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
4 changes: 2 additions & 2 deletions src/components/MoneyReportHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {downloadReportPDF, exportReportToCSV, exportReportToPDF, exportToIntegra
import {getThreadReportIDsForTransactions, getTotalAmountForIOUReportPreviewButton} from '@libs/MoneyRequestReportUtils';
import Navigation from '@libs/Navigation/Navigation';
import {buildOptimisticNextStepForPreventSelfApprovalsEnabled} from '@libs/NextStepUtils';
import {getConnectedIntegration} from '@libs/PolicyUtils';
import {getValidConnectedIntegration} from '@libs/PolicyUtils';
import {getOriginalMessage, getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
import {getReportPrimaryAction} from '@libs/ReportPrimaryActionUtils';
import {getSecondaryReportActions} from '@libs/ReportSecondaryActionUtils';
Expand Down Expand Up @@ -184,7 +184,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
const [requestType, setRequestType] = useState<ActionHandledType>();
const canAllowSettlement = hasUpdatedTotal(moneyRequestReport, policy);
const policyType = policy?.type;
const connectedIntegration = getConnectedIntegration(policy);
const connectedIntegration = getValidConnectedIntegration(policy);
const hasScanningReceipt = getTransactionsWithReceipts(moneyRequestReport?.reportID).some((t) => isReceiptBeingScanned(t));
const hasOnlyPendingTransactions = useMemo(() => {
return !!transactions && transactions.length > 0 && transactions.every((t) => isExpensifyCardTransaction(t) && isPending(t));
Expand Down
4 changes: 2 additions & 2 deletions src/components/ReportActionItem/ReportPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {getTotalAmountForIOUReportPreviewButton} from '@libs/MoneyRequestReportU
import Navigation from '@libs/Navigation/Navigation';
import Parser from '@libs/Parser';
import Performance from '@libs/Performance';
import {getConnectedIntegration} from '@libs/PolicyUtils';
import {getValidConnectedIntegration} from '@libs/PolicyUtils';
import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
import {getReportActionText} from '@libs/ReportActionsUtils';
import getReportPreviewAction from '@libs/ReportPreviewActionUtils';
Expand Down Expand Up @@ -459,7 +459,7 @@ function ReportPreview({
/*
* Manual export
*/
const connectedIntegration = getConnectedIntegration(policy);
const connectedIntegration = getValidConnectedIntegration(policy);

useEffect(() => {
if (!isPaidAnimationRunning || isApprovedAnimationRunning) {
Expand Down
9 changes: 8 additions & 1 deletion src/libs/PolicyUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import type {
import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
import type {SearchPolicy} from '@src/types/onyx/SearchResults';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import {hasSynchronizationErrorMessage} from './actions/connections';
import {hasSynchronizationErrorMessage, isAuthenticationError} from './actions/connections';
import {shouldShowQBOReimbursableExportDestinationAccountError} from './actions/connections/QuickbooksOnline';
import {getCurrentUserAccountID, getCurrentUserEmail} from './actions/Report';
import {getCategoryApproverRule} from './CategoryUtils';
Expand Down Expand Up @@ -1156,6 +1156,12 @@ function getConnectedIntegration(policy: Policy | undefined, accountingIntegrati
return (accountingIntegrations ?? Object.values(CONST.POLICY.CONNECTIONS.NAME)).find((integration) => !!policy?.connections?.[integration]);
}

function getValidConnectedIntegration(policy: Policy | undefined, accountingIntegrations?: ConnectionName[]) {
return (accountingIntegrations ?? Object.values(CONST.POLICY.CONNECTIONS.NAME)).find(
(integration) => !!policy?.connections?.[integration] && !isAuthenticationError(policy, integration),
);
}

function hasIntegrationAutoSync(policy: Policy | undefined, connectedIntegration?: ConnectionName) {
return (connectedIntegration && policy?.connections?.[connectedIntegration]?.config?.autoSync?.enabled) ?? false;
}
Expand Down Expand Up @@ -1409,6 +1415,7 @@ export {
getAdminEmployees,
getCleanedTagName,
getConnectedIntegration,
getValidConnectedIntegration,
getCountOfEnabledTagsOfList,
getIneligibleInvitees,
getMemberAccountIDsForWorkspace,
Expand Down
8 changes: 3 additions & 5 deletions src/libs/ReportPreviewActionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ import {isApprover as isApproverMember} from './actions/Policy/Member';
import {getCurrentUserAccountID} from './actions/Report';
import {
arePaymentsEnabled,
getConnectedIntegration,
getCorrectedAutoReportingFrequency,
getSubmitToAccountID,
hasAccountingConnections,
getValidConnectedIntegration,
hasIntegrationAutoSync,
isPolicyAdmin,
isPreferredExporter,
Expand Down Expand Up @@ -142,13 +141,12 @@ function canExport(report: Report, violations: OnyxCollection<TransactionViolati
const isReimbursed = isSettled(report);
const isClosed = isClosedReport(report);
const isApproved = isReportApproved({report});
const hasAccountingConnection = hasAccountingConnections(policy);
const connectedIntegration = getConnectedIntegration(policy);
const connectedIntegration = getValidConnectedIntegration(policy);
const syncEnabled = hasIntegrationAutoSync(policy, connectedIntegration);
const hasAnyViolations =
hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);

if (!hasAccountingConnection || !isExpense || !isExporter) {
if (!connectedIntegration || !isExpense || !isExporter) {
return false;
}

Expand Down
8 changes: 3 additions & 5 deletions src/libs/ReportPrimaryActionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ import {isApprover as isApproverUtils} from './actions/Policy/Member';
import {getCurrentUserAccountID} from './actions/Report';
import {
arePaymentsEnabled as arePaymentsEnabledUtils,
getConnectedIntegration,
getCorrectedAutoReportingFrequency,
getSubmitToAccountID,
hasAccountingConnections,
getValidConnectedIntegration,
hasIntegrationAutoSync,
isPreferredExporter,
} from './PolicyUtils';
Expand Down Expand Up @@ -164,8 +163,8 @@ function isExportAction(report: Report, policy?: Policy, reportActions?: ReportA
return false;
}

const hasAccountingConnection = hasAccountingConnections(policy);
if (!hasAccountingConnection) {
const connectedIntegration = getValidConnectedIntegration(policy);
if (!connectedIntegration) {
return false;
}

Expand All @@ -174,7 +173,6 @@ function isExportAction(report: Report, policy?: Policy, reportActions?: ReportA
return false;
}

const connectedIntegration = getConnectedIntegration(policy);
const syncEnabled = hasIntegrationAutoSync(policy, connectedIntegration);
const isExported = isExportedUtil(reportActions);
if (isExported) {
Expand Down