Merge pull request #4205 from withspectrum/2.4.63

2.4.63

Author: brianlovin

package.json

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

src/helpers/is-os.js

@@ -1,3 +1,12 @@
 // @flow
-export const isMac = () =>
-  navigator && navigator.platform.toUpperCase().indexOf('MAC') >= 0;
+export const isMac = (): boolean => {
+  try {
+    return (
+      navigator &&
+      !!navigator.platform &&
+      !!(navigator.platform.toUpperCase().indexOf('MAC') >= 0)
+    );
+  } catch (err) {
+    return false;
+  }
+};

src/views/dashboard/components/desktopAppUpsell/index.js

@@ -29,14 +29,16 @@ class DesktopAppUpsell extends React.Component<{}, State> {
     super();
 
     this.state = {
-      isVisible: isMac() && !isDesktopApp() && !hasDismissedDesktopAppUpsell(),
+      isVisible: false,
     };
   }
 
   componentDidMount() {
-    const { isVisible } = this.state;
+    const desktopUpsellVisible =
+      isMac() && !isDesktopApp() && !hasDismissedDesktopAppUpsell();
 
-    if (isVisible) {
+    if (desktopUpsellVisible) {
+      this.setState({ isVisible: true });
       track(events.INBOX_DOWNLOAD_MAC_VIEWED);
     }
   }

src/views/thread/components/desktopAppUpsell/index.js

@@ -21,14 +21,16 @@ class DesktopAppUpsell extends React.Component<{}, State> {
     super();
 
     this.state = {
-      isVisible: isMac() && !isDesktopApp() && !hasDismissedDesktopAppUpsell(),
+      isVisible: false,
     };
   }
 
   componentDidMount() {
-    const { isVisible } = this.state;
+    const desktopUpsellVisible =
+      isMac() && !isDesktopApp() && !hasDismissedDesktopAppUpsell();
 
-    if (isVisible) {
+    if (desktopUpsellVisible) {
+      this.setState({ isVisible: true });
       track(events.THREAD_VIEW_DOWNLOAD_MAC_VIEWED);
     }
   }