Skip to content

fix: chain boundary #5391

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

Merged
Jack-Works merged 4 commits into from
Jan 6, 2022
+13 −5
Merged

fix: chain boundary #5391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5780a52
fix: add recheck when switch chain
albert-0229 Jan 5, 2022
599eabf
Merge branch 'develop' into fix/chain-boundary
albert-0229 Jan 5, 2022
e04c67d
Merge branch 'develop' into fix/chain-boundary
albert-0229 Jan 6, 2022
369125b
fix: remove faild state ui
albert-0229 Jan 6, 2022
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
12 changes: 9 additions & 3 deletions packages/mask/src/extension/options-page/DashboardComponents/ActionButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import CheckIcon from '@mui/icons-material/Check'
import ErrorIcon from '@mui/icons-material/Error'
import { red, green } from '@mui/material/colors'
import classNames from 'classnames'
import { useDebounce, useAsyncFn } from 'react-use'
import { useDebounce, useAsyncFn, useUpdateEffect } from 'react-use'
import { useErrorStyles } from '../../../utils/theme'

const circle = <CircularProgress color="inherit" size={18} />
Expand Down Expand Up @@ -87,7 +87,7 @@ export interface ActionButtonPromiseProps extends ButtonProps {
completeOnClick?: 'use executor' | (() => void)
waiting: React.ReactChild
waitingOnClick?: () => ActionButtonPromiseState
failed: React.ReactChild
failed?: React.ReactChild
failedOnClick?: 'use executor' | (() => void)
completeIcon?: React.ReactNode
failIcon?: React.ReactNode
Expand Down Expand Up @@ -131,6 +131,11 @@ export function ActionButtonPromise(props: ActionButtonPromiseProps) {
}
const completeClick = completeOnClick === 'use executor' ? run : completeOnClick
const failClick = failedOnClick === 'use executor' ? run : failedOnClick

useUpdateEffect(() => {
setState((prev) => (prev === 'init' ? prev : 'init'))
}, [executor])

if (state === 'wait')
return <Button {...b} startIcon={circle} disabled={!waitingOnClick} children={waiting} onClick={cancel} />
if (state === 'complete')
Expand All @@ -144,7 +149,7 @@ export function ActionButtonPromise(props: ActionButtonPromiseProps) {
onClick={completeClick}
/>
)
if (state === 'fail')
if (state === 'fail' && failed)
return (
<Button
{...b}
Expand All @@ -167,6 +172,7 @@ const useStyles = makeStyles()({
},
failed: {
backgroundColor: red[500],
color: '#fff',
'&:hover': {
backgroundColor: red[700],
},
Expand Down
6 changes: 4 additions & 2 deletions packages/mask/src/web3/UI/EthereumChainBoundary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ export function EthereumChainBoundary(props: EthereumChainBoundaryProps) {
? Services.Ethereum.switchEthereumChain(expectedChainId, overrides)
: Services.Ethereum.addEthereumChain(chainDetailedCAIP, account, overrides),
])

// recheck
const chainIdHex = await Services.Ethereum.getChainId(overrides)
if (Number.parseInt(chainIdHex, 16) !== expectedChainId) throw new Error('Failed to switch chain.')
} catch {
throw new Error(`Make sure your wallet is on the ${resolveNetworkName(networkType)} network.`)
}
Expand Down Expand Up @@ -194,7 +198,6 @@ export function EthereumChainBoundary(props: EthereumChainBoundaryProps) {
complete={t('plugin_wallet_switch_network', {
network: expectedNetwork,
})}
failed={t('retry')}
executor={onSwitchChain}
completeOnClick={onSwitchChain}
failedOnClick="use executor"
Expand Down Expand Up @@ -235,7 +238,6 @@ export function EthereumChainBoundary(props: EthereumChainBoundaryProps) {
complete={t('plugin_wallet_switch_network', {
network: expectedNetwork,
})}
failed={t('retry')}
executor={onSwitchChain}
completeOnClick={onSwitchChain}
failedOnClick="use executor"
Expand Down