The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
improve confirm modal, plausible props, cancellation ux
Steven Tey78e16c59f1ff
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsxindex 597e4b8427..e456f5b0e7 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx@@ -7,6 +7,7 @@ import usePartnersCount from "@/lib/swr/use-partners-count";import useTagsCount from "@/lib/swr/use-tags-count";import { useUsageTimeseries } from "@/lib/swr/use-usage-timeseries";import useWorkspace from "@/lib/swr/use-workspace";+import { useConfirmModal } from "@/ui/modals/confirm-modal";import useWorkspaceUsers from "@/lib/swr/use-workspace-users";import { useManageUsageModal } from "@/ui/modals/manage-usage-modal";import { useStartPaidPlanModal } from "@/ui/modals/start-paid-plan-modal";@@ -16,7 +17,6 @@ import {Button,DynamicTooltipWrapper,Icon,- Modal,Tooltip,useRouterStuff,} from "@dub/ui";@@ -44,14 +44,12 @@ import {import NumberFlow from "@number-flow/react";import Link from "next/link";import { useRouter } from "next/navigation";-import { CSSProperties, ReactNode, useMemo, useState } from "react";+import { CSSProperties, ReactNode, useMemo } from "react";import { toast } from "sonner";import { UsageChart } from "./usage-chart";export default function PlanUsage() {const router = useRouter();- const [showResubscribeModal, setShowResubscribeModal] = useState(false);- const [resubscribeLoading, setResubscribeLoading] = useState(false);const {id: workspaceId,@@ -184,7 +182,6 @@ export default function PlanUsage() {const showPendingCancellation = pendingCancellationEndDate != null;const confirmResubscribe = async () => {- setResubscribeLoading(true);try {const res = await fetch(`/api/workspaces/${workspaceId}/billing/cancel`, {method: "POST",@@ -194,7 +191,6 @@ export default function PlanUsage() {// sleep for 2 seconds to make sure Stripe webhook was received, and then mutateawait new Promise((resolve) => setTimeout(resolve, 2000));await mutate();- setShowResubscribeModal(false);toast.success("Your subscription will continue as normal.");} else {try {@@ -208,62 +204,40 @@ export default function PlanUsage() {} catch (error) {console.error(error);toast.error("Failed to resume subscription.");- } finally {- setResubscribeLoading(false);}};+ const { setShowConfirmModal: setShowResubscribeModal, confirmModal } =+ useConfirmModal({+ title: "Resume subscription",+ description: (+ <p>+ Your subscription is scheduled to end on{" "}+ <span className="font-medium text-neutral-900">+ {pendingCancellationEndDate+ ? new Date(pendingCancellationEndDate).toLocaleDateString(+ "en-US",+ {+ month: "long",+ day: "numeric",+ year: "numeric",+ },+ )+ : "—"}+ </span>+ . Resuming removes that cancellation and your plan will continue as+ before.+ </p>+ ),+ cancelText: "Not now",+ confirmText: "Resume subscription",+ onConfirm: confirmResubscribe,+ });+return (<><StartPaidPlanModal />- <Modal- showModal={showResubscribeModal}- setShowModal={setShowResubscribeModal}- className="max-w-md"- >- <div className="space-y-2 border-b border-neutral-200 px-4 py-4 sm:px-6">- <h3 className="text-content-emphasis text-lg font-medium">- Resume subscription- </h3>- </div>- <div className="flex flex-col gap-4 px-4 py-6 text-left text-sm text-neutral-600 sm:px-6">- <p>- Your subscription is scheduled to end on{" "}- <span className="font-medium text-neutral-900">- {pendingCancellationEndDate- ? new Date(pendingCancellationEndDate).toLocaleDateString(- "en-US",- {- month: "long",- day: "numeric",- year: "numeric",- },- )- : "—"}- </span>- . Resuming removes that cancellation and your plan will continue as- before.- </p>- </div>- <div className="flex items-center justify-end gap-2 border-t border-neutral-200 px-4 py-4 sm:px-6">- <Button- type="button"- variant="secondary"- text="Not now"- className="h-8 w-fit"- onClick={() => setShowResubscribeModal(false)}- disabled={resubscribeLoading}- />- <Button- type="button"- variant="primary"- text="Resume subscription"- className="h-8 w-fit"- loading={resubscribeLoading}- onClick={() => void confirmResubscribe()}- />- </div>- </Modal>+ {confirmModal}<div className="rounded-xl border border-neutral-200 bg-white">{showPendingCancellation ? (<div className="mx-1 mt-1 flex items-center justify-center rounded-lg bg-amber-100/50 px-3 py-2">diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/success/page-client.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/success/page-client.tsxindex c7c1125b03..06cec7c6e1 100644--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/success/page-client.tsx+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/success/page-client.tsx@@ -38,12 +38,7 @@ export function SuccessPageClient({"name" | "slug" | "logo" | "defaultProgramId">;}) {- const {- plan,- planPeriod,- planTier,- loading: isLoadingWorkspace,- } = useWorkspace();+ const { plan, planPeriod, loading: isLoadingWorkspace } = useWorkspace();const { finish, isLoading, isSuccessful } = useOnboardingProgress();@@ -67,6 +62,7 @@ export function SuccessPageClient({plausible(`Upgraded to ${capitalize(plan)}`);plausible("Upgraded Plan", {props: {+ product: hasProgram ? "Partners" : "Links",plan: capitalize(plan),planPeriod: capitalize(planPeriod),},diff --git a/apps/web/ui/modals/confirm-modal.tsx b/apps/web/ui/modals/confirm-modal.tsxindex 7d21fa973a..1ffaf1181c 100644--- a/apps/web/ui/modals/confirm-modal.tsx+++ b/apps/web/ui/modals/confirm-modal.tsx@@ -3,7 +3,7 @@ import { Dispatch, ReactNode, SetStateAction, useState } from "react";type PromptModelProps = {title: string;- description?: ReactNode;+ description: ReactNode | string;onCancel?: () => void;cancelText?: string;@@ -51,7 +51,11 @@ function ConfirmModal({};return (- <Modal showModal={showConfirmModal} setShowModal={setShowConfirmModal}>+ <Modal+ showModal={showConfirmModal}+ setShowModal={setShowConfirmModal}+ className="max-w-md"+ >{showConfirmModal && confirmShortcut && (<KeyboardShortcutconfirmShortcut={confirmShortcut}@@ -59,19 +63,18 @@ function ConfirmModal({confirmShortcutOptions={confirmShortcutOptions}/>)}- <div className="p-5 text-left">- <h3 className="text-content-emphasis text-base font-semibold">- {title}- </h3>- {description && (- <div className="text-content-subtle mt-1 text-sm">{description}</div>- )}+ <div className="divide-y divide-neutral-200">+ <div className="p-4 sm:px-6">+ <h3 className="text-content-emphasis text-lg font-medium">{title}</h3>+ </div>+ <div className="px-4 py-6 text-sm text-neutral-600 sm:px-6">+ {description}+ </div></div>-- <div className="border-border-subtle flex items-center justify-end gap-2 border-t px-5 py-4">+ <div className="flex items-center justify-end gap-2 border-t border-neutral-200 px-4 py-4 sm:px-6"><Buttonvariant="secondary"- className="h-8 w-fit px-3"+ className="h-8 w-fit"text={cancelText}onClick={() => {onCancel?.();@@ -80,7 +83,7 @@ function ConfirmModal({/><Buttonvariant={confirmVariant}- className="h-8 w-fit px-3"+ className="h-8 w-fit"text={confirmText}loading={isLoading}shortcut={diff --git a/apps/web/ui/workspaces/subscription-menu.tsx b/apps/web/ui/workspaces/subscription-menu.tsxindex ce9b0f744b..a0d5bfc57e 100644--- a/apps/web/ui/workspaces/subscription-menu.tsx+++ b/apps/web/ui/workspaces/subscription-menu.tsx@@ -16,6 +16,7 @@ import { Command } from "cmdk";import { useRouter } from "next/navigation";import { useState } from "react";import { toast } from "sonner";+import { useConfirmModal } from "../modals/confirm-modal";import { usePlanChangeConfirmationModal } from "../modals/plan-change-confirmation-modal";import { ThreeDots } from "../shared/icons";@@ -25,6 +26,7 @@ export default function SubscriptionMenu() {role,plan,defaultProgramId,+ billingCycleEndsAt,subscriptionCanceledAt,mutate,} = useWorkspace();@@ -90,13 +92,42 @@ export default function SubscriptionMenu() {setShowPlanChangeConfirmationModal(false);},});+ const { setShowConfirmModal, confirmModal } = useConfirmModal({+ title: "Cancel subscription",+ description: (+ <p>+ Your subscription will be scheduled for cancellation at the end of your+ current billing period+ {billingCycleEndsAt ? (+ <span className="font-medium text-neutral-900">+ {" "}+ (+ {new Date(billingCycleEndsAt).toLocaleDateString("en-US", {+ month: "long",+ day: "numeric",+ year: "numeric",+ })}+ )+ </span>+ ) : (+ ""+ )}+ . You will keep access until then.+ </p>+ ),+ cancelText: "Not now",+ confirmText: "Cancel subscription",+ onConfirm: async () => {+ await cancelSubscription();+ },+ });const handleCancelSubscription = () => {setIsOpen(false);if (losesPartnerAccess) {setShowPlanChangeConfirmationModal(true);} else {- cancelSubscription();+ setShowConfirmModal(true);}};@@ -107,6 +138,7 @@ export default function SubscriptionMenu() {return (<><PlanChangeConfirmationModal />+ {confirmModal}<PopoveropenPopover={isOpen}setOpenPopover={setIsOpen}diff --git a/apps/web/ui/workspaces/upgrade-plan-button.tsx b/apps/web/ui/workspaces/upgrade-plan-button.tsxindex baed9392ce..442257d454 100644--- a/apps/web/ui/workspaces/upgrade-plan-button.tsx+++ b/apps/web/ui/workspaces/upgrade-plan-button.tsx@@ -42,6 +42,7 @@ export function UpgradePlanButton({} = useWorkspace();const plausible = usePlausible();+ const product = searchParams.get("product");const { isTrialVariant } = useOnboardingTrialVariant();const isTrialActive = isWorkspaceBillingTrialActive(trialEndsAt);@@ -102,6 +103,7 @@ export function UpgradePlanButton({plausible("Opened Checkout", {props: {+ ...(product && { product: capitalize(product) }),plan: capitalize(selectedPlan.name),planPeriod: capitalize(period),},