Release/token (#948)

* Revert "feat: show correct reward type (#930)"

This reverts commit 8644eac2be.

* fix: incorrect decimals in pending stake

* fix: use old bridge
This commit is contained in:
Dexter Edwards 2022-08-08 09:42:56 +01:00 committed by GitHub
parent b733de5996
commit 838c6c45c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions

View File

@ -6,3 +6,4 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET":"https://dev.
NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
NX_ETHERSCAN_URL=https://ropsten.etherscan.io NX_ETHERSCAN_URL=https://ropsten.etherscan.io
NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
NX_IS_NEW_BRIDGE_CONTRACT=false

View File

@ -3,8 +3,6 @@
// @generated // @generated
// This file was automatically generated and should not be edited. // This file was automatically generated and should not be edited.
import { AccountType } from "@vegaprotocol/types";
// ==================================================== // ====================================================
// GraphQL query operation: Rewards // GraphQL query operation: Rewards
// ==================================================== // ====================================================
@ -47,10 +45,6 @@ export interface Rewards_party_rewardDetails_rewards_epoch {
export interface Rewards_party_rewardDetails_rewards { export interface Rewards_party_rewardDetails_rewards {
__typename: "Reward"; __typename: "Reward";
/**
* The type of reward
*/
rewardType: AccountType;
/** /**
* The asset this reward is paid in * The asset this reward is paid in
*/ */

View File

@ -30,7 +30,6 @@ export const REWARDS_QUERY = gql`
symbol symbol
} }
rewards { rewards {
rewardType
asset { asset {
id id
} }

View File

@ -19,6 +19,10 @@ interface RewardInfoProps {
rewardAssetId: string; rewardAssetId: string;
} }
// Note: For now the only reward type is Staking. We'll need this from the API
// at a later date
const DEFAULT_REWARD_TYPE = 'Staking';
export const RewardInfo = ({ export const RewardInfo = ({
data, data,
currVegaKey, currVegaKey,
@ -115,7 +119,7 @@ export const RewardTable = ({ reward, delegations }: RewardTableProps) => {
<KeyValueTable> <KeyValueTable>
<KeyValueTableRow> <KeyValueTableRow>
{t('rewardType')} {t('rewardType')}
<span>{reward.rewardType}</span> <span>{DEFAULT_REWARD_TYPE}</span>
</KeyValueTableRow> </KeyValueTableRow>
<KeyValueTableRow> <KeyValueTableRow>
{t('yourStake')} {t('yourStake')}

View File

@ -52,6 +52,7 @@ export interface Nodes_nodes {
* Amount of stake on the next epoch * Amount of stake on the next epoch
*/ */
pendingStake: string; pendingStake: string;
pendingStakeFormatted: string;
/** /**
* Ranking scores and status for the validator for the current epoch * Ranking scores and status for the validator for the current epoch
*/ */

View File

@ -34,6 +34,7 @@ export const NODES_QUERY = gql`
stakedTotal stakedTotal
stakedTotalFormatted @client stakedTotalFormatted @client
pendingStake pendingStake
pendingStakeFormatted @client
rankingScore { rankingScore {
rankingScore rankingScore
stakeScore stakeScore
@ -122,7 +123,7 @@ export const NodeList = ({ epoch }: NodeListProps) => {
performanceScore, performanceScore,
votingPower, votingPower,
}, },
pendingStake, pendingStakeFormatted,
}) => { }) => {
const stakedTotal = new BigNumber( const stakedTotal = new BigNumber(
data?.nodeData?.stakedTotalFormatted || 0 data?.nodeData?.stakedTotalFormatted || 0
@ -142,10 +143,10 @@ export const NodeList = ({ epoch }: NodeListProps) => {
name, name,
}, },
[STATUS]: statusTranslated, [STATUS]: statusTranslated,
[TOTAL_STAKE_THIS_EPOCH]: formatNumber(stakedTotal, 2), [TOTAL_STAKE_THIS_EPOCH]: formatNumber(stakedTotalFormatted, 2),
[SHARE]: stakedTotalPercentage, [SHARE]: stakedTotalPercentage,
[VALIDATOR_STAKE]: formatNumber(stakedOnNode, 2), [VALIDATOR_STAKE]: formatNumber(stakedOnNode, 2),
[PENDING_STAKE]: formatNumber(pendingStake, 2), [PENDING_STAKE]: formatNumber(pendingStakeFormatted, 2),
[RANKING_SCORE]: formatNumber(new BigNumber(rankingScore), 5), [RANKING_SCORE]: formatNumber(new BigNumber(rankingScore), 5),
[STAKE_SCORE]: formatNumber(new BigNumber(stakeScore), 5), [STAKE_SCORE]: formatNumber(new BigNumber(stakeScore), 5),
[PERFORMANCE_SCORE]: formatNumber(new BigNumber(performanceScore), 5), [PERFORMANCE_SCORE]: formatNumber(new BigNumber(performanceScore), 5),