Merge pull request #263 from chain4travel/header-address

Fix Address Display Bug When Switching to Imported Key
chain4travel · Oct 22, 2024 · 557e5e7 · 557e5e7
2 parents 346cd83 + e2ff931
commit 557e5e7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/redux/slices/app-config.ts b/src/redux/slices/app-config.ts
@@ -50,10 +50,14 @@ const appConfigSlice = createSlice({
             state.walletStore = payload
         },
         updatePchainAddress(state, { payload }) {
-            state.pChainAddress = payload.address[0]
+            const Address = store.getters.addresses[0].replace('X-', 'P-')
+            const activeAddress = payload.address.find((adr: string) => adr === Address) || null
+
+            state.pChainAddress = activeAddress
             state.walletName =
-                payload.walletName !== 'Singleton Wallet' ? payload.walletName : payload.address[0]
+                payload.walletName !== 'Singleton Wallet' ? payload.walletName : activeAddress
         },
+
         updateAccount(state, { payload }) {
             state.account = payload
         },