[NO QA] Merge the attendee tracking changes, but block use

src/ROUTES.ts

@@ -452,6 +452,54 @@ const ROUTES = {
         getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backTo = '') =>
             getUrlWithBackToParam(`${action as string}/${iouType as string}/attendees/${transactionID}/${reportID}`, backTo),
     },
+    SETTINGS_TAGS_ROOT: {
+        route: 'settings/:policyID/tags',
+        getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags`, backTo),
+    },
+    SETTINGS_TAGS_SETTINGS: {
+        route: 'settings/:policyID/tags/settings',
+        getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags/settings` as const, backTo),
+    },
+    SETTINGS_TAGS_EDIT: {
+        route: 'settings/:policyID/tags/:orderWeight/edit',
+        getRoute: (policyID: string, orderWeight: number, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags/${orderWeight}/edit` as const, backTo),
+    },
+    SETTINGS_TAG_CREATE: {
+        route: 'settings/:policyID/tags/new',
+        getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags/new` as const, backTo),
+    },
+    SETTINGS_TAG_EDIT: {
+        route: 'settings/:policyID/tag/:orderWeight/:tagName/edit',
+        getRoute: (policyID: string, orderWeight: number, tagName: string, backTo = '') =>
+            getUrlWithBackToParam(`settings/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}/edit` as const, backTo),
+    },
+    SETTINGS_TAG_SETTINGS: {
+        route: 'settings/:policyID/tag/:orderWeight/:tagName',
+        getRoute: (policyID: string, orderWeight: number, tagName: string, backTo = '') =>
+            getUrlWithBackToParam(`settings/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}` as const, backTo),
+    },
+    SETTINGS_TAG_APPROVER: {
+        route: 'settings/:policyID/tag/:orderWeight/:tagName/approver',
+        getRoute: (policyID: string, orderWeight: number, tagName: string, backTo = '') =>
+            getUrlWithBackToParam(`settings/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}/approver` as const, backTo),
+    },
+    SETTINGS_TAG_LIST_VIEW: {
+        route: 'settings/:policyID/tag-list/:orderWeight',
+        getRoute: (policyID: string, orderWeight: number, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tag-list/${orderWeight}` as const, backTo),
+    },
+    SETTINGS_TAG_GL_CODE: {
+        route: 'settings/:policyID/tag/:orderWeight/:tagName/gl-code',
+        getRoute: (policyID: string, orderWeight: number, tagName: string, backTo = '') =>
+            getUrlWithBackToParam(`settings/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}/gl-code` as const, backTo),
+    },
+    SETTINGS_TAGS_IMPORT: {
+        route: 'settings/:policyID/tags/import',
+        getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags/import` as const, backTo),
+    },
+    SETTINGS_TAGS_IMPORTED: {
+        route: 'settings/:policyID/tags/imported',
+        getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags/imported` as const, backTo),
+    },
     SETTINGS_CATEGORIES_ROOT: {
         route: 'settings/:policyID/categories',
         getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/categories`, backTo),

src/components/MoneyRequestConfirmationListFooter.tsx

@@ -544,7 +544,10 @@ function MoneyRequestConfirmationListFooter({
         },
         {
             item: (
-                <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8, styles.optionRow]}>
+                <View
+                    key={translate('common.billable')}
+                    style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8, styles.optionRow]}
+                >
                     <ToggleSettingOptionRow
                         switchAccessibilityLabel={translate('common.billable')}
                         title={translate('common.billable')}

src/languages/en.ts

