Merge branch 'release/5.4.0-beta.3' into i18n

9 files changed, 130 insertions, 69 deletions

diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index 63f43b6b7..e4ad6b612 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -47,7 +47,9 @@ export default class Settings {
   }
 
   _writeFile() {
-    outputJsonSync(this.settingsFile, this.store);
+    outputJsonSync(this.settingsFile, this.store, {
+      spaces: 2,
+    });
     debug('Write settings file', this.type, toJS(this.store));
   }
 
diff --git a/src/features/planSelection/components/PlanSelection.js b/src/features/planSelection/components/PlanSelection.js
index 355187516..b6bb9d32d 100644
--- a/src/features/planSelection/components/PlanSelection.js
+++ b/src/features/planSelection/components/PlanSelection.js
@@ -6,12 +6,13 @@ import { defineMessages, intlShape } from 'react-intl';
 import { H1, H2, Icon } from '@meetfranz/ui';
 import color from 'color';
 
-import { mdiRocket } from '@mdi/js';
+import { mdiRocket, mdiArrowRight } from '@mdi/js';
 import PlanItem from './PlanItem';
 import { i18nPlanName } from '../../../helpers/plan-helpers';
 import { PLANS } from '../../../config';
 import { FeatureList } from '../../../components/ui/FeatureList';
 import Appear from '../../../components/ui/effects/Appear';
