From 751a8f18820e4b2073137b2eabd815bf89f72c7d Mon Sep 17 00:00:00 2001
From: audric <audric@loki.network>
Date: Tue, 10 Aug 2021 13:47:37 +1000
Subject: [PATCH] start in tray setting directly creates the tray icon

---
 app/tray_icon.js                                | 11 -----------
 main.js                                         | 17 +++++++++++------
 preload.js                                      |  2 --
 ts/components/conversation/AddMentions.tsx      |  2 +-
 .../session/settings/SessionSettings.tsx        |  1 -
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/app/tray_icon.js b/app/tray_icon.js
index 3f4c3319f..6135f8c65 100644
--- a/app/tray_icon.js
+++ b/app/tray_icon.js
@@ -1,6 +1,5 @@
 const path = require('path');
 
-const fs = require('fs');
 const { app, Menu, Tray } = require('electron');
 
 let trayContextMenu = null;
@@ -70,16 +69,6 @@ function createTrayIcon(getMainWindow, messages) {
     tray.setContextMenu(trayContextMenu);
   };
 
-  tray.updateIcon = () => {
-    const image = iconNoNewMessages;
-
-    if (!fs.existsSync(image)) {
-      console.log('tray.updateIcon: Image for tray update does not exist!');
-      return;
-    }
-    tray.setImage(image);
-  };
-
   tray.on('click', tray.showWindow);
 
   tray.setToolTip(messages.sessionMessenger);
diff --git a/main.js b/main.js
index e2c1f7f5f..1a9c42dd3 100644
--- a/main.js
+++ b/main.js
@@ -876,12 +876,6 @@ ipc.on('close-about', () => {
   }
 });
 
-ipc.on('update-tray-icon', (event, unreadCount) => {
-  if (tray) {
-    tray.updateIcon(unreadCount);
-  }
-});
-
 // Password screen related IPC calls
 ipc.on('password-window-login', async (event, passPhrase) => {
   const sendResponse = e => event.sender.send('password-window-login-response', e);
@@ -898,6 +892,17 @@ ipc.on('password-window-login', async (event, passPhrase) => {
 ipc.on('start-in-tray-on-start', async (event, newValue) => {
   try {
     userConfig.set('startInTray', newValue);
+
+    if (newValue) {
+      if (!tray) {
+        tray = createTrayIcon(getMainWindow, locale.messages);
+      }
+    } else {
+      if (tray) {
+        tray.destroy();
+      }
+      tray = null;
+    }
     event.sender.send('start-in-tray-on-start-response', null);
   } catch (e) {
     event.sender.send('start-in-tray-on-start-response', e);
diff --git a/preload.js b/preload.js
index 1b4ede67a..76aad1499 100644
--- a/preload.js
+++ b/preload.js
@@ -179,8 +179,6 @@ ipc.on('mediaPermissionsChanged', () => {
 window.closeAbout = () => ipc.send('close-about');
 window.readyForUpdates = () => ipc.send('ready-for-updates');
 
-window.updateTrayIcon = unreadCount => ipc.send('update-tray-icon', unreadCount);
-
 ipc.on('get-theme-setting', () => {
   const theme = window.Events.getThemeSetting();
   ipc.send('get-success-theme-setting', theme);
diff --git a/ts/components/conversation/AddMentions.tsx b/ts/components/conversation/AddMentions.tsx
index 4eb470e87..52585b850 100644
--- a/ts/components/conversation/AddMentions.tsx
+++ b/ts/components/conversation/AddMentions.tsx
@@ -48,7 +48,7 @@ export class AddMentions extends React.Component<Props> {
     const results: Array<any> = [];
     const FIND_MENTIONS = new RegExp(`@${PubKey.regexForPubkeys}`, 'g');
 
-    // We have to do this, because renderNonNewLine is not required in our Props object,
+    // We have to do this, because renderOther is not required in our Props object,
     //  but it is always provided via defaultProps.
     if (!renderOther) {
       return;
diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
index 12efbdd68..e951aaf0d 100644
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@@ -382,7 +382,6 @@ class SettingsViewInner extends React.Component<SettingsViewProps, State> {
           await window.setStartInTray(newValue);
           // make sure to write it here too, as this is the value used on the UI to mark the toggle as true/false
           window.setSettingValue('start-in-tray-setting', newValue);
-          ToastUtils.pushRestartNeeded();
         },
         content: undefined,
         comparisonValue: undefined,