Skip to content

Remove usage of IOUReportID in IOU actions #87530

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

Draft
youssef-lr wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Remove usage of IOUReportID in IOU actions #87530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
15e497c
wip
youssef-lr Apr 9, 2026
335c704
Merge branch 'main' into youssef_cleanup_iou_data
youssef-lr Apr 16, 2026
39da0b5
Cleanup unused code
youssef-lr Apr 16, 2026
3cf5bf0
Remove unusued component
youssef-lr Apr 21, 2026
4a8c9ae
Cleanup ReportUtils from unused fields
youssef-lr Apr 21, 2026
265ff85
Add some comments so I can get back to them later
youssef-lr Apr 21, 2026
55a222d
Merge branch 'main' into youssef_cleanup_iou_data
youssef-lr Apr 21, 2026
470580f
Revert some unneeded changes
youssef-lr Apr 21, 2026
f95d2aa
Add fallback reportID
youssef-lr Apr 21, 2026
7ffc2b7
Merge branch 'main' into youssef_cleanup_iou_data
youssef-lr Apr 22, 2026
2c87a3d
Fix IOU & Split tests
youssef-lr Apr 23, 2026
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
177 changes: 0 additions & 177 deletions src/components/ReportActionItem/MoneyRequestAction.tsx
View file
Open in desktop

This file was deleted.

