Fix: APP-2461 - Fix execution status (#1093)

* add executed status * voting terminal taking in pluginType
aragon · Oct 26, 2023 · 06098ab · 06098ab
1 parent bd4091f
commit 06098ab
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 39 deletions.
diff --git a/src/containers/reviewProposal/index.tsx b/src/containers/reviewProposal/index.tsx
@@ -255,18 +255,21 @@ const ReviewProposal: React.FC<ReviewProposalProps> = ({
             )}
           />
 
-          <VotingTerminal
-            breakdownTabDisabled
-            votersTabDisabled
-            voteNowDisabled
-            selectedTab="info"
-            statusLabel={t('votingTerminal.status.draft')}
-            startDate={formattedStartDate}
-            endDate={formattedEndDate}
-            preciseEndDate={formattedPreciseEndDate}
-            daoToken={daoToken}
-            {...terminalProps}
-          />
+          {votingSettings && (
+            <VotingTerminal
+              pluginType={pluginType}
+              breakdownTabDisabled
+              votersTabDisabled
+              voteNowDisabled
+              selectedTab="info"
+              statusLabel={t('votingTerminal.status.draft')}
+              startDate={formattedStartDate}
+              endDate={formattedEndDate}
+              preciseEndDate={formattedPreciseEndDate}
+              daoToken={daoToken}
+              {...terminalProps}
+            />
+          )}
 
           <ExecutionWidget
             actions={getNonEmptyActions(

diff --git a/src/containers/votingTerminal/index.tsx b/src/containers/votingTerminal/index.tsx
@@ -31,6 +31,7 @@ import {CHAIN_METADATA} from 'utils/constants';
 import {Web3Address, shortenAddress} from 'utils/library';
 import BreakdownTab from './breakdownTab';
 import InfoTab from './infoTab';
+import {PluginTypes} from 'hooks/usePluginClient';
 
 export type ProposalVoteResults = {
   yes: {value: string | number; percentage: number};
@@ -70,6 +71,7 @@ export type VotingTerminalProps = {
   alertMessage?: string;
   selectedTab?: TerminalTabs;
   onTabSelected?: React.Dispatch<React.SetStateAction<TerminalTabs>>;
+  pluginType: PluginTypes;
   executableWithNextApproval?: boolean;
 };
 
@@ -103,6 +105,7 @@ export const VotingTerminal: React.FC<VotingTerminalProps> = ({
   alertMessage,
   selectedTab = 'info',
   onTabSelected,
+  pluginType,
   executableWithNextApproval = false,
 }) => {
   const [page, setPage] = useState(1);
@@ -114,7 +117,8 @@ export const VotingTerminal: React.FC<VotingTerminalProps> = ({
   const {network} = useNetwork();
   const fetchPastVotingPower = usePastVotingPowerAsync();
 
-  const isMultisigProposal = !!approvals && !!minApproval;
+  const isMultisigProposal =
+    pluginType === 'multisig.plugin.dao.eth' && !!approvals && !!minApproval;
 
   useEffect(() => {
     // fetch avatar fpr each voter

diff --git a/src/pages/proposal.tsx b/src/pages/proposal.tsx
@@ -693,31 +693,34 @@ export const Proposal: React.FC = () => {
               />
             )}
 
-          <VotingTerminal
-            status={proposalStatus}
-            daoToken={daoToken}
-            blockNumber={proposal.creationBlockNumber}
-            statusLabel={voteStatus}
-            selectedTab={terminalTab}
-            alertMessage={alertMessage}
-            onTabSelected={setTerminalTab}
-            onVoteClicked={handleVoteClick}
-            onApprovalClicked={handleApprovalClick}
-            onCancelClicked={() => setVotingInProcess(false)}
-            voteButtonLabel={voteButtonLabel}
-            voteNowDisabled={votingDisabled}
-            votingInProcess={votingInProcess}
-            executableWithNextApproval={executableWithNextApproval}
-            onVoteSubmitClicked={vote =>
-              handlePrepareVote({
-                vote,
-                replacement: voted || voteOrApprovalSubmitted,
-                voteTokenAddress: (proposal as TokenVotingProposal).token
-                  ?.address,
-              })
-            }
-            {...mappedProps}
-          />
+          {votingSettings && (
+            <VotingTerminal
+              status={proposalStatus}
+              pluginType={pluginType}
+              daoToken={daoToken}
+              blockNumber={proposal.creationBlockNumber}
+              statusLabel={voteStatus}
+              selectedTab={terminalTab}
+              alertMessage={alertMessage}
+              onTabSelected={setTerminalTab}
+              onVoteClicked={handleVoteClick}
+              onApprovalClicked={handleApprovalClick}
+              onCancelClicked={() => setVotingInProcess(false)}
+              voteButtonLabel={voteButtonLabel}
+              voteNowDisabled={votingDisabled}
+              votingInProcess={votingInProcess}
+              executableWithNextApproval={executableWithNextApproval}
+              onVoteSubmitClicked={vote =>
+                handlePrepareVote({
+                  vote,
+                  replacement: voted || voteOrApprovalSubmitted,
+                  voteTokenAddress: (proposal as TokenVotingProposal).token
+                    ?.address,
+                })
+              }
+              {...mappedProps}
+            />
+          )}
 
           <ExecutionWidget
             pluginType={pluginType}

diff --git a/src/services/aragon-sdk/selectors/proposal.ts b/src/services/aragon-sdk/selectors/proposal.ts
@@ -117,7 +117,11 @@ function syncExecutionInfo(
       chainId,
       proposal.id
     );
-    Object.assign(proposal, executionDetail);
+
+    if (executionDetail) {
+      Object.assign(proposal, executionDetail);
+      proposal.status = ProposalStatus.EXECUTED;
+    }
   }
 }