Fix top bar theme when changing the system settings

mattermost · Sep 5, 2023 · 9e66ec6 · 9e66ec6
1 parent 4266d24
commit 9e66ec6
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/src/renderer/components/MainPage.tsx b/src/renderer/components/MainPage.tsx
@@ -54,7 +54,6 @@ type State = {
     mentionCounts: Record<string, number>;
     maximized: boolean;
     tabViewStatus: Map<string, TabViewStatus>;
-    darkMode: boolean;
     modalOpen?: boolean;
     fullScreen?: boolean;
     showExtraBar?: boolean;
@@ -91,7 +90,6 @@ class MainPage extends React.PureComponent<Props, State> {
             mentionCounts: {},
             maximized: false,
             tabViewStatus: new Map(),
-            darkMode: this.props.darkMode,
             isMenuOpen: false,
             isDownloadsDropdownOpen: false,
             showDownloadsBadge: false,
@@ -194,10 +192,6 @@ class MainPage extends React.PureComponent<Props, State> {
             this.updateTabStatus(viewId, statusValue);
         });
 
-        window.desktop.onDarkModeChange((darkMode) => {
-            this.setState({darkMode});
-        });
-
         // can't switch tabs sequentially for some reason...
         window.desktop.onSetActiveView(this.setActiveView);
 
@@ -407,7 +401,7 @@ class MainPage extends React.PureComponent<Props, State> {
         const tabsRow = (
             <TabBar
                 id='tabBar'
-                isDarkMode={this.state.darkMode}
+                isDarkMode={this.props.darkMode}
                 tabs={currentTabs}
                 sessionsExpired={this.state.sessionsExpired}
                 unreadCounts={this.state.unreadCounts}
@@ -424,13 +418,13 @@ class MainPage extends React.PureComponent<Props, State> {
 
         const topBarClassName = classNames('topBar', {
             macOS: window.process.platform === 'darwin',
-            darkMode: this.state.darkMode,
+            darkMode: this.props.darkMode,
             fullScreen: this.state.fullScreen,
         });
 
         const downloadsDropdownButton = this.state.hasDownloads ? (
             <DownloadsDropdownButton
-                darkMode={this.state.darkMode}
+                darkMode={this.props.darkMode}
                 isDownloadsDropdownOpen={this.state.isDownloadsDropdownOpen}
                 showDownloadsBadge={this.state.showDownloadsBadge}
                 closeDownloadsDropdown={this.closeDownloadsDropdown}
@@ -544,7 +538,7 @@ class MainPage extends React.PureComponent<Props, State> {
                             totalMentionCount={totalMentionCount}
                             hasUnreads={hasAnyUnreads}
                             isMenuOpen={this.state.isMenuOpen}
-                            darkMode={this.state.darkMode}
+                            darkMode={this.props.darkMode}
                         />
                     )}
                     {tabsRow}
@@ -589,7 +583,7 @@ class MainPage extends React.PureComponent<Props, State> {
         const viewsRow = (
             <Fragment>
                 <ExtraBar
-                    darkMode={this.state.darkMode}
+                    darkMode={this.props.darkMode}
                     show={this.state.showExtraBar}
                     goBack={() => {
                         window.desktop.goBack();