From b33981afe3cc981d9015aff9aaaa8ed0341b0cc8 Mon Sep 17 00:00:00 2001 From: Lantt Date: Wed, 2 Mar 2022 17:29:56 +0800 Subject: [PATCH 1/4] fix: should not set setup status when use another persona connect --- packages/mask/src/components/DataSource/useNextID.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/mask/src/components/DataSource/useNextID.ts b/packages/mask/src/components/DataSource/useNextID.ts index cc57b68e16ac..f4fe8706a8e0 100644 --- a/packages/mask/src/components/DataSource/useNextID.ts +++ b/packages/mask/src/components/DataSource/useNextID.ts @@ -46,6 +46,7 @@ export function useNextIDConnectStatus() { ) const { value: isVerified = false } = useAsync(async () => { + if (lastState.status === SetupGuideStep.FindUsername) return true if (isOpenedVerifyDialog) return true if (!enableNextID || !username || !personaConnectStatus.connected) return true @@ -65,6 +66,7 @@ export function useNextIDConnectStatus() { status: SetupGuideStep.VerifyOnNextID, persona: currentPersona?.identifier.toText(), }) + isOpenedVerifyDialog = true return false }, [username, enableNextID, lastStateRef.value]) From 5bdb27c73271e459f90f68361bc579187954dc3a Mon Sep 17 00:00:00 2001 From: Lantt Date: Wed, 2 Mar 2022 17:50:27 +0800 Subject: [PATCH 2/4] fix: pass correct persona identifier --- packages/mask/src/components/InjectedComponents/SetupGuide.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mask/src/components/InjectedComponents/SetupGuide.tsx b/packages/mask/src/components/InjectedComponents/SetupGuide.tsx index 8af270978eff..25d9bd03e074 100644 --- a/packages/mask/src/components/InjectedComponents/SetupGuide.tsx +++ b/packages/mask/src/components/InjectedComponents/SetupGuide.tsx @@ -128,7 +128,7 @@ function SetupGuideUI(props: SetupGuideUIProps) { const signResult = await Services.Identity.signWithPersona({ method: 'eth', message: payload.signPayload, - identifier: persona_.publicHexKey, + identifier: persona_.identifier.toText(), }) if (!signResult) throw new Error('Failed to sign by persona.') const signature = signResult.signature.signature From 3bc67ff0c074933d73e3b7cf8d89274ebb3ad218 Mon Sep 17 00:00:00 2001 From: Lantt Date: Tue, 8 Mar 2022 10:26:51 +0800 Subject: [PATCH 3/4] fix: typo --- packages/mask/shared-ui/locales/en-US.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mask/shared-ui/locales/en-US.json b/packages/mask/shared-ui/locales/en-US.json index 3064c07e26be..9ca35d33f7a1 100644 --- a/packages/mask/shared-ui/locales/en-US.json +++ b/packages/mask/shared-ui/locales/en-US.json @@ -90,7 +90,7 @@ "setup_guide_verifying": "Verfiying", "setup_guide_verifying_failed": "Re-Verfiy", "user_guide_tip_connected": "You have connected to this account successfully.", - "user_guide_tip_need_verify_on_next_id": "Mask Network requires you to post an verification tweet to access Next.ID-based products.", + "user_guide_tip_need_verify_on_next_id": "Mask Network requires you to post a verification tweet to access Next.ID-based products.", "setup_guide_say_hello_content": "Hello Mask world. This is my first encrypted message. Install https://mask.io to send me encrypted post. ", "setup_guide_say_hello_follow": "Follow {{account}} to explore Web 3.0.", "setup_guide_pin_tip": "Don't forget to pin Mask Network in your browser toolbar to access web 3.0 easily.", From 50c31ee1f9e3d088f8d6123e38556b79a389b381 Mon Sep 17 00:00:00 2001 From: Lantt Date: Fri, 4 Mar 2022 12:28:37 +0800 Subject: [PATCH 4/4] fix: typo --- packages/mask/src/plugins/NextID/locales/en-US.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/NextID/locales/en-US.json b/packages/mask/src/plugins/NextID/locales/en-US.json index ab8fe62b7871..c027234ab216 100644 --- a/packages/mask/src/plugins/NextID/locales/en-US.json +++ b/packages/mask/src/plugins/NextID/locales/en-US.json @@ -8,7 +8,7 @@ "verify_wallet_button": "Verify Your Wallet", "add_wallet_button": "Add A Wallet", "verify_wallet_dialog_title": "Verify your wallet", - "bind_wallet_bound_error": "This wallet address has already connected.", + "bind_wallet_bound_error": "This wallet address has already been connected.", "unbind_wallet_same_account_error": "Please switch to the address that you want to disconnect.", "unbind_dialog_title": "Disconnect wallet", "persona_sign": "Persona Sign",