Skip to content

Commit 91fcd36

Browse files
committed
fix: get rid of NoWalletConnectedError
1 parent 906ffbe commit 91fcd36

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

src/utils/aeternity/wallet.js

+15-7
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,22 @@ const scanForWallets = async () => {
7777
});
7878

7979
walletInfo.value = await aeSdk.value.connectToWallet(foundWallet.getConnection())
80+
status.value = 'asking_account_access'
8081
await aeSdk.value.subscribeAddress('subscribe', 'current')
81-
await connectToNode(walletInfo.value.networkId)
82+
await fetchAccountInfo()
83+
}
84+
85+
const isSupportedNetwork = () => {
86+
const { networkId, status } = toRefs(state)
87+
const res = networkId.value === process.env.VUE_APP_NETWORK_ID
88+
if (!res) {
89+
status.value = `failed: Connected to wrong network. Please switch to ${process.env.VUE_APP_NETWORK_NAME} in your wallet.`
90+
}
91+
return res
8292
}
8393

8494
const fetchAccountInfo = async () => {
95+
if (!isSupportedNetwork()) return;
8596
const { balance, status } = toRefs(state)
8697
status.value = 'fetching_info'
8798
balance.value = await state.aeSdk.getBalance(state.aeSdk.address, {
@@ -91,12 +102,9 @@ const fetchAccountInfo = async () => {
91102
}
92103

93104
const connectToNode = async (selectedNetworkId) => {
94-
const { networkId, status, aeSdk } = toRefs(state)
95-
if (selectedNetworkId !== process.env.VUE_APP_NETWORK_ID) {
96-
status.value = `failed: Connected to wrong network. Please switch to ${process.env.VUE_APP_NETWORK_NAME} in your wallet.`
97-
return
98-
}
105+
const { networkId, aeSdk } = toRefs(state)
99106
networkId.value = selectedNetworkId
107+
if (!isSupportedNetwork()) return
100108
aeSdk.value.selectNode(selectedNetworkId)
101-
await fetchAccountInfo()
109+
if (aeSdk.value.addresses().length) await fetchAccountInfo()
102110
}

0 commit comments

Comments
 (0)