diff --git a/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx b/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx index 54165a357..e3fa42588 100644 --- a/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx +++ b/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx @@ -33,6 +33,8 @@ export const PoolSetupSection = () => { const form = useFormikContext() const { values } = form + console.log(values) + return ( @@ -88,7 +90,7 @@ export const PoolSetupSection = () => { { - if (form.values.adminMultisig && form.values.adminMultisig.signers?.length <= 10) { + if (values.adminMultisig && values.adminMultisig.signers?.length <= 10) { push('') } }} @@ -115,7 +117,7 @@ export const PoolSetupSection = () => { onBlur={field.onBlur} errorMessage={meta.touched && meta.error ? meta.error : undefined} value={field.value} - options={form.values.adminMultisig.signers.map((_: string, i: number) => ({ + options={values.adminMultisig.signers.map((_: string, i: number) => ({ label: i + 1, value: i + 1, }))} @@ -142,7 +144,7 @@ export const PoolSetupSection = () => { Add or remove addresses that can: Originate assets and invest in the pool* - {form.values.assetOriginators?.map((_: string, index: number) => ( + {values.assetOriginators?.map((_: string, index: number) => ( {({ field }: FieldProps) => } @@ -154,7 +156,7 @@ export const PoolSetupSection = () => { { - if (form.values.adminMultisig && form.values.adminMultisig.signers?.length <= 10) { + if (values.adminMultisig && values.adminMultisig.signers?.length <= 10) { push('') } }} @@ -207,12 +209,12 @@ export const PoolSetupSection = () => { {({ push, remove }) => ( <> - {form.values.poolFees.map((_, index) => ( + {values.poolFees.map((_, index) => ( Pool fees {index + 1} - {form.values.poolFees.length > 1 && ( + {values.poolFees.length > 1 && ( remove(index)}> @@ -330,7 +332,7 @@ export const PoolSetupSection = () => { {({ form }) => ( - {form.values.tranches.map((tranche, index) => ( + {values.tranches.map((tranche, index) => ( {({ field, meta }: FieldProps) => ( @@ -341,7 +343,7 @@ export const PoolSetupSection = () => { form.setFieldTouched(`subscriptionDocuments[${index}]`, true, false) form.setFieldValue(`subscriptionDocuments[${index}]`, file) }} - label={`Subscription document for ${tranche.trancheName}`} + label={`Subscription document for ${tranche.tokenName}`} errorMessage={meta.touched && meta.error ? meta.error : undefined} accept="application/pdf" small diff --git a/centrifuge-app/src/pages/IssuerCreatePool/types.ts b/centrifuge-app/src/pages/IssuerCreatePool/types.ts index f331e8590..9f1cfccdd 100644 --- a/centrifuge-app/src/pages/IssuerCreatePool/types.ts +++ b/centrifuge-app/src/pages/IssuerCreatePool/types.ts @@ -1,4 +1,4 @@ -import { PoolMetadataInput } from '@centrifuge/centrifuge-js' +import { FeeTypes, PoolMetadataInput } from '@centrifuge/centrifuge-js' import { isTestEnv } from '../../config' export interface Tranche { @@ -33,11 +33,40 @@ export const createPoolFee = () => ({ walletAddress: '', }) -export type CreatePoolValues = Omit & { +export type CreatePoolValues = Omit< + PoolMetadataInput, + 'poolIcon' | 'issuerLogo' | 'executiveSummary' | 'adminMultisig' | 'poolFees' | 'poolReport' | 'poolRatings' +> & { // pool structure assetDenomination: string + + // pool details + issuerCategories: { type: string; value: string }[] + poolIcon: File + issuerLogo: File + executiveSummary: File + + reportAuthorName: string + reportAuthorTitle: string + reportAuthorAvatar: File | null + reportUrl: string adminMultisigEnabled: boolean adminMultisig: Exclude + poolFees: { + id?: number + name: string + feeType: FeeTypes + percentOfNav: number | '' + walletAddress: string + feePosition: 'Top of waterfall' + category: string + }[] + poolRatings: { + agency?: string + value?: string + reportUrl?: string + reportFile?: File | null + }[] } export const initialValues: CreatePoolValues = {