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 network click tracking, work email

Steven Teyb8deadb1b8e5
diff --git a/apps/web/app/(ee)/api/track/application/route.ts b/apps/web/app/(ee)/api/track/application/route.ts
index a45f3f7789..bc289b7909 100644
--- a/apps/web/app/(ee)/api/track/application/route.ts
+++ b/apps/web/app/(ee)/api/track/application/route.ts
@@ -215,19 +215,19 @@ async function trackVisitEvent({
}
// for network program application events, track the click event
- if (program.id === NETWORK_PROGRAM_ID && referredByPartner) {
+ if (referredByPartner) {
waitUntil(
(async () => {
- const networkPartnerLink = await prisma.link.findFirst({
+ const networkReferralLink = await prisma.link.findFirst({
where: {
programId: NETWORK_PROGRAM_ID,
partnerId: referredByPartner.id,
},
});
- if (!networkPartnerLink) {
+ if (!networkReferralLink) {
console.log(
- `No network partner link found for partner ${referredByPartner.id}, skipping...`,
+ `No network referral link found for partner ${referredByPartner.id} (not enrolled in network program yet), skipping...`,
);
return;
}
@@ -237,9 +237,9 @@ async function trackVisitEvent({
...requestContext,
timestamp: new Date().toISOString(),
workspace_id: NETWORK_WORKSPACE_ID,
- link_id: networkPartnerLink.id,
- domain: networkPartnerLink.domain,
- key: networkPartnerLink.key,
+ link_id: networkReferralLink.id,
+ domain: networkReferralLink.domain,
+ key: networkReferralLink.key,
});
await recordClickZod(generatedClickEvent);
@@ -249,7 +249,7 @@ async function trackVisitEvent({
await prisma.link.update({
where: {
- id: networkPartnerLink.id,
+ id: networkReferralLink.id,
},
data: {
clicks: { increment: 1 },
@@ -257,7 +257,7 @@ async function trackVisitEvent({
},
});
console.log(
- `Updated link ${networkPartnerLink.id} to ${networkPartnerLink.clicks + 1} clicks`,
+ `Updated link ${networkReferralLink.id} to ${networkReferralLink.clicks + 1} clicks`,
);
await syncPartnerLinksStats({
diff --git a/apps/web/ui/auth/login/email-sign-in.tsx b/apps/web/ui/auth/login/email-sign-in.tsx
index ad566ea511..2a622ea4db 100644
--- a/apps/web/ui/auth/login/email-sign-in.tsx
+++ b/apps/web/ui/auth/login/email-sign-in.tsx
@@ -1,5 +1,5 @@
import { checkAccountExistsAction } from "@/lib/actions/check-account-exists";
-import { Button, Input, useMediaQuery } from "@dub/ui";
+import { Button, Input, useCurrentSubdomain, useMediaQuery } from "@dub/ui";
import { cn } from "@dub/utils";
import { signIn } from "next-auth/react";
import { useAction } from "next-safe-action/hooks";
@@ -10,6 +10,7 @@ import { toast } from "sonner";
import { errorCodes, LoginFormContext } from "./login-form";
export const EmailSignIn = ({ next }: { next?: string }) => {
+ const { subdomain } = useCurrentSubdomain();
const router = useRouter();
const searchParams = useSearchParams();
const finalNext = next ?? searchParams?.get("next");
@@ -128,7 +129,7 @@ export const EmailSignIn = ({ next }: { next?: string }) => {
{authMethod === "email" && (
<label>
<span className="text-content-emphasis mb-2 block text-sm font-medium leading-none">
- Email
+ {subdomain === "partners" ? "Email" : "Work email"}
</span>
<input
id="email"
diff --git a/apps/web/ui/auth/register/signup-email.tsx b/apps/web/ui/auth/register/signup-email.tsx
index c74a31227a..3c42385017 100644
--- a/apps/web/ui/auth/register/signup-email.tsx
+++ b/apps/web/ui/auth/register/signup-email.tsx
@@ -3,7 +3,7 @@
import { sendOtpAction } from "@/lib/actions/send-otp";
import { signUpSchema } from "@/lib/zod/schemas/auth";
import { PasswordRequirements } from "@/ui/shared/password-requirements";
-import { Button, Input, useMediaQuery } from "@dub/ui";
+import { Button, Input, useCurrentSubdomain, useMediaQuery } from "@dub/ui";
import { useAction } from "next-safe-action/hooks";
import { FormEvent, useCallback, useState } from "react";
import { FormProvider, useForm } from "react-hook-form";
@@ -15,6 +15,7 @@ type SignUpProps = z.infer<typeof signUpSchema>;
export const SignUpEmail = () => {
const { isMobile } = useMediaQuery();
+ const { subdomain } = useCurrentSubdomain();
const { setStep, setEmail, setPassword, email, lockEmail } =
useRegisterContext();
@@ -70,7 +71,7 @@ export const SignUpEmail = () => {
<div className="flex flex-col gap-y-6">
<label>
<span className="text-content-emphasis mb-2 block text-sm font-medium leading-none">
- Email
+ {subdomain === "partners" ? "Email" : "Work email"}
</span>
<Input
type="email"