diff --git a/public/currencies/1inch.png b/public/currencies/1inch.png index 5fea68a..a0df4c1 100644 Binary files a/public/currencies/1inch.png and b/public/currencies/1inch.png differ diff --git a/public/currencies/aave.png b/public/currencies/aave.png index a052e70..4f4eb96 100644 Binary files a/public/currencies/aave.png and b/public/currencies/aave.png differ diff --git a/public/currencies/ada.png b/public/currencies/ada.png index b22b602..8cec7d1 100644 Binary files a/public/currencies/ada.png and b/public/currencies/ada.png differ diff --git a/public/currencies/algo.png b/public/currencies/algo.png index 6d07326..3dd42ac 100644 Binary files a/public/currencies/algo.png and b/public/currencies/algo.png differ diff --git a/public/currencies/ape.png b/public/currencies/ape.png new file mode 100644 index 0000000..51d3f98 Binary files /dev/null and b/public/currencies/ape.png differ diff --git a/public/currencies/apt.png b/public/currencies/apt.png new file mode 100644 index 0000000..552b1db Binary files /dev/null and b/public/currencies/apt.png differ diff --git a/public/currencies/arb.png b/public/currencies/arb.png new file mode 100644 index 0000000..d5a3602 Binary files /dev/null and b/public/currencies/arb.png differ diff --git a/public/currencies/atom.png b/public/currencies/atom.png index 52e22ae..2e64ea6 100644 Binary files a/public/currencies/atom.png and b/public/currencies/atom.png differ diff --git a/public/currencies/avax.png b/public/currencies/avax.png index ef808cc..e8cc21a 100644 Binary files a/public/currencies/avax.png and b/public/currencies/avax.png differ diff --git a/public/currencies/bch.png b/public/currencies/bch.png index 2bc47af..40e0c99 100644 Binary files a/public/currencies/bch.png and b/public/currencies/bch.png differ diff --git a/public/currencies/blur.png b/public/currencies/blur.png new file mode 100644 index 0000000..283d102 Binary files /dev/null and b/public/currencies/blur.png differ diff --git a/public/currencies/btc.png b/public/currencies/btc.png index eac760a..2bea4fc 100644 Binary files a/public/currencies/btc.png and b/public/currencies/btc.png differ diff --git a/public/currencies/celo.png b/public/currencies/celo.png index 9afa92a..31a906e 100644 Binary files a/public/currencies/celo.png and b/public/currencies/celo.png differ diff --git a/public/currencies/comp.png b/public/currencies/comp.png index c3d070a..850d596 100644 Binary files a/public/currencies/comp.png and b/public/currencies/comp.png differ diff --git a/public/currencies/crv.png b/public/currencies/crv.png index 8ae33ad..757e7cf 100644 Binary files a/public/currencies/crv.png and b/public/currencies/crv.png differ diff --git a/public/currencies/dai.png b/public/currencies/dai.png index 6cf8a78..f17f3ca 100644 Binary files a/public/currencies/dai.png and b/public/currencies/dai.png differ diff --git a/public/currencies/doge.png b/public/currencies/doge.png index 2511bc9..caaaab1 100644 Binary files a/public/currencies/doge.png and b/public/currencies/doge.png differ diff --git a/public/currencies/dot.png b/public/currencies/dot.png index ee4f40a..ba5fc19 100644 Binary files a/public/currencies/dot.png and b/public/currencies/dot.png differ diff --git a/public/currencies/dydx.png b/public/currencies/dydx.png index b3ced1a..841eba2 100644 Binary files a/public/currencies/dydx.png and b/public/currencies/dydx.png differ diff --git a/public/currencies/enj.png b/public/currencies/enj.png index af199f4..24c80ac 100644 Binary files a/public/currencies/enj.png and b/public/currencies/enj.png differ diff --git a/public/currencies/eos.png b/public/currencies/eos.png index 013ee7f..34d742a 100644 Binary files a/public/currencies/eos.png and b/public/currencies/eos.png differ diff --git a/public/currencies/etc.png b/public/currencies/etc.png index b405a06..6ec0728 100644 Binary files a/public/currencies/etc.png and b/public/currencies/etc.png differ diff --git a/public/currencies/eth.png b/public/currencies/eth.png index 3b3392b..7e5bd0a 100644 Binary files a/public/currencies/eth.png and b/public/currencies/eth.png differ diff --git a/public/currencies/fil.png b/public/currencies/fil.png index 1ad12d4..c0d7089 100644 Binary files a/public/currencies/fil.png and b/public/currencies/fil.png differ diff --git a/public/currencies/icp.png b/public/currencies/icp.png index 682518a..64d3463 100644 Binary files a/public/currencies/icp.png and b/public/currencies/icp.png differ diff --git a/public/currencies/ldo.png b/public/currencies/ldo.png new file mode 100644 index 0000000..37b1a4c Binary files /dev/null and b/public/currencies/ldo.png differ diff --git a/public/currencies/link.png b/public/currencies/link.png index 8bf658a..b734609 100644 Binary files a/public/currencies/link.png and b/public/currencies/link.png differ diff --git a/public/currencies/ltc.png b/public/currencies/ltc.png index e0d1e42..43db7a1 100644 Binary files a/public/currencies/ltc.png and b/public/currencies/ltc.png differ diff --git a/public/currencies/matic.png b/public/currencies/matic.png index f3718cf..2604a3d 100644 Binary files a/public/currencies/matic.png and b/public/currencies/matic.png differ diff --git a/public/currencies/mkr.png b/public/currencies/mkr.png index 536ec6c..f4564cf 100644 Binary files a/public/currencies/mkr.png and b/public/currencies/mkr.png differ diff --git a/public/currencies/near.png b/public/currencies/near.png index 0c42e0c..aa86500 100644 Binary files a/public/currencies/near.png and b/public/currencies/near.png differ diff --git a/public/currencies/op.png b/public/currencies/op.png new file mode 100644 index 0000000..ef563b7 Binary files /dev/null and b/public/currencies/op.png differ diff --git a/public/currencies/pepe.png b/public/currencies/pepe.png new file mode 100644 index 0000000..66fe7d0 Binary files /dev/null and b/public/currencies/pepe.png differ diff --git a/public/currencies/rune.png b/public/currencies/rune.png index b99d24f..2ee1863 100644 Binary files a/public/currencies/rune.png and b/public/currencies/rune.png differ diff --git a/public/currencies/sei.png b/public/currencies/sei.png new file mode 100644 index 0000000..1072240 Binary files /dev/null and b/public/currencies/sei.png differ diff --git a/public/currencies/shib.png b/public/currencies/shib.png new file mode 100644 index 0000000..0a44383 Binary files /dev/null and b/public/currencies/shib.png differ diff --git a/public/currencies/snx.png b/public/currencies/snx.png index b3fd370..a1fcb97 100644 Binary files a/public/currencies/snx.png and b/public/currencies/snx.png differ diff --git a/public/currencies/sol.png b/public/currencies/sol.png index 3d56e3f..15d04d3 100644 Binary files a/public/currencies/sol.png and b/public/currencies/sol.png differ diff --git a/public/currencies/sui.png b/public/currencies/sui.png new file mode 100644 index 0000000..0d17eeb Binary files /dev/null and b/public/currencies/sui.png differ diff --git a/public/currencies/sushi.png b/public/currencies/sushi.png index 91ee385..986c101 100644 Binary files a/public/currencies/sushi.png and b/public/currencies/sushi.png differ diff --git a/public/currencies/trx.png b/public/currencies/trx.png index 673ebe4..b87321e 100644 Binary files a/public/currencies/trx.png and b/public/currencies/trx.png differ diff --git a/public/currencies/uma.png b/public/currencies/uma.png index 0019c47..17a61a9 100644 Binary files a/public/currencies/uma.png and b/public/currencies/uma.png differ diff --git a/public/currencies/uni.png b/public/currencies/uni.png index ed6fa70..7a51c35 100644 Binary files a/public/currencies/uni.png and b/public/currencies/uni.png differ diff --git a/public/currencies/usdc.png b/public/currencies/usdc.png index 8b7c070..3de6940 100644 Binary files a/public/currencies/usdc.png and b/public/currencies/usdc.png differ diff --git a/public/currencies/usdt.png b/public/currencies/usdt.png index a8b9e22..db67216 100644 Binary files a/public/currencies/usdt.png and b/public/currencies/usdt.png differ diff --git a/public/currencies/wbtc.png b/public/currencies/wbtc.png index 3150873..b0ed485 100644 Binary files a/public/currencies/wbtc.png and b/public/currencies/wbtc.png differ diff --git a/public/currencies/weth.png b/public/currencies/weth.png index 317570b..54864ae 100644 Binary files a/public/currencies/weth.png and b/public/currencies/weth.png differ diff --git a/public/currencies/wld.png b/public/currencies/wld.png new file mode 100644 index 0000000..73e2e6f Binary files /dev/null and b/public/currencies/wld.png differ diff --git a/public/currencies/xlm.png b/public/currencies/xlm.png index fa6f941..d59fd57 100644 Binary files a/public/currencies/xlm.png and b/public/currencies/xlm.png differ diff --git a/public/currencies/xmr.png b/public/currencies/xmr.png index f784d4a..223d000 100644 Binary files a/public/currencies/xmr.png and b/public/currencies/xmr.png differ diff --git a/public/currencies/xrp.png b/public/currencies/xrp.png new file mode 100644 index 0000000..de0fc84 Binary files /dev/null and b/public/currencies/xrp.png differ diff --git a/public/currencies/xtz.png b/public/currencies/xtz.png index e8fe4be..3a2344e 100644 Binary files a/public/currencies/xtz.png and b/public/currencies/xtz.png differ diff --git a/public/currencies/yfi.png b/public/currencies/yfi.png index 6ec6174..2f0f188 100644 Binary files a/public/currencies/yfi.png and b/public/currencies/yfi.png differ diff --git a/public/currencies/zec.png b/public/currencies/zec.png index 64d53e7..90512d8 100644 Binary files a/public/currencies/zec.png and b/public/currencies/zec.png differ diff --git a/public/currencies/zrx.png b/public/currencies/zrx.png index 3cacc10..a512933 100644 Binary files a/public/currencies/zrx.png and b/public/currencies/zrx.png differ diff --git a/src/components/AssetIcon.tsx b/src/components/AssetIcon.tsx index f375284..5ecc426 100644 --- a/src/components/AssetIcon.tsx +++ b/src/components/AssetIcon.tsx @@ -9,9 +9,13 @@ const assetIcons = { AAVE: '/currencies/aave.png', ADA: '/currencies/ada.png', ALGO: '/currencies/algo.png', + APE: '/currencies/ape.png', + APT: '/currencies/apt.png', + ARB: '/currencies/arb.png', ATOM: '/currencies/atom.png', AVAX: '/currencies/avax.png', BCH: '/currencies/bch.png', + BLUR: '/currencies/blur.png', BTC: '/currencies/btc.png', CELO: '/currencies/celo.png', COMP: '/currencies/comp.png', @@ -26,14 +30,20 @@ const assetIcons = { ETH: '/currencies/eth.png', FIL: '/currencies/fil.png', ICP: '/currencies/icp.png', + LDO: '/currencies/ldo.png', LINK: '/currencies/link.png', LTC: '/currencies/ltc.png', MATIC: '/currencies/matic.png', MKR: '/currencies/mkr.png', NEAR: '/currencies/near.png', + OP: '/currencies/op.png', + PEPE: '/currencies/pepe.png', RUNE: '/currencies/rune.png', + SEI: '/currencies/sei.png', + SHIB: '/currencies/shib.png', SNX: '/currencies/snx.png', SOL: '/currencies/sol.png', + SUI: '/currencies/sui.png', SUSHI: '/currencies/sushi.png', TRX: '/currencies/trx.png', UMA: '/currencies/uma.png', @@ -42,21 +52,27 @@ const assetIcons = { USDT: '/currencies/usdt.png', WBTC: '/currencies/wbtc.png', WETH: '/currencies/weth.png', + WLD: '/currencies/wld.png', XLM: '/currencies/xlm.png', XMR: '/currencies/xmr.png', + XRP: '/currencies/xrp.png', XTZ: '/currencies/xtz.png', YFI: '/currencies/yfi.png', ZEC: '/currencies/zec.png', ZRX: '/currencies/zrx.png', } as const; +const isAssetSymbol = (symbol: Nullable): symbol is AssetSymbol => + symbol != null && assetIcons.hasOwnProperty(symbol); + export const AssetIcon = ({ symbol, className, }: { - symbol?: Nullable; + symbol?: Nullable; className?: string; -}) => (symbol ? : null); +}) => + isAssetSymbol(symbol) ? : null; const Styled: Record = {}; diff --git a/src/hooks/useSubaccount.tsx b/src/hooks/useSubaccount.tsx index d36fb94..30dca37 100644 --- a/src/hooks/useSubaccount.tsx +++ b/src/hooks/useSubaccount.tsx @@ -181,6 +181,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo recipient, DYDX_DENOM, Long.fromNumber(amount * QUANTUM_MULTIPLIER), + false, Method.BroadcastTxCommit ), diff --git a/src/pages/trade/HorizontalPanel.tsx b/src/pages/trade/HorizontalPanel.tsx index 76e975f..d3b4d73 100644 --- a/src/pages/trade/HorizontalPanel.tsx +++ b/src/pages/trade/HorizontalPanel.tsx @@ -6,7 +6,7 @@ import { STRING_KEYS } from '@/constants/localization'; import { useBreakpoints, useStringGetter } from '@/hooks'; -import { AssetIcon, type AssetSymbol } from '@/components/AssetIcon'; +import { AssetIcon } from '@/components/AssetIcon'; import { CollapsibleTabs } from '@/components/CollapsibleTabs'; import { LoadingSpinner } from '@/components/Loading/LoadingSpinner'; import { MobileTabs } from '@/components/Tabs'; @@ -217,7 +217,7 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => { value: PanelView.CurrentMarket, ...(currentMarketAssetId ? { - slotBefore: , + slotBefore: , label: currentMarketAssetId, } : { label: stringGetter({ key: STRING_KEYS.MARKET }) }), diff --git a/src/views/dialogs/ClosePositionDialog.tsx b/src/views/dialogs/ClosePositionDialog.tsx index c349312..9575189 100644 --- a/src/views/dialogs/ClosePositionDialog.tsx +++ b/src/views/dialogs/ClosePositionDialog.tsx @@ -8,7 +8,7 @@ import { MobilePlaceOrderSteps } from '@/constants/trade'; import { useBreakpoints, useStringGetter } from '@/hooks'; import { layoutMixins } from '@/styles/layoutMixins'; -import { AssetIcon, AssetSymbol } from '@/components/AssetIcon'; +import { AssetIcon } from '@/components/AssetIcon'; import { ClosePositionForm } from '@/views/forms/ClosePositionForm'; import { Dialog, DialogPlacement } from '@/components/Dialog'; import { GreenCheckCircle } from '@/components/GreenCheckCircle'; @@ -46,7 +46,7 @@ export const ClosePositionDialog = ({ setIsOpen }: ElementProps) => { } = { [MobilePlaceOrderSteps.EditOrder]: { title: , - slotIcon: symbol ? : undefined, + slotIcon: , }, [MobilePlaceOrderSteps.PreviewOrder]: { title: ( diff --git a/src/views/dialogs/TradeDialog.tsx b/src/views/dialogs/TradeDialog.tsx index ebcc8d7..c67d46a 100644 --- a/src/views/dialogs/TradeDialog.tsx +++ b/src/views/dialogs/TradeDialog.tsx @@ -9,7 +9,7 @@ import { TradeTypes, TRADE_TYPE_STRINGS, MobilePlaceOrderSteps } from '@/constan import { useBreakpoints, useStringGetter } from '@/hooks'; import { layoutMixins } from '@/styles/layoutMixins'; -import { AssetIcon, AssetSymbol } from '@/components/AssetIcon'; +import { AssetIcon } from '@/components/AssetIcon'; import { Dialog, DialogPlacement } from '@/components/Dialog'; import { GreenCheckCircle } from '@/components/GreenCheckCircle'; import { TradeForm } from '@/views/forms/TradeForm'; @@ -65,7 +65,7 @@ export const TradeDialog = ({ isOpen, setIsOpen, slotTrigger }: ElementProps) => items={[TradeTypes.LIMIT, TradeTypes.MARKET].map((tradeType: TradeTypes) => ({ value: tradeType, label: stringGetter({ key: TRADE_TYPE_STRINGS[tradeType].tradeTypeKey }), - slotBefore: , + slotBefore: , }))} value={selectedTradeType} onValueChange={(tradeType: TradeTypes) => diff --git a/src/views/forms/TradeForm/PositionPreview.tsx b/src/views/forms/TradeForm/PositionPreview.tsx index 5d97c82..d297db5 100644 --- a/src/views/forms/TradeForm/PositionPreview.tsx +++ b/src/views/forms/TradeForm/PositionPreview.tsx @@ -6,7 +6,7 @@ import { STRING_KEYS } from '@/constants/localization'; import { layoutMixins } from '@/styles/layoutMixins'; import { useStringGetter } from '@/hooks'; -import { AssetIcon, type AssetSymbol } from '@/components/AssetIcon'; +import { AssetIcon } from '@/components/AssetIcon'; import { getCurrentMarketAssetData } from '@/state/assetsSelectors'; import { getCurrentMarketData } from '@/state/perpetualsSelectors'; @@ -29,7 +29,7 @@ export const PositionPreview = ({ showNarrowVariation }: ElementProps) => { return ( - {!showNarrowVariation && } + {!showNarrowVariation && } {stringGetter({ key: STRING_KEYS.YOUR_MARKET_POSITION, diff --git a/src/views/tables/FillsTable.tsx b/src/views/tables/FillsTable.tsx index 6010499..59dfdb1 100644 --- a/src/views/tables/FillsTable.tsx +++ b/src/views/tables/FillsTable.tsx @@ -14,7 +14,7 @@ import { useBreakpoints, useStringGetter } from '@/hooks'; import { layoutMixins } from '@/styles/layoutMixins'; import { tradeViewMixins } from '@/styles/tradeViewMixins'; -import { AssetIcon, type AssetSymbol } from '@/components/AssetIcon'; +import { AssetIcon } from '@/components/AssetIcon'; import { Icon, IconName } from '@/components/Icon'; import { MarketTableCell } from '@/components/Table/MarketTableCell'; import { OrderSideTag } from '@/components/OrderSideTag'; @@ -90,7 +90,7 @@ const getFillsTableColumnDef = ({ key: STRING_KEYS.AMOUNT, })}`, renderCell: ({ resources, size, stepSizeDecimals, asset: { symbol } }) => ( - }> + }> {resources.typeStringKey ? stringGetter({ key: resources.typeStringKey }) : null} diff --git a/src/views/tables/OrdersTable.tsx b/src/views/tables/OrdersTable.tsx index 1269844..68f018a 100644 --- a/src/views/tables/OrdersTable.tsx +++ b/src/views/tables/OrdersTable.tsx @@ -16,7 +16,7 @@ import { breakpoints } from '@/styles'; import { layoutMixins } from '@/styles/layoutMixins'; import { tradeViewMixins } from '@/styles/tradeViewMixins'; -import { AssetIcon, AssetSymbol } from '@/components/AssetIcon'; +import { AssetIcon } from '@/components/AssetIcon'; import { Icon, IconName } from '@/components/Icon'; import { OrderSideTag } from '@/components/OrderSideTag'; import { Output, OutputType } from '@/components/Output'; @@ -254,7 +254,7 @@ const getOrdersTableColumnDef = ({ value={createdAtMilliseconds} /> - + diff --git a/src/views/tables/PositionsTable.tsx b/src/views/tables/PositionsTable.tsx index 1b8f2f9..91d7ca7 100644 --- a/src/views/tables/PositionsTable.tsx +++ b/src/views/tables/PositionsTable.tsx @@ -23,7 +23,7 @@ import { getExistingOpenPositions } from '@/state/accountSelectors'; import { getAssets } from '@/state/assetsSelectors'; import { getPerpetualMarkets } from '@/state/perpetualsSelectors'; -import { AssetIcon, AssetSymbol } from '@/components/AssetIcon'; +import { AssetIcon } from '@/components/AssetIcon'; import { Icon, IconName } from '@/components/Icon'; import { MarketTableCell } from '@/components/Table/MarketTableCell'; import { Output, OutputType, ShowSign } from '@/components/Output'; @@ -72,7 +72,7 @@ const getPositionsTableColumnDef = ({ getCellValue: (row) => row.id, label: stringGetter({ key: STRING_KEYS.DETAILS }), renderCell: ({ id, asset, leverage, resources, size }) => ( - }> + }>