Merge pull request #2733 from decentdao/release/v0.7.0

Release/v0.7.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "decent-interface",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "private": true,
   "dependencies": {
     "@amplitude/analytics-browser": "^2.11.1",

src/components/Proposals/ProposalActions/AzoriusOrSnapshotProposalAction.tsx

@@ -1,8 +1,5 @@
-import { Button } from '@chakra-ui/react';
 import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 import useSnapshotProposal from '../../../hooks/DAO/loaders/snapshot/useSnapshotProposal';
-import { useFractal } from '../../../providers/App/AppProvider';
 import { AzoriusProposal, FractalProposalState, SnapshotProposal } from '../../../types';
 import { useVoteContext } from '../ProposalVotes/context/VoteContext';
 import { CastVote } from './CastVote';
@@ -22,15 +19,9 @@ function ProposalActions({ proposal }: { proposal: AzoriusProposal | SnapshotPro
 
 export function AzoriusOrSnapshotProposalAction({
   proposal,
-  expandedView,
 }: {
   proposal: AzoriusProposal | SnapshotProposal;
-  expandedView?: boolean;
 }) {
-  const {
-    governance: { isAzorius },
-  } = useFractal();
-  const { t } = useTranslation();
   const { snapshotProposal } = useSnapshotProposal(proposal);
   const { canVote } = useVoteContext();
 
@@ -46,33 +37,11 @@ export function AzoriusOrSnapshotProposalAction({
     proposal.state === FractalProposalState.TIMELOCKABLE ||
     proposal.state === FractalProposalState.TIMELOCKED;
 
-  const label = useMemo(() => {
-    if (snapshotProposal) {
-      return t('details');
-    }
-
-    if (isActiveProposal) {
-      if (!canVote) {
-        return t('details');
-      }
-      return t(isAzorius ? 'vote' : 'sign');
-    }
-    return t('details');
-  }, [snapshotProposal, t, canVote, isAzorius, isActiveProposal]);
-
   if (!showActionButton) {
-    if (!expandedView) {
-      return <Button variant="secondary">{t('details')}</Button>;
-    }
-    // This means that Proposal in state where there's no action to perform
     return null;
   }
 
-  if (expandedView) {
-    if (!snapshotProposal && isActiveProposal && !canVote) return null;
-
-    return <ProposalActions proposal={proposal} />;
-  }
+  if (!snapshotProposal && isActiveProposal && !canVote) return null;
 
-  return <Button variant={showActionButton && canVote ? 'primary' : 'secondary'}>{label}</Button>;
+  return <ProposalActions proposal={proposal} />;
 }

src/components/Proposals/ProposalActions/CastVote.tsx

@@ -171,7 +171,10 @@ export function CastVote({ proposal }: { proposal: FractalProposal }) {
             : undefined
       }
     >
-      <RadioGroup>
+      <RadioGroup
+        mt={6}
+        mx={-2}
+      >
         {VOTE_CHOICES.map(choice => (
           <Radio
             key={choice.value}
@@ -194,14 +197,15 @@ export function CastVote({ proposal }: { proposal: FractalProposal }) {
               color: 'lilac--3',
               borderWidth: '6px',
             }}
+            mb={2}
           >
             {t(choice.label, { ns: 'common' })}
           </Radio>
         ))}
         <Button
           marginTop={5}
-          padding="1.5rem 6rem"
-          height="auto"
+          padding="3"
+          height="3.25rem"
           width="full"
           isDisabled={disabled}
           onClick={() => selectedVoteChoice !== undefined && castVote(selectedVoteChoice)}