Merge pull request #4263 from withspectrum/2.4.70

2.4.70

Author: brianlovin

api/yarn.lock

@@ -3637,7 +3637,7 @@ draft-js-prism@^1.0.6:
     extend "^3.0.0"
     immutable "*"
 
-"draft-js-prism@github:ngs/draft-js-prism#6edb31c3805dd1de3fb897cc27fced6bac1bafbb":
+draft-js-prism@ngs/draft-js-prism#6edb31c3805dd1de3fb897cc27fced6bac1bafbb:
   version "1.0.3"
   resolved "https://codeload.github.com/ngs/draft-js-prism/tar.gz/6edb31c3805dd1de3fb897cc27fced6bac1bafbb"
   dependencies:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.4.69",
+  "version": "2.4.70",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "@babel/preset-flow": "^7.0.0",

shared/db/queries/usersNotifications.js

@@ -50,6 +50,7 @@ export const markNotificationsSeen = createWriteQuery(
           userId,
           event: events.NOTIFICATIONS_MARKED_AS_SEEN,
         });
+        return true;
       }),
     invalidateTags: () => [userId, ...notifications],
   })

shared/notification-to-text.js

@@ -160,21 +160,19 @@ const formatNotification = (incomingNotification, currentUserId) => {
     }
     case 'REACTION_CREATED': {
       const message = notification.context.payload;
-
       href = `/thread/${message.threadId}`;
       body =
         message.messageType.toLowerCase() === 'draftjs'
-          ? toPlainText(toState(message.content.body))
+          ? `${toPlainText(toState(JSON.parse(message.content.body)))}`
           : message.content.body;
       break;
     }
     case 'THREAD_REACTION_CREATED': {
       const thread = notification.context.payload;
-
       href = `/thread/${thread.id}`;
       body =
         thread.type.toLowerCase() === 'draftjs'
-          ? toPlainText(toState(thread.content.body))
+          ? `${toPlainText(toState(JSON.parse(thread.content.body)))}`
           : thread.content.body;
       break;
     }

src/views/navbar/components/messagesTab.js

@@ -37,6 +37,11 @@ class MessagesTab extends React.Component<Props, State> {
     subscription: null,
   };
 
+  componentDidMount() {
+    this.subscribe();
+    return this.setCount(this.props);
+  }
+
   shouldComponentUpdate(nextProps) {
     const prevProps = this.props;
 
@@ -59,7 +64,6 @@ class MessagesTab extends React.Component<Props, State> {
         nextProps.data.directMessageNotifications.edges.length
     )
       return true;
-
     // if the user clicks on the messages tab
     if (prevProps.active !== nextProps.active) return true;
 
@@ -149,7 +153,6 @@ class MessagesTab extends React.Component<Props, State> {
     } = props;
     const { dispatch } = this.props;
     const nodes = this.convertEdgesToNodes(directMessageNotifications);
-
     // set to 0 if no notifications exist yet
     if (!nodes || nodes.length === 0) {
       return dispatch(

src/views/navbar/components/profileDropdown.js

@@ -49,42 +49,57 @@ type ProfileProps = {
   dispatch: Function,
 };
 
-const ProfileDropdown = (props: ProfileProps) => {
-  return (
-    <UserProfileDropdown className={'dropdown'}>
-      <UserProfileDropdownList>
-        {props.user.username && (
-          <Link rel="nofollow" to={`/users/${props.user.username}/settings`}>
-            <UserProfileDropdownListItem>
-              My Settings
-            </UserProfileDropdownListItem>
-          </Link>
-        )}
+type State = {
+  didMount: boolean,
+};
+
+class ProfileDropdown extends React.Component<ProfileProps, State> {
+  state = { didMount: false };
+
+  componentDidMount() {
+    return this.setState({ didMount: true });
+  }
 
-        {isMac() &&
-          !isDesktopApp() && (
-            <Link to={`/apps`}>
+  render() {
+    const { props } = this;
+    const { didMount } = this.state;
+    return (
+      <UserProfileDropdown className={'dropdown'}>
+        <UserProfileDropdownList>
+          {props.user.username && (
+            <Link rel="nofollow" to={`/users/${props.user.username}/settings`}>
               <UserProfileDropdownListItem>
-                Desktop App
+                My Settings
               </UserProfileDropdownListItem>
             </Link>
           )}
 
-        <Link to={`/about`}>
-          <UserProfileDropdownListItem>
-            About Spectrum
-          </UserProfileDropdownListItem>
-        </Link>
-        <Link to={`/support`}>
-          <UserProfileDropdownListItem>Support</UserProfileDropdownListItem>
-        </Link>
+          {didMount &&
+            isMac() &&
+            !isDesktopApp() && (
+              <Link to={`/apps`}>
+                <UserProfileDropdownListItem>
+                  Desktop App
+                </UserProfileDropdownListItem>
+              </Link>
+            )}
 
-        <a href={`${SERVER_URL}/auth/logout`}>
-          <UserProfileDropdownListItem>Log Out</UserProfileDropdownListItem>
-        </a>
-      </UserProfileDropdownList>
-    </UserProfileDropdown>
-  );
-};
+          <Link to={`/about`}>
+            <UserProfileDropdownListItem>
+              About Spectrum
+            </UserProfileDropdownListItem>
+          </Link>
+          <Link to={`/support`}>
+            <UserProfileDropdownListItem>Support</UserProfileDropdownListItem>
+          </Link>
+
+          <a href={`${SERVER_URL}/auth/logout`}>
+            <UserProfileDropdownListItem>Log Out</UserProfileDropdownListItem>
+          </a>
+        </UserProfileDropdownList>
+      </UserProfileDropdown>
+    );
+  }
+}
 
 export default connect()(ProfileDropdown);