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
8 changes: 7 additions & 1 deletion src/components/MoneyReportHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,13 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
handleDeleteTransactions,
isDeleteModalVisible: hookDeleteModalVisible,
hideDeleteModal,
} = useSelectedTransactionsActions({report: moneyRequestReport, reportActions, session, onExportFailed: () => setIsDownloadErrorModalVisible(true)});
} = useSelectedTransactionsActions({
report: moneyRequestReport,
reportActions,
allTransactionsLength: transactions.length,
session,
onExportFailed: () => setIsDownloadErrorModalVisible(true),
});

const shouldShowSelectedTransactionsButton = !!selectedTransactionsOptions.length && !transactionThreadReportID;

Expand Down
10 changes: 8 additions & 2 deletions src/components/MoneyReportHeaderOld.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ function MoneyReportHeaderOld({policy, report: moneyRequestReport, transactionTh
}
return reportActions.find((action): action is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => action.reportActionID === transactionThreadReport.parentReportActionID);
}, [reportActions, transactionThreadReport?.parentReportActionID]);
const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {
const [transactions = []] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {
selector: (_transactions) => reportTransactionsSelector(_transactions, moneyRequestReport?.reportID),
initialValue: [],
canBeMissing: true,
Expand Down Expand Up @@ -202,7 +202,13 @@ function MoneyReportHeaderOld({policy, report: moneyRequestReport, transactionTh
handleDeleteTransactions,
isDeleteModalVisible,
hideDeleteModal,
} = useSelectedTransactionsActions({report: moneyRequestReport, reportActions, session, onExportFailed: () => setIsDownloadErrorModalVisible(true)});
} = useSelectedTransactionsActions({
report: moneyRequestReport,
reportActions,
allTransactionsLength: transactions.length,
session,
onExportFailed: () => setIsDownloadErrorModalVisible(true),
});

const shouldShowSelectedTransactionsButton = !!selectedTransactionsOptions.length && !transactionThreadReportID;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function MoneyRequestReportActionsList({report, policy, reportActions = [], tran
handleDeleteTransactions,
isDeleteModalVisible,
hideDeleteModal,
} = useSelectedTransactionsActions({report, reportActions, session, onExportFailed: () => setIsDownloadErrorModalVisible(true)});
} = useSelectedTransactionsActions({report, reportActions, allTransactionsLength: transactions.length, session, onExportFailed: () => setIsDownloadErrorModalVisible(true)});

// We are reversing actions because in this View we are starting at the top and don't use Inverted list
const visibleReportActions = useMemo(() => {
Expand Down
20 changes: 18 additions & 2 deletions src/hooks/useSelectedTransactionsActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {useCallback, useMemo, useState} from 'react';
import * as Expensicons from '@components/Icon/Expensicons';
import {useMoneyRequestReportContext} from '@components/MoneyRequestReportView/MoneyRequestReportContext';
import {deleteMoneyRequest, unholdRequest} from '@libs/actions/IOU';
import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
import {exportReportToCSV} from '@libs/actions/Report';
import Navigation from '@libs/Navigation/Navigation';
import {getIOUActionForTransactionID, getOriginalMessage, isDeletedAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
Expand All @@ -16,7 +17,19 @@ import useLocalize from './useLocalize';
const HOLD = 'HOLD';
const UNHOLD = 'UNHOLD';

function useSelectedTransactionsActions({report, reportActions, session, onExportFailed}: {report?: Report; reportActions: ReportAction[]; session?: Session; onExportFailed?: () => void}) {
function useSelectedTransactionsActions({
report,
reportActions,
allTransactionsLength,
session,
onExportFailed,
}: {
report?: Report;
reportActions: ReportAction[];
allTransactionsLength: number;
session?: Session;
onExportFailed?: () => void;
}) {
const {selectedTransactionsID, setSelectedTransactionsID} = useMoneyRequestReportContext();
const {translate} = useLocalize();
const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
Expand All @@ -34,8 +47,11 @@ function useSelectedTransactionsActions({report, reportActions, session, onExpor

transactionsWithActions.forEach(({transactionID, action}) => action && deleteMoneyRequest(transactionID, action));
setSelectedTransactionsID([]);
if (allTransactionsLength - transactionsWithActions.length <= 1) {
turnOffMobileSelectionMode();
}
setIsDeleteModalVisible(false);
}, [reportActions, selectedTransactionsID, setSelectedTransactionsID]);
}, [allTransactionsLength, reportActions, selectedTransactionsID, setSelectedTransactionsID]);

const showDeleteModal = useCallback(() => {
setIsDeleteModalVisible(true);
Expand Down