From 53bc97eddbe60fed0703b12497940aeafdaacd13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Fri, 21 Jul 2023 18:58:22 +0300
Subject: [PATCH 01/19] ui and first data flow attemps

merchant and date value are taken from the "iou" key-value pair. Clearing this up with Alex.
---
 .../MoneyRequestConfirmationList.js           |  53 +++-
 src/components/MoneyRequestDetails.js         |  28 +-
 src/languages/en.js                           | 120 ++++----
 src/languages/es.js                           | 118 ++++----
 src/libs/actions/IOU.js                       | 285 ++++++++++--------
 .../iou/steps/MoneyRequestConfirmPage.js      |  21 +-
 6 files changed, 355 insertions(+), 270 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index b376e02b1095..37e83692f658 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -1,25 +1,28 @@
-import React, {useState, useCallback, useMemo} from 'react';
+import React, { useCallback, useMemo, useReducer, useState } from 'react';
 import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
+import { withOnyx } from 'react-native-onyx';
 import _ from 'underscore';
+import { View } from 'react-native';
 import styles from '../styles/styles';
 import * as OptionsListUtils from '../libs/OptionsListUtils';
 import OptionsSelector from './OptionsSelector';
 import ONYXKEYS from '../ONYXKEYS';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
-import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
+import withLocalize, { withLocalizePropTypes } from './withLocalize';
+import withWindowDimensions, { windowDimensionsPropTypes } from './withWindowDimensions';
 import compose from '../libs/compose';
 import CONST from '../CONST';
 import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
 import Log from '../libs/Log';
 import SettlementButton from './SettlementButton';
 import ROUTES from '../ROUTES';
-import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from './withCurrentUserPersonalDetails';
+import withCurrentUserPersonalDetails, { withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes } from './withCurrentUserPersonalDetails';
 import * as IOUUtils from '../libs/IOUUtils';
 import MenuItemWithTopDescription from './MenuItemWithTopDescription';
 import Navigation from '../libs/Navigation/Navigation';
 import optionPropTypes from './optionPropTypes';
 import * as CurrencyUtils from '../libs/CurrencyUtils';
