From 6eaced1c937592e6d1eaad594516ffddae656dfe Mon Sep 17 00:00:00 2001
From: Pedro Guerreiro <pedro.a.c.guerreiro@gmail.com>
Date: Wed, 22 Nov 2023 22:17:49 +0000
Subject: [PATCH] fix(get physical card): bad margins affecting personal
 details address page

---
 src/components/AddressForm.js                            | 1 -
 src/pages/settings/Wallet/Card/BaseGetPhysicalCard.js    | 2 +-
 src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.js | 2 +-
 src/pages/settings/Wallet/Card/GetPhysicalCardName.js    | 2 +-
 src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js   | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/AddressForm.js b/src/components/AddressForm.js
index 19ab35f036c1..dfea017692ef 100644
--- a/src/components/AddressForm.js
+++ b/src/components/AddressForm.js
@@ -122,7 +122,6 @@ function AddressForm({city, country, formID, onAddressChanged, onSubmit, shouldS
             submitButtonText={submitButtonText}
             enabledWhenOffline
         >
-            <View style={styles.formSpaceVertical} />
             <View>
                 <AddressSearch
                     inputID="addressLine1"
diff --git a/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.js b/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.js
index 030ca04b7074..bc37cf78d6be 100644
--- a/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.js
+++ b/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.js
@@ -207,7 +207,7 @@ function BaseGetPhysicalCard({
                 title={title}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(domain))}
             />
-            <Text style={[styles.textHeadline, styles.mh5]}>{headline}</Text>
+            <Text style={[styles.textHeadline, styles.mh5, styles.mb5]}>{headline}</Text>
             {renderContent(onSubmit, submitButtonText, children, onValidate)}
         </ScreenWrapper>
     );
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.js b/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.js
index e6a11e2ba1e1..10069bceb1c4 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.js
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.js
@@ -82,7 +82,7 @@ function GetPhysicalCardConfirm({
             submitButtonText={translate('getPhysicalCard.shipCard')}
             title={translate('getPhysicalCard.header')}
         >
-            <Text style={[styles.baseFontStyle, styles.mv5, styles.mh5]}>{translate('getPhysicalCard.estimatedDeliveryMessage')}</Text>
+            <Text style={[styles.baseFontStyle, styles.mb5, styles.mh5]}>{translate('getPhysicalCard.estimatedDeliveryMessage')}</Text>
             <MenuItemWithTopDescription
                 description={translate('getPhysicalCard.legalName')}
                 iconRight={Expensicons.ArrowRight}
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardName.js b/src/pages/settings/Wallet/Card/GetPhysicalCardName.js
index 3a5399adad3a..1ab573c51875 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardName.js
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardName.js
@@ -79,7 +79,7 @@ function GetPhysicalCardName({
                 role={CONST.ACCESSIBILITY_ROLE.TEXT}
                 autoCapitalize="words"
                 defaultValue={legalFirstName}
-                containerStyles={[styles.mt5, styles.mh5]}
+                containerStyles={[styles.mh5]}
                 shouldSaveDraft
             />
             <TextInput
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js b/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js
index 9d9ae607438e..d03bfe74c059 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js
@@ -72,7 +72,7 @@ function GetPhysicalCardPhone({
                 aria-label={translate('getPhysicalCard.phoneNumber')}
                 role={CONST.ACCESSIBILITY_ROLE.TEXT}
                 defaultValue={phoneNumber}
-                containerStyles={[styles.mt5, styles.mh5]}
+                containerStyles={[styles.mh5]}
                 shouldSaveDraft
             />
         </BaseGetPhysicalCard>