From eeafda455ae2e61b3108108aaaa0014c8b5f5df4 Mon Sep 17 00:00:00 2001 From: Serkan Reis Date: Wed, 3 May 2023 11:52:26 +0300 Subject: [PATCH] Free mint related changes --- .../collections/creation/MintingDetails.tsx | 8 +++++++- .../collections/creation/WhitelistDetails.tsx | 8 +++++++- pages/collections/create.tsx | 15 ++------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/components/collections/creation/MintingDetails.tsx b/components/collections/creation/MintingDetails.tsx index 7f6d806..09bd3ca 100644 --- a/components/collections/creation/MintingDetails.tsx +++ b/components/collections/creation/MintingDetails.tsx @@ -1,3 +1,5 @@ +/* eslint-disable eslint-comments/disable-enable-pair */ +/* eslint-disable no-nested-ternary */ import { FormControl } from 'components/FormControl' import { FormGroup } from 'components/FormGroup' import { useInputState, useNumberInputState } from 'components/forms/FormInput.hooks' @@ -75,7 +77,11 @@ export const MintingDetails = ({ onChange, numberOfTokens, uploadMethod, minimum if (numberOfTokens) numberOfTokensState.onChange(numberOfTokens) const data: MintingDetailsDataProps = { numTokens: numberOfTokensState.value, - unitPrice: unitPriceState.value ? (Number(unitPriceState.value) * 1_000_000).toString() : '', + unitPrice: unitPriceState.value + ? (Number(unitPriceState.value) * 1_000_000).toString() + : unitPriceState.value === 0 + ? '0' + : '', perAddressLimit: perAddressLimitState.value, startTime: timestamp ? (timestamp.getTime() * 1_000_000).toString() : '', paymentAddress: paymentAddressState.value.trim(), diff --git a/components/collections/creation/WhitelistDetails.tsx b/components/collections/creation/WhitelistDetails.tsx index 488a3e7..3f9daa7 100644 --- a/components/collections/creation/WhitelistDetails.tsx +++ b/components/collections/creation/WhitelistDetails.tsx @@ -1,3 +1,5 @@ +/* eslint-disable eslint-comments/disable-enable-pair */ +/* eslint-disable no-nested-ternary */ import { FormControl } from 'components/FormControl' import { FormGroup } from 'components/FormGroup' import { AddressList } from 'components/forms/AddressList' @@ -102,7 +104,11 @@ export const WhitelistDetails = ({ onChange }: WhitelistDetailsProps) => { .replace(/'/g, '') .replace(/ /g, ''), members: whitelistType === 'standard' ? whitelistStandardArray : whitelistFlexArray, - unitPrice: unitPriceState.value ? (Number(unitPriceState.value) * 1_000_000).toString() : '', + unitPrice: unitPriceState.value + ? (Number(unitPriceState.value) * 1_000_000).toString() + : unitPriceState.value === 0 + ? '0' + : undefined, startTime: startDate ? (startDate.getTime() * 1_000_000).toString() : '', endTime: endDate ? (endDate.getTime() * 1_000_000).toString() : '', perAddressLimit: perAddressLimitState.value, diff --git a/pages/collections/create.tsx b/pages/collections/create.tsx index bc3fc0b..f0c1cc9 100644 --- a/pages/collections/create.tsx +++ b/pages/collections/create.tsx @@ -483,18 +483,6 @@ const CollectionCreationPage: NextPage = () => { }, } - console.log('Whitelist State: ', whitelistDetails?.whitelistState) - console.log('Whitelist Type: ', whitelistDetails?.whitelistType) - console.log( - 'Factory Address: ', - whitelistDetails?.whitelistState !== 'none' && whitelistDetails?.whitelistType === 'flex' - ? VENDING_FACTORY_FLEX_ADDRESS - : collectionDetails?.updatable - ? VENDING_FACTORY_UPDATABLE_ADDRESS - : VENDING_FACTORY_ADDRESS, - ) - - console.log('Whitelist: ', whitelist) const payload: VendingFactoryDispatchExecuteArgs = { contract: whitelistDetails?.whitelistState !== 'none' && whitelistDetails?.whitelistType === 'flex' @@ -820,6 +808,7 @@ const CollectionCreationPage: NextPage = () => { const checkMintingDetails = () => { if (!mintingDetails) throw new Error('Please fill out the minting details') if (mintingDetails.numTokens < 1 || mintingDetails.numTokens > 10000) throw new Error('Invalid number of tokens') + if (mintingDetails.unitPrice === '') throw new Error('Public mint price is required') if (whitelistDetails?.whitelistState !== 'none' && whitelistDetails?.whitelistType === 'flex') { if (Number(mintingDetails.unitPrice) < Number(minimumFlexMintPrice)) throw new Error(`Invalid unit price: The minimum unit price is ${Number(minimumFlexMintPrice) / 1000000} STARS`) @@ -893,7 +882,7 @@ const CollectionCreationPage: NextPage = () => { } } else if (whitelistDetails.whitelistState === 'new') { if (whitelistDetails.members?.length === 0) throw new Error('Whitelist member list cannot be empty') - if (whitelistDetails.unitPrice === '') throw new Error('Whitelist unit price is required') + if (whitelistDetails.unitPrice === undefined) throw new Error('Whitelist unit price is required') if (Number(whitelistDetails.unitPrice) < 0) throw new Error('Invalid unit price: The unit price cannot be negative') if (whitelistDetails.startTime === '') throw new Error('Start time is required')