15 files changed, 252 insertions, 155 deletions

diff --git a/README.md b/README.md
index c7e1d8034..d44cfaa6c 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many mor
 
 `$ brew cask install franz`
 
-(Don't know homebrew? [brew.sh](https://brew.sh/)
+(Don't know homebrew? [brew.sh](https://brew.sh/))
 
 ## Development
 
diff --git a/docs/example-feature/actions.js b/docs/example-feature/actions.js
new file mode 100644
index 000000000..c4d49b708
--- /dev/null
+++ b/docs/example-feature/actions.js
@@ -0,0 +1,10 @@
+import PropTypes from 'prop-types';
+import { createActionsFromDefinitions } from '../../src/actions/lib/actions';
+
+export const exampleFeatureActions = createActionsFromDefinitions({
+  greet: {
+    name: PropTypes.string.isRequired,
+  },
+}, PropTypes.checkPropTypes);
+
+export default exampleFeatureActions;
diff --git a/docs/example-feature/api.js b/docs/example-feature/api.js
new file mode 100644
index 000000000..65207e877
--- /dev/null
+++ b/docs/example-feature/api.js
@@ -0,0 +1,5 @@
+export default {
+  async getName() {
+    return Promise.resolve('Franz');
+  },
+};
diff --git a/docs/example-feature/index.js b/docs/example-feature/index.js
new file mode 100644
index 000000000..af859af26
--- /dev/null
+++ b/docs/example-feature/index.js
@@ -0,0 +1,36 @@
+import { reaction, runInAction } from 'mobx';
+import { ExampleFeatureStore } from './store';
+import state, { resetState } from './state';
+import api from './api';
+
+const debug = require('debug')('Franz:feature:EXAMPLE_FEATURE');
+
+let store = null;
+
+export default function initAnnouncements(stores, actions) {
+  const { features } = stores;
+
+  // Toggle workspace feature
+  reaction(
+    () => (
+      features.features.isExampleFeatureEnabled
+    ),
+    (isEnabled) => {
+      if (isEnabled) {
+        debug('Initializing `EXAMPLE_FEATURE` feature');
+        store = new ExampleFeatureStore(stores, api, actions, state);
+        store.initialize();
+        runInAction(() => { state.isFeatureActive = true; });
+      } else if (store) {
+        debug('Disabling `EXAMPLE_FEATURE` feature');
+        runInAction(() => { state.isFeatureActive = false; });
+        store.teardown();
+        store = null;
+        resetState(); // Reset state to default
+      }
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+}
diff --git a/docs/example-feature/state.js b/docs/example-feature/state.js
new file mode 100644
index 000000000..676717da7
--- /dev/null
+++ b/docs/example-feature/state.js
@@ -0,0 +1,14 @@
+import { observable } from 'mobx';
+
+const defaultState = {
+  name: null,
+  isFeatureActive: false,
+};
+
+export const exampleFeatureState = observable(defaultState);
+
+export function resetState() {
+  Object.assign(exampleFeatureState, defaultState);
+}
+
+export default exampleFeatureState;
diff --git a/docs/example-feature/store.js b/docs/example-feature/store.js
new file mode 100644
index 000000000..d8acfdca3
--- /dev/null
+++ b/docs/example-feature/store.js
@@ -0,0 +1,32 @@
+import { action, observable, reaction } from 'mobx';
+import Store from '../../src/stores/lib/Store';
+import Request from '../../src/stores/lib/Request';
+
+const debug = require('debug')('Franz:feature:EXAMPLE_FEATURE:store');
+
+export class ExampleFeatureStore extends Store {
+  @observable getNameRequest = new Request(this.api, 'getName');
+
+  constructor(stores, api, actions, state) {
+    super(stores, api, actions);
+    this.state = state;
+  }
+
+  setup() {
+    debug('fetching name from api');
+    this.getNameRequest.execute();
+
+    // Update the name on the state when the request resolved
+    reaction(
+      () => this.getNameRequest.result,
+      name => this._setName(name),
+    );
+  }
+
+  @action _setName = (name) => {
+    debug('setting name', name);
+    this.state.name = name;
+  };
+}
+
+export default ExampleFeatureStore;
diff --git a/package-lock.json b/package-lock.json
index 1f1ac3c00..c3b291acf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2340,7 +2340,8 @@
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
     },
     "accepts": {
       "version": "1.0.7",
@@ -2610,7 +2611,8 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
     },
     "archy": {
       "version": "1.0.0",
@@ -2622,6 +2624,7 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "dev": true,
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -2631,6 +2634,7 @@
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -2645,6 +2649,7 @@
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -5410,7 +5415,8 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
     },
     "depd": {
       "version": "0.4.4",
@@ -5650,6 +5656,29 @@
         "readable-stream": "~1.1.9"
       },
       "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "resolved": false,
+          "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": false,
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "resolved": false,
+          "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "resolved": false,
+          "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+          "requires": {
+            "delegates": "^1.0.0"
+          }
+        },
         "balanced-match": {
           "version": "1.0.0",
           "resolved": false,
@@ -5966,6 +5995,11 @@
             "glob": "^7.0.5"
           }
         },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "resolved": false,
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+        },
         "safer-buffer": {
           "version": "2.1.2",
           "resolved": false,
@@ -6010,7 +6044,10 @@
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": false,
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
         },
         "strip-json-comments": {
           "version": "2.0.1",
@@ -6136,9 +6173,9 @@
       "dev": true
     },
     "electron": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.7.tgz",
