Skip to content

PM-5043: Restore locked challenge fee fallback #1872

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

Open
jmgasper wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

PM-5043: Restore locked challenge fee fallback #1872

Show file tree
Hide file tree
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
27 changes: 27 additions & 0 deletions ...ork/src/lib/components/BillingAccountLineItemsModal/BillingAccountLineItemsModal.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,33 @@ describe('BillingAccountLineItemsModal', () => {
.toBeNull()
})

it('uses billing-account markup for locked challenge fees when challenge markup cannot be loaded', () => {
mockedFetchChallenge.mockRejectedValueOnce(new Error('Forbidden'))

renderModal({
...baseBillingAccountDetails,
lockedAmounts: [
{
amount: '28.6',
date: '2026-05-12T00:00:00.000Z',
externalId: '5fdf48d2-811f-4914-b713-9e5f423c907d',
externalName: 'Copilot and Admin with reviews',
externalType: 'CHALLENGE',
},
],
lockedBudget: 28.6,
markup: 0.33,
totalBudgetRemaining: 971.4,
})

expect(screen.getAllByText('$28.60'))
.toHaveLength(2)
expect(screen.getByText('$9.44'))
.toBeTruthy()
expect(screen.queryByText('-'))
.toBeNull()
})

it('removes challenge markup once from consumed challenge charges before showing member payments', async () => {
renderModal({
...baseBillingAccountDetails,
Expand Down
8 changes: 5 additions & 3 deletions ...pps/work/src/lib/components/BillingAccountLineItemsModal/BillingAccountLineItemsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,11 @@ async function fetchChallengeDetailsById(
* @param item Billing-account line item being displayed.
* @param billingAccountDetails Billing account detail payload.
* @param challengeDetailsById Hydrated challenge details, or `undefined` while loading.
* @returns Challenge-specific markup, billing-account fallback for legacy
* rows, or `undefined` when the challenge row is still being hydrated.
* @returns Challenge-specific markup when available, otherwise the billing-account markup fallback.
* @remarks Canonical challenge rows use challenge billing markup so `0` markup
* challenges do not inherit the billing account default fee.
* challenges do not inherit the billing account default fee once hydrated. The
* billing-account fallback keeps locked rows from showing a blank fee when
* challenge hydration is unavailable.
*/
function getLineItemChallengeMarkup(
item: BillingAccountLineItem,
Expand All @@ -291,6 +292,7 @@ function getLineItemChallengeMarkup(
}

return challengeDetailsById?.get(challengeId)?.billing?.markup
?? billingAccountDetails.markup
}

/**
Expand Down
Loading