Merge pull request #35877 from ZhenjaHorbach/migrate-settlementbutton…

…-component-to-ts-2 [TS migration] Migrate 'SettlementButton.js' component to TypeScript PART-2
Expensify · Feb 6, 2024 · 25e6a00 · 25e6a00
2 parents 500dd09 + abcf695
commit 25e6a00
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/src/components/SettlementButton.tsx b/src/components/SettlementButton.tsx
@@ -197,7 +197,7 @@ function SettlementButton({
         }
 
         if (iouPaymentType === CONST.IOU.REPORT_ACTION_TYPE.APPROVE) {
-            IOU.approveMoneyRequest(iouReport);
+            IOU.approveMoneyRequest(iouReport ?? {});
             return;
         }
 

diff --git a/src/libs/API/parameters/PayMoneyRequestParams.ts b/src/libs/API/parameters/PayMoneyRequestParams.ts
@@ -1,11 +1,10 @@
-import type CONST from '@src/CONST';
-import type DeepValueOf from '@src/types/utils/DeepValueOf';
+import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 
 type PayMoneyRequestParams = {
     iouReportID: string;
     chatReportID: string;
     reportActionID: string;
-    paymentMethodType: DeepValueOf<typeof CONST.IOU.PAYMENT_TYPE>;
+    paymentMethodType: PaymentMethodType;
 };
 
 export default PayMoneyRequestParams;
diff --git a/src/libs/API/parameters/SendMoneyParams.ts b/src/libs/API/parameters/SendMoneyParams.ts
@@ -1,11 +1,10 @@
-import type CONST from '@src/CONST';
-import type DeepValueOf from '@src/types/utils/DeepValueOf';
+import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 
 type SendMoneyParams = {
     iouReportID: string;
     chatReportID: string;
     reportActionID: string;
-    paymentMethodType: DeepValueOf<typeof CONST.IOU.PAYMENT_TYPE>;
+    paymentMethodType: PaymentMethodType;
     transactionID: string;
     newIOUReportDetails: string;
     createdReportActionID: string;

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
@@ -50,10 +50,10 @@ import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {Participant, Split} from '@src/types/onyx/IOU';
 import type {ErrorFields, Errors} from '@src/types/onyx/OnyxCommon';
+import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import type {OnyxData} from '@src/types/onyx/Request';
 import type {Comment, Receipt, ReceiptSource, TaxRate, TransactionChanges, WaypointCollection} from '@src/types/onyx/Transaction';
-import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as Policy from './Policy';
@@ -63,8 +63,6 @@ type MoneyRequestRoute = StackScreenProps<MoneyRequestNavigatorParamList, typeof
 
 type IOURequestType = ValueOf<typeof CONST.IOU.REQUEST_TYPE>;
 
-type PaymentMethodType = DeepValueOf<typeof CONST.IOU.PAYMENT_TYPE>;
-
 type OneOnOneIOUReport = OnyxTypes.Report | undefined | null;
 
 type MoneyRequestInformation = {
@@ -3255,7 +3253,7 @@ function sendMoneyWithWallet(report: OnyxTypes.Report, amount: number, currency:
     Report.notifyNewAction(params.chatReportID, managerID);
 }
 
-function approveMoneyRequest(expenseReport: OnyxTypes.Report) {
+function approveMoneyRequest(expenseReport: OnyxTypes.Report | EmptyObject) {
     const currentNextStep = allNextSteps[`${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`] ?? null;
 
     const optimisticApprovedReportAction = ReportUtils.buildOptimisticApprovedReportAction(expenseReport.total ?? 0, expenseReport.currency ?? '', expenseReport.reportID);