From 647ad91e2d8f1bd6eb33a25fbf15d74f711e1621 Mon Sep 17 00:00:00 2001 From: billy Date: Mon, 25 Apr 2022 14:56:53 +0800 Subject: [PATCH 1/5] fix: connect wallet show solana flow --- .../plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx index e2dab72d2ff7..c55166e43d31 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx @@ -35,14 +35,14 @@ export interface SelectProviderDialogProps {} export function SelectProviderDialog(props: SelectProviderDialogProps) { const { t } = useI18N() const { classes } = useStyles() - const [underPluginID, setUnderPluginID] = useState() + const [underPluginID, setUnderPluginID] = useState() // #region remote controlled dialog logic // #endregion const { open, closeDialog } = useRemoteControlledDialog( WalletMessages.events.selectProviderDialogUpdated, (ev?) => { if (!ev?.open) return - setUnderPluginID(ev?.pluginID ?? NetworkPluginID.PLUGIN_EVM) + setUnderPluginID(ev?.pluginID) }, ) // #region native app From 9ca3b5c40006707a3e5a0bdf481f3cc5a063b204 Mon Sep 17 00:00:00 2001 From: billy Date: Mon, 25 Apr 2022 15:28:57 +0800 Subject: [PATCH 2/5] fix: fix --- .../components/shared/VerifyWallet/Steps.tsx | 12 +----------- .../pages/Personas/VerifyWallet/index.tsx | 1 + .../Tips/SNSAdaptor/TipsEntranceDialog.tsx | 18 ++++++++++-------- .../Tips/SNSAdaptor/bodyViews/Wallets.tsx | 2 +- .../SNSAdaptor/components/DisconnectDialog.tsx | 2 +- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/packages/mask/src/components/shared/VerifyWallet/Steps.tsx b/packages/mask/src/components/shared/VerifyWallet/Steps.tsx index 3d2ffb0db91e..eca3dae53f21 100644 --- a/packages/mask/src/components/shared/VerifyWallet/Steps.tsx +++ b/packages/mask/src/components/shared/VerifyWallet/Steps.tsx @@ -11,7 +11,6 @@ import { } from './constants' import { ImageIcon } from '@masknet/shared' import { Button, Typography } from '@mui/material' -import { useNavigate } from 'react-router-dom' import classNames from 'classnames' import { useEffect } from 'react' import { useI18N } from '../../../utils' @@ -109,7 +108,6 @@ interface StepsProps { export function Steps(props: StepsProps) { const { t } = useI18N() const { classes } = useStyles() - const navigate = useNavigate() const { changeWallet, nickname, @@ -151,14 +149,6 @@ export function Steps(props: StepsProps) { } }, [disableConfirm]) - const onCancel = () => { - if (notInPop && onCustomCancel !== undefined) { - onCustomCancel() - return - } - navigate(-1) - } - return (
@@ -204,7 +194,7 @@ export function Steps(props: StepsProps) { size="large" fullWidth color="primary" - onClick={onCancel}> + onClick={onCustomCancel}> {t('cancel')} { changeWallet={changeWallet} onConfirm={handleConfirm} confirmLoading={confirmLoading} + onCustomCancel={() => navigate(-1)} />
) diff --git a/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx b/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx index 5ff2f176e802..56992fa688f8 100644 --- a/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx +++ b/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx @@ -176,7 +176,7 @@ export function TipsEntranceDialog({ open, onClose }: TipsEntranceDialogProps) { ) if (!signResult) throw new Error('sign error') await setKvPatchData(payload.val, signResult.signature.signature, rawPatchData) - showSnackbar('Persona signed successfully.', { + showSnackbar(t('plugin_tips_persona_sign_success'), { variant: 'success', message: nowTime, }) @@ -184,7 +184,7 @@ export function TipsEntranceDialog({ open, onClose }: TipsEntranceDialogProps) { retryKv() return true } catch (error) { - showSnackbar('Persona Signature failed.', { + showSnackbar(t('plugin_tips_persona_sign_error'), { variant: 'error', message: nowTime, }) @@ -239,18 +239,20 @@ export function TipsEntranceDialog({ open, onClose }: TipsEntranceDialogProps) { result.createdAt, { signature: signature.signature.signature }, ) - retryProof() - retryKv() - return true + showSnackbar(t('plugin_tips_persona_sign_success'), { + variant: 'success', + message: nowTime, + }) } catch (error) { - showSnackbar('Persona Signature failed.', { + showSnackbar(t('plugin_tips_persona_sign_error'), { variant: 'error', message: nowTime, }) - return false + } finally { + retryProof() } }, - [currentPersona], + [currentPersona, proofRes], ) return ( diff --git a/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Wallets.tsx b/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Wallets.tsx index 5eda05aada19..9dd443befd1b 100644 --- a/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Wallets.tsx +++ b/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Wallets.tsx @@ -26,7 +26,7 @@ const useStyles = makeStyles()((theme) => ({ interface WalletsPageProp { wallets: BindingProof[] releaseLoading: boolean - onRelease: (wallet?: BindingProof) => Promise + onRelease: (wallet?: BindingProof) => Promise personaName: string | undefined } diff --git a/packages/mask/src/plugins/Tips/SNSAdaptor/components/DisconnectDialog.tsx b/packages/mask/src/plugins/Tips/SNSAdaptor/components/DisconnectDialog.tsx index 0810d03315de..7da9500f0c77 100644 --- a/packages/mask/src/plugins/Tips/SNSAdaptor/components/DisconnectDialog.tsx +++ b/packages/mask/src/plugins/Tips/SNSAdaptor/components/DisconnectDialog.tsx @@ -71,7 +71,7 @@ const useStyles = makeStyles()((theme) => ({ export interface DisconnectWalletDialogProps extends DialogProps { confirmLoading: boolean - onConfirmDisconnect: () => Promise + onConfirmDisconnect: () => Promise address?: string onClose: () => void personaName: string | undefined From 9537bf523a4460c33a50fc1724fc176827ea690d Mon Sep 17 00:00:00 2001 From: billy Date: Mon, 25 Apr 2022 19:09:10 +0800 Subject: [PATCH 3/5] fix: wont disable && kv prod base url --- .../Tips/SNSAdaptor/TipsEntranceDialog.tsx | 7 +------ packages/mask/src/plugins/Tips/base.ts | 17 ----------------- packages/web3-providers/src/NextID/constants.ts | 2 +- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx b/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx index 56992fa688f8..d953daf38cd4 100644 --- a/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx +++ b/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx @@ -1,5 +1,3 @@ -import { PluginId } from '@masknet/plugin-infra' -import { useActivatedPlugin } from '@masknet/plugin-infra/content-script' import { NetworkPluginID } from '@masknet/plugin-infra/web3' import { WalletMessages } from '@masknet/plugin-wallet' import { InjectedDialog, LoadingAnimation } from '@masknet/shared' @@ -102,10 +100,7 @@ export function TipsEntranceDialog({ open, onClose }: TipsEntranceDialogProps) { const [hasChanged, setHasChanged] = useState(false) const [rawPatchData, setRawPatchData] = useState([]) const [rawWalletList, setRawWalletList] = useState([]) - const plugin = useActivatedPlugin(PluginId.Tips, 'any') - const supportedNetworks = useSupportedNetworks( - Object.keys(plugin?.enableRequirement.web3 ?? {}) as NetworkPluginID[], - ) + const supportedNetworks = useSupportedNetworks([NetworkPluginID.PLUGIN_EVM]) const { showSnackbar } = useCustomSnackbar() const account = useAccount() diff --git a/packages/mask/src/plugins/Tips/base.ts b/packages/mask/src/plugins/Tips/base.ts index c055f214de2a..b8acc7702403 100644 --- a/packages/mask/src/plugins/Tips/base.ts +++ b/packages/mask/src/plugins/Tips/base.ts @@ -1,6 +1,4 @@ import { Plugin, PluginId } from '@masknet/plugin-infra' -import { NetworkPluginID } from '@masknet/plugin-infra/web3' -import { ChainId } from '@masknet/web3-shared-evm' import { languages } from './locales/languages' export const base: Plugin.Shared.Definition = { @@ -17,21 +15,6 @@ export const base: Plugin.Shared.Definition = { networks: {}, }, target: 'stable', - web3: { - [NetworkPluginID.PLUGIN_EVM]: { - supportedChainIds: [ - ChainId.Mainnet, - ChainId.BSC, - ChainId.Matic, - ChainId.Arbitrum, - ChainId.xDai, - ChainId.Fantom, - ChainId.Avalanche, - ChainId.Aurora, - ChainId.Conflux, - ], - }, - }, }, i18n: languages, } diff --git a/packages/web3-providers/src/NextID/constants.ts b/packages/web3-providers/src/NextID/constants.ts index ccaf51f87774..ce365d697888 100644 --- a/packages/web3-providers/src/NextID/constants.ts +++ b/packages/web3-providers/src/NextID/constants.ts @@ -1,5 +1,5 @@ export const MASK_STORAGE_KEY = 'com.mask.plugin' export const KV_BASE_URL_DEV = 'https://kv-service.nextnext.id' -export const KV_BASE_URL_PROD = '' +export const KV_BASE_URL_PROD = 'https://kv-service.next.id' export const PROOF_BASE_URL_DEV = 'https://proof-service.nextnext.id/' export const PROOF_BASE_URL_PROD = 'https://proof-service.next.id/' From 22454cab80116a3f40e61a1cbb61c16696fdbb06 Mon Sep 17 00:00:00 2001 From: billy Date: Mon, 25 Apr 2022 19:16:19 +0800 Subject: [PATCH 4/5] fix: types --- packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Setting.tsx | 2 +- packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Wallets.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Setting.tsx b/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Setting.tsx index 6ecc016cdc5a..4d34e01a91fb 100644 --- a/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Setting.tsx +++ b/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Setting.tsx @@ -28,7 +28,7 @@ const useStyles = makeStyles()((theme) => ({ interface SettingPageProp { wallets: BindingProof[] - onSwitchChange: (idx: number, v: boolean) => void + onSwitchChange(idx: number, v: boolean): void } const SettingPage = memo(({ wallets, onSwitchChange }: SettingPageProp) => { diff --git a/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Wallets.tsx b/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Wallets.tsx index 9dd443befd1b..06a21b043dfd 100644 --- a/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Wallets.tsx +++ b/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/Wallets.tsx @@ -26,7 +26,7 @@ const useStyles = makeStyles()((theme) => ({ interface WalletsPageProp { wallets: BindingProof[] releaseLoading: boolean - onRelease: (wallet?: BindingProof) => Promise + onRelease(wallet?: BindingProof): Promise personaName: string | undefined } From 289119244bca60e9fb802dce5610bdbc5c9af18b Mon Sep 17 00:00:00 2001 From: billy Date: Tue, 26 Apr 2022 02:14:39 +0800 Subject: [PATCH 5/5] fix: clean --- packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx b/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx index d953daf38cd4..2fe304b0bbdd 100644 --- a/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx +++ b/packages/mask/src/plugins/Tips/SNSAdaptor/TipsEntranceDialog.tsx @@ -175,7 +175,6 @@ export function TipsEntranceDialog({ open, onClose }: TipsEntranceDialogProps) { variant: 'success', message: nowTime, }) - retryProof() retryKv() return true } catch (error) {