Resolved merge conflicts after rebase

Author: jakubkalinski0

src/components/MoneyRequestAmountInput.tsx

@@ -115,7 +115,6 @@ const defaultOnFormatAmount = (amount: number, currency?: string) => convertToFr
 /**
  * Specialized money amount input with currency and money amount formatting.
  */
-<<<<<<< HEAD
 function MoneyRequestAmountInput(
     {
         amount = 0,
@@ -146,36 +145,6 @@ function MoneyRequestAmountInput(
     }: MoneyRequestAmountInputProps,
     forwardedRef: ForwardedRef<BaseTextInputRef>,
 ) {
-=======
-function MoneyRequestAmountInput({
-    amount = 0,
-    currency = CONST.CURRENCY.USD,
-    isCurrencyPressable = true,
-    onCurrencyButtonPress,
-    onAmountChange,
-    prefixCharacter = '',
-    hideCurrencySymbol = false,
-    moneyRequestAmountInputRef,
-    disableKeyboard = true,
-    onFormatAmount = defaultOnFormatAmount,
-    formatAmountOnBlur,
-    maxLength,
-    hideFocusedState = true,
-    shouldKeepUserInput = false,
-    shouldShowBigNumberPad = false,
-    inputStyle,
-    autoGrow = true,
-    autoGrowExtraSpace,
-    contentWidth,
-    testID,
-    submitBehavior,
-    shouldApplyPaddingToContainer = false,
-    shouldUseDefaultLineHeightForPrefix = true,
-    shouldWrapInputInContainer = true,
-    forwardedRef,
-    ...props
-}: MoneyRequestAmountInputProps) {
->>>>>>> 6ddd1784ffe (Prettier run)
     const textInput = useRef<BaseTextInputRef | null>(null);
     const numberFormRef = useRef<NumberWithSymbolFormRef | null>(null);
     const decimals = getCurrencyDecimals(currency);

src/components/TextInput/BaseTextInput/implementation/index.native.tsx

@@ -29,7 +29,6 @@ import isInputAutoFilled from '@libs/isInputAutoFilled';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 
-<<<<<<< HEAD
 function BaseTextInput(
     {
         label = '',
@@ -84,60 +83,6 @@ function BaseTextInput(
     }: BaseTextInputProps,
     ref: ForwardedRef<BaseTextInputRef>,
 ) {
-=======
-function BaseTextInput({
-    label = '',
-    /**
-     * To be able to function as either controlled or uncontrolled component we should not
-     * assign a default prop value for `value` or `defaultValue` props
-     */
-    value = undefined,
-    defaultValue = undefined,
-    placeholder = '',
-    errorText = '',
-    iconLeft = null,
-    icon = null,
-    textInputContainerStyles,
-    shouldApplyPaddingToContainer = true,
-    touchableInputWrapperStyle,
-    containerStyles,
-    inputStyle,
-    shouldUseFullInputHeight = false,
-    forceActiveLabel = false,
-    disableKeyboard = false,
-    autoGrow = false,
-    autoGrowExtraSpace = 0,
-    autoGrowMarginSide,
-    autoGrowHeight = false,
-    maxAutoGrowHeight,
-    hideFocusedState = false,
-    maxLength = undefined,
-    hint = '',
-    onInputChange = () => {},
-    multiline = false,
-    autoCorrect = true,
-    prefixCharacter = '',
-    suffixCharacter = '',
-    inputID,
-    type = 'default',
-    excludedMarkdownStyles = [],
-    shouldShowClearButton = false,
-    shouldHideClearButton = true,
-    prefixContainerStyle = [],
-    prefixStyle = [],
-    suffixContainerStyle = [],
-    suffixStyle = [],
-    contentWidth,
-    loadingSpinnerStyle,
-    uncontrolled,
-    placeholderTextColor,
-    onClearInput,
-    iconContainerStyle,
-    shouldUseDefaultLineHeightForPrefix = true,
-    ref,
-    ...props
-}: BaseTextInputProps) {
->>>>>>> 7acd72ff71c (Prettier run)
     const InputComponent = InputComponentMap.get(type) ?? RNTextInput;
     const isMarkdownEnabled = type === 'markdown';
     const isAutoGrowHeightMarkdown = isMarkdownEnabled && autoGrowHeight;

src/components/TextInput/BaseTextInput/implementation/index.tsx

@@ -32,7 +32,6 @@ import isInputAutoFilled from '@libs/isInputAutoFilled';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 
-<<<<<<< HEAD
 function BaseTextInput(
     {
         label = '',
@@ -86,59 +85,6 @@ function BaseTextInput(
     }: BaseTextInputProps,
     ref: ForwardedRef<BaseTextInputRef>,
 ) {
-=======
-function BaseTextInput({
-    label = '',
-    /**
-     * To be able to function as either controlled or uncontrolled component we should not
-     * assign a default prop value for `value` or `defaultValue` props
-     */
-    value = undefined,
-    defaultValue = undefined,
-    placeholder = '',
-    errorText = '',
-    icon = null,
-    iconLeft = null,
-    textInputContainerStyles,
-    shouldApplyPaddingToContainer = true,
-    touchableInputWrapperStyle,
-    containerStyles,
-    inputStyle,
-    forceActiveLabel = false,
-    disableKeyboard = false,
-    autoGrow = false,
-    autoGrowHeight = false,
-    maxAutoGrowHeight,
-    hideFocusedState = false,
-    maxLength = undefined,
-    hint = '',
-    onInputChange = () => {},
-    multiline = false,
-    shouldInterceptSwipe = false,
-    autoCorrect = true,
-    prefixCharacter = '',
-    suffixCharacter = '',
-    inputID,
-    type = 'default',
-    excludedMarkdownStyles = [],
-    shouldShowClearButton = false,
-    shouldHideClearButton = true,
-    shouldUseDisabledStyles = true,
-    prefixContainerStyle = [],
-    prefixStyle = [],
-    suffixContainerStyle = [],
-    suffixStyle = [],
-    contentWidth,
-    loadingSpinnerStyle,
-    uncontrolled = false,
-    placeholderTextColor,
-    onClearInput,
-    iconContainerStyle,
-    shouldUseDefaultLineHeightForPrefix = true,
-    ref,
-    ...inputProps
-}: BaseTextInputProps) {
->>>>>>> 7acd72ff71c (Prettier run)
     const InputComponent = InputComponentMap.get(type) ?? RNTextInput;
     const isMarkdownEnabled = type === 'markdown';
     const isAutoGrowHeightMarkdown = isMarkdownEnabled && autoGrowHeight;