Fix notifications on all services (#1593)

* refactor class

* Revert "refactor class"

This reverts commit 7e266d7aa4905f236457c44f9ffc37fa8f742b4c.

* refactor: change logic

* Working logic (but double notifications)

* fix: final adjustments

1 files changed, 2 insertions, 1 deletions

diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts
index 9f2cfeca3..58c6b2a87 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -917,12 +917,13 @@ export default class ServicesStore extends TypedStore {
 
         if (service.isNotificationEnabled) {
           let title: string;
-          options.icon = service.iconUrl;
           if (this.stores.settings.all.app.privateNotifications === true) {
             // Remove message data from notification in private mode
             options.body = '';
+            options.icon = service.icon;
             title = `Notification from ${service.name}`;
           } else {
+            options.icon = options.icon || service.icon;
             options.body = typeof options.body === 'string' ? options.body : '';
             title =
               typeof args[0].title === 'string' ? args[0].title : service.name;