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.

Merge branch 'main' into staging-sandbox

Kiran Kbc8077f8b6c0
diff --cc apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx
index 9a10e8b126,86636f35a1..aaff3cade7
--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx
@@@ -1,10 -1,8 +1,10 @@@
import { getProgram } from "@/lib/fetchers/get-program";
import { prisma } from "@/lib/prisma";
+import { ProgramEnvironmentBanner } from "@/lib/sandbox/components/program-environment-banner";
+import { isProductionEnvironment } from "@/lib/sandbox/workspace-guards";
import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
import { Logo } from "@dub/ui";
- import { BoltFill, CursorRays, LinesY, MoneyBills2 } from "@dub/ui/icons";
+ import { Bolt, CursorRays, LinesY, MoneyBills2 } from "@dub/ui/icons";
import { OG_AVATAR_URL } from "@dub/utils";
import { Store } from "lucide-react";
import { notFound, redirect } from "next/navigation";
diff --cc apps/web/lib/hooks/use-dashboard-banner-visible.ts
index 40c62362ff,0000000000..89bfdfd7f6
mode 100644,000000..100644
--- a/apps/web/lib/hooks/use-dashboard-banner-visible.ts
+++ b/apps/web/lib/hooks/use-dashboard-banner-visible.ts
@@@ -1,33 -1,0 +1,41 @@@
+"use client";
+
+import { isProductionEnvironment } from "@/lib/sandbox/workspace-guards";
+import useWorkspace from "@/lib/swr/use-workspace";
+
+export function useDashboardBannerVisible() {
+ const {
+ exceededEvents,
+ exceededLinks,
+ exceededPayouts,
+ paymentFailedAt,
++ subscriptionCanceledAt,
+ environment,
+ loading,
+ } = useWorkspace();
+
++ const subscriptionCanceled =
++ subscriptionCanceledAt && new Date(subscriptionCanceledAt) < new Date();
++
+ // Visible in production workspaces
+ const isUpgradeBannerVisible =
- (exceededEvents || exceededLinks || exceededPayouts || !!paymentFailedAt) &&
++ (exceededEvents ||
++ exceededLinks ||
++ exceededPayouts ||
++ !!paymentFailedAt ||
++ subscriptionCanceled) &&
+ isProductionEnvironment(environment) &&
+ !loading;
+
+ // Visible in non-production workspaces
+ const isEnvironmentBannerVisible =
+ !isProductionEnvironment(environment) && !loading;
+
+ const hasBanner = isUpgradeBannerVisible || isEnvironmentBannerVisible;
+
+ return {
+ isUpgradeBannerVisible,
+ isEnvironmentBannerVisible,
+ hasBanner,
+ };
+}
diff --cc apps/web/ui/layout/upgrade-banner.tsx
index 777f771bd5,35baa45bd8..f8119277e2
--- a/apps/web/ui/layout/upgrade-banner.tsx
+++ b/apps/web/ui/layout/upgrade-banner.tsx
@@@ -1,9 -1,8 +1,9 @@@
"use client";
+import { useDashboardBannerVisible } from "@/lib/hooks/use-dashboard-banner-visible";
import useWorkspace from "@/lib/swr/use-workspace";
import { useTrialLimitActivateModal } from "@/ui/modals/trial-limit-activate-modal";
- import { Crown } from "@dub/ui";
+ import { Button, Crown, TriangleWarning, useMediaQuery } from "@dub/ui";
import {
cn,
getTrialLimitResourceForOverageBanner,
@@@ -20,18 -40,20 +41,20 @@@ export function UpgradeBanner()
useTrialLimitActivateModal();
const trialActive = isWorkspaceBillingTrialActive(trialEndsAt);
- const needsUpgrade = exceededEvents || exceededLinks || exceededPayouts;
- const { isVisible, needsUpgrade, paymentFailed, subscriptionCanceled } =
- useUpgradeBannerVisibility();
++ const { needsUpgrade, subscriptionCanceled } = useUpgradeBannerVisibility();
++ const { isUpgradeBannerVisible } = useDashboardBannerVisible();
+
const overageLimitResource = getTrialLimitResourceForOverageBanner({
exceededEvents: Boolean(exceededEvents),
exceededLinks: Boolean(exceededLinks),
exceededPayouts: Boolean(exceededPayouts),
});
- const { isUpgradeBannerVisible } = useDashboardBannerVisible();
+ const customButtonClassname = "ml-4 h-7 w-fit px-2.5 text-sm font-medium";
- if (!isUpgradeBannerVisible) {
- return null;
- }
+ const { isMobile } = useMediaQuery();
+
- if (!isVisible) return null;
++ if (!isUpgradeBannerVisible) return null;
return (
<>