From b8244f3266e9c84118de7486a6c277855a2e039b Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Thu, 14 Apr 2022 10:15:21 -0400
Subject: [PATCH] [MM-26016] Hide tray icon theme colour when tray icon not
 enabled (#2051)

---
 src/renderer/components/SettingsPage.tsx | 88 ++++++++++++------------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/src/renderer/components/SettingsPage.tsx b/src/renderer/components/SettingsPage.tsx
index 09d07f50..5f9147ac 100644
--- a/src/renderer/components/SettingsPage.tsx
+++ b/src/renderer/components/SettingsPage.tsx
@@ -712,49 +712,51 @@ export default class SettingsPage extends React.PureComponent<Record<string, nev
                 </FormCheck>);
         }
 
-        if (window.process.platform === 'linux' || window.process.platform === 'win32') {
-            options.push(
-                <FormGroup
-                    key='trayIconTheme'
-                    ref={this.trayIconThemeRef}
-                    style={{marginLeft: '20px'}}
-                >
-                    {'Icon theme: '}
-                    {window.process.platform === 'win32' &&
-                        <>
-                            <FormCheck
-                                type='radio'
-                                inline={true}
-                                name='trayIconTheme'
-                                value='use_system'
-                                defaultChecked={this.state.trayIconTheme === 'use_system' || !this.state.trayIconTheme}
-                                onChange={() => this.handleChangeTrayIconTheme('use_system')}
-                                label={'Use system default'}
-                            />
-                            {' '}
-                        </>
-                    }
-                    <FormCheck
-                        type='radio'
-                        inline={true}
-                        name='trayIconTheme'
-                        value='light'
-                        defaultChecked={this.state.trayIconTheme === 'light' || !this.state.trayIconTheme}
-                        onChange={() => this.handleChangeTrayIconTheme('light')}
-                        label={'Light'}
-                    />
-                    {' '}
-                    <FormCheck
-                        type='radio'
-                        inline={true}
-                        name='trayIconTheme'
-                        value='dark'
-                        defaultChecked={this.state.trayIconTheme === 'dark'}
-                        onChange={() => this.handleChangeTrayIconTheme('dark')}
-                        label={'Dark'}
-                    />
-                </FormGroup>,
-            );
+        if (this.state.showTrayIcon) {
+            if (window.process.platform === 'linux' || window.process.platform === 'win32') {
+                options.push(
+                    <FormGroup
+                        key='trayIconTheme'
+                        ref={this.trayIconThemeRef}
+                        style={{marginLeft: '20px'}}
+                    >
+                        {'Icon theme: '}
+                        {window.process.platform === 'win32' &&
+                            <>
+                                <FormCheck
+                                    type='radio'
+                                    inline={true}
+                                    name='trayIconTheme'
+                                    value='use_system'
+                                    defaultChecked={this.state.trayIconTheme === 'use_system' || !this.state.trayIconTheme}
+                                    onChange={() => this.handleChangeTrayIconTheme('use_system')}
+                                    label={'Use system default'}
+                                />
+                                {' '}
+                            </>
+                        }
+                        <FormCheck
+                            type='radio'
+                            inline={true}
+                            name='trayIconTheme'
+                            value='light'
+                            defaultChecked={this.state.trayIconTheme === 'light' || !this.state.trayIconTheme}
+                            onChange={() => this.handleChangeTrayIconTheme('light')}
+                            label={'Light'}
+                        />
+                        {' '}
+                        <FormCheck
+                            type='radio'
+                            inline={true}
+                            name='trayIconTheme'
+                            value='dark'
+                            defaultChecked={this.state.trayIconTheme === 'dark'}
+                            onChange={() => this.handleChangeTrayIconTheme('dark')}
+                            label={'Dark'}
+                        />
+                    </FormGroup>,
+                );
+            }
         }
 
         if (window.process.platform === 'linux' || window.process.platform === 'win32') {