fix old proposals (#1768)

solana-labs · Aug 13, 2023 · f539d0a · f539d0a · vercel · Aug 13, 2023
1 parent 837529c
commit f539d0a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/components/VotePanel/VotePanel.tsx b/components/VotePanel/VotePanel.tsx
@@ -29,21 +29,29 @@ const VotePanel = () => {
     proposal.account.state !== ProposalState.Draft &&
     !isVoteCast
 
-  const isMulti = proposal?.account.voteType !== VoteType.SINGLE_CHOICE;
+  const isMulti = proposal?.account.voteType !== VoteType.SINGLE_CHOICE
 
   return (
     <>
       {didNotVote && (
         <div className="bg-bkg-2 p-4 md:p-6 rounded-lg flex flex-col items-center justify-center">
-          <h3 className="text-center mb-0">{isMulti ? "You did not vote on this proposal" : "You did not vote electorally"}</h3>
+          <h3 className="text-center mb-0">
+            {isMulti
+              ? 'You did not vote on this proposal'
+              : 'You did not vote electorally'}
+          </h3>
           <Tooltip content="You did not vote on this proposal">
             <BanIcon className="h-[34px] w-[34px] fill-white/50 mt-2" />
           </Tooltip>
         </div>
       )}
       {/* START: Note that these components control for themselves whether they are displayed and may not be visible */}
       <YouVoted quorum="electoral" />
-      {proposal && isMulti ? <CastMultiVoteButtons proposal={proposal.account} /> : <CastVoteButtons /> }
+      {proposal && isMulti && proposal.account.options ? (
+        <CastMultiVoteButtons proposal={proposal.account} />
+      ) : (
+        <CastVoteButtons />
+      )}
       <YouVoted quorum="veto" />
       {!isMulti && <VetoButtons />}
       {/* END */}

diff --git a/pages/dao/[symbol]/proposal/[pk]/index.tsx b/pages/dao/[symbol]/proposal/[pk]/index.tsx
@@ -37,7 +37,7 @@ const Proposal = () => {
   const governance = useProposalGovernanceQuery().data?.result
   const descriptionLink = proposal?.account.descriptionLink
   const allowDiscussion = realmInfo?.allowDiscussion ?? true
-  const isMulti = proposal?.account.voteType !== VoteType.SINGLE_CHOICE;
+  const isMulti = proposal?.account.voteType !== VoteType.SINGLE_CHOICE
 
   const [description, setDescription] = useState('')
   const voteData = useProposalVotes(proposal?.account)
@@ -176,11 +176,14 @@ const Proposal = () => {
                 </div>
               )}
 
-              {isMulti ?
-                <MultiChoiceVotes proposal={proposal.account} limit={proposal.account.options.length}/>
-              :
+              {isMulti && proposal.account.options ? (
+                <MultiChoiceVotes
+                  proposal={proposal.account}
+                  limit={proposal.account.options.length}
+                />
+              ) : (
                 <VoteResults proposal={proposal.account} />
-              }
+              )}
               {proposal && (
                 <div className="flex justify-end mt-4">
                   <Link