Skip to content

Commit d97d358

Browse files
committed
fix: change policyTagList to transactionPolicyTagList
1 parent 8382898 commit d97d358

13 files changed

Lines changed: 62 additions & 29 deletions

File tree

__mocks__/reportData/violations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const receiptErrorsR14932: ReceiptErrors = {
3333
transactionID: RECEIPT_ERRORS_TRANSACTION_ID_R14932,
3434
source: CONST.POLICY.ID_FAKE,
3535
transactionPolicy: undefined,
36-
policyTagList: undefined,
36+
transactionPolicyTagList: undefined,
3737
},
3838
},
3939
};

src/components/ReportActionItem/MoneyRequestReceiptView.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,14 @@ function MoneyRequestReceiptView({
443443
return;
444444
}
445445
const source = URL.createObjectURL(file as Blob);
446-
replaceReceipt({transactionID: linkedTransactionID, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories, policyTagList});
446+
replaceReceipt({
447+
transactionID: linkedTransactionID,
448+
file: file as File,
449+
source,
450+
transactionPolicy: policy,
451+
transactionPolicyCategories: policyCategories,
452+
transactionPolicyTagList: policyTagList,
453+
});
447454
};
448455

449456
// For empty receipt should be fullHeight

src/libs/ReceiptUploadRetryHandler/handleFileRetry.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ export default function handleFileRetry(message: ReceiptError, file: File, dismi
1313

1414
switch (message.action) {
1515
case CONST.IOU.ACTION_PARAMS.REPLACE_RECEIPT: {
16+
console.log('message: ', message);
17+
console.log('retryParams: ', retryParams);
18+
1619
dismissError();
1720
const replaceReceiptParams = {...retryParams} as IOU.ReplaceReceipt;
1821
replaceReceiptParams.file = file;

src/libs/ReceiptUploadRetryHandler/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ export default function handleRetryPress(message: ReceiptError, dismissError: ()
1515
handleFileRetry(message, reconstructedFile, dismissError, setShouldShowErrorModal);
1616
})
1717
.catch(() => {
18+
console.error('retry fetch failed:', message.source);
19+
console.error('message:', message);
1820
setShouldShowErrorModal(true);
1921
});
2022
}

src/libs/actions/IOU/Receipt.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ function detachReceipt(
160160
);
161161
}
162162

163-
function replaceReceipt({transactionID, file, source, state, transactionPolicy, transactionPolicyCategories, isSameReceipt, policyTagList}: ReplaceReceipt) {
163+
function replaceReceipt({transactionID, file, source, state, transactionPolicy, transactionPolicyCategories, isSameReceipt, transactionPolicyTagList}: ReplaceReceipt) {
164164
if (!file) {
165165
return;
166166
}
@@ -179,7 +179,7 @@ function replaceReceipt({transactionID, file, source, state, transactionPolicy,
179179
filename: file.name,
180180
};
181181
const newTransaction = transaction && {...transaction, receipt: receiptOptimistic};
182-
const retryParams: ReplaceReceipt = {transactionID, file: undefined, source, transactionPolicy, transactionPolicyCategories, policyTagList};
182+
const retryParams: ReplaceReceipt = {transactionID, file: undefined, source, transactionPolicy, transactionPolicyCategories, transactionPolicyTagList};
183183
const currentSearchQueryJSON = getCurrentSearchQueryJSON();
184184

185185
const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.TRANSACTION | typeof ONYXKEYS.COLLECTION.SNAPSHOT | typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS>> = [
@@ -228,9 +228,9 @@ function replaceReceipt({transactionID, file, source, state, transactionPolicy,
228228
newTransaction,
229229
currentTransactionViolations,
230230
transactionPolicy,
231-
policyTagList ?? {},
231+
transactionPolicyTagList ?? {},
232232
transactionPolicyCategories ?? {},
233-
hasDependentTags(transactionPolicy, policyTagList ?? {}),
233+
hasDependentTags(transactionPolicy, transactionPolicyTagList ?? {}),
234234
isInvoiceReportReportUtils(expenseReport),
235235
);
236236
optimisticData.push(violationsOnyxData);

src/libs/actions/IOU/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ type ReplaceReceipt = {
417417
transactionPolicyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>;
418418
transactionPolicy: OnyxEntry<OnyxTypes.Policy>;
419419
isSameReceipt?: boolean;
420-
policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>;
420+
transactionPolicyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>;
421421
};
422422

423423
type GetSearchOnyxUpdateParams = {

src/pages/inbox/report/ReportActionCompose/useAttachmentUploadValidation.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,14 @@ function useAttachmentUploadValidation({
9595

9696
if (shouldAddOrReplaceReceipt && transactionID) {
9797
const source = URL.createObjectURL(files.at(0) as Blob);
98-
replaceReceipt({transactionID, file: files.at(0) as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories, policyTagList});
98+
replaceReceipt({
99+
transactionID,
100+
file: files.at(0) as File,
101+
source,
102+
transactionPolicy: policy,
103+
transactionPolicyCategories: policyCategories,
104+
transactionPolicyTagList: policyTagList,
105+
});
99106
return;
100107
}
101108

src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,14 @@ function IOURequestStepScan({
217217
} else {
218218
navigateBack();
219219
}
220-
replaceReceipt({transactionID: initialTransactionID, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories, policyTagList});
220+
replaceReceipt({
221+
transactionID: initialTransactionID,
222+
file: file as File,
223+
source,
224+
transactionPolicy: policy,
225+
transactionPolicyCategories: policyCategories,
226+
transactionPolicyTagList: policyTagList,
227+
});
221228
},
222229
[initialTransactionID, policy, policyCategories, backTo, navigateBack, policyTagList],
223230
);

src/pages/iou/request/step/IOURequestStepScan/index.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,14 @@ function IOURequestStepScan({
5353

5454
const updateScanAndNavigate = useCallback(
5555
(file: FileObject, source: string) => {
56-
replaceReceipt({transactionID: initialTransactionID, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories, policyTagList});
56+
replaceReceipt({
57+
transactionID: initialTransactionID,
58+
file: file as File,
59+
source,
60+
transactionPolicy: policy,
61+
transactionPolicyCategories: policyCategories,
62+
transactionPolicyTagList: policyTagList,
63+
});
5764
navigateBack();
5865
},
5966
[initialTransactionID, navigateBack, policy, policyCategories, policyTagList],

src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre
300300
source: durableUri,
301301
transactionPolicyCategories: policyCategories,
302302
transactionPolicy: policy,
303-
policyTagList,
303+
transactionPolicyTagList: policyTagList,
304304
...(isSameReceipt ? {state: transaction?.receipt?.state, isSameReceipt: true} : {}),
305305
});
306306
}

0 commit comments

Comments
 (0)