diff --git a/apps/dashboard/src/@/components/contract-components/tables/contract-table.tsx b/apps/dashboard/src/@/components/contract-components/tables/contract-table.tsx
index 27ba135d3fd..e608e879c03 100644
--- a/apps/dashboard/src/@/components/contract-components/tables/contract-table.tsx
+++ b/apps/dashboard/src/@/components/contract-components/tables/contract-table.tsx
@@ -300,6 +300,7 @@ const contractTypeToAssetTypeRecord: Record<string, string | undefined> = {
   DropERC20: "Coin",
   DropERC721: "NFT Collection",
   DropERC1155: "NFT Collection",
+  ERC20Asset: "Coin",
 };
 
 const NetworkFilterCell = React.memo(function NetworkFilterCell({
diff --git a/apps/dashboard/src/@/components/ui/tabs.tsx b/apps/dashboard/src/@/components/ui/tabs.tsx
index 47acea12b5d..a2239f181ef 100644
--- a/apps/dashboard/src/@/components/ui/tabs.tsx
+++ b/apps/dashboard/src/@/components/ui/tabs.tsx
@@ -98,6 +98,7 @@ export function TabButtons(props: {
   shadowColor?: string;
   tabIconClassName?: string;
   hideBottomLine?: boolean;
+  bottomLineClassName?: string;
 }) {
   const { containerRef, lineRef, activeTabRef } =
     useUnderline<HTMLButtonElement>();
@@ -106,7 +107,12 @@ export function TabButtons(props: {
     <div className={cn("relative", props.containerClassName)}>
       {/* Bottom line */}
       {!props.hideBottomLine && (
-        <div className="absolute right-0 bottom-0 left-0 h-[1px] bg-border" />
+        <div
+          className={cn(
+            "absolute right-0 bottom-0 left-0 h-[1px] bg-border",
+            props.bottomLineClassName,
+          )}
+        />
       )}
 
       <ScrollShadow
diff --git a/apps/dashboard/src/@/hooks/project-contracts.ts b/apps/dashboard/src/@/hooks/project-contracts.ts
index bebcda01a5e..984e5a821bc 100644
--- a/apps/dashboard/src/@/hooks/project-contracts.ts
+++ b/apps/dashboard/src/@/hooks/project-contracts.ts
@@ -11,7 +11,7 @@ export function useAddContractToProject() {
       contractAddress: string;
       chainId: string;
       deploymentType: "asset" | undefined;
-      contractType: "DropERC20" | "DropERC721" | "DropERC1155" | undefined;
+      contractType: "ERC20Asset" | "DropERC721" | "DropERC1155" | undefined;
     }) => {
       const res = await apiServerProxy({
         body: JSON.stringify({
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/_common/step-card.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/_common/step-card.tsx
index fa14752c80f..316ee8b824f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/_common/step-card.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/_common/step-card.tsx
@@ -35,7 +35,7 @@ export function StepCard(props: {
       {props.children}
 
       {(props.prevButton || props.nextButton) && (
-        <div className="flex justify-end gap-3 border-t p-6">
+        <div className="flex justify-end gap-3 border-t p-4 md:p-6">
           {props.prevButton && (
             <Button
               className="gap-2"
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/nft/collection-info/nft-collection-info-fieldset.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/nft/collection-info/nft-collection-info-fieldset.tsx
index 2399888a1b8..732f17cbf35 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/nft/collection-info/nft-collection-info-fieldset.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/nft/collection-info/nft-collection-info-fieldset.tsx
@@ -9,6 +9,7 @@ import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { Form } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Skeleton } from "@/components/ui/skeleton";
 import { Textarea } from "@/components/ui/textarea";
 import { SocialUrlsFieldset } from "../../_common/SocialUrls";
 import { StepCard } from "../../_common/step-card";
@@ -94,7 +95,7 @@ export function NFTCollectionInfoFieldset(props: {
                 isRequired
                 label="Chain"
               >
-                <ClientOnly ssr={null}>
+                <ClientOnly ssr={<Skeleton className="h-10" />}>
                   <SingleNetworkSelector
                     chainId={Number(form.watch("chain"))}
                     className="bg-background"
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/nft/create-nft-page-ui.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/nft/create-nft-page-ui.tsx
index a4cf72010b9..d467a0bf38f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/nft/create-nft-page-ui.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/nft/create-nft-page-ui.tsx
@@ -8,7 +8,7 @@ import {
   NATIVE_TOKEN_ADDRESS,
   type ThirdwebClient,
 } from "thirdweb";
-import { useActiveAccount } from "thirdweb/react";
+import { useActiveAccount, useActiveWalletChain } from "thirdweb/react";
 import { reportAssetCreationStepConfigured } from "@/analytics/report";
 import {
   type CreateNFTCollectionFunctions,
@@ -160,11 +160,10 @@ export function CreateNFTPageUI(props: {
 }
 
 function useNFTCollectionInfoForm() {
+  const activeChain = useActiveWalletChain();
   return useForm<NFTCollectionInfoFormValues>({
-    resolver: zodResolver(nftCollectionInfoFormSchema),
-    reValidateMode: "onChange",
-    values: {
-      chain: "1",
+    defaultValues: {
+      chain: activeChain?.id.toString() || "1",
       description: "",
       image: undefined,
       name: "",
@@ -180,5 +179,7 @@ function useNFTCollectionInfoForm() {
       ],
       symbol: "",
     },
+    resolver: zodResolver(nftCollectionInfoFormSchema),
+    reValidateMode: "onChange",
   });
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/_common/form.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/_common/form.ts
index 4463b991ab8..06a36bdbd1c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/_common/form.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/_common/form.ts
@@ -15,6 +15,16 @@ export const tokenInfoFormSchema = z.object({
     .max(10, "Symbol must be 10 characters or less"),
 });
 
+const priceAmountSchema = z.string().refine(
+  (value) => {
+    const number = Number(value);
+    return !Number.isNaN(number) && number >= 0;
+  },
+  {
+    message: "Must be number larger than or equal to 0",
+  },
+);
+
 export const tokenDistributionFormSchema = z.object({
   airdropAddresses: z.array(
     z.object({
@@ -24,6 +34,13 @@ export const tokenDistributionFormSchema = z.object({
   ),
   // UI states
   airdropEnabled: z.boolean(),
+  directSale: z.object({
+    currencyAddress: addressSchema,
+    priceAmount: priceAmountSchema,
+  }),
+  publicMarket: z.object({
+    tradingFees: z.enum(["0.01", "0.05", "0.3", "1"]),
+  }),
   saleAllocationPercentage: z.string().refine(
     (value) => {
       const number = Number(value);
@@ -36,17 +53,7 @@ export const tokenDistributionFormSchema = z.object({
       message: "Must be a number between 0 and 100",
     },
   ),
-  saleEnabled: z.boolean(),
-  salePrice: z.string().refine(
-    (value) => {
-      const number = Number(value);
-      return !Number.isNaN(number) && number >= 0;
-    },
-    {
-      message: "Must be number larger than or equal to 0",
-    },
-  ),
-  saleTokenAddress: z.string(),
+  saleMode: z.enum(["direct-sale", "public-market", "disabled"]),
   supply: z.string().min(1, "Supply is required"),
 });
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page-impl.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page-impl.tsx
index 28eee054f9d..d00082ef687 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page-impl.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page-impl.tsx
@@ -2,36 +2,28 @@
 import { useRef } from "react";
 import { toast } from "sonner";
 import {
-  getAddress,
+  defineChain,
   getContract,
-  NATIVE_TOKEN_ADDRESS,
   sendAndConfirmTransaction,
   type ThirdwebClient,
-  toUnits,
+  toWei,
 } from "thirdweb";
-import { deployERC20Contract } from "thirdweb/deploys";
-import type { ClaimConditionsInput } from "thirdweb/dist/types/utils/extensions/drops/types";
 import {
-  claimTo,
-  getActiveClaimCondition,
-  setClaimConditions as setClaimConditionsExtension,
-  transferBatch,
-} from "thirdweb/extensions/erc20";
+  createToken,
+  distributeToken,
+  getDeployedEntrypointERC20,
+} from "thirdweb/assets";
+import { approve } from "thirdweb/extensions/erc20";
 import { useActiveAccount } from "thirdweb/react";
 import { revalidatePathAction } from "@/actions/revalidate";
 import {
   reportAssetCreationFailed,
   reportContractDeployed,
 } from "@/analytics/report";
-import {
-  DEFAULT_FEE_BPS_NEW,
-  DEFAULT_FEE_RECIPIENT,
-} from "@/constants/addresses";
 import { useAllChainsData } from "@/hooks/chains/allChains";
 import { useAddContractToProject } from "@/hooks/project-contracts";
 import { defineDashboardChain } from "@/lib/defineDashboardChain";
 import { parseError } from "@/utils/errorParser";
-import { pollWithTimeout } from "@/utils/pollWithTimeout";
 import type { CreateAssetFormValues } from "./_common/form";
 import { CreateTokenAssetPageUI } from "./create-token-page.client";
 
@@ -65,35 +57,40 @@ export function CreateTokenAssetPage(props: {
     );
 
     try {
-      const contractAddress = await deployERC20Contract({
+      const salePercent = Number(formValues.saleAllocationPercentage);
+      const saleAmount = Number(formValues.supply) * (salePercent / 100);
+
+      const contractAddress = await createToken({
         account,
         // eslint-disable-next-line no-restricted-syntax
-        chain: defineDashboardChain(
-          Number(formValues.chain),
-          idToChain.get(Number(formValues.chain)),
-        ),
+        chain: defineChain(Number(formValues.chain)),
         client: props.client,
+        launchConfig:
+          formValues.saleMode === "public-market" && saleAmount !== 0
+            ? {
+                config: {
+                  amount: BigInt(saleAmount),
+                  fee: Number(formValues.publicMarket.tradingFees) * 10000, // TODO - fix in SDK
+                  // initialTick (floorPrice) : disabled for now
+                }, // public
+                kind: "pool",
+              }
+            : undefined,
         params: {
           description: formValues.description,
           image: formValues.image,
-          // metadata
+          maxSupply: BigInt(formValues.supply),
           name: formValues.name,
-          // platform fees
-          platformFeeBps: BigInt(DEFAULT_FEE_BPS_NEW),
-          platformFeeRecipient: DEFAULT_FEE_RECIPIENT,
-          // primary sale
-          saleRecipient: account.address,
           social_urls: socialUrls,
           symbol: formValues.symbol,
         },
-        type: "DropERC20",
       });
 
       // add contract to project in background
       addContractToProject.mutateAsync({
         chainId: formValues.chain,
         contractAddress: contractAddress,
-        contractType: "DropERC20",
+        contractType: "ERC20Asset",
         deploymentType: "asset",
         projectId: props.projectId,
         teamId: props.teamId,
@@ -104,7 +101,7 @@ export function CreateTokenAssetPage(props: {
         chainId: Number(formValues.chain),
         contractName: "DropERC20",
         deploymentType: "asset",
-        publisher: "deployer.thirdweb.eth",
+        publisher: account.address,
       });
 
       contractAddressRef.current = contractAddress;
@@ -146,185 +143,77 @@ export function CreateTokenAssetPage(props: {
       idToChain.get(Number(formValues.chain)),
     );
 
-    const contract = getContract({
+    const tokenContract = getContract({
       address: contractAddress,
       chain,
       client: props.client,
     });
 
-    try {
-      const airdropTx = transferBatch({
-        batch: formValues.airdropAddresses.map((recipient) => ({
-          amount: recipient.quantity,
-          to: recipient.address,
-        })),
-        contract,
-      });
-
-      await sendAndConfirmTransaction({
-        account,
-        transaction: airdropTx,
-      });
-    } catch (e) {
-      console.error(e);
-      const errorMessage = parseError(e);
-
-      reportAssetCreationFailed({
-        assetType: "coin",
-        contractType: "DropERC20",
-        error: errorMessage,
-        step: "airdrop-tokens",
-      });
-      throw e;
-    }
-  }
-
-  async function mintTokens(formValues: CreateAssetFormValues) {
-    const contractAddress = contractAddressRef.current;
-    if (!contractAddress) {
-      throw new Error("No contract address");
-    }
-
-    if (!account) {
-      throw new Error("No connected account");
-    }
-
-    // eslint-disable-next-line no-restricted-syntax
-    const chain = defineDashboardChain(
-      Number(formValues.chain),
-      idToChain.get(Number(formValues.chain)),
+    const totalAmountToAirdrop = formValues.airdropAddresses.reduce(
+      (acc, recipient) => acc + BigInt(recipient.quantity),
+      0n,
     );
 
-    const contract = getContract({
-      address: contractAddress,
-      chain,
-      client: props.client,
-    });
-
-    // poll until claim conditions are set before moving on to minting
-    await pollWithTimeout({
-      shouldStop: async () => {
-        const claimConditions = await getActiveClaimCondition({
-          contract,
-        });
-        return !!claimConditions;
-      },
-      timeoutMs: 30000,
-    });
+    // approve entrypoint to spend tokens
 
-    const totalSupply = Number(formValues.supply);
-    const salePercent = formValues.saleEnabled
-      ? Number(formValues.saleAllocationPercentage)
-      : 0;
+    try {
+      const entrypoint = await getDeployedEntrypointERC20({
+        chain,
+        client: props.client,
+      });
 
-    const ownerAndAirdropPercent = 100 - salePercent;
-    const ownerSupplyTokens = (totalSupply * ownerAndAirdropPercent) / 100;
+      if (!entrypoint) {
+        throw new Error("Entrypoint not found");
+      }
 
-    try {
-      const claimTx = claimTo({
-        contract,
-        quantity: ownerSupplyTokens.toString(),
-        to: account.address,
+      const approvalTx = approve({
+        amountWei: toWei(totalAmountToAirdrop.toString()),
+        contract: tokenContract,
+        spender: entrypoint.address,
       });
 
       await sendAndConfirmTransaction({
         account,
-        transaction: claimTx,
+        transaction: approvalTx,
       });
     } catch (e) {
       const errorMessage = parseError(e);
-      console.error(e);
 
       reportAssetCreationFailed({
         assetType: "coin",
         contractType: "DropERC20",
         error: errorMessage,
-        step: "mint-tokens",
+        step: "airdrop-tokens",
       });
 
       throw e;
     }
-  }
-
-  async function setClaimConditions(formValues: CreateAssetFormValues) {
-    const contractAddress = contractAddressRef.current;
-
-    if (!contractAddress) {
-      throw new Error("No contract address");
-    }
-
-    if (!account) {
-      throw new Error("No connected account");
-    }
-
-    // eslint-disable-next-line no-restricted-syntax
-    const chain = defineDashboardChain(
-      Number(formValues.chain),
-      idToChain.get(Number(formValues.chain)),
-    );
-
-    const contract = getContract({
-      address: contractAddress,
-      chain,
-      client: props.client,
-    });
-
-    const salePercent = formValues.saleEnabled
-      ? Number(formValues.saleAllocationPercentage)
-      : 0;
-
-    const totalSupply = Number(formValues.supply);
-    const totalSupplyWei = toUnits(totalSupply.toString(), 18);
-
-    const phases: ClaimConditionsInput[] = [
-      {
-        currencyAddress:
-          getAddress(formValues.saleTokenAddress) ===
-          getAddress(NATIVE_TOKEN_ADDRESS)
-            ? undefined
-            : formValues.saleTokenAddress,
-        maxClaimablePerWallet: formValues.saleEnabled ? undefined : 0n,
-        maxClaimableSupply: totalSupplyWei,
-        metadata: {
-          name:
-            formValues.saleEnabled && salePercent > 0
-              ? "Coin Sale phase"
-              : "Only Owner phase",
-        },
-        overrideList: [
-          {
-            address: account.address,
-            maxClaimable: "unlimited",
-            price: "0",
-          },
-        ],
-        price:
-          formValues.saleEnabled && salePercent > 0
-            ? formValues.salePrice
-            : "0",
-        startTime: new Date(),
-      },
-    ];
-
-    const preparedTx = setClaimConditionsExtension({
-      contract,
-      phases,
-    });
 
     try {
+      const airdropTx = await distributeToken({
+        // eslint-disable-next-line no-restricted-syntax
+        chain,
+        client: props.client,
+        contents: formValues.airdropAddresses.map((recipient) => ({
+          amount: BigInt(recipient.quantity),
+          recipient: recipient.address,
+        })),
+        tokenAddress: contractAddress,
+      });
+
       await sendAndConfirmTransaction({
         account,
-        transaction: preparedTx,
+        transaction: airdropTx,
       });
     } catch (e) {
-      const errorMessage = parseError(e);
       console.error(e);
+      const errorMessage = parseError(e);
 
       reportAssetCreationFailed({
         assetType: "coin",
         contractType: "DropERC20",
         error: errorMessage,
-        step: "set-claim-conditions",
+        step: "airdrop-tokens",
       });
       throw e;
     }
@@ -337,8 +226,6 @@ export function CreateTokenAssetPage(props: {
       createTokenFunctions={{
         airdropTokens,
         deployContract,
-        mintTokens,
-        setClaimConditions,
       }}
       onLaunchSuccess={() => {
         revalidatePathAction(
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page.client.tsx
index 10699b2dfb6..b7ff5a81b90 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page.client.tsx
@@ -8,6 +8,7 @@ import {
   NATIVE_TOKEN_ADDRESS,
   type ThirdwebClient,
 } from "thirdweb";
+import { useActiveWalletChain } from "thirdweb/react";
 import { reportAssetCreationStepConfigured } from "@/analytics/report";
 import {
   type CreateAssetFormValues,
@@ -24,8 +25,6 @@ export type CreateTokenFunctions = {
   deployContract: (values: CreateAssetFormValues) => Promise<{
     contractAddress: string;
   }>;
-  setClaimConditions: (values: CreateAssetFormValues) => Promise<void>;
-  mintTokens: (values: CreateAssetFormValues) => Promise<void>;
   airdropTokens: (values: CreateAssetFormValues) => Promise<void>;
 };
 
@@ -42,12 +41,11 @@ export function CreateTokenAssetPageUI(props: {
   const [step, setStep] = useState<"token-info" | "distribution" | "launch">(
     "token-info",
   );
+  const activeChain = useActiveWalletChain();
 
   const tokenInfoForm = useForm<TokenInfoFormValues>({
-    resolver: zodResolver(tokenInfoFormSchema),
-    reValidateMode: "onChange",
-    values: {
-      chain: "1",
+    defaultValues: {
+      chain: activeChain?.id.toString() || "",
       description: "",
       image: undefined,
       name: "",
@@ -63,22 +61,29 @@ export function CreateTokenAssetPageUI(props: {
       ],
       symbol: "",
     },
+    resolver: zodResolver(tokenInfoFormSchema),
+    reValidateMode: "onChange",
   });
 
   const tokenDistributionForm = useForm<TokenDistributionFormValues>({
-    resolver: zodResolver(tokenDistributionFormSchema),
-    reValidateMode: "onChange",
-    values: {
+    defaultValues: {
       airdropAddresses: [],
       // airdrop
       airdropEnabled: false,
+      directSale: {
+        currencyAddress: checksummedNativeTokenAddress,
+        priceAmount: "0.1",
+      },
+      publicMarket: {
+        tradingFees: "1",
+      },
       // sale fieldset
       saleAllocationPercentage: "0",
-      saleEnabled: false,
-      salePrice: "0.1",
-      saleTokenAddress: checksummedNativeTokenAddress,
+      saleMode: "disabled",
       supply: "1000000",
     },
+    resolver: zodResolver(tokenDistributionFormSchema),
+    reValidateMode: "onChange",
   });
 
   return (
@@ -90,7 +95,7 @@ export function CreateTokenAssetPageUI(props: {
           onChainUpdated={() => {
             // if the chain is updated, set the sale token address to the native token address
             tokenDistributionForm.setValue(
-              "saleTokenAddress",
+              "directSale.currencyAddress",
               checksummedNativeTokenAddress,
             );
           }}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page.stories.tsx
index 185efd02438..a308bcbba0f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page.stories.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/create-token-page.stories.tsx
@@ -1,7 +1,10 @@
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { storybookThirdwebClient } from "@/storybook/utils";
-import { CreateTokenAssetPageUI } from "./create-token-page.client";
+import {
+  CreateTokenAssetPageUI,
+  type CreateTokenFunctions,
+} from "./create-token-page.client";
 
 const meta = {
   component: CreateTokenAssetPageUI,
@@ -9,9 +12,9 @@ const meta = {
     (Story) => (
       <ThirdwebProvider>
         <div className="container max-w-5xl py-10">
-          <ConnectButton client={storybookThirdwebClient} />
-          <div className="h-10" />
           <Story />
+          <div className="h-10" />
+          <ConnectButton client={storybookThirdwebClient} />
         </div>
       </ThirdwebProvider>
     ),
@@ -22,7 +25,7 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;
 
-const mockCreateTokenFunctions = {
+const mockCreateTokenFunctions: CreateTokenFunctions = {
   airdropTokens: async () => {
     await new Promise((resolve) => setTimeout(resolve, 1000));
   },
@@ -30,12 +33,6 @@ const mockCreateTokenFunctions = {
     await new Promise((resolve) => setTimeout(resolve, 1000));
     return { contractAddress: "0x123" };
   },
-  mintTokens: async () => {
-    await new Promise((resolve) => setTimeout(resolve, 1000));
-  },
-  setClaimConditions: async () => {
-    await new Promise((resolve) => setTimeout(resolve, 1000));
-  },
 };
 
 export const Default: Story = {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/distribution/token-airdrop.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/distribution/token-airdrop.tsx
index dbd83f8253c..133e8bd0295 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/distribution/token-airdrop.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/distribution/token-airdrop.tsx
@@ -67,7 +67,7 @@ export function TokenAirdropSection(props: {
   return (
     <DynamicHeight>
       <div className="relative border-t border-dashed">
-        <div className="flex items-center justify-between gap-3 px-6 py-5">
+        <div className="flex items-center justify-between gap-3 px-4 py-5 md:px-6">
           <div>
             <h2 className="font-semibold text-lg">Airdrop</h2>
             <p className="text-muted-foreground text-sm">
@@ -88,7 +88,7 @@ export function TokenAirdropSection(props: {
         </div>
 
         {isEnabled && (
-          <div className="flex justify-start px-6 pb-6">
+          <div className="flex justify-start px-4 pb-4 md:px-6 md:pb-6">
             {airdropAddresses.length > 0 ? (
               <div className="flex w-full flex-col gap-4 rounded-lg border bg-background p-4 md:flex-row lg:items-center lg:justify-between">
                 {/* left */}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/distribution/token-sale.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/distribution/token-sale.tsx
index 67a4c9938d6..3893bd3cfaa 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/distribution/token-sale.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/distribution/token-sale.tsx
@@ -1,114 +1,325 @@
 "use client";
 
+import { useQuery } from "@tanstack/react-query";
+import { XIcon } from "lucide-react";
+import { useEffect } from "react";
 import type { ThirdwebClient } from "thirdweb";
+import { defineChain } from "thirdweb";
+import { isRouterEnabled } from "thirdweb/assets";
 import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { TokenSelector } from "@/components/blocks/TokenSelector";
 import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { DecimalInput } from "@/components/ui/decimal-input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import { Skeleton } from "@/components/ui/skeleton";
 import { Switch } from "@/components/ui/switch";
-import type { TokenDistributionForm } from "../_common/form";
+import { useAllChainsData } from "@/hooks/chains/allChains";
+import type {
+  TokenDistributionForm,
+  TokenDistributionFormValues,
+} from "../_common/form";
 
 export function TokenSaleSection(props: {
   form: TokenDistributionForm;
   chainId: string;
   client: ThirdwebClient;
 }) {
-  const totalSupply = Number(props.form.watch("supply"));
-  const sellSupply = Math.floor(
-    (totalSupply * Number(props.form.watch("saleAllocationPercentage"))) / 100,
-  );
+  const isEnabled = props.form.watch("saleMode") !== "disabled";
+  const isDirectSale = props.form.watch("saleMode") === "direct-sale";
+  const isPublicMarket = props.form.watch("saleMode") === "public-market";
+  const { idToChain } = useAllChainsData();
+  const chainMeta = idToChain.get(Number(props.chainId));
+
+  const isRouterEnabledQuery = useQuery({
+    queryFn: () =>
+      isRouterEnabled({
+        // eslint-disable-next-line no-restricted-syntax
+        chain: defineChain(Number(props.chainId)),
+        client: props.client,
+      }),
+    queryKey: ["isRouterEnabled", props.chainId],
+  });
+
+  // eslint-disable-next-line no-restricted-syntax
+  useEffect(() => {
+    if (isRouterEnabledQuery.data === false && isEnabled) {
+      props.form.setValue("saleMode", "disabled");
+    }
+  }, [isRouterEnabledQuery.data, isEnabled, props.form]);
 
-  const isEnabled = props.form.watch("saleEnabled");
   return (
     <DynamicHeight>
-      <div className="relative border-t border-dashed p-6">
-        <div className="flex items-center justify-between gap-3">
-          <div>
-            <h2 className="font-semibold text-lg">Sale</h2>
-            <p className="text-muted-foreground text-sm">
-              Make your coin available for purchase by setting a price
-            </p>
-          </div>
+      <div className="relative border-t border-dashed p-4 md:p-6">
+        <div>
+          <div className="flex items-center justify-between gap-3">
+            <div>
+              <h2 className="font-semibold text-lg">Sale</h2>
+              <p className="text-muted-foreground text-sm">
+                {/* Make your coin available for purchase via Direct Sale or Public
+              Market */}
+                List and add liquidity for your coin on a decentralized exchange
+                for purchase at fluctuating market price
+              </p>
+            </div>
 
-          <Switch
-            checked={isEnabled}
-            onCheckedChange={(checked) => {
-              props.form.setValue("saleEnabled", checked);
-              if (!checked) {
-                props.form.setValue("saleAllocationPercentage", "0");
-                props.form.setValue("salePrice", "0");
-              }
-            }}
-          />
-        </div>
+            <div className="flex items-center gap-2">
+              {isRouterEnabledQuery.isPending ? (
+                <Skeleton className="h-[24px] w-[44px] rounded-full border" />
+              ) : (
+                <Switch
+                  checked={isEnabled}
+                  disabled={isRouterEnabledQuery.data !== true}
+                  onCheckedChange={(checked) => {
+                    if (isRouterEnabledQuery.data !== true) {
+                      return;
+                    }
 
-        {isEnabled && (
-          <div className="mt-4 flex flex-col gap-6">
-            <FormFieldSetup
-              errorMessage={
-                props.form.formState.errors.saleAllocationPercentage?.message
-              }
-              helperText={`${sellSupply} tokens`}
-              isRequired
-              label="Sell % of Total Supply"
-            >
-              <div className="relative">
-                <DecimalInput
-                  maxValue={100}
-                  onChange={(value) => {
-                    props.form.setValue("saleAllocationPercentage", value);
+                    props.form.setValue(
+                      "saleMode",
+                      checked ? "public-market" : "disabled",
+                    );
+                    if (!checked) {
+                      props.form.setValue("saleAllocationPercentage", "0");
+                    }
                   }}
-                  value={props.form.watch("saleAllocationPercentage")}
                 />
-                <span className="-translate-y-1/2 absolute top-1/2 right-3 text-muted-foreground text-sm">
-                  %
-                </span>
+              )}
+            </div>
+          </div>
+
+          {isRouterEnabledQuery.data === false && (
+            <div className="mt-4 flex items-center gap-1.5">
+              <div className="rounded-full border bg-background p-1">
+                <XIcon className="size-3 text-muted-foreground" />
               </div>
-            </FormFieldSetup>
-
-            <div className="grid grid-cols-1 gap-4 lg:grid-cols-2">
-              <FormFieldSetup
-                errorMessage={props.form.formState.errors.salePrice?.message}
-                isRequired
-                label="Price per Token"
-              >
-                <div className="relative">
-                  <DecimalInput
-                    onChange={(value) => {
-                      props.form.setValue("salePrice", value);
-                    }}
-                    value={props.form.watch("salePrice")}
-                  />
+              <h2 className="text-muted-foreground text-sm">
+                Not Available on {chainMeta?.name || props.chainId}
+              </h2>
+            </div>
+          )}
+        </div>
+
+        {isEnabled && isRouterEnabledQuery.data === true && (
+          <div className="space-y-5 pt-4">
+            {/* TODO - add this later */}
+            {/* <TabButtons
+              tabClassName="!text-sm"
+              tabIconClassName="size-3.5"
+              bottomLineClassName="bg-background border-b border-dashed"
+              tabs={[
+                {
+                  name: "Direct Sale",
+                  icon: isDirectSale ? CircleDotIcon : CircleIcon,
+                  onClick: () => {
+                    props.form.setValue("saleMode", "direct-sale");
+                  },
+                  isActive: isDirectSale,
+                },
+                {
+                  name: "Public Market",
+                  icon: isPublicMarket ? CircleDotIcon : CircleIcon,
+                  onClick: () => {
+                    props.form.setValue("saleMode", "public-market");
+                  },
+                  isActive: isPublicMarket,
+                },
+              ]}
+            /> */}
+
+            {isDirectSale && (
+              <div className="space-y-4">
+                <div>
+                  <h2 className="font-semibold text-base">Direct Sale</h2>
+                  <p className="text-muted-foreground text-sm">
+                    Make your coin available for purchase by setting a fixed
+                    price
+                  </p>
                 </div>
-              </FormFieldSetup>
-
-              <FormFieldSetup
-                errorMessage={
-                  props.form.formState.errors.saleTokenAddress?.message
-                }
-                isRequired
-                label="Currency"
-              >
-                <TokenSelector
-                  addNativeTokenIfMissing={true}
-                  chainId={Number(props.chainId)}
-                  className="bg-background"
+
+                <PrimarySaleConfig
+                  chainId={props.chainId}
                   client={props.client}
-                  disableAddress={true}
-                  onChange={(value) => {
-                    props.form.setValue("saleTokenAddress", value.address);
-                  }}
-                  selectedToken={{
-                    address: props.form.watch("saleTokenAddress"),
-                    chainId: Number(props.chainId),
-                  }}
-                  showCheck={true}
+                  form={props.form}
                 />
-              </FormFieldSetup>
-            </div>
+              </div>
+            )}
+
+            {isPublicMarket && (
+              <div className="space-y-4">
+                {/* <div>
+                  <h2 className="font-semibold text-base">Public Market</h2>
+                  <p className="text-muted-foreground text-sm">
+                    List and add liquidity for your coin on a decentralized
+                    exchange for purchase at fluctuating market price
+                  </p>
+                </div> */}
+
+                <PublicMarketConfig
+                  chainId={props.chainId}
+                  client={props.client}
+                  form={props.form}
+                />
+              </div>
+            )}
           </div>
         )}
       </div>
     </DynamicHeight>
   );
 }
+
+function PrimarySaleConfig(props: {
+  form: TokenDistributionForm;
+  chainId: string;
+  client: ThirdwebClient;
+}) {
+  const totalSupply = Number(props.form.watch("supply"));
+  const sellSupply = Math.floor(
+    (totalSupply * Number(props.form.watch("saleAllocationPercentage"))) / 100,
+  );
+
+  return (
+    <div className="grid grid-cols-1 gap-4 lg:grid-cols-2">
+      {/* supply % */}
+      <FormFieldSetup
+        errorMessage={
+          props.form.formState.errors.saleAllocationPercentage?.message
+        }
+        helperText={`${compactNumberFormatter.format(sellSupply)} tokens`}
+        isRequired
+        label="Sell % of Total Supply"
+      >
+        <div className="relative">
+          <DecimalInput
+            maxValue={100}
+            onChange={(value) => {
+              props.form.setValue("saleAllocationPercentage", value);
+            }}
+            value={props.form.watch("saleAllocationPercentage")}
+          />
+          <span className="-translate-y-1/2 absolute top-1/2 right-3 text-lg text-muted-foreground">
+            %
+          </span>
+        </div>
+      </FormFieldSetup>
+
+      {/* price  amount + currency*/}
+      <FormFieldSetup
+        errorMessage={
+          props.form.formState.errors.directSale?.priceAmount?.message ||
+          props.form.formState.errors.directSale?.currencyAddress?.message
+        }
+        isRequired
+        label="Price"
+      >
+        <div className="relative flex items-center">
+          <DecimalInput
+            className="rounded-r-none"
+            onChange={(value) => {
+              props.form.setValue("directSale.priceAmount", value);
+            }}
+            value={props.form.watch("directSale.priceAmount")}
+          />
+
+          <TokenSelector
+            addNativeTokenIfMissing={true}
+            chainId={Number(props.chainId)}
+            className="rounded-l-none border-l-0 bg-background"
+            client={props.client}
+            disableAddress={true}
+            onChange={(value) => {
+              props.form.setValue("directSale.currencyAddress", value.address);
+            }}
+            selectedToken={{
+              address: props.form.watch("directSale.currencyAddress"),
+              chainId: Number(props.chainId),
+            }}
+            showCheck={true}
+          />
+        </div>
+      </FormFieldSetup>
+    </div>
+  );
+}
+
+type TradingFees = TokenDistributionFormValues["publicMarket"]["tradingFees"];
+const tradingFeesOptions: TradingFees[] = ["0.01", "0.05", "0.3", "1"];
+
+function PublicMarketConfig(props: {
+  form: TokenDistributionForm;
+  chainId: string;
+  client: ThirdwebClient;
+}) {
+  const totalSupply = Number(props.form.watch("supply"));
+  const sellSupply = Math.floor(
+    (totalSupply * Number(props.form.watch("saleAllocationPercentage"))) / 100,
+  );
+
+  return (
+    <div className="grid grid-cols-1 gap-4 lg:grid-cols-2">
+      {/* supply % */}
+      <FormFieldSetup
+        errorMessage={
+          props.form.formState.errors.saleAllocationPercentage?.message
+        }
+        helperText={`${compactNumberFormatter.format(sellSupply)} tokens`}
+        isRequired
+        label="Sell % of Total Supply"
+      >
+        <div className="relative">
+          <DecimalInput
+            maxValue={100}
+            onChange={(value) => {
+              props.form.setValue("saleAllocationPercentage", value);
+            }}
+            value={props.form.watch("saleAllocationPercentage")}
+          />
+          <span className="-translate-y-1/2 absolute top-1/2 right-3 text-lg text-muted-foreground">
+            %
+          </span>
+        </div>
+      </FormFieldSetup>
+
+      {/* trading fees */}
+      <FormFieldSetup
+        errorMessage={
+          props.form.formState.errors.saleAllocationPercentage?.message
+        }
+        isRequired
+        label="Trading Fees"
+      >
+        <Select
+          onValueChange={(value) => {
+            props.form.setValue(
+              "publicMarket.tradingFees",
+              value as TradingFees,
+            );
+          }}
+          value={props.form.watch("publicMarket.tradingFees")}
+        >
+          <SelectTrigger>
+            <SelectValue placeholder="Select Fees" />
+          </SelectTrigger>
+          <SelectContent>
+            {tradingFeesOptions.map((option) => (
+              <SelectItem key={option} value={option}>
+                {option}%
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
+      </FormFieldSetup>
+    </div>
+  );
+}
+
+const compactNumberFormatter = new Intl.NumberFormat("en-US", {
+  maximumFractionDigits: 10,
+  notation: "compact",
+});
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/launch/launch-token.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/launch/launch-token.tsx
index ef0ad460c20..123a19621cd 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/launch/launch-token.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/launch/launch-token.tsx
@@ -79,16 +79,6 @@ export function LaunchTokenStatus(props: {
         label: "Deploy contract",
         status: { type: "idle" },
       },
-      {
-        id: stepIds["set-claim-conditions"],
-        label: "Set claim conditions",
-        status: { type: "idle" },
-      },
-      {
-        id: stepIds["mint-tokens"],
-        label: "Mint tokens",
-        status: { type: "idle" },
-      },
     ];
 
     if (formValues.airdropEnabled && formValues.airdropAddresses.length > 0) {
@@ -113,10 +103,6 @@ export function LaunchTokenStatus(props: {
       setContractLink(
         `/team/${props.teamSlug}/${props.projectSlug}/contract/${formValues.chain}/${result.contractAddress}`,
       );
-    } else if (stepId === "set-claim-conditions") {
-      await createTokenFunctions.setClaimConditions(formValues);
-    } else if (stepId === "mint-tokens") {
-      await createTokenFunctions.mintTokens(formValues);
     } else if (stepId === "airdrop-tokens") {
       await createTokenFunctions.airdropTokens(formValues);
     }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/token-info/token-info-fieldset.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/token-info/token-info-fieldset.tsx
index 7a0d4655c4f..76fc86fa4a3 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/token-info/token-info-fieldset.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/token/token-info/token-info-fieldset.tsx
@@ -8,6 +8,7 @@ import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { Form } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Skeleton } from "@/components/ui/skeleton";
 import { Textarea } from "@/components/ui/textarea";
 import { SocialUrlsFieldset } from "../../_common/SocialUrls";
 import { StepCard } from "../../_common/step-card";
@@ -94,7 +95,7 @@ export function TokenInfoFieldset(props: {
                 isRequired
                 label="Chain"
               >
-                <ClientOnly ssr={null}>
+                <ClientOnly ssr={<Skeleton className="h-10" />}>
                   <SingleNetworkSelector
                     chainId={Number(form.watch("chain"))}
                     className="bg-background"