Skip to content

Commit fafbd47

Browse files
committed
fix(user cancel error): fix the error of cancel auth, and optimize DApp interactive experience
1 parent eb4d4ce commit fafbd47

File tree

3 files changed

+23
-20
lines changed

3 files changed

+23
-20
lines changed

example/basic-dapp/CNAME

Lines changed: 0 additions & 1 deletion
This file was deleted.

example/basic-dapp/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
合约调用示例
7878
</header>
7979
<form>
80-
<label>通过Conflux水龙头获取测试CFX</label>
80+
<label>通过Conflux水龙头获取测试CFX(每小时一次)</label>
8181
</form>
8282
<button id="get-cfx" disabled=
8383
"true">获取1k CFX

example/basic-dapp/index.js

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -533,27 +533,31 @@ async function walletInitialized() {
533533
provider.request({ method: 'anyweb_version' }).then((version) => {
534534
getElement('version').innerHTML = version
535535
})
536+
try {
537+
const [chainId, networkId, alreadyAuthedAddresses] = await Promise.all([
538+
provider.request({ method: 'cfx_chainId' }),
539+
provider.request({ method: 'cfx_netVersion' }),
540+
provider.request({
541+
method: 'cfx_accounts',
542+
}),
543+
])
536544

537-
const [chainId, networkId, alreadyAuthedAddresses] = await Promise.all([
538-
provider.request({ method: 'cfx_chainId' }),
539-
provider.request({ method: 'cfx_netVersion' }),
540-
provider.request({
541-
method: 'cfx_accounts',
542-
}),
543-
])
544-
545-
getElement('initialized').innerHTML = 'initialized'
546-
getElement('chainId').innerHTML = chainId
547-
getElement('networkId').innerHTML = networkId
545+
getElement('initialized').innerHTML = 'initialized'
546+
getElement('chainId').innerHTML = chainId
547+
getElement('networkId').innerHTML = networkId
548548

549-
if (
550-
!alreadyAuthedAddresses ||
551-
!alreadyAuthedAddresses.length ||
552-
alreadyAuthedAddresses.length === 0
553-
) {
549+
if (
550+
!alreadyAuthedAddresses ||
551+
!alreadyAuthedAddresses.length ||
552+
alreadyAuthedAddresses.length === 0
553+
) {
554+
unAuthed()
555+
} else {
556+
authed(alreadyAuthedAddresses[0])
557+
}
558+
} catch (e) {
554559
unAuthed()
555-
} else {
556-
authed(alreadyAuthedAddresses[0])
560+
console.error(e)
557561
}
558562

559563
connectButton.onclick = () => {

0 commit comments

Comments
 (0)