Merge pull request #48848 from Expensify/monil-fixCurrencyShiftBug

[CP Staging] Revert some changes and fix UI bug

(cherry picked from commit e694253)

(CP triggered by luacmartins)

Author: luacmartins

src/components/AmountForm.tsx

@@ -49,7 +49,7 @@ type AmountFormProps = {
     /** Whether the form should use a standard TextInput as a base */
     displayAsTextInput?: boolean;
 } & Pick<TextInputWithCurrencySymbolProps, 'hideCurrencySymbol' | 'extraSymbol'> &
-    Pick<BaseTextInputProps, 'autoFocus' | 'hasError'>;
+    Pick<BaseTextInputProps, 'autoFocus'>;
 
 /**
  * Returns the new selection object based on the updated amount's length
@@ -69,6 +69,7 @@ function AmountForm(
         currency = CONST.CURRENCY.USD,
         extraDecimals = 0,
         amountMaxLength,
+        errorText,
         onInputChange,
         onCurrencyButtonPress,
         displayAsTextInput = false,
@@ -297,11 +298,11 @@ function AmountForm(
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...rest}
                 />
-                {!!rest.errorText && (
+                {!errorText && (
                     <FormHelpMessage
                         style={[styles.pAbsolute, styles.b0, canUseTouchScreen ? styles.mb0 : styles.mb3, styles.ph5, styles.w100]}
                         isError
-                        message={rest.errorText}
+                        message={errorText}
                     />
                 )}
             </View>