+import Button from './Button';
+import * as Expensicons from './Icon/Expensicons';
 
 const propTypes = {
     /** Callback to inform parent modal of success */
@@ -82,9 +85,9 @@ const propTypes = {
 };
 
 const defaultProps = {
-    onConfirm: () => {},
-    onSendMoney: () => {},
-    onSelectParticipant: () => {},
+    onConfirm: () => { },
+    onSendMoney: () => { },
+    onSelectParticipant: () => { },
     iouType: CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
     payeePersonalDetails: null,
     canModifyParticipants: false,
@@ -101,7 +104,10 @@ const defaultProps = {
 function MoneyRequestConfirmationList(props) {
     // Destructure functions from props to pass it as a dependecy to useCallback/useMemo hooks.
     // Prop functions pass props itself as a "this" value to the function which means they change every time props change.
-    const {translate, onSendMoney, onConfirm, onSelectParticipant} = props;
+    const { translate, onSendMoney, onConfirm, onSelectParticipant } = props;
+
+    // A flag and a toggler for showing the rest of the form fields
+    const [showAllFields, toggleShowAllFields] = useReducer((state) => !state, false);
 
     /**
      * Returns the participants with amount
@@ -272,6 +278,7 @@ function MoneyRequestConfirmationList(props) {
             />
         );
     }, [confirm, props.selectedParticipants, props.bankAccountRoute, props.iouCurrencyCode, props.iouType, props.isReadOnly, props.policyID, selectedParticipants, splitOrRequestOptions]);
+    console.log('list', props);
 
     return (
         <OptionsSelector
@@ -307,6 +314,34 @@ function MoneyRequestConfirmationList(props) {
                 style={[styles.moneyRequestMenuItem, styles.mb2]}
                 disabled={didConfirm || props.isReadOnly}
             />
+            <View style={[styles.flexRow, styles.justifyContentBetween, styles.mh3, styles.alignItemsCenter]}>
+                <View style={[styles.shortTermsHorizontalRule, styles.flex1]} />
+                <Button
+                    small
+                    onPress={toggleShowAllFields}
+                    text={showAllFields ? translate('common.showLess') : translate('common.showMore')}
+                    shouldShowRightIcon
+                    iconRight={showAllFields ? Expensicons.UpArrow : Expensicons.DownArrow}
+                    style={styles.mh3}
+                />
+                <View style={[styles.shortTermsHorizontalRule, styles.flex1]} />
+            </View>
+            {showAllFields && (
+                <>
+                    <MenuItemWithTopDescription
+                        title={'2022'}
+                        description="Date"
+                        style={[styles.moneyRequestMenuItem, styles.mb2]}
+                        disabled={didConfirm || props.isReadOnly}
+                    />
+                    <MenuItemWithTopDescription
+                        title={props.iouMerchant}
+                        description="Merchant"
+                        style={[styles.moneyRequestMenuItem, styles.mb2]}
+                        disabled={didConfirm || props.isReadOnly}
+                    />
+                </>
+            )}
         </OptionsSelector>
     );
 }
diff --git a/src/components/MoneyRequestDetails.js b/src/components/MoneyRequestDetails.js
index f8c371aa5a58..cf9d7ddf70aa 100644
--- a/src/components/MoneyRequestDetails.js
+++ b/src/components/MoneyRequestDetails.js
@@ -1,10 +1,10 @@
 import React from 'react';
-import {withOnyx} from 'react-native-onyx';
-import {View} from 'react-native';
+import { withOnyx } from 'react-native-onyx';
+import { View } from 'react-native';
 import PropTypes from 'prop-types';
 import lodashGet from 'lodash/get';
 import iouReportPropTypes from '../pages/iouReportPropTypes';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
+import withLocalize, { withLocalizePropTypes } from './withLocalize';
 import * as ReportUtils from '../libs/ReportUtils';
 import * as Expensicons from './Icon/Expensicons';
 import Text from './Text';
@@ -74,7 +74,7 @@ const defaultProps = {
 
 function MoneyRequestDetails(props) {
     // These are only used for the single transaction view and not for expense and iou reports
-    const {amount: transactionAmount, currency: transactionCurrency, comment: transactionDescription} = ReportUtils.getMoneyRequestAction(props.parentReportAction);
+    const { amount: transactionAmount, currency: transactionCurrency, comment: transactionDescription } = ReportUtils.getMoneyRequestAction(props.parentReportAction);
     const formattedTransactionAmount = transactionAmount && transactionCurrency && CurrencyUtils.convertToDisplayString(transactionAmount, transactionCurrency);
     const transactionDate = lodashGet(props.parentReportAction, ['created']);
     const formattedTransactionDate = DateUtils.getDateStringFromISOTimestamp(transactionDate);
@@ -92,14 +92,14 @@ function MoneyRequestDetails(props) {
     const shouldShowSettlementButton = !isSettled && !props.isSingleTransactionView && isPayer;
     const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
     const shouldShowPaypal = Boolean(lodashGet(props.personalDetails, [moneyRequestReport.ownerAccountID, 'payPalMeAddress']));
-    const {addWorkspaceRoomOrChatPendingAction, addWorkspaceRoomOrChatErrors} = ReportUtils.getReportOfflinePendingActionAndErrors(props.report);
+    const { addWorkspaceRoomOrChatPendingAction, addWorkspaceRoomOrChatErrors } = ReportUtils.getReportOfflinePendingActionAndErrors(props.report);
     return (
         <OfflineWithFeedback
             pendingAction={addWorkspaceRoomOrChatPendingAction}
             errors={addWorkspaceRoomOrChatErrors}
             shouldShowErrorMessages={false}
         >
-            <View style={[{backgroundColor: themeColors.highlightBG}, styles.pl0]}>
+            <View style={[{ backgroundColor: themeColors.highlightBG }, styles.pl0]}>
                 <View style={[styles.ph5, styles.pb2]}>
                     <Text style={[styles.textLabelSupporting, styles.lh16]}>{props.translate('common.to')}</Text>
                     <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.pv3]}>
@@ -177,22 +177,22 @@ function MoneyRequestDetails(props) {
                             description={`${props.translate('iou.amount')} • ${props.translate('iou.cash')}${isSettled ? ` • ${props.translate('iou.settledExpensify')}` : ''}`}
                             titleStyle={styles.newKansasLarge}
                             disabled={isSettled}
-                            // Note: These options are temporarily disabled while we figure out the required API changes
-                            // shouldShowRightIcon={!isSettled}
-                            // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.AMOUNT))}
+                        // Note: These options are temporarily disabled while we figure out the required API changes
+                        // shouldShowRightIcon={!isSettled}
+                        // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.AMOUNT))}
                         />
                         <MenuItemWithTopDescription
                             description={props.translate('common.description')}
                             title={transactionDescription}
                             disabled={isSettled}
-                            // shouldShowRightIcon={!isSettled}
-                            // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.DESCRIPTION))}
+                        // shouldShowRightIcon={!isSettled}
+                        // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.DESCRIPTION))}
                         />
                         <MenuItemWithTopDescription
                             description={props.translate('common.date')}
                             title={formattedTransactionDate}
-                            // shouldShowRightIcon={!isSettled}
-                            // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))}
+                        // shouldShowRightIcon={!isSettled}
+                        // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))}
                         />
                     </>
                 )}
@@ -210,7 +210,7 @@ export default compose(
     withLocalize,
     withOnyx({
         chatReport: {
-            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.chatReportID}`,
+            key: ({ report }) => `${ONYXKEYS.COLLECTION.REPORT}${report.chatReportID}`,
         },
         session: {
             key: ONYXKEYS.SESSION,
diff --git a/src/languages/en.js b/src/languages/en.js
index 4cf79bbcd097..85c82538cb45 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -1,4 +1,4 @@
-import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
+import { CONST as COMMON_CONST } from 'expensify-common/lib/CONST';
 import CONST from '../CONST';
 import * as ReportActionsUtils from '../libs/ReportActionsUtils';
 
@@ -72,7 +72,7 @@ export default {
         currentMonth: 'Current month',
         ssnLast4: 'Last 4 digits of SSN',
         ssnFull9: 'Full 9 digits of SSN',
-        addressLine: ({lineNumber}) => `Address line ${lineNumber}`,
+        addressLine: ({ lineNumber }) => `Address line ${lineNumber}`,
         personalAddress: 'Personal address',
         companyAddress: 'Company address',
         noPO: 'PO boxes and mail drop addresses are not allowed',
@@ -103,7 +103,7 @@ export default {
             acceptTerms: 'You must accept the Terms of Service to continue',
             phoneNumber: `Please enter a valid phone number, with the country code (e.g. ${CONST.EXAMPLE_PHONE_NUMBER})`,
             fieldRequired: 'This field is required.',
-            characterLimit: ({limit}) => `Exceeds the maximum length of ${limit} characters`,
+            characterLimit: ({ limit }) => `Exceeds the maximum length of ${limit} characters`,
             dateInvalid: 'Please select a valid date',
             invalidCharacter: 'Invalid character',
         },
@@ -133,14 +133,14 @@ export default {
         youAfterPreposition: 'you',
         your: 'your',
         conciergeHelp: 'Please reach out to Concierge for help.',
-        maxParticipantsReached: ({count}) => `You've selected the maximum number (${count}) of participants.`,
+        maxParticipantsReached: ({ count }) => `You've selected the maximum number (${count}) of participants.`,
         youAppearToBeOffline: 'You appear to be offline.',
         thisFeatureRequiresInternet: 'This feature requires an active internet connection to be used.',
         areYouSure: 'Are you sure?',
         verify: 'Verify',
         yesContinue: 'Yes, continue',
         websiteExample: 'e.g. https://www.expensify.com',
-        zipCodeExampleFormat: ({zipSampleFormat}) => (zipSampleFormat ? `e.g. ${zipSampleFormat}` : ''),
+        zipCodeExampleFormat: ({ zipSampleFormat }) => (zipSampleFormat ? `e.g. ${zipSampleFormat}` : ''),
         description: 'Description',
         with: 'with',
         shareCode: 'Share code',
@@ -152,6 +152,8 @@ export default {
         someone: 'Someone',
         total: 'Total',
         edit: 'Edit',
+        showMore: 'Show more',
+        showLess: 'Show less',
     },
     anonymousReportFooter: {
         logoTagline: 'Join in on the discussion.',
@@ -232,8 +234,8 @@ export default {
         phrase2: "Money talks. And now that chat and payments are in one place, it's also easy.",
         phrase3: 'Your payments get to you as fast as you can get your point across.',
         enterPassword: 'Please enter your password',
-        newFaceEnterMagicCode: ({login}) => `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
-        welcomeEnterMagicCode: ({login}) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
+        newFaceEnterMagicCode: ({ login }) => `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
+        welcomeEnterMagicCode: ({ login }) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
     login: {
         hero: {
@@ -242,8 +244,8 @@ export default {
         },
     },
     thirdPartySignIn: {
-        alreadySignedIn: ({email}) => `You are already signed in as ${email}.`,
-        goBackMessage: ({provider}) => `Don't want to sign in with ${provider}?`,
+        alreadySignedIn: ({ email }) => `You are already signed in as ${email}.`,
+        goBackMessage: ({ provider }) => `Don't want to sign in with ${provider}?`,
         continueWithMyCurrentSession: 'Continue with my current session',
         redirectToDesktopMessage: "We'll redirect you to the desktop app once you finish signing in.",
         signInAgreementMessage: 'By logging in, you agree to the',
@@ -268,7 +270,7 @@ export default {
         ],
         blockedFromConcierge: 'Communication is barred',
         fileUploadFailed: 'Upload failed. File is not supported.',
-        localTime: ({user, time}) => `It's ${time} for ${user}`,
+        localTime: ({ user, time }) => `It's ${time} for ${user}`,
         edited: '(edited)',
         emoji: 'Emoji',
         collapse: 'Collapse',
@@ -283,8 +285,8 @@ export default {
         markAsUnread: 'Mark as unread',
         markAsRead: 'Mark as read',
         editComment: 'Edit comment',
-        deleteAction: ({action}) => `Delete ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}`,
-        deleteConfirmation: ({action}) => `Are you sure you want to delete this ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}?`,
+        deleteAction: ({ action }) => `Delete ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}`,
+        deleteConfirmation: ({ action }) => `Are you sure you want to delete this ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}?`,
         onlyVisible: 'Only visible to',
         replyInThread: 'Reply in thread',
         flagAsOffensive: 'Flag as offensive',
@@ -296,12 +298,12 @@ export default {
     reportActionsView: {
         beginningOfArchivedRoomPartOne: 'You missed the party in ',
         beginningOfArchivedRoomPartTwo: ", there's nothing to see here.",
-        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}) => `Collaboration with everyone at ${domainRoom} starts here! 🎉\nUse `,
+        beginningOfChatHistoryDomainRoomPartOne: ({ domainRoom }) => `Collaboration with everyone at ${domainRoom} starts here! 🎉\nUse `,
         beginningOfChatHistoryDomainRoomPartTwo: ' to chat with colleagues, share tips, and ask questions.',
-        beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}) => `Collaboration among ${workspaceName} admins starts here! 🎉\nUse `,
+        beginningOfChatHistoryAdminRoomPartOne: ({ workspaceName }) => `Collaboration among ${workspaceName} admins starts here! 🎉\nUse `,
         beginningOfChatHistoryAdminRoomPartTwo: ' to chat about topics such as workspace configurations and more.',
-        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}) => `Collaboration between all ${workspaceName} members starts here! 🎉\nUse `,
-        beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}) => ` to chat about anything ${workspaceName} related.`,
+        beginningOfChatHistoryAnnounceRoomPartOne: ({ workspaceName }) => `Collaboration between all ${workspaceName} members starts here! 🎉\nUse `,
+        beginningOfChatHistoryAnnounceRoomPartTwo: ({ workspaceName }) => ` to chat about anything ${workspaceName} related.`,
         beginningOfChatHistoryUserRoomPartOne: 'Collaboration starts here! 🎉\nUse this space to chat about anything ',
         beginningOfChatHistoryUserRoomPartTwo: ' related.',
         beginningOfChatHistory: 'This is the beginning of your chat with ',
@@ -326,12 +328,12 @@ export default {
     },
     reportArchiveReasons: {
         [CONST.REPORT.ARCHIVE_REASON.DEFAULT]: 'This chat room has been archived.',
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({displayName}) => `This workspace chat is no longer active because ${displayName} closed their account.`,
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({displayName, oldDisplayName}) =>
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({ displayName }) => `This workspace chat is no longer active because ${displayName} closed their account.`,
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({ displayName, oldDisplayName }) =>
             `This workspace chat is no longer active because ${oldDisplayName} has merged their account with ${displayName}.`,
-        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({displayName, policyName}) =>
+        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({ displayName, policyName }) =>
             `This workspace chat is no longer active because ${displayName} is no longer a member of the ${policyName} workspace.`,
-        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}) => `This workspace chat is no longer active because ${policyName} is no longer an active workspace.`,
+        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({ policyName }) => `This workspace chat is no longer active because ${policyName} is no longer an active workspace.`,
     },
     writeCapabilityPage: {
         label: 'Who can post',
@@ -366,24 +368,24 @@ export default {
         settledExpensify: 'Paid',
         settledElsewhere: 'Paid elsewhere',
         settledPaypalMe: 'Paid using Paypal.me',
-        settleExpensify: ({formattedAmount}) => `Pay ${formattedAmount} with Expensify`,
+        settleExpensify: ({ formattedAmount }) => `Pay ${formattedAmount} with Expensify`,
         payElsewhere: 'Pay elsewhere',
-        settlePaypalMe: ({formattedAmount}) => `Pay ${formattedAmount} with PayPal.me`,
-        requestAmount: ({amount}) => `request ${amount}`,
-        splitAmount: ({amount}) => `split ${amount}`,
-        amountEach: ({amount}) => `${amount} each`,
-        payerOwesAmount: ({payer, amount}) => `${payer} owes ${amount}`,
-        payerOwes: ({payer}) => `${payer} owes: `,
-        payerPaidAmount: ({payer, amount}) => `${payer} paid ${amount}`,
-        payerPaid: ({payer}) => `${payer} paid: `,
-        payerSettled: ({amount}) => `paid ${amount}`,
-        paidElsewhereWithAmount: ({amount}) => `paid ${amount} elsewhere`,
-        paidUsingPaypalWithAmount: ({amount}) => `paid ${amount} using Paypal.me`,
-        paidUsingExpensifyWithAmount: ({amount}) => `paid ${amount} using Expensify`,
+        settlePaypalMe: ({ formattedAmount }) => `Pay ${formattedAmount} with PayPal.me`,
+        requestAmount: ({ amount }) => `request ${amount}`,
+        splitAmount: ({ amount }) => `split ${amount}`,
+        amountEach: ({ amount }) => `${amount} each`,
+        payerOwesAmount: ({ payer, amount }) => `${payer} owes ${amount}`,
+        payerOwes: ({ payer }) => `${payer} owes: `,
+        payerPaidAmount: ({ payer, amount }) => `${payer} paid ${amount}`,
+        payerPaid: ({ payer }) => `${payer} paid: `,
+        payerSettled: ({ amount }) => `paid ${amount}`,
+        paidElsewhereWithAmount: ({ amount }) => `paid ${amount} elsewhere`,
+        paidUsingPaypalWithAmount: ({ amount }) => `paid ${amount} using Paypal.me`,
+        paidUsingExpensifyWithAmount: ({ amount }) => `paid ${amount} using Expensify`,
         noReimbursableExpenses: 'This report has an invalid amount',
         pendingConversionMessage: "Total will update when you're back online",
-        threadRequestReportName: ({formattedAmount, comment}) => `${formattedAmount} request${comment ? ` for ${comment}` : ''}`,
-        threadSentMoneyReportName: ({formattedAmount, comment}) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
+        threadRequestReportName: ({ formattedAmount, comment }) => `${formattedAmount} request${comment ? ` for ${comment}` : ''}`,
+        threadSentMoneyReportName: ({ formattedAmount, comment }) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
         error: {
             invalidSplit: 'Split amounts do not equal total amount',
             other: 'Unexpected error, please try again later',
@@ -410,10 +412,10 @@ export default {
         editImage: 'Edit photo',
         imageUploadFailed: 'Image upload failed',
         deleteWorkspaceError: 'Sorry, there was an unexpected problem deleting your workspace avatar.',
-        sizeExceeded: ({maxUploadSizeInMB}) => `The selected image exceeds the maximum upload size of ${maxUploadSizeInMB}MB.`,
-        resolutionConstraints: ({minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx}) =>
+        sizeExceeded: ({ maxUploadSizeInMB }) => `The selected image exceeds the maximum upload size of ${maxUploadSizeInMB}MB.`,
+        resolutionConstraints: ({ minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx }) =>
             `Please upload an image larger than ${minHeightInPx}x${minWidthInPx} pixels and smaller than ${maxHeightInPx}x${maxWidthInPx} pixels.`,
-        notAllowedExtension: ({allowedExtensions}) => `Profile picture must be one of the following types: ${allowedExtensions.join(', ')}.`,
+        notAllowedExtension: ({ allowedExtensions }) => `Profile picture must be one of the following types: ${allowedExtensions.join(', ')}.`,
     },
     profilePage: {
         profile: 'Profile',
@@ -449,7 +451,7 @@ export default {
         helpTextAfterEmail: ' from multiple email addresses.',
         pleaseVerify: 'Please verify this contact method',
         getInTouch: "Whenever we need to get in touch with you, we'll use this contact method.",
-        enterMagicCode: ({contactMethod}) => `Please enter the magic code sent to ${contactMethod}`,
+        enterMagicCode: ({ contactMethod }) => `Please enter the magic code sent to ${contactMethod}`,
         setAsDefault: 'Set as default',
         yourDefaultContactMethod:
             'This is your current default contact method. You will not be able to delete this contact method until you set an alternative default by selecting another contact method and pressing “Set as default”.',
@@ -640,9 +642,9 @@ export default {
         addBankAccountFailure: 'An unexpected error occurred while trying to add your bank account. Please try again.',
     },
     transferAmountPage: {
-        transfer: ({amount}) => `Transfer${amount ? ` ${amount}` : ''}`,
+        transfer: ({ amount }) => `Transfer${amount ? ` ${amount}` : ''}`,
         instant: 'Instant (Debit card)',
-        instantSummary: ({rate, minAmount}) => `${rate}% fee (${minAmount} minimum)`,
+        instantSummary: ({ rate, minAmount }) => `${rate}% fee (${minAmount} minimum)`,
         ach: '1-3 Business days (Bank account)',
         achSummary: 'No fee',
         whichAccount: 'Which account?',
@@ -773,7 +775,7 @@ export default {
         },
         cannotGetAccountDetails: "Couldn't retrieve account details, please try to sign in again.",
         loginForm: 'Login form',
-        notYou: ({user}) => `Not ${user}?`,
+        notYou: ({ user }) => `Not ${user}?`,
     },
     personalDetails: {
         error: {
@@ -789,27 +791,27 @@ export default {
         legalLastName: 'Legal last name',
         homeAddress: 'Home address',
         error: {
-            dateShouldBeBefore: ({dateString}) => `Date should be before ${dateString}.`,
-            dateShouldBeAfter: ({dateString}) => `Date should be after ${dateString}.`,
+            dateShouldBeBefore: ({ dateString }) => `Date should be before ${dateString}.`,
+            dateShouldBeAfter: ({ dateString }) => `Date should be after ${dateString}.`,
             hasInvalidCharacter: 'Name can only include latin letters and numbers.',
-            incorrectZipFormat: ({zipFormat}) => `Incorrect zip code format.${zipFormat ? ` Acceptable format: ${zipFormat}` : ''}`,
+            incorrectZipFormat: ({ zipFormat }) => `Incorrect zip code format.${zipFormat ? ` Acceptable format: ${zipFormat}` : ''}`,
         },
     },
     resendValidationForm: {
         linkHasBeenResent: 'Link has been re-sent',
-        weSentYouMagicSignInLink: ({login, loginType}) => `I've sent a magic sign-in link to ${login}. Please check your ${loginType} to sign in.`,
+        weSentYouMagicSignInLink: ({ login, loginType }) => `I've sent a magic sign-in link to ${login}. Please check your ${loginType} to sign in.`,
         resendLink: 'Resend link',
     },
     unlinkLoginForm: {
-        toValidateLogin: ({primaryLogin, secondaryLogin}) => `To validate ${secondaryLogin}, please resend the magic code from the Account Settings of ${primaryLogin}.`,
-        noLongerHaveAccess: ({primaryLogin}) => `If you no longer have access to ${primaryLogin}, please unlink your accounts.`,
+        toValidateLogin: ({ primaryLogin, secondaryLogin }) => `To validate ${secondaryLogin}, please resend the magic code from the Account Settings of ${primaryLogin}.`,
+        noLongerHaveAccess: ({ primaryLogin }) => `If you no longer have access to ${primaryLogin}, please unlink your accounts.`,
         unlink: 'Unlink',
         linkSent: 'Link sent!',
         succesfullyUnlinkedLogin: 'Secondary login successfully unlinked!',
     },
     emailDeliveryFailurePage: {
-        ourEmailProvider: ({login}) => `Our email provider has temporarily suspended emails to ${login} due to delivery issues. To unblock your login, please follow these steps:`,
-        confirmThat: ({login}) => `Confirm that ${login} is spelled correctly and is a real, deliverable email address. `,
+        ourEmailProvider: ({ login }) => `Our email provider has temporarily suspended emails to ${login} due to delivery issues. To unblock your login, please follow these steps:`,
+        confirmThat: ({ login }) => `Confirm that ${login} is spelled correctly and is a real, deliverable email address. `,
         emailAliases: 'Email aliases such as "expenses@domain.com" must have access to their own email inbox for it to be a valid Expensify login.',
         ensureYourEmailClient: 'Ensure your email client allows expensify.com emails. ',
         youCanFindDirections: 'You can find directions on how to complete this step ',
@@ -845,7 +847,7 @@ export default {
         setPasswordLinkInvalid: 'This set password link is invalid or has expired. A new one is waiting for you in your email inbox!',
         validateAccount: 'Verify account',
     },
-    stepCounter: ({step, total, text}) => {
+    stepCounter: ({ step, total, text }) => {
         let result = `Step ${step}`;
 
         if (total) {
@@ -1132,7 +1134,7 @@ export default {
             unavailable: 'Unavailable workspace',
             memberNotFound: 'Member not found. To invite a new member to the workspace, please use the Invite button above.',
             notAuthorized: `You do not have access to this page. Are you trying to join the workspace? Please reach out to the owner of this workspace so they can add you as a member! Something else? Reach out to ${CONST.EMAIL.CONCIERGE}`,
-            goToRoom: ({roomName}) => `Go to ${roomName} room`,
+            goToRoom: ({ roomName }) => `Go to ${roomName} room`,
         },
         emptyWorkspace: {
             title: 'Create a new workspace',
@@ -1224,7 +1226,7 @@ export default {
             personalMessagePrompt: 'Message',
             genericFailureMessage: 'An error occurred inviting the user to the workspace, please try again.',
             inviteNoMembersError: 'Please select at least one member to invite',
-            welcomeNote: ({workspaceName}) =>
+            welcomeNote: ({ workspaceName }) =>
                 `You have been invited to ${workspaceName || 'a workspace'}! Download the Expensify mobile app at use.expensify.com/download to start tracking your expenses.`,
         },
         editor: {
@@ -1300,12 +1302,12 @@ export default {
         public_announceDescription: 'Anyone can find this room',
         createRoom: 'Create room',
         roomAlreadyExistsError: 'A room with this name already exists',
-        roomNameReservedError: ({reservedName}) => `${reservedName} is a default room on all workspaces. Please choose another name.`,
+        roomNameReservedError: ({ reservedName }) => `${reservedName} is a default room on all workspaces. Please choose another name.`,
         roomNameInvalidError: 'Room names can only include lowercase letters, numbers and hyphens',
         pleaseEnterRoomName: 'Please enter a room name',
         pleaseSelectWorkspace: 'Please select a workspace',
-        renamedRoomAction: ({oldName, newName}) => ` renamed this room from ${oldName} to ${newName}`,
-        roomRenamedTo: ({newName}) => `Room renamed to ${newName}`,
+        renamedRoomAction: ({ oldName, newName }) => ` renamed this room from ${oldName} to ${newName}`,
+        roomRenamedTo: ({ newName }) => `Room renamed to ${newName}`,
         social: 'social',
         selectAWorkspace: 'Select a workspace',
         growlMessageOnRenameError: 'Unable to rename policy room, please check your connection and try again.',
@@ -1455,8 +1457,8 @@ export default {
         noActivityYet: 'No activity yet',
     },
     chronos: {
-        oooEventSummaryFullDay: ({summary, dayCount, date}) => `${summary} for ${dayCount} ${dayCount === 1 ? 'day' : 'days'} until ${date}`,
-        oooEventSummaryPartialDay: ({summary, timePeriod, date}) => `${summary} from ${timePeriod} on ${date}`,
+        oooEventSummaryFullDay: ({ summary, dayCount, date }) => `${summary} for ${dayCount} ${dayCount === 1 ? 'day' : 'days'} until ${date}`,
+        oooEventSummaryPartialDay: ({ summary, timePeriod, date }) => `${summary} from ${timePeriod} on ${date}`,
     },
     footer: {
         features: 'Features',
@@ -1509,7 +1511,7 @@ export default {
     threads: {
         replies: 'Replies',
         reply: 'Reply',
-        parentNavigationSummary: ({rootReportName, workspaceName}) => `From ${rootReportName}${workspaceName ? ` in ${workspaceName}` : ''}`,
+        parentNavigationSummary: ({ rootReportName, workspaceName }) => `From ${rootReportName}${workspaceName ? ` in ${workspaceName}` : ''}`,
     },
     qrCodes: {
         copyUrlToClipboard: 'Copy URL to clipboard',
diff --git a/src/languages/es.js b/src/languages/es.js
index 27fde8e602ad..ee2984e8f8d5 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -71,7 +71,7 @@ export default {
         currentMonth: 'Mes actual',
         ssnLast4: 'Últimos 4 dígitos de su SSN',
         ssnFull9: 'Los 9 dígitos del SSN',
-        addressLine: ({lineNumber}) => `Dirección línea ${lineNumber}`,
+        addressLine: ({ lineNumber }) => `Dirección línea ${lineNumber}`,
         personalAddress: 'Dirección física personal',
         companyAddress: 'Dirección física de la empresa',
         noPO: 'No se aceptan apartados ni direcciones postales',
@@ -102,7 +102,7 @@ export default {
             acceptTerms: 'Debes aceptar los Términos de Servicio para continuar',
             phoneNumber: `Introduce un teléfono válido, incluyendo el código del país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER})`,
             fieldRequired: 'Este campo es obligatorio.',
-            characterLimit: ({limit}) => `Supera el límite de ${limit} caracteres`,
+            characterLimit: ({ limit }) => `Supera el límite de ${limit} caracteres`,
             dateInvalid: 'Por favor, selecciona una fecha válida',
             invalidCharacter: 'Carácter invalido',
         },
@@ -132,14 +132,14 @@ export default {
         youAfterPreposition: 'ti',
         your: 'tu',
         conciergeHelp: 'Por favor, contacta con Concierge para obtener ayuda.',
-        maxParticipantsReached: ({count}) => `Has seleccionado el número máximo (${count}) de participantes.`,
+        maxParticipantsReached: ({ count }) => `Has seleccionado el número máximo (${count}) de participantes.`,
         youAppearToBeOffline: 'Parece que estás desconectado.',
         thisFeatureRequiresInternet: 'Esta función requiere una conexión a Internet activa para ser utilizada.',
         areYouSure: '¿Estás seguro?',
         verify: 'Verifique',
         yesContinue: 'Sí, Continuar',
         websiteExample: 'p. ej. https://www.expensify.com',
-        zipCodeExampleFormat: ({zipSampleFormat}) => (zipSampleFormat ? `p. ej. ${zipSampleFormat}` : ''),
+        zipCodeExampleFormat: ({ zipSampleFormat }) => (zipSampleFormat ? `p. ej. ${zipSampleFormat}` : ''),
         description: 'Descripción',
         with: 'con',
         shareCode: 'Compartir código',
@@ -151,6 +151,8 @@ export default {
         someone: 'Alguien',
         total: 'Total',
         edit: 'Editar',
+        showMore: 'Mostrar más',
+        showLess: 'Mostrar menos',
     },
     anonymousReportFooter: {
         logoTagline: 'Únete a la discussion.',
@@ -231,8 +233,8 @@ export default {
         phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.',
         phrase3: 'Tus pagos llegan tan rápido como tus mensajes.',
         enterPassword: 'Por favor, introduce tu contraseña',
-        newFaceEnterMagicCode: ({login}) => `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
-        welcomeEnterMagicCode: ({login}) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
+        newFaceEnterMagicCode: ({ login }) => `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
+        welcomeEnterMagicCode: ({ login }) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
     login: {
         hero: {
@@ -241,8 +243,8 @@ export default {
         },
     },
     thirdPartySignIn: {
-        alreadySignedIn: ({email}) => `Ya has iniciado sesión con ${email}.`,
-        goBackMessage: ({provider}) => `No quieres iniciar sesión con ${provider}?`,
+        alreadySignedIn: ({ email }) => `Ya has iniciado sesión con ${email}.`,
+        goBackMessage: ({ provider }) => `No quieres iniciar sesión con ${provider}?`,
         continueWithMyCurrentSession: 'Continuar con mi sesión actual',
         redirectToDesktopMessage: 'Lo redirigiremos a la aplicación de escritorio una vez que termine de iniciar sesión.',
         signInAgreementMessage: 'Al iniciar sesión, aceptas las',
@@ -267,7 +269,7 @@ export default {
         ],
         blockedFromConcierge: 'Comunicación no permitida',
         fileUploadFailed: 'Subida fallida. El archivo no es compatible.',
-        localTime: ({user, time}) => `Son las ${time} para ${user}`,
+        localTime: ({ user, time }) => `Son las ${time} para ${user}`,
         edited: '(editado)',
         emoji: 'Emoji',
         collapse: 'Colapsar',
@@ -282,8 +284,8 @@ export default {
         markAsUnread: 'Marcar como no leído',
         markAsRead: 'Marcar como leído',
         editComment: 'Editar comentario',
-        deleteAction: ({action}) => `Eliminar ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
-        deleteConfirmation: ({action}) => `¿Estás seguro de que quieres eliminar este ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
+        deleteAction: ({ action }) => `Eliminar ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
+        deleteConfirmation: ({ action }) => `¿Estás seguro de que quieres eliminar este ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
         onlyVisible: 'Visible sólo para',
         replyInThread: 'Responder en el hilo',
         flagAsOffensive: 'Marcar como ofensivo',
@@ -295,12 +297,12 @@ export default {
     reportActionsView: {
         beginningOfArchivedRoomPartOne: 'Te perdiste la fiesta en ',
         beginningOfArchivedRoomPartTwo: ', no hay nada que ver aquí.',
-        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}) => `Colabora aquí con todos los participantes de ${domainRoom}! 🎉\nUtiliza `,
+        beginningOfChatHistoryDomainRoomPartOne: ({ domainRoom }) => `Colabora aquí con todos los participantes de ${domainRoom}! 🎉\nUtiliza `,
         beginningOfChatHistoryDomainRoomPartTwo: ' para chatear con compañeros, compartir consejos o hacer una pregunta.',
-        beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}) => `Este es el lugar para que los administradores de ${workspaceName} colaboren! 🎉\nUsa `,
+        beginningOfChatHistoryAdminRoomPartOne: ({ workspaceName }) => `Este es el lugar para que los administradores de ${workspaceName} colaboren! 🎉\nUsa `,
         beginningOfChatHistoryAdminRoomPartTwo: ' para chatear sobre temas como la configuración del espacio de trabajo y mas.',
-        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}) => `Este es el lugar para que todos los miembros de ${workspaceName} colaboren! 🎉\nUsa `,
-        beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}) => ` para chatear sobre cualquier cosa relacionada con ${workspaceName}.`,
+        beginningOfChatHistoryAnnounceRoomPartOne: ({ workspaceName }) => `Este es el lugar para que todos los miembros de ${workspaceName} colaboren! 🎉\nUsa `,
+        beginningOfChatHistoryAnnounceRoomPartTwo: ({ workspaceName }) => ` para chatear sobre cualquier cosa relacionada con ${workspaceName}.`,
         beginningOfChatHistoryUserRoomPartOne: 'Este es el lugar para colaborar! 🎉\nUsa este espacio para chatear sobre cualquier cosa relacionada con ',
         beginningOfChatHistoryUserRoomPartTwo: '.',
         beginningOfChatHistory: 'Aquí comienzan tus conversaciones con ',
@@ -325,12 +327,12 @@ export default {
     },
     reportArchiveReasons: {
         [CONST.REPORT.ARCHIVE_REASON.DEFAULT]: 'Esta sala de chat ha sido eliminada.',
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({displayName}) => `Este chat de espacio de trabajo esta desactivado porque ${displayName} ha cerrado su cuenta.`,
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({displayName, oldDisplayName}) =>
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({ displayName }) => `Este chat de espacio de trabajo esta desactivado porque ${displayName} ha cerrado su cuenta.`,
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({ displayName, oldDisplayName }) =>
             `Este chat de espacio de trabajo esta desactivado porque ${oldDisplayName} ha combinado su cuenta con ${displayName}.`,
-        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({displayName, policyName}) =>
+        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({ displayName, policyName }) =>
             `Este chat de espacio de trabajo esta desactivado porque ${displayName} ha dejado de ser miembro del espacio de trabajo ${policyName}.`,
-        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}) => `Este chat de espacio de trabajo esta desactivado porque el espacio de trabajo ${policyName} se ha eliminado.`,
+        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({ policyName }) => `Este chat de espacio de trabajo esta desactivado porque el espacio de trabajo ${policyName} se ha eliminado.`,
     },
     writeCapabilityPage: {
         label: 'Quién puede postear',
@@ -365,24 +367,24 @@ export default {
         settledExpensify: 'Pagado',
         settledElsewhere: 'Pagado de otra forma',
         settledPaypalMe: 'Pagado con PayPal.me',
-        settleExpensify: ({formattedAmount}) => `Pagar ${formattedAmount} con Expensify`,
+        settleExpensify: ({ formattedAmount }) => `Pagar ${formattedAmount} con Expensify`,
         payElsewhere: 'Pagar de otra forma',
-        settlePaypalMe: ({formattedAmount}) => `Pagar ${formattedAmount} con PayPal.me`,
-        requestAmount: ({amount}) => `solicitar ${amount}`,
-        splitAmount: ({amount}) => `dividir ${amount}`,
-        amountEach: ({amount}) => `${amount} cada uno`,
-        payerOwesAmount: ({payer, amount}) => `${payer} debe ${amount}`,
-        payerOwes: ({payer}) => `${payer} debe: `,
-        payerPaidAmount: ({payer, amount}) => `${payer} pagó ${amount}`,
-        payerPaid: ({payer}) => `${payer} pagó: `,
-        payerSettled: ({amount}) => `pagó ${amount}`,
-        paidElsewhereWithAmount: ({amount}) => `pagó ${amount} de otra forma`,
-        paidUsingPaypalWithAmount: ({amount}) => `pagó ${amount} con PayPal.me`,
-        paidUsingExpensifyWithAmount: ({amount}) => `pagó ${amount} con Expensify`,
+        settlePaypalMe: ({ formattedAmount }) => `Pagar ${formattedAmount} con PayPal.me`,
+        requestAmount: ({ amount }) => `solicitar ${amount}`,
+        splitAmount: ({ amount }) => `dividir ${amount}`,
+        amountEach: ({ amount }) => `${amount} cada uno`,
+        payerOwesAmount: ({ payer, amount }) => `${payer} debe ${amount}`,
+        payerOwes: ({ payer }) => `${payer} debe: `,
+        payerPaidAmount: ({ payer, amount }) => `${payer} pagó ${amount}`,
+        payerPaid: ({ payer }) => `${payer} pagó: `,
+        payerSettled: ({ amount }) => `pagó ${amount}`,
+        paidElsewhereWithAmount: ({ amount }) => `pagó ${amount} de otra forma`,
+        paidUsingPaypalWithAmount: ({ amount }) => `pagó ${amount} con PayPal.me`,
+        paidUsingExpensifyWithAmount: ({ amount }) => `pagó ${amount} con Expensify`,
         noReimbursableExpenses: 'El monto de este informe es inválido',
         pendingConversionMessage: 'El total se actualizará cuando estés online',
-        threadRequestReportName: ({formattedAmount, comment}) => `Solicitud de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
-        threadSentMoneyReportName: ({formattedAmount, comment}) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
+        threadRequestReportName: ({ formattedAmount, comment }) => `Solicitud de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
+        threadSentMoneyReportName: ({ formattedAmount, comment }) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
         error: {
             invalidSplit: 'La suma de las partes no equivale al monto total',
             other: 'Error inesperado, por favor inténtalo más tarde',
@@ -409,10 +411,10 @@ export default {
         editImage: 'Editar foto',
         imageUploadFailed: 'Error al cargar la imagen',
         deleteWorkspaceError: 'Lo sentimos, hubo un problema eliminando el avatar de su espacio de trabajo.',
-        sizeExceeded: ({maxUploadSizeInMB}) => `La imagen supera el tamaño máximo de ${maxUploadSizeInMB}MB.`,
-        resolutionConstraints: ({minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx}) =>
+        sizeExceeded: ({ maxUploadSizeInMB }) => `La imagen supera el tamaño máximo de ${maxUploadSizeInMB}MB.`,
+        resolutionConstraints: ({ minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx }) =>
             `Por favor, elige una imagen más grande que ${minHeightInPx}x${minWidthInPx} píxeles y más pequeña que ${maxHeightInPx}x${maxWidthInPx} píxeles.`,
-        notAllowedExtension: ({allowedExtensions}) => `La foto de perfil debe ser de uno de los siguientes tipos: ${allowedExtensions.join(', ')}.`,
+        notAllowedExtension: ({ allowedExtensions }) => `La foto de perfil debe ser de uno de los siguientes tipos: ${allowedExtensions.join(', ')}.`,
     },
     profilePage: {
         profile: 'Perfil',
@@ -449,7 +451,7 @@ export default {
         helpTextAfterEmail: ' desde varias direcciones de correo electrónico.',
         pleaseVerify: 'Por favor, verifica este método de contacto',
         getInTouch: 'Utilizaremos este método de contacto cuando necesitemos contactarte.',
-        enterMagicCode: ({contactMethod}) => `Por favor, introduce el código mágico enviado a ${contactMethod}`,
+        enterMagicCode: ({ contactMethod }) => `Por favor, introduce el código mágico enviado a ${contactMethod}`,
         setAsDefault: 'Establecer como predeterminado',
         yourDefaultContactMethod:
             'Este es tu método de contacto predeterminado. No podrás eliminarlo hasta que añadas otro método de contacto y lo marques como predeterminado pulsando "Establecer como predeterminado".',
@@ -641,9 +643,9 @@ export default {
         addBankAccountFailure: 'Ocurrió un error inesperado al intentar agregar su cuenta bancaria. Inténtalo de nuevo.',
     },
     transferAmountPage: {
-        transfer: ({amount}) => `Transferir${amount ? ` ${amount}` : ''}`,
+        transfer: ({ amount }) => `Transferir${amount ? ` ${amount}` : ''}`,
         instant: 'Instante',
-        instantSummary: ({rate, minAmount}) => `Tarifa del ${rate}% (${minAmount} mínimo)`,
+        instantSummary: ({ rate, minAmount }) => `Tarifa del ${rate}% (${minAmount} mínimo)`,
         ach: '1-3 días laborales',
         achSummary: 'Sin cargo',
         whichAccount: '¿Qué cuenta?',
@@ -775,7 +777,7 @@ export default {
         },
         cannotGetAccountDetails: 'No se pudieron cargar los detalles de tu cuenta. Por favor, intenta iniciar sesión de nuevo.',
         loginForm: 'Formulario de inicio de sesión',
-        notYou: ({user}) => `¿No eres ${user}?`,
+        notYou: ({ user }) => `¿No eres ${user}?`,
     },
     personalDetails: {
         error: {
@@ -791,28 +793,28 @@ export default {
         legalLastName: 'Apellidos legales',
         homeAddress: 'Domicilio',
         error: {
-            dateShouldBeBefore: ({dateString}) => `La fecha debe ser anterior a ${dateString}.`,
-            dateShouldBeAfter: ({dateString}) => `La fecha debe ser posterior a ${dateString}.`,
-            incorrectZipFormat: ({zipFormat}) => `Formato de código postal incorrecto.${zipFormat ? ` Formato aceptable: ${zipFormat}` : ''}`,
+            dateShouldBeBefore: ({ dateString }) => `La fecha debe ser anterior a ${dateString}.`,
+            dateShouldBeAfter: ({ dateString }) => `La fecha debe ser posterior a ${dateString}.`,
+            incorrectZipFormat: ({ zipFormat }) => `Formato de código postal incorrecto.${zipFormat ? ` Formato aceptable: ${zipFormat}` : ''}`,
             hasInvalidCharacter: 'El nombre solo puede contener números y caracteres latinos.',
         },
     },
     resendValidationForm: {
         linkHasBeenResent: 'El enlace se ha reenviado',
-        weSentYouMagicSignInLink: ({login, loginType}) => `Te he enviado un hiperenlace mágico para iniciar sesión a ${login}. Por favor, revisa tu ${loginType}`,
+        weSentYouMagicSignInLink: ({ login, loginType }) => `Te he enviado un hiperenlace mágico para iniciar sesión a ${login}. Por favor, revisa tu ${loginType}`,
         resendLink: 'Reenviar enlace',
     },
     unlinkLoginForm: {
-        toValidateLogin: ({primaryLogin, secondaryLogin}) => `Para validar ${secondaryLogin}, reenvía el código mágico desde la Configuración de la cuenta de ${primaryLogin}.`,
-        noLongerHaveAccess: ({primaryLogin}) => `Si ya no tienes acceso a ${primaryLogin} por favor, desvincula las cuentas.`,
+        toValidateLogin: ({ primaryLogin, secondaryLogin }) => `Para validar ${secondaryLogin}, reenvía el código mágico desde la Configuración de la cuenta de ${primaryLogin}.`,
+        noLongerHaveAccess: ({ primaryLogin }) => `Si ya no tienes acceso a ${primaryLogin} por favor, desvincula las cuentas.`,
         unlink: 'Desvincular',
         linkSent: '¡Enlace enviado!',
         succesfullyUnlinkedLogin: '¡Nombre de usuario secundario desvinculado correctamente!',
     },
     emailDeliveryFailurePage: {
-        ourEmailProvider: ({login}) =>
+        ourEmailProvider: ({ login }) =>
             `Nuestro proveedor de correo electrónico ha suspendido temporalmente los correos electrónicos a ${login} debido a problemas de entrega. Para desbloquear el inicio de sesión, sigue estos pasos:`,
-        confirmThat: ({login}) => `Confirma que ${login} está escrito correctamente y que es una dirección de correo electrónico real que puede recibir correos. `,
+        confirmThat: ({ login }) => `Confirma que ${login} está escrito correctamente y que es una dirección de correo electrónico real que puede recibir correos. `,
         emailAliases:
             'Los alias de correo electrónico como "expenses@domain.com" deben tener acceso a su propia bandeja de entrada de correo electrónico para que sea un inicio de sesión válido de Expensify.',
         ensureYourEmailClient: 'Asegúrese de que su cliente de correo electrónico permita correos electrónicos de expensify.com. ',
@@ -849,7 +851,7 @@ export default {
         setPasswordLinkInvalid: 'El enlace para configurar tu contraseña ha expirado. Te hemos enviado un nuevo enlace a tu correo.',
         validateAccount: 'Verificar cuenta',
     },
-    stepCounter: ({step, total, text}) => {
+    stepCounter: ({ step, total, text }) => {
         let result = `Paso ${step}`;
 
         if (total) {
@@ -1141,7 +1143,7 @@ export default {
             unavailable: 'Espacio de trabajo no disponible',
             memberNotFound: 'Miembro no encontrado. Para invitar a un nuevo miembro al espacio de trabajo, por favor, utiliza el botón Invitar que está arriba.',
             notAuthorized: `No tienes acceso a esta página. ¿Estás tratando de unirte al espacio de trabajo? Comunícate con el propietario de este espacio de trabajo para que pueda agregarte como miembro. ¿Necesitas algo más? Comunícate con ${CONST.EMAIL.CONCIERGE}`,
-            goToRoom: ({roomName}) => `Ir a la sala ${roomName}`,
+            goToRoom: ({ roomName }) => `Ir a la sala ${roomName}`,
         },
         emptyWorkspace: {
             title: 'Crear un nuevo espacio de trabajo',
@@ -1234,7 +1236,7 @@ export default {
             personalMessagePrompt: 'Mensaje',
             inviteNoMembersError: 'Por favor, selecciona al menos un miembro a invitar',
             genericFailureMessage: 'Se produjo un error al invitar al usuario al espacio de trabajo. Vuelva a intentarlo..',
-            welcomeNote: ({workspaceName}) =>
+            welcomeNote: ({ workspaceName }) =>
                 `¡Has sido invitado a ${workspaceName}! Descargue la aplicación móvil Expensify en use.expensify.com/download para comenzar a rastrear sus gastos.`,
         },
         editor: {
@@ -1311,12 +1313,12 @@ export default {
         public_announceDescription: 'Cualquier persona puede unirse a esta sala',
         createRoom: 'Crea una sala de chat',
         roomAlreadyExistsError: 'Ya existe una sala con este nombre',
-        roomNameReservedError: ({reservedName}) => `${reservedName} es el nombre una sala por defecto de todos los espacios de trabajo. Por favor, elige otro nombre.`,
+        roomNameReservedError: ({ reservedName }) => `${reservedName} es el nombre una sala por defecto de todos los espacios de trabajo. Por favor, elige otro nombre.`,
         roomNameInvalidError: 'Los nombres de las salas solo pueden contener minúsculas, números y guiones',
         pleaseEnterRoomName: 'Por favor, escribe el nombre de una sala',
         pleaseSelectWorkspace: 'Por favor, selecciona un espacio de trabajo',
-        renamedRoomAction: ({oldName, newName}) => ` cambió el nombre de la sala de ${oldName} a ${newName}`,
-        roomRenamedTo: ({newName}) => `Sala renombrada a ${newName}`,
+        renamedRoomAction: ({ oldName, newName }) => ` cambió el nombre de la sala de ${oldName} a ${newName}`,
+        roomRenamedTo: ({ newName }) => `Sala renombrada a ${newName}`,
         social: 'social',
         selectAWorkspace: 'Seleccionar un espacio de trabajo',
         growlMessageOnRenameError: 'No se ha podido cambiar el nombre del espacio de trabajo, por favor, comprueba tu conexión e inténtalo de nuevo.',
@@ -1466,8 +1468,8 @@ export default {
         noActivityYet: 'Sin actividad todavía',
     },
     chronos: {
-        oooEventSummaryFullDay: ({summary, dayCount, date}) => `${summary} por ${dayCount} ${dayCount === 1 ? 'día' : 'días'} hasta el ${date}`,
-        oooEventSummaryPartialDay: ({summary, timePeriod, date}) => `${summary} de ${timePeriod} del ${date}`,
+        oooEventSummaryFullDay: ({ summary, dayCount, date }) => `${summary} por ${dayCount} ${dayCount === 1 ? 'día' : 'días'} hasta el ${date}`,
+        oooEventSummaryPartialDay: ({ summary, timePeriod, date }) => `${summary} de ${timePeriod} del ${date}`,
     },
     footer: {
         features: 'Características',
@@ -1980,7 +1982,7 @@ export default {
     threads: {
         replies: 'Respuestas',
         reply: 'Respuesta',
-        parentNavigationSummary: ({rootReportName, workspaceName}) => `De ${rootReportName}${workspaceName ? ` en ${workspaceName}` : ''}`,
+        parentNavigationSummary: ({ rootReportName, workspaceName }) => `De ${rootReportName}${workspaceName ? ` en ${workspaceName}` : ''}`,
     },
     qrCodes: {
         copyUrlToClipboard: 'Copiar URL al portapapeles',
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index e480120a7323..45105daa7119 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -100,7 +100,13 @@ function buildOnyxDataForMoneyRequest(
                 lastReadTime: DateUtils.getDBTime(),
                 hasOutstandingIOU: iouReport.total !== 0,
                 iouReportID: iouReport.reportID,
-                ...(isNewChatReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
+                ...(isNewChatReport
+                    ? {
+                        pendingFields: {
+                            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                        },
+                    }
+                    : {}),
             },
         },
         {
@@ -110,7 +116,13 @@ function buildOnyxDataForMoneyRequest(
                 ...iouReport,
                 lastMessageText: iouAction.message[0].text,
                 lastMessageHtml: iouAction.message[0].html,
-                ...(isNewIOUReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
+                ...(isNewIOUReport
+                    ? {
+                        pendingFields: {
+                            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                        },
+                    }
+                    : {}),
             },
         },
         {
@@ -122,7 +134,7 @@ function buildOnyxDataForMoneyRequest(
             onyxMethod: isNewChatReport ? Onyx.METHOD.SET : Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
             value: {
-                ...(isNewChatReport ? {[chatCreatedAction.reportActionID]: chatCreatedAction} : {}),
+                ...(isNewChatReport ? { [chatCreatedAction.reportActionID]: chatCreatedAction } : {}),
                 [reportPreviewAction.reportActionID]: reportPreviewAction,
             },
         },
@@ -130,7 +142,7 @@ function buildOnyxDataForMoneyRequest(
             onyxMethod: isNewIOUReport ? Onyx.METHOD.SET : Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
             value: {
-                ...(isNewIOUReport ? {[iouCreatedAction.reportActionID]: iouCreatedAction} : {}),
+                ...(isNewIOUReport ? { [iouCreatedAction.reportActionID]: iouCreatedAction } : {}),
                 [iouAction.reportActionID]: iouAction,
             },
         },
@@ -147,32 +159,32 @@ function buildOnyxDataForMoneyRequest(
     const successData = [
         ...(isNewChatReport
             ? [
-                  {
-                      onyxMethod: Onyx.METHOD.MERGE,
-                      key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
-                      value: {
-                          pendingFields: null,
-                          errorFields: null,
-                      },
-                  },
-              ]
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
+                    value: {
+                        pendingFields: null,
+                        errorFields: null,
+                    },
+                },
+            ]
             : []),
         ...(isNewIOUReport
             ? [
-                  {
-                      onyxMethod: Onyx.METHOD.MERGE,
-                      key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
-                      value: {
-                          pendingFields: null,
-                          errorFields: null,
-                      },
-                  },
-              ]
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                    value: {
+                        pendingFields: null,
+                        errorFields: null,
+                    },
+                },
+            ]
             : []),
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
-            value: {pendingAction: null},
+            value: { pendingAction: null },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -180,11 +192,11 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewChatReport
                     ? {
-                          [chatCreatedAction.reportActionID]: {
-                              pendingAction: null,
-                              errors: null,
-                          },
-                      }
+                        [chatCreatedAction.reportActionID]: {
+                            pendingAction: null,
+                            errors: null,
+                        },
+                    }
                     : {}),
                 [reportPreviewAction.reportActionID]: {
                     pendingAction: null,
@@ -197,11 +209,11 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewIOUReport
                     ? {
-                          [iouCreatedAction.reportActionID]: {
-                              pendingAction: null,
-                              errors: null,
-                          },
-                      }
+                        [iouCreatedAction.reportActionID]: {
+                            pendingAction: null,
+                            errors: null,
+                        },
+                    }
                     : {}),
                 [iouAction.reportActionID]: {
                     pendingAction: null,
@@ -221,25 +233,25 @@ function buildOnyxDataForMoneyRequest(
                 lastReadTime: chatReport.lastReadTime,
                 ...(isNewChatReport
                     ? {
-                          errorFields: {
-                              createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
-                          },
-                      }
+                        errorFields: {
+                            createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                        },
+                    }
                     : {}),
             },
         },
         ...(isNewIOUReport
             ? [
-                  {
-                      onyxMethod: Onyx.METHOD.MERGE,
-                      key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
-                      value: {
-                          errorFields: {
-                              createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
-                          },
-                      },
-                  },
-              ]
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                    value: {
+                        errorFields: {
+                            createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                        },
+                    },
+                },
+            ]
             : []),
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -254,18 +266,18 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewChatReport
                     ? {
-                          [chatCreatedAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                          },
-                          [reportPreviewAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError(null),
-                          },
-                      }
+                        [chatCreatedAction.reportActionID]: {
+                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                        },
+                        [reportPreviewAction.reportActionID]: {
+                            errors: ErrorUtils.getMicroSecondOnyxError(null),
+                        },
+                    }
                     : {
-                          [reportPreviewAction.reportActionID]: {
-                              created: reportPreviewAction.created,
-                          },
-                      }),
+                        [reportPreviewAction.reportActionID]: {
+                            created: reportPreviewAction.created,
+                        },
+                    }),
             },
         },
         {
@@ -274,18 +286,18 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewIOUReport
                     ? {
-                          [iouCreatedAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                          },
-                          [iouAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError(null),
-                          },
-                      }
+                        [iouCreatedAction.reportActionID]: {
+                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                        },
+                        [iouAction.reportActionID]: {
+                            errors: ErrorUtils.getMicroSecondOnyxError(null),
+                        },
+                    }
                     : {
-                          [iouAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                          },
-                      }),
+                        [iouAction.reportActionID]: {
+                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                        },
+                    }),
             },
         },
     ];
@@ -303,8 +315,9 @@ function buildOnyxDataForMoneyRequest(
  * @param {Number} payeeAccountID
  * @param {Object} participant
  * @param {String} comment
+ * @param {String} merchant
  */
-function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, participant, comment) {
+function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, participant, comment, merchant) {
     const payerEmail = OptionsListUtils.addSMSDomainIfPhoneNumber(participant.login);
     const payerAccountID = Number(participant.accountID);
     const isPolicyExpenseChat = participant.isPolicyExpenseChat;
@@ -335,7 +348,9 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
 
     if (!isNewIOUReport) {
         if (isPolicyExpenseChat) {
-            iouReport = {...iouReports[`${ONYXKEYS.COLLECTION.REPORT}${chatReport.iouReportID}`]};
+            iouReport = {
+                ...iouReports[`${ONYXKEYS.COLLECTION.REPORT}${chatReport.iouReportID}`],
+            };
 
             // Because of the Expense reports are stored as negative values, we substract the total from the amount
             iouReport.total -= amount;
@@ -349,7 +364,7 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
     }
 
     // STEP 3: Build optimistic transaction
-    const optimisticTransaction = TransactionUtils.buildOptimisticTransaction(amount, currency, iouReport.reportID, comment);
+    const optimisticTransaction = TransactionUtils.buildOptimisticTransaction(amount, currency, iouReport.reportID, comment, null, null, merchant);
 
     // STEP 4: Build optimistic reportActions. We need:
     // 1. CREATED action for the chatReport
@@ -373,13 +388,13 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
     // Add optimistic personal details for participant
     const optimisticPersonalDetailListAction = isNewChatReport
         ? {
-              [payerAccountID]: {
-                  accountID: payerAccountID,
-                  avatar: UserUtils.getDefaultAvatarURL(payerAccountID),
-                  displayName: participant.displayName || payerEmail,
-                  login: participant.login,
-              },
-          }
+            [payerAccountID]: {
+                accountID: payerAccountID,
+                avatar: UserUtils.getDefaultAvatarURL(payerAccountID),
+                displayName: participant.displayName || payerEmail,
+                login: participant.login,
+            },
+        }
         : undefined;
 
     let reportPreviewAction = isNewIOUReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
@@ -422,7 +437,7 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
             createdIOUReportActionID: isNewIOUReport ? optimisticCreatedActionForIOU.reportActionID : 0,
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
         },
-        {optimisticData, successData, failureData},
+        { optimisticData, successData, failureData },
     );
     resetMoneyRequestInfo();
     Navigation.dismissModal(chatReport.reportID);
@@ -497,7 +512,11 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             onyxMethod: existingGroupChatReport ? Onyx.METHOD.MERGE : Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChatReport.reportID}`,
             value: {
-                ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: groupCreatedReportAction}),
+                ...(existingGroupChatReport
+                    ? {}
+                    : {
+                        [groupCreatedReportAction.reportActionID]: groupCreatedReportAction,
+                    }),
                 [groupIOUReportAction.reportActionID]: groupIOUReportAction,
             },
         },
@@ -513,14 +532,18 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChatReport.reportID}`,
             value: {
-                ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: {pendingAction: null}}),
-                [groupIOUReportAction.reportActionID]: {pendingAction: null},
+                ...(existingGroupChatReport
+                    ? {}
+                    : {
+                        [groupCreatedReportAction.reportActionID]: { pendingAction: null },
+                    }),
+                [groupIOUReportAction.reportActionID]: { pendingAction: null },
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${groupTransaction.transactionID}`,
-            value: {pendingAction: null},
+            value: { pendingAction: null },
         },
     ];
 
@@ -528,7 +551,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${groupChatReport.reportID}`,
-            value: {pendingFields: {createChat: null}},
+            value: { pendingFields: { createChat: null } },
         });
     }
 