@@ -1032,6 +1032,8 @@ const translations = {
         bookingArchived: 'This booking is archived',
         bookingArchivedDescription: 'This booking is archived because the trip date has passed. Add an expense for the final amount if needed.',
         attendees: 'Attendees',
+        paymentComplete: 'Payment complete',
+        justTrackIt: 'Just track it (don’t submit it)',
     },
     notificationPreferencesPage: {
         header: 'Notification preferences',

src/languages/es.ts

@@ -1029,6 +1029,8 @@ const translations = {
         bookingArchived: 'Esta reserva está archivada',
         bookingArchivedDescription: 'Esta reserva está archivada porque la fecha del viaje ha pasado. Agregue un gasto por el monto final si es necesario.',
         attendees: 'Asistentes',
+        paymentComplete: 'Pago completo',
+        justTrackIt: 'Solo guardarlo (no enviarlo)',
     },
     notificationPreferencesPage: {
         header: 'Preferencias de avisos',

src/libs/IOUUtils.ts

@@ -181,6 +181,14 @@ function formatCurrentUserToAttendee(currentUser?: PersonalDetails, reportID?: s
     return [initialAttendee];
 }
 
+function shouldStartLocationPermissionFlow() {
+    return (
+        !lastLocationPermissionPrompt ||
+        (DateUtils.isValidDateString(lastLocationPermissionPrompt ?? '') &&
+            DateUtils.getDifferenceInDaysFromNow(new Date(lastLocationPermissionPrompt ?? '')) > CONST.IOU.LOCATION_PERMISSION_PROMPT_THRESHOLD_DAYS)
+    );
+}
+
 export {
     calculateAmount,
     insertTagIntoTransactionTagsString,
@@ -190,6 +198,6 @@ export {
     isValidMoneyRequestType,
     navigateToStartMoneyRequestStep,
     updateIOUOwnerAndTotal,
-    temporary_isValidMoneyRequestType,
     formatCurrentUserToAttendee,
+    shouldStartLocationPermissionFlow,
 };

src/libs/OptionsListUtils.ts

@@ -2489,6 +2489,7 @@ function filterOptions(options: Options, searchInputValue: string, config?: Filt
         preferChatroomsOverThreads = false,
         preferPolicyExpenseChat = false,
         shouldAcceptName = false,
+        preferRecentExpenseReports = false,
     } = config ?? {};
     // Remove the personal details for the DMs that are already in the recent reports so that we don't show duplicates
     function filteredPersonalDetailsOfRecentReports(recentReports: ReportUtils.OptionData[], personalDetails: ReportUtils.OptionData[]) {

src/libs/TransactionUtils/index.ts

@@ -22,7 +22,7 @@ import type {IOURequestType} from '@userActions/IOU';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Beta, OnyxInputOrEntry, Policy, RecentWaypoint, ReviewDuplicates, TaxRate, TaxRates, Transaction, TransactionViolation, TransactionViolations} from '@src/types/onyx';
+import type {Beta, OnyxInputOrEntry, Policy, RecentWaypoint, Report, ReviewDuplicates, TaxRate, TaxRates, Transaction, TransactionViolation, TransactionViolations} from '@src/types/onyx';
 import type {Attendee} from '@src/types/onyx/IOU';
 import type {Comment, Receipt, TransactionChanges, TransactionPendingFieldsKey, Waypoint, WaypointCollection} from '@src/types/onyx/Transaction';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
@@ -211,8 +211,11 @@ function isMerchantMissing(transaction: OnyxEntry<Transaction>) {
     return isMerchantEmpty;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function shouldShowAttendees(iouType: IOUType, policy: OnyxEntry<Policy>): boolean {
-    return iouType === CONST.IOU.TYPE.SUBMIT && !!policy?.id && (policy?.type === CONST.POLICY.TYPE.CORPORATE || policy?.type === CONST.POLICY.TYPE.TEAM);
+    return false;
+    // To be renabled once feature is complete: https://github.com/Expensify/App/issues/44725
+    // return iouType === CONST.IOU.TYPE.SUBMIT && !!policy?.id && (policy?.type === CONST.POLICY.TYPE.CORPORATE || policy?.type === CONST.POLICY.TYPE.TEAM);
 }
 
 /**

src/libs/actions/IOU.ts

@@ -2038,6 +2038,7 @@ function getMoneyRequestInformation(
     moneyRequestReportID = '',
     linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction,
     attendees?: Attendee[],
+    existingTransaction: OnyxEntry<OnyxTypes.Transaction> | undefined = undefined,
 ): MoneyRequestInformation {
     const payerEmail = PhoneNumber.addSMSDomainIfPhoneNumber(participant.login ?? '');
     const payerAccountID = Number(participant.accountID);
@@ -2757,6 +2758,9 @@ function getUpdateMoneyRequestParams(
         }
     }
 
+    const clearedPendingFields = Object.fromEntries(Object.keys(updatedTransaction?.pendingFields ?? transactionChanges).map((key) => [key, null]));
+
+    // Clear out the error fields and loading states on success
     successData.push({
         onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
@@ -5280,6 +5284,7 @@ function createDistanceRequest(
             currentUserEmail,
             moneyRequestReportID,
             undefined,
+            undefined,
             existingTransaction,
         );
         onyxData = moneyRequestOnyxData;

src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

@@ -252,6 +252,7 @@ function IOURequestStepScan({
                 IOU.requestMoney(
                     report,
                     0,
+                    transaction?.attendees,
                     transaction?.currency ?? 'USD',
                     transaction?.created ?? '',
                     '',
@@ -263,7 +264,7 @@ function IOURequestStepScan({
                 );
             }
         },
-        [currentUserPersonalDetails.accountID, currentUserPersonalDetails.login, iouType, report, transaction?.created, transaction?.currency],
+        [currentUserPersonalDetails.accountID, currentUserPersonalDetails.login, iouType, report, transaction?.attendees, transaction?.created, transaction?.currency],
     );
     const navigateToConfirmationStep = useCallback(
         (file: FileObject, source: string, locationPermissionGranted = false) => {
@@ -309,105 +310,87 @@ function IOURequestStepScan({
                     });
                     return;
                 }
-                getCurrentPosition(
-                    (successData) => {
-                        if (iouType === CONST.IOU.TYPE.TRACK && report) {
-                            IOU.trackExpense(
-                                report,
-                                0,
-                                transaction?.currency ?? 'USD',
-                                transaction?.created ?? '',
-                                '',
-                                currentUserPersonalDetails.login,
-                                currentUserPersonalDetails.accountID,
-                                participants[0],
-                                '',
-                                receipt,
-                                '',
-                                '',
-                                '',
-                                0,
-                                false,
-                                policy,
-                                {},
-                                {},
-                                {
-                                    lat: successData.coords.latitude,
-                                    long: successData.coords.longitude,
-                                },
-                            );
-                        } else {
-                            IOU.requestMoney(
-                                report,
-                                0,
-                                transaction?.attendees,
-                                transaction?.currency ?? 'USD',
-                                transaction?.created ?? '',
-                                '',
-                                currentUserPersonalDetails.login,
-                                currentUserPersonalDetails.accountID,
-                                participants[0],
-                                '',
-                                receipt,
-                                '',
-                                '',
-                                '',
-                                0,
-                                false,
-                                policy,
-                                {},
-                                {},
-                                {
-                                    lat: successData.coords.latitude,
-                                    long: successData.coords.longitude,
-                                },
-                            );
-                        }
-                    },
-                    (errorData) => {
-                        Log.info('[IOURequestStepScan] getCurrentPosition failed', false, errorData);
-                        // When there is an error, the money can still be requested, it just won't include the GPS coordinates
-                        if (iouType === CONST.IOU.TYPE.TRACK && report) {
-                            IOU.trackExpense(
-                                report,
-                                0,
-                                transaction?.currency ?? 'USD',
-                                transaction?.created ?? '',
-                                '',
-                                currentUserPersonalDetails.login,
-                                currentUserPersonalDetails.accountID,
-                                participants[0],
-                                '',
-                                receipt,
-                            );
-                        } else {
-                            IOU.requestMoney(
-                                report,
-                                0,
-                                transaction?.attendees,
-                                transaction?.currency ?? 'USD',
-                                transaction?.created ?? '',
-                                '',
-                                currentUserPersonalDetails.login,
-                                currentUserPersonalDetails.accountID,
-                                participants[0],
-                                '',
-                                receipt,
-                            );
-                        }
-                    },
-                    {
-                        maximumAge: CONST.GPS.MAX_AGE,
-                        timeout: CONST.GPS.TIMEOUT,
-                    },
-                );
+                const participant = participants.at(0);
+                if (!participant) {
+                    return;
+                }
+                if (locationPermissionGranted) {
+                    getCurrentPosition(
+                        (successData) => {
+                            if (iouType === CONST.IOU.TYPE.TRACK && report) {
+                                IOU.trackExpense(
+                                    report,
+                                    0,
+                                    transaction?.currency ?? 'USD',
+                                    transaction?.created ?? '',
+                                    '',
+                                    currentUserPersonalDetails.login,
+                                    currentUserPersonalDetails.accountID,
+                                    participant,
+                                    '',
+                                    receipt,
+                                    '',
+                                    '',
+                                    '',
+                                    0,
+                                    false,
+                                    policy,
+                                    {},
+                                    {},
+                                    {
+                                        lat: successData.coords.latitude,
+                                        long: successData.coords.longitude,
+                                    },
+                                );
+                            } else {
+                                IOU.requestMoney(
+                                    report,
+                                    0,
+                                    transaction?.attendees,
+                                    transaction?.currency ?? 'USD',
+                                    transaction?.created ?? '',
+                                    '',
+                                    currentUserPersonalDetails.login,
+                                    currentUserPersonalDetails.accountID,
+                                    participant,
+                                    '',
+                                    receipt,
+                                    '',
+                                    '',
+                                    '',
+                                    0,
+                                    false,
+                                    policy,
+                                    {},
+                                    {},
+                                    {
+                                        lat: successData.coords.latitude,
+                                        long: successData.coords.longitude,
+                                    },
+                                );
+                            }
+                        },
+                        (errorData) => {
+                            Log.info('[IOURequestStepScan] getCurrentPosition failed', false, errorData);
+                            // When there is an error, the money can still be requested, it just won't include the GPS coordinates
+                            createTransaction(receipt, participant);
+                        },
+                        {
+                            maximumAge: CONST.GPS.MAX_AGE,
+                            timeout: CONST.GPS.TIMEOUT,
+                        },
+                    );
+                    return;
+                }
+                createTransaction(receipt, participant);
                 return;
             }
             navigateToConfirmationPage();
         },
         [
             backTo,
             transaction?.isFromGlobalCreate,
+            transaction?.attendees,
             transaction?.currency,
             transaction?.created,
             iouType,