fix: fix currentWallet and currentNetwork retrieving in unsafe contexts

LilaRest · Sep 2, 2022 · 7078cab · 7078cab
1 parent 3b02971
commit 7078cab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/components/provider/SelectNetworkDropdown.vue b/src/components/provider/SelectNetworkDropdown.vue
@@ -8,6 +8,10 @@ let availableNetworks = ref([])
 let isDropdownOpened = ref(false);
 
 dapp.onSafe(async function () {
+  availableNetworks.value = dapp.config.networks.getAvailable()
+})
+
+dapp.provider.onSafe(async function () {
   currentNetwork.value = await dapp.config.networks.getCurrent()
   availableNetworks.value = dapp.config.networks.getAvailable().filter(n => n.id !== currentNetwork.value.id);
 })

diff --git a/src/components/signer/SelectWalletDropdown.vue b/src/components/signer/SelectWalletDropdown.vue
@@ -7,8 +7,12 @@ let availableWallets = ref([])
 let isDropdownOpened = ref(false);
 
 dapp.onSafe(async function () {
+  availableWallets.value = dapp.config.wallets.getAvailable()
+})
+
+dapp.signer.onSafe(async function () {
   currentWallet.value = await dapp.config.wallets.getCurrent()
-  availableWallets.value = dapp.config.wallets.getAvailable().filter(w => w !== currentWallet.value);
+  availableWallets.value = dapp.config.wallets.getAvailable().filter(w => w.id !== currentWallet.value.id);
 })
 
 function toggle () {
@@ -22,7 +26,7 @@ function toggle () {
       <ul @click="toggle">
         <li v-if="currentWallet">
           <img width="40" :src="currentWallet.icon ? currentWallet.icon : dapp.config.defaults.wallets.icon" :alt="currentWallet.displayName + ' logo'"/>
-          <p>cur{{ currentWallet.displayName }}</p>
+          <p>{{ currentWallet.displayName }}</p>
         </li>
         <li v-else>
           <p>Select a wallet</p>