@@ -577,7 +600,13 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
 
     // Loop through participants creating individual chats, iouReports and reportActionIDs as needed
     const splitAmount = IOUUtils.calculateAmount(participants.length, amount, false);
-    const splits = [{email: currentUserEmail, accountID: currentUserAccountID, amount: IOUUtils.calculateAmount(participants.length, amount, true)}];
+    const splits = [
+        {
+            email: currentUserEmail,
+            accountID: currentUserAccountID,
+            amount: IOUUtils.calculateAmount(participants.length, amount, true),
+        },
+    ];
 
     const hasMultipleParticipants = participants.length > 1;
     _.each(participants, (participant) => {
@@ -646,13 +675,13 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         // Add optimistic personal details for new participants
         const oneOnOnePersonalDetailListAction = shouldCreateOptimisticPersonalDetails
             ? {
-                  [accountID]: {
-                      accountID,
-                      avatar: UserUtils.getDefaultAvatarURL(accountID),
-                      displayName: participant.displayName || email,
-                      login: participant.login,
-                  },
-              }
+                [accountID]: {
+                    accountID,
+                    avatar: UserUtils.getDefaultAvatarURL(accountID),
+                    displayName: participant.displayName || email,
+                    login: participant.login,
+                },
+            }
             : undefined;
 
         let oneOnOneReportPreviewAction = ReportActionsUtils.getReportPreviewAction(oneOnOneChatReport.reportID, oneOnOneIOUReport.reportID);
@@ -711,7 +740,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
     return {
         groupData,
         splits,
-        onyxData: {optimisticData, successData, failureData},
+        onyxData: { optimisticData, successData, failureData },
     };
 }
 
