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.

fix OnboardingButton

Steven Teyb45bc365528b
diff --git a/apps/web/lib/swr/use-customers-count.ts b/apps/web/lib/swr/use-customers-count.ts
index 2f4ec8bb6a..298919da73 100644
--- a/apps/web/lib/swr/use-customers-count.ts
+++ b/apps/web/lib/swr/use-customers-count.ts
@@ -17,7 +17,7 @@ export default function useCustomersCount<T = number>({
const { id: workspaceId } = useWorkspace();
const { getQueryString } = useRouterStuff();
- const { data, error } = useSWR<T>(
+ const { data, error, isLoading } = useSWR<T>(
enabled &&
workspaceId &&
`/api/customers/count${getQueryString(
@@ -34,6 +34,7 @@ export default function useCustomersCount<T = number>({
return {
data,
+ loading: isLoading,
error,
};
}
diff --git a/apps/web/lib/swr/use-workspace-users.ts b/apps/web/lib/swr/use-workspace-users.ts
index 969264f64e..4f17b8332b 100644
--- a/apps/web/lib/swr/use-workspace-users.ts
+++ b/apps/web/lib/swr/use-workspace-users.ts
@@ -3,13 +3,6 @@ import { fetcher } from "@dub/utils";
import useSWR from "swr";
import useWorkspace from "./use-workspace";
-type UserWithTokens = WorkspaceUserProps & {
- restrictedTokens: {
- name: string;
- lastUsed: Date;
- }[];
-};
-
export default function useWorkspaceUsers({
invites,
}: { invites?: boolean } = {}) {
diff --git a/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx b/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx
index c73d55ce64..305975d79f 100644
--- a/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx
+++ b/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx
@@ -1,10 +1,11 @@
"use client";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import useCustomersCount from "@/lib/swr/use-customers-count";
import useDomainsCount from "@/lib/swr/use-domains-count";
import usePartnersCount from "@/lib/swr/use-partners-count";
import useWorkspace from "@/lib/swr/use-workspace";
import useWorkspaceUsers from "@/lib/swr/use-workspace-users";
-import { useAnalyticsConnectedStatus } from "@/ui/analytics/use-analytics-connected-status";
import { CheckCircleFill } from "@/ui/shared/icons";
import {
Button,
@@ -37,14 +38,20 @@ function OnboardingButtonInner({
onHideForever: () => void;
}) {
const { slug } = useParams() as { slug: string };
- const { totalLinks, defaultProgramId } = useWorkspace();
+ const { plan, totalLinks, defaultProgramId } = useWorkspace();
+
+ const { canTrackConversions } = getPlanCapabilities(plan);
const { data: domainsCount, loading: domainsLoading } = useDomainsCount({
ignoreParams: true,
});
const { users, loading: usersLoading } = useWorkspaceUsers();
- const { isConnected: connectedAnalytics } = useAnalyticsConnectedStatus();
+ const { data: customersCount, loading: customersCountLoading } =
+ useCustomersCount<number>({
+ includeParams: [],
+ enabled: canTrackConversions,
+ });
const { partnersCount, loading: partnersCountLoading } =
usePartnersCount<number>({
@@ -52,7 +59,11 @@ function OnboardingButtonInner({
enabled: Boolean(defaultProgramId),
});
- const loading = domainsLoading || usersLoading || partnersCountLoading;
+ const loading =
+ domainsLoading ||
+ usersLoading ||
+ customersCountLoading ||
+ partnersCountLoading;
const tasks = useMemo(() => {
return [
@@ -73,7 +84,7 @@ function OnboardingButtonInner({
{
display: "Set up conversion tracking",
cta: `/${slug}/settings/analytics`,
- checked: connectedAnalytics,
+ checked: customersCount && customersCount > 0,
recommended: true,
},
{
@@ -102,7 +113,7 @@ function OnboardingButtonInner({
slug,
defaultProgramId,
domainsCount,
- connectedAnalytics,
+ customersCount,
partnersCount,
totalLinks,
users,