Skip to content

Commit a414ef1

Browse files
authored
Merge pull request #42305 from Expensify/dangrous-categoryutilsfile
Create Category utils file
2 parents 6b4df86 + f259939 commit a414ef1

File tree

77 files changed

+712
-594
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+712
-594
lines changed

src/components/KYCWall/BaseKYCWall.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Navigation from '@libs/Navigation/Navigation';
1111
import * as PaymentUtils from '@libs/PaymentUtils';
1212
import * as ReportUtils from '@libs/ReportUtils';
1313
import * as PaymentMethods from '@userActions/PaymentMethods';
14-
import * as Policy from '@userActions/Policy';
14+
import * as Policy from '@userActions/Policy/Policy';
1515
import * as Wallet from '@userActions/Wallet';
1616
import CONST from '@src/CONST';
1717
import ONYXKEYS from '@src/ONYXKEYS';

src/libs/ReportUtils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import type {EmptyObject} from '@src/types/utils/EmptyObject';
5757
import {isEmptyObject} from '@src/types/utils/EmptyObject';
5858
import type IconAsset from '@src/types/utils/IconAsset';
5959
import * as IOU from './actions/IOU';
60-
import * as PolicyActions from './actions/Policy';
60+
import * as PolicyActions from './actions/Policy/Policy';
6161
import * as store from './actions/ReimbursementAccount/store';
6262
import * as CurrencyUtils from './CurrencyUtils';
6363
import DateUtils from './DateUtils';

src/libs/actions/App.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import ROUTES from '@src/ROUTES';
3434
import type * as OnyxTypes from '@src/types/onyx';
3535
import type {SelectedTimezone} from '@src/types/onyx/PersonalDetails';
3636
import type {OnyxData} from '@src/types/onyx/Request';
37-
import * as Policy from './Policy';
37+
import * as Policy from './Policy/Policy';
3838
import * as Session from './Session';
3939
import Timing from './Timing';
4040

src/libs/actions/IOU.ts

+8-7
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ import type {Comment, Receipt, ReceiptSource, SplitShares, TransactionChanges, W
5959
import type {EmptyObject} from '@src/types/utils/EmptyObject';
6060
import {isEmptyObject} from '@src/types/utils/EmptyObject';
6161
import * as CachedPDFPaths from './CachedPDFPaths';
62-
import * as Policy from './Policy';
62+
import * as Category from './Policy/Category';
63+
import * as Policy from './Policy/Policy';
6364
import * as Report from './Report';
6465

6566
type IOURequestType = ValueOf<typeof CONST.IOU.REQUEST_TYPE>;
@@ -1697,7 +1698,7 @@ function getSendInvoiceInformation(
16971698
billable,
16981699
);
16991700

1700-
const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(optimisticInvoiceReport.policyID, category);
1701+
const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(optimisticInvoiceReport.policyID, category);
17011702
const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(optimisticInvoiceReport.policyID, tag);
17021703

17031704
// STEP 4: Add optimistic personal details for participant
@@ -1875,7 +1876,7 @@ function getMoneyRequestInformation(
18751876
isDistanceRequest ? {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD} : undefined,
18761877
);
18771878

1878-
const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(iouReport.policyID, category);
1879+
const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(iouReport.policyID, category);
18791880
const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(iouReport.policyID, tag);
18801881

18811882
// If there is an existing transaction (which is the case for distance requests), then the data from the existing transaction
@@ -2517,7 +2518,7 @@ function getUpdateMoneyRequestParams(
25172518

25182519
// Update recently used categories if the category is changed
25192520
if ('category' in transactionChanges) {
2520-
const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(iouReport?.policyID, transactionChanges.category);
2521+
const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(iouReport?.policyID, transactionChanges.category);
25212522
if (optimisticPolicyRecentlyUsedCategories.length) {
25222523
optimisticData.push({
25232524
onyxMethod: Onyx.METHOD.SET,
@@ -4027,7 +4028,7 @@ function createSplitsAndOnyxData(
40274028
}
40284029

40294030
// Add category to optimistic policy recently used categories when a participant is a workspace
4030-
const optimisticPolicyRecentlyUsedCategories = isPolicyExpenseChat ? Policy.buildOptimisticPolicyRecentlyUsedCategories(participant.policyID, category) : [];
4031+
const optimisticPolicyRecentlyUsedCategories = isPolicyExpenseChat ? Category.buildOptimisticPolicyRecentlyUsedCategories(participant.policyID, category) : [];
40314032

40324033
// Add tag to optimistic policy recently used tags when a participant is a workspace
40334034
const optimisticPolicyRecentlyUsedTags = isPolicyExpenseChat ? Policy.buildOptimisticPolicyRecentlyUsedTags(participant.policyID, tag) : {};
@@ -4501,7 +4502,7 @@ function startSplitBill({
45014502
return;
45024503
}
45034504

4504-
const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(participant.policyID, category);
4505+
const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(participant.policyID, category);
45054506
const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(participant.policyID, tag);
45064507

45074508
if (optimisticPolicyRecentlyUsedCategories.length > 0) {
@@ -4927,7 +4928,7 @@ function editRegularMoneyRequest(
49274928

49284929
// Update recently used categories if the category is changed
49294930
if ('category' in transactionChanges) {
4930-
const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(iouReport?.policyID, transactionChanges.category);
4931+
const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(iouReport?.policyID, transactionChanges.category);
49314932
if (optimisticPolicyRecentlyUsedCategories.length) {
49324933
optimisticData.push({
49334934
onyxMethod: Onyx.METHOD.SET,

0 commit comments

Comments
 (0)