Skip to content

Commit bac0a46

Browse files
committed
fix: change show reimbursable conditions
1 parent f78a94a commit bac0a46

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/components/ReportActionItem/MoneyRequestView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ function MoneyRequestView({allReports, report, policy, shouldShowAnimatedBackgro
246246
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
247247
const shouldShowTag = isPolicyExpenseChat && (transactionTag || hasEnabledTags(policyTagLists));
248248
const shouldShowBillable = isPolicyExpenseChat && (!!transactionBillable || !(policy?.disabledFields?.defaultBillable ?? true) || !!updatedTransaction?.billable);
249-
const shouldShowReimbursable = isPolicyExpenseChat && !!policy?.disabledFields?.reimbursable && !isCardTransaction && !isInvoice;
249+
const shouldShowReimbursable = isPolicyExpenseChat && !isCardTransaction && !isInvoice;
250250
const canEditReimbursable = canUserPerformWriteAction && canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.REIMBURSABLE);
251251
const shouldShowAttendees = useMemo(() => shouldShowAttendeesTransactionUtils(iouType, policy), [iouType, policy]);
252252

src/libs/ReportUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4216,9 +4216,10 @@ function canEditFieldOfMoneyRequest(
42164216
const policy = getPolicy(moneyRequestReport?.policyID);
42174217
const isAdmin = isExpenseReport(moneyRequestReport) && policy?.role === CONST.POLICY.ROLE.ADMIN;
42184218
const isManager = isExpenseReport(moneyRequestReport) && currentUserAccountID === moneyRequestReport?.managerID;
4219+
const isRequestor = currentUserAccountID === reportAction?.actorAccountID;
42194220

42204221
if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.REIMBURSABLE) {
4221-
return (isAdmin || isManager) && !policy?.disabledFields?.reimbursable;
4222+
return (isAdmin || isManager || isRequestor) && !policy?.disabledFields?.reimbursable;
42224223
}
42234224

42244225
if ((fieldToEdit === CONST.EDIT_REQUEST_FIELD.AMOUNT || fieldToEdit === CONST.EDIT_REQUEST_FIELD.CURRENCY) && isDistanceRequest(transaction)) {
@@ -4233,7 +4234,6 @@ function canEditFieldOfMoneyRequest(
42334234
}
42344235

42354236
if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.RECEIPT) {
4236-
const isRequestor = currentUserAccountID === reportAction?.actorAccountID;
42374237
return (
42384238
!isInvoiceReport(moneyRequestReport) &&
42394239
!isReceiptBeingScanned(transaction) &&

0 commit comments

Comments
 (0)