Merge pull request #22728 from kushu7/fix-22316-amount-formatting

fix: format amount before navigating to next page
Expensify · Jul 21, 2023 · 011a398 · 011a398
2 parents 8dcad16 + abb18c3
commit 011a398
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/src/pages/iou/steps/MoneyRequestAmountPage.js b/src/pages/iou/steps/MoneyRequestAmountPage.js
@@ -232,6 +232,24 @@ function MoneyRequestAmountPage(props) {
         });
     };
 
+    /**
+     * Convert amount to whole unit and update selection
+     *
+     * @param {String} currencyCode
+     * @param {Number} amountInCurrencyUnits
+     */
+    const saveAmountToState = (currencyCode, amountInCurrencyUnits) => {
+        if (!currencyCode || !amountInCurrencyUnits) {
+            return;
+        }
+        const amountAsStringForState = CurrencyUtils.convertToWholeUnit(currencyCode, amountInCurrencyUnits).toString();
+        setAmount(amountAsStringForState);
+        setSelection({
+            start: amountAsStringForState.length,
+            end: amountAsStringForState.length,
+        });
+    };
+
     useEffect(() => {
         if (isEditing.current) {
             if (prevMoneyRequestID.current !== props.iou.id) {
@@ -270,12 +288,7 @@ function MoneyRequestAmountPage(props) {
     }, [props.iou.currency]);
 
     useEffect(() => {
-        const selectedAmountAsStringForState = props.iou.amount ? CurrencyUtils.convertToWholeUnit(props.iou.currency, props.iou.amount).toString() : '';
-        setAmount(selectedAmountAsStringForState);
-        setSelection({
-            start: selectedAmountAsStringForState.length,
-            end: selectedAmountAsStringForState.length,
-        });
+        saveAmountToState(props.iou.currency, props.iou.amount);
     }, [props.iou.amount, props.iou.currency]);
 
     useFocusEffect(
@@ -369,6 +382,8 @@ function MoneyRequestAmountPage(props) {
         IOU.setMoneyRequestAmount(amountInSmallestCurrencyUnits);
         IOU.setMoneyRequestCurrency(selectedCurrencyCode);
 
+        saveAmountToState(selectedCurrencyCode, amountInSmallestCurrencyUnits);
+
         if (isEditing.current) {
             Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType.current, reportID.current));
             return;