From 28e6294d2c1077ed236ef9a7f27f4f62b8f4ef7e Mon Sep 17 00:00:00 2001
From: André Oliveira <oliveira.andrerodrigues95@gmail.com>
Date: Thu, 5 May 2022 01:28:21 +0100
Subject: Fix order of the Settings Icon on sidebar when Todo is enable

---
 src/components/layout/Sidebar.js | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 91178a370..0d3a7c20c 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -233,26 +233,6 @@ class Sidebar extends Component {
               <Icon icon={isAppMuted ? mdiBellOff : mdiBell} size={1.5} />
             </button>
           ) : null}
-          {!hideSettingsButton && !this.state.isCollapsed ? (
-            <button
-              type="button"
-              onClick={() => openSettings({ path: 'app' })}
-              className="sidebar__button sidebar__button--settings"
-              data-tip={`${intl.formatMessage(
-                globalMessages.settings,
-              )} (${settingsShortcutKey(false)})`}
-            >
-              <Icon icon={mdiCog} size={1.5} />
-              {
-                this.props.stores.settings.app.automaticUpdates &&
-                  (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE ||
-                  this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED ||
-                  this.props.showServicesUpdatedInfoBar) && (
-                  <span className="update-available">•</span>
-                )
-              }
-            </button>
-          ) : null}
           {todosStore.isFeatureEnabledByUser && !this.state.isCollapsed ? (
             <button
               type="button"
@@ -294,6 +274,26 @@ class Sidebar extends Component {
         {this.state.tooltipEnabled && (
           <ReactTooltip place="right" type="dark" effect="solid" />
         )}
+        {!hideSettingsButton && !this.state.isCollapsed ? (
+            <button
+              type="button"
+              onClick={() => openSettings({ path: 'app' })}
+              className="sidebar__button sidebar__button--settings"
+              data-tip={`${intl.formatMessage(
+                globalMessages.settings,
+              )} (${settingsShortcutKey(false)})`}
+            >
+              <Icon icon={mdiCog} size={1.5} />
+              {
+                this.props.stores.settings.app.automaticUpdates &&
+                  (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE ||
+                  this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED ||
+                  this.props.showServicesUpdatedInfoBar) && (
+                  <span className="update-available">•</span>
+                )
+              }
+            </button>
+          ) : null}
       </div>
     );
   }
-- 
cgit v1.2.3-54-g00ecf