diff --git a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx
index 910d2a3af27..d2d24c6da12 100644
--- a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx
+++ b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx
@@ -66,8 +66,6 @@ export type UploadMetadataFormValues = z.infer<typeof uploadMetadataFormSchema>;
 function BatchMetadataModule(props: ModuleInstanceProps) {
   const { contract, ownerAccount } = props;
 
-  const isErc721 = props.contractInfo.name === "BatchMetadataERC721";
-
   const uploadMetadata = useCallback(
     async (values: UploadMetadataFormValues) => {
       if (!ownerAccount) {
@@ -75,9 +73,10 @@ function BatchMetadataModule(props: ModuleInstanceProps) {
       }
 
       const nft = parseAttributes(values);
-      const uploadMetadata = isErc721
-        ? BatchMetadataERC721.uploadMetadata
-        : BatchMetadataERC1155.uploadMetadata;
+      const uploadMetadata =
+        props.contractInfo.name === "BatchMetadataERC721"
+          ? BatchMetadataERC721.uploadMetadata
+          : BatchMetadataERC1155.uploadMetadata;
       const uploadMetadataTx = uploadMetadata({
         contract,
         metadatas: [nft],
@@ -88,7 +87,7 @@ function BatchMetadataModule(props: ModuleInstanceProps) {
         transaction: uploadMetadataTx,
       });
     },
-    [contract, ownerAccount, isErc721],
+    [contract, ownerAccount, props.contractInfo.name],
   );
 
   return (
diff --git a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx
index 92e1a50c008..3fae3031aec 100644
--- a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx
+++ b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx
@@ -46,7 +46,11 @@ import {
   toTokens,
 } from "thirdweb";
 import { decimals } from "thirdweb/extensions/erc20";
-import { ClaimableERC721, ClaimableERC1155 } from "thirdweb/modules";
+import {
+  ClaimableERC20,
+  ClaimableERC721,
+  ClaimableERC1155,
+} from "thirdweb/modules";
 import { useActiveAccount, useReadContract } from "thirdweb/react";
 import { z } from "zod";
 import { addressSchema } from "../zod-schemas";
@@ -72,26 +76,34 @@ function ClaimableModule(props: ModuleInstanceProps) {
   const account = useActiveAccount();
   const [tokenId, setTokenId] = useState<string>("");
 
-  const isErc721 = props.contractInfo.name === "ClaimableERC721";
-  const isErc20 = props.contractInfo.name === "ClaimableERC20";
   const isValidTokenId = positiveIntegerRegex.test(tokenId);
 
   const primarySaleRecipientQuery = useReadContract(
-    isErc721 ? ClaimableERC721.getSaleConfig : ClaimableERC1155.getSaleConfig,
+    props.contractInfo.name === "ClaimableERC721"
+      ? ClaimableERC721.getSaleConfig
+      : props.contractInfo.name === "ClaimableERC20"
+        ? ClaimableERC20.getSaleConfig
+        : ClaimableERC1155.getSaleConfig,
     {
       contract: contract,
     },
   );
 
   const claimConditionQuery = useReadContract(
-    isErc721
+    props.contractInfo.name === "ClaimableERC721"
       ? ClaimableERC721.getClaimCondition
-      : ClaimableERC1155.getClaimCondition,
+      : props.contractInfo.name === "ClaimableERC20"
+        ? ClaimableERC20.getClaimCondition
+        : ClaimableERC1155.getClaimCondition,
     {
       tokenId: positiveIntegerRegex.test(tokenId) ? BigInt(tokenId) : 0n,
       contract: contract,
       queryOptions: {
-        enabled: isErc721 || (!!tokenId && isValidTokenId),
+        enabled:
+          ["ClaimableERC721", "ClaimableERC20"].includes(
+            props.contractInfo.name,
+          ) ||
+          (!!tokenId && isValidTokenId),
       },
     },
   );
@@ -116,12 +128,18 @@ function ClaimableModule(props: ModuleInstanceProps) {
     claimConditionQuery.data &&
     claimConditionQuery.data?.currency !== ZERO_ADDRESS;
 
-  const tokenDecimalsQuery = useReadContract(decimals, {
+  const currencyDecimalsQuery = useReadContract(decimals, {
     contract: currencyContract,
     queryOptions: {
       enabled: shouldFetchTokenDecimals,
     },
   });
+  const tokenDecimalsQuery = useReadContract(decimals, {
+    contract: contract,
+    queryOptions: {
+      enabled: props.contractInfo.name === "ClaimableERC20",
+    },
+  });
 
   const mint = useCallback(
     async (values: MintFormValues) => {
@@ -130,12 +148,18 @@ function ClaimableModule(props: ModuleInstanceProps) {
       }
 
       let mintTx: PreparedTransaction;
-      if (isErc721) {
+      if (props.contractInfo.name === "ClaimableERC721") {
         mintTx = ClaimableERC721.mint({
           contract,
           to: values.recipient,
           quantity: values.quantity,
         });
+      } else if (props.contractInfo.name === "ClaimableERC20") {
+        mintTx = ClaimableERC20.mint({
+          contract,
+          to: values.recipient,
+          quantity: values.quantity,
+        });
       } else if (values.tokenId) {
         mintTx = ClaimableERC1155.mint({
           contract,
@@ -152,7 +176,7 @@ function ClaimableModule(props: ModuleInstanceProps) {
         transaction: mintTx,
       });
     },
-    [contract, account, isErc721],
+    [contract, account, props.contractInfo.name],
   );
 
   const setClaimCondition = useCallback(
@@ -162,7 +186,7 @@ function ClaimableModule(props: ModuleInstanceProps) {
       }
 
       let setClaimConditionTx: PreparedTransaction;
-      if (isErc721) {
+      if (props.contractInfo.name === "ClaimableERC721") {
         setClaimConditionTx = ClaimableERC721.setClaimCondition({
           ...values,
           contract,
@@ -171,6 +195,15 @@ function ClaimableModule(props: ModuleInstanceProps) {
               ? values.allowList.map(({ address }) => address)
               : undefined,
         });
+      } else if (props.contractInfo.name === "ClaimableERC20") {
+        setClaimConditionTx = ClaimableERC20.setClaimCondition({
+          ...values,
+          contract,
+          allowList:
+            values.allowList && values.allowList.length > 0
+              ? values.allowList.map(({ address }) => address)
+              : undefined,
+        });
       } else if (values.tokenId) {
         setClaimConditionTx = ClaimableERC1155.setClaimCondition({
           ...values,
@@ -190,7 +223,7 @@ function ClaimableModule(props: ModuleInstanceProps) {
         transaction: setClaimConditionTx,
       });
     },
-    [contract, ownerAccount, isErc721],
+    [contract, ownerAccount, props.contractInfo.name],
   );
 
   const setPrimarySaleRecipient = useCallback(
@@ -198,9 +231,12 @@ function ClaimableModule(props: ModuleInstanceProps) {
       if (!ownerAccount) {
         throw new Error("Not an owner account");
       }
-      const setSaleConfig = isErc721
-        ? ClaimableERC721.setSaleConfig
-        : ClaimableERC1155.setSaleConfig;
+      const setSaleConfig =
+        props.contractInfo.name === "ClaimableERC721"
+          ? ClaimableERC721.setSaleConfig
+          : props.contractInfo.name === "ClaimableERC20"
+            ? ClaimableERC20.setSaleConfig
+            : ClaimableERC1155.setSaleConfig;
       const setSaleConfigTx = setSaleConfig({
         contract: contract,
         primarySaleRecipient: values.primarySaleRecipient,
@@ -211,7 +247,7 @@ function ClaimableModule(props: ModuleInstanceProps) {
         transaction: setSaleConfigTx,
       });
     },
-    [contract, ownerAccount, isErc721],
+    [contract, ownerAccount, props.contractInfo.name],
   );
 
   return (
@@ -228,9 +264,10 @@ function ClaimableModule(props: ModuleInstanceProps) {
           // claim conditions data is present
           claimConditionQuery.data &&
           // token decimals is fetched if it should be fetched
-          (shouldFetchTokenDecimals ? tokenDecimalsQuery.isFetched : true)
+          (shouldFetchTokenDecimals ? currencyDecimalsQuery.isFetched : true)
             ? {
                 claimCondition: claimConditionQuery.data,
+                currencyDecimals: currencyDecimalsQuery.data,
                 tokenDecimals: tokenDecimalsQuery.data,
               }
             : undefined,
@@ -238,11 +275,10 @@ function ClaimableModule(props: ModuleInstanceProps) {
         tokenId,
         isLoading:
           claimConditionQuery.isLoading ||
-          (!!shouldFetchTokenDecimals && tokenDecimalsQuery.isLoading),
+          (!!shouldFetchTokenDecimals && currencyDecimalsQuery.isLoading),
       }}
       isOwnerAccount={!!ownerAccount}
-      isErc721={isErc721}
-      isErc20={isErc20}
+      name={props.contractInfo.name}
       contractChainId={props.contract.chain.id}
       setTokenId={setTokenId}
       isValidTokenId={isValidTokenId}
@@ -257,8 +293,7 @@ function ClaimableModule(props: ModuleInstanceProps) {
 export function ClaimableModuleUI(
   props: Omit<ModuleCardUIProps, "children" | "updateButton"> & {
     isOwnerAccount: boolean;
-    isErc721: boolean;
-    isErc20: boolean;
+    name: string;
     contractChainId: number;
     setTokenId: Dispatch<SetStateAction<string>>;
     isValidTokenId: boolean;
@@ -282,6 +317,7 @@ export function ClaimableModuleUI(
       data:
         | {
             claimCondition: ClaimConditionValue;
+            currencyDecimals: number | undefined;
             tokenDecimals: number | undefined;
           }
         | undefined;
@@ -298,12 +334,12 @@ export function ClaimableModuleUI(
         <Accordion type="single" collapsible className="-mx-1">
           <AccordionItem value="metadata" className="border-none">
             <AccordionTrigger className="border-border border-t px-1">
-              Mint {props.isErc20 ? "Token" : "NFT"}
+              Mint {props.name === "ClaimableERC20" ? "Token" : "NFT"}
             </AccordionTrigger>
             <AccordionContent className="px-1">
               <MintNFTSection
                 mint={props.mintSection.mint}
-                isErc721={props.isErc721}
+                name={props.name}
                 contractChainId={props.contractChainId}
               />
             </AccordionContent>
@@ -314,7 +350,7 @@ export function ClaimableModuleUI(
               Claim Conditions
             </AccordionTrigger>
             <AccordionContent className="px-1">
-              {!props.isErc721 && (
+              {props.name === "ClaimableERC1155" && (
                 <div className="flex flex-col gap-6">
                   <div className="flex-1 space-y-1">
                     <Label>Token ID</Label>
@@ -330,28 +366,29 @@ export function ClaimableModuleUI(
 
               <div className="h-6" />
 
-              {props.isValidTokenId &&
-                props.claimConditionSection.data &&
-                !props.claimConditionSection.isLoading && (
+              {props.name !== "ClaimableERC1155" || props.isValidTokenId ? (
+                props.claimConditionSection.data ? (
                   <ClaimConditionSection
                     isOwnerAccount={props.isOwnerAccount}
                     claimCondition={
                       props.claimConditionSection.data.claimCondition
                     }
                     update={props.claimConditionSection.setClaimCondition}
-                    isErc721={props.isErc721}
+                    name={props.name}
                     chainId={props.contractChainId}
                     noClaimConditionSet={props.noClaimConditionSet}
+                    currencyDecimals={
+                      props.claimConditionSection.data?.currencyDecimals
+                    }
                     tokenDecimals={
                       props.claimConditionSection.data?.tokenDecimals
                     }
                     tokenId={props.claimConditionSection.tokenId}
                   />
-                )}
-              {props.isValidTokenId &&
-                props.claimConditionSection.isLoading && (
+                ) : (
                   <Skeleton className="h-[350px]" />
-                )}
+                )
+              ) : null}
             </AccordionContent>
           </AccordionItem>
 
@@ -423,9 +460,10 @@ function ClaimConditionSection(props: {
   claimCondition: ClaimConditionValue;
   update: (values: ClaimConditionFormValues) => Promise<void>;
   isOwnerAccount: boolean;
-  isErc721: boolean;
+  name: string;
   chainId: number;
-  tokenDecimals?: number;
+  currencyDecimals?: number;
+  tokenDecimals?: number | undefined;
   tokenId: string;
   noClaimConditionSet: boolean;
 }) {
@@ -445,18 +483,28 @@ function ClaimConditionSection(props: {
           : claimCondition?.currency,
       // default case is zero state, so 0 // 10 ** 18 still results in 0
       pricePerToken: Number(
-        toTokens(claimCondition?.pricePerUnit, props.tokenDecimals || 18),
+        toTokens(claimCondition?.pricePerUnit, props.currencyDecimals || 18),
       ),
       maxClaimableSupply:
         claimCondition?.availableSupply.toString() === "0" ||
         claimCondition?.availableSupply.toString() === MAX_UINT_256
           ? ""
-          : claimCondition?.availableSupply.toString() || "",
+          : props.name === "ClaimableERC20"
+            ? toTokens(
+                claimCondition?.availableSupply,
+                props.tokenDecimals || 18,
+              )
+            : claimCondition?.availableSupply.toString() || "",
       maxClaimablePerWallet:
         claimCondition?.maxMintPerWallet.toString() === "0" ||
         claimCondition?.maxMintPerWallet.toString() === MAX_UINT_256
           ? ""
-          : claimCondition?.maxMintPerWallet.toString() || "",
+          : props.name === "ClaimableERC20"
+            ? toTokens(
+                claimCondition?.maxMintPerWallet,
+                props.tokenDecimals || 18,
+              )
+            : claimCondition?.maxMintPerWallet.toString() || "",
       startTime: claimCondition?.startTimestamp
         ? fromUnixTime(claimCondition?.startTimestamp)
         : defaultStartDate,
@@ -487,7 +535,7 @@ function ClaimConditionSection(props: {
 
   const onSubmit = async () => {
     const values = form.getValues();
-    if (!props.isErc721 && !values.tokenId) {
+    if (props.name === "ClaimableERC1155" && !values.tokenId) {
       form.setError("tokenId", { message: "Token ID is required" });
       return;
     }
@@ -782,7 +830,7 @@ export type MintFormValues = z.infer<typeof mintFormSchema>;
 
 function MintNFTSection(props: {
   mint: (values: MintFormValues) => Promise<void>;
-  isErc721: boolean;
+  name: string;
   contractChainId: number;
 }) {
   const form = useForm<MintFormValues>({
@@ -808,7 +856,7 @@ function MintNFTSection(props: {
 
   const onSubmit = async () => {
     const values = form.getValues();
-    if (!props.isErc721 && !values.tokenId) {
+    if (props.name === "ClaimableERC1155" && !values.tokenId) {
       form.setError("tokenId", { message: "Token ID is required" });
       return;
     }
@@ -847,7 +895,7 @@ function MintNFTSection(props: {
             )}
           />
 
-          {!props.isErc721 && (
+          {props.name === "ClaimableERC1155" && (
             <FormField
               control={form.control}
               name="tokenId"
diff --git a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx
index 7346485605b..799e0dd211f 100644
--- a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx
+++ b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx
@@ -28,7 +28,11 @@ import { CircleAlertIcon } from "lucide-react";
 import { useCallback } from "react";
 import { useForm } from "react-hook-form";
 import { type PreparedTransaction, sendAndConfirmTransaction } from "thirdweb";
-import { MintableERC721, MintableERC1155 } from "thirdweb/modules";
+import {
+  MintableERC20,
+  MintableERC721,
+  MintableERC1155,
+} from "thirdweb/modules";
 import { grantRoles, hasAllRoles } from "thirdweb/modules";
 import { useReadContract } from "thirdweb/react";
 import type { NFTMetadataInputLimited } from "types/modified-types";
@@ -107,12 +111,18 @@ function MintableModule(props: ModuleInstanceProps) {
       }
 
       let mintTx: PreparedTransaction;
-      if (isErc721) {
+      if (props.contractInfo.name === "MintableERC721") {
         mintTx = MintableERC721.mintWithRole({
           contract,
           to: values.recipient,
           nfts: [nft],
         });
+      } else if (props.contractInfo.name === "MintableERC20") {
+        mintTx = MintableERC20.mintWithRole({
+          contract,
+          to: values.recipient,
+          quantity: String(values.amount),
+        });
       } else if (values.useNextTokenId || values.tokenId) {
         mintTx = MintableERC1155.mintWithRole({
           contract,
@@ -130,7 +140,7 @@ function MintableModule(props: ModuleInstanceProps) {
         transaction: mintTx,
       });
     },
-    [contract, ownerAccount, isErc721, hasMinterRole.data],
+    [contract, ownerAccount, hasMinterRole.data, props.contractInfo.name],
   );
 
   const update = useCallback(
@@ -139,9 +149,13 @@ function MintableModule(props: ModuleInstanceProps) {
         throw new Error("Not an owner account");
       }
 
-      const setSaleConfig = isErc721
-        ? MintableERC721.setSaleConfig
-        : MintableERC1155.setSaleConfig;
+      const setSaleConfig =
+        props.contractInfo.name === "MintableERC721"
+          ? MintableERC721.setSaleConfig
+          : props.contractInfo.name === "MintableERC20"
+            ? MintableERC20.setSaleConfig
+            : MintableERC1155.setSaleConfig;
+
       const setSaleConfigTx = setSaleConfig({
         contract: contract,
         primarySaleRecipient: values.primarySaleRecipient,
@@ -152,7 +166,7 @@ function MintableModule(props: ModuleInstanceProps) {
         transaction: setSaleConfigTx,
       });
     },
-    [contract, ownerAccount, isErc721],
+    [contract, ownerAccount, props.contractInfo.name],
   );
 
   return (
@@ -163,7 +177,7 @@ function MintableModule(props: ModuleInstanceProps) {
       updatePrimaryRecipient={update}
       mint={mint}
       isOwnerAccount={!!ownerAccount}
-      isErc721={isErc721}
+      name={props.contractInfo.name}
       isBatchMetadataInstalled={isBatchMetadataInstalled}
       contractChainId={contract.chain.id}
     />
@@ -177,7 +191,7 @@ export function MintableModuleUI(
     isOwnerAccount: boolean;
     updatePrimaryRecipient: (values: UpdateFormValues) => Promise<void>;
     mint: (values: MintFormValues) => Promise<void>;
-    isErc721: boolean;
+    name: string;
     isBatchMetadataInstalled: boolean;
     contractChainId: number;
   },
@@ -199,7 +213,7 @@ export function MintableModuleUI(
                 {props.isOwnerAccount && (
                   <MintNFTSection
                     mint={props.mint}
-                    isErc721={props.isErc721}
+                    name={props.name}
                     isBatchMetadataInstalled={props.isBatchMetadataInstalled}
                     contractChainId={props.contractChainId}
                   />
@@ -323,7 +337,7 @@ const mintFormSchema = z.object({
 
 function MintNFTSection(props: {
   mint: (values: MintFormValues) => Promise<void>;
-  isErc721: boolean;
+  name: string;
   isBatchMetadataInstalled: boolean;
   contractChainId: number;
 }) {
@@ -353,7 +367,11 @@ function MintNFTSection(props: {
 
   const onSubmit = async () => {
     const values = form.getValues();
-    if (!props.isErc721 && !values.useNextTokenId && !values.tokenId) {
+    if (
+      props.name === "MintableERC1155" &&
+      !values.useNextTokenId &&
+      !values.tokenId
+    ) {
       form.setError("tokenId", { message: "Token ID is required" });
       return;
     }
@@ -453,7 +471,7 @@ function MintNFTSection(props: {
               )}
             />
 
-            {!props.isErc721 && (
+            {props.name !== "MintableERC721" && (
               <FormField
                 control={form.control}
                 name="amount"
@@ -468,7 +486,7 @@ function MintNFTSection(props: {
               />
             )}
 
-            {!props.isErc721 && (
+            {props.name === "MintableERC1155" && (
               <div className="relative flex-1">
                 <FormField
                   control={form.control}
diff --git a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx
index b24d0c1c838..0b7738dead1 100644
--- a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx
+++ b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx
@@ -22,7 +22,11 @@ import { useCallback } from "react";
 import { useFieldArray, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { sendAndConfirmTransaction } from "thirdweb";
-import { TransferableERC721, TransferableERC1155 } from "thirdweb/modules";
+import {
+  TransferableERC20,
+  TransferableERC721,
+  TransferableERC1155,
+} from "thirdweb/modules";
 import { useReadContract } from "thirdweb/react";
 import { z } from "zod";
 import { addressSchema } from "../zod-schemas";
@@ -43,12 +47,12 @@ export type TransferableModuleFormValues = z.infer<typeof formSchema>;
 function TransferableModule(props: ModuleInstanceProps) {
   const { contract, ownerAccount } = props;
 
-  const isErc721 = props.contractInfo.name === "TransferableERC721";
-
   const isTransferEnabledQuery = useReadContract(
-    isErc721
+    props.contractInfo.name === "TransferableERC721"
       ? TransferableERC721.isTransferEnabled
-      : TransferableERC1155.isTransferEnabled,
+      : props.contractInfo.name === "TransferableERC20"
+        ? TransferableERC20.isTransferEnabled
+        : TransferableERC1155.isTransferEnabled,
     {
       contract,
     },
@@ -64,9 +68,12 @@ function TransferableModule(props: ModuleInstanceProps) {
       const transferEnabled = !values.isRestricted;
 
       if (isTransferEnabledQuery.data !== transferEnabled) {
-        const setTransferable = isErc721
-          ? TransferableERC721.setTransferable
-          : TransferableERC1155.setTransferable;
+        const setTransferable =
+          props.contractInfo.name === "TransferableERC721"
+            ? TransferableERC721.setTransferable
+            : props.contractInfo.name === "TransferableERC20"
+              ? TransferableERC20.setTransferable
+              : TransferableERC1155.setTransferable;
         const setTransferableTx = setTransferable({
           contract,
           enableTransfer: transferEnabled,
@@ -80,9 +87,12 @@ function TransferableModule(props: ModuleInstanceProps) {
 
       await Promise.all(
         values.allowList.map(async ({ address }) => {
-          const setTransferableFor = isErc721
-            ? TransferableERC721.setTransferableFor
-            : TransferableERC1155.setTransferableFor;
+          const setTransferableFor =
+            props.contractInfo.name === "TransferableERC721"
+              ? TransferableERC721.setTransferableFor
+              : props.contractInfo.name === "TransferableERC20"
+                ? TransferableERC20.setTransferableFor
+                : TransferableERC1155.setTransferableFor;
           const setTransferableForTx = setTransferableFor({
             contract,
             enableTransfer: true,
@@ -96,7 +106,12 @@ function TransferableModule(props: ModuleInstanceProps) {
         }),
       );
     },
-    [contract, ownerAccount, isTransferEnabledQuery.data, isErc721],
+    [
+      contract,
+      ownerAccount,
+      isTransferEnabledQuery.data,
+      props.contractInfo.name,
+    ],
   );
 
   return (
diff --git a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/claimable.stories.tsx b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/claimable.stories.tsx
index 069bb78c90a..e26f9a8b851 100644
--- a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/claimable.stories.tsx
+++ b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/claimable.stories.tsx
@@ -1,5 +1,12 @@
 import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
 import { Checkbox } from "@/components/ui/checkbox";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
 import type { Meta, StoryObj } from "@storybook/react";
 import { useMutation } from "@tanstack/react-query";
 import { subDays } from "date-fns";
@@ -60,8 +67,7 @@ const claimCondition = {
 
 function Component() {
   const [isOwner, setIsOwner] = useState(true);
-  const [isErc721, setIsErc721] = useState(false);
-  const [isErc20, setIsErc20] = useState(false);
+  const [name, setName] = useState("ClaimableERC721");
   const [isClaimConditionLoading, setIsClaimConditionLoading] = useState(false);
   const [isPrimarySaleRecipientLoading, setIsPrimarySaleRecipientLoading] =
     useState(false);
@@ -119,19 +125,16 @@ function Component() {
               label="Is Owner"
             />
 
-            <CheckboxWithLabel
-              value={isErc721}
-              onChange={setIsErc721}
-              id="isErc721"
-              label="isErc721"
-            />
-
-            <CheckboxWithLabel
-              value={isErc20}
-              onChange={setIsErc20}
-              id="isErc20"
-              label="isErc20"
-            />
+            <Select value={name} onValueChange={(v) => setName(v)}>
+              <SelectTrigger>
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="MintableERC721">MintableERC721</SelectItem>
+                <SelectItem value="MintableERC1155">MintableERC1155</SelectItem>
+                <SelectItem value="MintableERC20">MintableERC20</SelectItem>
+              </SelectContent>
+            </Select>
 
             <CheckboxWithLabel
               value={isClaimConditionLoading}
@@ -168,10 +171,12 @@ function Component() {
             }}
             claimConditionSection={{
               data:
-                isClaimConditionLoading || (!isErc721 && !tokenId)
+                isClaimConditionLoading ||
+                (name === "MintableERC1155" && !tokenId)
                   ? undefined
                   : {
                       claimCondition,
+                      currencyDecimals: 18,
                       tokenDecimals: 18,
                     },
               isLoading: false,
@@ -186,8 +191,7 @@ function Component() {
               isPending: removeMutation.isPending,
             }}
             isOwnerAccount={isOwner}
-            isErc721={isErc721}
-            isErc20={isErc20}
+            name={name}
             contractChainId={1}
             setTokenId={setTokenId}
             isValidTokenId={true}
diff --git a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/mintable.stories.tsx b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/mintable.stories.tsx
index 13c8b4a2199..d9abbc9c8f9 100644
--- a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/mintable.stories.tsx
+++ b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/mintable.stories.tsx
@@ -1,5 +1,14 @@
+"use client";
+
 import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
 import { Checkbox } from "@/components/ui/checkbox";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
 import type { Meta, StoryObj } from "@storybook/react";
 import { useMutation } from "@tanstack/react-query";
 import { useState } from "react";
@@ -42,7 +51,7 @@ const testAddress1 = "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37";
 
 function Component() {
   const [isOwner, setIsOwner] = useState(true);
-  const [isErc721, setIsErc721] = useState(false);
+  const [name, setName] = useState("MintableERC721");
   const [isBatchMetadataInstalled, setIsBatchMetadataInstalled] =
     useState(false);
   async function updatePrimaryRecipientStub(values: UpdateFormValues) {
@@ -90,19 +99,23 @@ function Component() {
               label="Is Owner"
             />
 
-            <CheckboxWithLabel
-              value={isErc721}
-              onChange={setIsErc721}
-              id="isErc721"
-              label="isErc721"
-            />
-
             <CheckboxWithLabel
               value={isBatchMetadataInstalled}
               onChange={setIsBatchMetadataInstalled}
               id="isBatchMetadataInstalled"
               label="isBatchMetadataInstalled"
             />
+
+            <Select value={name} onValueChange={(v) => setName(v)}>
+              <SelectTrigger>
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="MintableERC721">MintableERC721</SelectItem>
+                <SelectItem value="MintableERC1155">MintableERC1155</SelectItem>
+                <SelectItem value="MintableERC20">MintableERC20</SelectItem>
+              </SelectContent>
+            </Select>
           </div>
 
           <BadgeContainer label="Empty Primary Sale Recipient">
@@ -118,7 +131,7 @@ function Component() {
                 isPending: removeMutation.isPending,
               }}
               isOwnerAccount={isOwner}
-              isErc721={isErc721}
+              name={name}
               isBatchMetadataInstalled={isBatchMetadataInstalled}
               contractChainId={1}
             />
@@ -137,7 +150,7 @@ function Component() {
                 isPending: removeMutation.isPending,
               }}
               isOwnerAccount={isOwner}
-              isErc721={isErc721}
+              name={name}
               isBatchMetadataInstalled={isBatchMetadataInstalled}
               contractChainId={1}
             />
@@ -156,7 +169,7 @@ function Component() {
                 isPending: removeMutation.isPending,
               }}
               isOwnerAccount={isOwner}
-              isErc721={isErc721}
+              name={name}
               isBatchMetadataInstalled={isBatchMetadataInstalled}
               contractChainId={1}
             />