From d2c9def4cc031447570b685dfca5939d7ec6d6ce Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Tue, 19 Mar 2024 04:13:49 +0530
Subject: [PATCH 1/3] fix: Incorrect numpad horizontal padding on the native
 and mweb devices.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 .../AmountPicker/AmountSelectorModal.tsx        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/AmountPicker/AmountSelectorModal.tsx b/src/components/AmountPicker/AmountSelectorModal.tsx
index 949718a07af7..4cae4c6636ae 100644
--- a/src/components/AmountPicker/AmountSelectorModal.tsx
+++ b/src/components/AmountPicker/AmountSelectorModal.tsx
@@ -36,7 +36,7 @@ function AmountSelectorModal({value, description = '', onValueSelected, isVisibl
                     title={description}
                     onBackButtonPress={onClose}
                 />
-                <ScrollView contentContainerStyle={[styles.flex1, styles.mh5, styles.mb5]}>
+                <ScrollView contentContainerStyle={[styles.flex1, styles.mb5]}>
                     <View style={styles.flex1}>
                         <AmountForm
                             // eslint-disable-next-line react/jsx-props-no-spreading
@@ -45,14 +45,15 @@ function AmountSelectorModal({value, description = '', onValueSelected, isVisibl
                             value={currentValue}
                             onInputChange={setValue}
                         />
+                        <Button
+                            success
+                            large
+                            pressOnEnter
+                            text={translate('common.save')}
+                            onPress={() => onValueSelected?.(currentValue ?? '')}
+                            style={styles.mh5}
+                        />
                     </View>
-                    <Button
-                        success
-                        large
-                        pressOnEnter
-                        text={translate('common.save')}
-                        onPress={() => onValueSelected?.(currentValue ?? '')}
-                    />
                 </ScrollView>
             </ScreenWrapper>
         </Modal>

From 191766ba1410fc85e613d85710fe02bb81335adf Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Fri, 22 Mar 2024 07:44:41 +0530
Subject: [PATCH 2/3] fix: padding bottom amount selector modal.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/components/AmountPicker/AmountSelectorModal.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/AmountPicker/AmountSelectorModal.tsx b/src/components/AmountPicker/AmountSelectorModal.tsx
index 4cae4c6636ae..958f8e1714f8 100644
--- a/src/components/AmountPicker/AmountSelectorModal.tsx
+++ b/src/components/AmountPicker/AmountSelectorModal.tsx
@@ -31,12 +31,13 @@ function AmountSelectorModal({value, description = '', onValueSelected, isVisibl
                 includeSafeAreaPaddingBottom={false}
                 testID={AmountSelectorModal.displayName}
                 shouldEnableMaxHeight
+                style={[styles.pb0]}
             >
                 <HeaderWithBackButton
                     title={description}
                     onBackButtonPress={onClose}
                 />
-                <ScrollView contentContainerStyle={[styles.flex1, styles.mb5]}>
+                <ScrollView contentContainerStyle={[styles.flexGrow1, styles.mb5]}>
                     <View style={styles.flex1}>
                         <AmountForm
                             // eslint-disable-next-line react/jsx-props-no-spreading
@@ -51,7 +52,7 @@ function AmountSelectorModal({value, description = '', onValueSelected, isVisibl
                             pressOnEnter
                             text={translate('common.save')}
                             onPress={() => onValueSelected?.(currentValue ?? '')}
-                            style={styles.mh5}
+                            style={styles.m5}
                         />
                     </View>
                 </ScrollView>

From f18cfd85027237beafdcdb4adfec19ea8f107385 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Wed, 3 Apr 2024 04:49:53 +0530
Subject: [PATCH 3/3] fix margin bottom.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/components/AmountPicker/AmountSelectorModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AmountPicker/AmountSelectorModal.tsx b/src/components/AmountPicker/AmountSelectorModal.tsx
index 958f8e1714f8..b54f6301b798 100644
--- a/src/components/AmountPicker/AmountSelectorModal.tsx
+++ b/src/components/AmountPicker/AmountSelectorModal.tsx
@@ -52,7 +52,7 @@ function AmountSelectorModal({value, description = '', onValueSelected, isVisibl
                             pressOnEnter
                             text={translate('common.save')}
                             onPress={() => onValueSelected?.(currentValue ?? '')}
-                            style={styles.m5}
+                            style={styles.mh5}
                         />
                     </View>
                 </ScrollView>