@@ -725,7 +754,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
  * @param {String} existingGroupChatReportID
  */
 function splitBill(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID = '') {
-    const {groupData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID);
+    const { groupData, splits, onyxData } = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID);
 
     API.write(
         'SplitBill',
@@ -756,7 +785,7 @@ function splitBill(participants, currentUserLogin, currentUserAccountID, amount,
  * @param {String} currency
  */
 function splitBillAndOpenReport(participants, currentUserLogin, currentUserAccountID, amount, comment, currency) {
-    const {groupData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency);
+    const { groupData, splits, onyxData } = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency);
 
     API.write(
         'SplitBillAndOpenReport',
@@ -804,7 +833,7 @@ function deleteMoneyRequest(chatReportID, iouReportID, moneyRequestAction, shoul
     const currentUserAccountID = optimisticIOUAction.actorAccountID;
     let updatedIOUReport = {};
     if (ReportUtils.isExpenseReport(iouReportID)) {
-        updatedIOUReport = {...iouReport};
+        updatedIOUReport = { ...iouReport };
 
         // Because of the Expense reports are stored as negative values, we add the total from the amount
         updatedIOUReport.total += amount;
@@ -878,7 +907,7 @@ function deleteMoneyRequest(chatReportID, iouReportID, moneyRequestAction, shoul
             reportActionID: optimisticIOUAction.reportActionID,
             iouReportID: updatedIOUReport.reportID,
         },
-        {optimisticData, successData, failureData},
+        { optimisticData, successData, failureData },
     );
 
     if (shouldCloseOnDelete) {
@@ -1004,7 +1033,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${optimisticTransaction.transactionID}`,
-            value: {pendingAction: null},
+            value: { pendingAction: null },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1037,11 +1066,13 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
         optimisticIOUReportData.onyxMethod = Onyx.METHOD.SET;
 
         // Set and clear pending fields on the chat report
-        optimisticChatReportData.value.pendingFields = {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD};
+        optimisticChatReportData.value.pendingFields = {
+            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        };
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: optimisticChatReportData.key,
-            value: {pendingFields: null},
+            value: { pendingFields: null },
         });
         failureData.push(
             {
@@ -1197,7 +1228,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_LAST_PAYMENT_METHOD,
-            value: {[iouReport.policyID]: paymentMethodType},
+            value: { [iouReport.policyID]: paymentMethodType },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1275,9 +1306,13 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyElsewhere(report, amount, currency, comment, managerID, recipient) {
-    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.ELSEWHERE, managerID, recipient);
+    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.ELSEWHERE, managerID, recipient);
 
-    API.write('SendMoneyElsewhere', params, {optimisticData, successData, failureData});
+    API.write('SendMoneyElsewhere', params, {
+        optimisticData,
+        successData,
+        failureData,
+    });
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);
@@ -1293,9 +1328,13 @@ function sendMoneyElsewhere(report, amount, currency, comment, managerID, recipi
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyWithWallet(report, amount, currency, comment, managerID, recipient) {
-    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.EXPENSIFY, managerID, recipient);
+    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.EXPENSIFY, managerID, recipient);
 
-    API.write('SendMoneyWithWallet', params, {optimisticData, successData, failureData});
+    API.write('SendMoneyWithWallet', params, {
+        optimisticData,
+        successData,
+        failureData,
+    });
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);
@@ -1311,9 +1350,13 @@ function sendMoneyWithWallet(report, amount, currency, comment, managerID, recip
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyViaPaypal(report, amount, currency, comment, managerID, recipient) {
-    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
+    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
 
-    API.write('SendMoneyViaPaypal', params, {optimisticData, successData, failureData});
+    API.write('SendMoneyViaPaypal', params, {
+        optimisticData,
+        successData,
+        failureData,
+    });
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);
@@ -1334,13 +1377,13 @@ function payMoneyRequest(paymentType, chatReport, iouReport) {
         accountID: iouReport.ownerAccountID,
         payPalMeAddress: iouReport.submitterPayPalMeAddress,
     };
-    const {params, optimisticData, successData, failureData} = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType);
+    const { params, optimisticData, successData, failureData } = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType);
 
     // For now we need to call the PayMoneyRequestWithWallet API since PayMoneyRequest was not updated to work with
     // Expensify Wallets.
     const apiCommand = paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'PayMoneyRequestWithWallet' : 'PayMoneyRequest';
 
-    API.write(apiCommand, params, {optimisticData, successData, failureData});
+    API.write(apiCommand, params, { optimisticData, successData, failureData });
     Navigation.dismissModal(chatReport.reportID);
     if (paymentType === CONST.IOU.PAYMENT_TYPE.PAYPAL_ME) {
         asyncOpenURL(Promise.resolve(), buildPayPalPaymentUrl(iouReport.total, recipient.payPalMeAddress, iouReport.currency));
@@ -1361,51 +1404,51 @@ function startMoneyRequest(iouType, reportID = '') {
  * @param {String} id
  */
 function setMoneyRequestId(id) {
-    Onyx.merge(ONYXKEYS.IOU, {id});
+    Onyx.merge(ONYXKEYS.IOU, { id });
 }
 
 /**
  * @param {Number} amount
  */
 function setMoneyRequestAmount(amount) {
-    Onyx.merge(ONYXKEYS.IOU, {amount});
+    Onyx.merge(ONYXKEYS.IOU, { amount });
 }
 
 /**
  * @param {String} currency
  */
 function setMoneyRequestCurrency(currency) {
-    Onyx.merge(ONYXKEYS.IOU, {currency});
+    Onyx.merge(ONYXKEYS.IOU, { currency });
 }
 
 /**
  * @param {String} comment
  */
 function setMoneyRequestDescription(comment) {
-    Onyx.merge(ONYXKEYS.IOU, {comment: comment.trim()});
+    Onyx.merge(ONYXKEYS.IOU, { comment: comment.trim() });
 }
 
 /**
  * @param {Object[]} participants
  */
 function setMoneyRequestParticipants(participants) {
-    Onyx.merge(ONYXKEYS.IOU, {participants});
+    Onyx.merge(ONYXKEYS.IOU, { participants });
 }
 
 export {
     deleteMoneyRequest,
-    splitBill,
-    splitBillAndOpenReport,
+    payMoneyRequest,
     requestMoney,
+    resetMoneyRequestInfo,
     sendMoneyElsewhere,
     sendMoneyViaPaypal,
-    payMoneyRequest,
     sendMoneyWithWallet,
-    startMoneyRequest,
-    resetMoneyRequestInfo,
-    setMoneyRequestId,
     setMoneyRequestAmount,
     setMoneyRequestCurrency,
     setMoneyRequestDescription,
+    setMoneyRequestId,
     setMoneyRequestParticipants,
+    splitBill,
+    splitBillAndOpenReport,
+    startMoneyRequest,
 };
diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js
index 4816a395780a..bd6b6b46f111 100644
--- a/src/pages/iou/steps/MoneyRequestConfirmPage.js
+++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js
@@ -1,7 +1,7 @@
-import React, {useCallback, useEffect, useRef, useMemo} from 'react';
-import {View} from 'react-native';
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import { View } from 'react-native';
 import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
+import { withOnyx } from 'react-native-onyx';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import MoneyRequestConfirmationList from '../../../components/MoneyRequestConfirmationList';
@@ -17,7 +17,7 @@ import * as OptionsListUtils from '../../../libs/OptionsListUtils';
 import withLocalize from '../../../components/withLocalize';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
 import ONYXKEYS from '../../../ONYXKEYS';
-import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '../../../components/withCurrentUserPersonalDetails';
+import withCurrentUserPersonalDetails, { withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes } from '../../../components/withCurrentUserPersonalDetails';
 import reportPropTypes from '../../reportPropTypes';
 import personalDetailsPropType from '../../personalDetailsPropType';
 
@@ -148,9 +148,10 @@ function MoneyRequestConfirmPage(props) {
                 props.currentUserPersonalDetails.accountID,
                 selectedParticipants[0],
                 trimmedComment,
+                props.iou.merchant,
             );
         },
-        [props.iou.amount, props.iou.comment, props.currentUserPersonalDetails.login, props.currentUserPersonalDetails.accountID, props.iou.currency, props.report],
+        [props.iou.amount, props.iou.comment, props.currentUserPersonalDetails.login, props.currentUserPersonalDetails.accountID, props.iou.currency, props.report, props.iou.merchant],
     );
 
     /**
@@ -180,10 +181,10 @@ function MoneyRequestConfirmPage(props) {
         },
         [props.iou.amount, props.iou.comment, participants, props.iou.currency, props.currentUserPersonalDetails.accountID, props.report],
     );
-
+    console.log('stuff', props.report, props.iou);
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
-            {({safeAreaPaddingBottomStyle}) => (
+            {({ safeAreaPaddingBottomStyle }) => (
                 <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                     <HeaderWithBackButton
                         title={props.translate('iou.cash')}
@@ -200,7 +201,7 @@ function MoneyRequestConfirmPage(props) {
                         onSelectParticipant={(option) => {
                             const newParticipants = _.map(props.iou.participants, (participant) => {
                                 if (participant.accountID === option.accountID) {
-                                    return {...participant, selected: !participant.selected};
+                                    return { ...participant, selected: !participant.selected };
                                 }
                                 return participant;
                             });
@@ -216,6 +217,8 @@ function MoneyRequestConfirmPage(props) {
                         canModifyParticipants={!_.isEmpty(reportID.current)}
                         policyID={props.report.policyID}
                         bankAccountRoute={ReportUtils.getBankAccountRoute(props.report)}
+                        iouMerchant={props.iou.merchant}
+                        iouModifiedMerchant={props.iou.modifiedMerchant}
                     />
                 </View>
             )}
@@ -232,7 +235,7 @@ export default compose(
     withLocalize,
     withOnyx({
         report: {
-            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
+            key: ({ route }) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
         },
         iou: {
             key: ONYXKEYS.IOU,

From dfeadb93f7ebb557248d430faffabaeeb15731a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Mon, 24 Jul 2023 16:02:13 +0300
Subject: [PATCH 02/19] added date and fixed layout

---
 src/components/MoneyRequestConfirmationList.js | 15 ++++++++++-----
 src/libs/actions/IOU.js                        | 10 ++++++++++
 src/pages/iou/steps/MoneyRequestConfirmPage.js |  3 ++-
 src/styles/utilities/spacing.js                |  4 ++++
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 37e83692f658..4f55dd1a428b 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -49,6 +49,12 @@ const propTypes = {
     /** IOU type */
     iouType: PropTypes.string,
 
+    /** IOU date */
+    iouDate: PropTypes.string,
+
+    /** IOU merchant */
+    iouMerchant: PropTypes.string,
+
     /** Selected participants from MoneyRequestModal with login / accountID */
     selectedParticipants: PropTypes.arrayOf(optionPropTypes).isRequired,
 
@@ -278,7 +284,6 @@ function MoneyRequestConfirmationList(props) {
             />
         );
     }, [confirm, props.selectedParticipants, props.bankAccountRoute, props.iouCurrencyCode, props.iouType, props.isReadOnly, props.policyID, selectedParticipants, splitOrRequestOptions]);
-    console.log('list', props);
 
     return (
         <OptionsSelector
@@ -315,21 +320,21 @@ function MoneyRequestConfirmationList(props) {
                 disabled={didConfirm || props.isReadOnly}
             />
             <View style={[styles.flexRow, styles.justifyContentBetween, styles.mh3, styles.alignItemsCenter]}>
-                <View style={[styles.shortTermsHorizontalRule, styles.flex1]} />
+                <View style={[styles.shortTermsHorizontalRule, styles.flex1, styles.mr0]} />
                 <Button
                     small
                     onPress={toggleShowAllFields}
                     text={showAllFields ? translate('common.showLess') : translate('common.showMore')}
                     shouldShowRightIcon
                     iconRight={showAllFields ? Expensicons.UpArrow : Expensicons.DownArrow}
-                    style={styles.mh3}
+                    style={styles.mh0}
                 />
-                <View style={[styles.shortTermsHorizontalRule, styles.flex1]} />
+                <View style={[styles.shortTermsHorizontalRule, styles.flex1, styles.ml0]} />
             </View>
             {showAllFields && (
                 <>
                     <MenuItemWithTopDescription
-                        title={'2022'}
+                        title={props.iouDate}
                         description="Date"
                         style={[styles.moneyRequestMenuItem, styles.mb2]}
                         disabled={didConfirm || props.isReadOnly}
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 45105daa7119..f53d1cca4885 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -64,6 +64,14 @@ Onyx.connect({
     },
 });
 
+let currentDate = '';
+Onyx.connect({
+    key: ONYXKEYS.CURRENT_DATE,
+    callback: (val) => {
+        currentDate = val;
+    },
+});
+
 /**
  * Reset money request info from the store with its initial value
  * @param {String} id
@@ -75,6 +83,8 @@ function resetMoneyRequestInfo(id = '') {
         currency: lodashGet(currentUserPersonalDetails, 'localCurrencyCode', CONST.CURRENCY.USD),
         comment: '',
         participants: [],
+        merchant: '',
+        date: currentDate,
     });
 }
 
diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js
index bd6b6b46f111..87933973bafa 100644
--- a/src/pages/iou/steps/MoneyRequestConfirmPage.js
+++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js
@@ -181,7 +181,7 @@ function MoneyRequestConfirmPage(props) {
         },
         [props.iou.amount, props.iou.comment, participants, props.iou.currency, props.currentUserPersonalDetails.accountID, props.report],
     );
-    console.log('stuff', props.report, props.iou);
+
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
             {({ safeAreaPaddingBottomStyle }) => (
@@ -219,6 +219,7 @@ function MoneyRequestConfirmPage(props) {
                         bankAccountRoute={ReportUtils.getBankAccountRoute(props.report)}
                         iouMerchant={props.iou.merchant}
                         iouModifiedMerchant={props.iou.modifiedMerchant}
+                        iouDate={props.iou.date}
                     />
                 </View>
             )}
diff --git a/src/styles/utilities/spacing.js b/src/styles/utilities/spacing.js
index f70c8fbf419f..8391aca7d878 100644
--- a/src/styles/utilities/spacing.js
+++ b/src/styles/utilities/spacing.js
@@ -113,6 +113,10 @@ export default {
         marginLeft: 'auto',
     },
 
+    ml0: {
+        marginLeft: 0,
+    },
+
     ml1: {
         marginLeft: 4,
     },

From 79612cf6220c2a73aaee4389ff28aa4f3cdeb349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Mon, 24 Jul 2023 16:09:14 +0300
Subject: [PATCH 03/19] linting

---
 jsconfig.json                                 |  19 ++
 .../MoneyRequestConfirmationList.js           |  20 +-
 src/components/MoneyRequestDetails.js         |  28 +--
 src/languages/en.js                           | 118 ++++-----
 src/languages/es.js                           | 116 ++++-----
 src/libs/actions/IOU.js                       | 230 +++++++++---------
 .../iou/steps/MoneyRequestConfirmPage.js      |  14 +-
 7 files changed, 282 insertions(+), 263 deletions(-)
 create mode 100644 jsconfig.json

diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 000000000000..1a69cceaae35
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "target": "es2018",
+        "module": "es6",
+        "jsx": "react-native",
+        "allowSyntheticDefaultImports": true,
+        "moduleResolution": "node",
+        "allowJs": true,
+        "checkJs": false,
+        "lib": ["es2018", "dom"],
+        "baseUrl": "./",
+        "paths": {
+            "*": ["src/*"]
+        },
+        "esModuleInterop": true
+    },
+    "exclude": ["node_modules"],
+    "include": ["src/**/*"]
+}
diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 4f55dd1a428b..4b1a0a33fc79 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -1,21 +1,21 @@
-import React, { useCallback, useMemo, useReducer, useState } from 'react';
+import React, {useCallback, useMemo, useReducer, useState} from 'react';
 import PropTypes from 'prop-types';
-import { withOnyx } from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
-import { View } from 'react-native';
+import {View} from 'react-native';
 import styles from '../styles/styles';
 import * as OptionsListUtils from '../libs/OptionsListUtils';
 import OptionsSelector from './OptionsSelector';
 import ONYXKEYS from '../ONYXKEYS';
-import withLocalize, { withLocalizePropTypes } from './withLocalize';
-import withWindowDimensions, { windowDimensionsPropTypes } from './withWindowDimensions';
+import withLocalize, {withLocalizePropTypes} from './withLocalize';
+import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
 import compose from '../libs/compose';
 import CONST from '../CONST';
 import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
 import Log from '../libs/Log';
 import SettlementButton from './SettlementButton';
 import ROUTES from '../ROUTES';
-import withCurrentUserPersonalDetails, { withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes } from './withCurrentUserPersonalDetails';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from './withCurrentUserPersonalDetails';
 import * as IOUUtils from '../libs/IOUUtils';
 import MenuItemWithTopDescription from './MenuItemWithTopDescription';
 import Navigation from '../libs/Navigation/Navigation';
@@ -91,9 +91,9 @@ const propTypes = {
 };
 
 const defaultProps = {
-    onConfirm: () => { },
-    onSendMoney: () => { },
-    onSelectParticipant: () => { },
+    onConfirm: () => {},
+    onSendMoney: () => {},
+    onSelectParticipant: () => {},
     iouType: CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
     payeePersonalDetails: null,
     canModifyParticipants: false,
@@ -110,7 +110,7 @@ const defaultProps = {
 function MoneyRequestConfirmationList(props) {
     // Destructure functions from props to pass it as a dependecy to useCallback/useMemo hooks.
     // Prop functions pass props itself as a "this" value to the function which means they change every time props change.
-    const { translate, onSendMoney, onConfirm, onSelectParticipant } = props;
+    const {translate, onSendMoney, onConfirm, onSelectParticipant} = props;
 
     // A flag and a toggler for showing the rest of the form fields
     const [showAllFields, toggleShowAllFields] = useReducer((state) => !state, false);
diff --git a/src/components/MoneyRequestDetails.js b/src/components/MoneyRequestDetails.js
index cf9d7ddf70aa..f8c371aa5a58 100644
--- a/src/components/MoneyRequestDetails.js
+++ b/src/components/MoneyRequestDetails.js
@@ -1,10 +1,10 @@
 import React from 'react';
-import { withOnyx } from 'react-native-onyx';
-import { View } from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import lodashGet from 'lodash/get';
 import iouReportPropTypes from '../pages/iouReportPropTypes';
-import withLocalize, { withLocalizePropTypes } from './withLocalize';
+import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import * as ReportUtils from '../libs/ReportUtils';
 import * as Expensicons from './Icon/Expensicons';
 import Text from './Text';
@@ -74,7 +74,7 @@ const defaultProps = {
 
 function MoneyRequestDetails(props) {
     // These are only used for the single transaction view and not for expense and iou reports
-    const { amount: transactionAmount, currency: transactionCurrency, comment: transactionDescription } = ReportUtils.getMoneyRequestAction(props.parentReportAction);
+    const {amount: transactionAmount, currency: transactionCurrency, comment: transactionDescription} = ReportUtils.getMoneyRequestAction(props.parentReportAction);
     const formattedTransactionAmount = transactionAmount && transactionCurrency && CurrencyUtils.convertToDisplayString(transactionAmount, transactionCurrency);
     const transactionDate = lodashGet(props.parentReportAction, ['created']);
     const formattedTransactionDate = DateUtils.getDateStringFromISOTimestamp(transactionDate);
@@ -92,14 +92,14 @@ function MoneyRequestDetails(props) {
     const shouldShowSettlementButton = !isSettled && !props.isSingleTransactionView && isPayer;
     const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
     const shouldShowPaypal = Boolean(lodashGet(props.personalDetails, [moneyRequestReport.ownerAccountID, 'payPalMeAddress']));
-    const { addWorkspaceRoomOrChatPendingAction, addWorkspaceRoomOrChatErrors } = ReportUtils.getReportOfflinePendingActionAndErrors(props.report);
+    const {addWorkspaceRoomOrChatPendingAction, addWorkspaceRoomOrChatErrors} = ReportUtils.getReportOfflinePendingActionAndErrors(props.report);
     return (
         <OfflineWithFeedback
             pendingAction={addWorkspaceRoomOrChatPendingAction}
             errors={addWorkspaceRoomOrChatErrors}
             shouldShowErrorMessages={false}
         >
-            <View style={[{ backgroundColor: themeColors.highlightBG }, styles.pl0]}>
+            <View style={[{backgroundColor: themeColors.highlightBG}, styles.pl0]}>
                 <View style={[styles.ph5, styles.pb2]}>
                     <Text style={[styles.textLabelSupporting, styles.lh16]}>{props.translate('common.to')}</Text>
                     <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.pv3]}>
@@ -177,22 +177,22 @@ function MoneyRequestDetails(props) {
                             description={`${props.translate('iou.amount')} • ${props.translate('iou.cash')}${isSettled ? ` • ${props.translate('iou.settledExpensify')}` : ''}`}
                             titleStyle={styles.newKansasLarge}
                             disabled={isSettled}
-                        // Note: These options are temporarily disabled while we figure out the required API changes
-                        // shouldShowRightIcon={!isSettled}
-                        // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.AMOUNT))}
+                            // Note: These options are temporarily disabled while we figure out the required API changes
+                            // shouldShowRightIcon={!isSettled}
+                            // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.AMOUNT))}
                         />
                         <MenuItemWithTopDescription
                             description={props.translate('common.description')}
                             title={transactionDescription}
                             disabled={isSettled}
-                        // shouldShowRightIcon={!isSettled}
-                        // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.DESCRIPTION))}
+                            // shouldShowRightIcon={!isSettled}
+                            // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.DESCRIPTION))}
                         />
                         <MenuItemWithTopDescription
                             description={props.translate('common.date')}
                             title={formattedTransactionDate}
-                        // shouldShowRightIcon={!isSettled}
-                        // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))}
+                            // shouldShowRightIcon={!isSettled}
+                            // onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))}
                         />
                     </>
                 )}
@@ -210,7 +210,7 @@ export default compose(
     withLocalize,
     withOnyx({
         chatReport: {
-            key: ({ report }) => `${ONYXKEYS.COLLECTION.REPORT}${report.chatReportID}`,
+            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.chatReportID}`,
         },
         session: {
             key: ONYXKEYS.SESSION,
diff --git a/src/languages/en.js b/src/languages/en.js
index 85c82538cb45..e2bd3da4cd4c 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -1,4 +1,4 @@
-import { CONST as COMMON_CONST } from 'expensify-common/lib/CONST';
+import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
 import CONST from '../CONST';
 import * as ReportActionsUtils from '../libs/ReportActionsUtils';
 
@@ -72,7 +72,7 @@ export default {
         currentMonth: 'Current month',
         ssnLast4: 'Last 4 digits of SSN',
         ssnFull9: 'Full 9 digits of SSN',
-        addressLine: ({ lineNumber }) => `Address line ${lineNumber}`,
+        addressLine: ({lineNumber}) => `Address line ${lineNumber}`,
         personalAddress: 'Personal address',
         companyAddress: 'Company address',
         noPO: 'PO boxes and mail drop addresses are not allowed',
@@ -103,7 +103,7 @@ export default {
             acceptTerms: 'You must accept the Terms of Service to continue',
             phoneNumber: `Please enter a valid phone number, with the country code (e.g. ${CONST.EXAMPLE_PHONE_NUMBER})`,
             fieldRequired: 'This field is required.',
-            characterLimit: ({ limit }) => `Exceeds the maximum length of ${limit} characters`,
+            characterLimit: ({limit}) => `Exceeds the maximum length of ${limit} characters`,
             dateInvalid: 'Please select a valid date',
             invalidCharacter: 'Invalid character',
         },
@@ -133,14 +133,14 @@ export default {
         youAfterPreposition: 'you',
         your: 'your',
         conciergeHelp: 'Please reach out to Concierge for help.',
-        maxParticipantsReached: ({ count }) => `You've selected the maximum number (${count}) of participants.`,
+        maxParticipantsReached: ({count}) => `You've selected the maximum number (${count}) of participants.`,
         youAppearToBeOffline: 'You appear to be offline.',
         thisFeatureRequiresInternet: 'This feature requires an active internet connection to be used.',
         areYouSure: 'Are you sure?',
         verify: 'Verify',
         yesContinue: 'Yes, continue',
         websiteExample: 'e.g. https://www.expensify.com',
-        zipCodeExampleFormat: ({ zipSampleFormat }) => (zipSampleFormat ? `e.g. ${zipSampleFormat}` : ''),
+        zipCodeExampleFormat: ({zipSampleFormat}) => (zipSampleFormat ? `e.g. ${zipSampleFormat}` : ''),
         description: 'Description',
         with: 'with',
         shareCode: 'Share code',
@@ -234,8 +234,8 @@ export default {
         phrase2: "Money talks. And now that chat and payments are in one place, it's also easy.",
         phrase3: 'Your payments get to you as fast as you can get your point across.',
         enterPassword: 'Please enter your password',
-        newFaceEnterMagicCode: ({ login }) => `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
-        welcomeEnterMagicCode: ({ login }) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
+        newFaceEnterMagicCode: ({login}) => `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
+        welcomeEnterMagicCode: ({login}) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
     login: {
         hero: {
@@ -244,8 +244,8 @@ export default {
         },
     },
     thirdPartySignIn: {
-        alreadySignedIn: ({ email }) => `You are already signed in as ${email}.`,
-        goBackMessage: ({ provider }) => `Don't want to sign in with ${provider}?`,
+        alreadySignedIn: ({email}) => `You are already signed in as ${email}.`,
+        goBackMessage: ({provider}) => `Don't want to sign in with ${provider}?`,
         continueWithMyCurrentSession: 'Continue with my current session',
         redirectToDesktopMessage: "We'll redirect you to the desktop app once you finish signing in.",
         signInAgreementMessage: 'By logging in, you agree to the',
@@ -270,7 +270,7 @@ export default {
         ],
         blockedFromConcierge: 'Communication is barred',
         fileUploadFailed: 'Upload failed. File is not supported.',
-        localTime: ({ user, time }) => `It's ${time} for ${user}`,
+        localTime: ({user, time}) => `It's ${time} for ${user}`,
         edited: '(edited)',
         emoji: 'Emoji',
         collapse: 'Collapse',
@@ -285,8 +285,8 @@ export default {
         markAsUnread: 'Mark as unread',
         markAsRead: 'Mark as read',
         editComment: 'Edit comment',
-        deleteAction: ({ action }) => `Delete ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}`,
-        deleteConfirmation: ({ action }) => `Are you sure you want to delete this ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}?`,
+        deleteAction: ({action}) => `Delete ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}`,
+        deleteConfirmation: ({action}) => `Are you sure you want to delete this ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}?`,
         onlyVisible: 'Only visible to',
         replyInThread: 'Reply in thread',
         flagAsOffensive: 'Flag as offensive',
@@ -298,12 +298,12 @@ export default {
     reportActionsView: {
         beginningOfArchivedRoomPartOne: 'You missed the party in ',
         beginningOfArchivedRoomPartTwo: ", there's nothing to see here.",
-        beginningOfChatHistoryDomainRoomPartOne: ({ domainRoom }) => `Collaboration with everyone at ${domainRoom} starts here! 🎉\nUse `,
+        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}) => `Collaboration with everyone at ${domainRoom} starts here! 🎉\nUse `,
         beginningOfChatHistoryDomainRoomPartTwo: ' to chat with colleagues, share tips, and ask questions.',
-        beginningOfChatHistoryAdminRoomPartOne: ({ workspaceName }) => `Collaboration among ${workspaceName} admins starts here! 🎉\nUse `,
+        beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}) => `Collaboration among ${workspaceName} admins starts here! 🎉\nUse `,
         beginningOfChatHistoryAdminRoomPartTwo: ' to chat about topics such as workspace configurations and more.',
-        beginningOfChatHistoryAnnounceRoomPartOne: ({ workspaceName }) => `Collaboration between all ${workspaceName} members starts here! 🎉\nUse `,
-        beginningOfChatHistoryAnnounceRoomPartTwo: ({ workspaceName }) => ` to chat about anything ${workspaceName} related.`,
+        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}) => `Collaboration between all ${workspaceName} members starts here! 🎉\nUse `,
+        beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}) => ` to chat about anything ${workspaceName} related.`,
         beginningOfChatHistoryUserRoomPartOne: 'Collaboration starts here! 🎉\nUse this space to chat about anything ',
         beginningOfChatHistoryUserRoomPartTwo: ' related.',
         beginningOfChatHistory: 'This is the beginning of your chat with ',
@@ -328,12 +328,12 @@ export default {
     },
     reportArchiveReasons: {
         [CONST.REPORT.ARCHIVE_REASON.DEFAULT]: 'This chat room has been archived.',
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({ displayName }) => `This workspace chat is no longer active because ${displayName} closed their account.`,
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({ displayName, oldDisplayName }) =>
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({displayName}) => `This workspace chat is no longer active because ${displayName} closed their account.`,
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({displayName, oldDisplayName}) =>
             `This workspace chat is no longer active because ${oldDisplayName} has merged their account with ${displayName}.`,
-        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({ displayName, policyName }) =>
+        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({displayName, policyName}) =>
             `This workspace chat is no longer active because ${displayName} is no longer a member of the ${policyName} workspace.`,
-        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({ policyName }) => `This workspace chat is no longer active because ${policyName} is no longer an active workspace.`,
+        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}) => `This workspace chat is no longer active because ${policyName} is no longer an active workspace.`,
     },
     writeCapabilityPage: {
         label: 'Who can post',
@@ -368,24 +368,24 @@ export default {
         settledExpensify: 'Paid',
         settledElsewhere: 'Paid elsewhere',
         settledPaypalMe: 'Paid using Paypal.me',
-        settleExpensify: ({ formattedAmount }) => `Pay ${formattedAmount} with Expensify`,
+        settleExpensify: ({formattedAmount}) => `Pay ${formattedAmount} with Expensify`,
         payElsewhere: 'Pay elsewhere',
-        settlePaypalMe: ({ formattedAmount }) => `Pay ${formattedAmount} with PayPal.me`,
-        requestAmount: ({ amount }) => `request ${amount}`,
-        splitAmount: ({ amount }) => `split ${amount}`,
-        amountEach: ({ amount }) => `${amount} each`,
-        payerOwesAmount: ({ payer, amount }) => `${payer} owes ${amount}`,
-        payerOwes: ({ payer }) => `${payer} owes: `,
-        payerPaidAmount: ({ payer, amount }) => `${payer} paid ${amount}`,
-        payerPaid: ({ payer }) => `${payer} paid: `,
-        payerSettled: ({ amount }) => `paid ${amount}`,
-        paidElsewhereWithAmount: ({ amount }) => `paid ${amount} elsewhere`,
-        paidUsingPaypalWithAmount: ({ amount }) => `paid ${amount} using Paypal.me`,
-        paidUsingExpensifyWithAmount: ({ amount }) => `paid ${amount} using Expensify`,
+        settlePaypalMe: ({formattedAmount}) => `Pay ${formattedAmount} with PayPal.me`,
+        requestAmount: ({amount}) => `request ${amount}`,
+        splitAmount: ({amount}) => `split ${amount}`,
+        amountEach: ({amount}) => `${amount} each`,
+        payerOwesAmount: ({payer, amount}) => `${payer} owes ${amount}`,
+        payerOwes: ({payer}) => `${payer} owes: `,
+        payerPaidAmount: ({payer, amount}) => `${payer} paid ${amount}`,
+        payerPaid: ({payer}) => `${payer} paid: `,
+        payerSettled: ({amount}) => `paid ${amount}`,
+        paidElsewhereWithAmount: ({amount}) => `paid ${amount} elsewhere`,
+        paidUsingPaypalWithAmount: ({amount}) => `paid ${amount} using Paypal.me`,
+        paidUsingExpensifyWithAmount: ({amount}) => `paid ${amount} using Expensify`,
         noReimbursableExpenses: 'This report has an invalid amount',
         pendingConversionMessage: "Total will update when you're back online",
-        threadRequestReportName: ({ formattedAmount, comment }) => `${formattedAmount} request${comment ? ` for ${comment}` : ''}`,
-        threadSentMoneyReportName: ({ formattedAmount, comment }) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
+        threadRequestReportName: ({formattedAmount, comment}) => `${formattedAmount} request${comment ? ` for ${comment}` : ''}`,
+        threadSentMoneyReportName: ({formattedAmount, comment}) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
         error: {
             invalidSplit: 'Split amounts do not equal total amount',
             other: 'Unexpected error, please try again later',
@@ -412,10 +412,10 @@ export default {
         editImage: 'Edit photo',
         imageUploadFailed: 'Image upload failed',
         deleteWorkspaceError: 'Sorry, there was an unexpected problem deleting your workspace avatar.',
-        sizeExceeded: ({ maxUploadSizeInMB }) => `The selected image exceeds the maximum upload size of ${maxUploadSizeInMB}MB.`,
-        resolutionConstraints: ({ minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx }) =>
+        sizeExceeded: ({maxUploadSizeInMB}) => `The selected image exceeds the maximum upload size of ${maxUploadSizeInMB}MB.`,
+        resolutionConstraints: ({minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx}) =>
             `Please upload an image larger than ${minHeightInPx}x${minWidthInPx} pixels and smaller than ${maxHeightInPx}x${maxWidthInPx} pixels.`,
-        notAllowedExtension: ({ allowedExtensions }) => `Profile picture must be one of the following types: ${allowedExtensions.join(', ')}.`,
+        notAllowedExtension: ({allowedExtensions}) => `Profile picture must be one of the following types: ${allowedExtensions.join(', ')}.`,
     },
     profilePage: {
         profile: 'Profile',
@@ -451,7 +451,7 @@ export default {
         helpTextAfterEmail: ' from multiple email addresses.',
         pleaseVerify: 'Please verify this contact method',
         getInTouch: "Whenever we need to get in touch with you, we'll use this contact method.",
-        enterMagicCode: ({ contactMethod }) => `Please enter the magic code sent to ${contactMethod}`,
+        enterMagicCode: ({contactMethod}) => `Please enter the magic code sent to ${contactMethod}`,
         setAsDefault: 'Set as default',
         yourDefaultContactMethod:
             'This is your current default contact method. You will not be able to delete this contact method until you set an alternative default by selecting another contact method and pressing “Set as default”.',
@@ -642,9 +642,9 @@ export default {
         addBankAccountFailure: 'An unexpected error occurred while trying to add your bank account. Please try again.',
     },
     transferAmountPage: {
-        transfer: ({ amount }) => `Transfer${amount ? ` ${amount}` : ''}`,
+        transfer: ({amount}) => `Transfer${amount ? ` ${amount}` : ''}`,
         instant: 'Instant (Debit card)',
-        instantSummary: ({ rate, minAmount }) => `${rate}% fee (${minAmount} minimum)`,
+        instantSummary: ({rate, minAmount}) => `${rate}% fee (${minAmount} minimum)`,
         ach: '1-3 Business days (Bank account)',
         achSummary: 'No fee',
         whichAccount: 'Which account?',
@@ -775,7 +775,7 @@ export default {
         },
         cannotGetAccountDetails: "Couldn't retrieve account details, please try to sign in again.",
         loginForm: 'Login form',
-        notYou: ({ user }) => `Not ${user}?`,
+        notYou: ({user}) => `Not ${user}?`,
     },
     personalDetails: {
         error: {
@@ -791,27 +791,27 @@ export default {
         legalLastName: 'Legal last name',
         homeAddress: 'Home address',
         error: {
-            dateShouldBeBefore: ({ dateString }) => `Date should be before ${dateString}.`,
-            dateShouldBeAfter: ({ dateString }) => `Date should be after ${dateString}.`,
+            dateShouldBeBefore: ({dateString}) => `Date should be before ${dateString}.`,
+            dateShouldBeAfter: ({dateString}) => `Date should be after ${dateString}.`,
             hasInvalidCharacter: 'Name can only include latin letters and numbers.',
-            incorrectZipFormat: ({ zipFormat }) => `Incorrect zip code format.${zipFormat ? ` Acceptable format: ${zipFormat}` : ''}`,
+            incorrectZipFormat: ({zipFormat}) => `Incorrect zip code format.${zipFormat ? ` Acceptable format: ${zipFormat}` : ''}`,
         },
     },
     resendValidationForm: {
         linkHasBeenResent: 'Link has been re-sent',
-        weSentYouMagicSignInLink: ({ login, loginType }) => `I've sent a magic sign-in link to ${login}. Please check your ${loginType} to sign in.`,
+        weSentYouMagicSignInLink: ({login, loginType}) => `I've sent a magic sign-in link to ${login}. Please check your ${loginType} to sign in.`,
         resendLink: 'Resend link',
     },
     unlinkLoginForm: {
-        toValidateLogin: ({ primaryLogin, secondaryLogin }) => `To validate ${secondaryLogin}, please resend the magic code from the Account Settings of ${primaryLogin}.`,
-        noLongerHaveAccess: ({ primaryLogin }) => `If you no longer have access to ${primaryLogin}, please unlink your accounts.`,
+        toValidateLogin: ({primaryLogin, secondaryLogin}) => `To validate ${secondaryLogin}, please resend the magic code from the Account Settings of ${primaryLogin}.`,
+        noLongerHaveAccess: ({primaryLogin}) => `If you no longer have access to ${primaryLogin}, please unlink your accounts.`,
         unlink: 'Unlink',
         linkSent: 'Link sent!',
         succesfullyUnlinkedLogin: 'Secondary login successfully unlinked!',
     },
     emailDeliveryFailurePage: {
-        ourEmailProvider: ({ login }) => `Our email provider has temporarily suspended emails to ${login} due to delivery issues. To unblock your login, please follow these steps:`,
-        confirmThat: ({ login }) => `Confirm that ${login} is spelled correctly and is a real, deliverable email address. `,
+        ourEmailProvider: ({login}) => `Our email provider has temporarily suspended emails to ${login} due to delivery issues. To unblock your login, please follow these steps:`,
+        confirmThat: ({login}) => `Confirm that ${login} is spelled correctly and is a real, deliverable email address. `,
         emailAliases: 'Email aliases such as "expenses@domain.com" must have access to their own email inbox for it to be a valid Expensify login.',
         ensureYourEmailClient: 'Ensure your email client allows expensify.com emails. ',
         youCanFindDirections: 'You can find directions on how to complete this step ',
@@ -847,7 +847,7 @@ export default {
         setPasswordLinkInvalid: 'This set password link is invalid or has expired. A new one is waiting for you in your email inbox!',
         validateAccount: 'Verify account',
     },
-    stepCounter: ({ step, total, text }) => {
+    stepCounter: ({step, total, text}) => {
         let result = `Step ${step}`;
 
         if (total) {
@@ -1134,7 +1134,7 @@ export default {
             unavailable: 'Unavailable workspace',
             memberNotFound: 'Member not found. To invite a new member to the workspace, please use the Invite button above.',
             notAuthorized: `You do not have access to this page. Are you trying to join the workspace? Please reach out to the owner of this workspace so they can add you as a member! Something else? Reach out to ${CONST.EMAIL.CONCIERGE}`,
-            goToRoom: ({ roomName }) => `Go to ${roomName} room`,
+            goToRoom: ({roomName}) => `Go to ${roomName} room`,
         },
         emptyWorkspace: {
             title: 'Create a new workspace',
@@ -1226,7 +1226,7 @@ export default {
             personalMessagePrompt: 'Message',
             genericFailureMessage: 'An error occurred inviting the user to the workspace, please try again.',
             inviteNoMembersError: 'Please select at least one member to invite',
-            welcomeNote: ({ workspaceName }) =>
+            welcomeNote: ({workspaceName}) =>
                 `You have been invited to ${workspaceName || 'a workspace'}! Download the Expensify mobile app at use.expensify.com/download to start tracking your expenses.`,
         },
         editor: {
@@ -1302,12 +1302,12 @@ export default {
         public_announceDescription: 'Anyone can find this room',
         createRoom: 'Create room',
         roomAlreadyExistsError: 'A room with this name already exists',
-        roomNameReservedError: ({ reservedName }) => `${reservedName} is a default room on all workspaces. Please choose another name.`,
+        roomNameReservedError: ({reservedName}) => `${reservedName} is a default room on all workspaces. Please choose another name.`,
         roomNameInvalidError: 'Room names can only include lowercase letters, numbers and hyphens',
         pleaseEnterRoomName: 'Please enter a room name',
         pleaseSelectWorkspace: 'Please select a workspace',
-        renamedRoomAction: ({ oldName, newName }) => ` renamed this room from ${oldName} to ${newName}`,
-        roomRenamedTo: ({ newName }) => `Room renamed to ${newName}`,
+        renamedRoomAction: ({oldName, newName}) => ` renamed this room from ${oldName} to ${newName}`,
+        roomRenamedTo: ({newName}) => `Room renamed to ${newName}`,
         social: 'social',
         selectAWorkspace: 'Select a workspace',
         growlMessageOnRenameError: 'Unable to rename policy room, please check your connection and try again.',
@@ -1457,8 +1457,8 @@ export default {
         noActivityYet: 'No activity yet',
     },
     chronos: {
-        oooEventSummaryFullDay: ({ summary, dayCount, date }) => `${summary} for ${dayCount} ${dayCount === 1 ? 'day' : 'days'} until ${date}`,
-        oooEventSummaryPartialDay: ({ summary, timePeriod, date }) => `${summary} from ${timePeriod} on ${date}`,
+        oooEventSummaryFullDay: ({summary, dayCount, date}) => `${summary} for ${dayCount} ${dayCount === 1 ? 'day' : 'days'} until ${date}`,
+        oooEventSummaryPartialDay: ({summary, timePeriod, date}) => `${summary} from ${timePeriod} on ${date}`,
     },
     footer: {
         features: 'Features',
@@ -1511,7 +1511,7 @@ export default {
     threads: {
         replies: 'Replies',
         reply: 'Reply',
-        parentNavigationSummary: ({ rootReportName, workspaceName }) => `From ${rootReportName}${workspaceName ? ` in ${workspaceName}` : ''}`,
+        parentNavigationSummary: ({rootReportName, workspaceName}) => `From ${rootReportName}${workspaceName ? ` in ${workspaceName}` : ''}`,
     },
     qrCodes: {
         copyUrlToClipboard: 'Copy URL to clipboard',
diff --git a/src/languages/es.js b/src/languages/es.js
index ee2984e8f8d5..e06724afecfb 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -71,7 +71,7 @@ export default {
         currentMonth: 'Mes actual',
         ssnLast4: 'Últimos 4 dígitos de su SSN',
         ssnFull9: 'Los 9 dígitos del SSN',
-        addressLine: ({ lineNumber }) => `Dirección línea ${lineNumber}`,
+        addressLine: ({lineNumber}) => `Dirección línea ${lineNumber}`,
         personalAddress: 'Dirección física personal',
         companyAddress: 'Dirección física de la empresa',
         noPO: 'No se aceptan apartados ni direcciones postales',
@@ -102,7 +102,7 @@ export default {
             acceptTerms: 'Debes aceptar los Términos de Servicio para continuar',
             phoneNumber: `Introduce un teléfono válido, incluyendo el código del país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER})`,
             fieldRequired: 'Este campo es obligatorio.',
-            characterLimit: ({ limit }) => `Supera el límite de ${limit} caracteres`,
+            characterLimit: ({limit}) => `Supera el límite de ${limit} caracteres`,
             dateInvalid: 'Por favor, selecciona una fecha válida',
             invalidCharacter: 'Carácter invalido',
         },
@@ -132,14 +132,14 @@ export default {
         youAfterPreposition: 'ti',
         your: 'tu',
         conciergeHelp: 'Por favor, contacta con Concierge para obtener ayuda.',
-        maxParticipantsReached: ({ count }) => `Has seleccionado el número máximo (${count}) de participantes.`,
+        maxParticipantsReached: ({count}) => `Has seleccionado el número máximo (${count}) de participantes.`,
         youAppearToBeOffline: 'Parece que estás desconectado.',
         thisFeatureRequiresInternet: 'Esta función requiere una conexión a Internet activa para ser utilizada.',
         areYouSure: '¿Estás seguro?',
         verify: 'Verifique',
         yesContinue: 'Sí, Continuar',
         websiteExample: 'p. ej. https://www.expensify.com',
-        zipCodeExampleFormat: ({ zipSampleFormat }) => (zipSampleFormat ? `p. ej. ${zipSampleFormat}` : ''),
+        zipCodeExampleFormat: ({zipSampleFormat}) => (zipSampleFormat ? `p. ej. ${zipSampleFormat}` : ''),
         description: 'Descripción',
         with: 'con',
         shareCode: 'Compartir código',
@@ -233,8 +233,8 @@ export default {
         phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.',
         phrase3: 'Tus pagos llegan tan rápido como tus mensajes.',
         enterPassword: 'Por favor, introduce tu contraseña',
-        newFaceEnterMagicCode: ({ login }) => `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
-        welcomeEnterMagicCode: ({ login }) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
+        newFaceEnterMagicCode: ({login}) => `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
+        welcomeEnterMagicCode: ({login}) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
     login: {
         hero: {
@@ -243,8 +243,8 @@ export default {
         },
     },
     thirdPartySignIn: {
-        alreadySignedIn: ({ email }) => `Ya has iniciado sesión con ${email}.`,
-        goBackMessage: ({ provider }) => `No quieres iniciar sesión con ${provider}?`,
+        alreadySignedIn: ({email}) => `Ya has iniciado sesión con ${email}.`,
+        goBackMessage: ({provider}) => `No quieres iniciar sesión con ${provider}?`,
         continueWithMyCurrentSession: 'Continuar con mi sesión actual',
         redirectToDesktopMessage: 'Lo redirigiremos a la aplicación de escritorio una vez que termine de iniciar sesión.',
         signInAgreementMessage: 'Al iniciar sesión, aceptas las',
@@ -269,7 +269,7 @@ export default {
         ],
         blockedFromConcierge: 'Comunicación no permitida',
         fileUploadFailed: 'Subida fallida. El archivo no es compatible.',
-        localTime: ({ user, time }) => `Son las ${time} para ${user}`,
+        localTime: ({user, time}) => `Son las ${time} para ${user}`,
         edited: '(editado)',
         emoji: 'Emoji',
         collapse: 'Colapsar',
@@ -284,8 +284,8 @@ export default {
         markAsUnread: 'Marcar como no leído',
         markAsRead: 'Marcar como leído',
         editComment: 'Editar comentario',
-        deleteAction: ({ action }) => `Eliminar ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
-        deleteConfirmation: ({ action }) => `¿Estás seguro de que quieres eliminar este ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
+        deleteAction: ({action}) => `Eliminar ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
+        deleteConfirmation: ({action}) => `¿Estás seguro de que quieres eliminar este ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
         onlyVisible: 'Visible sólo para',
         replyInThread: 'Responder en el hilo',
         flagAsOffensive: 'Marcar como ofensivo',
@@ -297,12 +297,12 @@ export default {
     reportActionsView: {
         beginningOfArchivedRoomPartOne: 'Te perdiste la fiesta en ',
         beginningOfArchivedRoomPartTwo: ', no hay nada que ver aquí.',
-        beginningOfChatHistoryDomainRoomPartOne: ({ domainRoom }) => `Colabora aquí con todos los participantes de ${domainRoom}! 🎉\nUtiliza `,
+        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}) => `Colabora aquí con todos los participantes de ${domainRoom}! 🎉\nUtiliza `,
         beginningOfChatHistoryDomainRoomPartTwo: ' para chatear con compañeros, compartir consejos o hacer una pregunta.',
-        beginningOfChatHistoryAdminRoomPartOne: ({ workspaceName }) => `Este es el lugar para que los administradores de ${workspaceName} colaboren! 🎉\nUsa `,
+        beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}) => `Este es el lugar para que los administradores de ${workspaceName} colaboren! 🎉\nUsa `,
         beginningOfChatHistoryAdminRoomPartTwo: ' para chatear sobre temas como la configuración del espacio de trabajo y mas.',
-        beginningOfChatHistoryAnnounceRoomPartOne: ({ workspaceName }) => `Este es el lugar para que todos los miembros de ${workspaceName} colaboren! 🎉\nUsa `,
-        beginningOfChatHistoryAnnounceRoomPartTwo: ({ workspaceName }) => ` para chatear sobre cualquier cosa relacionada con ${workspaceName}.`,
+        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}) => `Este es el lugar para que todos los miembros de ${workspaceName} colaboren! 🎉\nUsa `,
+        beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}) => ` para chatear sobre cualquier cosa relacionada con ${workspaceName}.`,
         beginningOfChatHistoryUserRoomPartOne: 'Este es el lugar para colaborar! 🎉\nUsa este espacio para chatear sobre cualquier cosa relacionada con ',
         beginningOfChatHistoryUserRoomPartTwo: '.',
         beginningOfChatHistory: 'Aquí comienzan tus conversaciones con ',
@@ -327,12 +327,12 @@ export default {
     },
     reportArchiveReasons: {
         [CONST.REPORT.ARCHIVE_REASON.DEFAULT]: 'Esta sala de chat ha sido eliminada.',
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({ displayName }) => `Este chat de espacio de trabajo esta desactivado porque ${displayName} ha cerrado su cuenta.`,
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({ displayName, oldDisplayName }) =>
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({displayName}) => `Este chat de espacio de trabajo esta desactivado porque ${displayName} ha cerrado su cuenta.`,
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({displayName, oldDisplayName}) =>
             `Este chat de espacio de trabajo esta desactivado porque ${oldDisplayName} ha combinado su cuenta con ${displayName}.`,
-        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({ displayName, policyName }) =>
+        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({displayName, policyName}) =>
             `Este chat de espacio de trabajo esta desactivado porque ${displayName} ha dejado de ser miembro del espacio de trabajo ${policyName}.`,
-        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({ policyName }) => `Este chat de espacio de trabajo esta desactivado porque el espacio de trabajo ${policyName} se ha eliminado.`,
+        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}) => `Este chat de espacio de trabajo esta desactivado porque el espacio de trabajo ${policyName} se ha eliminado.`,
     },
     writeCapabilityPage: {
         label: 'Quién puede postear',
@@ -367,24 +367,24 @@ export default {
         settledExpensify: 'Pagado',
         settledElsewhere: 'Pagado de otra forma',
         settledPaypalMe: 'Pagado con PayPal.me',
-        settleExpensify: ({ formattedAmount }) => `Pagar ${formattedAmount} con Expensify`,
+        settleExpensify: ({formattedAmount}) => `Pagar ${formattedAmount} con Expensify`,
         payElsewhere: 'Pagar de otra forma',
-        settlePaypalMe: ({ formattedAmount }) => `Pagar ${formattedAmount} con PayPal.me`,
-        requestAmount: ({ amount }) => `solicitar ${amount}`,
-        splitAmount: ({ amount }) => `dividir ${amount}`,
-        amountEach: ({ amount }) => `${amount} cada uno`,
-        payerOwesAmount: ({ payer, amount }) => `${payer} debe ${amount}`,
-        payerOwes: ({ payer }) => `${payer} debe: `,
-        payerPaidAmount: ({ payer, amount }) => `${payer} pagó ${amount}`,
-        payerPaid: ({ payer }) => `${payer} pagó: `,
-        payerSettled: ({ amount }) => `pagó ${amount}`,
-        paidElsewhereWithAmount: ({ amount }) => `pagó ${amount} de otra forma`,
-        paidUsingPaypalWithAmount: ({ amount }) => `pagó ${amount} con PayPal.me`,
-        paidUsingExpensifyWithAmount: ({ amount }) => `pagó ${amount} con Expensify`,
+        settlePaypalMe: ({formattedAmount}) => `Pagar ${formattedAmount} con PayPal.me`,
+        requestAmount: ({amount}) => `solicitar ${amount}`,
+        splitAmount: ({amount}) => `dividir ${amount}`,
+        amountEach: ({amount}) => `${amount} cada uno`,
+        payerOwesAmount: ({payer, amount}) => `${payer} debe ${amount}`,
+        payerOwes: ({payer}) => `${payer} debe: `,
+        payerPaidAmount: ({payer, amount}) => `${payer} pagó ${amount}`,
+        payerPaid: ({payer}) => `${payer} pagó: `,
+        payerSettled: ({amount}) => `pagó ${amount}`,
+        paidElsewhereWithAmount: ({amount}) => `pagó ${amount} de otra forma`,
+        paidUsingPaypalWithAmount: ({amount}) => `pagó ${amount} con PayPal.me`,
+        paidUsingExpensifyWithAmount: ({amount}) => `pagó ${amount} con Expensify`,
         noReimbursableExpenses: 'El monto de este informe es inválido',
         pendingConversionMessage: 'El total se actualizará cuando estés online',
-        threadRequestReportName: ({ formattedAmount, comment }) => `Solicitud de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
-        threadSentMoneyReportName: ({ formattedAmount, comment }) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
+        threadRequestReportName: ({formattedAmount, comment}) => `Solicitud de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
+        threadSentMoneyReportName: ({formattedAmount, comment}) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
         error: {
             invalidSplit: 'La suma de las partes no equivale al monto total',
             other: 'Error inesperado, por favor inténtalo más tarde',
@@ -411,10 +411,10 @@ export default {
         editImage: 'Editar foto',
         imageUploadFailed: 'Error al cargar la imagen',
         deleteWorkspaceError: 'Lo sentimos, hubo un problema eliminando el avatar de su espacio de trabajo.',
-        sizeExceeded: ({ maxUploadSizeInMB }) => `La imagen supera el tamaño máximo de ${maxUploadSizeInMB}MB.`,
-        resolutionConstraints: ({ minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx }) =>
+        sizeExceeded: ({maxUploadSizeInMB}) => `La imagen supera el tamaño máximo de ${maxUploadSizeInMB}MB.`,
+        resolutionConstraints: ({minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx}) =>
             `Por favor, elige una imagen más grande que ${minHeightInPx}x${minWidthInPx} píxeles y más pequeña que ${maxHeightInPx}x${maxWidthInPx} píxeles.`,
-        notAllowedExtension: ({ allowedExtensions }) => `La foto de perfil debe ser de uno de los siguientes tipos: ${allowedExtensions.join(', ')}.`,
+        notAllowedExtension: ({allowedExtensions}) => `La foto de perfil debe ser de uno de los siguientes tipos: ${allowedExtensions.join(', ')}.`,
     },
     profilePage: {
         profile: 'Perfil',
@@ -451,7 +451,7 @@ export default {
         helpTextAfterEmail: ' desde varias direcciones de correo electrónico.',
         pleaseVerify: 'Por favor, verifica este método de contacto',
         getInTouch: 'Utilizaremos este método de contacto cuando necesitemos contactarte.',
-        enterMagicCode: ({ contactMethod }) => `Por favor, introduce el código mágico enviado a ${contactMethod}`,
+        enterMagicCode: ({contactMethod}) => `Por favor, introduce el código mágico enviado a ${contactMethod}`,
         setAsDefault: 'Establecer como predeterminado',
         yourDefaultContactMethod:
             'Este es tu método de contacto predeterminado. No podrás eliminarlo hasta que añadas otro método de contacto y lo marques como predeterminado pulsando "Establecer como predeterminado".',
@@ -643,9 +643,9 @@ export default {
         addBankAccountFailure: 'Ocurrió un error inesperado al intentar agregar su cuenta bancaria. Inténtalo de nuevo.',
     },
     transferAmountPage: {
-        transfer: ({ amount }) => `Transferir${amount ? ` ${amount}` : ''}`,
+        transfer: ({amount}) => `Transferir${amount ? ` ${amount}` : ''}`,
         instant: 'Instante',
-        instantSummary: ({ rate, minAmount }) => `Tarifa del ${rate}% (${minAmount} mínimo)`,
+        instantSummary: ({rate, minAmount}) => `Tarifa del ${rate}% (${minAmount} mínimo)`,
         ach: '1-3 días laborales',
         achSummary: 'Sin cargo',
         whichAccount: '¿Qué cuenta?',
@@ -777,7 +777,7 @@ export default {
         },
         cannotGetAccountDetails: 'No se pudieron cargar los detalles de tu cuenta. Por favor, intenta iniciar sesión de nuevo.',
         loginForm: 'Formulario de inicio de sesión',
-        notYou: ({ user }) => `¿No eres ${user}?`,
+        notYou: ({user}) => `¿No eres ${user}?`,
     },
     personalDetails: {
         error: {
@@ -793,28 +793,28 @@ export default {
         legalLastName: 'Apellidos legales',
         homeAddress: 'Domicilio',
         error: {
-            dateShouldBeBefore: ({ dateString }) => `La fecha debe ser anterior a ${dateString}.`,
-            dateShouldBeAfter: ({ dateString }) => `La fecha debe ser posterior a ${dateString}.`,
-            incorrectZipFormat: ({ zipFormat }) => `Formato de código postal incorrecto.${zipFormat ? ` Formato aceptable: ${zipFormat}` : ''}`,
+            dateShouldBeBefore: ({dateString}) => `La fecha debe ser anterior a ${dateString}.`,
+            dateShouldBeAfter: ({dateString}) => `La fecha debe ser posterior a ${dateString}.`,
+            incorrectZipFormat: ({zipFormat}) => `Formato de código postal incorrecto.${zipFormat ? ` Formato aceptable: ${zipFormat}` : ''}`,
             hasInvalidCharacter: 'El nombre solo puede contener números y caracteres latinos.',
         },
     },
     resendValidationForm: {
         linkHasBeenResent: 'El enlace se ha reenviado',
-        weSentYouMagicSignInLink: ({ login, loginType }) => `Te he enviado un hiperenlace mágico para iniciar sesión a ${login}. Por favor, revisa tu ${loginType}`,
+        weSentYouMagicSignInLink: ({login, loginType}) => `Te he enviado un hiperenlace mágico para iniciar sesión a ${login}. Por favor, revisa tu ${loginType}`,
         resendLink: 'Reenviar enlace',
     },
     unlinkLoginForm: {
-        toValidateLogin: ({ primaryLogin, secondaryLogin }) => `Para validar ${secondaryLogin}, reenvía el código mágico desde la Configuración de la cuenta de ${primaryLogin}.`,
-        noLongerHaveAccess: ({ primaryLogin }) => `Si ya no tienes acceso a ${primaryLogin} por favor, desvincula las cuentas.`,
+        toValidateLogin: ({primaryLogin, secondaryLogin}) => `Para validar ${secondaryLogin}, reenvía el código mágico desde la Configuración de la cuenta de ${primaryLogin}.`,
+        noLongerHaveAccess: ({primaryLogin}) => `Si ya no tienes acceso a ${primaryLogin} por favor, desvincula las cuentas.`,
         unlink: 'Desvincular',
         linkSent: '¡Enlace enviado!',
         succesfullyUnlinkedLogin: '¡Nombre de usuario secundario desvinculado correctamente!',
     },
     emailDeliveryFailurePage: {
-        ourEmailProvider: ({ login }) =>
+        ourEmailProvider: ({login}) =>
             `Nuestro proveedor de correo electrónico ha suspendido temporalmente los correos electrónicos a ${login} debido a problemas de entrega. Para desbloquear el inicio de sesión, sigue estos pasos:`,
-        confirmThat: ({ login }) => `Confirma que ${login} está escrito correctamente y que es una dirección de correo electrónico real que puede recibir correos. `,
+        confirmThat: ({login}) => `Confirma que ${login} está escrito correctamente y que es una dirección de correo electrónico real que puede recibir correos. `,
         emailAliases:
             'Los alias de correo electrónico como "expenses@domain.com" deben tener acceso a su propia bandeja de entrada de correo electrónico para que sea un inicio de sesión válido de Expensify.',
         ensureYourEmailClient: 'Asegúrese de que su cliente de correo electrónico permita correos electrónicos de expensify.com. ',
@@ -851,7 +851,7 @@ export default {
         setPasswordLinkInvalid: 'El enlace para configurar tu contraseña ha expirado. Te hemos enviado un nuevo enlace a tu correo.',
         validateAccount: 'Verificar cuenta',
     },
-    stepCounter: ({ step, total, text }) => {
+    stepCounter: ({step, total, text}) => {
         let result = `Paso ${step}`;
 
         if (total) {
@@ -1143,7 +1143,7 @@ export default {
             unavailable: 'Espacio de trabajo no disponible',
             memberNotFound: 'Miembro no encontrado. Para invitar a un nuevo miembro al espacio de trabajo, por favor, utiliza el botón Invitar que está arriba.',
             notAuthorized: `No tienes acceso a esta página. ¿Estás tratando de unirte al espacio de trabajo? Comunícate con el propietario de este espacio de trabajo para que pueda agregarte como miembro. ¿Necesitas algo más? Comunícate con ${CONST.EMAIL.CONCIERGE}`,
-            goToRoom: ({ roomName }) => `Ir a la sala ${roomName}`,
+            goToRoom: ({roomName}) => `Ir a la sala ${roomName}`,
         },
         emptyWorkspace: {
             title: 'Crear un nuevo espacio de trabajo',
@@ -1236,7 +1236,7 @@ export default {
             personalMessagePrompt: 'Mensaje',
             inviteNoMembersError: 'Por favor, selecciona al menos un miembro a invitar',
             genericFailureMessage: 'Se produjo un error al invitar al usuario al espacio de trabajo. Vuelva a intentarlo..',
-            welcomeNote: ({ workspaceName }) =>
+            welcomeNote: ({workspaceName}) =>
                 `¡Has sido invitado a ${workspaceName}! Descargue la aplicación móvil Expensify en use.expensify.com/download para comenzar a rastrear sus gastos.`,
         },
         editor: {
@@ -1313,12 +1313,12 @@ export default {
         public_announceDescription: 'Cualquier persona puede unirse a esta sala',
         createRoom: 'Crea una sala de chat',
         roomAlreadyExistsError: 'Ya existe una sala con este nombre',
-        roomNameReservedError: ({ reservedName }) => `${reservedName} es el nombre una sala por defecto de todos los espacios de trabajo. Por favor, elige otro nombre.`,
+        roomNameReservedError: ({reservedName}) => `${reservedName} es el nombre una sala por defecto de todos los espacios de trabajo. Por favor, elige otro nombre.`,
         roomNameInvalidError: 'Los nombres de las salas solo pueden contener minúsculas, números y guiones',
         pleaseEnterRoomName: 'Por favor, escribe el nombre de una sala',
         pleaseSelectWorkspace: 'Por favor, selecciona un espacio de trabajo',
-        renamedRoomAction: ({ oldName, newName }) => ` cambió el nombre de la sala de ${oldName} a ${newName}`,
-        roomRenamedTo: ({ newName }) => `Sala renombrada a ${newName}`,
+        renamedRoomAction: ({oldName, newName}) => ` cambió el nombre de la sala de ${oldName} a ${newName}`,
+        roomRenamedTo: ({newName}) => `Sala renombrada a ${newName}`,
         social: 'social',
         selectAWorkspace: 'Seleccionar un espacio de trabajo',
         growlMessageOnRenameError: 'No se ha podido cambiar el nombre del espacio de trabajo, por favor, comprueba tu conexión e inténtalo de nuevo.',
@@ -1468,8 +1468,8 @@ export default {
         noActivityYet: 'Sin actividad todavía',
     },
     chronos: {
-        oooEventSummaryFullDay: ({ summary, dayCount, date }) => `${summary} por ${dayCount} ${dayCount === 1 ? 'día' : 'días'} hasta el ${date}`,
-        oooEventSummaryPartialDay: ({ summary, timePeriod, date }) => `${summary} de ${timePeriod} del ${date}`,
+        oooEventSummaryFullDay: ({summary, dayCount, date}) => `${summary} por ${dayCount} ${dayCount === 1 ? 'día' : 'días'} hasta el ${date}`,
+        oooEventSummaryPartialDay: ({summary, timePeriod, date}) => `${summary} de ${timePeriod} del ${date}`,
     },
     footer: {
         features: 'Características',
@@ -1982,7 +1982,7 @@ export default {
     threads: {
         replies: 'Respuestas',
         reply: 'Respuesta',
-        parentNavigationSummary: ({ rootReportName, workspaceName }) => `De ${rootReportName}${workspaceName ? ` en ${workspaceName}` : ''}`,
+        parentNavigationSummary: ({rootReportName, workspaceName}) => `De ${rootReportName}${workspaceName ? ` en ${workspaceName}` : ''}`,
     },
     qrCodes: {
         copyUrlToClipboard: 'Copiar URL al portapapeles',
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index f53d1cca4885..9801127d3283 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -112,10 +112,10 @@ function buildOnyxDataForMoneyRequest(
                 iouReportID: iouReport.reportID,
                 ...(isNewChatReport
                     ? {
-                        pendingFields: {
-                            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                        },
-                    }
+                          pendingFields: {
+                              createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                          },
+                      }
                     : {}),
             },
         },
@@ -128,10 +128,10 @@ function buildOnyxDataForMoneyRequest(
                 lastMessageHtml: iouAction.message[0].html,
                 ...(isNewIOUReport
                     ? {
-                        pendingFields: {
-                            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                        },
-                    }
+                          pendingFields: {
+                              createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                          },
+                      }
                     : {}),
             },
         },
@@ -144,7 +144,7 @@ function buildOnyxDataForMoneyRequest(
             onyxMethod: isNewChatReport ? Onyx.METHOD.SET : Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
             value: {
-                ...(isNewChatReport ? { [chatCreatedAction.reportActionID]: chatCreatedAction } : {}),
+                ...(isNewChatReport ? {[chatCreatedAction.reportActionID]: chatCreatedAction} : {}),
                 [reportPreviewAction.reportActionID]: reportPreviewAction,
             },
         },
@@ -152,7 +152,7 @@ function buildOnyxDataForMoneyRequest(
             onyxMethod: isNewIOUReport ? Onyx.METHOD.SET : Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
             value: {
-                ...(isNewIOUReport ? { [iouCreatedAction.reportActionID]: iouCreatedAction } : {}),
+                ...(isNewIOUReport ? {[iouCreatedAction.reportActionID]: iouCreatedAction} : {}),
                 [iouAction.reportActionID]: iouAction,
             },
         },
@@ -169,32 +169,32 @@ function buildOnyxDataForMoneyRequest(
     const successData = [
         ...(isNewChatReport
             ? [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
-                    value: {
-                        pendingFields: null,
-                        errorFields: null,
-                    },
-                },
-            ]
+                  {
+                      onyxMethod: Onyx.METHOD.MERGE,
+                      key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
+                      value: {
+                          pendingFields: null,
+                          errorFields: null,
+                      },
+                  },
+              ]
             : []),
         ...(isNewIOUReport
             ? [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
-                    value: {
-                        pendingFields: null,
-                        errorFields: null,
-                    },
-                },
-            ]
+                  {
+                      onyxMethod: Onyx.METHOD.MERGE,
+                      key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                      value: {
+                          pendingFields: null,
+                          errorFields: null,
+                      },
+                  },
+              ]
             : []),
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
-            value: { pendingAction: null },
+            value: {pendingAction: null},
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -202,11 +202,11 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewChatReport
                     ? {
-                        [chatCreatedAction.reportActionID]: {
-                            pendingAction: null,
-                            errors: null,
-                        },
-                    }
+                          [chatCreatedAction.reportActionID]: {
+                              pendingAction: null,
+                              errors: null,
+                          },
+                      }
                     : {}),
                 [reportPreviewAction.reportActionID]: {
                     pendingAction: null,
@@ -219,11 +219,11 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewIOUReport
                     ? {
-                        [iouCreatedAction.reportActionID]: {
-                            pendingAction: null,
-                            errors: null,
-                        },
-                    }
+                          [iouCreatedAction.reportActionID]: {
+                              pendingAction: null,
+                              errors: null,
+                          },
+                      }
                     : {}),
                 [iouAction.reportActionID]: {
                     pendingAction: null,
@@ -243,25 +243,25 @@ function buildOnyxDataForMoneyRequest(
                 lastReadTime: chatReport.lastReadTime,
                 ...(isNewChatReport
                     ? {
-                        errorFields: {
-                            createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
-                        },
-                    }
+                          errorFields: {
+                              createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                          },
+                      }
                     : {}),
             },
         },
         ...(isNewIOUReport
             ? [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
-                    value: {
-                        errorFields: {
-                            createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
-                        },
-                    },
-                },
-            ]
+                  {
+                      onyxMethod: Onyx.METHOD.MERGE,
+                      key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                      value: {
+                          errorFields: {
+                              createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                          },
+                      },
+                  },
+              ]
             : []),
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -276,18 +276,18 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewChatReport
                     ? {
-                        [chatCreatedAction.reportActionID]: {
-                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                        },
-                        [reportPreviewAction.reportActionID]: {
-                            errors: ErrorUtils.getMicroSecondOnyxError(null),
-                        },
-                    }
+                          [chatCreatedAction.reportActionID]: {
+                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                          },
+                          [reportPreviewAction.reportActionID]: {
+                              errors: ErrorUtils.getMicroSecondOnyxError(null),
+                          },
+                      }
                     : {
-                        [reportPreviewAction.reportActionID]: {
-                            created: reportPreviewAction.created,
-                        },
-                    }),
+                          [reportPreviewAction.reportActionID]: {
+                              created: reportPreviewAction.created,
+                          },
+                      }),
             },
         },
         {
@@ -296,18 +296,18 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewIOUReport
                     ? {
-                        [iouCreatedAction.reportActionID]: {
-                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                        },
-                        [iouAction.reportActionID]: {
-                            errors: ErrorUtils.getMicroSecondOnyxError(null),
-                        },
-                    }
+                          [iouCreatedAction.reportActionID]: {
+                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                          },
+                          [iouAction.reportActionID]: {
+                              errors: ErrorUtils.getMicroSecondOnyxError(null),
+                          },
+                      }
                     : {
-                        [iouAction.reportActionID]: {
-                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                        },
-                    }),
+                          [iouAction.reportActionID]: {
+                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                          },
+                      }),
             },
         },
     ];
@@ -398,13 +398,13 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
     // Add optimistic personal details for participant
     const optimisticPersonalDetailListAction = isNewChatReport
         ? {
-            [payerAccountID]: {
-                accountID: payerAccountID,
-                avatar: UserUtils.getDefaultAvatarURL(payerAccountID),
-                displayName: participant.displayName || payerEmail,
-                login: participant.login,
-            },
-        }
+              [payerAccountID]: {
+                  accountID: payerAccountID,
+                  avatar: UserUtils.getDefaultAvatarURL(payerAccountID),
+                  displayName: participant.displayName || payerEmail,
+                  login: participant.login,
+              },
+          }
         : undefined;
 
     let reportPreviewAction = isNewIOUReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
@@ -447,7 +447,7 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
             createdIOUReportActionID: isNewIOUReport ? optimisticCreatedActionForIOU.reportActionID : 0,
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
         },
-        { optimisticData, successData, failureData },
+        {optimisticData, successData, failureData},
     );
     resetMoneyRequestInfo();
     Navigation.dismissModal(chatReport.reportID);
@@ -525,8 +525,8 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
                 ...(existingGroupChatReport
                     ? {}
                     : {
-                        [groupCreatedReportAction.reportActionID]: groupCreatedReportAction,
-                    }),
+                          [groupCreatedReportAction.reportActionID]: groupCreatedReportAction,
+                      }),
                 [groupIOUReportAction.reportActionID]: groupIOUReportAction,
             },
         },
@@ -545,15 +545,15 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
                 ...(existingGroupChatReport
                     ? {}
                     : {
-                        [groupCreatedReportAction.reportActionID]: { pendingAction: null },
-                    }),
-                [groupIOUReportAction.reportActionID]: { pendingAction: null },
+                          [groupCreatedReportAction.reportActionID]: {pendingAction: null},
+                      }),
+                [groupIOUReportAction.reportActionID]: {pendingAction: null},
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${groupTransaction.transactionID}`,
-            value: { pendingAction: null },
+            value: {pendingAction: null},
         },
     ];
 
@@ -561,7 +561,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${groupChatReport.reportID}`,
-            value: { pendingFields: { createChat: null } },
+            value: {pendingFields: {createChat: null}},
         });
     }
 