-      "integrity": "sha512-KYQ9SJZFWNKqoq6XjKW1bLFHjmAGeSC3XNuhHK/Sd2MK5H5sO3iKjvZU/YhiBUtkB/cBSkOdQTVEaLcMwU8l3A==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.8.tgz",
+      "integrity": "sha512-FOBJIHkuv8wc15N+ZyqwDzPavYVu5CHMBEf14jHDWv7QW2vkEIpJjVK+PIT31kfZfvjsIP0j2wvA/FBsiqB7pw==",
       "dev": true,
       "requires": {
         "@types/node": "^10.12.18",
@@ -6147,9 +6184,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "10.12.29",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.29.tgz",
-          "integrity": "sha512-J/tnbnj8HcsBgCe2apZbdUpQ7hs4d7oZNTYA5bekWdP0sr2NGsOpI/HRdDroEi209tEvTcTtxhD0FfED3DhEcw==",
+          "version": "10.12.30",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz",
+          "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==",
           "dev": true
         }
       }
@@ -14574,7 +14611,8 @@
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
     },
     "progress": {
       "version": "2.0.3",
diff --git a/package.json b/package.json
index 14e0df7ca..df7fa4191 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "cross-env": "^5.0.5",
     "cz-conventional-changelog": "2.1.0",
     "dotenv": "^4.0.0",
-    "electron": "4.0.7",
+    "electron": "4.0.8",
     "electron-builder": "20.38.4",
     "electron-rebuild": "1.8.4",
     "eslint": "5.10.0",
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 2871769a9..bafeef005 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -3,7 +3,6 @@ import path from 'path';
 import tar from 'tar';
 import fs from 'fs-extra';
 import { remote } from 'electron';
-import localStorage from 'mobx-localstorage';
 
 import ServiceModel from '../../models/Service';
 import RecipePreviewModel from '../../models/RecipePreview';
@@ -16,6 +15,7 @@ import OrderModel from '../../models/Order';
 import { sleep } from '../../helpers/async-helpers';
 
 import { API } from '../../environment';
+import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
 import {
   getRecipeDirectory,
@@ -39,6 +39,7 @@ const { default: fetch } = remote.require('electron-fetch');
 
 const SERVER_URL = API;
 const API_VERSION = 'v1';
+const API_URL = `${SERVER_URL}/${API_VERSION}`;
 
 export default class ServerApi {
   recipePreviews = [];
@@ -47,12 +48,12 @@ export default class ServerApi {
 
   // User
   async login(email, passwordHash) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/auth/login`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/auth/login`, {
       method: 'POST',
       headers: {
         Authorization: `Basic ${window.btoa(`${email}:${passwordHash}`)}`,
       },
-    }, false));
+    }, false);
     if (!request.ok) {
       throw request;
     }
