From 03c63fa36d8eb2c05f22e74cdec48d1dcfa693c8 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Sat, 11 Jul 2020 21:29:57 -0600
Subject: [PATCH] Fix a bug where it doesn't show the proper icon if the
 themeMode is not set

---
 app/soapbox/features/ui/components/tabs_bar.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/soapbox/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js
index ce10d5c7d..a2c6375bb 100644
--- a/app/soapbox/features/ui/components/tabs_bar.js
+++ b/app/soapbox/features/ui/components/tabs_bar.js
@@ -13,7 +13,7 @@ import ActionBar from 'soapbox/features/compose/components/action_bar';
 import { openModal } from '../../../actions/modal';
 import { openSidebar } from '../../../actions/sidebar';
 import Icon from '../../../components/icon';
-import { changeSetting } from 'soapbox/actions/settings';
+import { changeSetting, getSettings } from 'soapbox/actions/settings';
 
 const messages = defineMessages({
   post: { id: 'tabs_bar.post', defaultMessage: 'Post' },
@@ -32,7 +32,7 @@ class TabsBar extends React.PureComponent {
     toggleTheme: PropTypes.func,
     logo: PropTypes.string,
     account: ImmutablePropTypes.map,
-    settings: ImmutablePropTypes.map,
+    themeMode: PropTypes.string,
   }
 
   state = {
@@ -108,7 +108,7 @@ class TabsBar extends React.PureComponent {
   }
 
   getNewThemeValue() {
-    if (this.props.settings.get('themeMode') === 'light') return 'dark';
+    if (this.props.themeMode === 'light') return 'dark';
 
     return 'light';
   }
@@ -139,7 +139,7 @@ class TabsBar extends React.PureComponent {
   });
 
   render() {
-    const { account, onOpenCompose, onOpenSidebar, intl, settings } = this.props;
+    const { account, onOpenCompose, onOpenSidebar, intl, themeMode } = this.props;
     const { collapsed } = this.state;
 
     const classes = classNames('tabs-bar', {
@@ -158,8 +158,8 @@ class TabsBar extends React.PureComponent {
             </div>
             { account &&
               <div className='flex'>
-                <button className='tabs-bar__button-theme-toggle button' onClick={this.handleToggleTheme} aria-label={settings.get('themeMode') === 'light' ? intl.formatMessage(messages.switchToDark) : intl.formatMessage(messages.switchToLight)}>
-                  <Icon id={settings.get('themeMode') === 'light' ? 'sun' : 'moon'} />
+                <button className='tabs-bar__button-theme-toggle button' onClick={this.handleToggleTheme} aria-label={themeMode === 'light' ? intl.formatMessage(messages.switchToDark) : intl.formatMessage(messages.switchToLight)}>
+                  <Icon id={themeMode === 'light' ? 'sun' : 'moon'} />
                 </button>
                 <div className='tabs-bar__profile'>
                   <Avatar account={account} />
@@ -192,10 +192,11 @@ class TabsBar extends React.PureComponent {
 
 const mapStateToProps = state => {
   const me = state.get('me');
+  const settings = getSettings(state);
   return {
     account: state.getIn(['accounts', me]),
     logo: state.getIn(['soapbox', 'logo']),
-    settings: state.get('settings'),
+    themeMode: settings.get('themeMode'),
   };
 };