From fc23396f6174c876c5d94e5171474f20963e864f Mon Sep 17 00:00:00 2001
From: kubabutkiewicz <jakub.butkiewicz94@gmail.com>
Date: Tue, 28 Oct 2025 17:00:29 +0100
Subject: [PATCH 1/4] refactor: Simplify layout structure in
 NumberWithSymbolForm component

---
 src/components/NumberWithSymbolForm.tsx | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/components/NumberWithSymbolForm.tsx b/src/components/NumberWithSymbolForm.tsx
index 9829ab19aa350..00a2958e96c75 100644
--- a/src/components/NumberWithSymbolForm.tsx
+++ b/src/components/NumberWithSymbolForm.tsx
@@ -450,19 +450,14 @@ function NumberWithSymbolForm({
     );
 
     return (
-        <ScrollView
-            contentContainerStyle={styles.flexGrow1}
-            style={!shouldWrapInputInContainer && styles.flexGrow0}
-        >
+        <>
             {shouldWrapInputInContainer ? (
-                <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter]}>
-                    <View
-                        id={NUMBER_VIEW_ID}
-                        onMouseDown={(event) => focusTextInput(event, [NUMBER_VIEW_ID])}
-                        style={[styles.moneyRequestAmountContainer, styles.flexRow, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}
-                    >
-                        {textInputComponent}
-                    </View>
+                <View
+                    id={NUMBER_VIEW_ID}
+                    onMouseDown={(event) => focusTextInput(event, [NUMBER_VIEW_ID])}
+                    style={[styles.moneyRequestAmountContainer, styles.flex1, styles.flexRow, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}
+                >
+                    {textInputComponent}
 
                     {isSymbolPressable && !!currency && !canUseTouchScreen && (
                         <Button
@@ -531,7 +526,7 @@ function NumberWithSymbolForm({
                     {footer}
                 </View>
             ) : null}
-        </ScrollView>
+        </>
     );
 }
 

From 757b402849a82cfe2d55f2f173814ea54d25083b Mon Sep 17 00:00:00 2001
From: kubabutkiewicz <jakub.butkiewicz94@gmail.com>
Date: Thu, 30 Oct 2025 10:45:25 +0100
Subject: [PATCH 2/4] Revert "refactor: Simplify layout structure in
 NumberWithSymbolForm component"

This reverts commit fc23396f6174c876c5d94e5171474f20963e864f.
---
 src/components/NumberWithSymbolForm.tsx | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/NumberWithSymbolForm.tsx b/src/components/NumberWithSymbolForm.tsx
index 00a2958e96c75..9829ab19aa350 100644
--- a/src/components/NumberWithSymbolForm.tsx
+++ b/src/components/NumberWithSymbolForm.tsx
@@ -450,14 +450,19 @@ function NumberWithSymbolForm({
     );
 
     return (
-        <>
+        <ScrollView
+            contentContainerStyle={styles.flexGrow1}
+            style={!shouldWrapInputInContainer && styles.flexGrow0}
+        >
             {shouldWrapInputInContainer ? (
-                <View
-                    id={NUMBER_VIEW_ID}
-                    onMouseDown={(event) => focusTextInput(event, [NUMBER_VIEW_ID])}
-                    style={[styles.moneyRequestAmountContainer, styles.flex1, styles.flexRow, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}
-                >
-                    {textInputComponent}
+                <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter]}>
+                    <View
+                        id={NUMBER_VIEW_ID}
+                        onMouseDown={(event) => focusTextInput(event, [NUMBER_VIEW_ID])}
+                        style={[styles.moneyRequestAmountContainer, styles.flexRow, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}
+                    >
+                        {textInputComponent}
+                    </View>
 
                     {isSymbolPressable && !!currency && !canUseTouchScreen && (
                         <Button
@@ -526,7 +531,7 @@ function NumberWithSymbolForm({
                     {footer}
                 </View>
             ) : null}
-        </>
+        </ScrollView>
     );
 }
 

From 23d3f14c5af9b0b8dfa3a5fc8a4d1f83a13e3652 Mon Sep 17 00:00:00 2001
From: kubabutkiewicz <jakub.butkiewicz94@gmail.com>
Date: Thu, 30 Oct 2025 11:00:51 +0100
Subject: [PATCH 3/4] fixed layout of the number with symbol form

---
 src/components/NumberWithSymbolForm.tsx | 42 ++++++++++++-------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/components/NumberWithSymbolForm.tsx b/src/components/NumberWithSymbolForm.tsx
index 9829ab19aa350..660e38bfebe64 100644
--- a/src/components/NumberWithSymbolForm.tsx
+++ b/src/components/NumberWithSymbolForm.tsx
@@ -459,30 +459,28 @@ function NumberWithSymbolForm({
                     <View
                         id={NUMBER_VIEW_ID}
                         onMouseDown={(event) => focusTextInput(event, [NUMBER_VIEW_ID])}
-                        style={[styles.moneyRequestAmountContainer, styles.flexRow, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}
+                        style={[, styles.flex1, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}
                     >
-                        {textInputComponent}
+                        <View style={[styles.flexRow, styles.moneyRequestAmountContainer, styles.alignItemsCenter, styles.justifyContentCenter]}>{textInputComponent}</View>
+                        {isSymbolPressable && !!currency && !canUseTouchScreen && (
+                            <Button
+                                shouldShowRightIcon
+                                small
+                                iconRight={Expensicons.DownArrow}
+                                onPress={onSymbolButtonPress}
+                                style={styles.minWidth18}
+                                isContentCentered
+                                text={currency}
+                            />
+                        )}
+                        {!!errorText && (
+                            <FormHelpMessage
+                                style={[styles.pAbsolute, styles.b0, shouldShowBigNumberPad ? styles.mb0 : styles.mb3, styles.ph5, styles.w100]}
+                                isError
+                                message={errorText}
+                            />
+                        )}
                     </View>
-
-                    {isSymbolPressable && !!currency && !canUseTouchScreen && (
-                        <Button
-                            shouldShowRightIcon
-                            small
-                            iconRight={Expensicons.DownArrow}
-                            onPress={onSymbolButtonPress}
-                            style={styles.minWidth18}
-                            isContentCentered
-                            text={currency}
-                        />
-                    )}
-
-                    {!!errorText && (
-                        <FormHelpMessage
-                            style={[styles.pAbsolute, styles.b0, shouldShowBigNumberPad ? styles.mb0 : styles.mb3, styles.ph5, styles.w100]}
-                            isError
-                            message={errorText}
-                        />
-                    )}
                 </View>
             ) : (
                 textInputComponent

From 8f38cff21119ff205a0dfa43f848ad96227c1aa3 Mon Sep 17 00:00:00 2001
From: kubabutkiewicz <jakub.butkiewicz94@gmail.com>
Date: Fri, 31 Oct 2025 11:16:58 +0100
Subject: [PATCH 4/4] fix lint

---
 src/components/NumberWithSymbolForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NumberWithSymbolForm.tsx b/src/components/NumberWithSymbolForm.tsx
index 660e38bfebe64..17f8bb69ec0e0 100644
--- a/src/components/NumberWithSymbolForm.tsx
+++ b/src/components/NumberWithSymbolForm.tsx
@@ -459,7 +459,7 @@ function NumberWithSymbolForm({
                     <View
                         id={NUMBER_VIEW_ID}
                         onMouseDown={(event) => focusTextInput(event, [NUMBER_VIEW_ID])}
-                        style={[, styles.flex1, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}
+                        style={[styles.flex1, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}
                     >
                         <View style={[styles.flexRow, styles.moneyRequestAmountContainer, styles.alignItemsCenter, styles.justifyContentCenter]}>{textInputComponent}</View>
                         {isSymbolPressable && !!currency && !canUseTouchScreen && (