@@ -685,13 +685,13 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         // Add optimistic personal details for new participants
         const oneOnOnePersonalDetailListAction = shouldCreateOptimisticPersonalDetails
             ? {
-                [accountID]: {
-                    accountID,
-                    avatar: UserUtils.getDefaultAvatarURL(accountID),
-                    displayName: participant.displayName || email,
-                    login: participant.login,
-                },
-            }
+                  [accountID]: {
+                      accountID,
+                      avatar: UserUtils.getDefaultAvatarURL(accountID),
+                      displayName: participant.displayName || email,
+                      login: participant.login,
+                  },
+              }
             : undefined;
 
         let oneOnOneReportPreviewAction = ReportActionsUtils.getReportPreviewAction(oneOnOneChatReport.reportID, oneOnOneIOUReport.reportID);
@@ -750,7 +750,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
     return {
         groupData,
         splits,
-        onyxData: { optimisticData, successData, failureData },
+        onyxData: {optimisticData, successData, failureData},
     };
 }
 
@@ -764,7 +764,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
  * @param {String} existingGroupChatReportID
  */
 function splitBill(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID = '') {
-    const { groupData, splits, onyxData } = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID);
+    const {groupData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID);
 
     API.write(
         'SplitBill',
@@ -795,7 +795,7 @@ function splitBill(participants, currentUserLogin, currentUserAccountID, amount,
  * @param {String} currency
  */
 function splitBillAndOpenReport(participants, currentUserLogin, currentUserAccountID, amount, comment, currency) {
-    const { groupData, splits, onyxData } = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency);
+    const {groupData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency);
 
     API.write(
         'SplitBillAndOpenReport',
@@ -843,7 +843,7 @@ function deleteMoneyRequest(chatReportID, iouReportID, moneyRequestAction, shoul
     const currentUserAccountID = optimisticIOUAction.actorAccountID;
     let updatedIOUReport = {};
     if (ReportUtils.isExpenseReport(iouReportID)) {
-        updatedIOUReport = { ...iouReport };
+        updatedIOUReport = {...iouReport};
 
         // Because of the Expense reports are stored as negative values, we add the total from the amount
         updatedIOUReport.total += amount;
@@ -917,7 +917,7 @@ function deleteMoneyRequest(chatReportID, iouReportID, moneyRequestAction, shoul
             reportActionID: optimisticIOUAction.reportActionID,
             iouReportID: updatedIOUReport.reportID,
         },
-        { optimisticData, successData, failureData },
+        {optimisticData, successData, failureData},
     );
 
     if (shouldCloseOnDelete) {
@@ -1043,7 +1043,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${optimisticTransaction.transactionID}`,
-            value: { pendingAction: null },
+            value: {pendingAction: null},
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1082,7 +1082,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: optimisticChatReportData.key,
-            value: { pendingFields: null },
+            value: {pendingFields: null},
         });
         failureData.push(
             {
@@ -1238,7 +1238,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_LAST_PAYMENT_METHOD,
-            value: { [iouReport.policyID]: paymentMethodType },
+            value: {[iouReport.policyID]: paymentMethodType},
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1316,7 +1316,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyElsewhere(report, amount, currency, comment, managerID, recipient) {
-    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.ELSEWHERE, managerID, recipient);
+    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.ELSEWHERE, managerID, recipient);
 
     API.write('SendMoneyElsewhere', params, {
         optimisticData,
@@ -1338,7 +1338,7 @@ function sendMoneyElsewhere(report, amount, currency, comment, managerID, recipi
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyWithWallet(report, amount, currency, comment, managerID, recipient) {
-    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.EXPENSIFY, managerID, recipient);
+    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.EXPENSIFY, managerID, recipient);
 
     API.write('SendMoneyWithWallet', params, {
         optimisticData,
@@ -1360,7 +1360,7 @@ function sendMoneyWithWallet(report, amount, currency, comment, managerID, recip
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyViaPaypal(report, amount, currency, comment, managerID, recipient) {
-    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
+    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
 
     API.write('SendMoneyViaPaypal', params, {
         optimisticData,
@@ -1387,13 +1387,13 @@ function payMoneyRequest(paymentType, chatReport, iouReport) {
         accountID: iouReport.ownerAccountID,
         payPalMeAddress: iouReport.submitterPayPalMeAddress,
     };
-    const { params, optimisticData, successData, failureData } = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType);
+    const {params, optimisticData, successData, failureData} = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType);
 
     // For now we need to call the PayMoneyRequestWithWallet API since PayMoneyRequest was not updated to work with
     // Expensify Wallets.
     const apiCommand = paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'PayMoneyRequestWithWallet' : 'PayMoneyRequest';
 
-    API.write(apiCommand, params, { optimisticData, successData, failureData });
+    API.write(apiCommand, params, {optimisticData, successData, failureData});
     Navigation.dismissModal(chatReport.reportID);
     if (paymentType === CONST.IOU.PAYMENT_TYPE.PAYPAL_ME) {
         asyncOpenURL(Promise.resolve(), buildPayPalPaymentUrl(iouReport.total, recipient.payPalMeAddress, iouReport.currency));
@@ -1414,35 +1414,35 @@ function startMoneyRequest(iouType, reportID = '') {
  * @param {String} id
  */
 function setMoneyRequestId(id) {
-    Onyx.merge(ONYXKEYS.IOU, { id });
+    Onyx.merge(ONYXKEYS.IOU, {id});
 }
 
 /**
  * @param {Number} amount
  */
 function setMoneyRequestAmount(amount) {
-    Onyx.merge(ONYXKEYS.IOU, { amount });
+    Onyx.merge(ONYXKEYS.IOU, {amount});
 }
 
 /**
  * @param {String} currency
  */
 function setMoneyRequestCurrency(currency) {
-    Onyx.merge(ONYXKEYS.IOU, { currency });
+    Onyx.merge(ONYXKEYS.IOU, {currency});
 }
 
 /**
  * @param {String} comment
  */
 function setMoneyRequestDescription(comment) {
-    Onyx.merge(ONYXKEYS.IOU, { comment: comment.trim() });
+    Onyx.merge(ONYXKEYS.IOU, {comment: comment.trim()});
 }
 
 /**
  * @param {Object[]} participants
  */
 function setMoneyRequestParticipants(participants) {
-    Onyx.merge(ONYXKEYS.IOU, { participants });
+    Onyx.merge(ONYXKEYS.IOU, {participants});
 }
 
 export {
diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js
index 87933973bafa..0ffafd783528 100644
--- a/src/pages/iou/steps/MoneyRequestConfirmPage.js
+++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js
@@ -1,7 +1,7 @@
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
-import { View } from 'react-native';
+import React, {useCallback, useEffect, useMemo, useRef} from 'react';
+import {View} from 'react-native';
 import PropTypes from 'prop-types';
-import { withOnyx } from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import MoneyRequestConfirmationList from '../../../components/MoneyRequestConfirmationList';
@@ -17,7 +17,7 @@ import * as OptionsListUtils from '../../../libs/OptionsListUtils';
 import withLocalize from '../../../components/withLocalize';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
 import ONYXKEYS from '../../../ONYXKEYS';
-import withCurrentUserPersonalDetails, { withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes } from '../../../components/withCurrentUserPersonalDetails';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '../../../components/withCurrentUserPersonalDetails';
 import reportPropTypes from '../../reportPropTypes';
 import personalDetailsPropType from '../../personalDetailsPropType';
 
@@ -184,7 +184,7 @@ function MoneyRequestConfirmPage(props) {
 
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
-            {({ safeAreaPaddingBottomStyle }) => (
+            {({safeAreaPaddingBottomStyle}) => (
                 <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                     <HeaderWithBackButton
                         title={props.translate('iou.cash')}
@@ -201,7 +201,7 @@ function MoneyRequestConfirmPage(props) {
                         onSelectParticipant={(option) => {
                             const newParticipants = _.map(props.iou.participants, (participant) => {
                                 if (participant.accountID === option.accountID) {
-                                    return { ...participant, selected: !participant.selected };
+                                    return {...participant, selected: !participant.selected};
                                 }
                                 return participant;
                             });
@@ -236,7 +236,7 @@ export default compose(
     withLocalize,
     withOnyx({
         report: {
-            key: ({ route }) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
+            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
         },
         iou: {
             key: ONYXKEYS.IOU,

From 79b2b56df7c69f9545ce1df57fbd7cf8c1332ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Mon, 24 Jul 2023 17:55:54 +0300
Subject: [PATCH 04/19] remove jsconfig

---
 jsconfig.json | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 jsconfig.json

diff --git a/jsconfig.json b/jsconfig.json
deleted file mode 100644
index 1a69cceaae35..000000000000
--- a/jsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "es2018",
-        "module": "es6",
-        "jsx": "react-native",
-        "allowSyntheticDefaultImports": true,
-        "moduleResolution": "node",
-        "allowJs": true,
-        "checkJs": false,
-        "lib": ["es2018", "dom"],
-        "baseUrl": "./",
-        "paths": {
-            "*": ["src/*"]
-        },
-        "esModuleInterop": true
-    },
-    "exclude": ["node_modules"],
-    "include": ["src/**/*"]
-}

From 6d55c8a554fb8896e2eca07cd147bfac84994e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Wed, 26 Jul 2023 13:50:40 +0300
Subject: [PATCH 05/19] fixed missing iou date on native

---
 src/libs/actions/IOU.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 9801127d3283..dd54cda6d238 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -2,6 +2,7 @@ import Onyx from 'react-native-onyx';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import Str from 'expensify-common/lib/str';
+import moment from 'moment';
 import CONST from '../../CONST';
 import ROUTES from '../../ROUTES';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -77,6 +78,7 @@ Onyx.connect({
  * @param {String} id
  */
 function resetMoneyRequestInfo(id = '') {
+    const date = currentDate || moment().format('YYYY-MM-DD');
     Onyx.merge(ONYXKEYS.IOU, {
         id,
         amount: 0,
@@ -84,7 +86,7 @@ function resetMoneyRequestInfo(id = '') {
         comment: '',
         participants: [],
         merchant: '',
-        date: currentDate,
+        date,
     });
 }
 
@@ -1442,7 +1444,9 @@ function setMoneyRequestDescription(comment) {
  * @param {Object[]} participants
  */
 function setMoneyRequestParticipants(participants) {
-    Onyx.merge(ONYXKEYS.IOU, {participants});
+    Onyx.merge(ONYXKEYS.IOU, {
+        participants,
+    });
 }
 
 export {

From 12cb63684679a5249cf851d5e8a920c082c2abad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Wed, 26 Jul 2023 13:51:05 +0300
Subject: [PATCH 06/19] show more button hidden when details showed

---
 .../MoneyRequestConfirmationList.js           | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 4b1a0a33fc79..27603eb85435 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -319,18 +319,20 @@ function MoneyRequestConfirmationList(props) {
                 style={[styles.moneyRequestMenuItem, styles.mb2]}
                 disabled={didConfirm || props.isReadOnly}
             />
-            <View style={[styles.flexRow, styles.justifyContentBetween, styles.mh3, styles.alignItemsCenter]}>
-                <View style={[styles.shortTermsHorizontalRule, styles.flex1, styles.mr0]} />
-                <Button
-                    small
-                    onPress={toggleShowAllFields}
-                    text={showAllFields ? translate('common.showLess') : translate('common.showMore')}
-                    shouldShowRightIcon
-                    iconRight={showAllFields ? Expensicons.UpArrow : Expensicons.DownArrow}
-                    style={styles.mh0}
-                />
-                <View style={[styles.shortTermsHorizontalRule, styles.flex1, styles.ml0]} />
-            </View>
+            {!showAllFields && (
+                <View style={[styles.flexRow, styles.justifyContentBetween, styles.mh3, styles.alignItemsCenter]}>
+                    <View style={[styles.shortTermsHorizontalRule, styles.flex1, styles.mr0]} />
+                    <Button
+                        small
+                        onPress={toggleShowAllFields}
+                        text={showAllFields ? translate('common.showLess') : translate('common.showMore')}
+                        shouldShowRightIcon
+                        iconRight={showAllFields ? Expensicons.UpArrow : Expensicons.DownArrow}
+                        style={styles.mh0}
+                    />
+                    <View style={[styles.shortTermsHorizontalRule, styles.flex1, styles.ml0]} />
+                </View>
+            )}
             {showAllFields && (
                 <>
                     <MenuItemWithTopDescription

From e35f9c8801f886592e403e91f8f0f0973daf5552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Wed, 26 Jul 2023 18:10:25 +0300
Subject: [PATCH 07/19] removed button show less state

---
 src/components/MoneyRequestConfirmationList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 27603eb85435..ed7dbbeafdaa 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -325,9 +325,9 @@ function MoneyRequestConfirmationList(props) {
                     <Button
                         small
                         onPress={toggleShowAllFields}
-                        text={showAllFields ? translate('common.showLess') : translate('common.showMore')}
+                        text={translate('common.showMore')}
                         shouldShowRightIcon
-                        iconRight={showAllFields ? Expensicons.UpArrow : Expensicons.DownArrow}
+                        iconRight={Expensicons.DownArrow}
                         style={styles.mh0}
                     />
                     <View style={[styles.shortTermsHorizontalRule, styles.flex1, styles.ml0]} />

From 696e8812205d93aee114f9c99f95dbc75826a281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Wed, 26 Jul 2023 18:21:47 +0300
Subject: [PATCH 08/19] show more button icon fill change

---
 src/components/MoneyRequestConfirmationList.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index ed7dbbeafdaa..0797c997bf56 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -23,6 +23,7 @@ import optionPropTypes from './optionPropTypes';
 import * as CurrencyUtils from '../libs/CurrencyUtils';
 import Button from './Button';
 import * as Expensicons from './Icon/Expensicons';
+import themeColors from '../styles/themes/default';
 
 const propTypes = {
     /** Callback to inform parent modal of success */
@@ -328,6 +329,7 @@ function MoneyRequestConfirmationList(props) {
                         text={translate('common.showMore')}
                         shouldShowRightIcon
                         iconRight={Expensicons.DownArrow}
+                        iconFill={themeColors.icon}
                         style={styles.mh0}
                     />
                     <View style={[styles.shortTermsHorizontalRule, styles.flex1, styles.ml0]} />

From 2844a13761f4ecc014750f15bd8cf7ed750af0bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Fri, 28 Jul 2023 14:51:12 +0300
Subject: [PATCH 09/19] localizing and disabling fields, removing show less

---
 src/components/MoneyRequestConfirmationList.js | 8 ++++----
 src/languages/en.js                            | 2 +-
 src/languages/es.js                            | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 0797c997bf56..ea5428820caf 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -339,15 +339,15 @@ function MoneyRequestConfirmationList(props) {
                 <>
                     <MenuItemWithTopDescription
                         title={props.iouDate}
-                        description="Date"
+                        description={translate('common.date')}
                         style={[styles.moneyRequestMenuItem, styles.mb2]}
-                        disabled={didConfirm || props.isReadOnly}
+                        disabled
                     />
                     <MenuItemWithTopDescription
                         title={props.iouMerchant}
-                        description="Merchant"
+                        description={translate('common.merchant')}
                         style={[styles.moneyRequestMenuItem, styles.mb2]}
-                        disabled={didConfirm || props.isReadOnly}
+                        disabled
                     />
                 </>
             )}
diff --git a/src/languages/en.js b/src/languages/en.js
index 2303fcc1bcf8..967410db0ad8 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -150,7 +150,7 @@ export default {
         total: 'Total',
         edit: 'Edit',
         showMore: 'Show more',
-        showLess: 'Show less',
+        merchant: 'Merchant'
     },
     anonymousReportFooter: {
         logoTagline: 'Join in on the discussion.',
diff --git a/src/languages/es.js b/src/languages/es.js
index 10523445e341..24f86213377c 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -149,7 +149,6 @@ export default {
         total: 'Total',
         edit: 'Editar',
         showMore: 'Mostrar más',
-        showLess: 'Mostrar menos',
     },
     anonymousReportFooter: {
         logoTagline: 'Únete a la discussion.',

From 4642d362cf6ae682a1e977e7403d16ae272b84ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Fri, 28 Jul 2023 14:51:27 +0300
Subject: [PATCH 10/19] formatting

---
 src/libs/actions/IOU.js | 71 ++++++++++-------------------------------
 1 file changed, 17 insertions(+), 54 deletions(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index cfa516e67897..752a455b4a3e 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -112,13 +112,7 @@ function buildOnyxDataForMoneyRequest(
                 lastReadTime: DateUtils.getDBTime(),
                 hasOutstandingIOU: iouReport.total !== 0,
                 iouReportID: iouReport.reportID,
-                ...(isNewChatReport
-                    ? {
-                          pendingFields: {
-                              createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                          },
-                      }
-                    : {}),
+                ...(isNewChatReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
             },
         },
         {
@@ -128,13 +122,7 @@ function buildOnyxDataForMoneyRequest(
                 ...iouReport,
                 lastMessageText: iouAction.message[0].text,
                 lastMessageHtml: iouAction.message[0].html,
-                ...(isNewIOUReport
-                    ? {
-                          pendingFields: {
-                              createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                          },
-                      }
-                    : {}),
+                ...(isNewIOUReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
             },
         },
         {
@@ -521,11 +509,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             onyxMethod: existingGroupChatReport ? Onyx.METHOD.MERGE : Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChatReport.reportID}`,
             value: {
-                ...(existingGroupChatReport
-                    ? {}
-                    : {
-                          [groupCreatedReportAction.reportActionID]: groupCreatedReportAction,
-                      }),
+                ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: groupCreatedReportAction}),
                 [groupIOUReportAction.reportActionID]: groupIOUReportAction,
             },
         },
@@ -541,11 +525,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChatReport.reportID}`,
             value: {
-                ...(existingGroupChatReport
-                    ? {}
-                    : {
-                          [groupCreatedReportAction.reportActionID]: {pendingAction: null},
-                      }),
+                ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: {pendingAction: null}}),
                 [groupIOUReportAction.reportActionID]: {pendingAction: null},
             },
         },
@@ -609,13 +589,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
 
     // Loop through participants creating individual chats, iouReports and reportActionIDs as needed
     const splitAmount = IOUUtils.calculateAmount(participants.length, amount, false);
-    const splits = [
-        {
-            email: currentUserEmail,
-            accountID: currentUserAccountID,
-            amount: IOUUtils.calculateAmount(participants.length, amount, true),
-        },
-    ];
+    const splits = [{email: currentUserEmail, accountID: currentUserAccountID, amount: IOUUtils.calculateAmount(participants.length, amount, true)}];
 
     const hasMultipleParticipants = participants.length > 1;
     _.each(participants, (participant) => {
@@ -1075,9 +1049,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
         optimisticIOUReportData.onyxMethod = Onyx.METHOD.SET;
 
         // Set and clear pending fields on the chat report
-        optimisticChatReportData.value.pendingFields = {
-            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        };
+        optimisticChatReportData.value.pendingFields = {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD};
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: optimisticChatReportData.key,
@@ -1317,11 +1289,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
 function sendMoneyElsewhere(report, amount, currency, comment, managerID, recipient) {
     const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.ELSEWHERE, managerID, recipient);
 
-    API.write('SendMoneyElsewhere', params, {
-        optimisticData,
-        successData,
-        failureData,
-    });
+    API.write('SendMoneyElsewhere', params, {optimisticData, successData, failureData});
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);
@@ -1339,11 +1307,7 @@ function sendMoneyElsewhere(report, amount, currency, comment, managerID, recipi
 function sendMoneyWithWallet(report, amount, currency, comment, managerID, recipient) {
     const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.EXPENSIFY, managerID, recipient);
 
-    API.write('SendMoneyWithWallet', params, {
-        optimisticData,
-        successData,
-        failureData,
-    });
+    API.write('SendMoneyWithWallet', params, {optimisticData, successData, failureData});
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);
@@ -1361,6 +1325,7 @@ function sendMoneyWithWallet(report, amount, currency, comment, managerID, recip
 function sendMoneyViaPaypal(report, amount, currency, comment, managerID, recipient) {
     const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
 
+    API.write('SendMoneyViaPaypal', params, {optimisticData, successData, failureData});
     API.write('SendMoneyViaPaypal', params, {
         optimisticData,
         successData,
@@ -1441,25 +1406,23 @@ function setMoneyRequestDescription(comment) {
  * @param {Object[]} participants
  */
 function setMoneyRequestParticipants(participants) {
-    Onyx.merge(ONYXKEYS.IOU, {
-        participants,
-    });
+    Onyx.merge(ONYXKEYS.IOU, {participants});
 }
 
 export {
     deleteMoneyRequest,
-    payMoneyRequest,
+    splitBill,
+    splitBillAndOpenReport,
     requestMoney,
-    resetMoneyRequestInfo,
     sendMoneyElsewhere,
     sendMoneyViaPaypal,
+    payMoneyRequest,
     sendMoneyWithWallet,
+    startMoneyRequest,
+    resetMoneyRequestInfo,
+    setMoneyRequestId,
     setMoneyRequestAmount,
     setMoneyRequestCurrency,
     setMoneyRequestDescription,
-    setMoneyRequestId,
     setMoneyRequestParticipants,
-    splitBill,
-    splitBillAndOpenReport,
-    startMoneyRequest,
-};
+};
\ No newline at end of file

From 9aa9b1869b7a910735790193f5c47c2b11b574e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Fri, 28 Jul 2023 17:45:55 +0300
Subject: [PATCH 11/19] formatting

---
 src/libs/actions/IOU.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 752a455b4a3e..dd6cc9bd2eeb 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -349,6 +349,7 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
     if (iouReport) {
         if (isPolicyExpenseChat) {
             iouReport = {...iouReport};
+
             // Because of the Expense reports are stored as negative values, we substract the total from the amount
             iouReport.total -= amount;
         } else {
@@ -1326,11 +1327,6 @@ function sendMoneyViaPaypal(report, amount, currency, comment, managerID, recipi
     const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
 
     API.write('SendMoneyViaPaypal', params, {optimisticData, successData, failureData});
-    API.write('SendMoneyViaPaypal', params, {
-        optimisticData,
-        successData,
-        failureData,
-    });
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);

From a59d121322d4ebbd2fd92326394abf374d50c8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Fri, 28 Jul 2023 17:48:02 +0300
Subject: [PATCH 12/19] added spanish merchant localization

---
 src/languages/es.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/languages/es.js b/src/languages/es.js
index 24f86213377c..3ea00e227a60 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -149,6 +149,7 @@ export default {
         total: 'Total',
         edit: 'Editar',
         showMore: 'Mostrar más',
+        merchant: 'comerciante'
     },
     anonymousReportFooter: {
         logoTagline: 'Únete a la discussion.',

From 8fc5ffe15a16d1ba66eda1c424fb1f640afe33a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Fri, 28 Jul 2023 17:51:56 +0300
Subject: [PATCH 13/19] comment disabled options

---
 src/components/MoneyRequestConfirmationList.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index ea5428820caf..f6b56b1789c9 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -341,12 +341,14 @@ function MoneyRequestConfirmationList(props) {
                         title={props.iouDate}
                         description={translate('common.date')}
                         style={[styles.moneyRequestMenuItem, styles.mb2]}
+                        // Note: These options are temporarily disabled while we figure out the required API changes 
                         disabled
                     />
                     <MenuItemWithTopDescription
                         title={props.iouMerchant}
                         description={translate('common.merchant')}
                         style={[styles.moneyRequestMenuItem, styles.mb2]}
+                        // Note: These options are temporarily disabled while we figure out the required API changes 
                         disabled
                     />
                 </>

From 33bf29d1911ac953c3a186b15ff2a94485c956cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Fri, 28 Jul 2023 17:56:11 +0300
Subject: [PATCH 14/19] comment

---
 src/components/MoneyRequestConfirmationList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index f6b56b1789c9..4716ed848d55 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -341,14 +341,14 @@ function MoneyRequestConfirmationList(props) {
                         title={props.iouDate}
                         description={translate('common.date')}
                         style={[styles.moneyRequestMenuItem, styles.mb2]}
-                        // Note: These options are temporarily disabled while we figure out the required API changes 
+                        // Note: This component is disabled until this field is editable in next PR
                         disabled
                     />
                     <MenuItemWithTopDescription
                         title={props.iouMerchant}
                         description={translate('common.merchant')}
                         style={[styles.moneyRequestMenuItem, styles.mb2]}
-                        // Note: These options are temporarily disabled while we figure out the required API changes 
+                        // Note: This component is disabled until this field is editable in next PR
                         disabled
                     />
                 </>

From e993ea3174ef217719c12a34584f85e6da06c688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Fri, 28 Jul 2023 18:23:27 +0300
Subject: [PATCH 15/19] linting

---
 src/languages/en.js     | 2 +-
 src/languages/es.js     | 2 +-
 src/libs/actions/IOU.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 967410db0ad8..a17bf534a3c7 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -150,7 +150,7 @@ export default {
         total: 'Total',
         edit: 'Edit',
         showMore: 'Show more',
-        merchant: 'Merchant'
+        merchant: 'Merchant',
     },
     anonymousReportFooter: {
         logoTagline: 'Join in on the discussion.',
diff --git a/src/languages/es.js b/src/languages/es.js
index 3ea00e227a60..06be02403d48 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -149,7 +149,7 @@ export default {
         total: 'Total',
         edit: 'Editar',
         showMore: 'Mostrar más',
-        merchant: 'comerciante'
+        merchant: 'comerciante',
     },
     anonymousReportFooter: {
         logoTagline: 'Únete a la discussion.',
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index dd6cc9bd2eeb..4da084b4c2f3 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -1421,4 +1421,4 @@ export {
     setMoneyRequestCurrency,
     setMoneyRequestDescription,
     setMoneyRequestParticipants,
-};
\ No newline at end of file
+};

From 58806ef57a04ae78bd8597a2622b96dcde7d37b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Mon, 31 Jul 2023 16:41:47 +0200
Subject: [PATCH 16/19] removed merchant from optimistic update

---
 src/libs/actions/IOU.js                       | 283 ++++++++++--------
 .../iou/steps/MoneyRequestConfirmPage.js      |  15 +-
 2 files changed, 168 insertions(+), 130 deletions(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 4da084b4c2f3..16d6d8c05d15 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -112,7 +112,13 @@ function buildOnyxDataForMoneyRequest(
                 lastReadTime: DateUtils.getDBTime(),
                 hasOutstandingIOU: iouReport.total !== 0,
                 iouReportID: iouReport.reportID,
-                ...(isNewChatReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
+                ...(isNewChatReport
+                    ? {
+                        pendingFields: {
+                            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                        },
+                    }
+                    : {}),
             },
         },
         {
@@ -122,7 +128,13 @@ function buildOnyxDataForMoneyRequest(
                 ...iouReport,
                 lastMessageText: iouAction.message[0].text,
                 lastMessageHtml: iouAction.message[0].html,
-                ...(isNewIOUReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
+                ...(isNewIOUReport
+                    ? {
+                        pendingFields: {
+                            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                        },
+                    }
+                    : {}),
             },
         },
         {
@@ -134,7 +146,7 @@ function buildOnyxDataForMoneyRequest(
             onyxMethod: isNewChatReport ? Onyx.METHOD.SET : Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
             value: {
-                ...(isNewChatReport ? {[chatCreatedAction.reportActionID]: chatCreatedAction} : {}),
+                ...(isNewChatReport ? { [chatCreatedAction.reportActionID]: chatCreatedAction } : {}),
                 [reportPreviewAction.reportActionID]: reportPreviewAction,
             },
         },
@@ -142,7 +154,7 @@ function buildOnyxDataForMoneyRequest(
             onyxMethod: isNewIOUReport ? Onyx.METHOD.SET : Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
             value: {
-                ...(isNewIOUReport ? {[iouCreatedAction.reportActionID]: iouCreatedAction} : {}),
+                ...(isNewIOUReport ? { [iouCreatedAction.reportActionID]: iouCreatedAction } : {}),
                 [iouAction.reportActionID]: iouAction,
             },
         },
@@ -159,32 +171,32 @@ function buildOnyxDataForMoneyRequest(
     const successData = [
         ...(isNewChatReport
             ? [
-                  {
-                      onyxMethod: Onyx.METHOD.MERGE,
-                      key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
-                      value: {
-                          pendingFields: null,
-                          errorFields: null,
-                      },
-                  },
-              ]
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
+                    value: {
+                        pendingFields: null,
+                        errorFields: null,
+                    },
+                },
+            ]
             : []),
         ...(isNewIOUReport
             ? [
-                  {
-                      onyxMethod: Onyx.METHOD.MERGE,
-                      key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
-                      value: {
-                          pendingFields: null,
-                          errorFields: null,
-                      },
-                  },
-              ]
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                    value: {
+                        pendingFields: null,
+                        errorFields: null,
+                    },
+                },
+            ]
             : []),
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
-            value: {pendingAction: null},
+            value: { pendingAction: null },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -192,11 +204,11 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewChatReport
                     ? {
-                          [chatCreatedAction.reportActionID]: {
-                              pendingAction: null,
-                              errors: null,
-                          },
-                      }
+                        [chatCreatedAction.reportActionID]: {
+                            pendingAction: null,
+                            errors: null,
+                        },
+                    }
                     : {}),
                 [reportPreviewAction.reportActionID]: {
                     pendingAction: null,
@@ -209,11 +221,11 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewIOUReport
                     ? {
-                          [iouCreatedAction.reportActionID]: {
-                              pendingAction: null,
-                              errors: null,
-                          },
-                      }
+                        [iouCreatedAction.reportActionID]: {
+                            pendingAction: null,
+                            errors: null,
+                        },
+                    }
                     : {}),
                 [iouAction.reportActionID]: {
                     pendingAction: null,
@@ -233,25 +245,25 @@ function buildOnyxDataForMoneyRequest(
                 lastReadTime: chatReport.lastReadTime,
                 ...(isNewChatReport
                     ? {
-                          errorFields: {
-                              createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
-                          },
-                      }
+                        errorFields: {
+                            createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                        },
+                    }
                     : {}),
             },
         },
         ...(isNewIOUReport
             ? [
-                  {
-                      onyxMethod: Onyx.METHOD.MERGE,
-                      key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
-                      value: {
-                          errorFields: {
-                              createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
-                          },
-                      },
-                  },
-              ]
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                    value: {
+                        errorFields: {
+                            createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                        },
+                    },
+                },
+            ]
             : []),
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -266,18 +278,18 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewChatReport
                     ? {
-                          [chatCreatedAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                          },
-                          [reportPreviewAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError(null),
-                          },
-                      }
+                        [chatCreatedAction.reportActionID]: {
+                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                        },
+                        [reportPreviewAction.reportActionID]: {
+                            errors: ErrorUtils.getMicroSecondOnyxError(null),
+                        },
+                    }
                     : {
-                          [reportPreviewAction.reportActionID]: {
-                              created: reportPreviewAction.created,
-                          },
-                      }),
+                        [reportPreviewAction.reportActionID]: {
+                            created: reportPreviewAction.created,
+                        },
+                    }),
             },
         },
         {
@@ -286,18 +298,18 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewIOUReport
                     ? {
-                          [iouCreatedAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                          },
-                          [iouAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError(null),
-                          },
-                      }
+                        [iouCreatedAction.reportActionID]: {
+                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                        },
+                        [iouAction.reportActionID]: {
+                            errors: ErrorUtils.getMicroSecondOnyxError(null),
+                        },
+                    }
                     : {
-                          [iouAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                          },
-                      }),
+                        [iouAction.reportActionID]: {
+                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                        },
+                    }),
             },
         },
     ];
@@ -315,9 +327,8 @@ function buildOnyxDataForMoneyRequest(
  * @param {Number} payeeAccountID
  * @param {Object} participant
  * @param {String} comment
- * @param {String} merchant
  */
-function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, participant, comment, merchant) {
+function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, participant, comment) {
     const payerEmail = OptionsListUtils.addSMSDomainIfPhoneNumber(participant.login);
     const payerAccountID = Number(participant.accountID);
     const isPolicyExpenseChat = participant.isPolicyExpenseChat;
@@ -348,7 +359,7 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
 
     if (iouReport) {
         if (isPolicyExpenseChat) {
-            iouReport = {...iouReport};
+            iouReport = { ...iouReport };
 
             // Because of the Expense reports are stored as negative values, we substract the total from the amount
             iouReport.total -= amount;
@@ -362,7 +373,7 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
     }
 
     // STEP 3: Build optimistic transaction
-    const optimisticTransaction = TransactionUtils.buildOptimisticTransaction(amount, currency, iouReport.reportID, comment, null, null, merchant);
+    const optimisticTransaction = TransactionUtils.buildOptimisticTransaction(amount, currency, iouReport.reportID, comment, null, null);
 
     // STEP 4: Build optimistic reportActions. We need:
     // 1. CREATED action for the chatReport
@@ -386,13 +397,13 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
     // Add optimistic personal details for participant
     const optimisticPersonalDetailListAction = isNewChatReport
         ? {
-              [payerAccountID]: {
-                  accountID: payerAccountID,
-                  avatar: UserUtils.getDefaultAvatarURL(payerAccountID),
-                  displayName: participant.displayName || payerEmail,
-                  login: participant.login,
-              },
-          }
+            [payerAccountID]: {
+                accountID: payerAccountID,
+                avatar: UserUtils.getDefaultAvatarURL(payerAccountID),
+                displayName: participant.displayName || payerEmail,
+                login: participant.login,
+            },
+        }
         : undefined;
 
     let reportPreviewAction = isNewIOUReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
@@ -435,7 +446,7 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
             createdIOUReportActionID: isNewIOUReport ? optimisticCreatedActionForIOU.reportActionID : 0,
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
         },
-        {optimisticData, successData, failureData},
+        { optimisticData, successData, failureData },
     );
     resetMoneyRequestInfo();
     Navigation.dismissModal(chatReport.reportID);
@@ -510,7 +521,11 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             onyxMethod: existingGroupChatReport ? Onyx.METHOD.MERGE : Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChatReport.reportID}`,
             value: {
-                ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: groupCreatedReportAction}),
+                ...(existingGroupChatReport
+                    ? {}
+                    : {
+                        [groupCreatedReportAction.reportActionID]: groupCreatedReportAction,
+                    }),
                 [groupIOUReportAction.reportActionID]: groupIOUReportAction,
             },
         },
