Skip to content

Fix next step showing 'an admin' instead of 'you' after approval #81998

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

Closed
MobileMage wants to merge 1 commit into from
Closed

Fix next step showing 'an admin' instead of 'you' after approval #81998

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 3 additions & 13 deletions src/components/MoneyReportHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,10 +539,6 @@ function MoneyReportHeader({
optimisticNextStep = buildOptimisticNextStepForStrictPolicyRuleViolations();
}

// Check if we have a local optimistic override (e.g., error states, offline submission)
// When there's an override, we should NOT use the new translated format as the override takes precedence
const hasOptimisticOverride = optimisticNextStep !== nextStep;

const shouldShowNextStep = isFromPaidPolicy && !isInvoiceReport && !shouldShowStatusBar;
const {nonHeldAmount, fullAmount, hasValidNonHeldAmount} = getNonHeldAndFullAmount(moneyRequestReport, shouldShowPayButton);
const isAnyTransactionOnHold = hasHeldExpensesReportUtils(moneyRequestReport?.reportID);
Expand Down Expand Up @@ -1752,14 +1748,8 @@ function MoneyReportHeader({
betas,
});

const effectiveNextStep = hasOptimisticOverride ? optimisticNextStep : (moneyRequestReport?.nextStep ?? optimisticNextStep);
const hasNextStepContent = !!(
effectiveNextStep &&
(('message' in effectiveNextStep && Array.isArray(effectiveNextStep.message) && effectiveNextStep.message.length > 0) ||
('messageKey' in effectiveNextStep && effectiveNextStep.messageKey))
);
const showNextStepBar = shouldShowNextStep && hasNextStepContent;
const showNextStepSkeleton = shouldShowNextStep && !effectiveNextStep && !!isLoadingInitialReportActions && !isOffline;
const showNextStepBar = shouldShowNextStep && !!(optimisticNextStep?.message?.length ?? (optimisticNextStep && 'messageKey' in optimisticNextStep));
const showNextStepSkeleton = shouldShowNextStep && !optimisticNextStep && !!isLoadingInitialReportActions && !isOffline;
const shouldShowMoreContent = showNextStepBar || showNextStepSkeleton || !!statusBarProps || isReportInSearch;

return (
Expand Down Expand Up @@ -1836,7 +1826,7 @@ function MoneyReportHeader({
{shouldShowMoreContent && (
<View style={[styles.flexRow, styles.gap2, styles.justifyContentStart, styles.flexNoWrap, styles.ph5, styles.pb3]}>
<View style={[styles.flexShrink1, styles.flexGrow1, styles.mnw0, styles.flexWrap, styles.justifyContentCenter]}>
{showNextStepBar && <MoneyReportHeaderStatusBar nextStep={effectiveNextStep} />}
{showNextStepBar && <MoneyReportHeaderStatusBar nextStep={optimisticNextStep} />}
{showNextStepSkeleton && <MoneyReportHeaderStatusBarSkeleton />}
{!!statusBarProps && (
<MoneyRequestHeaderStatusBar
Expand Down
Loading