remove zod address schema cleanup

Author: MananTank

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx

@@ -28,24 +28,14 @@ import { useCallback } from "react";
 import { useFieldArray, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { type PreparedTransaction, sendAndConfirmTransaction } from "thirdweb";
-import { isAddress } from "thirdweb";
 import { ClaimableERC721, ClaimableERC1155 } from "thirdweb/modules";
 import { useActiveAccount, useReadContract } from "thirdweb/react";
 import { z } from "zod";
+import { addressSchema } from "../zod-schemas";
 import { CurrencySelector } from "./CurrencySelector";
 import { ModuleCardUI, type ModuleCardUIProps } from "./module-card";
 import type { ModuleInstanceProps } from "./module-instance";
 
-const zodAddress = z.string().refine(
-  (v) => {
-    if (isAddress(v)) {
-      return true;
-    }
-    return false;
-  },
-  { message: "Invalid Address" },
-);
-
 export type ClaimCondition = {
   availableSupply: bigint;
   allowlistMerkleRoot: `0x${string}`;
@@ -252,7 +242,7 @@ export function ClaimableModuleUI(
 }
 
 const configFormSchema = z.object({
-  primarySaleRecipient: zodAddress,
+  primarySaleRecipient: addressSchema,
 
   tokenId: z.string().optional(),
 
@@ -273,7 +263,7 @@ const configFormSchema = z.object({
   startTime: z.date().optional(),
   endTime: z.date().optional(),
 
-  allowList: z.array(z.object({ address: zodAddress })).optional(),
+  allowList: z.array(z.object({ address: addressSchema })).optional(),
 });
 
 export type ConfigFormValues = z.infer<typeof configFormSchema>;
@@ -550,7 +540,7 @@ const mintFormSchema = z.object({
   quantity: z.string().refine((v) => v.length > 0 && Number(v) >= 0, {
     message: "Invalid quantity",
   }),
-  recipient: zodAddress,
+  recipient: addressSchema,
 });
 
 export type MintFormValues = z.infer<typeof mintFormSchema>;

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx

@@ -29,12 +29,12 @@ import { useCallback } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { type PreparedTransaction, sendAndConfirmTransaction } from "thirdweb";
-import { isAddress } from "thirdweb";
 import { MintableERC721, MintableERC1155 } from "thirdweb/modules";
 import { useReadContract } from "thirdweb/react";
 import type { NFTMetadataInputLimited } from "types/modified-types";
 import { parseAttributes } from "utils/parseAttributes";
 import { z } from "zod";
+import { addressSchema } from "../zod-schemas";
 import { ModuleCardUI, type ModuleCardUIProps } from "./module-card";
 import type { ModuleInstanceProps } from "./module-instance";
 import { AdvancedNFTMetadataFormGroup } from "./nft/AdvancedNFTMetadataFormGroup";
@@ -215,18 +215,7 @@ export function MintableModuleUI(
 }
 
 const primarySaleRecipientFormSchema = z.object({
-  primarySaleRecipient: z.string().refine(
-    (v) => {
-      // don't return `isAddress(v)` directly to avoid typecasting address as `0x${string}`
-      if (isAddress(v)) {
-        return true;
-      }
-      return false;
-    },
-    {
-      message: "Invalid Address",
-    },
-  ),
+  primarySaleRecipient: addressSchema,
 });
 
 function PrimarySalesSection(props: {

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Royalty.tsx

@@ -24,10 +24,11 @@ import { CircleAlertIcon } from "lucide-react";
 import { useCallback } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
-import { isAddress, sendAndConfirmTransaction } from "thirdweb";
+import { sendAndConfirmTransaction } from "thirdweb";
 import { RoyaltyERC721 } from "thirdweb/modules";
 import { useReadContract } from "thirdweb/react";
 import { z } from "zod";
+import { addressSchema } from "../zod-schemas";
 import { ModuleCardUI, type ModuleCardUIProps } from "./module-card";
 import type { ModuleInstanceProps } from "./module-instance";
 
@@ -192,15 +193,7 @@ const royaltyInfoFormSchema = z.object({
     .string()
     .min(1, { message: "Invalid Token ID" })
     .refine((v) => Number(v) >= 0, { message: "Invalid Token ID" }),
-  recipient: z.string().refine(
-    (v) => {
-      if (isAddress(v)) {
-        return true;
-      }
-      return false;
-    },
-    { message: "Invalid Address" },
-  ),
+  recipient: addressSchema,
   bps: z
     .string()
     .min(1, { message: "Invalid BPS" })
@@ -306,31 +299,11 @@ function RoyaltyInfoPerTokenSection(props: {
 }
 
 const defaultRoyaltyFormSchema = z.object({
-  recipient: z.string().refine(
-    (v) => {
-      // return true if it is an empty string to emulate optional condition
-      // don't return `isAddress(v)` directly to avoid typecasting address as `0x${string}
-      if (!v || isAddress(v)) {
-        return true;
-      }
-      return false;
-    },
-    { message: "Invalid Address" },
-  ),
+  recipient: addressSchema,
   bps: z.string().refine((v) => v.length === 0 || Number(v) >= 0, {
     message: "Invalid BPS",
   }),
-  transferValidator: z.string().refine(
-    (v) => {
-      // return true if it is an empty string to emulate optional condition
-      // don't return `isAddress(v)` directly to avoid typecasting address as `0x${string}
-      if (!v || isAddress(v)) {
-        return true;
-      }
-      return false;
-    },
-    { message: "Invalid Address" },
-  ),
+  transferValidator: addressSchema,
 });
 
 export type RoyaltyConfigFormValues = z.infer<typeof defaultRoyaltyFormSchema>;

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx

@@ -20,28 +20,18 @@ import { CircleAlertIcon, PlusIcon, Trash2Icon } from "lucide-react";
 import { useCallback } from "react";
 import { useFieldArray, useForm } from "react-hook-form";
 import { toast } from "sonner";
-import { isAddress, sendAndConfirmTransaction } from "thirdweb";
+import { sendAndConfirmTransaction } from "thirdweb";
 import { TransferableERC721 } from "thirdweb/modules";
 import { useReadContract } from "thirdweb/react";
 import { z } from "zod";
+import { addressSchema } from "../zod-schemas";
 import { ModuleCardUI, type ModuleCardUIProps } from "./module-card";
 import type { ModuleInstanceProps } from "./module-instance";
 
 const formSchema = z.object({
   allowList: z.array(
     z.object({
-      address: z.string().refine(
-        (v) => {
-          // don't return `isAddress(v)` directly to avoid typecasting address as `0x${string}`
-          if (isAddress(v)) {
-            return true;
-          }
-          return false;
-        },
-        {
-          message: "Invalid Address",
-        },
-      ),
+      address: addressSchema,
     }),
   ),
   isRestricted: z.boolean(),

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/zod-schemas.ts

@@ -0,0 +1,13 @@
+import { isAddress } from "thirdweb";
+import { z } from "zod";
+
+export const addressSchema = z.string().refine(
+  (v) => {
+    // not returning the return value of isAddress directly on purpose to prevent type narrowing to `0x${string}`
+    if (isAddress(v)) {
+      return true;
+    }
+    return false;
+  },
+  { message: "Invalid Address" },
+);