@@ -526,14 +541,18 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChatReport.reportID}`,
             value: {
-                ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: {pendingAction: null}}),
-                [groupIOUReportAction.reportActionID]: {pendingAction: null},
+                ...(existingGroupChatReport
+                    ? {}
+                    : {
+                        [groupCreatedReportAction.reportActionID]: { pendingAction: null },
+                    }),
+                [groupIOUReportAction.reportActionID]: { pendingAction: null },
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${groupTransaction.transactionID}`,
-            value: {pendingAction: null},
+            value: { pendingAction: null },
         },
     ];
 
@@ -541,7 +560,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${groupChatReport.reportID}`,
-            value: {pendingFields: {createChat: null}},
+            value: { pendingFields: { createChat: null } },
         });
     }
 
@@ -590,7 +609,13 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
 
     // Loop through participants creating individual chats, iouReports and reportActionIDs as needed
     const splitAmount = IOUUtils.calculateAmount(participants.length, amount, false);
-    const splits = [{email: currentUserEmail, accountID: currentUserAccountID, amount: IOUUtils.calculateAmount(participants.length, amount, true)}];
+    const splits = [
+        {
+            email: currentUserEmail,
+            accountID: currentUserAccountID,
+            amount: IOUUtils.calculateAmount(participants.length, amount, true),
+        },
+    ];
 
     const hasMultipleParticipants = participants.length > 1;
     _.each(participants, (participant) => {
@@ -659,13 +684,13 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         // Add optimistic personal details for new participants
         const oneOnOnePersonalDetailListAction = shouldCreateOptimisticPersonalDetails
             ? {
-                  [accountID]: {
-                      accountID,
-                      avatar: UserUtils.getDefaultAvatarURL(accountID),
-                      displayName: participant.displayName || email,
-                      login: participant.login,
-                  },
-              }
+                [accountID]: {
+                    accountID,
+                    avatar: UserUtils.getDefaultAvatarURL(accountID),
+                    displayName: participant.displayName || email,
+                    login: participant.login,
+                },
+            }
             : undefined;
 
         let oneOnOneReportPreviewAction = ReportActionsUtils.getReportPreviewAction(oneOnOneChatReport.reportID, oneOnOneIOUReport.reportID);
@@ -724,7 +749,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
     return {
         groupData,
         splits,
-        onyxData: {optimisticData, successData, failureData},
+        onyxData: { optimisticData, successData, failureData },
     };
 }
 
@@ -738,7 +763,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
  * @param {String} existingGroupChatReportID
  */
 function splitBill(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID = '') {
-    const {groupData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID);
+    const { groupData, splits, onyxData } = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID);
 
     API.write(
         'SplitBill',
@@ -769,7 +794,7 @@ function splitBill(participants, currentUserLogin, currentUserAccountID, amount,
  * @param {String} currency
  */
 function splitBillAndOpenReport(participants, currentUserLogin, currentUserAccountID, amount, comment, currency) {
-    const {groupData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency);
+    const { groupData, splits, onyxData } = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency);
 
     API.write(
         'SplitBillAndOpenReport',
@@ -817,7 +842,7 @@ function deleteMoneyRequest(chatReportID, iouReportID, moneyRequestAction, shoul
     const currentUserAccountID = optimisticIOUAction.actorAccountID;
     let updatedIOUReport = {};
     if (ReportUtils.isExpenseReport(iouReportID)) {
-        updatedIOUReport = {...iouReport};
+        updatedIOUReport = { ...iouReport };
 
         // Because of the Expense reports are stored as negative values, we add the total from the amount
         updatedIOUReport.total += amount;
@@ -891,7 +916,7 @@ function deleteMoneyRequest(chatReportID, iouReportID, moneyRequestAction, shoul
             reportActionID: optimisticIOUAction.reportActionID,
             iouReportID: updatedIOUReport.reportID,
         },
-        {optimisticData, successData, failureData},
+        { optimisticData, successData, failureData },
     );
 
     if (shouldCloseOnDelete) {
@@ -1017,7 +1042,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${optimisticTransaction.transactionID}`,
-            value: {pendingAction: null},
+            value: { pendingAction: null },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1050,11 +1075,13 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
         optimisticIOUReportData.onyxMethod = Onyx.METHOD.SET;
 
         // Set and clear pending fields on the chat report
