Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions src/components/MoneyRequestHeaderSecondaryActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`);
const [parentReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.parentReportID}`);
const parentReportAction = report?.parentReportActionID ? parentReportActions?.[report.parentReportActionID] : undefined;
const [transactionThreadReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(parentReportAction?.childReportID)}`);
const transactionIDFromAction = isMoneyRequestAction(parentReportAction)
? (getOriginalMessage(parentReportAction)?.IOUTransactionID ?? CONST.DEFAULT_NUMBER_ID)
: CONST.DEFAULT_NUMBER_ID;
Expand Down Expand Up @@ -538,6 +539,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
chatReportID: report?.parentReportID,
chatReport: parentReport,
chatReportActions: parentReportActions,
transactionThreadReportActions,
transactionID: transaction.transactionID,
reportAction: parentReportAction,
iouReport,
Expand Down
2 changes: 2 additions & 0 deletions src/hooks/useDeleteTransactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac
chatReportID: candidateIOUReport?.reportID,
chatReport: candidateIOUReport,
chatReportActions: selfDMReportActions,
transactionThreadReportActions: allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${action?.childReportID}`],
transactionID,
reportAction: action,
iouReport: undefined,
Expand Down Expand Up @@ -392,6 +393,7 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac
transactionID,
reportAction: action,
transactionThreadReport,
transactionThreadReportActions: allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`],
transactions: duplicateTransactions,
violations: duplicateTransactionViolations,
iouReport,
Expand Down
7 changes: 5 additions & 2 deletions src/libs/actions/IOU/DeleteMoneyRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ type DeleteMoneyRequestFunctionParams = {
currentUserAccountID: number;
currentUserEmail: string;
transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
transactionThreadReportActions: OnyxEntry<OnyxTypes.ReportActions>;
policy?: OnyxEntry<OnyxTypes.Policy>;
getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals'];
};
Expand Down Expand Up @@ -628,7 +629,7 @@ function getCleanUpTransactionThreadReportOnyxData({
updatedReportPreviewAction?: ReportAction;
shouldAddUpdatedReportPreviewActionToOnyxData?: boolean;
currentUserAccountID: number;
transactionThreadReportActionsParam?: OnyxEntry<OnyxTypes.ReportActions>;
transactionThreadReportActionsParam: OnyxEntry<OnyxTypes.ReportActions>;
}) {
const allReports = getAllReports();
const allReportNameValuePairs = getAllReportNameValuePairs();
Expand All @@ -642,7 +643,7 @@ function getCleanUpTransactionThreadReportOnyxData({
let transactionThreadReportActions = null;
if (transactionThreadID) {
transactionThread = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`] ?? null;
transactionThreadReportActions = transactionThreadReportActionsParam ?? getAllReportActionsFromIOU()?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadID}`] ?? null;
transactionThreadReportActions = transactionThreadReportActionsParam ?? null;
}

optimisticData.push(
Expand Down Expand Up @@ -786,6 +787,7 @@ function deleteMoneyRequest({
allTransactionViolationsParam,
currentUserAccountID,
currentUserEmail,
transactionThreadReportActions,
policy,
getCurrencyDecimals,
}: DeleteMoneyRequestFunctionParams) {
Expand Down Expand Up @@ -941,6 +943,7 @@ function deleteMoneyRequest({
reportAction,
isChatIOUReportArchived,
currentUserAccountID,
transactionThreadReportActionsParam: transactionThreadReportActions,
});
optimisticData.push(...cleanUpTransactionThreadReportOnyxData.optimisticData);

Expand Down
23 changes: 11 additions & 12 deletions src/libs/actions/IOU/SplitTransactionUpdate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1407,18 +1407,15 @@ function updateSplitTransactions({
optimisticData: deleteExpenseOptimisticData,
failureData: deleteExpenseFailureData,
successData: deleteExpenseSuccessData,
} = getDeleteTrackExpenseInformation(
splitTransactionReport,
undeletedTransaction?.transactionID,
currentReportAction,
undefined,
currentUserPersonalDetails.accountID,
undefined,
undefined,
undefined,
undefined,
isReportArchived || undeletedTransaction?.transactionID === forceDeleteSplitTransactionID,
);
} = getDeleteTrackExpenseInformation({
chatReport: splitTransactionReport,
transactionID: undeletedTransaction?.transactionID,
reportAction: currentReportAction,
isChatReportArchived: undefined,
currentUserAccountID: currentUserPersonalDetails.accountID,
transactionThreadReportActions: allReportActionsList?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${currentReportAction?.childReportID}`],
shouldRemoveIOUTransaction: isReportArchived || undeletedTransaction?.transactionID === forceDeleteSplitTransactionID,
});

