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/Expensify.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ import NavigationRoot from './libs/Navigation/NavigationRoot';
import NetworkConnection from './libs/NetworkConnection';
import PushNotification from './libs/Notification/PushNotification';
import './libs/Notification/PushNotification/subscribeToPushNotifications';
// This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
import './libs/registerPaginationConfig';
import setCrashlyticsUserId from './libs/setCrashlyticsUserId';
import StartupTimer from './libs/StartupTimer';
// This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
Expand Down
17 changes: 15 additions & 2 deletions src/components/MoneyReportHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type {OnyxEntry} from 'react-native-onyx';
import type {ValueOf} from 'type-fest';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations';
import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLoadingBarVisibility from '@hooks/useLoadingBarVisibility';
import useLocalize from '@hooks/useLocalize';
Expand Down Expand Up @@ -213,6 +214,7 @@ function MoneyReportHeader({
}
return reportActions.find((action): action is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => action.reportActionID === transactionThreadReport.parentReportActionID);
}, [reportActions, transactionThreadReport?.parentReportActionID]);
const {iouReport, chatReport: chatIOUReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(requestParentReportAction);

const {transactions: reportTransactions, violations} = useTransactionsAndViolationsForReport(moneyRequestReport?.reportID);

Expand Down Expand Up @@ -1362,10 +1364,21 @@ function MoneyReportHeader({
// Money request should be deleted when interactions are done, to not show the not found page before navigating to goBackRoute
// eslint-disable-next-line deprecation/deprecation
InteractionManager.runAfterInteractions(() => {
deleteMoneyRequest(transaction?.transactionID, requestParentReportAction, duplicateTransactions, duplicateTransactionViolations);
deleteMoneyRequest(
transaction?.transactionID,
requestParentReportAction,
duplicateTransactions,
duplicateTransactionViolations,
iouReport,
chatIOUReport,
false,
undefined,
undefined,
isChatIOUReportArchived,
);
removeTransaction(transaction.transactionID);
});
goBackRoute = getNavigationUrlOnMoneyRequestDelete(transaction.transactionID, requestParentReportAction, false);
goBackRoute = getNavigationUrlOnMoneyRequestDelete(transaction.transactionID, requestParentReportAction, iouReport, chatIOUReport, false, isChatIOUReportArchived);
}

if (goBackRoute) {
Expand Down
20 changes: 18 additions & 2 deletions src/components/MoneyRequestHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {OnyxEntry} from 'react-native-onyx';
import type {ValueOf} from 'type-fest';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations';
import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction';
import useLoadingBarVisibility from '@hooks/useLoadingBarVisibility';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
Expand Down Expand Up @@ -119,6 +120,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
const isFromReviewDuplicates = !!route.params.backTo?.replace(/\?.*/g, '').endsWith('/duplicates/review');
const shouldDisplayTransactionNavigation = !!(reportID && isReportInRHP);
const isParentReportArchived = useReportIsArchived(report?.parentReportID);
const {iouReport, chatReport: chatIOUReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(parentReportAction);

const {isBetaEnabled} = usePermissions();

Expand Down Expand Up @@ -449,16 +451,30 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
}
if (isTrackExpenseAction(parentReportAction)) {
deleteTrackExpense(
report?.parentReportID,
parentReport,
transaction.transactionID,
parentReportAction,
iouReport,
chatIOUReport,
duplicateTransactions,
duplicateTransactionViolations,
true,
isParentReportArchived,
isChatIOUReportArchived,
);
} else {
deleteMoneyRequest(transaction.transactionID, parentReportAction, duplicateTransactions, duplicateTransactionViolations, true);
deleteMoneyRequest(
transaction.transactionID,
parentReportAction,
duplicateTransactions,
duplicateTransactionViolations,
iouReport,
chatIOUReport,
true,
undefined,
undefined,
isChatIOUReportArchived,
);
removeTransaction(transaction.transactionID);
}
onBackButtonPress();
Expand Down
6 changes: 4 additions & 2 deletions src/components/ReportActionItem/MoneyRequestReceiptView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
import ReceiptAudit, {ReceiptAuditMessages} from '@components/ReceiptAudit';
import ReceiptEmptyState from '@components/ReceiptEmptyState';
import useActiveRoute from '@hooks/useActiveRoute';
import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useReportIsArchived from '@hooks/useReportIsArchived';
Expand Down Expand Up @@ -109,6 +110,7 @@ function MoneyRequestReceiptView({
const [isLoading, setIsLoading] = useState(true);

const parentReportAction = report?.parentReportActionID ? parentReportActions?.[report.parentReportActionID] : undefined;
const {iouReport, chatReport: chatIOUReport, isChatIOUReportArchived} = useGetIOUReportFromReportAction(parentReportAction);
const isTrackExpense = isTrackExpenseReport(report);
const moneyRequestReport = parentReport;
const linkedTransactionID = useMemo(() => {
Expand Down Expand Up @@ -206,7 +208,7 @@ function MoneyRequestReceiptView({
return;
}
if (parentReportAction) {
cleanUpMoneyRequest(transaction?.transactionID ?? linkedTransactionID, parentReportAction, report.reportID, true);
cleanUpMoneyRequest(transaction?.transactionID ?? linkedTransactionID, parentReportAction, report.reportID, iouReport, chatIOUReport, true, isChatIOUReportArchived);
return;
}
}
Expand All @@ -221,7 +223,7 @@ function MoneyRequestReceiptView({
revert(transaction, getLastModifiedExpense(report?.reportID));
clearError(transaction.transactionID);
clearAllRelatedReportActionErrors(report.reportID, parentReportAction);
}, [transaction, chatReport, parentReportAction, linkedTransactionID, report?.reportID]);
}, [transaction, chatReport, parentReportAction, isChatIOUReportArchived, linkedTransactionID, report?.reportID, iouReport, chatIOUReport]);

let receiptStyle: StyleProp<ViewStyle>;

Expand Down
19 changes: 19 additions & 0 deletions src/hooks/useGetIOUReportFromReportAction.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
import ONYXKEYS from '@src/ONYXKEYS';
import type * as OnyxTypes from '@src/types/onyx';
import useOnyx from './useOnyx';
import useReportIsArchived from './useReportIsArchived';

function useGetIOUReportFromReportAction(reportAction: OnyxTypes.ReportAction | null | undefined): {
iouReport: OnyxTypes.Report | undefined;
chatReport: OnyxTypes.Report | undefined;
isChatIOUReportArchived: boolean;
} {
const iouReportID = isMoneyRequestAction(reportAction) ? getOriginalMessage(reportAction)?.IOUReportID : undefined;
const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`, {canBeMissing: true}) ?? null;
const isChatIOUReportArchived = useReportIsArchived(iouReportID);
const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`, {canBeMissing: true});
return {iouReport, chatReport, isChatIOUReportArchived};
}

export default useGetIOUReportFromReportAction;
40 changes: 38 additions & 2 deletions src/hooks/useSelectedTransactionsActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ import {
canEditFieldOfMoneyRequest,
canHoldUnholdReportAction,
canUserPerformWriteAction as canUserPerformWriteActionReportUtils,
isArchivedReport,
isInvoiceReport,
isMoneyRequestReport as isMoneyRequestReportUtils,
isTrackExpenseReport,
} from '@libs/ReportUtils';
import type {ArchivedReportsIDSet} from '@libs/SearchUIUtils';
import type {IOUType} from '@src/CONST';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
Expand Down Expand Up @@ -59,6 +61,7 @@ function useSelectedTransactionsActions({
const {selectedTransactionIDs, clearSelectedTransactions} = useSearchContext();
const [allTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {canBeMissing: false});
const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID, {canBeMissing: true});
const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: true});
const [lastVisitedPath] = useOnyx(ONYXKEYS.LAST_VISITED_PATH, {canBeMissing: true});

const [integrationsExportTemplates] = useOnyx(ONYXKEYS.NVP_INTEGRATION_SERVER_EXPORT_TEMPLATES, {canBeMissing: true});
Expand All @@ -83,6 +86,23 @@ function useSelectedTransactionsActions({
const isTrackExpenseThread = isTrackExpenseReport(report);
const isInvoice = isInvoiceReport(report);

const [archivedReportsIdSet = new Set<string>()] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, {
canBeMissing: true,
selector: (all): ArchivedReportsIDSet => {
const ids = new Set<string>();
if (!all) {
return ids;
}

for (const [key, value] of Object.entries(all)) {
if (isArchivedReport(value)) {
ids.add(key);
}
}
return ids;
},
});

let iouType: IOUType = CONST.IOU.TYPE.SUBMIT;

if (isTrackExpenseThread) {
Expand All @@ -109,7 +129,23 @@ function useSelectedTransactionsActions({
return;
}

deleteMoneyRequest(transactionID, action, duplicateTransactions, duplicateTransactionViolations, false, deletedTransactionIDs, selectedTransactionIDs);
const iouReportID = isMoneyRequestAction(action) ? getOriginalMessage(action)?.IOUReportID : undefined;
const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`];
const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`];
const chatIOUReportID = chatReport?.reportID;
const isChatIOUReportArchived = archivedReportsIdSet.has(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${chatIOUReportID}`);
deleteMoneyRequest(
transactionID,
action,
duplicateTransactions,
duplicateTransactionViolations,
iouReport,
chatReport,
false,
deletedTransactionIDs,
selectedTransactionIDs,
isChatIOUReportArchived,
);
deletedTransactionIDs.push(transactionID);
if (action.childReportID) {
deletedTransactionThreadReportIDs.add(action.childReportID);
Expand All @@ -118,7 +154,7 @@ function useSelectedTransactionsActions({
clearSelectedTransactions(true);
setIsDeleteModalVisible(false);
Navigation.removeReportScreen(deletedTransactionThreadReportIDs);
}, [duplicateTransactions, duplicateTransactionViolations, reportActions, selectedTransactionIDs, clearSelectedTransactions]);
}, [duplicateTransactions, duplicateTransactionViolations, reportActions, selectedTransactionIDs, clearSelectedTransactions, allReports, archivedReportsIdSet]);

const showDeleteModal = useCallback(() => {
setIsDeleteModalVisible(true);
Expand Down
4 changes: 3 additions & 1 deletion src/libs/OptionsListUtils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,9 @@ Onyx.connect({
lastReportActions[reportID] = firstReportAction;
}

const isWriteActionAllowed = canUserPerformWriteAction(report);
const reportNameValuePairs = allReportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`];
const isReportArchived = !!reportNameValuePairs?.private_isArchived;
const isWriteActionAllowed = canUserPerformWriteAction(report, isReportArchived);

// The report is only visible if it is the last action not deleted that
// does not match a closed or created state.
Expand Down
6 changes: 3 additions & 3 deletions src/libs/ReportUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10987,10 +10987,10 @@ function prepareOnboardingOnyxData(
hasOutstandingChildTask: false,
};
const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${targetChatReportID}`];
const canUserPerformWriteAction1 = canUserPerformWriteAction(report);
const {lastMessageText = ''} = getLastVisibleMessageActionUtils(targetChatReportID, canUserPerformWriteAction1);
const canUserPerformWriteActionVariable = canUserPerformWriteAction(report);
const {lastMessageText = ''} = getLastVisibleMessageActionUtils(targetChatReportID, canUserPerformWriteActionVariable);
if (lastMessageText) {
const lastVisibleAction = getLastVisibleAction(targetChatReportID, canUserPerformWriteAction1);
const lastVisibleAction = getLastVisibleAction(targetChatReportID, canUserPerformWriteActionVariable);
const prevLastVisibleActionCreated = lastVisibleAction?.created;
const lastActorAccountID = lastVisibleAction?.actorAccountID;
failureReport = {
Expand Down
Loading