From ca9c12de471acf25d4ddb4d26967e63bdbefb410 Mon Sep 17 00:00:00 2001 From: DylanDylann Date: Tue, 5 Aug 2025 00:23:23 +0700 Subject: [PATCH 1/3] remove connect method --- package.json | 2 +- src/libs/TransactionUtils/index.ts | 14 -------------- .../IOURequestStepScan/ReceiptViewModal/index.tsx | 9 ++++----- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 150698b2b0ab..edeee768e3cb 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "test:debug": "TZ=utc NODE_OPTIONS='--inspect-brk --experimental-vm-modules' jest --runInBand", "perf-test": "NODE_OPTIONS=--experimental-vm-modules npx reassure", "typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc", - "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=319 --cache --cache-location=node_modules/.cache/eslint", + "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=318 --cache --cache-location=node_modules/.cache/eslint", "lint-changed": "NODE_OPTIONS=--max_old_space_size=8192 ./scripts/lintChanged.sh", "lint-watch": "npx eslint-watch --watch --changed", "shellcheck": "./scripts/shellCheck.sh", diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts index bc7a5ad0f002..38c27f69cfa2 100644 --- a/src/libs/TransactionUtils/index.ts +++ b/src/libs/TransactionUtils/index.ts @@ -113,15 +113,6 @@ Onyx.connect({ }, }); -let allTransactionDrafts: OnyxCollection = {}; -Onyx.connect({ - key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, - waitForCollectionCallback: true, - callback: (value) => { - allTransactionDrafts = value ?? {}; - }, -}); - let allReports: OnyxCollection = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, @@ -1386,10 +1377,6 @@ function getTaxName(policy: OnyxEntry, transaction: OnyxEntry taxRate.code === (transaction?.taxCode ?? defaultTaxCode))?.modifiedName; } -function getTransactionOrDraftTransaction(transactionID: string): OnyxEntry { - return allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? allTransactionDrafts?.[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`]; -} - type FieldsToCompare = Record>; type FieldsToChange = { category?: Array; @@ -1961,7 +1948,6 @@ export { isPartialTransaction, isPendingCardOrScanningTransaction, isScanning, - getTransactionOrDraftTransaction, checkIfShouldShowMarkAsCashButton, getOriginalTransactionWithSplitInfo, getTransactionPendingAction, diff --git a/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx index f90ff43b3975..08f1f2800301 100644 --- a/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx +++ b/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx @@ -12,7 +12,6 @@ import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; import Navigation from '@libs/Navigation/Navigation'; -import {getTransactionOrDraftTransaction} from '@libs/TransactionUtils'; import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types'; import {removeDraftTransaction, removeTransactionReceipt, replaceDefaultDraftTransaction} from '@userActions/TransactionEdit'; import CONST from '@src/CONST'; @@ -37,7 +36,6 @@ function ReceiptViewModal({route}: ReceiptViewModalProps) { const {setAttachmentError, clearAttachmentErrors} = useAttachmentErrors(); const {shouldShowArrows, setShouldShowArrows, autoHideArrows, cancelAutoHideArrows} = useCarouselArrows(); const styles = useThemeStyles(); - const [currentReceipt, setCurrentReceipt] = useState(); const [page, setPage] = useState(-1); const [isDeleteReceiptConfirmModalVisible, setIsDeleteReceiptConfirmModalVisible] = useState(false); @@ -49,7 +47,9 @@ function ReceiptViewModal({route}: ReceiptViewModalProps) { .filter((receipt): receipt is ReceiptWithTransactionIDAndSource => !!receipt), canBeMissing: true, }); - + const secondTransactionID = receipts.at(1)?.transactionID; + const [transactionDraft] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${secondTransactionID}`, {canBeMissing: true}); + const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${secondTransactionID}`, {canBeMissing: true}); useEffect(() => { if (!receipts || receipts.length === 0) { return; @@ -74,8 +74,7 @@ function ReceiptViewModal({route}: ReceiptViewModalProps) { return; } - const secondTransactionID = receipts.at(1)?.transactionID; - const secondTransaction = secondTransactionID ? getTransactionOrDraftTransaction(secondTransactionID) : undefined; + const secondTransaction = secondTransactionID ? (transaction ?? transactionDraft) : undefined; replaceDefaultDraftTransaction(secondTransaction); return; } From 73582febbf6aa0d9350d352e26b386ff0aa7eba8 Mon Sep 17 00:00:00 2001 From: DylanDylann Date: Mon, 11 Aug 2025 14:56:25 +0700 Subject: [PATCH 2/3] update dependency --- .../request/step/IOURequestStepScan/ReceiptViewModal/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx index 08f1f2800301..d1c8ccd2e76a 100644 --- a/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx +++ b/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx @@ -82,7 +82,7 @@ function ReceiptViewModal({route}: ReceiptViewModalProps) { }); Navigation.goBack(); - }, [currentReceipt, receipts]); + }, [currentReceipt, receipts, secondTransactionID, transaction, transactionDraft]); const handleCloseConfirmModal = () => { setIsDeleteReceiptConfirmModalVisible(false); From 9129d52cff00af557fc15000af228bf96c08d6d8 Mon Sep 17 00:00:00 2001 From: DylanDylann Date: Sat, 16 Aug 2025 16:23:54 +0700 Subject: [PATCH 3/3] resolve cmt --- .../step/IOURequestStepScan/ReceiptViewModal/index.tsx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx index d1c8ccd2e76a..0aaaa75b3b46 100644 --- a/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx +++ b/src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx @@ -48,8 +48,7 @@ function ReceiptViewModal({route}: ReceiptViewModalProps) { canBeMissing: true, }); const secondTransactionID = receipts.at(1)?.transactionID; - const [transactionDraft] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${secondTransactionID}`, {canBeMissing: true}); - const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${secondTransactionID}`, {canBeMissing: true}); + const [secondTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${secondTransactionID}`, {canBeMissing: true}); useEffect(() => { if (!receipts || receipts.length === 0) { return; @@ -74,15 +73,14 @@ function ReceiptViewModal({route}: ReceiptViewModalProps) { return; } - const secondTransaction = secondTransactionID ? (transaction ?? transactionDraft) : undefined; - replaceDefaultDraftTransaction(secondTransaction); + replaceDefaultDraftTransaction(secondTransactionID ? secondTransaction : undefined); return; } removeDraftTransaction(currentReceipt.transactionID); }); Navigation.goBack(); - }, [currentReceipt, receipts, secondTransactionID, transaction, transactionDraft]); + }, [currentReceipt, receipts.length, secondTransaction, secondTransactionID]); const handleCloseConfirmModal = () => { setIsDeleteReceiptConfirmModalVisible(false);