From 4313ccb249f3900b7c4f10e719c18b99110b3db3 Mon Sep 17 00:00:00 2001
From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com>
Date: Wed, 7 Jun 2023 17:18:57 +0200
Subject: [PATCH] Remember last selected node

---
 .../src/functional-components/settings-page.js | 18 ++++++++++++++++--
 core/src/redux/app/actions/node-config.js      | 12 ++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/core/src/functional-components/settings-page.js b/core/src/functional-components/settings-page.js
index a7d26317..ad938bbf 100644
--- a/core/src/functional-components/settings-page.js
+++ b/core/src/functional-components/settings-page.js
@@ -184,7 +184,12 @@ class SettingsPage extends connect(store)(LitElement) {
     }
 
     firstUpdated() {
-        // ...
+        const checkNode = localStorage.getItem('mySelectedNode')
+        if (checkNode === null || checkNode.length === 0) {
+            localStorage.setItem('mySelectedNode', 0)
+        } else {
+        }
+        console.log("NODE", localStorage.getItem('mySelectedNode'))
     }
 
     show() {
@@ -224,6 +229,9 @@ class SettingsPage extends connect(store)(LitElement) {
             dismiss: true
         })
 
+        localStorage.removeItem('mySelectedNode')
+        localStorage.setItem('mySelectedNode', 0)
+
         store.dispatch(doLoadNodeConfig())
     }
 
@@ -237,12 +245,15 @@ class SettingsPage extends connect(store)(LitElement) {
 
         store.dispatch(doSetNode(selectedNodeIndex))
 
+        localStorage.removeItem('mySelectedNode')
+        localStorage.setItem('mySelectedNode', selectedNodeIndex)
+
         let snack2string = get("settings.snack2")
         snackbar.add({
             labelText: `${snack2string} : ${selectedNodeUrl}`,
             dismiss: true
         })
-
+        console.log("NODE", localStorage.getItem('mySelectedNode'))
         this.shadowRoot.querySelector('#settingsDialog').close()
     }
 
@@ -374,6 +385,9 @@ class SettingsPage extends connect(store)(LitElement) {
             dismiss: true
         })
 
+        localStorage.removeItem('mySelectedNode')
+        localStorage.setItem('mySelectedNode', 0)
+
         store.dispatch(doLoadNodeConfig())
     }
 
diff --git a/core/src/redux/app/actions/node-config.js b/core/src/redux/app/actions/node-config.js
index 8181553f..2cf5eca1 100644
--- a/core/src/redux/app/actions/node-config.js
+++ b/core/src/redux/app/actions/node-config.js
@@ -4,7 +4,9 @@ import { UI_VERSION } from '../version.js'
 
 const nodeConfigUrl = '/getConfig'
 
-const checkNodes = JSON.parse(localStorage.getItem('myQortalNodes'));
+const checkNodes = JSON.parse(localStorage.getItem('myQortalNodes'))
+
+const checkMyNode = localStorage.getItem('mySelectedNode')
 
 export const doLoadNodeConfig = () => {
 
@@ -19,7 +21,13 @@ export const doLoadNodeConfig = () => {
                     knownNodes: [{}],
                     version: ''
                 }
-                nodeConfig.node = data.config.user.node
+
+                if (checkMyNode === null || checkMyNode.length === 0) {
+                    localStorage.setItem('mySelectedNode', 0)
+                    nodeConfig.node = localStorage.getItem('mySelectedNode')
+                } else {
+                    nodeConfig.node = localStorage.getItem('mySelectedNode')
+                }
 
                 if (checkNodes === null || checkNodes.length === 0) {
                     var saveNode = [];