Update

Author: kien-ngo

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/hooks.ts

@@ -2,6 +2,7 @@ import {
   type BaseTransactionOptions,
   type ThirdwebClient,
   toTokens,
+  toUnits,
 } from "thirdweb";
 import type { OverrideEntry } from "thirdweb/dist/types/utils/extensions/drops/types";
 import type { Prettify } from "thirdweb/dist/types/utils/type-utils";
@@ -107,15 +108,41 @@ export async function getClaimPhasesInLegacyFormat(
 
 type PhaseInput = z.input<typeof LegacyClaimConditionInputSchema>;
 
-export function setClaimPhasesTx(
+export async function setClaimPhasesTx(
   baseOptions: BaseTransactionOptions<Options>,
   rawPhases: PhaseInput[],
 ) {
+  const tokenDecimals =
+    baseOptions.type === "erc20"
+      ? await ERC20Ext.decimals({
+          contract: baseOptions.contract,
+        }).catch(() => 0)
+      : 0;
   const phases = rawPhases.map((phase) => {
+    let _maxClaimable = toBigInt(phase.maxClaimableSupply);
+    if (typeof _maxClaimable === "bigint" && _maxClaimable !== maxUint256) {
+      _maxClaimable = toUnits(String(_maxClaimable), tokenDecimals);
+    }
+    let _maxClaimablePerWallet = toBigInt(phase.maxClaimablePerWallet);
+    if (
+      typeof _maxClaimablePerWallet === "bigint" &&
+      _maxClaimablePerWallet !== maxUint256
+    ) {
+      _maxClaimablePerWallet = toUnits(
+        String(_maxClaimablePerWallet),
+        tokenDecimals,
+      );
+    }
     return {
       startTime: toDate(phase.startTime),
-      maxClaimableSupply: toBigInt(phase.maxClaimableSupply),
-      maxClaimablePerWallet: toBigInt(phase.maxClaimablePerWallet),
+      maxClaimableSupply:
+        baseOptions.type === "erc20"
+          ? _maxClaimable
+          : toBigInt(phase.maxClaimableSupply),
+      maxClaimablePerWallet:
+        baseOptions.type === "erc20"
+          ? _maxClaimablePerWallet
+          : toBigInt(phase.maxClaimablePerWallet),
       merkleRootHash: phase.merkleRootHash as string | undefined,
       overrideList: phase.snapshot?.length
         ? snapshotToOverrides(phase.snapshot)

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx

@@ -355,7 +355,7 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
     });
 
     try {
-      const tx = setClaimPhasesTx(
+      const tx = await setClaimPhasesTx(
         {
           contract,
           ...(isErc20