Merge pull request #54534 from callstack-internal/chore/eslint-consis…

…tent-id-iou Align default IDs in IOU.ts file
Expensify · Jan 21, 2025 · f40c622 · f40c622
2 parents c07fa50 + 4d75438
commit f40c622
Show file tree

Hide file tree

Showing 22 changed files with 378 additions and 296 deletions.
diff --git a/.eslintrc.changed.js b/.eslintrc.changed.js
@@ -21,7 +21,7 @@ module.exports = {
     },
     overrides: [
         {
-            files: ['src/libs/actions/IOU.ts', 'src/pages/workspace/WorkspaceInitialPage.tsx', 'src/pages/home/report/PureReportActionItem.tsx', 'src/libs/SidebarUtils.ts'],
+            files: ['src/pages/workspace/WorkspaceInitialPage.tsx', 'src/pages/home/report/PureReportActionItem.tsx', 'src/libs/SidebarUtils.ts'],
             rules: {
                 'rulesdir/no-default-id-values': 'off',
             },

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
@@ -436,7 +436,10 @@ const ROUTES = {
     },
     ROOM_INVITE: {
         route: 'r/:reportID/invite/:role?',
-        getRoute: (reportID: string, role?: string, backTo?: string) => {
+        getRoute: (reportID: string | undefined, role?: string, backTo?: string) => {
+            if (!reportID) {
+                Log.warn('Invalid reportID is used to build the ROOM_INVITE route');
+            }
             const route = role ? (`r/${reportID}/invite/${role}` as const) : (`r/${reportID}/invite` as const);
             return getUrlWithBackToParam(route, backTo);
         },
@@ -770,7 +773,12 @@ const ROUTES = {
     },
     WORKSPACE_PROFILE_ADDRESS: {
         route: 'settings/workspaces/:policyID/profile/address',
-        getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/profile/address` as const, backTo),
+        getRoute: (policyID: string | undefined, backTo?: string) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_PROFILE_ADDRESS route');
+            }
+            return getUrlWithBackToParam(`settings/workspaces/${policyID}/profile/address` as const, backTo);
+        },
     },
     WORKSPACE_PROFILE_PLAN: {
         route: 'settings/workspaces/:policyID/profile/plan',

diff --git a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
@@ -6,14 +6,14 @@ type CategorizeTrackedExpenseParams = {
     comment: string;
     created: string;
     merchant: string;
-    policyID: string;
-    transactionID: string;
-    moneyRequestPreviewReportActionID: string;
-    moneyRequestReportID: string;
-    moneyRequestCreatedReportActionID: string;
+    policyID: string | undefined;
+    transactionID: string | undefined;
+    moneyRequestPreviewReportActionID: string | undefined;
+    moneyRequestReportID: string | undefined;
+    moneyRequestCreatedReportActionID: string | undefined;
     actionableWhisperReportActionID: string;
     modifiedExpenseReportActionID: string;
-    reportPreviewReportActionID: string;
+    reportPreviewReportActionID: string | undefined;
     category?: string;
     tag?: string;
     receipt?: Receipt;

diff --git a/src/libs/API/parameters/CompleteSplitBillParams.ts b/src/libs/API/parameters/CompleteSplitBillParams.ts
@@ -1,5 +1,5 @@
 type CompleteSplitBillParams = {
-    transactionID: string;
+    transactionID: string | undefined;
     amount?: number;
     currency?: string;
     created?: string;

diff --git a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
@@ -8,9 +8,9 @@ type ConvertTrackedExpenseToRequestParams = {
     chatReportID: string;
     transactionID: string;
     actionableWhisperReportActionID: string;
-    createdChatReportActionID: string;
+    createdChatReportActionID?: string;
     moneyRequestReportID: string;
-    moneyRequestCreatedReportActionID: string;
+    moneyRequestCreatedReportActionID: string | undefined;
     moneyRequestPreviewReportActionID: string;
     reportPreviewReportActionID: string;
 };

diff --git a/src/libs/API/parameters/CreateDistanceRequestParams.ts b/src/libs/API/parameters/CreateDistanceRequestParams.ts
@@ -1,7 +1,7 @@
 type CreateDistanceRequestParams = {
     transactionID: string;
     chatReportID: string;
-    createdChatReportActionID: string;
+    createdChatReportActionID?: string;
     reportActionID: string;
     waypoints: string;
     customUnitRateID: string;

diff --git a/src/libs/API/parameters/CreatePerDiemRequestParams.ts b/src/libs/API/parameters/CreatePerDiemRequestParams.ts
@@ -14,11 +14,11 @@ type CreatePerDiemRequestParams = {
     chatReportID: string;
     transactionID: string;
     reportActionID: string;
-    createdChatReportActionID: string;
-    createdIOUReportActionID: string;
+    createdChatReportActionID?: string;
+    createdIOUReportActionID?: string;
     reportPreviewReportActionID: string;
     transactionThreadReportID: string;
-    createdReportActionIDForThread: string;
+    createdReportActionIDForThread: string | undefined;
 };
 
 export default CreatePerDiemRequestParams;
diff --git a/src/libs/API/parameters/DeleteMoneyRequestParams.ts b/src/libs/API/parameters/DeleteMoneyRequestParams.ts
@@ -1,5 +1,5 @@
 type DeleteMoneyRequestParams = {
-    transactionID: string;
+    transactionID: string | undefined;
     reportActionID: string;
 };
 

diff --git a/src/libs/API/parameters/PayInvoiceParams.ts b/src/libs/API/parameters/PayInvoiceParams.ts
@@ -2,7 +2,7 @@ import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type CreateWorkspaceParams from './CreateWorkspaceParams';
 
 type PayInvoiceParams = Partial<CreateWorkspaceParams> & {
-    reportID: string;
+    reportID: string | undefined;
     reportActionID: string;
     paymentMethodType: PaymentMethodType;
     payAsBusiness: boolean;

diff --git a/src/libs/API/parameters/PayMoneyRequestParams.ts b/src/libs/API/parameters/PayMoneyRequestParams.ts
@@ -1,7 +1,7 @@
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 
 type PayMoneyRequestParams = {
-    iouReportID: string;
+    iouReportID: string | undefined;
     chatReportID: string;
     reportActionID: string;
     paymentMethodType: PaymentMethodType;

diff --git a/src/libs/API/parameters/RequestMoneyParams.ts b/src/libs/API/parameters/RequestMoneyParams.ts
@@ -14,8 +14,8 @@ type RequestMoneyParams = {
     chatReportID: string;
     transactionID: string;
     reportActionID: string;
-    createdChatReportActionID: string;
-    createdIOUReportActionID: string;
+    createdChatReportActionID?: string;
+    createdIOUReportActionID?: string;
     reportPreviewReportActionID: string;
     receipt?: Receipt;
     receiptState?: ValueOf<typeof CONST.IOU.RECEIPT_STATE>;
@@ -26,7 +26,7 @@ type RequestMoneyParams = {
     billable?: boolean;
     receiptGpsPoints?: string;
     transactionThreadReportID: string;
-    createdReportActionIDForThread: string;
+    createdReportActionIDForThread: string | undefined;
     reimbursible?: boolean;
 };
 

diff --git a/src/libs/API/parameters/SendInvoiceParams.ts b/src/libs/API/parameters/SendInvoiceParams.ts
@@ -2,7 +2,7 @@ import type {RequireAtLeastOne} from 'type-fest';
 
 type SendInvoiceParams = RequireAtLeastOne<
     {
-        senderWorkspaceID: string;
+        senderWorkspaceID: string | undefined;
         accountID: number;
         receiverEmail?: string;
         receiverInvoiceRoomID?: string;
@@ -21,7 +21,7 @@ type SendInvoiceParams = RequireAtLeastOne<
         companyName?: string;
         companyWebsite?: string;
         createdIOUReportActionID: string;
-        createdReportActionIDForThread: string;
+        createdReportActionIDForThread: string | undefined;
         reportActionID: string;
     },
     'receiverEmail' | 'receiverInvoiceRoomID'

diff --git a/src/libs/API/parameters/SendMoneyParams.ts b/src/libs/API/parameters/SendMoneyParams.ts
@@ -7,11 +7,11 @@ type SendMoneyParams = {
     paymentMethodType: PaymentMethodType;
     transactionID: string;
     newIOUReportDetails: string;
-    createdReportActionID: string;
+    createdReportActionID: string | undefined;
     reportPreviewReportActionID: string;
     createdIOUReportActionID: string;
     transactionThreadReportID: string;
-    createdReportActionIDForThread: string;
+    createdReportActionIDForThread: string | undefined;
 };
 
 export default SendMoneyParams;
diff --git a/src/libs/API/parameters/ShareTrackedExpenseParams.ts b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
@@ -6,14 +6,14 @@ type ShareTrackedExpenseParams = {
     comment: string;
     created: string;
     merchant: string;
-    policyID: string;
-    transactionID: string;
-    moneyRequestPreviewReportActionID: string;
-    moneyRequestReportID: string;
-    moneyRequestCreatedReportActionID: string;
+    policyID: string | undefined;
+    transactionID: string | undefined;
+    moneyRequestPreviewReportActionID: string | undefined;
+    moneyRequestReportID: string | undefined;
+    moneyRequestCreatedReportActionID: string | undefined;
     actionableWhisperReportActionID: string;
     modifiedExpenseReportActionID: string;
-    reportPreviewReportActionID: string;
+    reportPreviewReportActionID: string | undefined;
     category?: string;
     tag?: string;
     receipt?: Receipt;

diff --git a/src/libs/API/parameters/TrackExpenseParams.ts b/src/libs/API/parameters/TrackExpenseParams.ts
@@ -9,10 +9,10 @@ type TrackExpenseParams = {
     created: string;
     merchant: string;
     iouReportID?: string;
-    chatReportID: string;
-    transactionID: string;
-    reportActionID: string;
-    createdChatReportActionID: string;
+    chatReportID: string | undefined;
+    transactionID: string | undefined;
+    reportActionID: string | undefined;
+    createdChatReportActionID?: string;
     createdIOUReportActionID?: string;
     reportPreviewReportActionID?: string;
     receipt?: Receipt;
@@ -23,8 +23,8 @@ type TrackExpenseParams = {
     taxAmount: number;
     billable?: boolean;
     receiptGpsPoints?: string;
-    transactionThreadReportID: string;
-    createdReportActionIDForThread: string;
+    transactionThreadReportID: string | undefined;
+    createdReportActionIDForThread: string | undefined;
     waypoints?: string;
     actionableWhisperReportActionID?: string;
     customUnitRateID?: string;

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
@@ -1601,7 +1601,10 @@ function wasActionTakenByCurrentUser(reportAction: OnyxInputOrEntry<ReportAction
 /**
  * Get IOU action for a reportID and transactionID
  */
-function getIOUActionForReportID(reportID: string, transactionID: string): OnyxEntry<ReportAction> {
+function getIOUActionForReportID(reportID: string | undefined, transactionID: string): OnyxEntry<ReportAction> {
+    if (!reportID) {
+        return;
+    }
     const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     const reportActions = getAllReportActions(report?.reportID);
     const action = Object.values(reportActions ?? {})?.find((reportAction) => {

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -789,7 +789,7 @@ Onyx.connect({
 
         reportsTransactions = Object.values(value).reduce<Record<string, Transaction[]>>((all, transaction) => {
             const reportsMap = all;
-            if (!transaction) {
+            if (!transaction?.reportID) {
                 return reportsMap;
             }
 
@@ -3191,6 +3191,10 @@ function getReportFieldKey(reportFieldId: string | undefined) {
  * Get the report fields attached to the policy given policyID
  */
 function getReportFieldsByPolicyID(policyID: string | undefined): Record<string, PolicyReportField> {
+    if (!policyID) {
+        return {};
+    }
+
     const policyReportFields = Object.entries(allPolicies ?? {}).find(([key]) => key.replace(ONYXKEYS.COLLECTION.POLICY, '') === policyID);
     const fieldList = policyReportFields?.[1]?.fieldList;
 
@@ -4801,7 +4805,7 @@ function buildOptimisticIOUReport(
     payeeAccountID: number,
     payerAccountID: number,
     total: number,
-    chatReportID: string,
+    chatReportID: string | undefined,
     currency: string,
     isSendingMoney = false,
     parentReportActionID?: string,
@@ -4873,7 +4877,14 @@ function populateOptimisticReportFormula(formula: string, report: OptimisticExpe
 }
 
 /** Builds an optimistic invoice report with a randomly generated reportID */
-function buildOptimisticInvoiceReport(chatReportID: string, policyID: string, receiverAccountID: number, receiverName: string, total: number, currency: string): OptimisticExpenseReport {
+function buildOptimisticInvoiceReport(
+    chatReportID: string,
+    policyID: string | undefined,
+    receiverAccountID: number,
+    receiverName: string,
+    total: number,
+    currency: string,
+): OptimisticExpenseReport {
     const formattedTotal = convertToDisplayString(total, currency);
     const invoiceReport = {
         reportID: generateReportID(),
@@ -4945,8 +4956,8 @@ function getExpenseReportStateAndStatus(policy: OnyxEntry<Policy>) {
  * @param parentReportActionID – The parent ReportActionID of the PolicyExpenseChat
  */
 function buildOptimisticExpenseReport(
-    chatReportID: string,
-    policyID: string,
+    chatReportID: string | undefined,
+    policyID: string | undefined,
     payeeAccountID: number,
     total: number,
     currency: string,
@@ -5547,7 +5558,7 @@ function buildOptimisticModifiedExpenseReportAction(
  * @param transactionThreadID - The reportID of the transaction thread
  * @param movedToReportID - The reportID of the report the transaction is moved to
  */
-function buildOptimisticMovedTrackedExpenseModifiedReportAction(transactionThreadID: string, movedToReportID: string): OptimisticModifiedExpenseReportAction {
+function buildOptimisticMovedTrackedExpenseModifiedReportAction(transactionThreadID: string | undefined, movedToReportID: string | undefined): OptimisticModifiedExpenseReportAction {
     const delegateAccountDetails = getPersonalDetailByEmail(delegateEmail);
 
     return {
@@ -8581,10 +8592,6 @@ function canReportBeMentionedWithinPolicy(report: OnyxEntry<Report>, policyID: s
     return isChatRoom(report) && !isInvoiceRoom(report) && !isThread(report);
 }
 
-function shouldShowMerchantColumn(transactions: Transaction[]) {
-    return transactions.some((transaction) => isExpenseReport(allReports?.[transaction.reportID] ?? null));
-}
-
 /**
  * Whether a given report is used for onboarding tasks. In the past, it could be either the Concierge chat or the system
  * DM, and we saved the report ID in the user's `onboarding` NVP. As a fallback for users who don't have the NVP, we now
@@ -9123,7 +9130,6 @@ export {
     getTripIDFromTransactionParentReportID,
     buildOptimisticInvoiceReport,
     getInvoiceChatByParticipants,
-    shouldShowMerchantColumn,
     isCurrentUserInvoiceReceiver,
     isDraftReport,
     changeMoneyRequestHoldStatus,

diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
@@ -42,7 +42,7 @@ import getDistanceInMeters from './getDistanceInMeters';
 type TransactionParams = {
     amount: number;
     currency: string;
-    reportID: string;
+    reportID: string | undefined;
     comment?: string;
     attendees?: Attendee[];
     created?: string;

diff --git a/src/libs/TripReservationUtils.ts b/src/libs/TripReservationUtils.ts
@@ -13,10 +13,10 @@ import type {Reservation, ReservationType} from '@src/types/onyx/Transaction';
 import type Transaction from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
-import * as Link from './actions/Link';
+import {openTravelDotLink} from './actions/Link';
 import Log from './Log';
 import Navigation from './Navigation/Navigation';
-import * as PolicyUtils from './PolicyUtils';
+import {getPolicy} from './PolicyUtils';
 
 let travelSettings: OnyxEntry<TravelSettings>;
 Onyx.connect({
@@ -65,7 +65,7 @@ function getTripReservationIcon(reservationType?: ReservationType): IconAsset {
     }
 }
 
-type ReservationData = {reservation: Reservation; transactionID: string; reportID: string; reservationIndex: number};
+type ReservationData = {reservation: Reservation; transactionID: string; reportID: string | undefined; reservationIndex: number};
 
 function getReservationsFromTripTransactions(transactions: Transaction[]): ReservationData[] {
     return transactions
@@ -100,9 +100,9 @@ function bookATrip(translate: LocaleContextProps['translate'], setCtaErrorMessag
         setCtaErrorMessage(translate('travel.phoneError'));
         return;
     }
-    const policy = PolicyUtils.getPolicy(activePolicyID);
+    const policy = getPolicy(activePolicyID);
     if (isEmptyObject(policy?.address)) {
-        Navigation.navigate(ROUTES.WORKSPACE_PROFILE_ADDRESS.getRoute(activePolicyID ?? '-1', Navigation.getActiveRoute()));
+        Navigation.navigate(ROUTES.WORKSPACE_PROFILE_ADDRESS.getRoute(activePolicyID, Navigation.getActiveRoute()));
         return;
     }
     if (!travelSettings?.hasAcceptedTerms) {
@@ -112,7 +112,7 @@ function bookATrip(translate: LocaleContextProps['translate'], setCtaErrorMessag
     if (ctaErrorMessage) {
         setCtaErrorMessage('');
     }
-    Link.openTravelDotLink(activePolicyID)
+    openTravelDotLink(activePolicyID)
         ?.then(() => {
             if (!NativeModules.HybridAppModule || !isSingleNewDotEntry) {
                 return;