Fix issue with custom icon on service creation

2 files changed, 6 insertions, 6 deletions

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index a684ff98b..d37ff51f8 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -173,9 +173,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 +227,7 @@ export default class ServerApi {
 
     const serviceData = await request.json();
 
-    return serviceData.data.iconUrl;
+    return serviceData.data;
   }
 
   async reorderService(data) {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 7300a76c8..20e07e540 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -187,13 +187,13 @@ export default class ServicesStore extends Store {
 
       // patch custom icon deletion
       if (data.customIcon === 'delete') {
-        data.iconUrl = '';
-        data.hasCustomUploadedIcon = false;
+        newData.iconUrl = '';
+        newData.hasCustomUploadedIcon = false;
       }
 
       // patch custom icon url
       if (data.customIconUrl) {
-        data.iconUrl = data.customIconUrl;
+        newData.iconUrl = data.customIconUrl;
       }
 
       Object.assign(result.find(c => c.id === serviceId), newData);