-        optimisticChatReportData.value.pendingFields = {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD};
+        optimisticChatReportData.value.pendingFields = {
+            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        };
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: optimisticChatReportData.key,
-            value: {pendingFields: null},
+            value: { pendingFields: null },
         });
         failureData.push(
             {
@@ -1210,7 +1237,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_LAST_PAYMENT_METHOD,
-            value: {[iouReport.policyID]: paymentMethodType},
+            value: { [iouReport.policyID]: paymentMethodType },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1288,9 +1315,13 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyElsewhere(report, amount, currency, comment, managerID, recipient) {
-    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.ELSEWHERE, managerID, recipient);
+    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.ELSEWHERE, managerID, recipient);
 
-    API.write('SendMoneyElsewhere', params, {optimisticData, successData, failureData});
+    API.write('SendMoneyElsewhere', params, {
+        optimisticData,
+        successData,
+        failureData,
+    });
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);
@@ -1306,9 +1337,13 @@ function sendMoneyElsewhere(report, amount, currency, comment, managerID, recipi
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyWithWallet(report, amount, currency, comment, managerID, recipient) {
-    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.EXPENSIFY, managerID, recipient);
+    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.EXPENSIFY, managerID, recipient);
 
-    API.write('SendMoneyWithWallet', params, {optimisticData, successData, failureData});
+    API.write('SendMoneyWithWallet', params, {
+        optimisticData,
+        successData,
+        failureData,
+    });
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);
@@ -1324,9 +1359,13 @@ function sendMoneyWithWallet(report, amount, currency, comment, managerID, recip
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyViaPaypal(report, amount, currency, comment, managerID, recipient) {
-    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
+    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
 
-    API.write('SendMoneyViaPaypal', params, {optimisticData, successData, failureData});
+    API.write('SendMoneyViaPaypal', params, {
+        optimisticData,
+        successData,
+        failureData,
+    });
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);
@@ -1347,13 +1386,13 @@ function payMoneyRequest(paymentType, chatReport, iouReport) {
         accountID: iouReport.ownerAccountID,
         payPalMeAddress: iouReport.submitterPayPalMeAddress,
     };
-    const {params, optimisticData, successData, failureData} = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType);
+    const { params, optimisticData, successData, failureData } = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType);
 
     // For now we need to call the PayMoneyRequestWithWallet API since PayMoneyRequest was not updated to work with
     // Expensify Wallets.
     const apiCommand = paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'PayMoneyRequestWithWallet' : 'PayMoneyRequest';
 
