From ef3599e9cabe8b5db0fe6382fc12059b3d5a7a2e Mon Sep 17 00:00:00 2001
From: liangping <18786721@qq.com>
Date: Sat, 20 May 2023 16:04:54 +0800
Subject: [PATCH] fix events

---
 src/layouts/components/ChainProfile.vue  | 5 -----
 src/layouts/components/DefaultLayout.vue | 2 +-
 src/modules/[chain]/index.vue            | 2 +-
 src/modules/[chain]/widget/index.vue     | 2 +-
 src/stores/useTxDialog.ts                | 2 ++
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/layouts/components/ChainProfile.vue b/src/layouts/components/ChainProfile.vue
index 617b3bdd..b5eb4806 100644
--- a/src/layouts/components/ChainProfile.vue
+++ b/src/layouts/components/ChainProfile.vue
@@ -3,11 +3,6 @@ import { useBlockchain, useBaseStore } from '@/stores';
 const chainStore = useBlockchain();
 const baseStore = useBaseStore();
 chainStore.initial();
-chainStore.$subscribe((m, s) => {
-  if (!Array.isArray(m.events) && m.events.key === 'endpoint') {
-    // chainStore.initial();
-  }
-});
 </script>
 
 <template>
diff --git a/src/layouts/components/DefaultLayout.vue b/src/layouts/components/DefaultLayout.vue
index 9e2c4572..b9e5e9b0 100644
--- a/src/layouts/components/DefaultLayout.vue
+++ b/src/layouts/components/DefaultLayout.vue
@@ -22,7 +22,7 @@ dashboard.initial();
 const blockchain = useBlockchain();
 // blockchain.initial()
 blockchain.$subscribe((m, s) => {
-  if (!Array.isArray(m.events) && m.events.key === 'chainName') {
+  if (!Array.isArray(m.events) && m.events && m.events.key === 'chainName') {
     blockchain.initial();
   }
 });
diff --git a/src/modules/[chain]/index.vue b/src/modules/[chain]/index.vue
index 35ba6f03..820d71ff 100644
--- a/src/modules/[chain]/index.vue
+++ b/src/modules/[chain]/index.vue
@@ -44,7 +44,7 @@ const ticker = computed(() => store.coinInfo.tickers[store.tickerIndex]);
 blockchain.$subscribe((m, s) => {
   if (
     !Array.isArray(m.events) &&
-    ['chainName', 'endpoint'].includes(m.events.key)
+    ['chainName', 'endpoint'].includes(m.events?.key || "")
   ) {
     store.loadDashboard();
     walletStore.loadMyAsset();
diff --git a/src/modules/[chain]/widget/index.vue b/src/modules/[chain]/widget/index.vue
index 6ee96c20..41557b84 100644
--- a/src/modules/[chain]/widget/index.vue
+++ b/src/modules/[chain]/widget/index.vue
@@ -11,7 +11,7 @@ const baseStore = useBaseStore()
 const endpoint = ref(chainStore.current?.endpoints?.rest?.at(0)?.address)
 
 const chainId = computed(() => baseStore.latest?.block?.header?.chain_id || "")
-const chainName = computed(() => chainStore?.chainName || "")
+const chainName = computed(() => chainStore?.current?.prettyName || "")
 const hdPath = computed(() => {
     return `m/44'/${ chainStore.current?.coinType }/0'/0/0`
 })
diff --git a/src/stores/useTxDialog.ts b/src/stores/useTxDialog.ts
index 08d413ec..45ef355f 100644
--- a/src/stores/useTxDialog.ts
+++ b/src/stores/useTxDialog.ts
@@ -34,6 +34,8 @@ export const useTxDialog = defineStore('txDialogStore', {
         this.sender = this.walletAddress;
         this.endpoint = this.currentEndpoint || "";
         this.params = JSON.stringify(param)
+
+        // console.log("dialog:", this.$state)
     }
   },
 });