Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions apps/web/lib/swr/use-domain.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
import { fetcher } from "@dub/utils";
import { fetcher, isDubDomain } from "@dub/utils";
import useSWR from "swr";
import { DomainProps } from "../types";
import useWorkspace from "./use-workspace";

export default function useDomain(slug: string) {
export default function useDomain({
slug,
enabled,
}: {
slug: string;
enabled?: boolean;
}) {
const { id: workspaceId } = useWorkspace();

const { data: domain, error } = useSWR<DomainProps>(
workspaceId && slug && `/api/domains/${slug}?workspaceId=${workspaceId}`,
enabled &&
workspaceId &&
slug &&
!isDubDomain(slug) &&
`/api/domains/${slug}?workspaceId=${workspaceId}`,
fetcher,
{ refreshInterval: 60000 },
);

return {
Expand Down
15 changes: 3 additions & 12 deletions apps/web/ui/links/link-title-column.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";

import useDomain from "@/lib/swr/use-domain";
import useWorkspace from "@/lib/swr/use-workspace";
import { DomainProps } from "@/lib/types";
import {
ArrowTurnRight2,
Avatar,
Expand All @@ -27,7 +27,6 @@ import {
} from "@dub/ui/icons";
import {
cn,
fetcher,
formatDateTime,
getApexDomain,
getPrettyUrl,
Expand All @@ -38,7 +37,6 @@ import {
import * as HoverCard from "@radix-ui/react-hover-card";
import { Mail } from "lucide-react";
import { memo, PropsWithChildren, useContext, useRef, useState } from "react";
import useSWR from "swr";
import { useLinkBuilder } from "../modals/link-builder";
import { ResponseLink } from "./links-container";
import { LinksDisplayContext } from "./links-display-provider";
Expand Down Expand Up @@ -151,19 +149,12 @@ function UnverifiedTooltip({
_key,
children,
}: PropsWithChildren<{ domain: string; _key: string }>) {
const { id: workspaceId, slug } = useWorkspace();
const { slug } = useWorkspace();

const ref = useRef<HTMLDivElement>(null);
const isVisible = useInViewport(ref);

const { data: { verified } = {} } = useSWR<DomainProps>(
workspaceId &&
isVisible &&
!isDubDomain(domain) &&
`/api/domains/${domain}?workspaceId=${workspaceId}`,
fetcher,
{ refreshInterval: 60000 },
);
const { verified } = useDomain({ slug: domain, enabled: isVisible });

return (
<div ref={ref}>
Expand Down
13 changes: 10 additions & 3 deletions apps/web/ui/modals/link-builder/qr-code-preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ import { QRCode } from "@/ui/shared/qr-code";
import {
Button,
ShimmerDots,
useInViewport,
useKeyboardShortcut,
useLocalStorage,
useMediaQuery,
} from "@dub/ui";
import { Pen2, QRCode as QRCodeIcon } from "@dub/ui/icons";
import { DUB_QR_LOGO, linkConstructor } from "@dub/utils";
import { AnimatePresence, motion } from "framer-motion";
import { useMemo } from "react";
import { useMemo, useRef } from "react";
import { useFormContext } from "react-hook-form";
import { useDebounce } from "use-debounce";
import { LinkFormData } from ".";
Expand All @@ -30,7 +31,13 @@ export function QRCodePreview() {
const [key] = useDebounce(rawKey, 500);
const [domain] = useDebounce(rawDomain, 500);

const { logo: domainLogo } = useDomain(rawDomain);
const ref = useRef<HTMLDivElement>(null);
const isVisible = useInViewport(ref);

const { logo: domainLogo } = useDomain({
slug: rawDomain,
enabled: isVisible,
});

const [data, setData] = useLocalStorage<QRCodeDesign>(
`qr-code-design-${workspaceId}`,
Expand Down Expand Up @@ -64,7 +71,7 @@ export function QRCodePreview() {
});

return (
<div>
<div ref={ref}>
<LinkQRModal />
<div className="flex items-center justify-between">
<h2 className="text-sm font-medium text-gray-700">QR Code</h2>
Expand Down
6 changes: 5 additions & 1 deletion apps/web/ui/modals/link-qr-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ function LinkQRModal(
function LinkQRModalInner({
props,
onSave,
showLinkQRModal,
setShowLinkQRModal,
}: {
showLinkQRModal: boolean;
Expand All @@ -85,7 +86,10 @@ function LinkQRModalInner({
const { id: workspaceId, slug, plan, logo: workspaceLogo } = useWorkspace();
const id = useId();
const { isMobile } = useMediaQuery();
const { logo: domainLogo } = useDomain(props.domain);
const { logo: domainLogo } = useDomain({
slug: props.domain,
enabled: showLinkQRModal,
});

const url = useMemo(() => {
return props.key && props.domain
Expand Down
Loading