feat(billing): make the expired-trial state visible with a clear upgrade path (#1725)
getCompanyEntitlements now derives an entitlementState (trial / trial_expired / lapsed_subscription / paid / none) plus trialExpiredAt from the grants it already fetches, reading company_subscriptions.status inside the existing Promise.all so churned payers get 'abonnemang' copy instead of 'provperiod'. The state threads through CompanyContext and the dashboard layout. Two new surfaces, both hidden in sandbox: - SubscriptionTouchpoint replaces the sidebar trial pill: countdown while the trial runs, a persistent muted upgrade link to /settings/billing once it lapses (visible even collapsed, icon-only with aria-label), and the first mobile bottom-sheet touchpoint. - TrialExpiredDialog: one-time on-entry notice with 'Se abonnemang' and a ghost dismiss; acknowledgement persists per user+company in user_preferences.ui_state.trial_expired_ack (read server-side, no flash), set on dismiss and click-through alike. Narrows the 2026-07-11 'no trial-expired nag' decision at the founder's direction after a user could not find the upgrade path at all; see DECISIONS.md. Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Jakob Wennberg
Claude Fable 5
parent
834cc4d0e8
commit
c402421908
@@ -0,0 +1,92 @@
|
||||
'use client'
|
||||
|
||||
import { useState } from 'react'
|
||||
import { usePathname, useRouter } from 'next/navigation'
|
||||
import { useTranslations } from 'next-intl'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from '@/components/ui/dialog'
|
||||
import { persistUiState } from '@/lib/ui-state/client'
|
||||
import { useFormat } from '@/lib/hooks/use-format'
|
||||
import type { EntitlementState } from '@/lib/entitlements/has-capability'
|
||||
|
||||
/**
|
||||
* One-time on-entry notice that the trial (or a cancelled subscription) has
|
||||
* lapsed, with the path to Abonnemang. Shown once per user AND company:
|
||||
* the acknowledgement persists in user_preferences.ui_state
|
||||
* (trial_expired_ack[companyId]), read server-side by the dashboard layout so
|
||||
* an acked dialog never mounts (no flash). Both dismissing and clicking
|
||||
* through count as acknowledged; afterwards the persistent
|
||||
* SubscriptionTouchpoint in the chrome carries the CTA. The layout gates
|
||||
* sandbox/anonymous users (no billing); this component additionally skips
|
||||
* /settings/* so it never stacks on the routed settings modal.
|
||||
*/
|
||||
export function TrialExpiredDialog({
|
||||
state,
|
||||
trialExpiredAt,
|
||||
companyId,
|
||||
initialAcknowledged,
|
||||
}: {
|
||||
state: EntitlementState
|
||||
trialExpiredAt: string | null
|
||||
companyId: string
|
||||
initialAcknowledged: boolean
|
||||
}) {
|
||||
const t = useTranslations('trial_expired_dialog')
|
||||
const { formatDateLong } = useFormat()
|
||||
const router = useRouter()
|
||||
const pathname = usePathname()
|
||||
const [open, setOpen] = useState(true)
|
||||
|
||||
const lapsed = state === 'trial_expired' || state === 'lapsed_subscription'
|
||||
if (!lapsed || initialAcknowledged || pathname.startsWith('/settings')) {
|
||||
return null
|
||||
}
|
||||
|
||||
const acknowledge = () => {
|
||||
setOpen(false)
|
||||
persistUiState({
|
||||
trial_expired_ack: { [companyId]: new Date().toISOString() },
|
||||
})
|
||||
}
|
||||
|
||||
const goToBilling = () => {
|
||||
acknowledge()
|
||||
router.push('/settings/billing')
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={(next) => { if (!next) acknowledge() }}>
|
||||
<DialogContent className="max-w-md">
|
||||
<DialogHeader>
|
||||
<DialogTitle className="font-display text-xl tracking-tight">
|
||||
{state === 'lapsed_subscription'
|
||||
? t('title_lapsed')
|
||||
: trialExpiredAt
|
||||
? t('title_dated', { date: formatDateLong(trialExpiredAt) })
|
||||
: t('title')}
|
||||
</DialogTitle>
|
||||
<DialogDescription className="sr-only">{t('body_paused')}</DialogDescription>
|
||||
</DialogHeader>
|
||||
<div className="space-y-3 text-sm text-muted-foreground">
|
||||
<p>{t('body_paused')}</p>
|
||||
<p>{t('body_free')}</p>
|
||||
</div>
|
||||
<DialogFooter>
|
||||
<Button variant="ghost" onClick={acknowledge}>
|
||||
{t('cta_secondary')}
|
||||
</Button>
|
||||
<Button onClick={goToBilling}>{t('cta_primary')}</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
|
||||
export default TrialExpiredDialog
|
||||
Reference in New Issue
Block a user