diff --git a/packages/mask/shared-ui/locales/en-US.json b/packages/mask/shared-ui/locales/en-US.json index c35ca86aaa17..3f585d0d09c6 100644 --- a/packages/mask/shared-ui/locales/en-US.json +++ b/packages/mask/shared-ui/locales/en-US.json @@ -927,6 +927,10 @@ "wallet_verify_persona_sign_intro": "Sign seamlessly with Persona, ensure the validity of data.", "waller_verify_wallet_sign_intro": "After two steps, you will own, view, utilize all your cyber identities through Next.ID. You can also disconnect them easily.", "popups_add_wallet": "Add Wallet", + "popups_verify_persona_sign_success": "Persona signed successfully", + "popups_verify_persona_sign_failed": "Persona signed failed", + "popups_verify_wallet_sign_success": "Wallet signed successfully", + "popups_verify_wallet_sign_failed": "Wallet signed failed", "popups_profile_photo": "Profile Photo", "popups_public_key": "Public Key", "popups_create_persona": "Create Persona", diff --git a/packages/mask/src/components/shared/VerifyWallet/Steps.tsx b/packages/mask/src/components/shared/VerifyWallet/Steps.tsx index 931a308a5c55..b407d054dea6 100644 --- a/packages/mask/src/components/shared/VerifyWallet/Steps.tsx +++ b/packages/mask/src/components/shared/VerifyWallet/Steps.tsx @@ -67,9 +67,17 @@ const useStyles = makeStyles()((theme) => ({ display: 'flex', alignItems: 'center', }, + roundBtn: { borderRadius: 99, }, + cancelBtn: { + padding: '8px 22px', + borderRadius: 99, + border: '1px solid #EBEEF0', + color: '#1C68F3', + fontSize: 14, + }, disableBtn: { pointerEvents: 'none', opacity: 0.5, @@ -189,7 +197,7 @@ export function Steps(props: StepsProps) {
{ currentPersona.identifier, payload.signPayload, ) + showSnackbar(t('popups_verify_persona_sign_success'), { variant: 'success' }) return signResult.signature.signature } catch (error) { + showSnackbar(t('popups_verify_persona_sign_failed'), { variant: 'error' }) console.error(error) return } @@ -113,11 +115,12 @@ const VerifyWallet = memo(() => { signature, }, ) + showSnackbar(t('popups_verify_wallet_sign_success'), { variant: 'success' }) setSigned(true) refreshProofs() return true } catch (error) { - console.error(error) + showSnackbar(t('popups_verify_wallet_sign_failed'), { variant: 'error' }) return false } }, [currentPersona?.identifier.publicKeyAsHex, payload, wallet, signature]) @@ -130,19 +133,17 @@ const VerifyWallet = memo(() => { try { if (signed) Services.Helper.removePopupWindow() - // first Step if (!signature && !walletSignState) { await personaSilentSign() return SignSteps.FirstStepDone } else if (signature && !walletSignState) { - await walletSign() - return SignSteps.SecondStepDone + const walletSignRes = await walletSign() + return walletSignRes ? SignSteps.SecondStepDone : SignSteps.FirstStepDone } else { await Services.Helper.removePopupWindow() return } } catch { - // err step showSnackbar('Connect error', { variant: 'error' }) return SignSteps.Ready }