From 94ba4b1668beb80f55f5504966adb530f6b4b805 Mon Sep 17 00:00:00 2001
From: liangping <18786721@qq.com>
Date: Sun, 21 May 2023 19:07:30 +0800
Subject: [PATCH] fix connect wallet issue

---
 src/layouts/components/NavBarWallet.vue | 14 ++++++--------
 src/stores/useBaseStore.ts              |  3 +++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/layouts/components/NavBarWallet.vue b/src/layouts/components/NavBarWallet.vue
index 77681027..26ef2b2d 100644
--- a/src/layouts/components/NavBarWallet.vue
+++ b/src/layouts/components/NavBarWallet.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
-import { useWalletStore } from '@/stores';
+import { useBaseStore, useBlockchain, useWalletStore } from '@/stores';
 import type { Icon } from '@iconify/vue';
 import { ref, computed } from 'vue';
 const walletStore = useWalletStore();
+const chainStore = useBlockchain();
+const baseStore = useBaseStore()
 // walletStore.$subscribe((m, s) => {
 //   console.log(m, s);
 // });
@@ -30,11 +32,7 @@ const tipMsg = computed(() => {
     : { class: 'success', msg: 'Copy Success!' };
 });
 
-const addressChange = computed(() => {
-  return walletStore?.currentAddress || walletStore?.walletIsConnected
-    ? true
-    : false;
-});
+
 </script>
 
 <template>
@@ -104,8 +102,8 @@ const addressChange = computed(() => {
   <div class="footer-modal">
     <Teleport to="body">
       <ping-connect-wallet
-        :chain-id="'juno-1'"
-        :hd-path="`m/44'/118/0'/0/0`"
+        :chain-id="baseStore.currentChainId"
+        :hd-path="chainStore.defaultHDPath"
         @connect="walletStateChange"
       />
     </Teleport>
diff --git a/src/stores/useBaseStore.ts b/src/stores/useBaseStore.ts
index 46f51134..ca5edd22 100644
--- a/src/stores/useBaseStore.ts
+++ b/src/stores/useBaseStore.ts
@@ -32,6 +32,9 @@ export const useBaseStore = defineStore('baseStore', {
     blockchain() {
       return useBlockchain();
     },
+    currentChainId(): string {
+      return this.latest.block?.header.chain_id || ""
+    },
     txsInRecents() {
       const txs = [] as { height: string; hash: string; tx: DecodedTxRaw }[];
       this.recents.forEach((b) =>