From 78f3eacd62038ebeed913d653f929a439b7e06d4 Mon Sep 17 00:00:00 2001 From: Juan Camilo Cifuentes Date: Tue, 21 Mar 2023 11:20:41 -0700 Subject: [PATCH 1/3] fix: denoms are not being forced to uppercase anymore, flickering on blocks page as well as padding has been fixed --- apps/web-coreum/public/locales/en/params.json | 4 ++-- .../ui/src/components/msg/asset/burn/index.tsx | 3 ++- .../ui/src/components/msg/asset/freeze/index.tsx | 3 ++- .../ui/src/components/msg/asset/mint/index.tsx | 3 ++- .../msg/asset/set_whitelisted_limit/index.tsx | 3 ++- .../src/components/msg/asset/unfreeze/index.tsx | 3 ++- .../src/components/msg/bank/multisend/index.tsx | 6 ++++-- .../ui/src/components/msg/bank/send/index.tsx | 3 ++- .../components/msg/distribution/fund/index.tsx | 3 ++- .../distribution/withdraw_commission/index.tsx | 3 ++- .../msg/distribution/withdraw_reward/index.tsx | 3 ++- .../msg/governance/deposit_proposal/index.tsx | 3 ++- .../msg/ibc_transfer/transfer/index.tsx | 3 ++- .../src/components/msg/staking/delegate/index.tsx | 3 ++- .../components/msg/staking/redelegate/index.tsx | 3 ++- .../components/msg/staking/undelegate/index.tsx | 3 ++- .../components/nav/components/title_bar/utils.tsx | 9 ++++----- .../account_details/components/balance/index.tsx | 6 ++++-- .../account_details/components/balance/utils.tsx | 15 ++++++++++----- .../other_tokens/components/desktop/index.tsx | 3 ++- .../other_tokens/components/mobile/index.tsx | 3 ++- .../delegations/components/desktop/index.tsx | 6 ++++-- .../delegations/components/mobile/index.tsx | 6 ++++-- .../redelegations/components/desktop/index.tsx | 3 ++- .../redelegations/components/mobile/index.tsx | 3 ++- .../unbondings/components/desktop/index.tsx | 3 ++- .../unbondings/components/mobile/index.tsx | 3 ++- packages/ui/src/screens/blocks/styles.ts | 2 +- .../screens/home/components/tokenomics/index.tsx | 3 ++- packages/ui/src/screens/params/hooks.ts | 1 - packages/ui/src/screens/params/utils.tsx | 10 ++++++---- .../deposits/components/desktop/index.tsx | 3 ++- .../deposits/components/mobile/index.tsx | 3 ++- .../components/overview/index.tsx | 3 ++- .../components/overview/index.tsx | 3 ++- .../delegations/components/desktop/index.tsx | 3 ++- .../delegations/components/mobile/index.tsx | 3 ++- .../redelegations/components/desktop/index.tsx | 3 ++- .../redelegations/components/mobile/index.tsx | 3 ++- .../unbondings/components/desktop/index.tsx | 3 ++- .../unbondings/components/mobile/index.tsx | 3 ++- 41 files changed, 101 insertions(+), 57 deletions(-) diff --git a/apps/web-coreum/public/locales/en/params.json b/apps/web-coreum/public/locales/en/params.json index 6b129c55fa..dc36b47960 100644 --- a/apps/web-coreum/public/locales/en/params.json +++ b/apps/web-coreum/public/locales/en/params.json @@ -38,8 +38,8 @@ "maxDiscount": "Max Discount", "maxBlockGas": "Max Block Gas", "initialGasPrice": "Initial Gas Price", - "longEmaBlockLength": "Long Ema Block Length", - "shortEmaBlockLength": "Short Ema Block Length", + "longEmaBlockLength": "Long EMA Block Length", + "shortEmaBlockLength": "Short EMA Block Length", "maxGasPriceMultiplier": "Max Gas Price Multiplier", "escalationStartFraction": "Escalation Start Fraction" } diff --git a/packages/ui/src/components/msg/asset/burn/index.tsx b/packages/ui/src/components/msg/asset/burn/index.tsx index 8ebda67c1b..0802685cc2 100644 --- a/packages/ui/src/components/msg/asset/burn/index.tsx +++ b/packages/ui/src/components/msg/asset/burn/index.tsx @@ -14,7 +14,8 @@ const Burn: FC<{ message: MsgBurn }> = (props) => { const parsedAmount = `${formatNumber( amount.value, amount.exponent - )} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${amount.displayDenom}`; const sender = useProfileRecoil(message.sender); diff --git a/packages/ui/src/components/msg/asset/freeze/index.tsx b/packages/ui/src/components/msg/asset/freeze/index.tsx index 9c52513ca6..24c1da1044 100644 --- a/packages/ui/src/components/msg/asset/freeze/index.tsx +++ b/packages/ui/src/components/msg/asset/freeze/index.tsx @@ -17,7 +17,8 @@ const Freeze: FC<{ message: MsgFreeze }> = (props) => { const parsedAmount = `${formatNumber( amount.value, amount.exponent - )} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${amount.displayDenom}`; return ( diff --git a/packages/ui/src/components/msg/asset/mint/index.tsx b/packages/ui/src/components/msg/asset/mint/index.tsx index 9a997ea235..79b3ccdc2c 100644 --- a/packages/ui/src/components/msg/asset/mint/index.tsx +++ b/packages/ui/src/components/msg/asset/mint/index.tsx @@ -16,7 +16,8 @@ const Mint: FC<{ message: MsgMint }> = (props) => { const parsedAmount = `${formatNumber( amount.value, amount.exponent - )} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${amount.displayDenom}`; return ( diff --git a/packages/ui/src/components/msg/asset/set_whitelisted_limit/index.tsx b/packages/ui/src/components/msg/asset/set_whitelisted_limit/index.tsx index 815d0c16d4..8a08ce6ce1 100644 --- a/packages/ui/src/components/msg/asset/set_whitelisted_limit/index.tsx +++ b/packages/ui/src/components/msg/asset/set_whitelisted_limit/index.tsx @@ -17,7 +17,8 @@ const SetWhitelistedLimit: FC<{ message: MsgSetWhitelistedLimit }> = (props) => const parsedAmount = `${formatNumber( amount.value, amount.exponent - )} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${amount.displayDenom}`; return ( diff --git a/packages/ui/src/components/msg/asset/unfreeze/index.tsx b/packages/ui/src/components/msg/asset/unfreeze/index.tsx index a8120c87bb..efe161286a 100644 --- a/packages/ui/src/components/msg/asset/unfreeze/index.tsx +++ b/packages/ui/src/components/msg/asset/unfreeze/index.tsx @@ -17,7 +17,8 @@ const Unfreeze: FC<{ message: MsgUnfreeze }> = (props) => { const parsedAmount = `${formatNumber( amount.value, amount.exponent - )} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${amount.displayDenom}`; return ( = (props) => { const parsedAmount = coins ?.map((x) => { const amount = formatToken(x.amount, x.denom); - return `${formatNumber(amount.value, amount.exponent)} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + return `${formatNumber(amount.value, amount.exponent)} ${amount.displayDenom}`; }) .reduce( (text, value, j, array) => text + (j < array.length - 1 ? ', ' : ` ${t('and')} `) + value @@ -43,7 +44,8 @@ const Multisend: FC<{ message: MsgMultiSend }> = (props) => { const senderAmount = sender?.coins ?.map((x) => { const amount = formatToken(x.amount, x.denom); - return `${formatNumber(amount.value, amount.exponent)} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + return `${formatNumber(amount.value, amount.exponent)} ${amount.displayDenom}`; }) .reduce( (text, value, i, array) => text + (i < array.length - 1 ? ', ' : ` ${t('and')} `) + value diff --git a/packages/ui/src/components/msg/bank/send/index.tsx b/packages/ui/src/components/msg/bank/send/index.tsx index a619a202bd..2a5c63dd36 100644 --- a/packages/ui/src/components/msg/bank/send/index.tsx +++ b/packages/ui/src/components/msg/bank/send/index.tsx @@ -13,7 +13,8 @@ const Send: FC<{ message: MsgSend }> = (props) => { const parsedAmount = message?.amount ?.map((x) => { const amount = formatToken(x.amount, x.denom); - return `${formatNumber(amount.value, amount.exponent)} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + return `${formatNumber(amount.value, amount.exponent)} ${amount.displayDenom}`; }) .reduce( (text, value, i, array) => text + (i < array.length - 1 ? ', ' : ` ${t('and')} `) + value diff --git a/packages/ui/src/components/msg/distribution/fund/index.tsx b/packages/ui/src/components/msg/distribution/fund/index.tsx index 36c323a48c..5e6269deb7 100644 --- a/packages/ui/src/components/msg/distribution/fund/index.tsx +++ b/packages/ui/src/components/msg/distribution/fund/index.tsx @@ -13,7 +13,8 @@ const Fund: FC<{ message: MsgFundCommunityPool }> = (props) => { const parsedAmount = message?.amount ?.map((x) => { const amount = formatToken(x.amount, x.denom); - return `${formatNumber(amount.value, amount.exponent)} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + return `${formatNumber(amount.value, amount.exponent)} ${amount.displayDenom}`; }) .reduce( (text, value, i, array) => text + (i < array.length - 1 ? ', ' : ` ${t('and')} `) + value diff --git a/packages/ui/src/components/msg/distribution/withdraw_commission/index.tsx b/packages/ui/src/components/msg/distribution/withdraw_commission/index.tsx index 5c5c4c3b27..134cb4f27b 100644 --- a/packages/ui/src/components/msg/distribution/withdraw_commission/index.tsx +++ b/packages/ui/src/components/msg/distribution/withdraw_commission/index.tsx @@ -11,7 +11,8 @@ const WithdrawCommission: FC<{ message: MsgWithdrawValidatorCommission }> = (pro const validator = useProfileRecoil(message.validatorAddress); const validatorMoniker = validator ? validator?.name : message.validatorAddress; const parsedAmount = message.amounts - .map((x) => `${formatNumber(x.value, x.exponent)} ${x.displayDenom.toUpperCase()}`) + //Removed ".toUpperCase()" from the end of the line below per Reza's request + .map((x) => `${formatNumber(x.value, x.exponent)} ${x.displayDenom}`) .join(', '); return ( diff --git a/packages/ui/src/components/msg/distribution/withdraw_reward/index.tsx b/packages/ui/src/components/msg/distribution/withdraw_reward/index.tsx index 945acadb5a..87e7ce50ac 100644 --- a/packages/ui/src/components/msg/distribution/withdraw_reward/index.tsx +++ b/packages/ui/src/components/msg/distribution/withdraw_reward/index.tsx @@ -15,7 +15,8 @@ const WithdrawReward: FC<{ message: MsgWithdrawDelegatorReward }> = (props) => { const validatorMoniker = validator ? validator?.name : message.validatorAddress; const parsedAmount = message.amounts - .map((x) => `${formatNumber(x.value, x.exponent)} ${x.displayDenom.toUpperCase()}`) + //Removed ".toUpperCase()" from the end of the line below per Reza's request + .map((x) => `${formatNumber(x.value, x.exponent)} ${x.displayDenom}`) .join(', '); return ( diff --git a/packages/ui/src/components/msg/governance/deposit_proposal/index.tsx b/packages/ui/src/components/msg/governance/deposit_proposal/index.tsx index 603664cceb..4bd9c49116 100644 --- a/packages/ui/src/components/msg/governance/deposit_proposal/index.tsx +++ b/packages/ui/src/components/msg/governance/deposit_proposal/index.tsx @@ -15,7 +15,8 @@ const DepositProposal: FC<{ message: MsgDeposit }> = (props) => { const parsedAmount = message?.amount ?.map((x) => { const amount = formatToken(x.amount, x.denom); - return `${formatNumber(amount.value, amount.exponent)} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + return `${formatNumber(amount.value, amount.exponent)} ${amount.displayDenom}`; }) .reduce( (text, value, i, array) => text + (i < array.length - 1 ? ', ' : ` ${t('and')} `) + value diff --git a/packages/ui/src/components/msg/ibc_transfer/transfer/index.tsx b/packages/ui/src/components/msg/ibc_transfer/transfer/index.tsx index 67da70d3f7..bd73c505ad 100644 --- a/packages/ui/src/components/msg/ibc_transfer/transfer/index.tsx +++ b/packages/ui/src/components/msg/ibc_transfer/transfer/index.tsx @@ -17,7 +17,8 @@ const Transfer: FC<{ message: MsgTransfer }> = (props) => { const token = `${formatNumber( tokenFormatDenom.value, tokenFormatDenom.exponent - )} ${tokenFormatDenom.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${tokenFormatDenom.displayDenom}`; return ( diff --git a/packages/ui/src/components/msg/staking/delegate/index.tsx b/packages/ui/src/components/msg/staking/delegate/index.tsx index 50dab1abbd..16aab5c180 100644 --- a/packages/ui/src/components/msg/staking/delegate/index.tsx +++ b/packages/ui/src/components/msg/staking/delegate/index.tsx @@ -18,7 +18,8 @@ const Delegate: FC<{ message: MsgDelegate }> = (props) => { const parsedAmount = `${formatNumber( amount.value, amount.exponent - )} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${amount.displayDenom}`; return ( diff --git a/packages/ui/src/components/msg/staking/redelegate/index.tsx b/packages/ui/src/components/msg/staking/redelegate/index.tsx index f93a14cc83..67de5e4df2 100644 --- a/packages/ui/src/components/msg/staking/redelegate/index.tsx +++ b/packages/ui/src/components/msg/staking/redelegate/index.tsx @@ -13,7 +13,8 @@ const Redelegate: FC<{ message: MsgRedelegate }> = (props) => { const parsedAmount = `${formatNumber( amount.value, amount.exponent - )} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${amount.displayDenom}`; const delegator = useProfileRecoil(message.delegatorAddress); const delegatorMoniker = delegator ? delegator?.name : message.delegatorAddress; diff --git a/packages/ui/src/components/msg/staking/undelegate/index.tsx b/packages/ui/src/components/msg/staking/undelegate/index.tsx index 50a63010ad..0298116ba8 100644 --- a/packages/ui/src/components/msg/staking/undelegate/index.tsx +++ b/packages/ui/src/components/msg/staking/undelegate/index.tsx @@ -13,7 +13,8 @@ const Undelegate: FC<{ message: MsgUndelegate }> = (props) => { const parsedAmount = `${formatNumber( amount.value, amount.exponent - )} ${amount.displayDenom.toUpperCase()}`; + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${amount.displayDenom}`; const delegator = useProfileRecoil(message.delegatorAddress); const delegatorMoniker = delegator ? delegator?.name : message.delegatorAddress; diff --git a/packages/ui/src/components/nav/components/title_bar/utils.tsx b/packages/ui/src/components/nav/components/title_bar/utils.tsx index 5381208f99..6567246fc5 100644 --- a/packages/ui/src/components/nav/components/title_bar/utils.tsx +++ b/packages/ui/src/components/nav/components/title_bar/utils.tsx @@ -23,14 +23,13 @@ export const formatMarket = (data: AtomState) => { }, { key: 'supply', - data: `${formatNumber(data.supply.value, 2)} ${data.supply.displayDenom.toUpperCase()}`, + //Removed ".toUpperCase()" from the end of the line below per Reza's request + data: `${formatNumber(data.supply.value, 2)} ${data.supply.displayDenom}`, }, { key: 'communityPool', - data: `${formatNumber( - data.communityPool.value, - 2 - )} ${data.communityPool.displayDenom.toUpperCase()}`, + //Removed ".toUpperCase()" from the end of the line below per Reza's request + data: `${formatNumber(data.communityPool.value, 2)} ${data.communityPool.displayDenom}`, }, ]; }; diff --git a/packages/ui/src/screens/account_details/components/balance/index.tsx b/packages/ui/src/screens/account_details/components/balance/index.tsx index 2f2c13a84c..33858a39f7 100644 --- a/packages/ui/src/screens/account_details/components/balance/index.tsx +++ b/packages/ui/src/screens/account_details/components/balance/index.tsx @@ -108,7 +108,8 @@ const Balance: FC = (props) => {
{t('total', { - unit: props.total.displayDenom.toUpperCase(), + //Removed ".toUpperCase()" from the end of the line below per Reza's request + unit: props.total.displayDenom, })} {totalDisplay} @@ -116,7 +117,8 @@ const Balance: FC = (props) => {
${numeral(market.price).format('0,0.[00]', Math.floor)} /{' '} - {(tokenUnits?.[primaryTokenUnit]?.display ?? '').toUpperCase()} + {/* Removed ".toUpperCase()" from the end of the line below per Reza's request */} + {tokenUnits?.[primaryTokenUnit]?.display ?? ''} {totalAmount}
diff --git a/packages/ui/src/screens/account_details/components/balance/utils.tsx b/packages/ui/src/screens/account_details/components/balance/utils.tsx index d8e4f1e529..cfc96c6523 100644 --- a/packages/ui/src/screens/account_details/components/balance/utils.tsx +++ b/packages/ui/src/screens/account_details/components/balance/utils.tsx @@ -15,7 +15,8 @@ export const formatBalanceData = (data: { display: `${formatNumber( data.available.value, data.available.exponent - )} ${data.available.displayDenom.toUpperCase()}`, + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${data.available.displayDenom}`, value: data.available.value, }, { @@ -23,7 +24,8 @@ export const formatBalanceData = (data: { display: `${formatNumber( data.delegate.value, data.delegate.exponent - )} ${data.delegate.displayDenom.toUpperCase()}`, + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${data.delegate.displayDenom}`, value: data.delegate.value, }, { @@ -31,7 +33,8 @@ export const formatBalanceData = (data: { display: `${formatNumber( data.unbonding.value, data.unbonding.exponent - )} ${data.unbonding.displayDenom.toUpperCase()}`, + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${data.unbonding.displayDenom}`, value: data.unbonding.value, }, { @@ -40,7 +43,8 @@ export const formatBalanceData = (data: { ? `${formatNumber( data.reward.value, data.reward.exponent - )} ${data.reward.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${data.reward.displayDenom}` : '', value: data.reward?.value, }, @@ -52,7 +56,8 @@ export const formatBalanceData = (data: { display: `${formatNumber( data.commission.value, data.commission.exponent - )} ${data.commission.displayDenom.toUpperCase()}`, + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${data.commission.displayDenom}`, value: data.commission.value, }); } diff --git a/packages/ui/src/screens/account_details/components/other_tokens/components/desktop/index.tsx b/packages/ui/src/screens/account_details/components/other_tokens/components/desktop/index.tsx index 788a55df29..6bd805487f 100644 --- a/packages/ui/src/screens/account_details/components/other_tokens/components/desktop/index.tsx +++ b/packages/ui/src/screens/account_details/components/other_tokens/components/desktop/index.tsx @@ -19,7 +19,8 @@ const Desktop: FC = ({ className, items }) => { const formattedItems = items?.map((x, i) => ({ key: i, - token: x.denom.toUpperCase(), + //Removed ".toUpperCase()" from the end of the line below per Reza's request + token: x.denom, commission: formatNumber(x.commission.value, x.commission.exponent), available: formatNumber(x.available.value, x.available.exponent), reward: x.reward ? formatNumber(x.reward.value, x.reward.exponent) : '', diff --git a/packages/ui/src/screens/account_details/components/other_tokens/components/mobile/index.tsx b/packages/ui/src/screens/account_details/components/other_tokens/components/mobile/index.tsx index 86f520a72e..48c0c90617 100644 --- a/packages/ui/src/screens/account_details/components/other_tokens/components/mobile/index.tsx +++ b/packages/ui/src/screens/account_details/components/other_tokens/components/mobile/index.tsx @@ -30,7 +30,8 @@ const Mobile: FC = ({ className, items }) => { {t('token')} - {x.denom.toUpperCase()} + {/* //Removed ".toUpperCase()" from the end of the line below per Reza's request */} + {x.denom}
diff --git a/packages/ui/src/screens/account_details/components/staking/components/delegations/components/desktop/index.tsx b/packages/ui/src/screens/account_details/components/staking/components/delegations/components/desktop/index.tsx index 592d14e2b3..7ccc4353b4 100644 --- a/packages/ui/src/screens/account_details/components/staking/components/delegations/components/desktop/index.tsx +++ b/packages/ui/src/screens/account_details/components/staking/components/delegations/components/desktop/index.tsx @@ -24,9 +24,11 @@ const DelegationsRow: FC = ({ item, i }) => { const formattedItem = { identifier: i, validator: , - amount: `${amount} ${item.amount?.displayDenom.toUpperCase()}`, + //Removed ".toUpperCase()" from the end of the line below per Reza's request + amount: `${amount} ${item.amount?.displayDenom}`, commission: `${commission} %`, - reward: `${reward} ${item.reward?.displayDenom.toUpperCase()}`, + //Removed ".toUpperCase()" from the end of the line below per Reza's request + reward: `${reward} ${item.reward?.displayDenom}`, }; return ( diff --git a/packages/ui/src/screens/account_details/components/staking/components/delegations/components/mobile/index.tsx b/packages/ui/src/screens/account_details/components/staking/components/delegations/components/mobile/index.tsx index 197dd5b0d1..7d09007fb6 100644 --- a/packages/ui/src/screens/account_details/components/staking/components/delegations/components/mobile/index.tsx +++ b/packages/ui/src/screens/account_details/components/staking/components/delegations/components/mobile/index.tsx @@ -33,7 +33,8 @@ const DelegationsItem: FC = ({ item, isLast }) => { {item.amount ? formatNumber(item.amount.value, item.amount.exponent) : ''}{' '} - {item.amount?.displayDenom.toUpperCase()} + {/* //Removed ".toUpperCase()" from the end of the line below per Reza's request */} + {item.amount?.displayDenom}
@@ -50,7 +51,8 @@ const DelegationsItem: FC = ({ item, isLast }) => { {item.reward ? formatNumber(item.reward.value, item.reward.exponent) : ''}{' '} - {item.reward?.displayDenom.toUpperCase()} + {/* //Removed ".toUpperCase()" from the end of the line below per Reza's request */} + {item.reward?.displayDenom}
diff --git a/packages/ui/src/screens/account_details/components/staking/components/redelegations/components/desktop/index.tsx b/packages/ui/src/screens/account_details/components/staking/components/redelegations/components/desktop/index.tsx index 78c83126c4..e728c2aaf6 100644 --- a/packages/ui/src/screens/account_details/components/staking/components/redelegations/components/desktop/index.tsx +++ b/packages/ui/src/screens/account_details/components/staking/components/redelegations/components/desktop/index.tsx @@ -35,7 +35,8 @@ const RedelegationsRow: FC = ({ item, i }) => { ? `${formatNumber( item.amount.value, item.amount.exponent - )} ${item.amount.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${item.amount.displayDenom}` : '', completionTime: formatDayJs(dayjs.utc(item.completionTime), dateFormat), }; diff --git a/packages/ui/src/screens/account_details/components/staking/components/redelegations/components/mobile/index.tsx b/packages/ui/src/screens/account_details/components/staking/components/redelegations/components/mobile/index.tsx index 9daded1ccb..47c051b6de 100644 --- a/packages/ui/src/screens/account_details/components/staking/components/redelegations/components/mobile/index.tsx +++ b/packages/ui/src/screens/account_details/components/staking/components/redelegations/components/mobile/index.tsx @@ -55,7 +55,8 @@ const RedelegationsItem: FC = ({ item, isLast }) => { ? `${formatNumber( item.amount.value, item.amount.exponent - )} ${item.amount.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${item.amount.displayDenom}` : ''} diff --git a/packages/ui/src/screens/account_details/components/staking/components/unbondings/components/desktop/index.tsx b/packages/ui/src/screens/account_details/components/staking/components/unbondings/components/desktop/index.tsx index d8db694dc6..6d5d7b6857 100644 --- a/packages/ui/src/screens/account_details/components/staking/components/unbondings/components/desktop/index.tsx +++ b/packages/ui/src/screens/account_details/components/staking/components/unbondings/components/desktop/index.tsx @@ -27,7 +27,8 @@ const UnbondingsRow: FC = ({ item }) => { ? `${formatNumber( item.amount.value, item.amount.exponent - )} ${item.amount.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${item.amount.displayDenom}` : '', completionTime: formatDayJs(dayjs.utc(item.completionTime), dateFormat), }; diff --git a/packages/ui/src/screens/account_details/components/staking/components/unbondings/components/mobile/index.tsx b/packages/ui/src/screens/account_details/components/staking/components/unbondings/components/mobile/index.tsx index 1f538c1f17..eee69ad344 100644 --- a/packages/ui/src/screens/account_details/components/staking/components/unbondings/components/mobile/index.tsx +++ b/packages/ui/src/screens/account_details/components/staking/components/unbondings/components/mobile/index.tsx @@ -44,7 +44,8 @@ const UnbondingsItem: FC = ({ item, isLast }) => { ? `${formatNumber( item.amount.value, item.amount.exponent - )} ${item.amount.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${item.amount.displayDenom}` : ''} diff --git a/packages/ui/src/screens/blocks/styles.ts b/packages/ui/src/screens/blocks/styles.ts index 39a5db4917..3bb57143bb 100644 --- a/packages/ui/src/screens/blocks/styles.ts +++ b/packages/ui/src/screens/blocks/styles.ts @@ -11,7 +11,7 @@ const useStyles = makeStyles()((theme) => ({ box: { minHeight: '500px', height: '50vh', - padding: '0px !important', + overflow: 'hidden', [theme.breakpoints.up('lg')]: { height: '100%', minHeight: '65vh', diff --git a/packages/ui/src/screens/home/components/tokenomics/index.tsx b/packages/ui/src/screens/home/components/tokenomics/index.tsx index dfcfaa1538..e3a8dc7ec2 100644 --- a/packages/ui/src/screens/home/components/tokenomics/index.tsx +++ b/packages/ui/src/screens/home/components/tokenomics/index.tsx @@ -93,7 +93,8 @@ const Tokenomics: FC = ({ className }) => { {data.slice(0, 2).map((x) => (
- {x.value} {tokenUnits?.[state.denom]?.display?.toUpperCase()} + {/* Removed ".toUpperCase()" from the end of the line below per Reza's request */} + {x.value} {tokenUnits?.[state.denom]?.display} {x.percentKey diff --git a/packages/ui/src/screens/params/hooks.ts b/packages/ui/src/screens/params/hooks.ts index b27239778c..8509c5508a 100644 --- a/packages/ui/src/screens/params/hooks.ts +++ b/packages/ui/src/screens/params/hooks.ts @@ -117,7 +117,6 @@ const formatDistribution = (data: ParamsQuery) => { const formatGov = (data: ParamsQuery) => { if (data.govParams.length) { const govParamsRaw = GovParams.fromJson(data?.govParams?.[0] ?? {}); - console.log(govParamsRaw.depositParams); return { minDeposit: formatToken( govParamsRaw.depositParams.minDeposit?.[0]?.amount ?? 0, diff --git a/packages/ui/src/screens/params/utils.tsx b/packages/ui/src/screens/params/utils.tsx index 34216171ee..b9dda6ba7f 100644 --- a/packages/ui/src/screens/params/utils.tsx +++ b/packages/ui/src/screens/params/utils.tsx @@ -51,9 +51,10 @@ export const formatStaking = (data: Staking, t: TFunction) => [ { key: 'minSelfDelegation', label: t('minSelfDelegation'), - detail: `${numeral(data.minSelfDelegation.value).format( - '0,0' - )} ${data.minSelfDelegation.displayDenom.toUpperCase()}`, + //Removed ".toUpperCase()" from the end of the line below per Reza's request + detail: `${numeral(data.minSelfDelegation.value).format('0,0')} ${ + data.minSelfDelegation.displayDenom + }`, }, ]; @@ -147,7 +148,8 @@ export const formatGov = (data: Gov, t: TFunction) => [ { key: 'minDeposit', label: t('minDeposit'), - detail: `${data.minDeposit.value} ${data.minDeposit.displayDenom.toUpperCase()}`, + //Removed ".toUpperCase()" from the end of the line below per Reza's request + detail: `${data.minDeposit.value} ${data.minDeposit.displayDenom}`, }, { key: 'maxDepositPeriod', diff --git a/packages/ui/src/screens/proposal_details/components/deposits/components/desktop/index.tsx b/packages/ui/src/screens/proposal_details/components/deposits/components/desktop/index.tsx index 4be79d4406..3ebea02c83 100644 --- a/packages/ui/src/screens/proposal_details/components/deposits/components/desktop/index.tsx +++ b/packages/ui/src/screens/proposal_details/components/deposits/components/desktop/index.tsx @@ -44,7 +44,8 @@ const DepositsRow: FC = ({ i, item }) => { `${formatNumber( item.amount.value, item.amount.exponent - )} ${item.amount.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${item.amount.displayDenom}` ) : ( '' ) diff --git a/packages/ui/src/screens/proposal_details/components/deposits/components/mobile/index.tsx b/packages/ui/src/screens/proposal_details/components/deposits/components/mobile/index.tsx index c47325d4a3..c2f7c6601b 100644 --- a/packages/ui/src/screens/proposal_details/components/deposits/components/mobile/index.tsx +++ b/packages/ui/src/screens/proposal_details/components/deposits/components/mobile/index.tsx @@ -41,7 +41,8 @@ const DepositsRow: FC = ({ i, item, isLast }) => { ? `${formatNumber( item.amount.value, item.amount.exponent - )} ${item.amount.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${item.amount.displayDenom}` : ''}
diff --git a/packages/ui/src/screens/proposal_details/components/overview/index.tsx b/packages/ui/src/screens/proposal_details/components/overview/index.tsx index 0ff83b34a1..8b0e1d818a 100644 --- a/packages/ui/src/screens/proposal_details/components/overview/index.tsx +++ b/packages/ui/src/screens/proposal_details/components/overview/index.tsx @@ -38,7 +38,8 @@ const Overview: FC<{ className?: string; overview: OverviewType }> = ({ classNam ? `${formatNumber( amountRequested.value, amountRequested.exponent - )} ${amountRequested.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${amountRequested.displayDenom}` : ''; const getExtraDetails = useCallback(() => { diff --git a/packages/ui/src/screens/transaction_details/components/overview/index.tsx b/packages/ui/src/screens/transaction_details/components/overview/index.tsx index 5b69f7e26f..8a00c0d270 100644 --- a/packages/ui/src/screens/transaction_details/components/overview/index.tsx +++ b/packages/ui/src/screens/transaction_details/components/overview/index.tsx @@ -48,7 +48,8 @@ const Overview: FC = ({ className, data }) => { detail: `${formatNumber( data.fee.value, data.fee.exponent - )} ${data?.fee?.displayDenom?.toUpperCase()}`, + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${data?.fee?.displayDenom}`, }, { key: 'gas', diff --git a/packages/ui/src/screens/validator_details/components/staking/components/delegations/components/desktop/index.tsx b/packages/ui/src/screens/validator_details/components/staking/components/delegations/components/desktop/index.tsx index 53f5b71d1a..3941fab90c 100644 --- a/packages/ui/src/screens/validator_details/components/staking/components/delegations/components/desktop/index.tsx +++ b/packages/ui/src/screens/validator_details/components/staking/components/delegations/components/desktop/index.tsx @@ -23,7 +23,8 @@ const DelegationsRow: FC = ({ item }) => { ? `${formatNumber( item.amount.value, item.amount.exponent - )} ${item.amount.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${item.amount.displayDenom}` : '', }; diff --git a/packages/ui/src/screens/validator_details/components/staking/components/delegations/components/mobile/index.tsx b/packages/ui/src/screens/validator_details/components/staking/components/delegations/components/mobile/index.tsx index 5505464475..6ef1e684d8 100644 --- a/packages/ui/src/screens/validator_details/components/staking/components/delegations/components/mobile/index.tsx +++ b/packages/ui/src/screens/validator_details/components/staking/components/delegations/components/mobile/index.tsx @@ -34,7 +34,8 @@ const DelegationsItem: FC = ({ i, item, isLast }) => { {item.amount ? formatNumber(item.amount.value, item.amount.exponent) : ''}{' '} - {item.amount?.displayDenom.toUpperCase()} + {/* //Removed ".toUpperCase()" from the end of the line below per Reza's request */} + {item.amount?.displayDenom} diff --git a/packages/ui/src/screens/validator_details/components/staking/components/redelegations/components/desktop/index.tsx b/packages/ui/src/screens/validator_details/components/staking/components/redelegations/components/desktop/index.tsx index b3ddc69ff3..371809464e 100644 --- a/packages/ui/src/screens/validator_details/components/staking/components/redelegations/components/desktop/index.tsx +++ b/packages/ui/src/screens/validator_details/components/staking/components/redelegations/components/desktop/index.tsx @@ -25,7 +25,8 @@ const RedelegationsItem: FC<{ item: ItemType }> = ({ item }) => { ? `${formatNumber( item.amount.value, item.amount.exponent - )} ${item.amount.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${item.amount.displayDenom}` : '', completionTime: formatDayJs(dayjs.utc(item.completionTime), dateFormat), }; diff --git a/packages/ui/src/screens/validator_details/components/staking/components/redelegations/components/mobile/index.tsx b/packages/ui/src/screens/validator_details/components/staking/components/redelegations/components/mobile/index.tsx index 664e5f2db0..190f92f1da 100644 --- a/packages/ui/src/screens/validator_details/components/staking/components/redelegations/components/mobile/index.tsx +++ b/packages/ui/src/screens/validator_details/components/staking/components/redelegations/components/mobile/index.tsx @@ -52,7 +52,8 @@ const RedelegationsItem: FC = ({ i, item, isLast }) => { ? `${formatNumber( item.amount.value, item.amount.exponent - )} ${item.amount.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${item.amount.displayDenom}` : ''} diff --git a/packages/ui/src/screens/validator_details/components/staking/components/unbondings/components/desktop/index.tsx b/packages/ui/src/screens/validator_details/components/staking/components/unbondings/components/desktop/index.tsx index 54cbad7622..351b91a2c1 100644 --- a/packages/ui/src/screens/validator_details/components/staking/components/unbondings/components/desktop/index.tsx +++ b/packages/ui/src/screens/validator_details/components/staking/components/unbondings/components/desktop/index.tsx @@ -27,7 +27,8 @@ const UnboundingRow: FC = ({ item }) => { ? `${formatNumber( item.amount.value, item.amount.exponent - )} ${item.amount.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${item.amount.displayDenom}` : '', completionTime: formatDayJs(dayjs.utc(item.completionTime), dateFormat), }; diff --git a/packages/ui/src/screens/validator_details/components/staking/components/unbondings/components/mobile/index.tsx b/packages/ui/src/screens/validator_details/components/staking/components/unbondings/components/mobile/index.tsx index 26b9d8741b..4ff6564bf5 100644 --- a/packages/ui/src/screens/validator_details/components/staking/components/unbondings/components/mobile/index.tsx +++ b/packages/ui/src/screens/validator_details/components/staking/components/unbondings/components/mobile/index.tsx @@ -45,7 +45,8 @@ const UnbondingsItem: FC = ({ i, item, isLast }) => { ? `${formatNumber( item.amount.value, item.amount.exponent - )} ${item.amount.displayDenom.toUpperCase()}` + //Removed ".toUpperCase()" from the end of the line below per Reza's request + )} ${item.amount.displayDenom}` : ''} From aa71a95361a792aadf09b687aa559ab36c6de39c Mon Sep 17 00:00:00 2001 From: Juan Camilo Cifuentes Date: Tue, 21 Mar 2023 11:22:23 -0700 Subject: [PATCH 2/3] small typo fixes --- packages/ui/src/screens/blocks/styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui/src/screens/blocks/styles.ts b/packages/ui/src/screens/blocks/styles.ts index 3bb57143bb..05c730aef7 100644 --- a/packages/ui/src/screens/blocks/styles.ts +++ b/packages/ui/src/screens/blocks/styles.ts @@ -11,7 +11,7 @@ const useStyles = makeStyles()((theme) => ({ box: { minHeight: '500px', height: '50vh', - overflow: 'hidden', + overflow: 'hidden !important', [theme.breakpoints.up('lg')]: { height: '100%', minHeight: '65vh', From c676f4062ebcc9de180a587ed2b1df6c0fd0fb0e Mon Sep 17 00:00:00 2001 From: Juan Camilo Cifuentes Date: Tue, 21 Mar 2023 12:14:25 -0700 Subject: [PATCH 3/3] fixed badge under logo in sidebar --- packages/ui/src/assets/devnet-badge.svg | 37 ++++++++----------- packages/ui/src/assets/mainnet-badge.svg | 25 +++++++++++++ packages/ui/src/assets/testnet-badge.svg | 18 +++++++++ .../nav/components/desktop/index.tsx | 16 +++++--- 4 files changed, 69 insertions(+), 27 deletions(-) create mode 100644 packages/ui/src/assets/mainnet-badge.svg create mode 100644 packages/ui/src/assets/testnet-badge.svg diff --git a/packages/ui/src/assets/devnet-badge.svg b/packages/ui/src/assets/devnet-badge.svg index b04cbfcf9a..0b68256fc3 100644 --- a/packages/ui/src/assets/devnet-badge.svg +++ b/packages/ui/src/assets/devnet-badge.svg @@ -1,22 +1,17 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/packages/ui/src/assets/mainnet-badge.svg b/packages/ui/src/assets/mainnet-badge.svg new file mode 100644 index 0000000000..ef51feae13 --- /dev/null +++ b/packages/ui/src/assets/mainnet-badge.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/ui/src/assets/testnet-badge.svg b/packages/ui/src/assets/testnet-badge.svg new file mode 100644 index 0000000000..5356b34493 --- /dev/null +++ b/packages/ui/src/assets/testnet-badge.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/packages/ui/src/components/nav/components/desktop/index.tsx b/packages/ui/src/components/nav/components/desktop/index.tsx index cb1b55f13e..32e4b18c4b 100644 --- a/packages/ui/src/components/nav/components/desktop/index.tsx +++ b/packages/ui/src/components/nav/components/desktop/index.tsx @@ -14,6 +14,8 @@ import ActionBar from '@/components/nav/components/desktop/components/action_bar import Logo from '@/assets/logo.svg'; import LogoText from '@/assets/logo-text-white.svg'; import DevnetBadge from '@/assets/devnet-badge.svg'; +import TestnetBadge from '@/assets/testnet-badge.svg'; +import MainnetBadge from '@/assets/mainnet-badge.svg'; import ArrowIcon from '@/assets/icon_nav.svg'; import NetworkSelector from '../network_selector'; @@ -25,6 +27,7 @@ type DesktopProps = { const Desktop: FC = ({ className }) => { const { classes, cx } = useStyles(); const theme = useRecoilValue(readTheme); + const netName = process.env.NEXT_PUBLIC_CHAIN_TYPE; const { isMenu, toggleMenu, turnOffAll, toggleNetwork, isNetwork } = useDesktop(); return ( @@ -71,12 +74,13 @@ const Desktop: FC = ({ className }) => { transition: '.3s ease', }} /> - + {netName === 'devnet' ? ( + + ) : netName === 'testnet' ? ( + + ) : ( + + )} }