Merge pull request #1090 from near-daos/fix/external-proposal-create-…

…update fix(create proposal external): fix groups and accounts parse, add mis…
near-daos · May 18, 2022 · f190289 · f190289
2 parents b05459d + 742f00a
commit f190289
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 17 deletions.
diff --git a/astro_2.0/features/CreateProposal/components/AddBountyContent/AddBountyContent.module.scss b/astro_2.0/features/CreateProposal/components/AddBountyContent/AddBountyContent.module.scss
@@ -15,6 +15,7 @@
     border-radius: 50%;
     height: 24px;
     margin-right: 8px;
+    overflow: hidden;
     width: 24px;
   }
 }
@@ -55,6 +56,7 @@
 
   button {
     border: 0;
+    margin-top: 8px;
     overflow: hidden;
   }
 
@@ -91,8 +93,9 @@
 }
 
 .loaderWrapper {
-  align-items: flex-end;
+  align-items: center;
   display: flex;
+  margin-top: 24px;
   padding: 8px;
 }
 

diff --git a/astro_2.0/features/CreateProposal/components/AddBountyContent/AddBountyContent.tsx b/astro_2.0/features/CreateProposal/components/AddBountyContent/AddBountyContent.tsx
@@ -40,7 +40,7 @@ export const AddBountyContent: FC = () => {
     ),
   }));
 
