4 files changed, 46 insertions, 10 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index dd4642d70..b21d48a11 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -143,10 +143,13 @@ export default class AppStore extends Store {
 
     // Handle deep linking (franz://)
     ipcRenderer.on('navigateFromDeepLink', (event, data) => {
-      const { url } = data;
+      debug('Navigate from deep link', data);
+      let { url } = data;
       if (!url) return;
 
-      this.stores.router.push(data.url);
+      url = url.replace(/\/$/, '');
+
+      this.stores.router.push(url);
     });
 
     // Set active the next service
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 0ab57312a..efd57a09d 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -70,6 +70,7 @@ export default class ServicesStore extends Store {
       this._mapActiveServiceToServiceModelReaction.bind(this),
       this._saveActiveService.bind(this),
       this._logoutReaction.bind(this),
+      this._handleMuteSettings.bind(this),
     ]);
 
     // Just bind this
@@ -627,6 +628,20 @@ export default class ServicesStore extends Store {
     }
   }
 
+  _handleMuteSettings() {
+    const { enabled } = this;
+    const { isAppMuted } = this.stores.settings.app;
+
+    enabled.forEach((service) => {
+      const { isAttached } = service;
+      const isMuted = isAppMuted || service.isMuted;
+
+      if (isAttached) {
+        service.webview.setAudioMuted(isMuted);
+      }
+    });
+  }
+
   _shareSettingsWithServiceProcess() {
     const settings = this.stores.settings.app;
     this.actions.service.sendIPCMessageToAllServices({
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index d37ebe4c7..bb7965a4a 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -1,8 +1,7 @@
 import { action, observable, computed } from 'mobx';
+import { theme } from '@meetfranz/theme';
 
 import Store from './lib/Store';
-import * as themeDefault from '../theme/default';
-import * as themeDark from '../theme/dark';
 
 export default class UIStore extends Store {
   @observable showServicesUpdatedInfoBar = false;
@@ -24,10 +23,10 @@ export default class UIStore extends Store {
 
   @computed get theme() {
     if (this.stores.settings.all.app.darkMode) {
-      return Object.assign({}, themeDefault, themeDark);
+      return theme('dark');
     }
 
-    return themeDefault;
+    return theme('default');
   }
 
   // Actions
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 7addb5760..77d84afe1 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -129,10 +129,6 @@ export default class UserStore extends Store {
     return Boolean(localStorage.getItem('authToken'));
   }
 
-  // @computed get isTokenValid() {
-  //   return this.authToken !== null && moment(this.tokenExpiry).isAfter(moment());
-  // }
-
   @computed get isTokenExpired() {
     if (!this.authToken) return false;
 
@@ -160,6 +156,14 @@ export default class UserStore extends Store {
     gaEvent('User', 'login');
   }
 
+  @action _tokenLogin(authToken) {
+    this._setUserData(authToken);
+
+    this.stores.router.push('/');
+
+    gaEvent('User', 'tokenLogin');
+  }
+
   @action async _signup({
     firstname, lastname, email, password, accountType, company,
   }) {
@@ -206,6 +210,8 @@ export default class UserStore extends Store {
   }
 
   @action async _update({ userData }) {
+    if (!this.isLoggedIn) return;
+
     const response = await this.updateUserInfoRequest.execute(userData)._promise;
 
     this.getUserInfoRequest.patch(() => response.data);
@@ -222,6 +228,7 @@ export default class UserStore extends Store {
     // workaround mobx issue
     localStorage.removeItem('authToken');
     window.localStorage.removeItem('authToken');
+
     this.getUserInfoRequest.invalidate().reset();
     this.authToken = null;
   }
@@ -262,6 +269,18 @@ export default class UserStore extends Store {
     const { router } = this.stores;
     const currentRoute = router.location.pathname;
     if (!this.isLoggedIn
+      && currentRoute.includes('token=')) {
+      router.push(this.WELCOME_ROUTE);
+      const token = currentRoute.split('=')[1];
+
+      const data = this._parseToken(token);
+      if (data) {
+        // Give this some time to sink
+        setTimeout(() => {
+          this._tokenLogin(token);
+        }, 1000);
+      }
+    } else if (!this.isLoggedIn
       && !currentRoute.includes(this.BASE_ROUTE)) {
       router.push(this.WELCOME_ROUTE);
     } else if (this.isLoggedIn