Skip to content
Draft
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
68 changes: 12 additions & 56 deletions src/libs/ReportPreviewActionUtils.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
import type {ValueOf} from 'type-fest';
import CONST from '@src/CONST';
import type {Policy, Report, Transaction} from '@src/types/onyx';
import {arePaymentsEnabled, getSubmitToAccountID, getValidConnectedIntegration, hasIntegrationAutoSync, isPreferredExporter} from './PolicyUtils';
import {isAddExpenseAction} from './ReportPrimaryActionUtils';
import {
getMoneyRequestSpendBreakdown,
getParentReport,
getReportTransactions,
isClosedReport,
isCurrentUserSubmitter,
isExpenseReport,
isInvoiceReport,
isIOUReport,
isOpenReport,
isPayer,
isProcessingReport,
isReportApproved,
isSettled,
} from './ReportUtils';
import {getSubmitToAccountID, getValidConnectedIntegration, hasIntegrationAutoSync, isPreferredExporter} from './PolicyUtils';
import {canPayReport, isAddExpenseAction} from './ReportPrimaryActionUtils';
import {getReportTransactions, isClosedReport, isCurrentUserSubmitter, isExpenseReport, isIOUReport, isOpenReport, isProcessingReport, isReportApproved, isSettled} from './ReportUtils';
import {getSession} from './SessionUtils';
import {isPending, isScanning} from './TransactionUtils';

Expand Down Expand Up @@ -75,48 +61,18 @@ function canApprove(report: Report, currentUserAccountID: number, policy?: Polic
}

