Skip to content

[PROD RELEASE] - BAs & Fixes #1793

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

Merged
kkartunov merged 2 commits into from
Apr 30, 2026
Merged

[PROD RELEASE] - BAs & Fixes #1793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
514bb7b
Merge pull request #1792 from topcoder-platform/master
jmgasper Apr 29, 2026
a41685a
Fix merge issue
jmgasper Apr 29, 2026
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
24 changes: 14 additions & 10 deletions ...components/ProjectBillingAccountExpiredNotice/ProjectBillingAccountExpiredNotice.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,20 @@ describe('ProjectBillingAccountExpiredNotice', () => {
})

it('hides billing account budget and line-item details while billing details are disabled', () => {
render(
<MemoryRouter>
<ProjectBillingAccountExpiredNotice
billingAccountId={80001063}
billingAccountName='Test Project Engagement BA'
canManageProject
projectId='project-1'
/>
</MemoryRouter>,
)
renderNotice()

expect(screen.getByText(/Billing account:/))
.toBeTruthy()
expect(screen.queryByText('$1,025 / $1,000 spent'))
.toBeNull()
expect(screen.queryByRole('button', {
name: 'View billing account details',
}))
.toBeNull()
expect(screen.queryByRole('dialog'))
.toBeNull()
})

it('keeps billing account details and line items available when remaining funds are insufficient', () => {
renderNotice()

Expand Down
120 changes: 27 additions & 93 deletions .../lib/components/ProjectBillingAccountExpiredNotice/ProjectBillingAccountExpiredNotice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
BILLING_ACCOUNT_BUDGET_DISPLAY_ENABLED,
BILLING_ACCOUNT_DETAILS_MODAL_ENABLED,
} from '../../constants'
import {
WorkAppContext,
} from '../../contexts/WorkAppContext'
import {
Expand Down Expand Up @@ -51,20 +52,15 @@ interface ProjectBillingAccountExpiredNoticeProps {
projectId: string
}

type BudgetStatus = 'healthy' | 'warning' | 'critical'
type BillingAccountIssue = ReturnType<typeof getProjectBillingAccountChallengeIssue>

interface BillingBudgetInfo {
spent: number
status: BudgetStatus
totalBudget: number
}

interface BillingAccountDetailsContentProps {
billingAccountId: string
billingAccountName: string | undefined
budgetInfo: BillingBudgetInfo | undefined
budgetDisplayContent: JSX.Element | undefined
budgetInfo: BillingAccountBudgetInfo | undefined
onOpenModal: () => void
showDetailsButton: boolean
}

interface RenderBillingAccountContentParams {
Expand Down Expand Up @@ -218,30 +214,6 @@ function getVisibleBillingAccountIssue(
: billingAccountIssue
}

/**
* Builds the optional spent/total budget display model from fetched billing details.
*
* @param billingAccountDetails Billing account details returned by the work app hook.
* @returns Spent, total, and status information, or `undefined` while hidden or unavailable.
*/
function getBillingAccountBudgetInfo(
billingAccountDetails: BillingAccountDetails | undefined,
): BillingBudgetInfo | undefined {
if (!BILLING_ACCOUNT_BUDGET_DISPLAY_ENABLED || !billingAccountDetails) {
return undefined
}

const totalBudget = Number(billingAccountDetails.budget) || 0
const remaining = Number(billingAccountDetails.totalBudgetRemaining) || 0
const status = getBudgetStatus(remaining, totalBudget)

return {
spent: Math.max(totalBudget - remaining, 0),
status,
totalBudget,
}
}

/**
* Renders the visible billing account label plus optional budget and details controls.
*
Expand All @@ -251,10 +223,7 @@ function getBillingAccountBudgetInfo(
const BillingAccountDetailsContent: FC<BillingAccountDetailsContentProps> = (
props: BillingAccountDetailsContentProps,
) => {
const budgetStatusClass = props.budgetInfo
? styles[`budget${props.budgetInfo.status.charAt(0)
.toUpperCase()}${props.budgetInfo.status.slice(1)}`]
: ''
const budgetStatusClass = getBudgetStatusClass(props.budgetInfo)

return (
<div className={styles.details}>
Expand All @@ -270,14 +239,11 @@ const BillingAccountDetailsContent: FC<BillingAccountDetailsContentProps> = (
{props.budgetInfo
? (
<span className={`${styles.budgetDisplay} ${budgetStatusClass}`}>
{formatCurrency(props.budgetInfo.spent)}
{' / '}
{formatCurrency(props.budgetInfo.totalBudget)}
{' spent'}
{props.budgetDisplayContent}
</span>
)
: undefined}
{BILLING_ACCOUNT_DETAILS_MODAL_ENABLED
{props.showDetailsButton
? (
<button
aria-label='View billing account details'
Expand All @@ -299,12 +265,16 @@ const BillingAccountDetailsContent: FC<BillingAccountDetailsContentProps> = (
* @param billingAccountDetails Billing account detail payload, if loaded.
* @param isModalOpen Whether the details modal has been requested.
* @param onClose Close handler passed to the modal.
* @param projectId Project id used to build project-scoped line-item links.
* @param showMemberPaymentsRemaining Whether the modal should hide markup and show copilot-safe payment values.
* @returns The line-item modal, or `undefined` when the feature is hidden.
*/
function renderBillingAccountModal(
billingAccountDetails: BillingAccountDetails | undefined,
isModalOpen: boolean,
onClose: () => void,
projectId: string,
showMemberPaymentsRemaining: boolean,
): JSX.Element | undefined {
if (!BILLING_ACCOUNT_DETAILS_MODAL_ENABLED || !isModalOpen || !billingAccountDetails) {
return undefined
Expand All @@ -314,6 +284,8 @@ function renderBillingAccountModal(
<BillingAccountLineItemsModal
billingAccountDetails={billingAccountDetails}
onClose={onClose}
projectId={projectId}
showMemberPaymentsRemaining={showMemberPaymentsRemaining}
/>
)
}
Expand Down Expand Up @@ -384,9 +356,11 @@ export const ProjectBillingAccountExpiredNotice: FC<ProjectBillingAccountExpired
const billingAccount = projectBillingAccountResult.billingAccount
const normalizedBillingAccountId = normalizeOptionalString(props.billingAccountId)
|| normalizeOptionalString(billingAccount?.id)
const shouldFetchBillingAccountDetails = (BILLING_ACCOUNT_BUDGET_DISPLAY_ENABLED && showPaymentDetails)
|| showMemberPaymentsRemaining
|| (BILLING_ACCOUNT_DETAILS_MODAL_ENABLED && isModalOpen && showPaymentDetails)
const billingAccountDetailsResult: UseFetchBillingAccountDetailsResult = useFetchBillingAccountDetails(
BILLING_ACCOUNT_BUDGET_DISPLAY_ENABLED || BILLING_ACCOUNT_DETAILS_MODAL_ENABLED
showPaymentDetails
shouldFetchBillingAccountDetails
? normalizedBillingAccountId
: undefined,
)
Expand Down Expand Up @@ -419,14 +393,8 @@ export const ProjectBillingAccountExpiredNotice: FC<ProjectBillingAccountExpired
getProjectBillingAccountChallengeIssue(billingAccount),
)

const budgetInfo = useMemo(
() => getBillingAccountBudgetInfo(billingAccountDetailsData),
[billingAccountDetailsData],
)
const billingAccountIssue = getProjectBillingAccountChallengeIssue(billingAccount)

const standardBudgetInfo = useMemo(() => {
if (!billingAccountDetailsData) {
if (!BILLING_ACCOUNT_BUDGET_DISPLAY_ENABLED || !billingAccountDetailsData) {
return undefined
}

Expand All @@ -443,6 +411,11 @@ export const ProjectBillingAccountExpiredNotice: FC<ProjectBillingAccountExpired
showPaymentDetails,
standardBudgetInfo,
})
const budgetDisplayContent = renderBudgetDisplayContent(
budgetInfo,
copilotBudgetInfo,
showMemberPaymentsRemaining,
)

const handleOpenModal = useCallback((): void => {
setIsModalOpen(true)
Expand All @@ -457,58 +430,19 @@ export const ProjectBillingAccountExpiredNotice: FC<ProjectBillingAccountExpired
<BillingAccountDetailsContent
billingAccountId={normalizedBillingAccountId}
billingAccountName={billingAccountName}
budgetDisplayContent={budgetDisplayContent}
budgetInfo={budgetInfo}
onOpenModal={handleOpenModal}
const budgetStatusClass = getBudgetStatusClass(budgetInfo)
const budgetDisplayContent = renderBudgetDisplayContent(
budgetInfo,
copilotBudgetInfo,
showMemberPaymentsRemaining,
)
const billingAccountDetailsContent = normalizedBillingAccountId
? (
<div className={styles.details}>
<span>
Billing account:
{' '}
{billingAccountName || 'Unknown'}
{' '}
/
{' '}
{normalizedBillingAccountId}
</span>
{budgetInfo && (
<>
<span className={`${styles.budgetDisplay} ${budgetStatusClass}`}>
{budgetDisplayContent}
</span>
<button
aria-label='View billing account details'
className={styles.infoButton}
onClick={handleOpenModal}
type='button'
>
<IconOutline.InformationCircleIcon className={styles.infoIcon} />
</button>
</>
)}
</div>
)
: undefined
const billingAccountModal = isModalOpen && billingAccountDetailsData
? (
<BillingAccountLineItemsModal
billingAccountDetails={billingAccountDetailsData}
onClose={handleCloseModal}
projectId={props.projectId}
showMemberPaymentsRemaining={showMemberPaymentsRemaining}
showDetailsButton={BILLING_ACCOUNT_DETAILS_MODAL_ENABLED && showPaymentDetails}
/>
)
: undefined
const billingAccountModal = renderBillingAccountModal(
billingAccountDetailsData,
isModalOpen,
handleCloseModal,
props.projectId,
showMemberPaymentsRemaining,
)

return renderBillingAccountContent({
Expand Down
Loading
Loading