rearrange some stuff

Author: steven-tey

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx

@@ -4,7 +4,6 @@ import { deleteProgramInviteAction } from "@/lib/actions/partners/delete-program
 import { resendProgramInviteAction } from "@/lib/actions/partners/resend-program-invite";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import useGroups from "@/lib/swr/use-groups";
-import usePartner from "@/lib/swr/use-partner";
 import usePartnersCount from "@/lib/swr/use-partners-count";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { EnrolledPartnerProps } from "@/lib/types";
@@ -704,31 +703,3 @@ function MenuItem({
     </Command.Item>
   );
 }
-
-/** Gets the current partner from the loaded partners array if available, or a separate fetch if not */
-function useCurrentPartner({
-  partners,
-  partnerId,
-}: {
-  partners?: EnrolledPartnerProps[];
-  partnerId: string | null;
-}) {
-  let currentPartner = partnerId
-    ? partners?.find(({ id }) => id === partnerId)
-    : null;
-
-  const { partner: fetchedPartner, loading: isLoading } = usePartner(
-    {
-      partnerId: partners && partnerId && !currentPartner ? partnerId : null,
-    },
-    {
-      keepPreviousData: true,
-    },
-  );
-
-  if (!currentPartner && fetchedPartner?.id === partnerId) {
-    currentPartner = fetchedPartner;
-  }
-
-  return { currentPartner, isLoading };
-}

apps/web/ui/modals/add-discount-code-modal.tsx

@@ -1,6 +1,5 @@
 import { mutatePrefix } from "@/lib/swr/mutate";
 import { useApiMutation } from "@/lib/swr/use-api-mutation";
-import useWorkspace from "@/lib/swr/use-workspace";
 import { DiscountCodeProps, EnrolledPartnerProps } from "@/lib/types";
 import { createDiscountCodeSchema } from "@/lib/zod/schemas/discount";
 import {
@@ -10,7 +9,6 @@ import {
   ComboboxOption,
   Modal,
   useCopyToClipboard,
-  useMediaQuery,
 } from "@dub/ui";
 import { cn, getPrettyUrl } from "@dub/utils";
 import { Tag } from "lucide-react";
@@ -36,11 +34,9 @@ const AddDiscountCodeModal = ({
   setShowModal,
   partner,
 }: AddDiscountCodeModalProps) => {
-  const { stripeConnectId } = useWorkspace();
   const [search, setSearch] = useState("");
   const [isOpen, setIsOpen] = useState(false);
 
-  const { isMobile } = useMediaQuery();
   const formRef = useRef<HTMLFormElement>(null);
   const [debouncedSearch] = useDebounce(search, 500);
   const [, copyToClipboard] = useCopyToClipboard();
@@ -138,34 +134,6 @@ const AddDiscountCodeModal = ({
           </div>
 
           <div className="flex w-full flex-col gap-6">
-            <div className="flex flex-col gap-2">
-              <div className="flex items-center gap-2">
-                <label
-                  htmlFor="code"
-                  className="block text-sm font-medium text-neutral-700"
-                >
-                  Discount code
-                </label>
-              </div>
-
-              <div className="relative">
-                <div className="absolute inset-y-0 left-0 flex items-center pl-3">
-                  <Tag className="text-content-default h-4 w-4" />
-                </div>
-                <input
-                  {...register("code")}
-                  type="text"
-                  id="code"
-                  autoFocus={!isMobile}
-                  className="block w-full rounded-md border-[1.5px] border-neutral-300 pl-10 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
-                  placeholder="CODE"
-                />
-              </div>
-              <p className="text-xs text-neutral-500">
-                Discount codes cannot be edited after creation
-              </p>
-            </div>
-
             <div className="flex flex-col gap-2">
               <div className="flex items-center gap-2">
                 <label
@@ -209,6 +177,36 @@ const AddDiscountCodeModal = ({
                 onOpenChange={setIsOpen}
                 onSearchChange={setSearch}
               />
+              <p className="text-xs text-neutral-500">
+                Choose a referral link to associate the discount code with
+              </p>
+            </div>
+
+            <div className="flex flex-col gap-2">
+              <div className="flex items-center gap-2">
+                <label
+                  htmlFor="code"
+                  className="block text-sm font-medium text-neutral-700"
+                >
+                  Discount code
+                </label>
+              </div>
+
+              <div className="relative">
+                <div className="absolute inset-y-0 left-0 flex items-center pl-3">
+                  <Tag className="text-content-default h-4 w-4" />
+                </div>
+                <input
+                  {...register("code")}
+                  type="text"
+                  id="code"
+                  className="block w-full rounded-md border-[1.5px] border-neutral-300 pl-10 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
+                  placeholder={partner.name.split(" ")[0].toUpperCase()}
+                />
+              </div>
+              <p className="text-xs text-neutral-500">
+                Discount codes cannot be edited after creation
+              </p>
             </div>
           </div>
         </div>