From 297e594f310560a74b8997bcdcd7251819dee713 Mon Sep 17 00:00:00 2001
From: Mohit <msaini0r@gmail.com>
Date: Fri, 15 Oct 2021 10:51:55 +0530
Subject: [PATCH 1/6] Updated Zulip.js

I think the issue is solved. #72
---
 src/components/Zulip.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/Zulip.js b/src/components/Zulip.js
index 5b6e29d..f2a39a0 100644
--- a/src/components/Zulip.js
+++ b/src/components/Zulip.js
@@ -59,10 +59,6 @@ class Zulip extends Component {
                     <b>Streams: </b>
                     <br />
                     <ul>
-                      <li>
-                        <b>#newcomers: </b>
-                        {zulipstat[0] ? zulipstat[0].newcomers_messages : 0}
-                      </li>
                       <li>
                         <b>#celebrate: </b>
                         {zulipstat[0] ? zulipstat[0].celebrate_messages : 0}

From 34d8cb34826c4e3b97ac30e6a7047b047d30be3f Mon Sep 17 00:00:00 2001
From: Mohit <msaini0r@gmail.com>
Date: Fri, 15 Oct 2021 12:18:03 +0530
Subject: [PATCH 2/6] Update Zulip.js

---
 src/components/Zulip.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/Zulip.js b/src/components/Zulip.js
index f2a39a0..5d06fc9 100644
--- a/src/components/Zulip.js
+++ b/src/components/Zulip.js
@@ -59,21 +59,25 @@ class Zulip extends Component {
                     <b>Streams: </b>
                     <br />
                     <ul>
+                      <li>
+                        <b>#newcomers: </b>
+                        {zulipstat && zulipstat[0] && zulipstat[0].newcomers_message ? zulipstat[0].newcomers_message : 0}
+                      </li>
                       <li>
                         <b>#celebrate: </b>
-                        {zulipstat[0] ? zulipstat[0].celebrate_messages : 0}
+                        {zulipstat && zulipstat[0] && zulipstat[0].celebrate_message ? zulipstat[0].celebrate_message : 0}
                       </li>
                       <li>
                         <b>#opportunities: </b>
-                        {zulipstat[0] ? zulipstat[0].opportunities_messages : 0}
+                        {zulipstat && zulipstat[0] && zulipstat[0].opportunities_message ? zulipstat[0].opportunities_message : 0}
                       </li>
                       <li>
                         <b>#questions: </b>
-                        {zulipstat[0] ? zulipstat[0].questions_messages : 0}
+                        {zulipstat && zulipstat[0] && zulipstat[0].questions_message ? zulipstat[0].questions_message : 0}
                       </li>
                       <li>
                         <b>#general: </b>
-                        {zulipstat[0] ? zulipstat[0].general_messages : 0}
+                       {zulipstat && zulipstat[0] && zulipstat[0].general_message ? zulipstat[0].general_message : 0}
                       </li>
                     </ul>
                   </>

From 9593b3f8516f9fc490f2c279195e9a0562717d19 Mon Sep 17 00:00:00 2001
From: Mohit <msaini0r@gmail.com>
Date: Fri, 15 Oct 2021 12:23:15 +0530
Subject: [PATCH 3/6] Delete Zulip.js

---
 src/components/Zulip.js | 121 ----------------------------------------
 1 file changed, 121 deletions(-)
 delete mode 100644 src/components/Zulip.js

diff --git a/src/components/Zulip.js b/src/components/Zulip.js
deleted file mode 100644
index 5d06fc9..0000000
--- a/src/components/Zulip.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { getZulipStat, updateZulipStat } from '../actions/zulip';
-import PropTypes from 'prop-types';
-import moment from 'moment';
-import { Card, Icon } from 'semantic-ui-react';
-import '../styles/Dashboard.css';
-
-class Zulip extends Component {
-  componentDidMount() {
-    this.props.getZulipStat();
-  }
-
-  update = () => {
-    this.props.updateZulipStat();
-  };
-
-  render() {
-    const { zulipstat } = this.props;
-    return (
-      <>
-        {/* zulip stats of a user  */}
-        <Card.Content>
-          <Card.Header>
-            <span>Zulip Stats</span>
-            <span className="space"></span>
-            <Icon
-              name="refresh"
-              size="small"
-              color="grey"
-              onClick={this.update}
-              className="refresh"
-            />
-          </Card.Header>
-          <Card.Description>
-            {zulipstat[0] ? (
-              <>
-                <b>Username: </b>
-                {zulipstat[0].zulip_username}
-                <br />
-                <b>Total Messages: </b>
-                {zulipstat[0].total_messages}
-                <br />
-                <b>First Activity: </b>
-                {moment(
-                  new Date(zulipstat[0].first_activity),
-                  'YYYYMMDD'
-                ).fromNow()}
-                <br />
-                <b>Last Activity: </b>
-                {moment(
-                  new Date(zulipstat[0].last_activity),
-                  'YYYYMMDD'
-                ).fromNow()}
-                <br />
-                {/* check for existence of streamwise messages */}
-                {zulipstat[0].newcomers_messages ? (
-                  <>
-                    <b>Streams: </b>
-                    <br />
-                    <ul>
-                      <li>
-                        <b>#newcomers: </b>
-                        {zulipstat && zulipstat[0] && zulipstat[0].newcomers_message ? zulipstat[0].newcomers_message : 0}
-                      </li>
-                      <li>
-                        <b>#celebrate: </b>
-                        {zulipstat && zulipstat[0] && zulipstat[0].celebrate_message ? zulipstat[0].celebrate_message : 0}
-                      </li>
-                      <li>
-                        <b>#opportunities: </b>
-                        {zulipstat && zulipstat[0] && zulipstat[0].opportunities_message ? zulipstat[0].opportunities_message : 0}
-                      </li>
-                      <li>
-                        <b>#questions: </b>
-                        {zulipstat && zulipstat[0] && zulipstat[0].questions_message ? zulipstat[0].questions_message : 0}
-                      </li>
-                      <li>
-                        <b>#general: </b>
-                       {zulipstat && zulipstat[0] && zulipstat[0].general_message ? zulipstat[0].general_message : 0}
-                      </li>
-                    </ul>
-                  </>
-                ) : null}
-              </>
-            ) : null}
-          </Card.Description>
-        </Card.Content>
-        {/* this part shows details of high/low community interaction and last updated time of stats  */}
-        <Card.Content extra>
-          <b>Stats Last updated: </b>
-          {zulipstat[0]
-            ? moment(new Date(zulipstat[0].updated_on), 'YYYYMMDD').fromNow()
-            : 'Never'}
-          <br />
-          {zulipstat[0] ? (
-            zulipstat[0].total_messages < 10 ? (
-              <span>
-                Expected messages to be above 10. Please increase your community
-                engagement!
-              </span>
-            ) : null
-          ) : null}
-        </Card.Content>
-      </>
-    );
-  }
-}
-
-Zulip.propTypes = {
-  zulipstat: PropTypes.array.isRequired,
-};
-
-const mapStateToProps = (state) => ({
-  zulipstat: state.zulip.zulipstat,
-  zuliperror: state.zulip.zuliperror,
-});
-
-export default connect(mapStateToProps, { getZulipStat, updateZulipStat })(
-  Zulip
-);

From 5b176e1bcf1cfd3e2ae6dc894b9aa644ecc6cf9d Mon Sep 17 00:00:00 2001
From: Mohit <msaini0r@gmail.com>
Date: Fri, 15 Oct 2021 17:07:44 +0530
Subject: [PATCH 4/6] Revert "Delete Zulip.js"

This reverts commit 9593b3f8516f9fc490f2c279195e9a0562717d19.
---
 src/components/Zulip.js | 121 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 src/components/Zulip.js

diff --git a/src/components/Zulip.js b/src/components/Zulip.js
new file mode 100644
index 0000000..5d06fc9
--- /dev/null
+++ b/src/components/Zulip.js
@@ -0,0 +1,121 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { getZulipStat, updateZulipStat } from '../actions/zulip';
+import PropTypes from 'prop-types';
+import moment from 'moment';
+import { Card, Icon } from 'semantic-ui-react';
+import '../styles/Dashboard.css';
+
+class Zulip extends Component {
+  componentDidMount() {
+    this.props.getZulipStat();
+  }
+
+  update = () => {
+    this.props.updateZulipStat();
+  };
+
+  render() {
+    const { zulipstat } = this.props;
+    return (
+      <>
+        {/* zulip stats of a user  */}
+        <Card.Content>
+          <Card.Header>
+            <span>Zulip Stats</span>
+            <span className="space"></span>
+            <Icon
+              name="refresh"
+              size="small"
+              color="grey"
+              onClick={this.update}
+              className="refresh"
+            />
+          </Card.Header>
+          <Card.Description>
+            {zulipstat[0] ? (
+              <>
+                <b>Username: </b>
+                {zulipstat[0].zulip_username}
+                <br />
+                <b>Total Messages: </b>
+                {zulipstat[0].total_messages}
+                <br />
+                <b>First Activity: </b>
+                {moment(
+                  new Date(zulipstat[0].first_activity),
+                  'YYYYMMDD'
+                ).fromNow()}
+                <br />
+                <b>Last Activity: </b>
+                {moment(
+                  new Date(zulipstat[0].last_activity),
+                  'YYYYMMDD'
+                ).fromNow()}
+                <br />
+                {/* check for existence of streamwise messages */}
+                {zulipstat[0].newcomers_messages ? (
+                  <>
+                    <b>Streams: </b>
+                    <br />
+                    <ul>
+                      <li>
+                        <b>#newcomers: </b>
+                        {zulipstat && zulipstat[0] && zulipstat[0].newcomers_message ? zulipstat[0].newcomers_message : 0}
+                      </li>
+                      <li>
+                        <b>#celebrate: </b>
+                        {zulipstat && zulipstat[0] && zulipstat[0].celebrate_message ? zulipstat[0].celebrate_message : 0}
+                      </li>
+                      <li>
+                        <b>#opportunities: </b>
+                        {zulipstat && zulipstat[0] && zulipstat[0].opportunities_message ? zulipstat[0].opportunities_message : 0}
+                      </li>
+                      <li>
+                        <b>#questions: </b>
+                        {zulipstat && zulipstat[0] && zulipstat[0].questions_message ? zulipstat[0].questions_message : 0}
+                      </li>
+                      <li>
+                        <b>#general: </b>
+                       {zulipstat && zulipstat[0] && zulipstat[0].general_message ? zulipstat[0].general_message : 0}
+                      </li>
+                    </ul>
+                  </>
+                ) : null}
+              </>
+            ) : null}
+          </Card.Description>
+        </Card.Content>
+        {/* this part shows details of high/low community interaction and last updated time of stats  */}
+        <Card.Content extra>
+          <b>Stats Last updated: </b>
+          {zulipstat[0]
+            ? moment(new Date(zulipstat[0].updated_on), 'YYYYMMDD').fromNow()
+            : 'Never'}
+          <br />
+          {zulipstat[0] ? (
+            zulipstat[0].total_messages < 10 ? (
+              <span>
+                Expected messages to be above 10. Please increase your community
+                engagement!
+              </span>
+            ) : null
+          ) : null}
+        </Card.Content>
+      </>
+    );
+  }
+}
+
+Zulip.propTypes = {
+  zulipstat: PropTypes.array.isRequired,
+};
+
+const mapStateToProps = (state) => ({
+  zulipstat: state.zulip.zulipstat,
+  zuliperror: state.zulip.zuliperror,
+});
+
+export default connect(mapStateToProps, { getZulipStat, updateZulipStat })(
+  Zulip
+);

From caf53a6f06288efa0028cee61e1941dc289df4eb Mon Sep 17 00:00:00 2001
From: Mohit <msaini0r@gmail.com>
Date: Sat, 16 Oct 2021 15:07:20 +0530
Subject: [PATCH 5/6] Update Zulip.js

---
 src/components/Zulip.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/Zulip.js b/src/components/Zulip.js
index 5d06fc9..1db3122 100644
--- a/src/components/Zulip.js
+++ b/src/components/Zulip.js
@@ -58,26 +58,26 @@ class Zulip extends Component {
                   <>
                     <b>Streams: </b>
                     <br />
-                    <ul>
+                    <zulipstat && zulipstat[0]>
                       <li>
                         <b>#newcomers: </b>
-                        {zulipstat && zulipstat[0] && zulipstat[0].newcomers_message ? zulipstat[0].newcomers_message : 0}
+                        {zulipstat[0].newcomers_message ? zulipstat[0].newcomers_message : 0}
                       </li>
                       <li>
                         <b>#celebrate: </b>
-                        {zulipstat && zulipstat[0] && zulipstat[0].celebrate_message ? zulipstat[0].celebrate_message : 0}
+                        {zulipstat[0].celebrate_message ? zulipstat[0].celebrate_message : 0}
                       </li>
                       <li>
                         <b>#opportunities: </b>
-                        {zulipstat && zulipstat[0] && zulipstat[0].opportunities_message ? zulipstat[0].opportunities_message : 0}
+                        {zulipstat[0].opportunities_message ? zulipstat[0].opportunities_message : 0}
                       </li>
                       <li>
                         <b>#questions: </b>
-                        {zulipstat && zulipstat[0] && zulipstat[0].questions_message ? zulipstat[0].questions_message : 0}
+                        {zulipstat[0].questions_message ? zulipstat[0].questions_message : 0}
                       </li>
                       <li>
                         <b>#general: </b>
-                       {zulipstat && zulipstat[0] && zulipstat[0].general_message ? zulipstat[0].general_message : 0}
+                       {zulipstat[0].general_message ? zulipstat[0].general_message : 0}
                       </li>
                     </ul>
                   </>

From f9fa49eeadc8cf102c39e533bc63a1fcbb9fd09e Mon Sep 17 00:00:00 2001
From: Mohit <msaini0r@gmail.com>
Date: Sat, 16 Oct 2021 16:00:20 +0530
Subject: [PATCH 6/6] Update Zulip.js

---
 src/components/Zulip.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Zulip.js b/src/components/Zulip.js
index 1db3122..11f4081 100644
--- a/src/components/Zulip.js
+++ b/src/components/Zulip.js
@@ -58,7 +58,7 @@ class Zulip extends Component {
                   <>
                     <b>Streams: </b>
                     <br />
-                    <zulipstat && zulipstat[0]>
+                    {zulipstat && zulipstat[0] ? <ul>
                       <li>
                         <b>#newcomers: </b>
                         {zulipstat[0].newcomers_message ? zulipstat[0].newcomers_message : 0}
@@ -79,7 +79,7 @@ class Zulip extends Component {
                         <b>#general: </b>
                        {zulipstat[0].general_message ? zulipstat[0].general_message : 0}
                       </li>
-                    </ul>
+                    </ul> : null}
                   </>
                 ) : null}
               </>