// getDeleteTrackExpenseInformation only handles deleting the transaction report thread, so we need to update the report preview action here
if (originalReportPreviewAction) {
Expand All @@ -1428,6 +1425,8 @@ function updateSplitTransactions({
updatedReportPreviewAction: (updatedReportPreviewAction ?? originalReportPreviewAction) as OnyxTypes.ReportAction,
shouldAddUpdatedReportPreviewActionToOnyxData: false,
currentUserAccountID: currentUserPersonalDetails.accountID,
// shouldDeleteTransactionThread is false, so the transaction-thread report actions are never read here.
transactionThreadReportActionsParam: undefined,
});
updatedReportPreviewAction = cleanUpTransactionThreadReportOnyxData.updatedReportPreviewAction;
}
Expand Down
62 changes: 41 additions & 21 deletions src/libs/actions/IOU/TrackExpense.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ type DeleteTrackExpenseParams = {
chatReportID: string | undefined;
chatReport: OnyxEntry<OnyxTypes.Report> | undefined;
chatReportActions: OnyxEntry<OnyxTypes.ReportActions>;
transactionThreadReportActions: OnyxEntry<OnyxTypes.ReportActions>;
transactionID: string | undefined;
reportAction: OnyxTypes.ReportAction;
iouReport: OnyxEntry<OnyxTypes.Report>;
Expand Down Expand Up @@ -652,18 +653,33 @@ function buildOnyxDataForTrackExpense({
return onyxData;
}

Comment thread
cretadn22 marked this conversation as resolved.
Resolved
Comment thread
cretadn22 marked this conversation as resolved.
Resolved
function getDeleteTrackExpenseInformation(
chatReport: OnyxEntry<OnyxTypes.Report>,
transactionID: string | undefined,
reportAction: OnyxTypes.ReportAction,
isChatReportArchived: boolean | undefined,
currentUserAccountID: number,
type GetDeleteTrackExpenseInformationParams = {
chatReport: OnyxEntry<OnyxTypes.Report>;
transactionID: string | undefined;
reportAction: OnyxTypes.ReportAction;
isChatReportArchived: boolean | undefined;
currentUserAccountID: number;
transactionThreadReportActions: OnyxEntry<OnyxTypes.ReportActions>;
shouldDeleteTransactionFromOnyx?: boolean;
isMovingTransactionFromTrackExpense?: boolean;
actionableWhisperReportActionID?: string;
resolution?: string;
shouldRemoveIOUTransaction?: boolean;
};

function getDeleteTrackExpenseInformation({
chatReport,
transactionID,
reportAction,
isChatReportArchived,
currentUserAccountID,
transactionThreadReportActions,
shouldDeleteTransactionFromOnyx = true,
isMovingTransactionFromTrackExpense = false,
actionableWhisperReportActionID = '',
resolution = '',
shouldRemoveIOUTransaction = true,
) {
}: GetDeleteTrackExpenseInformationParams) {
// STEP 1: Get all collections we're updating
const transaction = getAllTransactions()?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
// TODO: https://github.com/Expensify/App/issues/66512
Expand Down Expand Up @@ -738,6 +754,7 @@ function getDeleteTrackExpenseInformation(
transactionThreadID,
shouldDeleteTransactionThread,
currentUserAccountID,
transactionThreadReportActionsParam: transactionThreadReportActions,
});
optimisticData.push(...cleanUpTransactionThreadReportOnyxData.optimisticData);

Expand Down Expand Up @@ -1240,18 +1257,20 @@ const getConvertTrackedExpenseInformation = (
optimisticData: deleteOptimisticData,
successData: deleteSuccessData,
failureData: deleteFailureData,
} = getDeleteTrackExpenseInformation(
getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${linkedTrackedExpenseReportID}`],
} = getDeleteTrackExpenseInformation({
chatReport: getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${linkedTrackedExpenseReportID}`],
transactionID,
linkedTrackedExpenseReportAction,
isLinkedTrackedExpenseReportArchived,
reportAction: linkedTrackedExpenseReportAction,
isChatReportArchived: isLinkedTrackedExpenseReportArchived,
currentUserAccountID,
false,
true,
// isMovingTransactionFromTrackExpense is true, so the transaction thread is never deleted and these report actions are unused here.
transactionThreadReportActions: undefined,
shouldDeleteTransactionFromOnyx: false,
isMovingTransactionFromTrackExpense: true,
actionableWhisperReportActionID,
resolution,
true,
);
shouldRemoveIOUTransaction: true,
});

