Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

improve sidebar display

Steven Teyecd522a7f132
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/default-domain-selector.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/default-domain-selector.tsx
index 74cadc659b..a1f000c8f4 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/default-domain-selector.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/default-domain-selector.tsx
@@ -10,18 +10,16 @@ import { ReactNode } from "react";
import { LaterButton } from "../../later-button";
import { useOnboardingProduct } from "../../use-onboarding-product";
import { useOnboardingProgress } from "../../use-onboarding-progress";
-import { useOnboardingTrialVariant } from "../../use-onboarding-trial-variant";
export function DefaultDomainSelector() {
const searchParams = useSearchParams();
- const { isTrialVariant } = useOnboardingTrialVariant();
const workspaceSlug = searchParams.get("workspace");
const product = useOnboardingProduct();
return (
<>
<div className="animate-fade-in mx-auto grid w-full gap-4 sm:max-w-[600px] sm:grid-cols-2">
- {isTrialVariant && (
+ {product === "partners" && (
<DomainOption
step="domain/subdomain"
icon="https://assets.dub.co/icons/gift.webp"
@@ -58,7 +56,7 @@ export function DefaultDomainSelector() {
description="Already have a domain? Connect it to your Dub workspace."
cta="Connect domain"
/>
- {!isTrialVariant && (
+ {product === "links" && (
<DomainOption
step="domain/register"
icon="https://assets.dub.co/icons/gift.webp"
diff --git a/apps/web/ui/layout/sidebar/sidebar-usage.tsx b/apps/web/ui/layout/sidebar/sidebar-usage.tsx
index 9940b94954..c39494a322 100644
--- a/apps/web/ui/layout/sidebar/sidebar-usage.tsx
+++ b/apps/web/ui/layout/sidebar/sidebar-usage.tsx
@@ -7,7 +7,6 @@ import ManageSubscriptionButton from "@/ui/workspaces/manage-subscription-button
import {
AnimatedSizeContainer,
Button,
- buttonVariants,
DynamicTooltipWrapper,
Icon,
} from "@dub/ui";
@@ -16,6 +15,7 @@ import {
cn,
getFirstAndLastDay,
getNextPlan,
+ getPlanDetails,
INFINITY_NUMBER,
isWorkspaceBillingTrialActive,
nFormatter,
@@ -45,6 +45,7 @@ function UsageInner() {
partnersLimit,
billingCycleStart,
plan,
+ planTier,
slug,
paymentFailedAt,
loading,
@@ -89,7 +90,11 @@ function UsageInner() {
const [hovered, setHovered] = useState(false);
- const nextPlan = getNextPlan(plan);
+ const currentPlanLimits = getPlanDetails({
+ plan: plan ?? "free",
+ planTier,
+ }).limits;
+ const nextPlanLimits = getNextPlan(plan)?.limits;
// Warn the user if they're >= 90% of any limit
const warnings = useMemo(
@@ -143,24 +148,28 @@ function UsageInner() {
<div
className={cn("mt-4 flex flex-col", isTrial ? "gap-3" : "gap-4")}
>
- {isTrial ? (
+ <UsageRow
+ icon={CursorRays}
+ label="Events"
+ usage={usage}
+ limit={usageLimit}
+ showNextPlan={hovered}
+ nextPlanLimit={
+ isTrial ? currentPlanLimits.clicks : nextPlanLimits.clicks
+ }
+ warning={warnings[0]}
+ />
+ {defaultProgramId ? (
<>
- <UsageRow
- icon={CursorRays}
- label="Events"
- usage={usage}
- limit={usageLimit}
- showNextPlan={false}
- nextPlanLimit={undefined}
- warning={warnings[0]}
- />
<UsageRow
icon={MoneyBills2}
label="Payouts"
usage={payoutsUsage}
limit={payoutsLimit}
- showNextPlan={false}
- nextPlanLimit={undefined}
+ showNextPlan={hovered}
+ nextPlanLimit={
+ isTrial ? currentPlanLimits.payouts : nextPlanLimits.payouts
+ }
warning={warnings[1]}
valueInCents
/>
@@ -169,29 +178,26 @@ function UsageInner() {
label="Partners"
usage={defaultProgramId ? partnersUsage : 0}
limit={partnersLimit}
- showNextPlan={false}
- nextPlanLimit={undefined}
+ showNextPlan={hovered}
+ nextPlanLimit={
+ isTrial
+ ? currentPlanLimits.partners
+ : nextPlanLimits.partners
+ }
warning={warnings[2]}
/>
</>
) : (
<>
- <UsageRow
- icon={CursorRays}
- label="Events"
- usage={usage}
- limit={usageLimit}
- showNextPlan={hovered}
- nextPlanLimit={nextPlan?.limits.clicks}
- warning={warnings[0]}
- />
<UsageRow
icon={Hyperlink}
label="Links"
usage={linksUsage}
limit={linksLimit}
showNextPlan={hovered}
- nextPlanLimit={nextPlan?.limits.links}
+ nextPlanLimit={
+ isTrial ? currentPlanLimits.links : nextPlanLimits.links
+ }
warning={warnings[1]}
/>
</>
@@ -252,20 +258,18 @@ function UsageInner() {
/>
</DynamicTooltipWrapper>
) : (warning || plan === "free") && plan !== "enterprise" ? (
- <Link
- href={`/${slug}/upgrade`}
- className={cn(
- buttonVariants(),
- "mt-4 flex h-9 items-center justify-center rounded-md border px-4 text-sm",
- )}
- onMouseEnter={() => {
- setHovered(true);
- }}
- onMouseLeave={() => {
- setHovered(false);
- }}
- >
- Upgrade plan
+ <Link href={`/${slug}/upgrade`}>
+ <Button
+ text="Upgrade plan"
+ variant="primary"
+ className="mt-4 h-8 w-full rounded-lg"
+ onMouseEnter={() => {
+ setHovered(true);
+ }}
+ onMouseLeave={() => {
+ setHovered(false);
+ }}
+ />
</Link>
) : null}
</div>