From ea84b0b8baa07648295d9f867d072b87a189dd78 Mon Sep 17 00:00:00 2001
From: Jennifer Chen <shinyi.chen@gmail.com>
Date: Fri, 11 Jun 2021 07:35:34 -0700
Subject: [PATCH] Fixed dark mode setting logic error.

The error: Dark mode is always set to use system setting if app setting is dark mode off.
---
 src/js/dark-mode-switch.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/js/dark-mode-switch.js b/src/js/dark-mode-switch.js
index 9329c2b0a..3fea47bc0 100644
--- a/src/js/dark-mode-switch.js
+++ b/src/js/dark-mode-switch.js
@@ -24,16 +24,17 @@ define([], function() {
     darkSwitch = document.getElementById('darkSwitch');
 
     // 1. check app setting
-    if (
-      localStorage.getItem('darkSwitch') !== null &&
-      localStorage.getItem('darkSwitch') === 'on'
-    ) {
-      turnOnDarkMode(false);
-    }
-    // 2. check system setting
-    else if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+    if (localStorage.getItem('darkSwitch') !== null) {
+      if (localStorage.getItem('darkSwitch') === 'on') {
+        turnOnDarkMode(false);
+      } else {
+        turnOffDarkMode(false);
+      }
+    } else if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+      // 2. check system setting
       turnOnDarkMode(false);
     } else {
+      // 3. default to light
       turnOffDarkMode(false);
     }
     darkSwitch.addEventListener('click', function() {