Skip to content

Commit a9d4a63

Browse files
authored
Merge pull request #89736 from DylanDylann/refactor-money-request-builder
refactor: extract MoneyRequestBuilder.ts from IOU/index.ts
2 parents 8ef84fc + d7226e6 commit a9d4a63

23 files changed

Lines changed: 1686 additions & 1706 deletions

config/eslint/eslint.seatbelt.tsv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,9 +347,9 @@
347347
"../../src/libs/actions/IOU/TrackExpense.ts" "no-restricted-syntax" 2
348348
"../../src/libs/actions/IOU/UpdateMoneyRequest.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 1
349349
"../../src/libs/actions/IOU/UpdateMoneyRequest.ts" "@typescript-eslint/no-deprecated/getPolicyTagsData" 13
350+
"../../src/libs/actions/IOU/MoneyRequestBuilder.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 2
351+
"../../src/libs/actions/IOU/MoneyRequestBuilder.ts" "@typescript-eslint/no-deprecated/translateLocal" 1
350352
"../../src/libs/actions/IOU/UpdateMoneyRequest.ts" "no-restricted-syntax" 1
351-
"../../src/libs/actions/IOU/index.ts" "@typescript-eslint/no-deprecated/Localize.translateLocal" 1
352-
"../../src/libs/actions/IOU/index.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 2
353353
"../../src/libs/actions/IOU/index.ts" "@typescript-eslint/no-deprecated/getMoneyRequestPolicyTags" 1
354354
"../../src/libs/actions/IOU/index.ts" "@typescript-eslint/no-deprecated/getPolicyTagsData" 2
355355
"../../src/libs/actions/IOU/index.ts" "no-restricted-syntax" 2

src/libs/ReceiptUploadRetryHandler/handleFileRetry.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import type * as IOU from '@userActions/IOU';
2+
import type {RequestMoneyInformation} from '@userActions/IOU/MoneyRequestBuilder';
23
import {replaceReceipt} from '@userActions/IOU/Receipt';
34
import {startSplitBill} from '@userActions/IOU/Split';
45
import * as TrackExpense from '@userActions/IOU/TrackExpense';
56
import CONST from '@src/CONST';
67
import type {ReceiptError} from '@src/types/onyx/Transaction';
78

89
export default function handleFileRetry(message: ReceiptError, file: File, dismissError: () => void, setShouldShowErrorModal: (value: boolean) => void) {
9-
const retryParams: IOU.ReplaceReceipt | IOU.StartSplitBilActionParams | TrackExpense.CreateTrackExpenseParams | IOU.RequestMoneyInformation =
10+
const retryParams: IOU.ReplaceReceipt | IOU.StartSplitBilActionParams | TrackExpense.CreateTrackExpenseParams | RequestMoneyInformation =
1011
typeof message.retryParams === 'string'
11-
? (JSON.parse(message.retryParams) as IOU.ReplaceReceipt | IOU.StartSplitBilActionParams | TrackExpense.CreateTrackExpenseParams | IOU.RequestMoneyInformation)
12+
? (JSON.parse(message.retryParams) as IOU.ReplaceReceipt | IOU.StartSplitBilActionParams | TrackExpense.CreateTrackExpenseParams | RequestMoneyInformation)
1213
: message.retryParams;
1314

1415
switch (message.action) {
@@ -38,7 +39,7 @@ export default function handleFileRetry(message: ReceiptError, file: File, dismi
3839
}
3940
case CONST.IOU.ACTION_PARAMS.MONEY_REQUEST: {
4041
dismissError();
41-
const requestMoneyParams = {...retryParams} as IOU.RequestMoneyInformation;
42+
const requestMoneyParams = {...retryParams} as RequestMoneyInformation;
4243
requestMoneyParams.transactionParams.receipt = file;
4344
requestMoneyParams.isRetry = true;
4445
requestMoneyParams.shouldPlaySound = false;

src/libs/actions/IOU/BulkEdit.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ import ONYXKEYS from '@src/ONYXKEYS';
3030
import type * as OnyxTypes from '@src/types/onyx';
3131
import type {SearchResultDataType} from '@src/types/onyx/SearchResults';
3232
import type {TransactionChanges} from '@src/types/onyx/Transaction';
33-
import {getAllTransactionViolations, getUpdatedMoneyRequestReportData} from '.';
33+
import {getAllTransactionViolations} from '.';
34+
import {getUpdatedMoneyRequestReportData} from './MoneyRequestBuilder';
3435

3536
function removeUnchangedBulkEditFields(
3637
transactionChanges: TransactionChanges,

src/libs/actions/IOU/DeleteMoneyRequest.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ import type {Route} from '@src/ROUTES';
3434
import ROUTES from '@src/ROUTES';
3535
import type * as OnyxTypes from '@src/types/onyx';
3636
import type ReportAction from '@src/types/onyx/ReportAction';
37-
import {getAllReportActionsFromIOU, getAllReportNameValuePairs, getAllReports, getAllTransactions, getAllTransactionViolations, getReportPreviewAction} from '.';
37+
import {getAllReportActionsFromIOU, getAllReportNameValuePairs, getAllReports, getAllTransactions, getAllTransactionViolations} from '.';
38+
import {getReportPreviewAction} from './MoneyRequestBuilder';
3839

3940
type DeleteMoneyRequestFunctionParams = {
4041
transactionID: string | undefined;

src/libs/actions/IOU/Duplicate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ import type * as OnyxTypes from '@src/types/onyx';
4545
import type {Attendee, Participant} from '@src/types/onyx/IOU';
4646
import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
4747
import type {WaypointCollection} from '@src/types/onyx/Transaction';
48-
import type {RequestMoneyInformation} from '.';
4948
import {getAllReportActionsFromIOU, getAllReports, getAllTransactions, getAllTransactionViolations, getMoneyRequestParticipantsFromReport} from '.';
5049
import {getCleanUpTransactionThreadReportOnyxData} from './DeleteMoneyRequest';
50+
import type {RequestMoneyInformation} from './MoneyRequestBuilder';
5151
import type {PerDiemExpenseInformation} from './PerDiem';
5252
import {submitPerDiemExpense} from './PerDiem';
5353
import type {CreateDistanceRequestInformation} from './Split';

0 commit comments

Comments
 (0)