9 changes: 4 additions & 5 deletions src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ function TransactionPreviewContent({
const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`);
const managerID = report?.managerID ?? reportPreviewAction?.childManagerAccountID ?? CONST.DEFAULT_NUMBER_ID;
const ownerAccountID = report?.ownerAccountID ?? reportPreviewAction?.childOwnerAccountID ?? CONST.DEFAULT_NUMBER_ID;
const isReportAPolicyExpenseChat = isPolicyExpenseChat(chatReport);
const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(report?.reportID)}`);
const isChatReportArchived = useReportIsArchived(chatReport?.reportID);
const currentUserDetails = useCurrentUserPersonalDetails();
Expand All @@ -111,12 +110,12 @@ function TransactionPreviewContent({
createTransactionPreviewConditionals({
...transactionPreviewCommonArguments,
areThereDuplicates,
isReportAPolicyExpenseChat,
isReportAPolicyExpenseChat: isParentPolicyExpenseChat,
currentUserEmail,
currentUserAccountID,
reportActions,
}),
[areThereDuplicates, transactionPreviewCommonArguments, isReportAPolicyExpenseChat, currentUserEmail, currentUserAccountID, reportActions],
[areThereDuplicates, transactionPreviewCommonArguments, isParentPolicyExpenseChat, currentUserEmail, currentUserAccountID, reportActions],
);

const {shouldShowRBR, shouldShowMerchant, shouldShowSplitShare, shouldShowTag, shouldShowCategory, shouldShowSkeleton, shouldShowDescription} = conditionals;
Expand Down Expand Up @@ -230,10 +229,10 @@ function TransactionPreviewContent({
}
}

return calculateAmount(isReportAPolicyExpenseChat ? 1 : originalParticipantCount - 1, amount ?? 0, requestCurrency ?? '', actorAccountID === sessionAccountID);
return calculateAmount(isParentPolicyExpenseChat ? 1 : originalParticipantCount - 1, amount ?? 0, requestCurrency ?? '', actorAccountID === sessionAccountID);
}, [
shouldShowSplitShare,
isReportAPolicyExpenseChat,
isParentPolicyExpenseChat,
participantAccountIDs.length,
transaction?.comment?.splits,
amount,
Expand Down
25 changes: 9 additions & 16 deletions src/components/ReportActionItem/TransactionPreview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ function TransactionPreview(props: TransactionPreviewProps) {
contextMenuAnchor,
checkIfContextMenuActive = () => {},
shouldDisplayContextMenu,
iouReportID,
transactionID: transactionIDFromProps,
onPreviewPressed,
shouldHighlight,
Expand All @@ -47,17 +46,15 @@ function TransactionPreview(props: TransactionPreviewProps) {
originalReportID,
} = props;

const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`);
const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`);
const route = useRoute<PlatformStackRouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
const isMoneyRequestAction = isMoneyRequestActionReportActionsUtils(action);
const transactionID = transactionIDFromProps ?? (isMoneyRequestAction ? getOriginalMessage(action)?.IOUTransactionID : undefined);
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`);
const [originalTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transaction?.comment?.originalTransactionID)}`);
const [transactionReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(transaction?.reportID)}`);
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(transactionReport?.policyID)}`);
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getNonEmptyStringOnyxID(transactionReport?.policyID)}`);
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(transactionReport?.policyID)}`);
const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(transaction?.reportID)}`);
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(iouReport?.policyID)}`);
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getNonEmptyStringOnyxID(iouReport?.policyID)}`);
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(iouReport?.policyID)}`);
const violations = useTransactionViolations(transaction?.transactionID);
const [walletTerms] = useOnyx(ONYXKEYS.WALLET_TERMS);
const session = useSession();
Expand Down Expand Up @@ -90,15 +87,13 @@ function TransactionPreview(props: TransactionPreviewProps) {

const navigateToReviewFields = () =>
Navigation.navigate(
getReviewNavigationRoute(Navigation.getActiveRoute(), route.params?.threadReportID, transaction, duplicates, policy, policyCategories, policyTags ?? {}, transactionReport),
getReviewNavigationRoute(Navigation.getActiveRoute(), route.params?.threadReportID, transaction, duplicates, policy, policyCategories, policyTags ?? {}, iouReport),
);

const transactionPreview = transaction;

const {isBillSplit} = getOriginalTransactionWithSplitInfo(transaction, originalTransaction);

const iouAction = action;

// See description of `transactionRawAmount` prop for more context
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const transactionRawAmount = (Number(transaction?.modifiedAmount) || transaction?.amount) ?? 0;
Expand All @@ -121,13 +116,12 @@ function TransactionPreview(props: TransactionPreviewProps) {
<TransactionPreviewContent
/* eslint-disable-next-line react/jsx-props-no-spreading */
{...props}
action={iouAction}
action={action}
isBillSplit={isBillSplit && !transaction?.comment?.originalTransactionID}
chatReport={chatReport}
personalDetails={personalDetails}
transaction={transactionPreview}
transactionRawAmount={transactionRawAmount}
report={report}
report={iouReport}
violations={violations}
offlineWithFeedbackOnClose={offlineWithFeedbackOnClose}
navigateToReviewFields={navigateToReviewFields}
Expand All @@ -146,13 +140,12 @@ function TransactionPreview(props: TransactionPreviewProps) {
<TransactionPreviewContent
/* eslint-disable-next-line react/jsx-props-no-spreading */
{...props}
action={iouAction}
action={action}
isBillSplit={isBillSplit}
chatReport={chatReport}
personalDetails={personalDetails}
transaction={originalTransaction ?? transaction}
transactionRawAmount={transactionRawAmount}
report={report}
report={iouReport}
violations={violations}
offlineWithFeedbackOnClose={offlineWithFeedbackOnClose}
navigateToReviewFields={navigateToReviewFields}
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useDeleteTransactions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac
}
const originalTransaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
const originalTransactionIouActions = getIOUActionForTransactions([transactionID], report?.reportID);
const iouReportID = isMoneyRequestAction(originalTransactionIouActions.at(0)) ? getOriginalMessage(originalTransactionIouActions.at(0))?.IOUReportID : undefined;
const iouReportID = isMoneyRequestAction(originalTransactionIouActions.at(0)) ? originalTransactionIouActions.at(0)?.reportID : undefined;
const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`];
const policyRecentlyUsedCategories =
allPolicyRecentlyUsedCategories?.[
Expand Down Expand Up @@ -186,7 +186,7 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac
if (!action) {
continue;
}
const iouReportID = isMoneyRequestAction(action) ? getOriginalMessage(action)?.IOUReportID : undefined;
const iouReportID = isMoneyRequestAction(action) ? action?.reportID : undefined;
const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`];
const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`];
const chatIOUReportID = chatReport?.reportID;
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useGetIOUReportFromReportAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';

Check failure on line 1 in src/hooks/useGetIOUReportFromReportAction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

'getOriginalMessage' is defined but never used

Check failure on line 1 in src/hooks/useGetIOUReportFromReportAction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

'getOriginalMessage' is defined but never used

Check failure on line 1 in src/hooks/useGetIOUReportFromReportAction.ts

View workflow job for this annotation

GitHub Actions / ESLint check 

'getOriginalMessage' is defined but never used

Check failure on line 1 in src/hooks/useGetIOUReportFromReportAction.ts

View workflow job for this annotation

GitHub Actions / ESLint check 

'getOriginalMessage' is defined but never used
import ONYXKEYS from '@src/ONYXKEYS';
import type * as OnyxTypes from '@src/types/onyx';
import useOnyx from './useOnyx';
Expand All @@ -9,7 +9,7 @@
chatReport: OnyxTypes.Report | undefined;
isChatIOUReportArchived: boolean;
} {
const iouReportID = isMoneyRequestAction(reportAction) ? getOriginalMessage(reportAction)?.IOUReportID : undefined;
const iouReportID = isMoneyRequestAction(reportAction) ? reportAction?.reportID : undefined;
const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`) ?? null;
const isChatIOUReportArchived = useReportIsArchived(iouReportID);
const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`);
Expand Down
Loading
Loading