diff --git a/components/work/AwardProposalCard.tsx b/components/work/AwardProposalCard.tsx index 01e3c9471..48735cbd5 100644 --- a/components/work/AwardProposalCard.tsx +++ b/components/work/AwardProposalCard.tsx @@ -75,7 +75,6 @@ export function AwardProposalCard({ grantOpen, fundraise, }); - const funder = linkedGrant.organization.trim(); const headline = phase === 'none' ? formatCurrency({ @@ -108,12 +107,7 @@ export function AwardProposalCard({ key: 'awarded', label: 'Awarded', date: awardedDate, - // Only a named funder says anything the step doesn't already. - detail: awarded - ? funder && `From ${funder}` - : stillOpen - ? funder && `${funder} picks who wins the prize once results are posted.` - : 'The prize has closed', + detail: !awarded && !stillOpen ? 'The prize has closed' : undefined, done: awarded, disabled: !awarded && !stillOpen, }, diff --git a/components/work/LinkedRfpCard.tsx b/components/work/LinkedRfpCard.tsx index f5116b4f3..fb9d67dc3 100644 --- a/components/work/LinkedRfpCard.tsx +++ b/components/work/LinkedRfpCard.tsx @@ -6,62 +6,27 @@ import { DocumentThumbnail } from '@/components/Funding/dashboard/DocumentThumbn import { isAwardMechanism } from '@/components/Funding/lib/fundingMechanism'; import { SidebarCard } from '@/components/ui/SidebarCard'; import { getLinkedGrantLink } from '@/components/work/lib/linkedGrant'; -import { useCurrencyPreference } from '@/contexts/CurrencyPreferenceContext'; -import { useExchangeRate } from '@/contexts/ExchangeRateContext'; import type { Work } from '@/types/work'; -import { formatCurrencyAmount } from '@/utils/currency'; -import { pluralizeSuffix } from '@/utils/stringUtils'; -import { cn } from '@/utils/styles'; /** * The RFP a proposal answers, in its sidebar under the funding card: the RFP's - * image, name, funder and amount, whether it is still open and how many - * proposals it has. The whole row opens the RFP. + * image, name and funder, kept short on purpose. The whole row opens the RFP. */ export function LinkedRfpCard({ work }: { work: Work }) { - const { showUSD } = useCurrencyPreference(); - const { exchangeRate } = useExchangeRate(); const grant = work.linkedGrant; const { title, href } = getLinkedGrantLink(work); if (!grant || !title) return null; const isPrize = isAwardMechanism(grant.fundingMechanism); - const isOpen = grant.status === 'OPEN'; - const count = grant.applicantCount; - const amount = - grant.fundingAmount > 0 - ? formatCurrencyAmount({ - amount: grant.fundingAmount, - currency: grant.currency === 'USD' ? 'USD' : 'RSC', - showUSD, - exchangeRate, - shorten: true, - }) - : undefined; // The title falls back to the organization, so don't name it twice. const funder = grant.organization.trim() !== title ? grant.organization.trim() : ''; - const byline = [funder, amount].filter(Boolean).join(' · '); const row = ( <> {title} - {byline && {byline}} - - + {funder && {funder}} );