Add trialStatusBar & polishing

4 files changed, 56 insertions, 1 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index f102fc370..329c43f32 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -81,6 +81,8 @@ export default class AppStore extends Store {
 
   dictionaries = [];
 
+  fetchDataInterval = null;
+
   constructor(...args) {
     super(...args);
 
@@ -102,6 +104,7 @@ export default class AppStore extends Store {
       this._setLocale.bind(this),
       this._muteAppHandler.bind(this),
       this._handleFullScreen.bind(this),
+      this._handleLogout.bind(this),
     ]);
   }
 
@@ -129,6 +132,11 @@ export default class AppStore extends Store {
     this._systemDND();
     setInterval(() => this._systemDND(), ms('5s'));
 
+    this.fetchDataInterval = setInterval(() => {
+      this.stores.user.getUserInfoRequest.invalidate({ immediately: true });
+      this.stores.features.featuresRequest.invalidate({ immediately: true });
+    }, ms('10s'));
+
     // Check for updates once every 4 hours
     setInterval(() => this._checkForUpdates(), CHECK_INTERVAL);
     // Check for an update in 30s (need a delay to prevent Squirrel Installer lock file issues)
@@ -430,6 +438,12 @@ export default class AppStore extends Store {
     }
   }
 
+  _handleLogout() {
+    if (!this.stores.user.isLoggedIn) {
+      clearInterval(this.fetchDataInterval);
+    }
+  }
+
   // Helpers
   _appStartsCounter() {
     this.actions.settings.update({
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index bffcb01bc..5d379fd3e 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -20,6 +20,7 @@ import serviceLimit from '../features/serviceLimit';
 import communityRecipes from '../features/communityRecipes';
 import todos from '../features/todos';
 import planSelection from '../features/planSelection';
+import trialStatusBar from '../features/trialStatusBar';
 
 import { DEFAULT_FEATURES_CONFIG } from '../config';
 
@@ -83,5 +84,6 @@ export default class FeaturesStore extends Store {
     communityRecipes(this.stores, this.actions);
     todos(this.stores, this.actions);
     planSelection(this.stores, this.actions);
+    trialStatusBar(this.stores, this.actions);
   }
 }
diff --git a/src/stores/PaymentStore.js b/src/stores/PaymentStore.js
index d4de476c8..b90e8f006 100644
--- a/src/stores/PaymentStore.js
+++ b/src/stores/PaymentStore.js
@@ -1,10 +1,13 @@
 import { action, observable, computed } from 'mobx';
+import { remote } from 'electron';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { gaEvent } from '../lib/analytics';
 
+const { BrowserWindow } = remote;
+
 export default class PaymentStore extends Store {
   @observable plansRequest = new CachedRequest(this.api.payment, 'plans');
 
@@ -14,6 +17,7 @@ export default class PaymentStore extends Store {
     super(...args);
 
     this.actions.payment.createHostedPage.listen(this._createHostedPage.bind(this));
+    this.actions.payment.upgradeAccount.listen(this._upgradeAccount.bind(this));
   }
 
   @computed get plan() {
@@ -30,4 +34,37 @@ export default class PaymentStore extends Store {
 
     return request;
   }
+
+  @action _upgradeAccount({ planId, onCloseWindow = () => null }) {
+    let hostedPageURL = this.stores.features.features.subscribeURL;
+
+    const parsedUrl = new URL(hostedPageURL);
+    const params = new URLSearchParams(parsedUrl.search.slice(1));
+
+    params.set('plan', planId);
+
+    hostedPageURL = this.stores.user.getAuthURL(`${parsedUrl.origin}${parsedUrl.pathname}?${params.toString()}`);
+
+    const win = new BrowserWindow({
+      parent: remote.getCurrentWindow(),
+      modal: true,
+      title: '🔒 Upgrade Your Franz Account',
+      width: 800,
+      height: window.innerHeight - 100,
+      maxWidth: 800,
+      minWidth: 600,
+      webPreferences: {
+        nodeIntegration: true,
+        webviewTag: true,
+      },
+    });
+    win.loadURL(`file://${__dirname}/../index.html#/payment/${encodeURIComponent(hostedPageURL)}`);
+
+    win.on('closed', () => {
+      this.stores.user.getUserInfoRequest.invalidate({ immediately: true });
+      this.stores.features.featuresRequest.invalidate({ immediately: true });
+
+      onCloseWindow();
+    });
+  }
 }
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index b652098f9..735e8f886 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -77,6 +77,8 @@ export default class UserStore extends Store {
 
   @observable logoutReason = null;
 
+  fetchUserInfoInterval = null;
+
   constructor(...args) {
     super(...args);
 
@@ -161,7 +163,7 @@ export default class UserStore extends Store {
   }
 
   @computed get isPremiumOverride() {
-    return ((!this.team || !this.team.plan) && this.isPremium) || (this.team.state === 'expired' && this.isPremium);
+    return ((!this.team || !this.team.plan) && this.isPremium) || (this.team && this.team.state === 'expired' && this.isPremium);
   }
 
   @computed get isPersonal() {