LaconicNetwork/vega-frontend-monorepo
3
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Chore/update wording assets (#1712)

Browse Source 
* chore: updated wording

* chore: updated wording

* chore: updated wording

* chore: updated wording

* chore: updated unit tests

* chore: fixed lint errors
This commit is contained in:
Art 2022-10-11 18:18:01 +02:00 committed by GitHub
parent 7824c39bfe
commit 0129dbd611
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/token/src/components/web3-connector/web3-connector.tsx
View File

@ -1,5 +1,4 @@
import { useEthereumConfig } from '@vegaprotocol/web3'; import { Button, Splash } from '@vegaprotocol/ui-toolkit';
import { Button, Splash, AsyncRenderer } from '@vegaprotocol/ui-toolkit';
import { Web3ConnectDialog } from '@vegaprotocol/web3'; import { Web3ConnectDialog } from '@vegaprotocol/web3';
import { useWeb3React } from '@web3-react/core'; import { useWeb3React } from '@web3-react/core';
import type { ReactElement } from 'react'; import type { ReactElement } from 'react';

7
libs/assets/src/lib/asset-details-dialog.spec.tsx
View File

@ -90,8 +90,11 @@ describe('AssetDetailsDialog', () => {
key: AssetDetail.GLOBAL_REWARD_POOL_ACCOUNT_BALANCE, key: AssetDetail.GLOBAL_REWARD_POOL_ACCOUNT_BALANCE,
value: '0.002', value: '0.002',
}, },
{ key: AssetDetail.TAKER_FEE_REWARD_ACCOUNT_BALANCE, value: '0.003' }, { key: AssetDetail.MAKER_PAID_FEES_ACCOUNT_BALANCE, value: '0.003' },
{ key: AssetDetail.MAKER_FEE_REWARD_ACCOUNT_BALANCE, value: '0.004' }, {
key: AssetDetail.MAKER_RECEIVED_FEES_ACCOUNT_BALANCE,
value: '0.004',
},
{ key: AssetDetail.LP_FEE_REWARD_ACCOUNT_BALANCE, value: '0.005' }, { key: AssetDetail.LP_FEE_REWARD_ACCOUNT_BALANCE, value: '0.005' },
{ {
key: AssetDetail.MARKET_PROPOSER_REWARD_ACCOUNT_BALANCE, key: AssetDetail.MARKET_PROPOSER_REWARD_ACCOUNT_BALANCE,

7
libs/assets/src/lib/asset-details-table.spec.tsx
View File

@ -33,8 +33,11 @@ describe('AssetDetailsTable', () => {
key: AssetDetail.GLOBAL_REWARD_POOL_ACCOUNT_BALANCE, key: AssetDetail.GLOBAL_REWARD_POOL_ACCOUNT_BALANCE,
value: '0.002', value: '0.002',
}, },
{ key: AssetDetail.TAKER_FEE_REWARD_ACCOUNT_BALANCE, value: '0.003' }, { key: AssetDetail.MAKER_PAID_FEES_ACCOUNT_BALANCE, value: '0.003' },
{ key: AssetDetail.MAKER_FEE_REWARD_ACCOUNT_BALANCE, value: '0.004' }, {
key: AssetDetail.MAKER_RECEIVED_FEES_ACCOUNT_BALANCE,
value: '0.004',
},
{ key: AssetDetail.LP_FEE_REWARD_ACCOUNT_BALANCE, value: '0.005' }, { key: AssetDetail.LP_FEE_REWARD_ACCOUNT_BALANCE, value: '0.005' },
{ {
key: AssetDetail.MARKET_PROPOSER_REWARD_ACCOUNT_BALANCE, key: AssetDetail.MARKET_PROPOSER_REWARD_ACCOUNT_BALANCE,

42
libs/assets/src/lib/asset-details-table.tsx
View File

@ -33,8 +33,8 @@ export enum AssetDetail {
// balances: // balances:
INFRASTRUCTURE_FEE_ACCOUNT_BALANCE, INFRASTRUCTURE_FEE_ACCOUNT_BALANCE,
GLOBAL_REWARD_POOL_ACCOUNT_BALANCE, GLOBAL_REWARD_POOL_ACCOUNT_BALANCE,
TAKER_FEE_REWARD_ACCOUNT_BALANCE, MAKER_PAID_FEES_ACCOUNT_BALANCE, // account type: ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES
MAKER_FEE_REWARD_ACCOUNT_BALANCE, MAKER_RECEIVED_FEES_ACCOUNT_BALANCE, // account type: ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES
LP_FEE_REWARD_ACCOUNT_BALANCE, LP_FEE_REWARD_ACCOUNT_BALANCE,
MARKET_PROPOSER_REWARD_ACCOUNT_BALANCE, MARKET_PROPOSER_REWARD_ACCOUNT_BALANCE,
} }
@ -81,7 +81,7 @@ export const rows: Rows = [
{ {
key: AssetDetail.QUANTUM, key: AssetDetail.QUANTUM,
label: t('Quantum'), label: t('Quantum'),
tooltip: t('The minimum economically meaningful amount in the asset'), tooltip: t('The minimum economically meaningful amount of the asset'),
value: (asset) => asset.quantum, value: (asset) => asset.quantum,
}, },
{ {
@ -103,7 +103,7 @@ export const rows: Rows = [
key: AssetDetail.WITHDRAWAL_THRESHOLD, key: AssetDetail.WITHDRAWAL_THRESHOLD,
label: t('Withdrawal threshold'), label: t('Withdrawal threshold'),
tooltip: t( tooltip: t(
'The maximum allowed per withdraw note: this is a temporary measure for restricted mainnet' 'The maximum allowed per withdrawal. Note: this is a temporary measure for restricted mainnet'
), ),
value: (asset) => value: (asset) =>
num(asset, (asset.source as Schema.ERC20).withdrawThreshold), num(asset, (asset.source as Schema.ERC20).withdrawThreshold),
@ -112,7 +112,7 @@ export const rows: Rows = [
key: AssetDetail.LIFETIME_LIMIT, key: AssetDetail.LIFETIME_LIMIT,
label: t('Lifetime limit'), label: t('Lifetime limit'),
tooltip: t( tooltip: t(
'The lifetime limits deposit per address note: this is a temporary measure for restricted mainnet' 'The lifetime deposit limit per address. Note: this is a temporary measure for restricted mainnet'
), ),
value: (asset) => num(asset, (asset.source as Schema.ERC20).lifetimeLimit), value: (asset) => num(asset, (asset.source as Schema.ERC20).lifetimeLimit),
}, },
@ -128,37 +128,45 @@ export const rows: Rows = [
{ {
key: AssetDetail.INFRASTRUCTURE_FEE_ACCOUNT_BALANCE, key: AssetDetail.INFRASTRUCTURE_FEE_ACCOUNT_BALANCE,
label: t('Infrastructure fee account balance'), label: t('Infrastructure fee account balance'),
tooltip: t('The infrastructure fee account for this asset'), tooltip: t('The infrastructure fee account in this asset'),
value: (asset) => num(asset, asset.infrastructureFeeAccount.balance), value: (asset) => num(asset, asset.infrastructureFeeAccount.balance),
}, },
{ {
key: AssetDetail.GLOBAL_REWARD_POOL_ACCOUNT_BALANCE, key: AssetDetail.GLOBAL_REWARD_POOL_ACCOUNT_BALANCE,
label: t('Global reward pool account balance'), label: t('Global reward pool account balance'),
tooltip: t('The global reward pool account for this asset'), tooltip: t('The global rewards acquired in this asset'),
value: (asset) => num(asset, asset.globalRewardPoolAccount?.balance), value: (asset) => num(asset, asset.globalRewardPoolAccount?.balance),
}, },
{ {
key: AssetDetail.TAKER_FEE_REWARD_ACCOUNT_BALANCE, key: AssetDetail.MAKER_PAID_FEES_ACCOUNT_BALANCE,
label: t('Taker fee reward account balance'), label: t('Maker paid fees account balance'),
tooltip: t('The taker fee reward account for this asset'), tooltip: t(
'The rewards acquired based on the fees paid to makers in this asset'
),
value: (asset) => num(asset, asset.takerFeeRewardAccount?.balance), value: (asset) => num(asset, asset.takerFeeRewardAccount?.balance),
}, },
{ {
key: AssetDetail.MAKER_FEE_REWARD_ACCOUNT_BALANCE, key: AssetDetail.MAKER_RECEIVED_FEES_ACCOUNT_BALANCE,
label: t('Maker fee reward account balance'), label: t('Maker received fees account balance'),
tooltip: t('The maker fee reward account for this asset'), tooltip: t(
'The rewards acquired based on fees received for being a maker on trades'
),
value: (asset) => num(asset, asset.makerFeeRewardAccount?.balance), value: (asset) => num(asset, asset.makerFeeRewardAccount?.balance),
}, },
{ {
key: AssetDetail.LP_FEE_REWARD_ACCOUNT_BALANCE, key: AssetDetail.LP_FEE_REWARD_ACCOUNT_BALANCE,
label: t('Liquidity provision fee reward account balance'), label: t('Liquidity provision fee reward account balance'),
tooltip: t('The liquidity provision reward account for this asset'), tooltip: t(
'The rewards acquired based on the liquidity provision fees in this asset'
),
value: (asset) => num(asset, asset.lpFeeRewardAccount?.balance), value: (asset) => num(asset, asset.lpFeeRewardAccount?.balance),
}, },
{ {
key: AssetDetail.MARKET_PROPOSER_REWARD_ACCOUNT_BALANCE, key: AssetDetail.MARKET_PROPOSER_REWARD_ACCOUNT_BALANCE,
label: t('Market proposer reward account balance'), label: t('Market proposer reward account balance'),
tooltip: t('The market proposer reward account for this asset'), tooltip: t(
'The rewards acquired based on the market proposer reward in this asset'
),
value: (asset) => num(asset, asset.marketProposerRewardAccount?.balance), value: (asset) => num(asset, asset.marketProposerRewardAccount?.balance),
}, },
]; ];
@ -170,11 +178,11 @@ const AssetStatusMapping: Mapping = {
}, },
STATUS_PENDING_LISTING: { STATUS_PENDING_LISTING: {
value: t('Pending listing'), value: t('Pending listing'),
tooltip: t('Asset is pending listing on the ethereum bridge'), tooltip: t('Asset needs to be added to the Ethereum bridge'),
}, },
STATUS_PROPOSED: { STATUS_PROPOSED: {
value: t('Proposed'), value: t('Proposed'),
tooltip: t('Asset is proposed to be added to the network'), tooltip: t('Asset has been proposed to the network'),
}, },
STATUS_REJECTED: { STATUS_REJECTED: {
value: t('Rejected'), value: t('Rejected'),