Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(unlock-app): fix network switch #14064

Merged
merged 5 commits into from
Jun 18, 2024
Merged

fix(unlock-app): fix network switch #14064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f81241c
fix network switch
clemsos Jun 18, 2024
ed08673
remove unwanted console log
clemsos Jun 18, 2024
9469420
cross-chain parse gas values properly
clemsos Jun 18, 2024
312cbd0
recreate provider proplery
clemsos Jun 18, 2024
4b9309b
cross chain: delete unwanted gas values
clemsos Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions unlock-app/src/components/interface/checkout/main/Confirm/ConfirmCrossChainPurchase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,12 @@ export function ConfirmCrossChainPurchase({
}
}
setButtonLabel(`Purchasing...`)

// delete unwanted gas values
delete route.tx.gasLimit
delete route.tx.maxFeePerGas
delete route.tx.maxPriorityFeePerGas

const tx = await walletService.signer.sendTransaction(route.tx)
onConfirmed(lockAddress, route.network, tx.hash)
} catch (error: any) {
Expand Down
4 changes: 2 additions & 2 deletions unlock-app/src/hooks/useProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export const useProvider = (config: any) => {
)) as unknown as ethers.BrowserProvider
} else {
await switchBrowserProviderNetwork(networkId)
walletServiceProvider = new ethers.BrowserProvider(pr.provider, 'any')
walletServiceProvider = new ethers.BrowserProvider(window.ethereum!)
Copy link
Member

Choose a reason for hiding this comment

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

Are you sure this works with wallet connect or Coinbase wallet?

Copy link
Member Author

@clemsos clemsos Jun 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

for coinbase that approach should work https://docs.cdp.coinbase.com/wallet-sdk/docs/injected-provider/

but fails with WalletConnect indeed

}
}
return walletServiceProvider
Expand Down Expand Up @@ -182,7 +182,7 @@ export const useProvider = (config: any) => {
})

provider.on('chainChanged', async () => {
await resetProvider(new ethers.BrowserProvider(provider))
await resetProvider(new ethers.BrowserProvider(window.ethereum!))
})
}
auth = await resetProvider(ethersProvider)
Expand Down
1 change: 0 additions & 1 deletion unlock-app/src/utils/theBox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ export const getCrossChainRoute = async ({
],
},
}
console.log(actionRequest)

const query = JSON.stringify({
...actionRequest,
Expand Down
Loading