fixed types

JoinColony · Mar 13, 2023 · 085b5dd · 085b5dd
1 parent 279e505
commit 085b5dd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 115 deletions.
diff --git a/src/modules/dashboard/components/Incorporation/IncorporationForm/IncorporationForm.tsx b/src/modules/dashboard/components/Incorporation/IncorporationForm/IncorporationForm.tsx
@@ -54,6 +54,10 @@ export const MSG = defineMessages({
     id: 'dashboard.Incorporation.IncorporationForm.descriptionLabel',
     defaultMessage: 'Describe the purpose of the DAO',
   },
+  currencyAndPeriod: {
+    id: 'dashboard.Incorporation.IncorporationForm.currencyAndPeriod',
+    defaultMessage: '{currency} / year',
+  },
 });
 
 const displayName = 'dashboard.Incorporation.IncorporationForm';
@@ -96,13 +100,16 @@ const IncorporationForm = ({ colony, sidebarRef }: Props) => {
             <FormattedMessage {...MSG.ongoingCost} />
           </div>
           <div className={styles.cost}>
+            <Icon name="usd-coin" appearance={{ size: 'medium' }} />
+            <Numeral
+              value={cost.reneval.amount || 0}
+              unit={getTokenDecimalsWithFallback(
+                cost.reneval.token && cost.reneval.token.decimals,
+              )}
+            />
             <FormattedMessage
-              {...MSG.cost}
-              values={{
-                icon: <Icon name="usd-coin" appearance={{ size: 'medium' }} />,
-                amount: '3,800 / year',
-                currency: 'USDC',
-              }}
+              {...MSG.currencyAndPeriod}
+              values={{ currency: cost.reneval.token.symbol }}
             />
           </div>
         </div>

diff --git a/src/modules/dashboard/components/Incorporation/IncorporationForm/Protectors/Protectors.tsx b/src/modules/dashboard/components/Incorporation/IncorporationForm/Protectors/Protectors.tsx
@@ -17,6 +17,7 @@ import Button from '~core/Button';
 import Link from '~core/Link';
 
 import SingleUserPicker from '../SingleUserPicker';
+import { SignOption } from '../constants';
 
 import styles from './Protectors.css';
 

diff --git a/src/modules/dashboard/components/Incorporation/Stages/FormStages.tsx b/src/modules/dashboard/components/Incorporation/Stages/FormStages.tsx
diff --git a/src/modules/dashboard/components/Incorporation/VerificationBanner/VerificationBanner.tsx b/src/modules/dashboard/components/Incorporation/VerificationBanner/VerificationBanner.tsx
@@ -3,7 +3,7 @@ import { defineMessages, FormattedMessage } from 'react-intl';
 
 import Button from '~core/Button';
 import UserMention from '~core/UserMention';
-import { AnyUser } from '~data/index';
+import { LoggedInUser } from '~data/index';
 import { useDialog } from '~core/Dialog';
 import RemoveNominationDialog from '~dashboard/Dialogs/RemoveNominationDialog';
 

diff --git a/src/modules/pages/components/IncorporationPage/IncorporationPage.tsx b/src/modules/pages/components/IncorporationPage/IncorporationPage.tsx
@@ -36,8 +36,8 @@ const IncorporationPage = () => {
   const { data: colonyData, loading } = useColonyFromNameQuery({
     variables: { name: colonyName, address: '' },
   });
-  const [isFormEditable, setFormEditable] = useState(false);
-  const [formValues, setFormValues] = useState<ValuesType>(formValuesMock);
+  const [isFormEditable, setFormEditable] = useState(true);
+  const [formValues, setFormValues] = useState<ValuesType>();
   const [shouldValidate, setShouldValidate] = useState(false);
   const [activeStageId, setActiveStageId] = useState(StagesEnum.Payment);
   const sidebarRef = useRef<HTMLElement>(null);