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.

use verifiedEmailDomain in partnerinvitesheet if present

Steven Tey5b1b5f3bc2e2
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx
index 69e9c591f2..f8cbf092d3 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx
@@ -87,10 +87,7 @@ const statusMessages = {
export function CampaignEditor({ campaign }: { campaign: Campaign }) {
const { id: workspaceId, slug: workspaceSlug } = useWorkspace();
- const { emailDomains } = useEmailDomains();
- const firstVerifiedEmailDomain = emailDomains?.find(
- (domain) => domain.status === "verified",
- );
+ const { verifiedEmailDomain } = useEmailDomains();
const isActive = campaign.status === CampaignStatus.active;
const isReadOnly = CAMPAIGN_READONLY_STATUSES.includes(campaign.status);
@@ -331,17 +328,17 @@ export function CampaignEditor({ campaign }: { campaign: Campaign }) {
name="from"
render={({ field }) => {
const localPart = field.value?.split("@")[0] || "";
- const domainSuffix = firstVerifiedEmailDomain?.slug
- ? `@${firstVerifiedEmailDomain.slug}`
+ const domainSuffix = verifiedEmailDomain?.slug
+ ? `@${verifiedEmailDomain.slug}`
: "";
- const isDisabled = isReadOnly || !firstVerifiedEmailDomain;
+ const isDisabled = isReadOnly || !verifiedEmailDomain;
return (
<DisabledInputWrapper
tooltip={
isReadOnly ? (
statusMessages[campaign.status]
- ) : !firstVerifiedEmailDomain ? (
+ ) : !verifiedEmailDomain ? (
<TooltipContent
title="You haven't configured an email domain yet. Please configure an email domain to enable campaign sending."
cta="Configure email domain"
@@ -364,9 +361,9 @@ export function CampaignEditor({ campaign }: { campaign: Campaign }) {
value={localPart}
onChange={(e) => {
const newLocalPart = e.target.value;
- if (firstVerifiedEmailDomain?.slug) {
+ if (verifiedEmailDomain?.slug) {
field.onChange(
- `${newLocalPart}@${firstVerifiedEmailDomain.slug}`,
+ `${newLocalPart}@${verifiedEmailDomain.slug}`,
);
}
}}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-sheet.tsx
index e73d7878e5..6f5c7e6fe5 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-sheet.tsx
@@ -1,6 +1,7 @@
import { parseActionError } from "@/lib/actions/parse-action-errors";
import { invitePartnerAction } from "@/lib/actions/partners/invite-partner";
import { saveInviteEmailDataAction } from "@/lib/actions/partners/save-invite-email-data";
+import { useEmailDomains } from "@/lib/swr/use-email-domains";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
import { ProgramInviteEmailData, ProgramProps } from "@/lib/types";
@@ -352,6 +353,8 @@ function EmailPreview({
isSavingEmailData: boolean;
}) {
const { program } = useProgram();
+ const { verifiedEmailDomain } = useEmailDomains();
+
const { isMobile } = useMediaQuery();
const richTextRef = useRef<{ setContent: (content: any) => void }>(null);
@@ -511,7 +514,9 @@ function EmailPreview({
<div className="grid gap-1 border-b border-neutral-200 bg-white px-4 py-3">
<p className="text-xs text-neutral-500">
<strong className="font-medium text-neutral-900">From: </strong>
+ {verifiedEmailDomain
+ ? `partners@${verifiedEmailDomain.slug}`
</p>
<p className="text-xs text-neutral-500">
<strong className="font-medium text-neutral-900">
diff --git a/apps/web/lib/swr/use-email-domains.ts b/apps/web/lib/swr/use-email-domains.ts
index f364b0dc73..ab12a4855e 100644
--- a/apps/web/lib/swr/use-email-domains.ts
+++ b/apps/web/lib/swr/use-email-domains.ts
@@ -1,12 +1,17 @@
import { EmailDomainProps } from "@/lib/types";
import { fetcher } from "@dub/utils";
+import { useMemo } from "react";
import useSWR from "swr";
import useWorkspace from "./use-workspace";
export function useEmailDomains() {
const { id: workspaceId, defaultProgramId } = useWorkspace();
- const { data, error, mutate } = useSWR<EmailDomainProps[]>(
+ const {
+ data: emailDomains,
+ error,
+ mutate,
+ } = useSWR<EmailDomainProps[]>(
workspaceId && defaultProgramId
? `/api/email-domains?workspaceId=${workspaceId}`
: null,
@@ -16,9 +21,14 @@ export function useEmailDomains() {
},
);
+ const verifiedEmailDomain = useMemo(() => {
+ return emailDomains?.find((domain) => domain.status === "verified");
+ }, [emailDomains]);
+
return {
- emailDomains: data || [],
- loading: !data && !error,
+ emailDomains,
+ verifiedEmailDomain,
+ loading: !emailDomains && !error,
mutate,
error,
};