Skip to content
This repository has been archived by the owner on Sep 27, 2023. It is now read-only.

fix: walletconnect #145

Merged
merged 2 commits into from Mar 18, 2021
Merged

fix: walletconnect #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
550cad3
fix: walletconnect
paouvrard Mar 16, 2021
57c9cea
fix: disconnect on walletconnect session end
paouvrard Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/js/authEthereum.js
View file
Open in desktop
Expand Up @@ -37,18 +37,29 @@ async function login () {
const provider = await window.web3Modal.connect()
setEthProvider(provider)

if (provider.isMetaMask) {
window.ethUserAddress = provider.selectedAddress
window.connectedEthNetwork = chainIdToEthNetwork[parseInt(provider.chainId)]
} else {
window.ethUserAddress = provider.accounts[0]
window.connectedEthNetwork = chainIdToEthNetwork[provider.chainId]
}
provider.on('accountsChanged', (accounts) => {
window.ethUserAddress = accounts[0]
render()
})
provider.on('chainChanged', (chainId) => {
window.connectedEthNetwork = chainIdToEthNetwork[chainId]
window.connectedEthNetwork = chainIdToEthNetwork[parseInt(chainId)]
window.isValidEthNetwork = window.connectedEthNetwork === process.env.ethNetworkId
render()
})
provider.on('disconnect', (code, reason) => {
console.log(code, reason)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove this console.log?

setTimeout(() => window.location.reload())
window.web3Modal.clearCachedProvider()
render()
})

window.ethUserAddress = provider.selectedAddress
window.connectedEthNetwork = chainIdToEthNetwork[provider.chainId]
window.isValidEthNetwork = window.connectedEthNetwork === process.env.ethNetworkId
window.ethInitialized = true

Expand Down
6 changes: 3 additions & 3 deletions src/js/utils.js
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ export async function getFeaturedErc20s () {
}

export const chainIdToEthNetwork = {
'0x1': 'main',
'0x3': 'ropsten',
'0x4': 'rinkeby'
1: 'main',
3: 'ropsten',
4: 'rinkeby'
}