From 39463d2f93ea3bc3dfb2758c540e3cbbea6732e4 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 21 Aug 2020 12:54:29 +1000
Subject: [PATCH] enable back ability to switch theme from leftpane

---
 js/background.js                       |  2 +-
 js/views/app_view.js                   |  2 +-
 stylesheets/_session_left_pane.scss    |  1 -
 ts/components/session/ActionsPanel.tsx | 14 +++++++++-----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/js/background.js b/js/background.js
index bece78657..df56fab33 100644
--- a/js/background.js
+++ b/js/background.js
@@ -368,7 +368,7 @@
 
     // These make key operations available to IPC handlers created in preload.js
     window.Events = {
-      getThemeSetting: () => 'dark', // storage.get('theme-setting', 'dark')
+      getThemeSetting: () => storage.get('theme-setting', 'dark'),
       setThemeSetting: value => {
         storage.put('theme-setting', value);
         onChangeTheme();
diff --git a/js/views/app_view.js b/js/views/app_view.js
index 3bfbe282a..0e73fc33d 100644
--- a/js/views/app_view.js
+++ b/js/views/app_view.js
@@ -25,7 +25,7 @@
     },
     applyTheme() {
       const iOS = storage.get('userAgent') === 'OWI';
-      const theme = 'dark'; // storage.get('theme-setting') || 'dark';
+      const theme = storage.get('theme-setting') || 'dark';
       this.$el
         .removeClass('light-theme')
         .removeClass('dark-theme')
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index 71fb51a5e..bf1f11383 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -166,7 +166,6 @@ $session-compose-margin: 20px;
       &:last-child {
         margin: auto auto 0px auto;
         /* Hide theme icon until light theme is ready */
-        display: none;
       }
 
       &:first-child {
diff --git a/ts/components/session/ActionsPanel.tsx b/ts/components/session/ActionsPanel.tsx
index 84d653bfa..04a0b7b99 100644
--- a/ts/components/session/ActionsPanel.tsx
+++ b/ts/components/session/ActionsPanel.tsx
@@ -93,11 +93,15 @@ export class ActionsPanel extends React.Component<Props, State> {
   }) => {
     const handleClick = onSelect
       ? () => {
-          type === SectionType.Profile
-            ? /* tslint:disable-next-line:no-void-expression */
-              this.editProfileHandle()
-            : /* tslint:disable-next-line:no-void-expression */
-              onSelect(type);
+          /* tslint:disable:no-void-expression */
+        if (type === SectionType.Profile) {
+          this.editProfileHandle()
+        } else if (type === SectionType.Moon) {
+          window.toggleTheme();
+        } else {
+          onSelect(type);
+        }
+        /* tslint:enable:no-void-expression */
         }
       : undefined;