resolve comments

src/containers/privacyPolicy/privacyPolicyContent.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import {useTranslation} from 'react-i18next';
-import {ButtonText, Link} from '@aragon/ods-old';
+import {ButtonText} from '@aragon/ods-old';
 import {htmlIn} from 'utils/htmlIn';
 
 type PrivacyPolicyContentProps = {

src/containers/proposalStepper/index.tsx

@@ -46,12 +46,6 @@ const ProposalStepper: React.FC<ProposalStepperType> = ({
     pluginType: daoDetails?.plugins?.[0]?.id as PluginTypes,
   });
 
-  // plugin data
-  const {data: daoMembers, isLoading: membersLoading} = useDaoMembers(
-    daoDetails?.plugins?.[0]?.instanceAddress as string,
-    daoDetails?.plugins?.[0]?.id as PluginTypes
-  );
-
   const {actions} = useActionsContext();
   const {open} = useGlobalModalContext();
 
@@ -154,10 +148,7 @@ const ProposalStepper: React.FC<ProposalStepperType> = ({
           next();
         }}
       >
-        <SetupVotingForm
-          pluginSettings={votingSettings}
-          daoMembers={daoMembers}
-        />
+        <SetupVotingForm pluginSettings={votingSettings} />
       </Step>
       <Step
         wizardTitle={t('newProposal.configureActions.heading')}

src/containers/setupVotingForm/index.tsx

@@ -13,14 +13,12 @@ import {
 } from 'utils/types';
 import SetupMultisigVotingForm from './multisig';
 import SetupTokenVotingForm from './tokenVoting';
-import {DaoMembersData} from 'hooks/useDaoMembers';
 
 export type Props = {
   pluginSettings: SupportedVotingSettings;
-  daoMembers?: DaoMembersData;
 };
 
-const SetupVotingForm: React.FC<Props> = ({pluginSettings, daoMembers}) => {
+const SetupVotingForm: React.FC<Props> = ({pluginSettings}) => {
   const {setError, clearErrors} = useFormContext<ProposalFormData>();
 
   /*************************************************
@@ -38,12 +36,7 @@ const SetupVotingForm: React.FC<Props> = ({pluginSettings, daoMembers}) => {
   if (isTokenVotingSettings(pluginSettings)) {
     return <SetupTokenVotingForm pluginSettings={pluginSettings} />;
   } else if (isMultisigVotingSettings(pluginSettings)) {
-    return (
-      <SetupMultisigVotingForm
-        pluginSettings={pluginSettings}
-        daoMembers={daoMembers}
-      />
-    );
+    return <SetupMultisigVotingForm pluginSettings={pluginSettings} />;
   }
 
   // TODO: We need an error output/boundary for when a network error occurs

src/containers/setupVotingForm/multisig.tsx

@@ -26,6 +26,9 @@ import {DateTimeErrors} from './dateTimeErrors';
 import {ProposalFormData} from 'utils/types';
 import {Props as SetupVotingProps} from 'containers/setupVotingForm';
 import {MultisigVotingSettings} from '@aragon/sdk-client';
+import {PluginTypes} from 'hooks/usePluginClient';
+import {useDaoMembers} from 'hooks/useDaoMembers';
+import {useDaoDetailsQuery} from 'hooks/useDaoDetails';
 
 const MAX_DURATION_MILLS =
   MULTISIG_MAX_REC_DURATION_DAYS * MINS_IN_DAY * 60 * 1000;
@@ -34,10 +37,15 @@ export type UtcInstance = 'first' | 'second';
 
 const SetupMultisigVotingForm: React.FC<SetupVotingProps> = ({
   pluginSettings,
-  daoMembers,
 }) => {
   const {t} = useTranslation();
   const {open} = useGlobalModalContext();
+  const {data: daoDetails} = useDaoDetailsQuery();
+  // plugin data
+  const {data: daoMembers} = useDaoMembers(
+    daoDetails?.plugins?.[0]?.instanceAddress as string,
+    daoDetails?.plugins?.[0]?.id as PluginTypes
+  );
 
   const [utcInstance, setUtcInstance] = useState<UtcInstance>('first');
   const {control, formState, getValues, resetField, setValue, trigger} =

src/containers/smartContractComposer/emptyStateModal/emptyState.tsx

@@ -37,6 +37,7 @@ const EmptyState: React.FC<Props> = props => {
           object="smart_contract"
           title={t('scc.emptyState.title')}
           description={htmlIn(t)('scc.emptyState.description')}
+          renderHtml
           primaryButton={{
             label: t('scc.emptyState.ctaLabel'),
             onClick: () => {