From e120c4893f4c36d0212522d1eef8a0c1647e4a5a Mon Sep 17 00:00:00 2001
From: J Blackman <blckmn@users.noreply.github.com>
Date: Wed, 27 Sep 2023 22:20:26 +1000
Subject: [PATCH] Adding dark and light theme names to the sponsor request
 (params to API) (#3561)

* Adding dark and light theme names to the sponsor request (params to API)

* Renamed configEnabled to configSetting as it does not reflect whether or not the darkTheme is currently enabled (just its setting).

* Missed the configEnabled in the optionsTab.
---
 src/js/BuildApi.js              |  4 ++--
 src/js/DarkTheme.js             | 16 +++++++++-------
 src/js/tabs/firmware_flasher.js |  3 ++-
 src/js/tabs/options.js          |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/js/BuildApi.js b/src/js/BuildApi.js
index f8bf85e55a..3506bc7cdd 100644
--- a/src/js/BuildApi.js
+++ b/src/js/BuildApi.js
@@ -172,8 +172,8 @@ export default class BuildApi {
         this.load(url, onSuccess, onFailure);
     }
 
-    loadSponsorTile(onSuccess, onFailure) {
-        const url = `${this._url}/api/configurator/sponsors`;
+    loadSponsorTile(mode, onSuccess, onFailure) {
+        const url = `${this._url}/api/configurator/sponsors/${mode}`;
         this.load(url, onSuccess, onFailure);
     }
 }
diff --git a/src/js/DarkTheme.js b/src/js/DarkTheme.js
index 400e3be8e9..12e896ca54 100644
--- a/src/js/DarkTheme.js
+++ b/src/js/DarkTheme.js
@@ -8,13 +8,14 @@ const css_dark = [
 ];
 
 const DarkTheme = {
-    configEnabled: undefined,
+    configSetting: undefined,
+    enabled: false,
 };
 
 DarkTheme.isDarkThemeEnabled = function (callback) {
-    if (this.configEnabled === 0) {
+    if (this.configSetting === 0) {
         callback(true);
-    } else if (this.configEnabled === 2) {
+    } else if (this.configSetting === 2) {
         if (GUI.isCordova()) {
             cordova.plugins.ThemeDetection.isDarkModeEnabled(function(success) {
                 callback(success.value);
@@ -47,27 +48,28 @@ DarkTheme.apply = function() {
 };
 
 DarkTheme.autoSet = function() {
-    if (this.configEnabled === 2) {
+    if (this.configSetting === 2) {
         this.apply();
     }
 };
 
 DarkTheme.setConfig = function (result) {
-    if (this.configEnabled !== result) {
-        this.configEnabled = result;
+    if (this.configSetting !== result) {
+        this.configSetting = result;
         this.apply();
     }
 };
 
 DarkTheme.applyDark = function () {
     css_dark.forEach((el) => $(`link[href="${el}"]`).prop('disabled', false));
+    this.enabled = true;
 };
 
 DarkTheme.applyNormal = function () {
     css_dark.forEach((el) => $(`link[href="${el}"]`).prop('disabled', true));
+    this.enabled = false;
 };
 
-
 export function setDarkTheme(enabled) {
     DarkTheme.setConfig(enabled);
 
diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js
index 99bee36a2e..3a41c2a5d2 100644
--- a/src/js/tabs/firmware_flasher.js
+++ b/src/js/tabs/firmware_flasher.js
@@ -19,6 +19,7 @@ import { gui_log } from '../gui_log';
 import semver from 'semver';
 import { checkChromeRuntimeError, urlExists } from '../utils/common';
 import { generateFilename } from '../utils/generate_filename';
+import DarkTheme from '../DarkTheme';
 
 const firmware_flasher = {
     targets: null,
@@ -55,7 +56,7 @@ firmware_flasher.initialize = function (callback) {
                 return;
             }
 
-            self.releaseLoader.loadSponsorTile(
+            self.releaseLoader.loadSponsorTile(DarkTheme.enabled ? 'dark' : 'light',
                 (content) => {
                     if (content) {
                         $('div.tab_sponsor').html(content);
diff --git a/src/js/tabs/options.js b/src/js/tabs/options.js
index 1d5d081760..0544cbae92 100644
--- a/src/js/tabs/options.js
+++ b/src/js/tabs/options.js
@@ -179,7 +179,7 @@ options.initCordovaForceComputerUI = function () {
 
 options.initDarkTheme = function () {
     $('#darkThemeSelect')
-        .val(DarkTheme.configEnabled)
+        .val(DarkTheme.configSetting)
         .change(function () {
             const value = parseInt($(this).val());