+import { gaPage } from '../../../lib/analytics';
 
 const messages = defineMessages({
   welcome: {
@@ -58,6 +59,10 @@ const messages = defineMessages({
     id: 'feature.planSelection.fullFeatureList',
     defaultMessage: '!!!Complete comparison of all plans',
   },
+  pricesBasedOnAnnualPayment: {
+    id: 'feature.planSelection.pricesBasedOnAnnualPayment',
+    defaultMessage: '!!!All prices based on yearly payment',
+  },
 });
 
 const styles = theme => ({
@@ -131,11 +136,23 @@ const styles = theme => ({
       borderBottom: [1, 'solid', '#CECECE'],
     },
   },
+  footer: {
+    display: 'flex',
+    color: theme.styleTypes.primary.contrast,
+    marginTop: 20,
+    padding: [0, 15],
+  },
   fullFeatureList: {
-    marginTop: 40,
+    marginRight: 'auto',
     textAlign: 'center',
-    display: 'block',
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
     color: `${theme.styleTypes.primary.contrast} !important`,
+
+    '& svg': {
+      marginRight: 5,
+    },
   },
   scrollContainer: {
     border: '1px solid red',
@@ -144,6 +161,10 @@ const styles = theme => ({
   featuredPlan: {
     transform: 'scale(1.05)',
   },
+  disclaimer: {
+    textAlign: 'right',
+    margin: [10, 15, 0, 0],
+  },
 });
 
 @injectSheet(styles) @observer
@@ -163,6 +184,10 @@ class PlanSelection extends Component {
     intl: intlShape,
   };
 
+  componentDidMount() {
+    gaPage('/select-plan');
+  }
+
   render() {
     const {
       classes,
@@ -233,13 +258,19 @@ class PlanSelection extends Component {
                 />
               </PlanItem>
             </div>
-            <a
-              href="https://meetfranz.com/pricing"
-              target="_blank"
-              className={classes.fullFeatureList}
-            >
-              {intl.formatMessage(messages.fullFeatureList)}
-            </a>
+            <div className={classes.footer}>
+              <a
+                href="https://meetfranz.com/pricing"
+                target="_blank"
+                className={classes.fullFeatureList}
+              >
+                <Icon icon={mdiArrowRight} />
+                {intl.formatMessage(messages.fullFeatureList)}
+              </a>
+              {/* <p className={classes.disclaimer}> */}
+              {intl.formatMessage(messages.pricesBasedOnAnnualPayment)}
+              {/* </p> */}
+            </div>
           </div>
         </div>
       </Appear>
diff --git a/src/features/planSelection/containers/PlanSelectionScreen.js b/src/features/planSelection/containers/PlanSelectionScreen.js
index 6e8cdbf47..cb62f45d3 100644
--- a/src/features/planSelection/containers/PlanSelectionScreen.js
+++ b/src/features/planSelection/containers/PlanSelectionScreen.js
@@ -9,7 +9,7 @@ import UserStore from '../../../stores/UserStore';
 import PlanSelection from '../components/PlanSelection';
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
 import { planSelectionStore, GA_CATEGORY_PLAN_SELECTION } from '..';
-import { gaEvent } from '../../../lib/analytics';
+import { gaEvent, gaPage } from '../../../lib/analytics';
 
 const { dialog, app } = remote;
 
@@ -38,10 +38,6 @@ class PlanSelectionScreen extends Component {
     intl: intlShape,
   };
 
-  componentDidMount() {
-    gaEvent(GA_CATEGORY_PLAN_SELECTION, 'show');
-  }
-
   upgradeAccount(planId) {
     const { upgradeAccount } = this.props.actions.payment;
 
@@ -80,6 +76,8 @@ class PlanSelectionScreen extends Component {
             }
           }}
           stayOnFree={() => {
+            gaPage('/select-plan/downgrade');
+
             const selection = dialog.showMessageBoxSync(app.mainWindow, {
               type: 'question',
               message: intl.formatMessage(messages.dialogTitle),
@@ -101,7 +99,7 @@ class PlanSelectionScreen extends Component {
             } else {
               this.upgradeAccount(plans.personal.yearly.id);
 
-              gaEvent(GA_CATEGORY_PLAN_SELECTION, 'SelectPlan', 'Revoke');
+              gaEvent(GA_CATEGORY_PLAN_SELECTION, 'SelectPlan', 'Downgrade');
             }
           }}
           subscriptionExpired={user.team && user.team.state === 'expired' && !user.team.userHasDowngraded}
diff --git a/src/features/planSelection/store.js b/src/features/planSelection/store.js
index 8622d4e5a..448e323ff 100644
--- a/src/features/planSelection/store.js
+++ b/src/features/planSelection/store.js
@@ -19,8 +19,8 @@ export default class PlanSelectionStore extends FeatureStore {
   @observable hideOverlay = false;
 
   @computed get showPlanSelectionOverlay() {
-    const { team } = this.stores.user;
-    if (team && !this.hideOverlay) {
+    const { team, isPremium } = this.stores.user;
+    if (team && !this.hideOverlay && !isPremium) {
       return team.state === 'expired' && !team.userHasDowngraded;
     }
 
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 9818dca87..9cfeaed42 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -3998,143 +3998,156 @@
         "defaultMessage": "!!!Are you ready to choose, {name}",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 21
         },
         "file": "src/features/planSelection/components/PlanSelection.js",
         "id": "feature.planSelection.fullscreen.welcome",
         "start": {
           "column": 11,
-          "line": 17
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!It's time to make a choice. Franz works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 25
         },
         "file": "src/features/planSelection/components/PlanSelection.js",
         "id": "feature.planSelection.fullscreen.subheadline",
         "start": {
           "column": 15,
-          "line": 21
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!Basic functionality",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 29
         },
         "file": "src/features/planSelection/components/PlanSelection.js",
         "id": "feature.planSelection.free.text",
         "start": {
           "column": 12,
-          "line": 25
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!More services, no waiting - ideal for personal use.",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 33
         },
         "file": "src/features/planSelection/components/PlanSelection.js",
         "id": "feature.planSelection.personal.text",
         "start": {
           "column": 16,
-          "line": 29
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Unlimited services and professional features for you - and your team.",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 37
         },
         "file": "src/features/planSelection/components/PlanSelection.js",
         "id": "feature.planSelection.pro.text",
         "start": {
           "column": 20,
-          "line": 33
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Stay on Free",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 41
         },
         "file": "src/features/planSelection/components/PlanSelection.js",
         "id": "feature.planSelection.cta.stayOnFree",
         "start": {
           "column": 17,
-          "line": 37
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Downgrade to Free",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 45
         },
         "file": "src/features/planSelection/components/PlanSelection.js",
         "id": "feature.planSelection.cta.ctaDowngradeFree",
         "start": {
           "column": 20,
-          "line": 41
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!Start my free 14-days Trial",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 49
         },
         "file": "src/features/planSelection/components/PlanSelection.js",
         "id": "feature.planSelection.cta.trial",
         "start": {
           "column": 15,
-          "line": 45
+          "line": 46
         }
       },
       {
         "defaultMessage": "!!!Choose Personal",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 53
         },
         "file": "src/features/planSelection/components/PlanSelection.js",
         "id": "feature.planSelection.cta.upgradePersonal",
         "start": {
           "column": 23,
-          "line": 49
+          "line": 50
         }
       },
       {
         "defaultMessage": "!!!Choose Professional",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 57
         },
         "file": "src/features/planSelection/components/PlanSelection.js",
         "id": "feature.planSelection.cta.upgradePro",
         "start": {
           "column": 18,
-          "line": 53
+          "line": 54
         }
       },
       {
         "defaultMessage": "!!!Complete comparison of all plans",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 61
         },
         "file": "src/features/planSelection/components/PlanSelection.js",
         "id": "feature.planSelection.fullFeatureList",
         "start": {
           "column": 19,
-          "line": 57
+          "line": 58
+        }
+      },
+      {
+        "defaultMessage": "!!!All prices based on yearly payment",
+        "end": {
+          "column": 3,
+          "line": 65
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.pricesBasedOnAnnualPayment",
+        "start": {
+          "column": 30,
+          "line": 62
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 8bef09d4d..a701836dc 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -23,6 +23,7 @@
   "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Franz works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
   "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?",
   "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
+  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
   "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
diff --git a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json b/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
index 2e66c8dfe..7f1de6cfd 100644
--- a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
+++ b/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Are you ready to choose, {name}",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
-      "line": 17,
+      "line": 18,
       "column": 11
     },
     "end": {
-      "line": 20,
+      "line": 21,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!It's time to make a choice. Franz works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
-      "line": 21,
+      "line": 22,
       "column": 15
     },
     "end": {
-      "line": 24,
+      "line": 25,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Basic functionality",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
-      "line": 25,
+      "line": 26,
       "column": 12
     },
     "end": {
-      "line": 28,
+      "line": 29,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!More services, no waiting - ideal for personal use.",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
-      "line": 29,
+      "line": 30,
       "column": 16
     },
     "end": {
-      "line": 32,
+      "line": 33,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Unlimited services and professional features for you - and your team.",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
-      "line": 33,
+      "line": 34,
       "column": 20
     },
     "end": {
-      "line": 36,
+      "line": 37,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Stay on Free",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
-      "line": 37,
+      "line": 38,
       "column": 17
     },
     "end": {
-      "line": 40,
+      "line": 41,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Downgrade to Free",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
-      "line": 41,
+      "line": 42,
       "column": 20
     },
     "end": {
-      "line": 44,
+      "line": 45,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Start my free 14-days Trial",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
-      "line": 45,
+      "line": 46,
       "column": 15
     },
     "end": {
-      "line": 48,
+      "line": 49,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Choose Personal",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
-      "line": 49,
+      "line": 50,
       "column": 23
     },
     "end": {
-      "line": 52,
+      "line": 53,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Choose Professional",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
-      "line": 53,
+      "line": 54,
       "column": 18
     },
     "end": {
-      "line": 56,
+      "line": 57,
       "column": 3
     }
   },
@@ -134,11 +134,24 @@
     "defaultMessage": "!!!Complete comparison of all plans",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
-      "line": 57,
+      "line": 58,
       "column": 19
     },
     "end": {
-      "line": 60,
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.planSelection.pricesBasedOnAnnualPayment",
+    "defaultMessage": "!!!All prices based on yearly payment",
+    "file": "src/features/planSelection/components/PlanSelection.js",
+    "start": {
+      "line": 62,
+      "column": 30
+    },
+    "end": {
+      "line": 65,
       "column": 3
     }
   }
diff --git a/src/index.js b/src/index.js
index 7de7a5e1c..3056a8bec 100644
--- a/src/index.js
+++ b/src/index.js
@@ -64,8 +64,15 @@ if (isWindows) {
   app.setAppUserModelId(appId);
 }
 
+// Initialize Settings
+const settings = new Settings('app', DEFAULT_APP_SETTINGS);
+const proxySettings = new Settings('proxy');
+
+// add `liftSingleInstanceLock` to settings.json to override the single instance lock
+const liftSingleInstanceLock = settings.get('liftSingleInstanceLock') || false;
+
 // Force single window
-const gotTheLock = app.requestSingleInstanceLock();
+const gotTheLock = liftSingleInstanceLock ? true : app.requestSingleInstanceLock();
 if (!gotTheLock) {
   app.quit();
 } else {
@@ -112,10 +119,6 @@ if (isLinux && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESK
   process.env.XDG_CURRENT_DESKTOP = 'Unity';
 }
 
-// Initialize Settings
-const settings = new Settings('app', DEFAULT_APP_SETTINGS);
-const proxySettings = new Settings('proxy');
-
 // Disable GPU acceleration
 if (!settings.get('enableGPUAcceleration')) {
   debug('Disable GPU Acceleration');
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 06cbd283a..d8f71f61f 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -96,7 +96,7 @@ export function isEnabled() {
 
 export function disable() {
   if (isEnabled()) {
-    webFrame.setSpellCheckProvider(currentDict, true, { spellCheck: () => true });
+    webFrame.setSpellCheckProvider(currentDict, { spellCheck: () => true });
     _isEnabled = false;
     currentDict = null;
   }