3 files changed, 4 insertions, 47 deletions

diff --git a/src/api/LocalApi.js b/src/api/LocalApi.js
index 3f84f8a0b..59d7d8fa2 100644
--- a/src/api/LocalApi.js
+++ b/src/api/LocalApi.js
@@ -4,18 +4,6 @@ export default class LocalApi {
     this.local = local;
   }
 
-  getSettings() {
-    return this.local.getAppSettings();
-  }
-
-  updateSettings(data) {
-    return this.local.updateAppSettings(data);
-  }
-
-  removeKey(key) {
-    return this.local.removeKey(key);
-  }
-
   getAppCacheSize() {
     return this.local.getAppCacheSize();
   }
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index e95d750ac..aa3a7d655 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -6,38 +6,6 @@ import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js'
 const { session } = remote;
 
 export default class LocalApi {
-  // App
-  async updateAppSettings(data) {
-    const currentSettings = await this.getAppSettings();
-    const settings = Object.assign(currentSettings, data);
-
-    localStorage.setItem('app', JSON.stringify(settings));
-    console.debug('LocalApi::updateAppSettings resolves', settings);
-
-    return settings;
-  }
-
-  async getAppSettings() {
-    const settingsString = localStorage.getItem('app');
-    try {
-      const settings = JSON.parse(settingsString) || {};
-      console.debug('LocalApi::getAppSettings resolves', settings);
-
-      return settings;
-    } catch (err) {
-      return {};
-    }
-  }
-
-  async removeKey(key) {
-    const settings = await this.getAppSettings();
-
-    if (Object.hasOwnProperty.call(settings, key)) {
-      delete settings[key];
-      localStorage.setItem('app', JSON.stringify(settings));
-    }
-  }
-
   // Services
   async getAppCacheSize() {
     const partitionsDir = getServicePartitionsDirectory();
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index a684ff98b..8f3297d13 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -3,6 +3,7 @@ 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';
@@ -173,9 +174,9 @@ export default class ServerApi {
     const serviceData = await request.json();
 
     if (data.iconFile) {
-      const iconUrl = await this.uploadServiceIcon(serviceData.data.id, data.iconFile);
+      const iconData = await this.uploadServiceIcon(serviceData.data.id, data.iconFile);
 
-      serviceData.data.iconUrl = iconUrl;
+      serviceData.data = iconData;
     }
 
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
@@ -227,7 +228,7 @@ export default class ServerApi {
 
     const serviceData = await request.json();
 
-    return serviceData.data.iconUrl;
+    return serviceData.data;
   }
 
   async reorderService(data) {