-    API.write(apiCommand, params, {optimisticData, successData, failureData});
+    API.write(apiCommand, params, { optimisticData, successData, failureData });
     Navigation.dismissModal(chatReport.reportID);
     if (paymentType === CONST.IOU.PAYMENT_TYPE.PAYPAL_ME) {
         asyncOpenURL(Promise.resolve(), buildPayPalPaymentUrl(iouReport.total, recipient.payPalMeAddress, iouReport.currency));
@@ -1374,51 +1413,51 @@ function startMoneyRequest(iouType, reportID = '') {
  * @param {String} id
  */
 function setMoneyRequestId(id) {
-    Onyx.merge(ONYXKEYS.IOU, {id});
+    Onyx.merge(ONYXKEYS.IOU, { id });
 }
 
 /**
  * @param {Number} amount
  */
 function setMoneyRequestAmount(amount) {
-    Onyx.merge(ONYXKEYS.IOU, {amount});
+    Onyx.merge(ONYXKEYS.IOU, { amount });
 }
 
 /**
  * @param {String} currency
  */
 function setMoneyRequestCurrency(currency) {
-    Onyx.merge(ONYXKEYS.IOU, {currency});
+    Onyx.merge(ONYXKEYS.IOU, { currency });
 }
 
 /**
  * @param {String} comment
  */
 function setMoneyRequestDescription(comment) {
-    Onyx.merge(ONYXKEYS.IOU, {comment: comment.trim()});
+    Onyx.merge(ONYXKEYS.IOU, { comment: comment.trim() });
 }
 
 /**
  * @param {Object[]} participants
  */
 function setMoneyRequestParticipants(participants) {
-    Onyx.merge(ONYXKEYS.IOU, {participants});
+    Onyx.merge(ONYXKEYS.IOU, { participants });
 }
 
 export {
     deleteMoneyRequest,
-    splitBill,
-    splitBillAndOpenReport,
+    payMoneyRequest,
     requestMoney,
+    resetMoneyRequestInfo,
     sendMoneyElsewhere,
     sendMoneyViaPaypal,
-    payMoneyRequest,
     sendMoneyWithWallet,
-    startMoneyRequest,
-    resetMoneyRequestInfo,
-    setMoneyRequestId,
     setMoneyRequestAmount,
     setMoneyRequestCurrency,
     setMoneyRequestDescription,
+    setMoneyRequestId,
     setMoneyRequestParticipants,
+    splitBill,
+    splitBillAndOpenReport,
+    startMoneyRequest,
 };
diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js
index 0ffafd783528..8867849c0d48 100644
--- a/src/pages/iou/steps/MoneyRequestConfirmPage.js
+++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js
@@ -1,7 +1,7 @@
-import React, {useCallback, useEffect, useMemo, useRef} from 'react';
-import {View} from 'react-native';
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import { View } from 'react-native';
 import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
+import { withOnyx } from 'react-native-onyx';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import MoneyRequestConfirmationList from '../../../components/MoneyRequestConfirmationList';
@@ -17,7 +17,7 @@ import * as OptionsListUtils from '../../../libs/OptionsListUtils';
 import withLocalize from '../../../components/withLocalize';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
 import ONYXKEYS from '../../../ONYXKEYS';
-import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '../../../components/withCurrentUserPersonalDetails';
+import withCurrentUserPersonalDetails, { withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes } from '../../../components/withCurrentUserPersonalDetails';
 import reportPropTypes from '../../reportPropTypes';
 import personalDetailsPropType from '../../personalDetailsPropType';
 
@@ -148,7 +148,6 @@ function MoneyRequestConfirmPage(props) {
                 props.currentUserPersonalDetails.accountID,
                 selectedParticipants[0],
                 trimmedComment,
-                props.iou.merchant,
             );
         },
         [props.iou.amount, props.iou.comment, props.currentUserPersonalDetails.login, props.currentUserPersonalDetails.accountID, props.iou.currency, props.report, props.iou.merchant],
@@ -184,7 +183,7 @@ function MoneyRequestConfirmPage(props) {
 
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
-            {({safeAreaPaddingBottomStyle}) => (
+            {({ safeAreaPaddingBottomStyle }) => (
                 <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                     <HeaderWithBackButton
                         title={props.translate('iou.cash')}
@@ -201,7 +200,7 @@ function MoneyRequestConfirmPage(props) {
                         onSelectParticipant={(option) => {
                             const newParticipants = _.map(props.iou.participants, (participant) => {
                                 if (participant.accountID === option.accountID) {
-                                    return {...participant, selected: !participant.selected};
+                                    return { ...participant, selected: !participant.selected };
                                 }
                                 return participant;
                             });
@@ -236,7 +235,7 @@ export default compose(
     withLocalize,
     withOnyx({
         report: {
-            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
+            key: ({ route }) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
         },
         iou: {
             key: ONYXKEYS.IOU,

From 8e49daa9ee961d83678e331ebdaabed8e09c1532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Tue, 1 Aug 2023 15:19:58 +0300
Subject: [PATCH 17/19] merge fix and formatting

---
 src/libs/actions/IOU.js                       | 283 ++++++++----------
 .../iou/steps/MoneyRequestConfirmPage.js      |  14 +-
 2 files changed, 126 insertions(+), 171 deletions(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 7a80c5328a97..dc165e5dbbbd 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -105,13 +105,7 @@ function buildOnyxDataForMoneyRequest(
                 lastReadTime: DateUtils.getDBTime(),
                 hasOutstandingIOU: iouReport.total !== 0,
                 iouReportID: iouReport.reportID,
-                ...(isNewChatReport
-                    ? {
-                        pendingFields: {
-                            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                        },
-                    }
-                    : {}),
+                ...(isNewChatReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
             },
         },
         {
@@ -121,13 +115,7 @@ function buildOnyxDataForMoneyRequest(
                 ...iouReport,
                 lastMessageText: iouAction.message[0].text,
                 lastMessageHtml: iouAction.message[0].html,
-                ...(isNewIOUReport
-                    ? {
-                        pendingFields: {
-                            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                        },
-                    }
-                    : {}),
+                ...(isNewIOUReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
             },
         },
         {
@@ -139,7 +127,7 @@ function buildOnyxDataForMoneyRequest(
             onyxMethod: isNewChatReport ? Onyx.METHOD.SET : Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
             value: {
-                ...(isNewChatReport ? { [chatCreatedAction.reportActionID]: chatCreatedAction } : {}),
+                ...(isNewChatReport ? {[chatCreatedAction.reportActionID]: chatCreatedAction} : {}),
                 [reportPreviewAction.reportActionID]: reportPreviewAction,
             },
         },
@@ -147,7 +135,7 @@ function buildOnyxDataForMoneyRequest(
             onyxMethod: isNewIOUReport ? Onyx.METHOD.SET : Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
             value: {
-                ...(isNewIOUReport ? { [iouCreatedAction.reportActionID]: iouCreatedAction } : {}),
+                ...(isNewIOUReport ? {[iouCreatedAction.reportActionID]: iouCreatedAction} : {}),
                 [iouAction.reportActionID]: iouAction,
             },
         },
@@ -164,32 +152,32 @@ function buildOnyxDataForMoneyRequest(
     const successData = [
         ...(isNewChatReport
             ? [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
-                    value: {
-                        pendingFields: null,
-                        errorFields: null,
-                    },
-                },
-            ]
+                  {
+                      onyxMethod: Onyx.METHOD.MERGE,
+                      key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
+                      value: {
+                          pendingFields: null,
+                          errorFields: null,
+                      },
+                  },
+              ]
             : []),
         ...(isNewIOUReport
             ? [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
-                    value: {
-                        pendingFields: null,
-                        errorFields: null,
-                    },
-                },
-            ]
+                  {
+                      onyxMethod: Onyx.METHOD.MERGE,
+                      key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                      value: {
+                          pendingFields: null,
+                          errorFields: null,
+                      },
+                  },
+              ]
             : []),
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
-            value: { pendingAction: null },
+            value: {pendingAction: null},
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -197,11 +185,11 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewChatReport
                     ? {
-                        [chatCreatedAction.reportActionID]: {
-                            pendingAction: null,
-                            errors: null,
-                        },
-                    }
+                          [chatCreatedAction.reportActionID]: {
+                              pendingAction: null,
+                              errors: null,
+                          },
+                      }
                     : {}),
                 [reportPreviewAction.reportActionID]: {
                     pendingAction: null,
@@ -214,11 +202,11 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewIOUReport
                     ? {
-                        [iouCreatedAction.reportActionID]: {
-                            pendingAction: null,
-                            errors: null,
-                        },
-                    }
+                          [iouCreatedAction.reportActionID]: {
+                              pendingAction: null,
+                              errors: null,
+                          },
+                      }
                     : {}),
                 [iouAction.reportActionID]: {
                     pendingAction: null,
@@ -238,25 +226,25 @@ function buildOnyxDataForMoneyRequest(
                 lastReadTime: chatReport.lastReadTime,
                 ...(isNewChatReport
                     ? {
-                        errorFields: {
-                            createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
-                        },
-                    }
+                          errorFields: {
+                              createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                          },
+                      }
                     : {}),
             },
         },
         ...(isNewIOUReport
             ? [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
-                    value: {
-                        errorFields: {
-                            createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
-                        },
-                    },
-                },
-            ]
+                  {
+                      onyxMethod: Onyx.METHOD.MERGE,
+                      key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                      value: {
+                          errorFields: {
+                              createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                          },
+                      },
+                  },
+              ]
             : []),
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -271,18 +259,18 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewChatReport
                     ? {
-                        [chatCreatedAction.reportActionID]: {
-                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                        },
-                        [reportPreviewAction.reportActionID]: {
-                            errors: ErrorUtils.getMicroSecondOnyxError(null),
-                        },
-                    }
+                          [chatCreatedAction.reportActionID]: {
+                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                          },
+                          [reportPreviewAction.reportActionID]: {
+                              errors: ErrorUtils.getMicroSecondOnyxError(null),
+                          },
+                      }
                     : {
-                        [reportPreviewAction.reportActionID]: {
-                            created: reportPreviewAction.created,
-                        },
-                    }),
+                          [reportPreviewAction.reportActionID]: {
+                              created: reportPreviewAction.created,
+                          },
+                      }),
             },
         },
         {
@@ -291,18 +279,18 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 ...(isNewIOUReport
                     ? {
-                        [iouCreatedAction.reportActionID]: {
-                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                        },
-                        [iouAction.reportActionID]: {
-                            errors: ErrorUtils.getMicroSecondOnyxError(null),
-                        },
-                    }
+                          [iouCreatedAction.reportActionID]: {
+                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                          },
+                          [iouAction.reportActionID]: {
+                              errors: ErrorUtils.getMicroSecondOnyxError(null),
+                          },
+                      }
                     : {
-                        [iouAction.reportActionID]: {
-                            errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                        },
-                    }),
+                          [iouAction.reportActionID]: {
+                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                          },
+                      }),
             },
         },
     ];
@@ -352,7 +340,7 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
 
     if (iouReport) {
         if (isPolicyExpenseChat) {
-            iouReport = { ...iouReport };
+            iouReport = {...iouReport};
 
             // Because of the Expense reports are stored as negative values, we substract the total from the amount
             iouReport.total -= amount;
@@ -366,7 +354,7 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
     }
 
     // STEP 3: Build optimistic transaction
-    const optimisticTransaction = TransactionUtils.buildOptimisticTransaction(amount, currency, iouReport.reportID, comment, null, null);
+    const optimisticTransaction = TransactionUtils.buildOptimisticTransaction(amount, currency, iouReport.reportID, comment);
 
     // STEP 4: Build optimistic reportActions. We need:
     // 1. CREATED action for the chatReport
@@ -390,13 +378,13 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
     // Add optimistic personal details for participant
     const optimisticPersonalDetailListAction = isNewChatReport
         ? {
-            [payerAccountID]: {
-                accountID: payerAccountID,
-                avatar: UserUtils.getDefaultAvatarURL(payerAccountID),
-                displayName: participant.displayName || payerEmail,
-                login: participant.login,
-            },
-        }
+              [payerAccountID]: {
+                  accountID: payerAccountID,
+                  avatar: UserUtils.getDefaultAvatarURL(payerAccountID),
+                  displayName: participant.displayName || payerEmail,
+                  login: participant.login,
+              },
+          }
         : undefined;
 
     let reportPreviewAction = isNewIOUReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
@@ -436,7 +424,7 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
             createdIOUReportActionID: isNewIOUReport ? optimisticCreatedActionForIOU.reportActionID : 0,
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
         },
-        { optimisticData, successData, failureData },
+        {optimisticData, successData, failureData},
     );
     resetMoneyRequestInfo();
     Navigation.dismissModal(chatReport.reportID);
@@ -511,11 +499,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             onyxMethod: existingGroupChatReport ? Onyx.METHOD.MERGE : Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChatReport.reportID}`,
             value: {
-                ...(existingGroupChatReport
-                    ? {}
-                    : {
-                        [groupCreatedReportAction.reportActionID]: groupCreatedReportAction,
-                    }),
+                ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: groupCreatedReportAction}),
                 [groupIOUReportAction.reportActionID]: groupIOUReportAction,
             },
         },
@@ -531,18 +515,14 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChatReport.reportID}`,
             value: {
-                ...(existingGroupChatReport
-                    ? {}
-                    : {
-                        [groupCreatedReportAction.reportActionID]: { pendingAction: null },
-                    }),
-                [groupIOUReportAction.reportActionID]: { pendingAction: null },
+                ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: {pendingAction: null}}),
+                [groupIOUReportAction.reportActionID]: {pendingAction: null},
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${groupTransaction.transactionID}`,
-            value: { pendingAction: null },
+            value: {pendingAction: null},
         },
     ];
 
@@ -550,7 +530,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${groupChatReport.reportID}`,
-            value: { pendingFields: { createChat: null } },
+            value: {pendingFields: {createChat: null}},
         });
     }
 
@@ -599,13 +579,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
 
     // Loop through participants creating individual chats, iouReports and reportActionIDs as needed
     const splitAmount = IOUUtils.calculateAmount(participants.length, amount, false);
-    const splits = [
-        {
-            email: currentUserEmail,
-            accountID: currentUserAccountID,
-            amount: IOUUtils.calculateAmount(participants.length, amount, true),
-        },
-    ];
+    const splits = [{email: currentUserEmail, accountID: currentUserAccountID, amount: IOUUtils.calculateAmount(participants.length, amount, true)}];
 
     const hasMultipleParticipants = participants.length > 1;
     _.each(participants, (participant) => {
@@ -674,13 +648,13 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         // Add optimistic personal details for new participants
         const oneOnOnePersonalDetailListAction = shouldCreateOptimisticPersonalDetails
             ? {
-                [accountID]: {
-                    accountID,
-                    avatar: UserUtils.getDefaultAvatarURL(accountID),
-                    displayName: participant.displayName || email,
-                    login: participant.login,
-                },
-            }
+                  [accountID]: {
+                      accountID,
+                      avatar: UserUtils.getDefaultAvatarURL(accountID),
+                      displayName: participant.displayName || email,
+                      login: participant.login,
+                  },
+              }
             : undefined;
 
         let oneOnOneReportPreviewAction = ReportActionsUtils.getReportPreviewAction(oneOnOneChatReport.reportID, oneOnOneIOUReport.reportID);
@@ -736,7 +710,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
     return {
         groupData,
         splits,
-        onyxData: { optimisticData, successData, failureData },
+        onyxData: {optimisticData, successData, failureData},
     };
 }
 
@@ -750,7 +724,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
  * @param {String} existingGroupChatReportID
  */
 function splitBill(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID = '') {
-    const { groupData, splits, onyxData } = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID);
+    const {groupData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID);
 
     API.write(
         'SplitBill',
@@ -781,7 +755,7 @@ function splitBill(participants, currentUserLogin, currentUserAccountID, amount,
  * @param {String} currency
  */
 function splitBillAndOpenReport(participants, currentUserLogin, currentUserAccountID, amount, comment, currency) {
-    const { groupData, splits, onyxData } = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency);
+    const {groupData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency);
 
     API.write(
         'SplitBillAndOpenReport',
@@ -847,11 +821,6 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView
         },
     };
 
-
-    const currentUserAccountID = optimisticIOUAction.actorAccountID;
-    let updatedIOUReport = {};
-    if (ReportUtils.isExpenseReport(iouReportID)) {
-        updatedIOUReport = { ...iouReport };
     const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(iouReport.reportID, updatedReportAction);
     const iouReportLastMessageText = ReportActionsUtils.getLastVisibleMessage(iouReport.reportID, updatedReportAction).lastMessageText;
     const shouldDeleteIOUReport =
@@ -1001,7 +970,7 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView
             transactionID,
             reportActionID: reportAction.reportActionID,
         },
-        { optimisticData, successData, failureData },
+        {optimisticData, successData, failureData},
     );
 
     // STEP 7: Navigate the user depending on which page they are on and which resources were deleted
@@ -1137,7 +1106,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${optimisticTransaction.transactionID}`,
-            value: { pendingAction: null },
+            value: {pendingAction: null},
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1170,13 +1139,11 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
         optimisticIOUReportData.onyxMethod = Onyx.METHOD.SET;
 
         // Set and clear pending fields on the chat report
-        optimisticChatReportData.value.pendingFields = {
-            createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        };
+        optimisticChatReportData.value.pendingFields = {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD};
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: optimisticChatReportData.key,
-            value: { pendingFields: null },
+            value: {pendingFields: null},
         });
         failureData.push(
             {
@@ -1328,7 +1295,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_LAST_PAYMENT_METHOD,
-            value: { [iouReport.policyID]: paymentMethodType },
+            value: {[iouReport.policyID]: paymentMethodType},
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1406,13 +1373,9 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyElsewhere(report, amount, currency, comment, managerID, recipient) {
-    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.ELSEWHERE, managerID, recipient);
+    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.ELSEWHERE, managerID, recipient);
 
-    API.write('SendMoneyElsewhere', params, {
-        optimisticData,
-        successData,
-        failureData,
-    });
+    API.write('SendMoneyElsewhere', params, {optimisticData, successData, failureData});
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);
@@ -1428,13 +1391,9 @@ function sendMoneyElsewhere(report, amount, currency, comment, managerID, recipi
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyWithWallet(report, amount, currency, comment, managerID, recipient) {
-    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.EXPENSIFY, managerID, recipient);
+    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.EXPENSIFY, managerID, recipient);
 
-    API.write('SendMoneyWithWallet', params, {
-        optimisticData,
-        successData,
-        failureData,
-    });
+    API.write('SendMoneyWithWallet', params, {optimisticData, successData, failureData});
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);
@@ -1450,13 +1409,9 @@ function sendMoneyWithWallet(report, amount, currency, comment, managerID, recip
  * @param {Object} recipient - The user receiving the money
  */
 function sendMoneyViaPaypal(report, amount, currency, comment, managerID, recipient) {
-    const { params, optimisticData, successData, failureData } = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
+    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
 
-    API.write('SendMoneyViaPaypal', params, {
-        optimisticData,
-        successData,
-        failureData,
-    });
+    API.write('SendMoneyViaPaypal', params, {optimisticData, successData, failureData});
 
     resetMoneyRequestInfo();
     Navigation.dismissModal(params.chatReportID);
@@ -1477,13 +1432,13 @@ function payMoneyRequest(paymentType, chatReport, iouReport) {
         accountID: iouReport.ownerAccountID,
         payPalMeAddress: iouReport.submitterPayPalMeAddress,
     };
-    const { params, optimisticData, successData, failureData } = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType);
+    const {params, optimisticData, successData, failureData} = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType);
 
     // For now we need to call the PayMoneyRequestWithWallet API since PayMoneyRequest was not updated to work with
     // Expensify Wallets.
     const apiCommand = paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'PayMoneyRequestWithWallet' : 'PayMoneyRequest';
 
-    API.write(apiCommand, params, { optimisticData, successData, failureData });
+    API.write(apiCommand, params, {optimisticData, successData, failureData});
     Navigation.dismissModal(chatReport.reportID);
     if (paymentType === CONST.IOU.PAYMENT_TYPE.PAYPAL_ME) {
         asyncOpenURL(Promise.resolve(), buildPayPalPaymentUrl(iouReport.total, recipient.payPalMeAddress, iouReport.currency));
@@ -1504,51 +1459,51 @@ function startMoneyRequest(iouType, reportID = '') {
  * @param {String} id
  */
 function setMoneyRequestId(id) {
-    Onyx.merge(ONYXKEYS.IOU, { id });
+    Onyx.merge(ONYXKEYS.IOU, {id});
 }
 
 /**
  * @param {Number} amount
  */
 function setMoneyRequestAmount(amount) {
-    Onyx.merge(ONYXKEYS.IOU, { amount });
+    Onyx.merge(ONYXKEYS.IOU, {amount});
 }
 
 /**
  * @param {String} currency
  */
 function setMoneyRequestCurrency(currency) {
-    Onyx.merge(ONYXKEYS.IOU, { currency });
+    Onyx.merge(ONYXKEYS.IOU, {currency});
 }
 
 /**
  * @param {String} comment
  */
 function setMoneyRequestDescription(comment) {
-    Onyx.merge(ONYXKEYS.IOU, { comment: comment.trim() });
+    Onyx.merge(ONYXKEYS.IOU, {comment: comment.trim()});
 }
 
 /**
  * @param {Object[]} participants
  */
 function setMoneyRequestParticipants(participants) {
-    Onyx.merge(ONYXKEYS.IOU, { participants });
+    Onyx.merge(ONYXKEYS.IOU, {participants});
 }
 
 export {
     deleteMoneyRequest,
-    payMoneyRequest,
+    splitBill,
+    splitBillAndOpenReport,
     requestMoney,
-    resetMoneyRequestInfo,
     sendMoneyElsewhere,
     sendMoneyViaPaypal,
+    payMoneyRequest,
     sendMoneyWithWallet,
+    startMoneyRequest,
+    resetMoneyRequestInfo,
+    setMoneyRequestId,
     setMoneyRequestAmount,
     setMoneyRequestCurrency,
     setMoneyRequestDescription,
-    setMoneyRequestId,
     setMoneyRequestParticipants,
-    splitBill,
-    splitBillAndOpenReport,
-    startMoneyRequest,
 };
diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js
index 8867849c0d48..a10f922937a4 100644
--- a/src/pages/iou/steps/MoneyRequestConfirmPage.js
+++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js
@@ -1,7 +1,7 @@
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
-import { View } from 'react-native';
+import React, {useCallback, useEffect, useMemo, useRef} from 'react';
+import {View} from 'react-native';
 import PropTypes from 'prop-types';
-import { withOnyx } from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import MoneyRequestConfirmationList from '../../../components/MoneyRequestConfirmationList';
@@ -17,7 +17,7 @@ import * as OptionsListUtils from '../../../libs/OptionsListUtils';
 import withLocalize from '../../../components/withLocalize';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
 import ONYXKEYS from '../../../ONYXKEYS';
-import withCurrentUserPersonalDetails, { withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes } from '../../../components/withCurrentUserPersonalDetails';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '../../../components/withCurrentUserPersonalDetails';
 import reportPropTypes from '../../reportPropTypes';
 import personalDetailsPropType from '../../personalDetailsPropType';
 
@@ -183,7 +183,7 @@ function MoneyRequestConfirmPage(props) {
 
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
-            {({ safeAreaPaddingBottomStyle }) => (
+            {({safeAreaPaddingBottomStyle}) => (
                 <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                     <HeaderWithBackButton
                         title={props.translate('iou.cash')}
@@ -200,7 +200,7 @@ function MoneyRequestConfirmPage(props) {
                         onSelectParticipant={(option) => {
                             const newParticipants = _.map(props.iou.participants, (participant) => {
                                 if (participant.accountID === option.accountID) {
-                                    return { ...participant, selected: !participant.selected };
+                                    return {...participant, selected: !participant.selected};
                                 }
                                 return participant;
                             });
@@ -235,7 +235,7 @@ export default compose(
     withLocalize,
     withOnyx({
         report: {
-            key: ({ route }) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
+            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
         },
         iou: {
             key: ONYXKEYS.IOU,

From 773bef67866487c91e5fd37749ebb2fafa7b23a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Tue, 1 Aug 2023 15:23:33 +0300
Subject: [PATCH 18/19] removed unnecessary useeffect dependency

---
 src/pages/iou/steps/MoneyRequestConfirmPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js
index a10f922937a4..2615aaf741e1 100644
--- a/src/pages/iou/steps/MoneyRequestConfirmPage.js
+++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js
@@ -150,7 +150,7 @@ function MoneyRequestConfirmPage(props) {
                 trimmedComment,
             );
         },
-        [props.iou.amount, props.iou.comment, props.currentUserPersonalDetails.login, props.currentUserPersonalDetails.accountID, props.iou.currency, props.report, props.iou.merchant],
+        [props.iou.amount, props.iou.comment, props.currentUserPersonalDetails.login, props.currentUserPersonalDetails.accountID, props.iou.currency, props.report],
     );
 
     /**

From 7f8a634d586550c1e896b54dbc2f0e71f0f1b960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Thu, 3 Aug 2023 11:29:04 +0300
Subject: [PATCH 19/19] capitalized merchant in Spanish

---
 src/languages/es.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/es.js b/src/languages/es.js
index a67101a5ef1e..4e6258f019cb 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -149,7 +149,7 @@ export default {
         total: 'Total',
         edit: 'Editar',
         showMore: 'Mostrar más',
-        merchant: 'comerciante',
+        merchant: 'Comerciante',
     },
     anonymousReportFooter: {
         logoTagline: 'Únete a la discussion.',