function canPay(report: Report, isReportArchived: boolean, currentUserAccountID: number, policy?: Policy, invoiceReceiverPolicy?: Policy) {
if (isReportArchived) {
return false;
}

const isReportPayer = isPayer(getSession(), report, false, policy);
const isExpense = isExpenseReport(report);
const isPaymentsEnabled = arePaymentsEnabled(policy);
const isProcessing = isProcessingReport(report);
const isApprovalEnabled = policy ? policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL : false;
const isSubmittedWithoutApprovalsEnabled = !isApprovalEnabled && isProcessing;
const isApproved = isReportApproved({report}) || isSubmittedWithoutApprovalsEnabled;
const isClosed = isClosedReport(report);
const isReportFinished = (isApproved || isClosed) && !report.isWaitingOnBankAccount;
const {reimbursableSpend} = getMoneyRequestSpendBreakdown(report);
const isReimbursed = isSettled(report);

if (isExpense && isReportPayer && isPaymentsEnabled && isReportFinished && reimbursableSpend !== 0) {
return true;
}

if (!isProcessing) {
return false;
}

const isIOU = isIOUReport(report);

if (isIOU && isReportPayer && !isReimbursed && reimbursableSpend > 0) {
return true;
}

const isInvoice = isInvoiceReport(report);

if (!isInvoice) {
if (isIOUReport(report) && isSettled(report)) {
return false;
}

const parentReport = getParentReport(report);
if (parentReport?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL && reimbursableSpend > 0) {
return parentReport?.invoiceReceiver?.accountID === currentUserAccountID;
}

return invoiceReceiverPolicy?.role === CONST.POLICY.ROLE.ADMIN && reimbursableSpend > 0;
return canPayReport({
report,
policy,
session: getSession(),
currentUserAccountID,
invoiceReceiverPolicy,
isArchived: isReportArchived,
});
}

function canExport(report: Report, policy?: Policy) {
Expand Down
29 changes: 25 additions & 4 deletions src/libs/ReportPrimaryActionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
import type {ValueOf} from 'type-fest';
import CONST from '@src/CONST';
import type {Policy, Report, ReportAction, ReportNameValuePairs, Transaction, TransactionViolation} from '@src/types/onyx';
import type Session from '@src/types/onyx/Session';
import {isApprover as isApproverUtils} from './actions/Policy/Member';
import {getCurrentUserAccountID} from './actions/Report';
import {
Expand Down Expand Up @@ -65,6 +66,15 @@ type GetReportPrimaryActionParams = {
isSubmittingAnimationRunning?: boolean;
};

type CanPayParams = {
report: Report;
policy?: Policy;
session?: OnyxEntry<Session>;
currentUserAccountID?: number;
invoiceReceiverPolicy?: Policy;
isArchived?: boolean;
};

function isAddExpenseAction(report: Report, reportTransactions: Transaction[], isChatReportArchived: boolean) {
if (isChatReportArchived) {
return false;
Expand Down Expand Up @@ -139,12 +149,16 @@ function isApproveAction(report: Report, reportTransactions: Transaction[], poli
return isProcessingReportUtils(report);
}

function isPrimaryPayAction(report: Report, policy?: Policy, reportNameValuePairs?: ReportNameValuePairs, isChatReportArchived?: boolean, invoiceReceiverPolicy?: Policy) {
if (isArchivedReport(reportNameValuePairs) || isChatReportArchived) {
function canPayReport({report, policy, session, currentUserAccountID, invoiceReceiverPolicy, isArchived}: CanPayParams): boolean {
if (isArchived) {
return false;
}

const resolvedSession = session ?? getSession();
const resolvedAccountID = currentUserAccountID ?? getCurrentUserAccountID();

const isExpenseReport = isExpenseReportUtils(report);
const isReportPayer = isPayer(getSession(), report, false, policy);
const isReportPayer = isPayer(resolvedSession, report, false, policy);
const arePaymentsEnabled = arePaymentsEnabledUtils(policy);
const isReportApproved = isReportApprovedUtils({report});
const isReportClosed = isClosedReportUtils(report);
Expand Down Expand Up @@ -178,12 +192,18 @@ function isPrimaryPayAction(report: Report, policy?: Policy, reportNameValuePair

const parentReport = getParentReport(report);
if (parentReport?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL && reimbursableSpend > 0) {
return parentReport?.invoiceReceiver?.accountID === getCurrentUserAccountID();
return parentReport?.invoiceReceiver?.accountID === resolvedAccountID;
}

return invoiceReceiverPolicy?.role === CONST.POLICY.ROLE.ADMIN && reimbursableSpend > 0;
}

function isPrimaryPayAction(report: Report, policy?: Policy, reportNameValuePairs?: ReportNameValuePairs, isChatReportArchived?: boolean, invoiceReceiverPolicy?: Policy) {
const isArchived = isArchivedReport(reportNameValuePairs) || isChatReportArchived;

return canPayReport({report, policy, invoiceReceiverPolicy, isArchived});
}

function isExportAction(report: Report, policy?: Policy, reportActions?: ReportAction[]) {
if (!policy) {
return false;
Expand Down Expand Up @@ -480,6 +500,7 @@ function getTransactionThreadPrimaryAction(
}

export {
canPayReport,
getReportPrimaryAction,
getTransactionThreadPrimaryAction,
isAddExpenseAction,
Expand Down
5 changes: 3 additions & 2 deletions src/libs/SearchUIUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ import {
isWhisperActionTargetedToOthers,
shouldReportActionBeVisible,
} from './ReportActionsUtils';
import {isExportAction} from './ReportPrimaryActionUtils';
import {canPayReport, isExportAction} from './ReportPrimaryActionUtils';
import {
canUserPerformWriteAction,
getIcons,
Expand Down Expand Up @@ -1272,9 +1272,10 @@ function getActions(
const chatReport = getChatReport(data, report);
const canBePaid = canIOUBePaid(report, chatReport, policy, allReportTransactions, false, chatReportRNVP, invoiceReceiverPolicy);
const shouldOnlyShowElsewhere = !canBePaid && canIOUBePaid(report, chatReport, policy, allReportTransactions, true, chatReportRNVP, invoiceReceiverPolicy);
const canPay = canPayReport({report, policy, invoiceReceiverPolicy, isArchived: isIOUReportArchived || isChatReportArchived});

// We're not supporting pay partial amount on search page now.
if ((canBePaid || shouldOnlyShowElsewhere) && !hasHeldExpenses(report.reportID, allReportTransactions)) {
if ((canBePaid || shouldOnlyShowElsewhere || canPay) && !hasHeldExpenses(report.reportID, allReportTransactions)) {
allActions.push(CONST.SEARCH.ACTION_TYPES.PAY);
}

Expand Down
Loading