Skip to content

Commit

Permalink
Fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
selankon committed Jan 26, 2024
1 parent 2331163 commit 3d363c0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 19 deletions.
24 changes: 8 additions & 16 deletions src/containers/defineExecutionMultisig/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import {Label} from '@aragon/ods-old';
import React, {useCallback, useEffect} from 'react';
import {
Controller,
useFormContext,
useWatch,
ValidateResult,
} from 'react-hook-form';
import React from 'react';
import {useTranslation} from 'react-i18next';
import styled from 'styled-components';

Expand Down Expand Up @@ -63,15 +57,13 @@ const DefineExecutionMultisig: React.FC = () => {
return (
<>
{/*Executive committee members*/}
{!isSettingPage && (
<FormItem>
<Label
label={t('createDao.executionMultisig.membersLabel')}
helpText={t('createDao.executionMultisig.membersDesc')}
/>
<AddCommittee />
</FormItem>
)}
<FormItem>
<Label
label={t('createDao.executionMultisig.membersLabel')}
helpText={t('createDao.executionMultisig.membersDesc')}
/>
<AddCommittee />
</FormItem>

{/*Minimum Approval*/}
<FormItem>
Expand Down
3 changes: 0 additions & 3 deletions src/pages/proposal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,6 @@ export const Proposal: React.FC = () => {
provider,
fetchToken,
t,
daoAddress,
proposal?.actions,
proposal,
]);

// caches the status for breadcrumb
Expand Down

0 comments on commit 3d363c0

Please sign in to comment.