vote details fixes.

OmniFlix · Mar 19, 2024 · c5c6d61 · c5c6d61
1 parent 755f9e1
commit c5c6d61
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/actions/proposals.js b/src/actions/proposals.js
@@ -156,7 +156,7 @@ export const fetchVoteDetails = (id, address) => (dispatch) => {
         },
     })
         .then((res) => {
-            dispatch(fetchVoteDetailsSuccess(res.data && res.data.result));
+            dispatch(fetchVoteDetailsSuccess(res.data && res.data.vote));
         })
         .catch((error) => {
             dispatch(fetchVoteDetailsError(

diff --git a/src/constants/url.js b/src/constants/url.js
@@ -17,6 +17,6 @@ export const PROPOSALS_LIST_URL = `${REST_URL}/cosmos/gov/v1beta1/proposals?pagi
 export const getDelegatedValidatorsURL = (address) => `${REST_URL}/cosmos/staking/v1beta1/delegators/${address}/validators`;
 export const urlFetchProposalVotes = (id) => `${REST_URL}/cosmos/gov/v1beta1/proposals/${id}/votes`;
 export const urlFetchTallyDetails = (id) => `${REST_URL}/cosmos/gov/v1beta1/proposals/${id}/tally`;
-export const urlFetchProposalDetails = (id) => `${REST_URL}/cosmos/tx/v1beta1/txs?events=submit_proposal.proposal_id=${id}`;
+export const urlFetchProposalDetails = (id) => `${REST_URL}/cosmos/gov/v1/proposals/${id}`;
 
 export const validatorImageURL = (id) => `https://keybase.io/_/api/1.0/user/lookup.json?fields=pictures&key_suffix=${id}`;
diff --git a/src/containers/Proposals/Cards.js b/src/containers/Proposals/Cards.js
@@ -61,9 +61,12 @@ const Cards = (props) => {
                 {reversedItems.length &&
                     reversedItems.map((proposal, index) => {
                         if (index < (page * rowsPerPage) && index >= (page - 1) * rowsPerPage) {
-                            const votedOption = props.voteDetails && props.voteDetails.length &&
+                            let votedOption = props.voteDetails && props.voteDetails.length &&
                                 proposal && proposal.proposal_id &&
                                 props.voteDetails.filter((vote) => vote && (vote.proposal_id === proposal.proposal_id))[0];
+                            if (votedOption && votedOption.options && votedOption.options.length && votedOption.options[0]) {
+                                votedOption = votedOption.options[0];
+                            }
                             let proposer = proposal.proposer;
                             props.proposalDetails && Object.keys(props.proposalDetails).length &&
                             Object.keys(props.proposalDetails).filter((key) => {
@@ -102,10 +105,10 @@ const Cards = (props) => {
                                             votedOption
                                                 ? <div className="details">
                                                     <p>your vote is taken: <b>
-                                                        {votedOption && votedOption.option === 1 ? 'Yes'
-                                                            : votedOption && votedOption.option === 2 ? 'Abstain'
-                                                                : votedOption && votedOption.option === 3 ? 'No'
-                                                                    : votedOption && votedOption.option === 4 ? 'NoWithVeto'
+                                                        {votedOption && (votedOption.option === 1 || votedOption.option === 'VOTE_OPTION_YES') ? 'Yes'
+                                                            : votedOption && (votedOption.option === 2 || votedOption.option === 'VOTE_OPTION_ABSTAIN') ? 'Abstain'
+                                                                : votedOption && (votedOption.option === 3 || votedOption.option === 'VOTE_OPTION_NO') ? 'No'
+                                                                    : votedOption && (votedOption.option === 4 || votedOption.option === 'VOTE_OPTION_NO_WITH_VETO') ? 'NoWithVeto'
                                                                         : votedOption && votedOption.option}
                                                     </b></p>
                                                     <Button