Skip to content

Fix getClaimConditions #6701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2025
Merged

Fix getClaimConditions #6701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6b1803
Fix getClaimConditions
kumaryash90 Apr 11, 2025
be7199d
Merge branch 'main' into yash/fix-getclaimconditions
kumaryash90 Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .../[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ type Options =
};

export async function getClaimPhasesInLegacyFormat(
options: BaseTransactionOptions<Options>,
options: BaseTransactionOptions<Options> & { isMultiPhase: boolean },
): Promise<CombinedClaimCondition[]> {
const conditions = await (async () => {
switch (options.type) {
Expand All @@ -64,7 +64,10 @@ export async function getClaimPhasesInLegacyFormat(
case "erc721":
return ERC721Ext.getClaimConditions(options);
case "erc1155":
return ERC1155Ext.getClaimConditions(options);
return ERC1155Ext.getClaimConditions({
...options,
singlePhaseDrop: !options.isMultiPhase,
});
}
})();

Expand Down
1 change: 1 addition & 0 deletions ...[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({

const claimConditionsQuery = useReadContract(getClaimPhasesInLegacyFormat, {
contract,
isMultiPhase,
...(isErc20
? { type: "erc20", decimals: tokenDecimals.data }
: isErc721
Expand Down
65 changes: 32 additions & 33 deletions packages/thirdweb/src/extensions/erc1155/drops/read/getClaimConditions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,36 @@ export type GetClaimConditionsParams = {
* ```
*/
export async function getClaimConditions(
options: BaseTransactionOptions<GetClaimConditionsParams>,
options: BaseTransactionOptions<GetClaimConditionsParams> & {
singlePhaseDrop?: boolean;
},
): Promise<ClaimCondition[]> {
const [multi, single] = await Promise.allSettled([
(async () => {
try {
if (options.singlePhaseDrop) {
return SinglePhase.claimCondition(options).then(
([
startTimestamp,
maxClaimableSupply,
supplyClaimed,
quantityLimitPerWallet,
merkleRoot,
pricePerToken,
currency,
metadata,
]) => [
{
startTimestamp,
maxClaimableSupply,
supplyClaimed,
quantityLimitPerWallet,
merkleRoot,
pricePerToken,
currency,
metadata,
},
],
);
} else {
const [startId, count] = await MultiPhase.claimCondition(options);

const conditionPromises: Array<
Expand All @@ -38,37 +64,10 @@ export async function getClaimConditions(
);
}
return Promise.all(conditionPromises);
})(),
SinglePhase.claimCondition(options).then(
([
startTimestamp,
maxClaimableSupply,
supplyClaimed,
quantityLimitPerWallet,
merkleRoot,
pricePerToken,
currency,
metadata,
]) => ({
startTimestamp,
maxClaimableSupply,
supplyClaimed,
quantityLimitPerWallet,
merkleRoot,
pricePerToken,
currency,
metadata,
}),
),
]);
if (multi.status === "fulfilled") {
return multi.value;
}
} catch {
throw new Error("Claim condition not found");
}
if (single.status === "fulfilled") {
return [single.value];
}

throw new Error("Claim condition not found");
}

/**
Expand Down
Loading