Skip to content

Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT in src/libs/TransactionUtils/index.ts P1 #67773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danieldoglas merged 6 commits into from
Aug 21, 2025
Merged

Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT in src/libs/TransactionUtils/index.ts P1 #67773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca9c12d
remove connect method
DylanDylann Aug 4, 2025
73582fe
update dependency
DylanDylann Aug 11, 2025
7df1fc9
Merge branch 'main' into remove-onyx-connect-in-TransactionUtils-p1
DylanDylann Aug 16, 2025
9129d52
resolve cmt
DylanDylann Aug 16, 2025
caa8e33
Merge branch 'main' into remove-onyx-connect-in-TransactionUtils-p1
DylanDylann Aug 20, 2025
f6e7572
Merge branch 'main' into remove-onyx-connect-in-TransactionUtils-p1
DylanDylann Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=245 --cache --cache-location=node_modules/.cache/eslint",
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=244 --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",
Expand Down
14 changes: 0 additions & 14 deletions src/libs/TransactionUtils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@

let allTransactions: OnyxCollection<Transaction> = {};

Onyx.connect({

Check warning on line 105 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -113,17 +113,8 @@
},
});

let allTransactionDrafts: OnyxCollection<Transaction> = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT,
waitForCollectionCallback: true,
callback: (value) => {
allTransactionDrafts = value ?? {};
},
});

let allReports: OnyxCollection<Report> = {};
Onyx.connect({

Check warning on line 117 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -132,7 +123,7 @@
});

let allTransactionViolations: OnyxCollection<TransactionViolations> = {};
Onyx.connect({

Check warning on line 126 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
waitForCollectionCallback: true,
callback: (value) => (allTransactionViolations = value),
Expand All @@ -140,7 +131,7 @@

let currentUserEmail = '';
let currentUserAccountID = -1;
Onyx.connect({

Check warning on line 134 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.SESSION,
callback: (val) => {
currentUserEmail = val?.email ?? '';
Expand Down Expand Up @@ -1395,10 +1386,6 @@
return Object.values(transformedTaxRates(policy, transaction)).find((taxRate) => taxRate.code === (transaction?.taxCode ?? defaultTaxCode))?.modifiedName;
}

function getTransactionOrDraftTransaction(transactionID: string): OnyxEntry<Transaction> {
return allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? allTransactionDrafts?.[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`];
}

type FieldsToCompare = Record<string, Array<keyof Transaction>>;
type FieldsToChange = {
category?: Array<string | undefined>;
Expand Down Expand Up @@ -1981,7 +1968,6 @@
isPartialTransaction,
isPendingCardOrScanningTransaction,
isScanning,
getTransactionOrDraftTransaction,
checkIfShouldShowMarkAsCashButton,
getOriginalTransactionWithSplitInfo,
getTransactionPendingAction,
Expand Down
11 changes: 4 additions & 7 deletions src/pages/iou/request/step/IOURequestStepScan/ReceiptView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -37,7 +36,6 @@ function ReceiptView({route}: ReceiptViewProps) {
const {setAttachmentError} = useAttachmentErrors();
const {shouldShowArrows, setShouldShowArrows, autoHideArrows, cancelAutoHideArrows} = useCarouselArrows();
const styles = useThemeStyles();

const [currentReceipt, setCurrentReceipt] = useState<ReceiptWithTransactionIDAndSource | null>();
const [page, setPage] = useState<number>(-1);
const [isDeleteReceiptConfirmModalVisible, setIsDeleteReceiptConfirmModalVisible] = useState(false);
Expand All @@ -49,7 +47,8 @@ function ReceiptView({route}: ReceiptViewProps) {
.filter((receipt): receipt is ReceiptWithTransactionIDAndSource => !!receipt),
canBeMissing: true,
});

const secondTransactionID = receipts.at(1)?.transactionID;
const [secondTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${secondTransactionID}`, {canBeMissing: true});
useEffect(() => {
if (!receipts || receipts.length === 0) {
return;
Expand All @@ -74,16 +73,14 @@ function ReceiptView({route}: ReceiptViewProps) {
return;
}

const secondTransactionID = receipts.at(1)?.transactionID;
const secondTransaction = secondTransactionID ? getTransactionOrDraftTransaction(secondTransactionID) : undefined;
replaceDefaultDraftTransaction(secondTransaction);
replaceDefaultDraftTransaction(secondTransactionID ? secondTransaction : undefined);
return;
}
removeDraftTransaction(currentReceipt.transactionID);
});

Navigation.goBack();
}, [currentReceipt, receipts]);
}, [currentReceipt, receipts.length, secondTransaction, secondTransactionID]);

const handleCloseConfirmModal = () => {
setIsDeleteReceiptConfirmModalVisible(false);
Expand Down
Loading