diff --git a/packages/dashboard/src/initialization/Dashboard.tsx b/packages/dashboard/src/initialization/Dashboard.tsx index 5715cdc26333..84236295ed53 100644 --- a/packages/dashboard/src/initialization/Dashboard.tsx +++ b/packages/dashboard/src/initialization/Dashboard.tsx @@ -60,8 +60,8 @@ export default function DashboardRoot() { + - diff --git a/packages/mask/src/components/shared/VerifyWallet/CurrentWalletBox.tsx b/packages/mask/src/components/shared/VerifyWallet/CurrentWalletBox.tsx index be797ea147ec..0b0b53a37120 100644 --- a/packages/mask/src/components/shared/VerifyWallet/CurrentWalletBox.tsx +++ b/packages/mask/src/components/shared/VerifyWallet/CurrentWalletBox.tsx @@ -1,10 +1,8 @@ -import { useCallback } from 'react' import { ExternalLink } from 'react-feather' import classNames from 'classnames' import { ProviderType } from '@masknet/web3-shared-evm' import { Button, Link, Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' -import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useAccount, useWeb3State, @@ -16,10 +14,7 @@ import { useWallet, } from '@masknet/plugin-infra/web3' import { FormattedAddress, WalletIcon } from '@masknet/shared' -import { WalletMessages } from '../../../plugins/Wallet/messages' import { useI18N } from '../../../utils' -import Services from '../../../extension/service' -import { ActionButtonPromise } from '../../../extension/options-page/DashboardComponents/ActionButton' const useStyles = makeStyles()((theme) => ({ currentAccount: { @@ -109,34 +104,6 @@ export function CurrentWalletBox(props: CurrentWalletBox) { const { value: domain } = useReverseAddress(account) - // #region change provider - const { openDialog: openSelectProviderDialog } = useRemoteControlledDialog( - WalletMessages.events.selectProviderDialogUpdated, - ) - // #endregion - - // #region walletconnect - const { setDialog: setWalletConnectDialog } = useRemoteControlledDialog( - WalletMessages.events.walletConnectQRCodeDialogUpdated, - ) - // #endregion - - const onDisconnect = useCallback(async () => { - switch (providerType) { - case ProviderType.WalletConnect: - setWalletConnectDialog({ - open: true, - uri: await Services.Ethereum.createConnectionURI(), - }) - break - case ProviderType.Fortmatic: - await Services.Ethereum.disconnectFortmatic(chainId) - break - } - }, [chainId, providerType, setWalletConnectDialog]) - - const onChange = props.changeWallet - return account ? (
{!props.disableChange && (
- {providerType === ProviderType.WalletConnect || providerType === ProviderType.Fortmatic ? ( - } - failIcon={<>} - /> - ) : null}
@@ -207,7 +160,11 @@ export function CurrentWalletBox(props: CurrentWalletBox) {
) : (
-
diff --git a/packages/mask/src/components/shared/WalletStatusBox.tsx b/packages/mask/src/components/shared/WalletStatusBox.tsx index f75f919884b7..cdb3d9f92c4e 100644 --- a/packages/mask/src/components/shared/WalletStatusBox.tsx +++ b/packages/mask/src/components/shared/WalletStatusBox.tsx @@ -1,4 +1,3 @@ -import { useCallback } from 'react' import { useCopyToClipboard } from 'react-use' import { Copy, ExternalLink } from 'react-feather' import classNames from 'classnames' @@ -20,8 +19,6 @@ import { import { FormattedAddress, useSnackbarCallback, WalletIcon } from '@masknet/shared' import { WalletMessages } from '../../plugins/Wallet/messages' import { useI18N } from '../../utils' -import Services from '../../extension/service' -import { ActionButtonPromise } from '../../extension/options-page/DashboardComponents/ActionButton' const useStyles = makeStyles<{ isDashboard: boolean }>()((theme, { isDashboard }) => ({ content: { @@ -130,26 +127,6 @@ export function WalletStatusBox(props: WalletStatusBox) { ) // #endregion - // #region walletconnect - const { setDialog: setWalletConnectDialog } = useRemoteControlledDialog( - WalletMessages.events.walletConnectQRCodeDialogUpdated, - ) - // #endregion - - const onDisconnect = useCallback(async () => { - switch (providerType) { - case ProviderType.WalletConnect: - setWalletConnectDialog({ - open: true, - uri: await Services.Ethereum.createConnectionURI(), - }) - break - case ProviderType.Fortmatic: - await Services.Ethereum.disconnectFortmatic(chainId) - break - } - }, [chainId, providerType, setWalletConnectDialog]) - return account ? (
{!props.disableChange && (
- {providerType === ProviderType.WalletConnect || providerType === ProviderType.Fortmatic ? ( - } - failIcon={<>} - /> - ) : null}