diff --git a/centrifuge-app/src/components/PoolOverview/TransactionHistory.tsx b/centrifuge-app/src/components/PoolOverview/TransactionHistory.tsx index 779cb85df..27a522749 100644 --- a/centrifuge-app/src/components/PoolOverview/TransactionHistory.tsx +++ b/centrifuge-app/src/components/PoolOverview/TransactionHistory.tsx @@ -292,7 +292,7 @@ export const TransactionHistoryTable = ({ View all )} - {transactions?.length && ( + {transactions?.length ? ( Download - )} + ) : null} diff --git a/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx b/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx index 7b85f1419..675c149b4 100644 --- a/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx +++ b/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx @@ -64,8 +64,6 @@ export const PoolSetupSection = () => { form.setFieldValue('adminMultisig.signers[0]', selectedAccount?.address) }, []) - console.log(values) - return ( @@ -89,6 +87,7 @@ export const PoolSetupSection = () => { form.setFieldValue('adminMultisigEnabled', false) }} isChecked={!values.adminMultisigEnabled} + id="singleMultisign" /> { form.setFieldValue('adminMultisig.signers', [form.values.adminMultisig.signers[0], '']) }} isChecked={values.adminMultisigEnabled} + id="multiMultisign" /> @@ -223,7 +223,7 @@ export const PoolSetupSection = () => { {values.assetOriginators?.map((_: string, index: number) => ( - {({ field, form, meta }: FieldProps) => ( + {({ field, form }: FieldProps) => ( { form.setFieldValue(`assetOriginators.${index}`, val.target.value) }} as={TextInput} - onBlur={field.onBlur} + onBlur={() => { + form.setFieldTouched(`assetOriginators.${index}`, true) + const value = form.values.assetOriginators[index] + if (value) { + const transformedValue = isEvmAddress(value) + ? evmToSubstrateAddress(value, chainId ?? 0) + : value + form.setFieldValue(`assetOriginators.${index}`, transformedValue) + } + }} /> )} diff --git a/centrifuge-app/src/pages/IssuerCreatePool/index.tsx b/centrifuge-app/src/pages/IssuerCreatePool/index.tsx index 3fd68d13c..baec4a060 100644 --- a/centrifuge-app/src/pages/IssuerCreatePool/index.tsx +++ b/centrifuge-app/src/pages/IssuerCreatePool/index.tsx @@ -94,7 +94,7 @@ const IssuerCreatePoolPage = () => { const [step, setStep] = useState(1) const [stepCompleted, setStepCompleted] = useState({ 1: false, 2: false, 3: false }) const [multisigData, setMultisigData] = useState<{ hash: string; callData: string }>() - const [isMultisigDialogOpen, setIsMultisigDialogOpen] = useState(true) + const [isMultisigDialogOpen, setIsMultisigDialogOpen] = useState(false) const [createdModal, setCreatedModal] = useState(false) const [preimageHash, setPreimageHash] = useState('') const [isPreimageDialogOpen, setIsPreimageDialogOpen] = useState(false) @@ -387,6 +387,11 @@ const IssuerCreatePoolPage = () => { } } + // Issuer categories + if (values.issuerCategories[0].value === '') { + metadataValues.issuerCategories = [] + } + createProxies([ (aoProxy, adminProxy) => { createPoolTx( @@ -508,7 +513,7 @@ const IssuerCreatePoolPage = () => { small onClick={handleNextStep} loading={createProxiesIsPending || transactionIsPending || form.isSubmitting} - disabled={step === 3} + disabled={step === 3 ? !(Object.keys(errors).length === 0) : false} > {step === 3 ? 'Create pool' : 'Next'}