Compare commits

..
Author SHA1 Message Date
John Huang b220203c91 Indexer and validator are on https for DEV 2023-10-23 14:26:14 -07:00
4 changed files with 46 additions and 16 deletions
+37 -13
View File
@@ -8,43 +8,67 @@
], ],
"components": [ "components": [
{ {
"/": "/" "/": "/trade/*"
}, },
{ {
"/": "/#/" "/": "/r/*"
}, },
{ {
"/": "*/markets" "/": "/portfolio/overview"
}, },
{ {
"/": "*/trade" "/": "/portfolio/positions"
}, },
{ {
"/": "*/trade/*" "/": "/portfolio/orders"
}, },
{ {
"/": "*/portfolio" "/": "/portfolio/fees"
}, },
{ {
"/": "*/portfolio/overview" "/": "/portfolio/history"
}, },
{ {
"/": "*/portfolio/positions" "/": "/portfolio/history/trades"
}, },
{ {
"/": "*/portfolio/orders" "/": "/portfolio/history/transfers"
}, },
{ {
"/": "*/portfolio/fees" "/": "/portfolio/history/funding"
}, },
{ {
"/": "*/portfolio/history/trades" "/": "/rewards"
}, },
{ {
"/": "*/portfolio/history/transfers" "/": "/my-profile"
}, },
{ {
"/": "*/portfolio/history/funding" "/": "/rankings/hedgies"
},
{
"/": "/rankings/competition"
},
{
"/": "/rankings/diamond"
},
{
"/": "/rankings/platinum"
},
{
"/": "/rankings/gold"
},
{
"/": "/rankings/silver"
},
{
"/": "/rankings/bronze"
},
{
"/": "/rankings/pnl-absolute"
},
{
"/": "/rankings/pnl-percent"
}, },
{ {
"/": "/walletsegue", "/": "/walletsegue",
+4 -1
View File
@@ -6,6 +6,7 @@ import { useQuery } from 'react-query';
import { formatUnits } from 'viem'; import { formatUnits } from 'viem';
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks'; import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { QUANTUM_MULTIPLIER } from '@/constants/numbers';
import { EvmAddress } from '@/constants/wallets'; import { EvmAddress } from '@/constants/wallets';
import { convertBech32Address } from '@/lib/addressUtils'; import { convertBech32Address } from '@/lib/addressUtils';
@@ -20,6 +21,7 @@ import { useTokenConfigs } from './useTokenConfigs';
type UseAccountBalanceProps = { type UseAccountBalanceProps = {
// Token Items // Token Items
addressOrDenom?: string; addressOrDenom?: string;
assetSymbol?: string;
decimals?: number; decimals?: number;
// Chain Items // Chain Items
@@ -38,6 +40,7 @@ export const CHAIN_DEFAULT_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeee
export const useAccountBalance = ({ export const useAccountBalance = ({
addressOrDenom, addressOrDenom,
assetSymbol,
bech32AddrPrefix, bech32AddrPrefix,
chainId, chainId,
decimals = 0, decimals = 0,
@@ -88,7 +91,7 @@ export const useAccountBalance = ({
}); });
const { formatted: evmBalance } = evmQuery.data || {}; const { formatted: evmBalance } = evmQuery.data || {};
const balance = isCosmosChain ? cosmosQuery.data : evmBalance; const balance = !assetSymbol ? '0' : isCosmosChain ? cosmosQuery.data : evmBalance;
const nativeTokenCoinBalance = balances?.[chainTokenDenom]; const nativeTokenCoinBalance = balances?.[chainTokenDenom];
const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount); const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount);
+4 -2
View File
@@ -22,6 +22,7 @@ import { OnboardingTriggerButton } from '@/views/dialogs/OnboardingTriggerButton
import { openDialog } from '@/state/dialogs'; import { openDialog } from '@/state/dialogs';
import { calculateCanAccountTrade } from '@/state/accountCalculators'; import { calculateCanAccountTrade } from '@/state/accountCalculators';
// TODO(@aforaleka): replace with real data
export const DYDXBalancePanel = () => { export const DYDXBalancePanel = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
@@ -109,7 +110,7 @@ export const DYDXBalancePanel = () => {
value: ( value: (
<Output <Output
type={OutputType.Asset} type={OutputType.Asset}
value={nativeTokenBalance.plus(nativeStakingBalance)} value={nativeTokenBalance + nativeStakingBalance}
tag={chainTokenLabel} tag={chainTokenLabel}
/> />
), ),
@@ -125,7 +126,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
Styled.Header = styled.div` Styled.Header = styled.div`
${layoutMixins.spacedRow} ${layoutMixins.spacedRow}
padding: 1rem 1.5rem 0; padding: 1.25rem 1.5rem 0.5rem;
`; `;
Styled.Title = styled.h3` Styled.Title = styled.h3`
@@ -154,6 +155,7 @@ Styled.ReceiveButton = styled(Button)`
Styled.Content = styled.div` Styled.Content = styled.div`
${layoutMixins.flexColumn} ${layoutMixins.flexColumn}
gap: 0.75rem; gap: 0.75rem;
padding: 0 0.5rem 0.5rem;
`; `;
Styled.IconContainer = styled.div` Styled.IconContainer = styled.div`
@@ -87,6 +87,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
// Async Data // Async Data
const { balance, queryStatus, isQueryFetching } = useAccountBalance({ const { balance, queryStatus, isQueryFetching } = useAccountBalance({
addressOrDenom: sourceToken?.address || CHAIN_DEFAULT_TOKEN_ADDRESS, addressOrDenom: sourceToken?.address || CHAIN_DEFAULT_TOKEN_ADDRESS,
assetSymbol: sourceToken?.symbol || undefined,
chainId: chainId, chainId: chainId,
decimals: sourceToken?.decimals || undefined, decimals: sourceToken?.decimals || undefined,
isCosmosChain: false, isCosmosChain: false,