optimisticData?.push(...deleteOptimisticData);
successData?.push(...deleteSuccessData);
Expand Down Expand Up @@ -2967,6 +2986,7 @@ function deleteTrackExpense({
chatReportID,
chatReport,
chatReportActions,
transactionThreadReportActions,
transactionID,
reportAction,
iouReport,
Expand Down Expand Up @@ -3008,6 +3028,7 @@ function deleteTrackExpense({
reportAction,
transactions,
transactionThreadReport,
transactionThreadReportActions,
violations,
iouReport,
chatReport: chatIOUReport,
Expand All @@ -3024,18 +3045,17 @@ function deleteTrackExpense({

const whisperAction = getTrackExpenseActionableWhisper(transactionID, chatReportID, chatReportActions);
const actionableWhisperReportActionID = whisperAction?.reportActionID;
const {parameters, optimisticData, successData, failureData} = getDeleteTrackExpenseInformation(
const {parameters, optimisticData, successData, failureData} = getDeleteTrackExpenseInformation({
chatReport,
transactionID,
reportAction,
isChatReportArchived,
currentUserAccountID,
undefined,
undefined,
transactionThreadReportActions,
actionableWhisperReportActionID,
CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION.NOTHING,
false,
);
resolution: CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION.NOTHING,
shouldRemoveIOUTransaction: false,
});

// STEP 6: Make the API request
API.write(WRITE_COMMANDS.DELETE_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});
Expand Down
21 changes: 10 additions & 11 deletions src/libs/actions/MergeTransaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -646,18 +646,17 @@ function mergeTransactionRequest({
if (!sourceIouAction) {
Log.warn("Can't find the iouAction for the transaction in the selfDM report.");
} else {
const {optimisticData, successData, failureData} = getDeleteTrackExpenseInformation(
selfDMReport,
sourceTransaction.transactionID,
sourceIouAction,
false,
currentUserAccountIDParam,
undefined,
undefined,
const {optimisticData, successData, failureData} = getDeleteTrackExpenseInformation({
chatReport: selfDMReport,
transactionID: sourceTransaction.transactionID,
reportAction: sourceIouAction,
isChatReportArchived: false,
currentUserAccountID: currentUserAccountIDParam,
transactionThreadReportActions: sourceTransactionThreadReportActions,
actionableWhisperReportActionID,
CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION.NOTHING,
false,
);
resolution: CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION.NOTHING,
shouldRemoveIOUTransaction: false,
});

sourceTransactionOptimisticData.push(...optimisticData);
sourceTransactionSuccessData.push(...successData);
Expand Down
3 changes: 3 additions & 0 deletions src/pages/DynamicReportDetailsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
const {iouReport, chatReport: chatIOUReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(requestParentReportAction);
const [iouPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`);
const [requestParentReportActionChildReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(requestParentReportAction?.childReportID)}`);
const [transactionThreadReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(requestParentReportAction?.childReportID)}`);

const isActionOwner =
typeof requestParentReportAction?.actorAccountID === 'number' &&
Expand Down Expand Up @@ -1046,6 +1047,7 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
chatReportID: moneyRequestReport?.reportID,
chatReport: moneyRequestReport,
chatReportActions: moneyRequestReportActions,
transactionThreadReportActions,
transactionID: iouTransactionID,
reportAction: requestParentReportAction,
iouReport,
Expand Down Expand Up @@ -1088,6 +1090,7 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
reportActionsForOriginalReportID,
moneyRequestReport,
moneyRequestReportActions,
transactionThreadReportActions,
iouReport,
chatIOUReport,
duplicateTransactions,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ function PopoverReportActionContextMenu({ref}: PopoverReportActionContextMenuPro
chatReportID: reportIDRef.current,
chatReport: report,
chatReportActions: reportActions,
transactionThreadReportActions: childReportActions,
transactionID: originalMessage?.IOUTransactionID,
reportAction,
iouReport,
Expand Down
Loading
Loading