From 55dcafbc5d80f8792e6de0617bef9bf7c3d6cbb8 Mon Sep 17 00:00:00 2001
From: Gandalf <whogandalf@gmail.com>
Date: Mon, 24 Feb 2025 19:17:28 +0530
Subject: [PATCH 1/2] Fix: 2FA code input displayed at the bottom on "Disable
 two-factor authentication" page

---
 src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx b/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx
index 857902c7d6f8d..12284c7d0d2a1 100644
--- a/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx
@@ -39,14 +39,14 @@ function DisablePage() {
                 <View style={[styles.ph5, styles.mt3]}>
                     <Text>{translate('twoFactorAuth.explainProcessToRemove')}</Text>
                 </View>
-            </ScrollView>
-            <FixedFooter style={[styles.mt2, styles.pt2]}>
-                <View style={[styles.mh5, styles.mb4]}>
+                <View style={[styles.mh5, styles.mb4, styles.mt5]}>
                     <TwoFactorAuthForm
                         innerRef={formRef}
                         validateInsteadOfDisable={false}
                     />
                 </View>
+            </ScrollView>
+            <FixedFooter style={[styles.mt2, styles.pt2]}>
                 <Button
                     success
                     large

From ed4b0876afee94355bb93d6a1949b33f3a80cbfe Mon Sep 17 00:00:00 2001
From: Gandalf <whogandalf@gmail.com>
Date: Tue, 25 Feb 2025 11:39:50 +0530
Subject: [PATCH 2/2] Update
 src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx

Co-authored-by: Cong Pham <ptcong411@gmail.com>
---
 src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx b/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx
index 12284c7d0d2a1..b8a0cfa2177b5 100644
--- a/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx
@@ -39,7 +39,7 @@ function DisablePage() {
                 <View style={[styles.ph5, styles.mt3]}>
                     <Text>{translate('twoFactorAuth.explainProcessToRemove')}</Text>
                 </View>
-                <View style={[styles.mh5, styles.mb4, styles.mt5]}>
+                <View style={[styles.mh5, styles.mb4, styles.mt3]}>
                     <TwoFactorAuthForm
                         innerRef={formRef}
                         validateInsteadOfDisable={false}