-  const selectedTokenData = tokens[getValues().selectedToken];
+  const selectedTokenData = tokens[getValues().token];
 
   const onTokenChange = useCallback(
     v => {
@@ -89,7 +89,9 @@ export const AddBountyContent: FC = () => {
             label="&nbsp;"
             {...register('token')}
             onChange={onTokenChange}
-            defaultValue={selectedTokenData?.symbol ?? 'NEAR'}
+            defaultValue={
+              selectedTokenData?.symbol ?? getValues().token ?? 'NEAR'
+            }
           />
         ) : (
           <div className={styles.loaderWrapper}>

diff --git a/....0/features/CreateProposal/components/AddMemberToGroupContent/AddMemberToGroupContent.tsx b/....0/features/CreateProposal/components/AddMemberToGroupContent/AddMemberToGroupContent.tsx
@@ -17,7 +17,7 @@ interface AddMemberToGroupContentProps {
 export const AddMemberToGroupContent: FC<AddMemberToGroupContentProps> = ({
   groups,
 }) => {
-  const { register, setValue, watch } = useFormContext();
+  const { register, setValue, getValues, watch } = useFormContext();
   const { t } = useTranslation();
 
   const currentValue = watch('memberName');
@@ -39,6 +39,7 @@ export const AddMemberToGroupContent: FC<AddMemberToGroupContentProps> = ({
           <DropdownSelect
             {...register('group')}
             onChange={onChange}
+            defaultValue={getValues().group}
             reverseMenu
             isBorderless
             options={groups.map(group => ({

diff --git a/.../CreateProposal/components/AddMemberToGroupContent/tests/AddMemberToGroupContent.spec.tsx b/.../CreateProposal/components/AddMemberToGroupContent/tests/AddMemberToGroupContent.spec.tsx
@@ -12,6 +12,9 @@ const formContextMock = {
   setValue: () => 0,
   register: () => 0,
   watch: () => '',
+  getValues: () => ({
+    group: 'Gr1',
+  }),
 };
 
 jest.mock('react-hook-form', () => {
@@ -45,7 +48,7 @@ describe('AddMemberToGroupContent', () => {
       <AddMemberToGroupContent groups={['Gr1', 'Gr2']} />
     );
 
-    fireEvent.click(getByText('proposalCard.chooseGroup'));
+    fireEvent.click(getByText('Gr1'));
     fireEvent.click(getByText('Gr2'));
 
     jest.runAllTimers();

diff --git a/astro_2.0/features/CreateProposal/components/ChangeLinksContent/ChangeLinksContent.tsx b/astro_2.0/features/CreateProposal/components/ChangeLinksContent/ChangeLinksContent.tsx
@@ -58,6 +58,7 @@ export const ChangeLinksContent: FC<ChangeLinksContentProps> = ({ daoId }) => {
                 <Input
                   isBorderless
                   {...register(`links.${index}.url`)}
+                  defaultValue={currentUrl}
                   onKeyUp={async () => {
                     await trigger();
                   }}

diff --git a/...s/CreateProposal/components/RemoveMemberFromGroupContent/RemoveMemberFromGroupContent.tsx b/...s/CreateProposal/components/RemoveMemberFromGroupContent/RemoveMemberFromGroupContent.tsx
@@ -16,7 +16,7 @@ interface ChangeDaoNameContentProps {
 export const RemoveMemberFromGroupContent: FC<ChangeDaoNameContentProps> = ({
   groups,
 }) => {
-  const { register, setValue } = useFormContext();
+  const { register, setValue, getValues } = useFormContext();
   const { t } = useTranslation();
 
   return (
@@ -31,6 +31,7 @@ export const RemoveMemberFromGroupContent: FC<ChangeDaoNameContentProps> = ({
                 shouldValidate: true,
               });
             }}
+            defaultValue={getValues().group}
             isBorderless
             options={groups.map(group => ({
               label: group,

diff --git a/...posal/components/RemoveMemberFromGroupContent/tests/RemoveMemberFromGroupContent.spec.tsx b/...posal/components/RemoveMemberFromGroupContent/tests/RemoveMemberFromGroupContent.spec.tsx
@@ -12,6 +12,9 @@ const formContextMock = {
     touchedFields: {},
   },
   register: () => 0,
+  getValues: () => ({
+    group: 'GR1',
+  }),
 };
 
 jest.mock('react-hook-form', () => {
@@ -45,7 +48,7 @@ describe('RemoveMemberFromGroupContent', () => {
       <RemoveMemberFromGroupContent groups={['GR1', 'GR2']} />
     );
 
-    fireEvent.click(getByText('proposalCard.chooseGroup'));
+    fireEvent.click(getByText('GR1'));
     fireEvent.click(getByText('GR2'));
 
     jest.runAllTimers();

diff --git a/astro_2.0/features/CreateProposal/components/TransferContent/TransferContent.module.scss b/astro_2.0/features/CreateProposal/components/TransferContent/TransferContent.module.scss
@@ -18,6 +18,7 @@
     border-radius: 50%;
     height: 24px;
     margin-right: 8px;
+    overflow: hidden;
     width: 24px;
   }
 }
@@ -62,6 +63,7 @@
 
   button {
     border: 0;
+    margin-top: 4px;
     overflow: hidden;
   }
 
@@ -115,8 +117,9 @@
 }
 
 .loaderWrapper {
-  align-items: flex-end;
+  align-items: center;
   display: flex;
+  margin-top: 24px;
   padding: 8px;
 }
 

diff --git a/astro_2.0/features/CreateProposal/components/TransferContent/TransferContent.tsx b/astro_2.0/features/CreateProposal/components/TransferContent/TransferContent.tsx
@@ -67,7 +67,7 @@ export const TransferContent: FC = () => {
     ),
   }));
 
-  const selectedTokenData = tokens[getValues().selectedToken];
+  const selectedTokenData = tokens[getValues().token];
 
   return (
     <div className={styles.root}>
@@ -98,7 +98,9 @@ export const TransferContent: FC = () => {
               shouldDirty: true,
             });
           }}
-          defaultValue={selectedTokenData?.symbol ?? 'NEAR'}
+          defaultValue={
+            selectedTokenData?.symbol ?? getValues().token ?? 'NEAR'
+          }
         />
       ) : (
         <div className={styles.loaderWrapper}>

diff --git a/astro_2.0/features/CreateProposal/helpers/initialValues.ts b/astro_2.0/features/CreateProposal/helpers/initialValues.ts
@@ -88,12 +88,16 @@ export function getFormInitialValues(
       };
     }
     case ProposalVariant.ProposeChangeDaoLinks: {
+      const initial = initialValues as { links?: string[] };
+
+      const links = initial ? initial?.links?.map(item => ({ url: item })) : [];
+
       return {
         details: '',
         externalUrl: '',
-        links: [],
         gas: DEFAULT_PROPOSAL_GAS,
         ...initialValues,
+        links,
       };
     }
     case ProposalVariant.ProposeCreateToken: {

diff --git a/components/inputs/selects/DropdownSelect.tsx b/components/inputs/selects/DropdownSelect.tsx
@@ -1,7 +1,6 @@
 import cn from 'classnames';
 import { useSelect } from 'downshift';
 import React, { ReactNode, useEffect } from 'react';
-import { useTranslation } from 'next-i18next';
 
 import { Icon } from 'components/Icon';
 
@@ -75,8 +74,6 @@ export const DropdownSelect = React.forwardRef<
       }
     }, [defaultValue, options, selectItem, selectedItem]);
 
-    const { t } = useTranslation();
-
     return (
       <div className={cn(styles.root, className)}>
         {label && (
@@ -96,9 +93,7 @@ export const DropdownSelect = React.forwardRef<
             <div className={styles.container}>
               <div className={styles.selected}>
                 {selectedItem?.component ?? (
-                  <div className={styles.placeholder}>
-                    {placeholder || t('proposalCard.chooseGroup')}
-                  </div>
+                  <div className={styles.placeholder}>{placeholder || ''}</div>
                 )}
               </div>
               {controlIcon || (

diff --git a/pages/api/createProposal.ts b/pages/api/createProposal.ts
@@ -11,6 +11,13 @@ export default function handler(
       'https://dev.app.astrodao.com/dao/aviarium.sputnikv2.testnet/proposals?action=create_proposal&variant=ProposeCustomFunctionCall&params={"details":"Proposal description here", "methodName": "create", "smartContractAddress": "sputnikv2.testnet", "json":{ "key": "some value" }}',
     action: 'create_proposal',
     variant: {
+      ProposeChangeDaoLegalInfo: {
+        details: '',
+        externalUrl: '',
+        legalStatus: '',
+        legalLink: '',
+        gas: '',
+      },
       ProposeAddMember: {
         details: '',
         externalUrl: '',