From c04d17fcb2fc953e2b0ba38eb69350294aef933f Mon Sep 17 00:00:00 2001
From: BreadJS <83626012+BreadJS@users.noreply.github.com>
Date: Sun, 9 Jul 2023 23:05:16 +0200
Subject: [PATCH 1/3] [JS] Testnet toggler now follows network state

---
 scripts/global.js   |  1 +
 scripts/settings.js | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/global.js b/scripts/global.js
index 5dc09a2ab..9e9e2138a 100644
--- a/scripts/global.js
+++ b/scripts/global.js
@@ -292,6 +292,7 @@ export async function start() {
         domDisplaySettingsBtn: document.getElementById('settingsDisplayBtn'),
         domVersion: document.getElementById('version'),
         domFlipdown: document.getElementById('flipdown'),
+        domTesnetToggler: document.getElementById('tesnetToggler'),
     };
     await i18nStart();
     await loadImages();
diff --git a/scripts/settings.js b/scripts/settings.js
index 746390afb..add3e21b0 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -386,8 +386,11 @@ async function setAnalytics(level, fSilent = false) {
 }
 
 export function toggleTestnet() {
-    if (fWalletLoaded)
+    if (fWalletLoaded) {
+        // Revert testnet toggle
+        doms.domTesnetToggler.checked = !doms.domTesnetToggler.checked;
         return createAlert('warning', ALERTS.UNABLE_SWITCH_TESTNET, [], 3250);
+    }
 
     // Update current chain config
     cChainParams.current = cChainParams.current.isTestnet
@@ -403,6 +406,14 @@ export function toggleTestnet() {
     doms.domGuiBalanceStakingTicker.innerText = cChainParams.current.TICKER;
     doms.domPrefixNetwork.innerText =
         cChainParams.current.PUBKEY_PREFIX.join(' or ');
+    
+    // Update testnet toggle in settings
+    if(cChainParams.current.isTestnet) {
+        doms.domTesnetToggler.checked = true;
+    } else {
+        doms.domTesnetToggler.checked = false;
+    }
+    
     fillExplorerSelect();
     fillNodeSelect();
     getBalance(true);

From bd50d6786c1cc38ad90423bd00f75402cdfd2ffb Mon Sep 17 00:00:00 2001
From: BreadJS <83626012+BreadJS@users.noreply.github.com>
Date: Sun, 9 Jul 2023 23:17:03 +0200
Subject: [PATCH 2/3] [JS] Linting fix

---
 scripts/settings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/settings.js b/scripts/settings.js
index add3e21b0..af5c3b12f 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -406,14 +406,14 @@ export function toggleTestnet() {
     doms.domGuiBalanceStakingTicker.innerText = cChainParams.current.TICKER;
     doms.domPrefixNetwork.innerText =
         cChainParams.current.PUBKEY_PREFIX.join(' or ');
-    
+
     // Update testnet toggle in settings
-    if(cChainParams.current.isTestnet) {
+    if (cChainParams.current.isTestnet) {
         doms.domTesnetToggler.checked = true;
     } else {
         doms.domTesnetToggler.checked = false;
     }
-    
+
     fillExplorerSelect();
     fillNodeSelect();
     getBalance(true);

From 11680822c4f0f55b041948570c502c0adb764dcd Mon Sep 17 00:00:00 2001
From: JSKitty <jskitty@protonmail.com>
Date: Tue, 11 Jul 2023 16:48:23 +0100
Subject: [PATCH 3/3] Fix issues

---
 index.template.html | 4 ++--
 scripts/global.js   | 2 +-
 scripts/settings.js | 8 ++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/index.template.html b/index.template.html
index b56a28ab4..631da4b1d 100644
--- a/index.template.html
+++ b/index.template.html
@@ -1152,8 +1152,8 @@ <h2 id="mnLastSeen" class="stake-balances" style="overflow-wrap: anywhere; top:
                       </div>
 
                       <div class="custom-control custom-switch">
-                        <input type="checkbox" class="custom-control-input" id="tesnetToggler" onclick="MPW.toggleTestnet()">
-                        <label class="custom-control-label" for="tesnetToggler">Testnet Mode</label>
+                        <input type="checkbox" class="custom-control-input" id="testnetToggler" onclick="MPW.toggleTestnet()">
+                        <label class="custom-control-label" for="testnetToggler">Testnet Mode</label>
                       </div>
 
                     </div>
diff --git a/scripts/global.js b/scripts/global.js
index 9e9e2138a..4afda0d11 100644
--- a/scripts/global.js
+++ b/scripts/global.js
@@ -292,7 +292,7 @@ export async function start() {
         domDisplaySettingsBtn: document.getElementById('settingsDisplayBtn'),
         domVersion: document.getElementById('version'),
         domFlipdown: document.getElementById('flipdown'),
-        domTesnetToggler: document.getElementById('tesnetToggler'),
+        domTestnetToggler: document.getElementById('testnetToggler'),
     };
     await i18nStart();
     await loadImages();
diff --git a/scripts/settings.js b/scripts/settings.js
index af5c3b12f..f2b136a2e 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -388,7 +388,7 @@ async function setAnalytics(level, fSilent = false) {
 export function toggleTestnet() {
     if (fWalletLoaded) {
         // Revert testnet toggle
-        doms.domTesnetToggler.checked = !doms.domTesnetToggler.checked;
+        doms.domTestnetToggler.checked = !doms.domTestnetToggler.checked;
         return createAlert('warning', ALERTS.UNABLE_SWITCH_TESTNET, [], 3250);
     }
 
@@ -408,11 +408,7 @@ export function toggleTestnet() {
         cChainParams.current.PUBKEY_PREFIX.join(' or ');
 
     // Update testnet toggle in settings
-    if (cChainParams.current.isTestnet) {
-        doms.domTesnetToggler.checked = true;
-    } else {
-        doms.domTesnetToggler.checked = false;
-    }
+    doms.domTestnetToggler.checked = cChainParams.current.isTestnet;
 
     fillExplorerSelect();
     fillNodeSelect();