Skip to content

Commit c8f68c5

Browse files
asizikovasizikov
authored
Merge pull request #113 from github/asizikov/update-discount-copy
Update existing discount disclaimer copy
2 parents 02f92f0 + 9adf3bd commit c8f68c5

11 files changed

Lines changed: 40 additions & 40 deletions

‎src/components/ui/AicNetCostInfoTip.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { InfoTip } from '../InfoTip'
22

3-
const AIC_NET_COST_INFO = 'All values are provided without any additional negotiated discounts applied.'
3+
const AIC_NET_COST_INFO = 'All values are provided without any existing discounts.'
44

55
export function AicNetCostInfoTip() {
66
return (

‎src/components/ui/BillingTotalsCards.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { appLinks } from '../../config/links'
22
import type { IndividualPlanUpgradeRecommendation } from '../../utils/individualPlanUpgrade'
33
import { formatAic, formatUsd } from '../../utils/format'
4-
import { NegotiatedDiscountDisclaimer } from './NegotiatedDiscountDisclaimer'
4+
import { ExistingDiscountDisclaimer } from './ExistingDiscountDisclaimer'
55
import { PromotionalDataDisclaimer } from './PromotionalDataDisclaimer'
66

77
export type BillingTotalsCardsProps = {
@@ -18,7 +18,7 @@ export type BillingTotalsCardsProps = {
1818
business: number
1919
enterprise: number
2020
}
21-
showNegotiatedDiscountDisclaimer?: boolean
21+
showExistingDiscountDisclaimer?: boolean
2222
showPromotionalDataDisclaimer?: boolean
2323
upgradeRecommendation?: IndividualPlanUpgradeRecommendation | null
2424
className?: string
@@ -35,7 +35,7 @@ export function BillingTotalsCards({
3535
aicQuantity,
3636
licenseAmount,
3737
licenseSeatCounts,
38-
showNegotiatedDiscountDisclaimer = false,
38+
showExistingDiscountDisclaimer = false,
3939
showPromotionalDataDisclaimer = false,
4040
upgradeRecommendation = null,
4141
className = '',
@@ -89,15 +89,15 @@ export function BillingTotalsCards({
8989
<span>{formatUsd(licenseAmount)}</span>
9090
</div>
9191
)}
92-
{(licenseAmount !== undefined || showNegotiatedDiscountDisclaimer) && (
92+
{(licenseAmount !== undefined || showExistingDiscountDisclaimer) && (
9393
<div className="pt-[6px] border-t border-border-default">
9494
{licenseAmount !== undefined && (
9595
<div className="flex justify-between items-center text-[13px] text-fg-default tabular-nums font-semibold">
9696
<span>Total (license + overages)</span>
9797
<span>{formatUsd(pruTotalAmount)}</span>
9898
</div>
9999
)}
100-
{showNegotiatedDiscountDisclaimer && <NegotiatedDiscountDisclaimer />}
100+
{showExistingDiscountDisclaimer && <ExistingDiscountDisclaimer />}
101101
</div>
102102
)}
103103
</div>
@@ -128,17 +128,17 @@ export function BillingTotalsCards({
128128
<span>{formatUsd(licenseAmount)}</span>
129129
</div>
130130
)}
131-
{(licenseAmount !== undefined || showNegotiatedDiscountDisclaimer || showPromotionalDataDisclaimer) && (
131+
{(licenseAmount !== undefined || showExistingDiscountDisclaimer || showPromotionalDataDisclaimer) && (
132132
<div className="pt-[6px] border-t border-border-default">
133133
{licenseAmount !== undefined && (
134134
<div className="flex justify-between items-center text-[13px] text-fg-default tabular-nums font-semibold">
135135
<span>Total (license + additional usage)</span>
136136
<span>{formatUsd(aicTotalAmount)}</span>
137137
</div>
138138
)}
139-
{showNegotiatedDiscountDisclaimer && (
139+
{showExistingDiscountDisclaimer && (
140140
<>
141-
<NegotiatedDiscountDisclaimer />
141+
<ExistingDiscountDisclaimer />
142142
<PromotionalDataDisclaimer scope="organization" />
143143
</>
144144
)}

‎src/components/ui/ExistingDiscountDisclaimer.tsx‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
export const EXISTING_DISCOUNT_DISCLAIMER = 'All values are provided without any existing discounts.'
2+
3+
type ExistingDiscountDisclaimerProps = {
4+
className?: string
5+
}
6+
7+
export function ExistingDiscountDisclaimer({ className = '' }: ExistingDiscountDisclaimerProps) {
8+
return (
9+
<p className={`m-0 mt-1 text-[12px] text-fg-muted leading-normal ${className}`.trim()}>
10+
{EXISTING_DISCOUNT_DISCLAIMER}
11+
</p>
12+
)
13+
}

‎src/components/ui/NegotiatedDiscountDisclaimer.tsx‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/components/ui/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ export { BillingTotalsCards } from './BillingTotalsCards'
88
export type { BillingTotalsCardsProps } from './BillingTotalsCards'
99
export { BillingProjectionDisclaimer } from './BillingProjectionDisclaimer'
1010
export { AicNetCostInfoTip } from './AicNetCostInfoTip'
11-
export { NegotiatedDiscountDisclaimer, NEGOTIATED_DISCOUNT_DISCLAIMER } from './NegotiatedDiscountDisclaimer'
11+
export { ExistingDiscountDisclaimer, EXISTING_DISCOUNT_DISCLAIMER } from './ExistingDiscountDisclaimer'
1212
export { PromotionalDataDisclaimer } from './PromotionalDataDisclaimer'

‎src/views/CostCentersView.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useCallback, useMemo, useState } from 'react'
22
import type { ChangeEvent } from 'react'
3-
import { BillingProjectionDisclaimer, NegotiatedDiscountDisclaimer } from '../components/ui'
3+
import { BillingProjectionDisclaimer, ExistingDiscountDisclaimer } from '../components/ui'
44
import { th, thNum, td, tdNum } from '../components/ui/tableStyles'
55
import { appLinks } from '../config/links'
66
import type { CostCenterResult, CostCenterUserTotals, CostTotals } from '../pipeline/aggregators/costCenterAggregator'
@@ -145,7 +145,7 @@ export function CostCentersView({ data, rangeStart }: { data: CostCenterResult;
145145
<span>Overages</span>
146146
<span>{formatUsd(totals.netAmount)}</span>
147147
</div>
148-
<NegotiatedDiscountDisclaimer />
148+
<ExistingDiscountDisclaimer />
149149
</div>
150150
</div>
151151
<div className="bg-bg-default border border-border-default rounded-md text-center py-7 px-5">
@@ -166,7 +166,7 @@ export function CostCentersView({ data, rangeStart }: { data: CostCenterResult;
166166
<span>Additional usage</span>
167167
<span>{formatUsd(totals.aicNetAmount)}</span>
168168
</div>
169-
<NegotiatedDiscountDisclaimer />
169+
<ExistingDiscountDisclaimer />
170170
</div>
171171
</div>
172172
</div>

‎src/views/CostManagementView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ export function CostManagementView({
231231
aicQuantity={currentAicQuantity}
232232
licenseAmount={licenseAmount}
233233
licenseSeatCounts={licenseSeatCounts}
234-
showNegotiatedDiscountDisclaimer={!isIndividualReport}
234+
showExistingDiscountDisclaimer={!isIndividualReport}
235235
showPromotionalDataDisclaimer={isIndividualReport}
236236
upgradeRecommendation={upgradeRecommendation}
237237
/>

‎src/views/ModelsView.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useState, useMemo } from 'react'
22
import { InfoIcon } from '@primer/octicons-react'
33
import type { ModelUsageResult, ModelDailyUsageData, ModelUsageTotals } from '../pipeline/aggregators/modelUsageAggregator'
44
import { DualAxisLineChart, MultiSeriesStackedBarChart } from '../components'
5-
import { BillingProjectionDisclaimer, NegotiatedDiscountDisclaimer, PromotionalDataDisclaimer } from '../components/ui'
5+
import { BillingProjectionDisclaimer, ExistingDiscountDisclaimer, PromotionalDataDisclaimer } from '../components/ui'
66
import { th, thNum, td, tdNum } from '../components/ui/tableStyles'
77
import { calculateAicDiscountAmount, calculateSavingsDifference } from '../utils/billingComparison'
88
import { fillDataForRange } from '../utils/fillDataForRange'
@@ -122,7 +122,7 @@ export function ModelsView({ modelUsage, isIndividualReport, rangeStart, rangeEn
122122
const periodLabel = rangeStart
123123
? new Date(rangeStart + 'T00:00:00').toLocaleString('en-US', { month: 'long', year: 'numeric' })
124124
: null
125-
const showNegotiatedDiscountDisclaimer = !isIndividualReport
125+
const showExistingDiscountDisclaimer = !isIndividualReport
126126

127127
return (
128128
<section className="flex flex-col gap-3" aria-label="Models">
@@ -220,7 +220,7 @@ export function ModelsView({ modelUsage, isIndividualReport, rangeStart, rangeEn
220220
<span>Overages</span>
221221
<span>{formatUsd(selectedModelTotals.netAmount)}</span>
222222
</div>
223-
{showNegotiatedDiscountDisclaimer && <NegotiatedDiscountDisclaimer />}
223+
{showExistingDiscountDisclaimer && <ExistingDiscountDisclaimer />}
224224
</div>
225225
</div>
226226
<div className="bg-bg-default border border-border-default rounded-md px-5 py-4 text-center py-7">
@@ -241,7 +241,7 @@ export function ModelsView({ modelUsage, isIndividualReport, rangeStart, rangeEn
241241
<span>Additional usage</span>
242242
<span>{formatUsd(selectedModelAicNetAmount)}</span>
243243
</div>
244-
{showNegotiatedDiscountDisclaimer ? <NegotiatedDiscountDisclaimer /> : <PromotionalDataDisclaimer />}
244+
{showExistingDiscountDisclaimer ? <ExistingDiscountDisclaimer /> : <PromotionalDataDisclaimer />}
245245
</div>
246246
</div>
247247
</div>

‎src/views/OrganizationsView.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useCallback, useMemo, useState } from 'react'
22
import type { ChangeEvent } from 'react'
3-
import { BillingProjectionDisclaimer, NegotiatedDiscountDisclaimer } from '../components/ui'
3+
import { BillingProjectionDisclaimer, ExistingDiscountDisclaimer } from '../components/ui'
44
import { th, thNum, td, tdNum } from '../components/ui/tableStyles'
55
import { appLinks } from '../config/links'
66
import type { OrganizationResult, OrgTotals, OrgUserTotals } from '../pipeline/aggregators/organizationAggregator'
@@ -144,7 +144,7 @@ export function OrganizationsView({ data, rangeStart }: { data: OrganizationResu
144144
<span>Overages</span>
145145
<span>{formatUsd(totals.netAmount)}</span>
146146
</div>
147-
<NegotiatedDiscountDisclaimer />
147+
<ExistingDiscountDisclaimer />
148148
</div>
149149
</div>
150150
<div className="bg-bg-default border border-border-default rounded-md text-center py-7 px-5">
@@ -165,7 +165,7 @@ export function OrganizationsView({ data, rangeStart }: { data: OrganizationResu
165165
<span>Additional usage</span>
166166
<span>{formatUsd(totals.aicNetAmount)}</span>
167167
</div>
168-
<NegotiatedDiscountDisclaimer />
168+
<ExistingDiscountDisclaimer />
169169
</div>
170170
</div>
171171
</div>

‎src/views/OverviewView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export function OverviewView({
135135
aicQuantity={overviewTotals.aicQuantity}
136136
licenseAmount={licenseAmount}
137137
licenseSeatCounts={licenseSeatCounts}
138-
showNegotiatedDiscountDisclaimer={reportPlanScope !== 'individual'}
138+
showExistingDiscountDisclaimer={reportPlanScope !== 'individual'}
139139
showPromotionalDataDisclaimer={reportPlanScope === 'individual'}
140140
upgradeRecommendation={upgradeRecommendation}
141141
className="mb-3"

0 commit comments

Comments
 (0)