Skip to content

Commit 52d4945

Browse files
authored
Merge pull request #42559 from Expensify/dangrous-tagutilsfile
Create Tag utils file
2 parents 3db90e4 + 9cf6a9f commit 52d4945

12 files changed

+646
-587
lines changed

src/libs/actions/IOU.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
6363
import * as CachedPDFPaths from './CachedPDFPaths';
6464
import * as Category from './Policy/Category';
6565
import * as Policy from './Policy/Policy';
66+
import * as Tag from './Policy/Tag';
6667
import * as Report from './Report';
6768

6869
type IOURequestType = ValueOf<typeof CONST.IOU.REQUEST_TYPE>;
@@ -1760,7 +1761,7 @@ function getSendInvoiceInformation(
17601761
);
17611762

17621763
const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(optimisticInvoiceReport.policyID, category);
1763-
const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(optimisticInvoiceReport.policyID, tag);
1764+
const optimisticPolicyRecentlyUsedTags = Tag.buildOptimisticPolicyRecentlyUsedTags(optimisticInvoiceReport.policyID, tag);
17641765

17651766
// STEP 4: Add optimistic personal details for participant
17661767
const shouldCreateOptimisticPersonalDetails = isNewChatReport && !allPersonalDetails[receiverAccountID];
@@ -1938,7 +1939,7 @@ function getMoneyRequestInformation(
19381939
);
19391940

19401941
const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(iouReport.policyID, category);
1941-
const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(iouReport.policyID, tag);
1942+
const optimisticPolicyRecentlyUsedTags = Tag.buildOptimisticPolicyRecentlyUsedTags(iouReport.policyID, tag);
19421943

19431944
// If there is an existing transaction (which is the case for distance requests), then the data from the existing transaction
19441945
// needs to be manually merged into the optimistic transaction. This is because buildOnyxDataForMoneyRequest() uses `Onyx.set()` for the transaction
@@ -2623,7 +2624,7 @@ function getUpdateMoneyRequestParams(
26232624

26242625
// Update recently used categories if the tag is changed
26252626
if ('tag' in transactionChanges) {
2626-
const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(iouReport?.policyID, transactionChanges.tag);
2627+
const optimisticPolicyRecentlyUsedTags = Tag.buildOptimisticPolicyRecentlyUsedTags(iouReport?.policyID, transactionChanges.tag);
26272628
if (!isEmptyObject(optimisticPolicyRecentlyUsedTags)) {
26282629
optimisticData.push({
26292630
onyxMethod: Onyx.METHOD.MERGE,
@@ -4103,7 +4104,7 @@ function createSplitsAndOnyxData(
41034104
const optimisticPolicyRecentlyUsedCategories = isPolicyExpenseChat ? Category.buildOptimisticPolicyRecentlyUsedCategories(participant.policyID, category) : [];
41044105

41054106
// Add tag to optimistic policy recently used tags when a participant is a workspace
4106-
const optimisticPolicyRecentlyUsedTags = isPolicyExpenseChat ? Policy.buildOptimisticPolicyRecentlyUsedTags(participant.policyID, tag) : {};
4107+
const optimisticPolicyRecentlyUsedTags = isPolicyExpenseChat ? Tag.buildOptimisticPolicyRecentlyUsedTags(participant.policyID, tag) : {};
41074108

41084109
// STEP 5: Build Onyx Data
41094110
const [oneOnOneOptimisticData, oneOnOneSuccessData, oneOnOneFailureData] = buildOnyxDataForMoneyRequest(
@@ -4575,7 +4576,7 @@ function startSplitBill({
45754576
}
45764577

45774578
const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(participant.policyID, category);
4578-
const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(participant.policyID, tag);
4579+
const optimisticPolicyRecentlyUsedTags = Tag.buildOptimisticPolicyRecentlyUsedTags(participant.policyID, tag);
45794580

45804581
if (optimisticPolicyRecentlyUsedCategories.length > 0) {
45814582
optimisticData.push({
@@ -5012,7 +5013,7 @@ function editRegularMoneyRequest(
50125013

50135014
// Update recently used categories if the tag is changed
50145015
if ('tag' in transactionChanges) {
5015-
const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(iouReport?.policyID, transactionChanges.tag);
5016+
const optimisticPolicyRecentlyUsedTags = Tag.buildOptimisticPolicyRecentlyUsedTags(iouReport?.policyID, transactionChanges.tag);
50165017
if (!isEmptyObject(optimisticPolicyRecentlyUsedTags)) {
50175018
optimisticData.push({
50185019
onyxMethod: Onyx.METHOD.MERGE,

0 commit comments

Comments
 (0)