Skip to content
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

Show/hide delete expense button based on Liability type for card transaction #56877

Merged
merged 21 commits into from
Mar 5, 2025
Merged

Show/hide delete expense button based on Liability type for card transaction #56877

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e1586d2
Show/hide delete expense button based on feed settings for Company cards
narefyev91 Feb 14, 2025
b5600cd
Merge branch 'refs/heads/main' into hide-delete-expense-button-if-car…
narefyev91 Feb 27, 2025
ea2eb87
show/hide button based on transaction liability
narefyev91 Feb 27, 2025
db6e038
prettier
narefyev91 Feb 27, 2025
658078e
fix ts
narefyev91 Feb 27, 2025
f04c256
update condition
narefyev91 Feb 27, 2025
fb471bb
remove ability to show delete button in context menu
narefyev91 Feb 28, 2025
089e966
fix empty transaction
narefyev91 Feb 28, 2025
ba8fa7e
Merge branch 'refs/heads/main' into hide-delete-expense-button-if-car…
narefyev91 Feb 28, 2025
3cb14b6
fix jest
narefyev91 Feb 28, 2025
78a5666
fix jest
narefyev91 Feb 28, 2025
20f09c3
add unit test
narefyev91 Mar 3, 2025
5c5ffa0
show delete button for card transaction report
narefyev91 Mar 4, 2025
c60107a
update condition for report details page
narefyev91 Mar 4, 2025
1b4744c
update condition for context menu
narefyev91 Mar 4, 2025
5b32275
Merge branch 'refs/heads/main' into hide-delete-expense-button-if-car…
narefyev91 Mar 5, 2025
53e8d25
update after c+ review
narefyev91 Mar 5, 2025
0ef4703
prettier
narefyev91 Mar 5, 2025
e15f660
ts
narefyev91 Mar 5, 2025
dbca006
fix jest
narefyev91 Mar 5, 2025
2807ce8
add missing money request
narefyev91 Mar 5, 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
15 changes: 12 additions & 3 deletions src/pages/ReportDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ import {
shouldUseFullTitleToDisplay,
} from '@libs/ReportUtils';
import StringUtils from '@libs/StringUtils';
import {isCardTransaction as isCardTransactionTransactionUtils, isExpensifyCardTransaction} from '@libs/TransactionUtils';
import {
cancelPayment as cancelPaymentAction,
deleteMoneyRequest,
Expand Down Expand Up @@ -302,7 +303,17 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
const shouldShowTaskDeleteButton =
isTaskReport && !isCanceledTaskReport && canWriteInReport(report) && report.stateNum !== CONST.REPORT.STATE_NUM.APPROVED && !isClosedReport(report) && canModifyTask && canActionTask;
const canDeleteRequest = isActionOwner && (canDeleteTransaction(moneyRequestReport) || isSelfDMTrackExpenseReport) && !isDeletedParentAction;
const shouldShowDeleteButton = shouldShowTaskDeleteButton || canDeleteRequest;
const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : '';

const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${iouTransactionID ?? CONST.DEFAULT_NUMBER_ID}`);
const isCardTransaction = isCardTransactionTransactionUtils(transaction);
const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${policy?.workspaceAccountID}`);

const isCompanyCardTransaction = !isExpensifyCardTransaction(transaction) && isCardTransaction;
const bank = transaction?.bank as ValueOf<typeof CONST.COMPANY_CARD.FEED_BANK_NAME>;
const liabilityType = cardFeeds?.settings?.companyCards?.[bank]?.liabilityType;
const isAllowToDeleteTransaction = !isCompanyCardTransaction || (isCompanyCardTransaction && liabilityType === CONST.COMPANY_CARDS.DELETE_TRANSACTIONS.ALLOW);
const shouldShowDeleteButton = isCompanyCardTransaction ? isAllowToDeleteTransaction : shouldShowTaskDeleteButton || canDeleteRequest;

const canUnapproveRequest = isExpenseReportUtil(report) && (isReportManagerUtil(report) || isPolicyAdmin) && isReportApprovedUtil({report}) && !isSubmitAndClose(policy);

Expand Down Expand Up @@ -380,8 +391,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
const shouldShowCancelPaymentButton = caseID === CASES.MONEY_REPORT && isPayer && isSettled && isExpenseReportUtil(moneyRequestReport);
const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReport?.chatReportID}`);

const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : '';

const cancelPayment = useCallback(() => {
if (!chatReport) {
return;
Expand Down
Loading