From 1414bbaedfb25c4473255d07d18f65c7d52201e9 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Mon, 9 May 2022 10:45:01 -0400
Subject: [PATCH] [MM-44023] Remove Settings window flash, change wording on
 Settings page (#2088)

---
 src/main/windows/windowManager.test.js   | 1 -
 src/main/windows/windowManager.ts        | 4 ----
 src/renderer/components/SettingsPage.tsx | 4 ++--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/windows/windowManager.test.js b/src/main/windows/windowManager.test.js
index 519e861a..bcb0adef 100644
--- a/src/main/windows/windowManager.test.js
+++ b/src/main/windows/windowManager.test.js
@@ -348,7 +348,6 @@ describe('main/windows/windowManager', () => {
                 value: originalPlatform,
             });
             expect(windowManager.mainWindow.flashFrame).toBeCalledWith(true);
-            expect(windowManager.settingsWindow.flashFrame).toBeCalledWith(true);
         });
 
         it('mac - should not bounce icon when config item is not set', () => {
diff --git a/src/main/windows/windowManager.ts b/src/main/windows/windowManager.ts
index e9f1e28e..9ab1284f 100644
--- a/src/main/windows/windowManager.ts
+++ b/src/main/windows/windowManager.ts
@@ -280,10 +280,6 @@ export class WindowManager {
         if (process.platform === 'linux' || process.platform === 'win32') {
             if (Config.notifications.flashWindow) {
                 this.mainWindow?.flashFrame(flash);
-                if (this.settingsWindow) {
-                    // main might be hidden behind the settings
-                    this.settingsWindow.flashFrame(flash);
-                }
             }
         }
         if (process.platform === 'darwin' && Config.notifications.bounceIcon) {
diff --git a/src/renderer/components/SettingsPage.tsx b/src/renderer/components/SettingsPage.tsx
index e84c65f0..f748a977 100644
--- a/src/renderer/components/SettingsPage.tsx
+++ b/src/renderer/components/SettingsPage.tsx
@@ -629,9 +629,9 @@ export default class SettingsPage extends React.PureComponent<Record<string, nev
                         checked={!this.state.notifications || this.state.notifications.flashWindow === 2}
                         onChange={this.handleFlashWindow}
                     />
-                    {'Flash app window and taskbar icon when a new message is received'}
+                    {'Flash taskbar icon when a new message is received'}
                     <FormText>
-                        {'If enabled, app window and taskbar icon flash for a few seconds when a new message is received.'}
+                        {'If enabled, the taskbar icon will flash for a few seconds when a new message is received.'}
                         {window.process.platform === 'linux' && (
                             <>
                                 <br/>