@@ -63,10 +64,10 @@ export default class ServerApi {
   }
 
   async signup(data) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/auth/signup`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/auth/signup`, {
       method: 'POST',
       body: JSON.stringify(data),
-    }, false));
+    }, false);
     if (!request.ok) {
       throw request;
     }
@@ -77,10 +78,10 @@ export default class ServerApi {
   }
 
   async inviteUser(data) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/invite`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/invite`, {
       method: 'POST',
       body: JSON.stringify(data),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -90,12 +91,12 @@ export default class ServerApi {
   }
 
   async retrievePassword(email) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/auth/password`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/auth/password`, {
       method: 'POST',
       body: JSON.stringify({
         email,
       }),
-    }, false));
+    }, false);
     if (!request.ok) {
       throw request;
     }
@@ -106,9 +107,7 @@ export default class ServerApi {
   }
 
   async userInfo() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
+    const request = await sendAuthRequest(`${API_URL}/me`);
     if (!request.ok) {
       throw request;
     }
@@ -121,10 +120,10 @@ export default class ServerApi {
   }
 
   async updateUserInfo(data) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/me`, {
       method: 'PUT',
       body: JSON.stringify(data),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -136,9 +135,9 @@ export default class ServerApi {
   }
 
   async deleteAccount() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/me`, {
       method: 'DELETE',
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -150,9 +149,7 @@ export default class ServerApi {
 
   // Services
   async getServices() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me/services`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
+    const request = await sendAuthRequest(`${API_URL}/me/services`);
     if (!request.ok) {
       throw request;
     }
@@ -165,12 +162,12 @@ export default class ServerApi {
   }
 
   async createService(recipeId, data) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/service`, {
       method: 'POST',
       body: JSON.stringify(Object.assign({
         recipeId,
       }, data)),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -195,10 +192,10 @@ export default class ServerApi {
       await this.uploadServiceIcon(serviceId, data.iconFile);
     }
 
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/${serviceId}`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/service/${serviceId}`, {
       method: 'PUT',
       body: JSON.stringify(data),
-    }));
+    });
 
     if (!request.ok) {
       throw request;
@@ -216,14 +213,14 @@ export default class ServerApi {
     const formData = new FormData();
     formData.append('icon', icon);
 
-    const requestData = this._prepareAuthRequest({
+    const requestData = prepareAuthRequest({
       method: 'PUT',
       body: formData,
     });
 
     delete requestData.headers['Content-Type'];
 
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/${serviceId}`, requestData);
+    const request = await window.fetch(`${API_URL}/service/${serviceId}`, requestData);
 
     if (!request.ok) {
       throw request;
@@ -235,10 +232,10 @@ export default class ServerApi {
   }
 
   async reorderService(data) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/reorder`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/service/reorder`, {
       method: 'PUT',
       body: JSON.stringify(data),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -248,9 +245,9 @@ export default class ServerApi {
   }
 
   async deleteService(id) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/${id}`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/service/${id}`, {
       method: 'DELETE',
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -264,9 +261,7 @@ export default class ServerApi {
 
   // Features
   async getDefaultFeatures() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features/default`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
+    const request = await sendAuthRequest(`${API_URL}/features/default`);
     if (!request.ok) {
       throw request;
     }
@@ -278,9 +273,7 @@ export default class ServerApi {
   }
 
   async getFeatures() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
+    const request = await sendAuthRequest(`${API_URL}/features`);
     if (!request.ok) {
       throw request;
     }
@@ -314,10 +307,10 @@ export default class ServerApi {
   }
 
   async getRecipeUpdates(recipeVersions) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes/update`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/recipes/update`, {
       method: 'POST',
       body: JSON.stringify(recipeVersions),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -328,29 +321,19 @@ export default class ServerApi {
 
   // Recipes Previews
   async getRecipePreviews() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
+    const request = await sendAuthRequest(`${API_URL}/recipes`);
+    if (!request.ok) throw request;
     const data = await request.json();
-
     const recipePreviews = this._mapRecipePreviewModel(data);
     debug('ServerApi::getRecipes resolves', recipePreviews);
-
     return recipePreviews;
   }
 
   async getFeaturedRecipePreviews() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes/popular`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
-    const data = await request.json();
+    const request = await sendAuthRequest(`${API_URL}/recipes/popular`);
+    if (!request.ok) throw request;
 
+    const data = await request.json();
     // data = this._addLocalRecipesToPreviews(data);
 
     const recipePreviews = this._mapRecipePreviewModel(data);
@@ -359,14 +342,11 @@ export default class ServerApi {
   }
 
   async searchRecipePreviews(needle) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes/search?needle=${needle}`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
-    const data = await request.json();
+    const url = `${API_URL}/recipes/search?needle=${needle}`;
+    const request = await sendAuthRequest(url);
+    if (!request.ok) throw request;
 
+    const data = await request.json();
     const recipePreviews = this._mapRecipePreviewModel(data);
     debug('ServerApi::searchRecipePreviews resolves', recipePreviews);
     return recipePreviews;
@@ -375,10 +355,9 @@ export default class ServerApi {
   async getRecipePackage(recipeId) {
     try {
       const recipesDirectory = path.join(app.getPath('userData'), 'recipes');
-
       const recipeTempDirectory = path.join(recipesDirectory, 'temp', recipeId);
       const archivePath = path.join(recipeTempDirectory, 'recipe.tar.gz');
-      const packageUrl = `${SERVER_URL}/${API_VERSION}/recipes/download/${recipeId}`;
+      const packageUrl = `${API_URL}/recipes/download/${recipeId}`;
 
       fs.ensureDirSync(recipeTempDirectory);
       const res = await fetch(packageUrl);
@@ -415,26 +394,21 @@ export default class ServerApi {
 
   // Payment
   async getPlans() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/payment/plans`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
+    const request = await sendAuthRequest(`${API_URL}/payment/plans`);
+    if (!request.ok) throw request;
     const data = await request.json();
-
     const plan = new PlanModel(data);
     debug('ServerApi::getPlans resolves', plan);
     return plan;
   }
 
   async getHostedPage(planId) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/payment/init`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/payment/init`, {
       method: 'POST',
       body: JSON.stringify({
         planId,
       }),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -445,25 +419,16 @@ export default class ServerApi {
   }
 
   async getPaymentDashboardUrl() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me/billing`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
+    const request = await sendAuthRequest(`${API_URL}/me/billing`);
+    if (!request.ok) throw request;
     const data = await request.json();
-
     debug('ServerApi::getPaymentDashboardUrl resolves', data);
     return data;
   }
 
   async getSubscriptionOrders() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me/subscription`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
+    const request = await sendAuthRequest(`${API_URL}/me/subscription`);
+    if (!request.ok) throw request;
     const data = await request.json();
     const orders = this._mapOrderModels(data);
     debug('ServerApi::getSubscriptionOrders resolves', orders);
@@ -472,15 +437,9 @@ export default class ServerApi {
 
   // News
   async getLatestNews() {
-    // eslint-disable-next-line
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`,
-      this._prepareAuthRequest({
-        method: 'GET',
-      }));
-
-    if (!request.ok) {
-      throw request;
-    }
+    const url = `${API_URL}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
+    const request = await sendAuthRequest(url);
+    if (!request.ok) throw request;
     const data = await request.json();
     const news = this._mapNewsModels(data);
     debug('ServerApi::getLatestNews resolves', news);
@@ -488,23 +447,16 @@ export default class ServerApi {
   }
 
   async hideNews(id) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/news/${id}/read`,
-      this._prepareAuthRequest({
-        method: 'GET',
-      }));
-
-    if (!request.ok) {
-      throw request;
-    }
-
+    const request = await sendAuthRequest(`${API_URL}/news/${id}/read`);
+    if (!request.ok) throw request;
     debug('ServerApi::hideNews resolves', id);
   }
 
   // Health Check
   async healthCheck() {
-    const request = await window.fetch(`${SERVER_URL}/health`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${SERVER_URL}/health`, {
       method: 'GET',
-    }, false));
+    }, false);
     if (!request.ok) {
       throw request;
     }
@@ -520,10 +472,7 @@ export default class ServerApi {
       if (Object.prototype.hasOwnProperty.call(config, 'services')) {
         const services = await Promise.all(config.services.map(async (s) => {
           const service = s;
-          const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes/${s.service}`,
-            this._prepareAuthRequest({
-              method: 'GET',
-            }));
+          const request = await sendAuthRequest(`${API_URL}/recipes/${s.service}`);
 
           if (request.status === 200) {
             const data = await request.json();
@@ -546,9 +495,7 @@ export default class ServerApi {
   // Helper
   async _mapServiceModels(services) {
     const recipes = services.map(s => s.recipeId);
-
     await this._bulkRecipeCheck(recipes);
-
     /* eslint-disable no-return-await */
     return Promise.all(services.map(async service => await this._prepareServiceModel(service)));
     /* eslint-enable no-return-await */
@@ -632,26 +579,6 @@ export default class ServerApi {
     }).filter(orderItem => orderItem !== null);
   }
 
-  _prepareAuthRequest(options, auth = true) {
-    const request = Object.assign(options, {
-      mode: 'cors',
-      headers: Object.assign({
-        'Content-Type': 'application/json',
-        'X-Franz-Source': 'desktop',
-        'X-Franz-Version': app.getVersion(),
-        'X-Franz-platform': process.platform,
-        'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(),
-        'X-Franz-System-Locale': app.getLocale(),
-      }, options.headers),
-    });
-
-    if (auth) {
-      request.headers.Authorization = `Bearer ${localStorage.getItem('authToken')}`;
-    }
-
-    return request;
-  }
-
   _getDevRecipes() {
     const recipesDirectory = getDevRecipeDirectory();
     try {
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js
index d469853a5..6dbdeaa7f 100644
--- a/src/api/utils/auth.js
+++ b/src/api/utils/auth.js
@@ -3,7 +3,7 @@ import localStorage from 'mobx-localstorage';
 
 const { app } = remote;
 
-export const prepareAuthRequest = (options, auth = true) => {
+export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => {
   const request = Object.assign(options, {
     mode: 'cors',
     headers: Object.assign({
@@ -23,6 +23,6 @@ export const prepareAuthRequest = (options, auth = true) => {
   return request;
 };
 
-export const sendAuthRequest = (url, options) => (
-  window.fetch(url, prepareAuthRequest(options))
+export const sendAuthRequest = (url, options, auth) => (
+  window.fetch(url, prepareAuthRequest(options, auth))
 );
diff --git a/src/index.js b/src/index.js
index 0e222c3d6..05c793d98 100644
--- a/src/index.js
+++ b/src/index.js
@@ -72,7 +72,10 @@ if (!gotTheLock) {
   app.on('second-instance', (event, argv) => {
     // Someone tried to run a second instance, we should focus our window.
     if (mainWindow) {
-      if (mainWindow.isMinimized()) mainWindow.restore();
+      mainWindow.show();
+      if (mainWindow.isMinimized()) {
+        mainWindow.restore();
+      }
       mainWindow.focus();
 
       if (isWindows) {
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 669b02709..192e24796 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -22,7 +22,11 @@ export default class TrayIcon {
       {
         label: 'Show Franz',
         click() {
+          if (app.mainWindow.isMinimized()) {
+            app.mainWindow.restore();
+          }
           app.mainWindow.show();
+          app.mainWindow.focus();
         },
       }, {
         label: 'Quit Franz',
@@ -36,7 +40,11 @@ export default class TrayIcon {
     this.trayIcon.setContextMenu(trayMenu);
 
     this.trayIcon.on('click', () => {
+      if (app.mainWindow.isMinimized()) {
+        app.mainWindow.restore();
+      }
       app.mainWindow.show();
+      app.mainWindow.focus();
     });
 
     if (process.platform === 'darwin') {
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 7784ff1f9..351ad6422 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -12,7 +12,7 @@ import { URL } from 'url';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
-import { isMac, isLinux, isWindows } from '../environment';
+import { isMac } from '../environment';
 import locales from '../i18n/translations';
 import { gaEvent, gaPage } from '../lib/analytics';
 import { onVisibilityChange } from '../helpers/visibility-helper';
@@ -185,7 +185,15 @@ export default class AppStore extends Store {
   }) {
     if (this.stores.settings.all.app.isAppMuted) return;
 
+    // TODO: is there a simple way to use blobs for notifications without storing them on disk?
+    if (options.icon.startsWith('blob:')) {
+      delete options.icon;
+    }
+
     const notification = new window.Notification(title, options);
+
+    debug('New notification', title, options);
+
     notification.onclick = (e) => {
       if (serviceId) {
         this.actions.service.sendIPCMessage({
@@ -195,12 +203,13 @@ export default class AppStore extends Store {
         });
 
         this.actions.service.setActive({ serviceId });
-
-        if (isWindows) {
+        mainWindow.show();
+        if (app.mainWindow.isMinimized()) {
           mainWindow.restore();
-        } else if (isLinux) {
-          mainWindow.show();
         }
+        mainWindow.focus();
+
+        debug('Notification click handler');
       }
     };
   }
diff --git a/src/styles/auth.scss b/src/styles/auth.scss
index 817801982..0a075036a 100644
--- a/src/styles/auth.scss
+++ b/src/styles/auth.scss
@@ -107,7 +107,7 @@
   &__scroll-container {
     max-height: 100vh;
     padding: 80px 0;
-    overflow: scroll;
+    overflow: auto;
     width: 100%;
   }
 
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index afb1d8912..a4a6ab899 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -33,6 +33,8 @@ const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheck
   const canGoBack = webContents.canGoBack();
   const canGoForward = webContents.canGoForward();
 
+  // @adlk: we can't use roles here due to a bug with electron where electron.remote.webContents.getFocusedWebContents() returns the first webview in DOM instead of the focused one
+  // Github issue creation is pending
   let menuTpl = [
     {
       type: 'separator',
@@ -48,19 +50,32 @@ const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheck
       type: 'separator',
     }, {
       id: 'cut',
-      role: can('Cut') ? 'cut' : '',
+      label: 'Cut',
+      click() {
+        if (can('Cut')) {
+          webContents.cut();
+        }
+      },
       enabled: can('Cut'),
       visible: hasText && props.isEditable,
     }, {
       id: 'copy',
       label: 'Copy',
-      role: can('Copy') ? 'copy' : '',
+      click() {
+        if (can('Copy')) {
+          webContents.copy();
+        }
+      },
       enabled: can('Copy'),
       visible: props.isEditable || hasText,
     }, {
       id: 'paste',
       label: 'Paste',
-      role: editFlags.canPaste ? 'paste' : '',
+      click() {
+        if (editFlags.canPaste) {
+          webContents.paste();
+        }
+      },
       enabled: editFlags.canPaste,
       visible: props.isEditable,
     }, {