From f29d9b99489ba2caee01fea91dccbd04ada842e4 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Mon, 22 Jun 2026 11:17:59 +0500
Subject: [PATCH] mobile: fix 2fa method selection ui

---
 .../mobile/app/components/auth/two-factor.tsx | 86 ++++++++++---------
 packages/intl/locale/en.po                    |  4 +-
 packages/intl/locale/pseudo-LOCALE.po         |  2 +-
 packages/intl/src/strings.ts                  |  2 +-
 4 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/apps/mobile/app/components/auth/two-factor.tsx b/apps/mobile/app/components/auth/two-factor.tsx
index d93978179..c2b8b9bcc 100644
--- a/apps/mobile/app/components/auth/two-factor.tsx
+++ b/apps/mobile/app/components/auth/two-factor.tsx
@@ -316,48 +316,56 @@ const TwoFactorVerification = ({
               />
             </View>
 
-            {currentMethod.method === "sms" ||
-            currentMethod.method === "email" ? (
-              <Button
-                onPress={onSendCode}
-                type={"plain"}
-                disabled={parseInt(`${seconds}`) !== 0}
-                title={
-                  sending
-                    ? ""
-                    : `${
-                        seconds
-                          ? strings.resend2faCode(`${seconds}`)
-                          : strings.resendCode()
-                      }`
-                }
-                loading={sending}
-                fontSize={AppFontSize.sm}
-                fontFamily="REGULAR"
+            <View
+              style={{
+                gap: Spacing.LEVEL_1,
+                marginTop: -Spacing.LEVEL_0
+              }}
+            >
+              {currentMethod.method === "sms" ||
+              currentMethod.method === "email" ? (
+                <Button
+                  onPress={onSendCode}
+                  type={"plain"}
+                  disabled={parseInt(`${seconds}`) !== 0}
+                  title={
+                    sending
+                      ? ""
+                      : `${
+                          seconds
+                            ? strings.resend2faCode(`${seconds}`)
+                            : strings.resendCode()
+                        }`
+                  }
+                  loading={sending}
+                  fontSize={AppFontSize.sm}
+                  fontFamily="REGULAR"
+                  style={{
+                    paddingVertical: 0,
+                    alignSelf: "flex-start",
+                    paddingHorizontal: 0
+                  }}
+                />
+              ) : null}
+              <TouchableOpacity
+                onPress={onRequestSecondaryMethod}
+                activeOpacity={0.8}
                 style={{
-                  paddingVertical: 0,
-                  alignSelf: "flex-start",
-                  paddingHorizontal: 0
+                  alignSelf: "flex-start"
                 }}
-              />
-            ) : null}
+              >
+                <Paragraph
+                  fontFamily="SEMI_BOLD"
+                  fontSize="SM"
+                  color={colors.primary.accent}
+                >
+                  {strings["2faCodeSecondaryMethodText"][
+                    currentMethod.method as keyof (typeof strings)["2faCodeSecondaryMethodText"]
+                  ]()}
+                </Paragraph>
+              </TouchableOpacity>
+            </View>
           </View>
-
-          <TouchableOpacity
-            onPress={onRequestSecondaryMethod}
-            activeOpacity={0.8}
-            style={{
-              alignSelf: "center",
-              paddingVertical: 0,
-              marginTop: Spacing.LEVEL_3
-            }}
-          >
-            <Paragraph fontSize="SM" color={colors.secondary.paragraph}>
-              {strings["2faCodeSecondaryMethodText"][
-                currentMethod.method as keyof (typeof strings)["2faCodeSecondaryMethodText"]
-              ]()}
-            </Paragraph>
-          </TouchableOpacity>
         </>
       ) : (
         <View
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index 7dff0a22c..7e88e635a 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -5989,8 +5989,8 @@ msgid "Report issue"
 msgstr "Report issue"
 
 #: src/strings.ts:128
-msgid "Resend code in ({seconds})"
-msgstr "Resend code in ({seconds})"
+msgid "Resend code in {seconds}s"
+msgstr "Resend code in {seconds}s"
 
 #. placeholder {0}: seconds ? ` in ${seconds}` : ""
 #: src/strings.ts:679
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index 6e7a631e0..b77cd2e4d 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -5963,7 +5963,7 @@ msgid "Report issue"
 msgstr ""
 
 #: src/strings.ts:128
-msgid "Resend code in ({seconds})"
+msgid "Resend code in {seconds}s"
 msgstr ""
 
 #. placeholder {0}: seconds ? ` in ${seconds}` : ""
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index 26324d938..4bd746f2b 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -125,7 +125,7 @@ export const strings = {
     app: () => t`I don't have access to authenticator app`,
     recoveryCode: () => t`I don't have recovery codes`
   },
-  resend2faCode: (seconds: string) => t`Resend code in (${seconds})`,
+  resend2faCode: (seconds: string) => t`Resend code in ${seconds}s`,
   sendCode: () => t`Send code`,
   sendCodeSms: () => t`Send code via SMS`,
   sendCodeEmail: () => t`Send code via email`,