Merge pull request #173 from ourzora/edit-founders-allocation

Edit founders allocation

Author: neokry

apps/web/src/modules/create-dao/components/AllocationForm/AllocationForm.schema.ts

@@ -3,7 +3,7 @@ import * as Yup from 'yup'
 import { isValidAddress } from 'src/utils/ens'
 import { getProvider } from 'src/utils/provider'
 
-const allocationSchema = Yup.object().shape({
+export const allocationSchema = Yup.object().shape({
   founderAddress: Yup.string()
     .test(
       'isValidAddress',
@@ -14,12 +14,12 @@ const allocationSchema = Yup.object().shape({
   allocationPercentage: Yup.number()
     .transform((value) => (isNaN(value) ? undefined : value))
     .required('*')
+    .integer('Must be whole number')
+    .max(100, '< 100')
     .when('admin', (admin, schema) => {
       if (!admin) return schema.min(1, '> 0') // (condition, errorMessage) - allocation represented as % must be greater than or equal to 0
       return schema
-    })
-    .max(100, '< 100')
-    .integer('Must be whole number'),
+    }),
   endDate: Yup.string()
     .required('*')
     .test('isDateInFuture', 'Must be in future', (value: string | undefined) => {

apps/web/src/modules/dao/components/AdminForm/AdminForm.schema.ts

@@ -1,7 +1,8 @@
 import { Provider } from '@ethersproject/abstract-provider'
 import * as Yup from 'yup'
 
-import { auctionSettingsValidationSchema } from 'src/modules/create-dao'
+import { TokenAllocation, auctionSettingsValidationSchema } from 'src/modules/create-dao'
+import { allocationSchema } from 'src/modules/create-dao/components/AllocationForm/AllocationForm.schema'
 import { Duration } from 'src/typings'
 import { isValidAddress } from 'src/utils/ens'
 import { durationValidationSchema, urlValidationSchema } from 'src/utils/yup'
@@ -17,6 +18,7 @@ export interface AdminFormValues {
   quorumThreshold: number
   votingPeriod: Duration
   votingDelay: Duration
+  founderAllocation: TokenAllocation[]
   vetoPower: boolean
   vetoer: string
 }
@@ -48,6 +50,16 @@ export const adminValidationSchema = (provider: Provider | undefined) =>
           { value: tenMinutes, description: '10 minutes' },
           { value: twentyFourWeeks, description: '24 weeks' }
         ),
+        founderAllocation: Yup.array()
+          .of(allocationSchema)
+          .test(
+            'unique',
+            'Founder allocation addresses should be unique.',
+            function (values) {
+              const addresses = values?.map((v) => v.founderAddress)
+              return values?.length === new Set(addresses)?.size
+            }
+          ),
         vetoPower: Yup.bool().required('*'),
       })
     )