From e9b2a76a87511d2e9387642ebebc73790a7e1e88 Mon Sep 17 00:00:00 2001
From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com>
Date: Wed, 8 Nov 2023 21:23:00 +0100
Subject: [PATCH] Fix save key

---
 .../components/settings-view/export-keys.js   | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/core/src/components/settings-view/export-keys.js b/core/src/components/settings-view/export-keys.js
index 0066a4ed..5d38c133 100644
--- a/core/src/components/settings-view/export-keys.js
+++ b/core/src/components/settings-view/export-keys.js
@@ -256,7 +256,7 @@ class ExportKeys extends connect(store)(LitElement) {
         addTradeBotRoutes(parentEpml)
         parentEpml.imReady()
         await this.fetchArrrWalletAddress()
-        this.fetchArrrWalletPrivateKey()
+        this.checkArrrWalletPrivateKey()
     }
 
     async fetchArrrWalletAddress() {
@@ -277,7 +277,7 @@ class ExportKeys extends connect(store)(LitElement) {
         }
     }
 
-    async fetchArrrWalletPrivateKey() {
+    async checkArrrWalletPrivateKey() {
         const myNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node]
         const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port
         const privateKeyUrl = `${nodeUrl}/crosschain/arrr/walletprivatekey?apiKey=${this.getApiKey()}`
@@ -290,23 +290,37 @@ class ExportKeys extends connect(store)(LitElement) {
                 this.arrrPMK = ''
                 this.enableArrr = false
                 this.shadowRoot.querySelector('#needCoreUpdate').show()
-            } else if (res != null && res.error != 1201) {
-                this.arrrPMK = ''
-                this.enableArrr = true
-                this.arrrPMK = res
             } else {
-                this.arrrPMK = ''
-                this.enableArrr = false
-                this.shadowRoot.querySelector('#arrrWalletNotSynced').show()
+                this.fetchArrrWalletPrivateKey()
             }
         })
     }
 
+    async fetchArrrWalletPrivateKey() {
+        let resPK = await parentEpml.request('apiCall', {
+            url: `/crosschain/arrr/walletprivatekey?apiKey=${this.getApiKey()}`,
+            method: 'POST',
+            body: `${store.getState().app.selectedAddress.arrrWallet.seed58}`
+        })
+
+        if (resPK != null && resPK.error != 1201) {
+            this.arrrPMK = ''
+            this.enableArrr = true
+            this.arrrPMK = resPK
+        } else {
+            this.arrrPMK = ''
+            this.enableArrr = false
+            this.shadowRoot.querySelector('#arrrWalletNotSynced').show()
+        }
+    }
+
     closeArrrWalletNotSynced() {
         this.shadowRoot.querySelector('#arrrWalletNotSynced').close()
     }
 
     closeNeedCoreUpdate() {
+        this.arrrPMK = ''
+        this.enableArrr = false
         this.shadowRoot.querySelector('#needCoreUpdate').close()
     }