Skip to content

Commit

Permalink
old commits update (#101)
Browse files Browse the repository at this point in the history 
* old commits update

* v47 updates.

---------

Co-authored-by: SrikanthSoparla <[email protected]>
  • Loading branch information
@poojachigitey @SrikanthSoparla
poojachigitey and SrikanthSoparla authored Dec 26, 2023
1 parent e849aec commit d0642cd
Show file tree
Hide file tree
Showing 9 changed files with 3,583 additions and 2,914 deletions.
10 changes: 5 additions & 5 deletions src/actions/accounts/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const getDelegations = (address) => (dispatch) => {
},
})
.then((res) => {
dispatch(fetchDelegationsSuccess(res.data && res.data.result));
dispatch(fetchDelegationsSuccess(res.data && res.data.delegation_responses));
})
.catch((error) => {
dispatch(fetchDelegationsError(
Expand Down Expand Up @@ -107,7 +107,7 @@ export const getBalance = (address) => (dispatch) => {
},
})
.then((res) => {
dispatch(fetchBalanceSuccess(res.data && res.data.result));
dispatch(fetchBalanceSuccess(res.data && res.data.balances));
})
.catch((error) => {
dispatch(fetchBalanceError(
Expand Down Expand Up @@ -149,7 +149,7 @@ export const fetchVestingBalance = (address) => (dispatch) => {
},
})
.then((res) => {
dispatch(fetchVestingBalanceSuccess(res.data && res.data.result));
dispatch(fetchVestingBalanceSuccess(res.data && res.data.balances));
})
.catch((error) => {
dispatch(fetchVestingBalanceError(
Expand Down Expand Up @@ -203,7 +203,7 @@ export const getUnBondingDelegations = (address) => (dispatch) => {
},
})
.then((res) => {
dispatch(fetchUnBondingDelegationsSuccess(res.data && res.data.result));
dispatch(fetchUnBondingDelegationsSuccess(res.data && res.data.unbonding_responses));
})
.catch((error) => {
dispatch(fetchUnBondingDelegationsError(
Expand Down Expand Up @@ -252,7 +252,7 @@ export const fetchRewards = (address) => (dispatch) => {
},
})
.then((res) => {
dispatch(fetchRewardsSuccess(res.data && res.data.result));
dispatch(fetchRewardsSuccess(res.data));
})
.catch((error) => {
dispatch(fetchRewardsError(
Expand Down
10 changes: 5 additions & 5 deletions src/actions/stake.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ export const getValidators = (cb) => (dispatch) => {
},
})
.then((res) => {
dispatch(fetchValidatorsSuccess(res.data && res.data.result));
cb(res.data && res.data.result);
dispatch(fetchValidatorsSuccess(res.data && res.data.validators));
cb(res.data && res.data.validators);
})
.catch((error) => {
dispatch(fetchValidatorsError(
Expand Down Expand Up @@ -182,8 +182,8 @@ export const getValidatorDetails = (address, cb) => (dispatch) => {
},
})
.then((res) => {
dispatch(fetchValidatorSuccess(res.data && res.data.result));
cb(res.data && res.data.result);
dispatch(fetchValidatorSuccess(res.data && res.data.validators));
cb(res.data && res.data.validators);
})
.catch((error) => {
dispatch(fetchValidatorError(
Expand Down Expand Up @@ -226,7 +226,7 @@ export const getDelegatedValidatorsDetails = (address) => (dispatch) => {
},
})
.then((res) => {
dispatch(fetchDelegatedValidatorsSuccess(res.data && res.data.result));
dispatch(fetchDelegatedValidatorsSuccess(res.data && res.data.validators));
})
.catch((error) => {
dispatch(fetchDelegatedValidatorsError(
Expand Down
27 changes: 13 additions & 14 deletions src/constants/url.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@ import { config } from '../config';

export const REST_URL = config.REST_URL;
export const RPC_URL = config.RPC_URL;
export const urlFetchDelegations = (address) => `${REST_URL}/cosmos/staking/v1beta1/delegations/${address}`;
export const urlFetchBalance = (address) => `${REST_URL}/cosmos/bank/v1beta1/balances/${address}`;
export const urlFetchVestingBalance = (address) => `${REST_URL}/cosmos/auth/v1beta1/accounts/${address}`;
export const urlFetchUnBondingDelegations = (address) => `${REST_URL}/cosmos/staking/v1beta1/delegators/${address}/unbonding_delegations`;

export const urlFetchDelegations = (address) => `${REST_URL}/staking/delegators/${address}/delegations`;
export const urlFetchBalance = (address) => `${REST_URL}/bank/balances/${address}`;
export const urlFetchVestingBalance = (address) => `${REST_URL}/auth/accounts/${address}`;
export const urlFetchUnBondingDelegations = (address) => `${REST_URL}/staking/delegators/${address}/unbonding_delegations`;
export const urlFetchRewards = (address) => `${REST_URL}/cosmos/distribution/v1beta1/delegators/${address}/rewards`;
export const urlFetchVoteDetails = (proposalId, address) => `${REST_URL}/cosmos/gov/v1beta1/proposals/${proposalId}/votes/${address}`;

export const urlFetchRewards = (address) => `${REST_URL}/distribution/delegators/${address}/rewards`;
export const urlFetchVoteDetails = (proposalId, address) => `${REST_URL}/gov/proposals/${proposalId}/votes/${address}`;

export const VALIDATORS_LIST_URL = `${REST_URL}/staking/validators`;
export const getValidatorURL = (address) => `${REST_URL}/staking/validators/${address}`;
export const PROPOSALS_LIST_URL = `${REST_URL}/cosmos/gov/v1beta1/proposals?pagination.limit=1000`;
export const getDelegatedValidatorsURL = (address) => `${REST_URL}/staking/delegators/${address}/validators`;
export const urlFetchProposalVotes = (id) => `${REST_URL}/gov/proposals/${id}/votes`;
export const urlFetchTallyDetails = (id) => `${REST_URL}/gov/proposals/${id}/tally`;
export const urlFetchProposalDetails = (id) => `${REST_URL}/txs?message.module=governance&submit_proposal.proposal_id=${id}`;
export const VALIDATORS_LIST_URL = `${REST_URL}/cosmos/staking/v1beta1/validators`;
export const getValidatorURL = (address) => `${REST_URL}/cosmos/staking/v1beta1/validators/${address}`;
export const PROPOSALS_LIST_URL = `${REST_URL}/cosmos/gov/v1/proposals?pagination.limit=1000`;
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/gov/v1/proposals/${id}`;

export const validatorImageURL = (id) => `https://keybase.io/_/api/1.0/user/lookup.json?fields=pictures&key_suffix=${id}`;
53 changes: 26 additions & 27 deletions src/containers/Proposals/Cards.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ const Cards = (props) => {

const VoteCalculation = (proposal, val) => {
if (proposal.status === 2 || proposal.status === 'PROPOSAL_STATUS_VOTING_PERIOD') {
const value = props.tallyDetails && props.tallyDetails[proposal.proposal_id];
const sum = value && value.yes && value.no && value.no_with_veto && value.abstain &&
(parseInt(value.yes) + parseInt(value.no) + parseInt(value.no_with_veto) + parseInt(value.abstain));
const value = props.tallyDetails && props.tallyDetails[proposal.id];
const sum = value && value.yes_count && value.no_count && value.no_with_veto_count && value.abstain_count &&
(parseInt(value.yes_count) + parseInt(value.no_count) + parseInt(value.no_with_veto_count) + parseInt(value.abstain_count));

return (props.tallyDetails && props.tallyDetails[proposal.proposal_id] && props.tallyDetails[proposal.proposal_id][val]
? tally(props.tallyDetails[proposal.proposal_id][val], sum) : '0%');
return (props.tallyDetails && props.tallyDetails[proposal.id] && props.tallyDetails[proposal.id][val]
? tally(props.tallyDetails[proposal.id][val], sum) : '0%');
} else {
const sum = proposal.final_tally_result && proposal.final_tally_result.yes &&
proposal.final_tally_result.no && proposal.final_tally_result.no_with_veto &&
proposal.final_tally_result.abstain &&
(parseInt(proposal.final_tally_result.yes) + parseInt(proposal.final_tally_result.no) +
parseInt(proposal.final_tally_result.no_with_veto) + parseInt(proposal.final_tally_result.abstain));
const sum = proposal.final_tally_result && proposal.final_tally_result.yes_count &&
proposal.final_tally_result.no_count && proposal.final_tally_result.no_with_veto_count &&
proposal.final_tally_result.abstain_count &&
(parseInt(proposal.final_tally_result.yes_count) + parseInt(proposal.final_tally_result.no_count) +
parseInt(proposal.final_tally_result.no_with_veto_count) + parseInt(proposal.final_tally_result.abstain_count));

return (proposal && proposal.final_tally_result &&
proposal.final_tally_result[val]
Expand All @@ -51,7 +51,7 @@ const Cards = (props) => {
};

const handleProposal = (proposal) => {
props.history.push(`/proposals/${proposal.proposal_id}`);
props.history.push(`/proposals/${proposal.id}`);
props.handleShow(proposal);
};

Expand All @@ -62,27 +62,26 @@ const Cards = (props) => {
reversedItems.map((proposal, index) => {
if (index < (page * rowsPerPage) && index >= (page - 1) * rowsPerPage) {
const votedOption = props.voteDetails && props.voteDetails.length &&
proposal && proposal.proposal_id &&
props.voteDetails.filter((vote) => vote.proposal_id === proposal.proposal_id)[0];
proposal && proposal.id &&
props.voteDetails.filter((vote) => vote.id === proposal.id)[0];
let proposer = proposal.proposer;
props.proposalDetails && Object.keys(props.proposalDetails).length &&
Object.keys(props.proposalDetails).filter((key) => {
if (key === proposal.proposal_id) {
if (key === proposal.id) {
if (props.proposalDetails[key] &&
props.proposalDetails[key][0] &&
props.proposalDetails[key][0].tx &&
props.proposalDetails[key][0].tx.value &&
props.proposalDetails[key][0].tx.value.msg[0] &&
props.proposalDetails[key][0].tx.value.msg[0].value &&
props.proposalDetails[key][0].tx.value.msg[0].value.proposer) {
proposer = props.proposalDetails[key][0].tx.value.msg[0].value.proposer;
props.proposalDetails[key][0].body &&
props.proposalDetails[key][0].body.messages &&
props.proposalDetails[key][0].body.messages.length &&
props.proposalDetails[key][0].body.messages[0].proposer) {
proposer = props.proposalDetails[key][0].body.messages[0].proposer;
}
}

return null;
});
let inProgress = props.proposalDetails && Object.keys(props.proposalDetails).length &&
Object.keys(props.proposalDetails).find((key) => key === proposal.proposal_id);
Object.keys(props.proposalDetails).find((key) => key === proposal.id);
inProgress = !inProgress && props.proposalDetailsInProgress;

return (
Expand All @@ -91,7 +90,7 @@ const Cards = (props) => {
className="card"
onClick={() => handleProposal(proposal)}>
<span className="number">
{proposal.proposal_id}
{proposal.id}
</span>
<div className="card_heading">
<h2 onClick={() => props.handleShow(proposal)}> {
Expand Down Expand Up @@ -124,7 +123,7 @@ const Cards = (props) => {
</Button>
: null}
</div>
<p className="description">{proposal.content && proposal.content.description}</p>
<p className="description">{proposal.summary}</p>
<div className="row">
<div className="icon_info">
<Icon className="person" icon="person"/>
Expand Down Expand Up @@ -178,19 +177,19 @@ const Cards = (props) => {
<div className="vote_details">
<div className="yes">
<span/>
<p>YES ({VoteCalculation(proposal, 'yes')})</p>
<p>YES ({VoteCalculation(proposal, 'yes_count')})</p>
</div>
<div className="no">
<span/>
<p>NO ({VoteCalculation(proposal, 'no')})</p>
<p>NO ({VoteCalculation(proposal, 'no_count')})</p>
</div>
<div className="option3">
<span/>
<p>NoWithVeto ({VoteCalculation(proposal, 'no_with_veto')})</p>
<p>NoWithVeto ({VoteCalculation(proposal, 'no_with_veto_count')})</p>
</div>
<div className="option4">
<span/>
<p>Abstain ({VoteCalculation(proposal, 'abstain')})</p>
<p>Abstain ({VoteCalculation(proposal, 'abstain_count')})</p>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit d0642cd

Please sign in to comment.