From 8488ecee1ee671274d2eade7deda50b741187991 Mon Sep 17 00:00:00 2001
From: billy <Billy@mask.io>
Date: Fri, 13 May 2022 15:48:13 +0800
Subject: [PATCH 1/3] fix: status snackbar

---
 packages/mask/shared-ui/locales/en-US.json            |  4 ++++
 .../popups/pages/Personas/VerifyWallet/index.tsx      | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

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/extension/popups/pages/Personas/VerifyWallet/index.tsx b/packages/mask/src/extension/popups/pages/Personas/VerifyWallet/index.tsx
index c54ea6a81f83..2f5e9163bf6d 100644
--- a/packages/mask/src/extension/popups/pages/Personas/VerifyWallet/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Personas/VerifyWallet/index.tsx
@@ -78,8 +78,10 @@ const VerifyWallet = memo(() => {
                 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
         }

From de06f3045aa10b6661947db686b528b991087260 Mon Sep 17 00:00:00 2001
From: billy <Billy@mask.io>
Date: Fri, 13 May 2022 16:44:38 +0800
Subject: [PATCH 2/3] fix: cancel btn ui

---
 packages/mask/src/components/shared/VerifyWallet/Steps.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/mask/src/components/shared/VerifyWallet/Steps.tsx b/packages/mask/src/components/shared/VerifyWallet/Steps.tsx
index 931a308a5c55..51aa1fa57069 100644
--- a/packages/mask/src/components/shared/VerifyWallet/Steps.tsx
+++ b/packages/mask/src/components/shared/VerifyWallet/Steps.tsx
@@ -67,6 +67,7 @@ const useStyles = makeStyles()((theme) => ({
         display: 'flex',
         alignItems: 'center',
     },
+
     roundBtn: {
         borderRadius: 99,
     },
@@ -190,7 +191,7 @@ export function Steps(props: StepsProps) {
             <div className={classes.actionBox}>
                 <ActionButton
                     className={notInPop ? '' : classes.roundBtn}
-                    variant="roundedFlat"
+                    variant={notInPop ? 'roundedFlat' : 'outlined'}
                     fullWidth
                     color="secondary"
                     onClick={onCustomCancel}>

From 7023af4a22e2b7c53e1153ec783c8d4f6cda4ad3 Mon Sep 17 00:00:00 2001
From: billy <Billy@mask.io>
Date: Fri, 13 May 2022 17:05:08 +0800
Subject: [PATCH 3/3] fix: override

---
 .../src/components/shared/VerifyWallet/Steps.tsx     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/mask/src/components/shared/VerifyWallet/Steps.tsx b/packages/mask/src/components/shared/VerifyWallet/Steps.tsx
index 51aa1fa57069..b407d054dea6 100644
--- a/packages/mask/src/components/shared/VerifyWallet/Steps.tsx
+++ b/packages/mask/src/components/shared/VerifyWallet/Steps.tsx
@@ -71,6 +71,13 @@ const useStyles = makeStyles()((theme) => ({
     roundBtn: {
         borderRadius: 99,
     },
+    cancelBtn: {
+        padding: '8px 22px',
+        borderRadius: 99,
+        border: '1px solid #EBEEF0',
+        color: '#1C68F3',
+        fontSize: 14,
+    },
     disableBtn: {
         pointerEvents: 'none',
         opacity: 0.5,
@@ -190,8 +197,8 @@ export function Steps(props: StepsProps) {
 
             <div className={classes.actionBox}>
                 <ActionButton
-                    className={notInPop ? '' : classes.roundBtn}
-                    variant={notInPop ? 'roundedFlat' : 'outlined'}
+                    className={notInPop ? '' : classes.cancelBtn}
+                    variant="roundedFlat"
                     fullWidth
                     color="secondary"
                     onClick={onCustomCancel}>
@@ -201,6 +208,7 @@ export function Steps(props: StepsProps) {
                     className={notInPop ? '' : classes.roundBtn}
                     color={notInPop ? 'inherit' : 'primary'}
                     loading={confirmLoading}
+                    size={notInPop ? 'medium' : 'large'}
                     disabled={disableConfirm}
                     variant={notInPop ? 'roundedContained' : 'contained'}
                     fullWidth