fix: use current email if user goes back to initial update email screen

Author: ignaciosantise

packages/core/src/controllers/RouterController.ts

@@ -26,6 +26,7 @@ export interface RouterControllerState {
     wallet?: WcWallet;
     network?: CaipNetwork;
     email?: string;
+    newEmail?: string;
   };
 }
 

packages/scaffold/src/partials/w3m-otp-code/index.tsx

@@ -13,8 +13,9 @@ interface Props {
   email?: string;
   timeLeft?: number;
   codeExpiry?: number;
-  retryDisabledLabel?: string;
   retryLabel?: string;
+  retryDisabledButtonLabel?: string;
+  retryButtonLabel?: string;
 }
 
 export function OtpCodeView({
@@ -26,8 +27,9 @@ export function OtpCodeView({
   email,
   timeLeft = 0,
   codeExpiry = 20,
-  retryDisabledLabel = 'Resend',
-  retryLabel = 'Resend code'
+  retryLabel = "Didn't receive it?",
+  retryDisabledButtonLabel = 'Resend',
+  retryButtonLabel = 'Resend code'
 }: Props) {
   const { keyboardShown, keyboardHeight } = useKeyboard();
   const paddingBottom = Platform.select({
@@ -67,10 +69,10 @@ export function OtpCodeView({
       {!loading && (
         <FlexView alignItems="center" flexDirection="row" margin={['s', '0', '0', '0']}>
           <Text variant="small-400" color="fg-200">
-            Didn't receive it?
+            {retryLabel}
           </Text>
           <Link onPress={onRetry} disabled={timeLeft > 0 || loading}>
-            {timeLeft > 0 ? `${retryDisabledLabel} in ${timeLeft}s` : retryLabel}
+            {timeLeft > 0 ? `${retryDisabledButtonLabel} in ${timeLeft}s` : retryButtonLabel}
           </Link>
         </FlexView>
       )}

packages/scaffold/src/views/w3m-update-email-primary-otp-view/index.tsx

@@ -44,12 +44,13 @@ export function UpdateEmailPrimaryOtpView() {
     <OtpCodeView
       loading={loading}
       error={error}
-      email={emailProvider?.getEmail()}
+      email={data?.email}
       onSubmit={onOtpSubmit}
       onRetry={RouterController.goBack}
       codeExpiry={10}
-      retryDisabledLabel="Try again"
-      retryLabel="Try again"
+      retryLabel="Something wrong?"
+      retryDisabledButtonLabel="Try again"
+      retryButtonLabel="Try again"
     />
   );
 }

packages/scaffold/src/views/w3m-update-email-secondary-otp-view/index.tsx

@@ -44,12 +44,13 @@ export function UpdateEmailSecondaryOtpView() {
     <OtpCodeView
       loading={loading}
       error={error}
-      email={data?.email}
+      email={data?.newEmail}
       onSubmit={onOtpSubmit}
       onRetry={RouterController.goBack}
       codeExpiry={10}
-      retryDisabledLabel="Try again"
-      retryLabel="Try again"
+      retryLabel="Something wrong?"
+      retryDisabledButtonLabel="Try again"
+      retryButtonLabel="Try again"
     />
   );
 }

packages/scaffold/src/views/w3m-update-email-wallet-view/index.tsx

@@ -44,9 +44,9 @@ export function UpdateEmailWalletView() {
       const response = await provider.updateEmail({ email: value });
       EventsController.sendEvent({ type: 'track', event: 'EMAIL_EDIT' });
       if (response.action === 'VERIFY_SECONDARY_OTP') {
-        RouterController.push('UpdateEmailSecondaryOtp', { email: value });
+        RouterController.push('UpdateEmailSecondaryOtp', { email: data?.email, newEmail: value });
       } else {
-        RouterController.push('UpdateEmailPrimaryOtp', { email: value });
+        RouterController.push('UpdateEmailPrimaryOtp', { email: data?.email, newEmail: value });
       }
     } catch (e) {
       const parsedError = CoreHelperUtil.parseError(e);