Compare commits

..
Author SHA1 Message Date
Rui db3e7331b8 Fix path to chainLogo 2023-12-06 13:35:08 -08:00
38 changed files with 894 additions and 1440 deletions
+4 -4
View File
@@ -39,9 +39,9 @@
"@cosmjs/proto-signing": "^0.31.0", "@cosmjs/proto-signing": "^0.31.0",
"@cosmjs/stargate": "^0.31.0", "@cosmjs/stargate": "^0.31.0",
"@cosmjs/tendermint-rpc": "^0.31.0", "@cosmjs/tendermint-rpc": "^0.31.0",
"@dydxprotocol/v4-abacus": "^1.1.24", "@dydxprotocol/v4-abacus": "^1.1.4",
"@dydxprotocol/v4-client-js": "^1.0.11", "@dydxprotocol/v4-client-js": "^1.0.6",
"@dydxprotocol/v4-localization": "^1.0.19", "@dydxprotocol/v4-localization": "^1.0.17",
"@ethersproject/providers": "^5.7.2", "@ethersproject/providers": "^5.7.2",
"@js-joda/core": "^5.5.3", "@js-joda/core": "^5.5.3",
"@radix-ui/react-checkbox": "^1.0.4", "@radix-ui/react-checkbox": "^1.0.4",
@@ -111,7 +111,7 @@
"styled-components": "^5.3.11", "styled-components": "^5.3.11",
"use-latest": "^1.2.1", "use-latest": "^1.2.1",
"viem": "^1.12.2", "viem": "^1.12.2",
"wagmi": "^1.4.12" "wagmi": "^1.4.5"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.22.5", "@babel/core": "^7.22.5",
+123 -671
View File
File diff suppressed because it is too large Load Diff
+20
View File
@@ -1,9 +1,29 @@
[ [
{
"chainId": "42161",
"tokenAddress": "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
"name": "Arbitrum"
},
{
"chainId": "43114",
"tokenAddress": "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
"name": "Avalanche"
},
{
"chainId": "8453",
"tokenAddress": "0x66627F389ae46D881773B7131139b2411980E09E",
"name": "Base"
},
{ {
"chainId": "1", "chainId": "1",
"tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
"name": "Ethereum" "name": "Ethereum"
}, },
{
"chainId": "10",
"tokenAddress": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607",
"name": "OP Mainnet"
},
{ {
"chainId": "421613", "chainId": "421613",
"tokenAddress": "0xfd064a18f3bf249cf1f87fc203e90d8f650f2d63", "tokenAddress": "0xfd064a18f3bf249cf1f87fc203e90d8f650f2d63",
+14 -14
View File
@@ -71,7 +71,7 @@
"https://validator.v4dev.dydx.exchange" "https://validator.v4dev.dydx.exchange"
], ],
"0xsquid": "https://testnet.api.0xsquid.com", "0xsquid": "https://testnet.api.0xsquid.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/", "nobleValidator": "https://rpc.testnet.noble.strange.love",
"faucet": "https://faucet.v4dev.dydx.exchange" "faucet": "https://faucet.v4dev.dydx.exchange"
}, },
"links": { "links": {
@@ -145,7 +145,7 @@
"http://54.92.118.111" "http://54.92.118.111"
], ],
"0xsquid": "https://testnet.api.0xsquid.com", "0xsquid": "https://testnet.api.0xsquid.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/" "nobleValidator": "https://rpc.testnet.noble.strange.love"
}, },
"links": { "links": {
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
@@ -218,7 +218,7 @@
"http://validator.v4dev4.dydx.exchange" "http://validator.v4dev4.dydx.exchange"
], ],
"0xsquid": "https://testnet.api.0xsquid.com", "0xsquid": "https://testnet.api.0xsquid.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/" "nobleValidator": "https://rpc.testnet.noble.strange.love"
}, },
"links": { "links": {
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
@@ -291,7 +291,7 @@
"http://18.223.78.50" "http://18.223.78.50"
], ],
"0xsquid": "https://testnet.api.0xsquid.com", "0xsquid": "https://testnet.api.0xsquid.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/" "nobleValidator": "https://rpc.testnet.noble.strange.love"
}, },
"links": { "links": {
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
@@ -365,7 +365,7 @@
"https://validator.v4staging.dydx.exchange" "https://validator.v4staging.dydx.exchange"
], ],
"0xsquid": "https://testnet.api.squidrouter.com", "0xsquid": "https://testnet.api.squidrouter.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/" "nobleValidator": "https://rpc.testnet.noble.strange.love"
}, },
"links": { "links": {
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
@@ -440,7 +440,7 @@
"https://validator.v4staging.dydx.exchange" "https://validator.v4staging.dydx.exchange"
], ],
"0xsquid": "https://testnet.api.squidrouter.com", "0xsquid": "https://testnet.api.squidrouter.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/" "nobleValidator": "https://rpc.testnet.noble.strange.love"
}, },
"links": { "links": {
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
@@ -513,7 +513,7 @@
"https://validator-uswest1.v4staging.dydx.exchange" "https://validator-uswest1.v4staging.dydx.exchange"
], ],
"0xsquid": "https://testnet.api.squidrouter.com", "0xsquid": "https://testnet.api.squidrouter.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/" "nobleValidator": "https://rpc.testnet.noble.strange.love"
}, },
"links": { "links": {
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
@@ -591,7 +591,7 @@
"https://dydx-rpc.liquify.com/api=8878132/dydx" "https://dydx-rpc.liquify.com/api=8878132/dydx"
], ],
"0xsquid": "https://testnet.api.squidrouter.com", "0xsquid": "https://testnet.api.squidrouter.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/", "nobleValidator": "https://rpc.testnet.noble.strange.love",
"faucet": "https://faucet.v4testnet.dydx.exchange" "faucet": "https://faucet.v4testnet.dydx.exchange"
}, },
"links": { "links": {
@@ -666,7 +666,7 @@
"https://validator.v4testnet.dydx.exchange" "https://validator.v4testnet.dydx.exchange"
], ],
"0xsquid": "https://testnet.api.squidrouter.com", "0xsquid": "https://testnet.api.squidrouter.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/", "nobleValidator": "https://rpc.testnet.noble.strange.love",
"faucet": "https://faucet.v4testnet.dydx.exchange" "faucet": "https://faucet.v4testnet.dydx.exchange"
}, },
"links": { "links": {
@@ -742,7 +742,7 @@
"https://dydx-testnet.nodefleet.org" "https://dydx-testnet.nodefleet.org"
], ],
"0xsquid": "https://testnet.api.squidrouter.com", "0xsquid": "https://testnet.api.squidrouter.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/", "nobleValidator": "https://rpc.testnet.noble.strange.love",
"faucet": "https://faucet.v4testnet.dydx.exchange" "faucet": "https://faucet.v4testnet.dydx.exchange"
}, },
"links": { "links": {
@@ -818,7 +818,7 @@
"https://test-dydx.kingnodes.com" "https://test-dydx.kingnodes.com"
], ],
"0xsquid": "https://testnet.api.squidrouter.com", "0xsquid": "https://testnet.api.squidrouter.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/", "nobleValidator": "https://rpc.testnet.noble.strange.love",
"faucet": "https://faucet.v4testnet.dydx.exchange" "faucet": "https://faucet.v4testnet.dydx.exchange"
}, },
"links": { "links": {
@@ -894,7 +894,7 @@
"https://dydx-rpc.liquify.com/api=8878132/dydx" "https://dydx-rpc.liquify.com/api=8878132/dydx"
], ],
"0xsquid": "https://testnet.api.squidrouter.com", "0xsquid": "https://testnet.api.squidrouter.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/", "nobleValidator": "https://rpc.testnet.noble.strange.love",
"faucet": "https://faucet.v4testnet.dydx.exchange" "faucet": "https://faucet.v4testnet.dydx.exchange"
}, },
"links": { "links": {
@@ -970,7 +970,7 @@
"https://dydx-testnet-rpc.polkachu.com/" "https://dydx-testnet-rpc.polkachu.com/"
], ],
"0xsquid": "https://testnet.api.squidrouter.com", "0xsquid": "https://testnet.api.squidrouter.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/", "nobleValidator": "https://rpc.testnet.noble.strange.love",
"faucet": "https://faucet.v4testnet.dydx.exchange" "faucet": "https://faucet.v4testnet.dydx.exchange"
}, },
"links": { "links": {
@@ -1037,7 +1037,7 @@
"https://dydx-testnet-full-rpc.public.blastapi.io/" "https://dydx-testnet-full-rpc.public.blastapi.io/"
], ],
"0xsquid": "https://testnet.api.squidrouter.com", "0xsquid": "https://testnet.api.squidrouter.com",
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/", "nobleValidator": "https://rpc.testnet.noble.strange.love",
"faucet": "https://faucet.v4testnet.dydx.exchange" "faucet": "https://faucet.v4testnet.dydx.exchange"
}, },
"links": { "links": {
+403 -309
View File
@@ -1,360 +1,454 @@
{ {
"1INCH-USD": { "1INCH-USD":{
"name": "1inch", "name":"1inch",
"tags": ["Defi"], "tags":[
"websiteLink": "https://1inch.io/", "Defi"
"whitepaperLink": "https://github.com/1inch", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/1inch/" "websiteLink":"https://1inch.io/",
"whitepaperLink":"https://github.com/1inch",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/1inch/"
}, },
"AAVE-USD": { "AAVE-USD":{
"name": "Aave", "name":"Aave",
"tags": ["Defi"], "tags":[
"websiteLink": "https://aave.com/", "Defi"
"whitepaperLink": "https://github.com/aave/protocol-v2/blob/master/aave-v2-whitepaper.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/aave/" "websiteLink":"https://aave.com/",
"whitepaperLink":"https://github.com/aave/protocol-v2/blob/master/aave-v2-whitepaper.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/aave/"
}, },
"ADA-USD": { "ADA-USD":{
"name": "Cardano", "name":"Cardano",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://cardano.org/", "Layer 1"
"whitepaperLink": "https://why.cardano.org/en/introduction/motivation/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/cardano/" "websiteLink":"https://cardano.org/",
"whitepaperLink":"https://why.cardano.org/en/introduction/motivation/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/cardano/"
}, },
"ALGO-USD": { "ALGO-USD":{
"name": "Algorand", "name":"Algorand",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://algorand.com/", "Layer 1"
"whitepaperLink": "https://algorand.com/technology/white-papers", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/algorand/" "websiteLink":"https://algorand.com/",
"whitepaperLink":"https://algorand.com/technology/white-papers",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/algorand/"
}, },
"APE-USD": { "APE-USD":{
"name": "ApeCoin", "name":"ApeCoin",
"tags": [], "tags":[
"websiteLink": "https://apecoin.com/",
"whitepaperLink": "https://apecoin.com/about", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/apecoin-ape/" "websiteLink":"https://apecoin.com/",
"whitepaperLink":"https://apecoin.com/about",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/apecoin-ape/"
}, },
"APT-USD": { "APT-USD":{
"name": "Aptos", "name":"Aptos",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://aptoslabs.com/", "Layer 1"
"whitepaperLink": "https://aptos.dev/aptos-white-paper/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/aptos/" "websiteLink":"https://aptoslabs.com/",
"whitepaperLink":"https://aptos.dev/aptos-white-paper/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/aptos/"
}, },
"ARB-USD": { "ARB-USD":{
"name": "Arbitrum", "name":"Arbitrum",
"tags": [], "tags":[
"websiteLink": "https://arbitrum.io/",
"whitepaperLink": "https://github.com/OffchainLabs/nitro", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/arbitrum/" "websiteLink":"https://arbitrum.io/",
"whitepaperLink":"https://github.com/OffchainLabs/nitro",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/arbitrum/"
}, },
"ATOM-USD": { "ATOM-USD":{
"name": "Cosmos", "name":"Cosmos",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://cosmos.network/", "Layer 1"
"whitepaperLink": "https://v1.cosmos.network/resources/whitepaper", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/cosmos/" "websiteLink":"https://cosmos.network/",
"whitepaperLink":"https://v1.cosmos.network/resources/whitepaper",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/cosmos/"
}, },
"AVAX-USD": { "AVAX-USD":{
"name": "Avalanche", "name":"Avalanche",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://www.avalabs.org/", "Layer 1"
"whitepaperLink": "https://assets.website-files.com/5d80307810123f5ffbb34d6e/6008d7bbf8b10d1eb01e7e16_Avalanche%20Platform%20Whitepaper.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/avalanche/" "websiteLink":"https://www.avalabs.org/",
"whitepaperLink":"https://assets.website-files.com/5d80307810123f5ffbb34d6e/6008d7bbf8b10d1eb01e7e16_Avalanche%20Platform%20Whitepaper.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/avalanche/"
}, },
"BCH-USD": { "BCH-USD":{
"name": "Bitcoin Cash", "name":"Bitcoin Cash",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://bitcoincash.org/", "Layer 1"
"whitepaperLink": "https://bitcoincash.org/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/bitcoin-cash/" "websiteLink":"https://bitcoincash.org/",
"whitepaperLink":"https://bitcoincash.org/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin-cash/"
}, },
"BLUR-USD": { "BLUR-USD":{
"name": "Blur", "name":"Blur",
"tags": [], "tags":[
"websiteLink": "https://blur.io/",
"whitepaperLink": "https://docs.blur.foundation/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/blur-token/" "websiteLink":"https://blur.io/",
"whitepaperLink":"https://docs.blur.foundation/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/blur-token/"
}, },
"CELO-USD": { "CELO-USD":{
"name": "Celo", "name":"Celo",
"tags": [], "tags":[
"websiteLink": "https://celo.org",
"whitepaperLink": "https://docs.celo.org", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/celo/" "websiteLink":"https://celo.org",
"whitepaperLink":"https://docs.celo.org",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/celo/"
}, },
"BTC-USD": { "BTC-USD":{
"name": "Bitcoin", "name":"Bitcoin",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://bitcoin.org/", "Layer 1"
"whitepaperLink": "https://bitcoin.org/bitcoin.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/bitcoin/" "websiteLink":"https://bitcoin.org/",
"whitepaperLink":"https://bitcoin.org/bitcoin.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin/"
}, },
"COMP-USD": { "COMP-USD":{
"name": "Compound", "name":"Compound",
"tags": ["Defi"], "tags":[
"websiteLink": "https://compound.finance/", "Defi"
"whitepaperLink": "https://compound.finance/documents/Compound.Whitepaper.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/compound/" "websiteLink":"https://compound.finance/",
"whitepaperLink":"https://compound.finance/documents/Compound.Whitepaper.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/compound/"
}, },
"CRV-USD": { "CRV-USD":{
"name": "Curve", "name":"Curve",
"tags": ["Governance"], "tags":[
"websiteLink": "https://curve.fi/", "Governance"
"whitepaperLink": "https://curve.fi/whitepaper", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/curve-dao-token/" "websiteLink":"https://curve.fi/",
"whitepaperLink":"https://curve.fi/whitepaper",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/curve-dao-token/"
}, },
"DOGE-USD": { "DOGE-USD":{
"name": "Dogecoin", "name":"Dogecoin",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://dogecoin.com/", "Layer 1"
"whitepaperLink": "https://github.com/dogecoin/dogecoin", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/dogecoin/" "websiteLink":"https://dogecoin.com/",
"whitepaperLink":"https://github.com/dogecoin/dogecoin",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/dogecoin/"
}, },
"DOT-USD": { "DOT-USD":{
"name": "Polkadot", "name":"Polkadot",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://polkadot.network/", "Layer 1"
"whitepaperLink": "https://polkadot.network/PolkaDotPaper.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/polkadot-new/" "websiteLink":"https://polkadot.network/",
"whitepaperLink":"https://polkadot.network/PolkaDotPaper.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/polkadot-new/"
}, },
"ENJ-USD": { "ENJ-USD":{
"name": "Enjin", "name":"Enjin",
"tags": [], "tags":[
"websiteLink": "https://enjin.io/",
"whitepaperLink": "https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/enjin-coin/" "websiteLink":"https://enjin.io/",
"whitepaperLink":"https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/enjin-coin/"
}, },
"EOS-USD": { "EOS-USD":{
"name": "EOS", "name":"EOS",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://eos.io/", "Layer 1"
"whitepaperLink": "https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/eos/" "websiteLink":"https://eos.io/",
"whitepaperLink":"https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/eos/"
}, },
"ETC-USD": { "ETC-USD":{
"name": "Ethereum Classic", "name":"Ethereum Classic",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://ethereumclassic.org/", "Layer 1"
"whitepaperLink": "https://ethereumclassic.org/why-classic", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/ethereum-classic/" "websiteLink":"https://ethereumclassic.org/",
"whitepaperLink":"https://ethereumclassic.org/why-classic",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum-classic/"
}, },
"ETH-USD": { "ETH-USD":{
"name": "Ethereum", "name":"Ethereum",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://ethereum.org/", "Layer 1"
"whitepaperLink": "https://ethereum.org/whitepaper/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/ethereum/", "websiteLink":"https://ethereum.org/",
"displayStepSize": "0.001", "whitepaperLink":"https://ethereum.org/whitepaper/",
"displayTickSize": "0.1" "coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum/",
"displayStepSize":"0.001",
"displayTickSize":"0.1"
}, },
"FIL-USD": { "FIL-USD":{
"name": "Filecoin", "name":"Filecoin",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://filecoin.io/", "Layer 1"
"whitepaperLink": "https://filecoin.io/filecoin.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/filecoin/" "websiteLink":"https://filecoin.io/",
"whitepaperLink":"https://filecoin.io/filecoin.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/filecoin/"
}, },
"HNT-USD": { "HNT-USD":{
"name": "Helium", "name":"Helium",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://www.helium.com", "Layer 1"
"whitepaperLink": "http://whitepaper.helium.com", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/helium/" "websiteLink":"https://www.helium.com",
"whitepaperLink":"http://whitepaper.helium.com",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/helium/"
}, },
"ICP-USD": { "ICP-USD":{
"name": "Internet Computer", "name":"Internet Computer",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://dfinity.org", "Layer 1"
"whitepaperLink": "https://dfinity.org/whitepaper.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/internet-computer/" "websiteLink":"https://dfinity.org",
"whitepaperLink":"https://dfinity.org/whitepaper.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/internet-computer/"
}, },
"LDO-USD": { "LDO-USD":{
"name": "Lido DAO", "name":"Lido DAO",
"tags": ["Defi"], "tags":[
"websiteLink": "https://lido.fi/", "Defi"
"whitepaperLink": "https://lido.fi/static/Lido:Ethereum-Liquid-Staking.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/lido-dao/" "websiteLink":"https://lido.fi/",
"whitepaperLink":"https://lido.fi/static/Lido:Ethereum-Liquid-Staking.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/lido-dao/"
}, },
"LINK-USD": { "LINK-USD":{
"name": "Chainlink", "name":"Chainlink",
"tags": ["Defi"], "tags":[
"websiteLink": "https://chain.link/", "Defi"
"whitepaperLink": "https://link.smartcontract.com/whitepaper", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/chainlink/" "websiteLink":"https://chain.link/",
"whitepaperLink":"https://link.smartcontract.com/whitepaper",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/chainlink/"
}, },
"LTC-USD": { "LTC-USD":{
"name": "Litecoin", "name":"Litecoin",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://litecoin.org/", "Layer 1"
"whitepaperLink": "https://litecoin.info/index.php/Main_Page", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/litecoin/" "websiteLink":"https://litecoin.org/",
"whitepaperLink":"https://litecoin.info/index.php/Main_Page",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/litecoin/"
}, },
"MATIC-USD": { "MATIC-USD":{
"name": "Polygon", "name":"Polygon",
"tags": ["Layer 2"], "tags":[
"websiteLink": "https://polygon.technology/", "Layer 2"
"whitepaperLink": "https://polygon.technology/lightpaper-polygon.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/polygon/" "websiteLink":"https://polygon.technology/",
"whitepaperLink":"https://polygon.technology/lightpaper-polygon.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/polygon/"
}, },
"MKR-USD": { "MKR-USD":{
"name": "Maker", "name":"Maker",
"tags": ["Governance"], "tags":[
"websiteLink": "https://makerdao.com", "Governance"
"whitepaperLink": "https://makerdao.com/whitepaper", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/maker/" "websiteLink":"https://makerdao.com",
"whitepaperLink":"https://makerdao.com/whitepaper",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/maker/"
}, },
"NEAR-USD": { "NEAR-USD":{
"name": "NEAR Protocol", "name":"NEAR Protocol",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://near.org", "Layer 1"
"whitepaperLink": "https://near.org/papers/the-official-near-white-paper/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/near-protocol/" "websiteLink":"https://near.org",
"whitepaperLink":"https://near.org/papers/the-official-near-white-paper/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/near-protocol/"
}, },
"OP-USD": { "OP-USD":{
"name": "Optimism", "name":"Optimism",
"tags": [], "tags":[
"websiteLink": "https://www.optimism.io/",
"whitepaperLink": "https://github.com/ethereum-optimism", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/optimism-ethereum/" "websiteLink":"https://www.optimism.io/",
"whitepaperLink":"https://github.com/ethereum-optimism",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/optimism-ethereum/"
}, },
"PEPE-USD": { "PEPE-USD":{
"name": "Pepe", "name":"Pepe",
"tags": [], "tags":[
"websiteLink": "https://www.pepe.vip/",
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/pepe/" ],
"websiteLink":"https://www.pepe.vip/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/pepe/"
}, },
"RUNE-USD": { "RUNE-USD":{
"name": "THORChain", "name":"THORChain",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://thorchain.org", "Layer 1"
"whitepaperLink": "https://whitepaper.io/document/709/thorchain-whitepaper", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/thorchain/" "websiteLink":"https://thorchain.org",
"whitepaperLink":"https://whitepaper.io/document/709/thorchain-whitepaper",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/thorchain/"
}, },
"SEI-USD": { "SEI-USD":{
"name": "Sei", "name":"Sei",
"tags": ["Layer 1", "Defi"], "tags":[
"websiteLink": "https://www.sei.io/", "Layer 1",
"whitepaperLink": "https://github.com/sei-protocol/sei-chain/blob/3c9576fee3494ce039df684624f918dd8066ba3f/whitepaper/Sei_Whitepaper.pdf", "Defi"
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/sei/" ],
"websiteLink":"https://www.sei.io/",
"whitepaperLink":"https://github.com/sei-protocol/sei-chain/blob/3c9576fee3494ce039df684624f918dd8066ba3f/whitepaper/Sei_Whitepaper.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/sei/"
}, },
"SHIB-USD": { "SHIB-USD":{
"name": "Shiba Inu", "name":"Shiba Inu",
"tags": [], "tags":[
"websiteLink": "https://shibatoken.com/",
"whitepaperLink": "https://docs.shibatoken.com/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/shiba-inu/" "websiteLink":"https://shibatoken.com/",
"whitepaperLink":"https://docs.shibatoken.com/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/shiba-inu/"
}, },
"SNX-USD": { "SNX-USD":{
"name": "Synthetix", "name":"Synthetix",
"tags": ["Defi"], "tags":[
"websiteLink": "https://synthetix.io/", "Defi"
"whitepaperLink": "https://docs.synthetix.io/litepaper", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/synthetix-network-token/" "websiteLink":"https://synthetix.io/",
"whitepaperLink":"https://docs.synthetix.io/litepaper",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/synthetix-network-token/"
}, },
"SOL-USD": { "SOL-USD":{
"name": "Solana", "name":"Solana",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://solana.com/", "Layer 1"
"whitepaperLink": "https://solana.com/solana-whitepaper.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/solana/" "websiteLink":"https://solana.com/",
"whitepaperLink":"https://solana.com/solana-whitepaper.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/solana/"
}, },
"SUI-USD": { "SUI-USD":{
"name": "Sui", "name":"Sui",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://sui.io/", "Layer 1"
"whitepaperLink": "https://github.com/MystenLabs", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/sui/" "websiteLink":"https://sui.io/",
"whitepaperLink":"https://github.com/MystenLabs",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/sui/"
}, },
"SUSHI-USD": { "SUSHI-USD":{
"name": "Sushi", "name":"Sushi",
"tags": ["Defi"], "tags":[
"websiteLink": "https://sushi.com/", "Defi"
"whitepaperLink": "https://docs.sushi.com/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/sushiswap/" "websiteLink":"https://sushi.com/",
"whitepaperLink":"https://docs.sushi.com/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/sushiswap/"
}, },
"TIA-USD": { "TRX-USD":{
"name": "Celestia", "name":"TRON",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://celestia.org/", "Defi"
"whitepaperLink": "https://arxiv.org/pdf/1905.09274.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/celestia/" "websiteLink":"https://tron.network/",
"whitepaperLink":"https://tron.network/static/doc/white_paper_v_2_0.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/tron/"
}, },
"TRX-USD": { "UMA-USD":{
"name": "TRON", "name":"UMA",
"tags": ["Defi"], "tags":[
"websiteLink": "https://tron.network/", "Defi"
"whitepaperLink": "https://tron.network/static/doc/white_paper_v_2_0.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/tron/" "websiteLink":"https://umaproject.org/",
"whitepaperLink":"https://github.com/UMAprotocol/whitepaper",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/uma/"
}, },
"UMA-USD": { "UNI-USD":{
"name": "UMA", "name":"Uniswap",
"tags": ["Defi"], "tags":[
"websiteLink": "https://umaproject.org/", "Defi"
"whitepaperLink": "https://github.com/UMAprotocol/whitepaper", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/uma/" "websiteLink":"https://uniswap.org/",
"whitepaperLink":"https://uniswap.org/whitepaper-v3.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/uniswap/"
}, },
"UNI-USD": { "WLD-USD":{
"name": "Uniswap", "name":"Worldcoin",
"tags": ["Defi"], "tags":[
"websiteLink": "https://uniswap.org/",
"whitepaperLink": "https://uniswap.org/whitepaper-v3.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/uniswap/" "websiteLink":"https://worldcoin.org/",
"whitepaperLink":"https://whitepaper.worldcoin.org/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/worldcoin-org/"
}, },
"WLD-USD": { "XLM-USD":{
"name": "Worldcoin", "name":"Stellar",
"tags": [], "tags":[
"websiteLink": "https://worldcoin.org/", "Layer 1"
"whitepaperLink": "https://whitepaper.worldcoin.org/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/worldcoin-org/" "websiteLink":"https://www.stellar.org/",
"whitepaperLink":"https://www.stellar.org/papers/stellar-consensus-protocol",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/stellar/"
}, },
"XLM-USD": { "XMR-USD":{
"name": "Stellar", "name":"Monero",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://www.stellar.org/", "Layer 1"
"whitepaperLink": "https://www.stellar.org/papers/stellar-consensus-protocol", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/stellar/" "websiteLink":"https://www.getmonero.org/",
"whitepaperLink":"https://www.getmonero.org/resources/research-lab/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/monero/"
}, },
"XMR-USD": { "XRP-USD":{
"name": "Monero", "name":"Ripple",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://www.getmonero.org/", "Layer 1"
"whitepaperLink": "https://www.getmonero.org/resources/research-lab/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/monero/" "websiteLink":"https://ripple.com/currency/",
"whitepaperLink":"https://github.com/ripple",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/xrp/"
}, },
"XRP-USD": { "XTZ-USD":{
"name": "Ripple", "name":"Tezos",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://ripple.com/currency/", "Layer 1"
"whitepaperLink": "https://github.com/ripple", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/xrp/" "websiteLink":"https://tezos.com",
"whitepaperLink":"https://tezos.com/whitepaper.pdf",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/tezos/"
}, },
"XTZ-USD": { "YFI-USD":{
"name": "Tezos", "name":"Yearn",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://tezos.com", "Defi"
"whitepaperLink": "https://tezos.com/whitepaper.pdf", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/tezos/" "websiteLink":"https://yearn.finance/",
"whitepaperLink":"https://docs.yearn.finance/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/yearn-finance/"
}, },
"YFI-USD": { "ZEC-USD":{
"name": "Yearn", "name":"Zcash",
"tags": ["Defi"], "tags":[
"websiteLink": "https://yearn.finance/", "Layer 1"
"whitepaperLink": "https://docs.yearn.finance/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/yearn-finance/" "websiteLink":"https://z.cash/",
"whitepaperLink":"https://z.cash/technology/",
"coinMarketCapsLink":"https://coinmarketcap.com/currencies/zcash/"
}, },
"ZEC-USD": { "ZRX-USD":{
"name": "Zcash", "name":"0x",
"tags": ["Layer 1"], "tags":[
"websiteLink": "https://z.cash/", "Defi"
"whitepaperLink": "https://z.cash/technology/", ],
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/zcash/" "websiteLink":"https://0x.org/",
}, "whitepaperLink":"https://0x.org/pdfs/0x_white_paper.pdf",
"ZRX-USD": { "coinMarketCapsLink":"https://coinmarketcap.com/currencies/0x/"
"name": "0x", }
"tags": ["Defi"],
"websiteLink": "https://0x.org/",
"whitepaperLink": "https://0x.org/pdfs/0x_white_paper.pdf",
"coinMarketCapsLink": "https://coinmarketcap.com/currencies/0x/"
} }
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

+2 -8
View File
@@ -45,7 +45,6 @@ const assetIcons = {
SOL: '/currencies/sol.png', SOL: '/currencies/sol.png',
SUI: '/currencies/sui.png', SUI: '/currencies/sui.png',
SUSHI: '/currencies/sushi.png', SUSHI: '/currencies/sushi.png',
TIA: '/currencies/tia.png',
TRX: '/currencies/trx.png', TRX: '/currencies/trx.png',
UMA: '/currencies/uma.png', UMA: '/currencies/uma.png',
UNI: '/currencies/uni.png', UNI: '/currencies/uni.png',
@@ -72,13 +71,8 @@ export const AssetIcon = ({
}: { }: {
symbol?: Nullable<string>; symbol?: Nullable<string>;
className?: string; className?: string;
}) => ( }) =>
<Styled.Img isAssetSymbol(symbol) ? <Styled.Img src={assetIcons[symbol]} className={className} /> : null;
src={isAssetSymbol(symbol) ? assetIcons[symbol] : '/currencies/unavailable.png'}
className={className}
alt={symbol}
/>
);
const Styled: Record<string, AnyStyledComponent> = {}; const Styled: Record<string, AnyStyledComponent> = {};
+5 -7
View File
@@ -31,12 +31,10 @@ type ElementProps<TabItemsValue> = {
}; };
type StyleProps = { type StyleProps = {
className?: string;
fullWidthTabs?: boolean; fullWidthTabs?: boolean;
className?: string;
}; };
export type CollapsibleTabsProps<TabItemsValue> = ElementProps<TabItemsValue> & StyleProps;
export const CollapsibleTabs = <TabItemsValue extends string>({ export const CollapsibleTabs = <TabItemsValue extends string>({
defaultValue, defaultValue,
items, items,
@@ -45,9 +43,8 @@ export const CollapsibleTabs = <TabItemsValue extends string>({
onOpenChange, onOpenChange,
fullWidthTabs, fullWidthTabs,
className, className,
}: CollapsibleTabsProps<TabItemsValue>) => { }: ElementProps<TabItemsValue> & StyleProps) => {
const [value, setValue] = useState(defaultValue); const [value, setValue] = useState(defaultValue);
const currentItem = items.find((item) => item.value === value); const currentItem = items.find((item) => item.value === value);
@@ -89,8 +86,8 @@ export const CollapsibleTabs = <TabItemsValue extends string>({
</Styled.Header> </Styled.Header>
<Styled.CollapsibleContent> <Styled.CollapsibleContent>
{items.map(({ asChild, value, content }) => ( {items.map(({ value, content }) => (
<Styled.TabsContent key={value} asChild={asChild} value={value}> <Styled.TabsContent key={value} value={value}>
{content} {content}
</Styled.TabsContent> </Styled.TabsContent>
))} ))}
@@ -222,6 +219,7 @@ Styled.Header = styled.header`
Styled.CollapsibleContent = styled(CollapsibleContent)` Styled.CollapsibleContent = styled(CollapsibleContent)`
${layoutMixins.stack} ${layoutMixins.stack}
${layoutMixins.perspectiveArea}
box-shadow: none; box-shadow: none;
`; `;
+1
View File
@@ -198,6 +198,7 @@ Styled.InputContainer = styled.div`
border-radius: inherit; border-radius: inherit;
input { input {
user-select: all;
flex: 1; flex: 1;
width: 100%; width: 100%;
} }
+2 -5
View File
@@ -21,7 +21,6 @@ export type TabItem<TabItemsValue> = {
content?: React.ReactNode; content?: React.ReactNode;
subitems?: TabItem<TabItemsValue>[]; subitems?: TabItem<TabItemsValue>[];
customTrigger?: ReactNode; customTrigger?: ReactNode;
asChild?: boolean;
}; };
type ElementProps<TabItemsValue> = { type ElementProps<TabItemsValue> = {
@@ -42,8 +41,6 @@ type StyleProps = {
className?: string; className?: string;
}; };
export type TabsProps<TabItemsValue> = ElementProps<TabItemsValue> & StyleProps;
export const Tabs = <TabItemsValue extends string>({ export const Tabs = <TabItemsValue extends string>({
defaultValue, defaultValue,
value, value,
@@ -110,10 +107,9 @@ export const Tabs = <TabItemsValue extends string>({
sharedContent sharedContent
) : ( ) : (
<Styled.Stack> <Styled.Stack>
{items.map(({ asChild, value, content, forceMount }) => ( {items.map(({ value, content, forceMount }) => (
<Styled.Content <Styled.Content
key={value} key={value}
asChild={asChild}
value={value} value={value}
forceMount={forceMount} forceMount={forceMount}
$hide={forceMount && currentItem?.value !== value} $hide={forceMount && currentItem?.value !== value}
@@ -246,6 +242,7 @@ Styled.Trigger = styled(Trigger)<{ $withBorders?: boolean }>`
Styled.Stack = styled.div` Styled.Stack = styled.div`
${layoutMixins.stack} ${layoutMixins.stack}
${layoutMixins.perspectiveArea}
box-shadow: none; box-shadow: none;
`; `;
+36
View File
@@ -26,3 +26,39 @@ export enum FundingDirection {
ToShort = 'ToShort', ToShort = 'ToShort',
ToLong = 'ToLong', ToLong = 'ToLong',
} }
export const MARKETS_TO_DISPLAY = [
'BTC-USD',
'ETH-USD',
'LINK-USD',
'SOL-USD',
'MATIC-USD',
'ATOM-USD',
'AVAX-USD',
'APE-USD',
'XRP-USD',
'UNI-USD',
'ADA-USD',
'TRX-USD',
'OP-USD',
'MKR-USD',
'DOGE-USD',
'SHIB-USD',
'COMP-USD',
'LDO-USD',
'NEAR-USD',
'APT-USD',
'SUI-USD',
'DOT-USD',
'ETC-USD',
'ARB-USD',
'CRV-USD',
'BLUR-USD',
'FIL-USD',
'XLM-USD',
'PEPE-USD',
'WLD-USD',
'SEI-USD',
'LTC-USD',
'BCH-USD',
];
-6
View File
@@ -122,15 +122,9 @@ export type NotificationDisplayData = {
toastDuration?: number; toastDuration?: number;
}; };
export enum TransferNotificationTypes {
Withdrawal = 'withdrawal',
Deposit = 'deposit',
}
// Notification types // Notification types
export type TransferNotifcation = { export type TransferNotifcation = {
txHash: string; txHash: string;
type?: TransferNotificationTypes;
toChainId?: string; toChainId?: string;
fromChainId?: string; fromChainId?: string;
toAmount?: number; toAmount?: number;
+11 -2
View File
@@ -1,7 +1,14 @@
import { useMemo } from 'react'; import { useMemo } from 'react';
import { useSelector, shallowEqual } from 'react-redux'; import { useSelector, shallowEqual } from 'react-redux';
import { MarketFilters, MARKET_FILTER_LABELS, type MarketData } from '@/constants/markets'; import {
MarketFilters,
MARKET_FILTER_LABELS,
type MarketData,
MARKETS_TO_DISPLAY,
} from '@/constants/markets';
import { testFlags } from '@/lib/testFlags';
import { getAssets } from '@/state/assetsSelectors'; import { getAssets } from '@/state/assetsSelectors';
import { getPerpetualMarkets } from '@/state/perpetualsSelectors'; import { getPerpetualMarkets } from '@/state/perpetualsSelectors';
@@ -42,7 +49,9 @@ export const useMarketsData = (
}, [allPerpetualMarkets, allAssets]); }, [allPerpetualMarkets, allAssets]);
const filteredMarkets = useMemo(() => { const filteredMarkets = useMemo(() => {
const filtered = markets.filter(filterFunctions[filter]); const filtered = markets
.filter(filterFunctions[filter])
.filter(({ id }) => (testFlags.displayAllMarkets ? true : MARKETS_TO_DISPLAY.includes(id)));
if (searchFilter) { if (searchFilter) {
return filtered.filter( return filtered.filter(
+6 -7
View File
@@ -20,7 +20,6 @@ import {
type NotificationTypeConfig, type NotificationTypeConfig,
NotificationType, NotificationType,
DEFAULT_TOAST_AUTO_CLOSE_MS, DEFAULT_TOAST_AUTO_CLOSE_MS,
TransferNotificationTypes,
} from '@/constants/notifications'; } from '@/constants/notifications';
import { useSelectedNetwork, useStringGetter } from '@/hooks'; import { useSelectedNetwork, useStringGetter } from '@/hooks';
@@ -153,20 +152,20 @@ export const notificationTypes: NotificationTypeConfig[] = [
useEffect(() => { useEffect(() => {
for (const transfer of transferNotifications) { for (const transfer of transferNotifications) {
const { fromChainId, status, txHash, toAmount, type } = transfer; const { fromChainId, status, txHash, toAmount } = transfer;
const isFinished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing'; const isFinished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
const icon = <Icon iconName={isFinished ? IconName.Transfer : IconName.Clock} />; const icon = <Icon iconName={isFinished ? IconName.Transfer : IconName.Clock} />;
const transferType = type ?? const type =
fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
? TransferNotificationTypes.Withdrawal ? 'withdrawal'
: TransferNotificationTypes.Deposit; : 'deposit';
const title = stringGetter({ const title = stringGetter({
key: { key: {
deposit: isFinished ? STRING_KEYS.DEPOSIT : STRING_KEYS.DEPOSIT_IN_PROGRESS, deposit: isFinished ? STRING_KEYS.DEPOSIT : STRING_KEYS.DEPOSIT_IN_PROGRESS,
withdrawal: isFinished ? STRING_KEYS.WITHDRAW : STRING_KEYS.WITHDRAW_IN_PROGRESS, withdrawal: isFinished ? STRING_KEYS.WITHDRAW : STRING_KEYS.WITHDRAW_IN_PROGRESS,
}[transferType], }[type],
}); });
const toChainEta = status?.toChain?.chainData?.estimatedRouteDuration || 0; const toChainEta = status?.toChain?.chainData?.estimatedRouteDuration || 0;
@@ -191,7 +190,7 @@ export const notificationTypes: NotificationTypeConfig[] = [
slotIcon={icon} slotIcon={icon}
slotTitle={title} slotTitle={title}
transfer={transfer} transfer={transfer}
type={transferType} type={type}
triggeredAt={transfer.triggeredAt} triggeredAt={transfer.triggeredAt}
notification={notification} notification={notification}
/> />
+3 -21
View File
@@ -31,7 +31,6 @@ import { log } from '@/lib/telemetry';
import { useAccounts } from './useAccounts'; import { useAccounts } from './useAccounts';
import { useTokenConfigs } from './useTokenConfigs'; import { useTokenConfigs } from './useTokenConfigs';
import { useDydxClient } from './useDydxClient'; import { useDydxClient } from './useDydxClient';
import { hashFromTx } from '@/lib/hashfromTx';
type SubaccountContextType = ReturnType<typeof useSubaccountContext>; type SubaccountContextType = ReturnType<typeof useSubaccountContext>;
const SubaccountContext = createContext<SubaccountContextType>({} as SubaccountContextType); const SubaccountContext = createContext<SubaccountContextType>({} as SubaccountContextType);
@@ -294,29 +293,12 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
); );
const sendSquidWithdraw = useCallback( const sendSquidWithdraw = useCallback(
async (amount: number, payload: string, isCctp?: boolean) => { async (amount: number, payload: string) => {
const cctpWithdraw = () => {
return new Promise<string>((resolve, reject) =>
abacusStateManager.cctpWithdraw((success, error, data) => {
const parsedData = JSON.parse(data);
if (success && parsedData?.code == 0) {
resolve(parsedData?.transactionHash);
} else {
reject(error);
}
})
)
}
if (isCctp) {
return await cctpWithdraw();
}
if (!subaccountClient) { if (!subaccountClient) {
return; return;
} }
const tx = await sendSquidWithdrawFromSubaccount({ subaccountClient, amount, payload });
return hashFromTx(tx?.hash); return await sendSquidWithdrawFromSubaccount({ subaccountClient, amount, payload });
}, },
[subaccountClient, sendSquidWithdrawFromSubaccount] [subaccountClient, sendSquidWithdrawFromSubaccount]
); );
-106
View File
@@ -2,7 +2,6 @@ import Abacus, { type Nullable } from '@dydxprotocol/v4-abacus';
import Long from 'long'; import Long from 'long';
import type { IndexedTx } from '@cosmjs/stargate'; import type { IndexedTx } from '@cosmjs/stargate';
import { GAS_MULTIPLIER, encodeJson } from '@dydxprotocol/v4-client-js'; import { GAS_MULTIPLIER, encodeJson } from '@dydxprotocol/v4-client-js';
import { EncodeObject } from '@cosmjs/proto-signing';
import { import {
CompositeClient, CompositeClient,
@@ -42,7 +41,6 @@ import { openDialog } from '@/state/dialogs';
import { StatefulOrderError } from '../errors'; import { StatefulOrderError } from '../errors';
import { bytesToBigInt } from '../numbers'; import { bytesToBigInt } from '../numbers';
import { log } from '../telemetry'; import { log } from '../telemetry';
import { hashFromTx } from '../hashfromTx';
class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol { class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
private compositeClient: CompositeClient | undefined; private compositeClient: CompositeClient | undefined;
@@ -65,14 +63,10 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
} }
setNobleWallet(nobleWallet: LocalWallet) { setNobleWallet(nobleWallet: LocalWallet) {
try {
this.nobleWallet = nobleWallet; this.nobleWallet = nobleWallet;
if (this.nobleClient) { if (this.nobleClient) {
this.nobleClient.connect(nobleWallet); this.nobleClient.connect(nobleWallet);
} }
} catch (e) {
log('DydxChainTransactions/setNobleWallet', e);
}
} }
async connectNetwork( async connectNetwork(
@@ -118,15 +112,10 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
this.compositeClient = compositeClient; this.compositeClient = compositeClient;
try {
if (nobleValidatorUrl) { if (nobleValidatorUrl) {
this.nobleClient = new NobleClient(nobleValidatorUrl); this.nobleClient = new NobleClient(nobleValidatorUrl);
if (this.nobleWallet) await this.nobleClient.connect(this.nobleWallet); if (this.nobleWallet) await this.nobleClient.connect(this.nobleWallet);
} }
} catch (e) {
log('DydxChainTransactions/connectNetwork/NobleClient', e);
}
// Dispatch custom event to notify other parts of the app that the network has been connected // Dispatch custom event to notify other parts of the app that the network has been connected
const customEvent = new CustomEvent('abacus:connectNetwork', { const customEvent = new CustomEvent('abacus:connectNetwork', {
detail: parsedParams, detail: parsedParams,
@@ -391,90 +380,6 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
} }
} }
async withdrawToNobleIBC(
params: {
subaccountNumber: number,
amount: string,
ibcPayload: string,
}
): Promise<string> {
if (!this.compositeClient || !this.localWallet) {
throw new Error('Missing compositeClient or localWallet');
}
const { subaccountNumber, amount, ibcPayload } = params ?? {};
const parsedIbcPayload: {
msgTypeUrl: string,
msg: any,
} = ibcPayload ? JSON.parse(ibcPayload) : undefined;
try {
const msg = this.compositeClient.withdrawFromSubaccountMessage(
new SubaccountClient(this.localWallet, subaccountNumber),
parseFloat(amount).toFixed(this.compositeClient.validatorClient.config.denoms.USDC_DECIMALS)
);
const ibcMsg: EncodeObject = {
typeUrl: parsedIbcPayload.msgTypeUrl,
value: parsedIbcPayload.msg,
};
const tx = await this.compositeClient.send(
this.localWallet,
() => Promise.resolve([msg, ibcMsg]),
false
);
return JSON.stringify({
txHash: hashFromTx(tx?.hash)
});
} catch (error) {
log('DydxChainTransactions/withdrawToNobleIBC', error);
return JSON.stringify({
error,
});
}
}
async cctpWithdraw(params: {
typeUrl: string,
value: any,
}): Promise<string> {
if (!this.nobleClient?.isConnected) {
throw new Error('Missing nobleClient or localWallet');
}
try {
const ibcMsg = {
typeUrl: params.typeUrl, // '/circle.cctp.v1.MsgDepositForBurn',
value: params.value,
};
const fee = await this.nobleClient.simulateTransaction([ibcMsg]);
// take out fee from amount before sweeping
const amount = parseInt(ibcMsg.value.amount, 10) -
Math.floor(parseInt(fee.amount[0].amount, 10) * GAS_MULTIPLIER);
if (amount <= 0) {
throw new Error('noble balance does not cover fees');
}
ibcMsg.value.amount = amount.toString();
const tx = await this.nobleClient.send([ibcMsg]);
const parsedTx = this.parseToPrimitives(tx);
return JSON.stringify(parsedTx);
} catch (error) {
log('DydxChainTransactions/cctpWithdraw', error);
return JSON.stringify({
error,
});
}
}
async transaction( async transaction(
type: TransactionTypes, type: TransactionTypes,
paramsInJson: Abacus.Nullable<string>, paramsInJson: Abacus.Nullable<string>,
@@ -509,17 +414,6 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
callback(result); callback(result);
break; break;
} }
case TransactionType.WithdrawToNobleIBC: {
const result = await this.withdrawToNobleIBC(params);
callback(result);
break;
}
case TransactionType.CctpWithdraw: {
const result = await this.cctpWithdraw(params);
callback(result);
break;
break;
}
default: { default: {
break; break;
} }
+1 -9
View File
@@ -85,7 +85,7 @@ class AbacusStateManager {
const appConfigs = AbacusAppConfig.Companion.forWeb; const appConfigs = AbacusAppConfig.Companion.forWeb;
if (!isMainnet || testFlags.withCCTP) if (!isMainnet || testFlags.withCCTP)
appConfigs.squidVersion = AbacusAppConfig.SquidVersion.V2; appConfigs.squidVersion = AbacusAppConfig.SquidVersion.V2DepositOnly;
this.stateManager = new AsyncAbacusStateManager( this.stateManager = new AsyncAbacusStateManager(
'', '',
@@ -262,14 +262,6 @@ class AbacusStateManager {
) => void ) => void
) => this.stateManager.cancelOrder(orderId, callback); ) => this.stateManager.cancelOrder(orderId, callback);
cctpWithdraw = (
callback: (
success: boolean,
parsingError: Nullable<ParsingError>,
data: string,
) => void
): void => this.stateManager.commitCCTPWithdraw(callback);
// ------ Utils ------ // // ------ Utils ------ //
getHistoricalPnlPeriod = (): Nullable<HistoricalPnlPeriods> => getHistoricalPnlPeriod = (): Nullable<HistoricalPnlPeriods> =>
this.stateManager.historicalPnlPeriod; this.stateManager.historicalPnlPeriod;
-3
View File
@@ -1,3 +0,0 @@
export const hashFromTx = (
txHash: string | Uint8Array
): string => `0x${Buffer.from(txHash).toString('hex')}`;
+5 -1
View File
@@ -5,7 +5,7 @@ class TestFlags {
this.queryParams = {}; this.queryParams = {};
const hash = window.location.hash; const hash = window.location.hash;
const queryIndex = hash.indexOf('?'); const queryIndex = hash.indexOf('?');
if (queryIndex === -1) return; if (queryIndex === -1) return
const queryParamsString = hash.substring(queryIndex + 1); const queryParamsString = hash.substring(queryIndex + 1);
const params = new URLSearchParams(queryParamsString); const params = new URLSearchParams(queryParamsString);
@@ -19,6 +19,10 @@ class TestFlags {
return !!this.queryParams.displayInitializingMarkets; return !!this.queryParams.displayInitializingMarkets;
} }
get displayAllMarkets() {
return !!this.queryParams.displayAllMarkets;
}
get withCCTP() { get withCCTP() {
return !!this.queryParams.withCCTP; return !!this.queryParams.withCCTP;
} }
+5 -20
View File
@@ -1,7 +1,8 @@
import { useMemo, useState } from 'react'; import { useState } from 'react';
import { shallowEqual, useSelector } from 'react-redux'; import { shallowEqual, useSelector } from 'react-redux';
import styled, { type AnyStyledComponent } from 'styled-components'; import styled, { type AnyStyledComponent } from 'styled-components';
import { AbacusOrderStatus } from '@/constants/abacus';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { useBreakpoints, useStringGetter } from '@/hooks'; import { useBreakpoints, useStringGetter } from '@/hooks';
@@ -27,6 +28,7 @@ import {
getCurrentMarketTradeInfoNumbers, getCurrentMarketTradeInfoNumbers,
getHasUnseenFillUpdates, getHasUnseenFillUpdates,
getHasUnseenOrderUpdates, getHasUnseenOrderUpdates,
getLatestOrderStatus,
getTradeInfoNumbers, getTradeInfoNumbers,
} from '@/state/accountSelectors'; } from '@/state/accountSelectors';
@@ -80,10 +82,8 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
showCurrentMarket ? numOpenOrders : numTotalOpenOrders showCurrentMarket ? numOpenOrders : numTotalOpenOrders
); );
const tabItems = useMemo( const tabItems = [
() => [
{ {
asChild: true,
value: InfoSection.Position, value: InfoSection.Position,
label: stringGetter({ label: stringGetter({
key: showCurrentMarket ? STRING_KEYS.POSITION : STRING_KEYS.POSITIONS, key: showCurrentMarket ? STRING_KEYS.POSITION : STRING_KEYS.POSITIONS,
@@ -118,7 +118,6 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
), ),
}, },
{ {
asChild: true,
value: InfoSection.Orders, value: InfoSection.Orders,
label: stringGetter({ key: STRING_KEYS.ORDERS }), label: stringGetter({ key: STRING_KEYS.ORDERS }),
@@ -153,7 +152,6 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
), ),
}, },
{ {
asChild: true,
value: InfoSection.Fills, value: InfoSection.Fills,
label: stringGetter({ key: STRING_KEYS.FILLS }), label: stringGetter({ key: STRING_KEYS.FILLS }),
@@ -202,20 +200,7 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
// <FundingPaymentsTable currentMarket={showCurrentMarket ? currentMarket?.id : undefined} /> // <FundingPaymentsTable currentMarket={showCurrentMarket ? currentMarket?.id : undefined} />
// ), // ),
// }, // },
], ];
[
stringGetter,
currentMarketId,
showCurrentMarket,
isTablet,
isWaitingForOrderToIndex,
isAccountViewOnly,
ordersTagNumber,
fillsTagNumber,
hasUnseenFillUpdates,
hasUnseenOrderUpdates,
]
);
return isTablet ? ( return isTablet ? (
<MobileTabs defaultValue={InfoSection.Position} items={tabItems} withBorders={false} /> <MobileTabs defaultValue={InfoSection.Position} items={tabItems} withBorders={false} />
+5
View File
@@ -877,6 +877,11 @@ export const layoutMixins: Record<
} }
`, `,
perspectiveArea: css`
perspective: 100rem;
transform-style: preserve-3d;
`,
absolute: css` absolute: css`
position: absolute; position: absolute;
top: 0; top: 0;
+1
View File
@@ -63,6 +63,7 @@ Styled.AccountInfoSectionContainer = styled.div<{ showAccountInfo?: boolean }>`
${layoutMixins.column} ${layoutMixins.column}
height: var(--account-info-section-height); height: var(--account-info-section-height);
min-height: var(--account-info-section-height); min-height: var(--account-info-section-height);
overflow-x: clip;
${({ showAccountInfo }) => ${({ showAccountInfo }) =>
!showAccountInfo && !showAccountInfo &&
@@ -203,6 +203,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
Styled.Stack = styled.div` Styled.Stack = styled.div`
${layoutMixins.stack} ${layoutMixins.stack}
${layoutMixins.perspectiveArea}
`; `;
Styled.CornerButton = styled(Button)` Styled.CornerButton = styled(Button)`
@@ -292,14 +293,7 @@ Styled.TransferButtons = styled.div`
Styled.ConnectedAccountInfoContainer = styled.div<{ $showHeader?: boolean }>` Styled.ConnectedAccountInfoContainer = styled.div<{ $showHeader?: boolean }>`
${layoutMixins.column} ${layoutMixins.column}
@media ${breakpoints.notTablet} {
${layoutMixins.withOuterAndInnerBorders} ${layoutMixins.withOuterAndInnerBorders}
}
@media ${breakpoints.tablet} {
${layoutMixins.withInnerBorder}
}
${({ $showHeader }) => ${({ $showHeader }) =>
$showHeader && $showHeader &&
+3
View File
@@ -2,7 +2,9 @@ import styled, { type AnyStyledComponent } from 'styled-components';
import { shallowEqual, useSelector } from 'react-redux'; import { shallowEqual, useSelector } from 'react-redux';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { MARKETS_TO_DISPLAY } from '@/constants/markets';
import { useBreakpoints, useStringGetter } from '@/hooks'; import { useBreakpoints, useStringGetter } from '@/hooks';
import { testFlags } from '@/lib/testFlags';
import { breakpoints } from '@/styles'; import { breakpoints } from '@/styles';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
@@ -32,6 +34,7 @@ export const ExchangeBillboards: React.FC<ExchangeBillboardsProps> = ({
Object.values(perpetualMarkets) Object.values(perpetualMarkets)
.filter(Boolean) .filter(Boolean)
.filter(({ id }) => (testFlags.displayAllMarkets ? true : MARKETS_TO_DISPLAY.includes(id)))
.forEach(({ oraclePrice, perpetual }) => { .forEach(({ oraclePrice, perpetual }) => {
const { volume24H, trades24H, openInterest = 0 } = perpetual || {}; const { volume24H, trades24H, openInterest = 0 } = perpetual || {};
volume24HUSDC += volume24H ?? 0; volume24HUSDC += volume24H ?? 0;
+5
View File
@@ -213,8 +213,13 @@ Styled.MarketDetails = styled.div`
`; `;
Styled.Header = styled.header` Styled.Header = styled.header`
/* max-width: fit-content; */
${layoutMixins.column} ${layoutMixins.column}
gap: 1.25rem; gap: 1.25rem;
position: sticky;
bottom: 3rem;
`; `;
Styled.WrapRow = styled.div` Styled.WrapRow = styled.div`
+7 -1
View File
@@ -453,6 +453,13 @@ Styled.Actions = styled.footer`
> :last-child { > :last-child {
flex: 2; flex: 2;
} }
position: sticky;
bottom: clamp(0.5rem, 7.5%, 2rem);
@media ${breakpoints.tablet} {
bottom: 0;
}
`; `;
Styled.Output = styled(Output)<{ sign: NumberSign; smallText?: boolean; margin?: string }>` Styled.Output = styled(Output)<{ sign: NumberSign; smallText?: boolean; margin?: string }>`
@@ -507,7 +514,6 @@ Styled.PositionInfo = styled.div`
Styled.DetachedSection = styled(DetachedSection)` Styled.DetachedSection = styled(DetachedSection)`
padding: 0 1.5rem; padding: 0 1.5rem;
position: relative;
`; `;
Styled.DetachedScrollableSection = styled(DetachedScrollableSection)` Styled.DetachedScrollableSection = styled(DetachedScrollableSection)`
+1
View File
@@ -82,6 +82,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
Styled.PriceChart = styled.div<{ isChartReady?: boolean }>` Styled.PriceChart = styled.div<{ isChartReady?: boolean }>`
${layoutMixins.stack} ${layoutMixins.stack}
${layoutMixins.perspectiveArea}
height: 100%; height: 100%;
@@ -94,7 +94,7 @@ export const FillDetailsDialog = ({ fillId, setIsOpen }: ElementProps) => {
return ( return (
<DetailsDialog <DetailsDialog
slotIcon={<Styled.AssetIcon symbol={asset?.id} />} slotIcon={<Styled.AssetIcon symbol={asset.id} />}
title={resources.typeStringKey && stringGetter({ key: resources.typeStringKey })} title={resources.typeStringKey && stringGetter({ key: resources.typeStringKey })}
items={detailItems} items={detailItems}
setIsOpen={setIsOpen} setIsOpen={setIsOpen}
@@ -194,7 +194,7 @@ export const OrderDetailsDialog = ({ orderId, setIsOpen }: ElementProps) => {
return ( return (
<DetailsDialog <DetailsDialog
slotIcon={<Styled.AssetIcon symbol={asset?.id} />} slotIcon={<Styled.AssetIcon symbol={asset.id} />}
title={!resources.typeStringKey ? '' : stringGetter({ key: resources.typeStringKey })} title={!resources.typeStringKey ? '' : stringGetter({ key: resources.typeStringKey })}
slotFooter={ slotFooter={
isAccountViewOnly ? null : isOrderStatusClearable(status) ? ( isAccountViewOnly ? null : isOrderStatusClearable(status) ? (
@@ -57,6 +57,7 @@ export const TokenSelectMenu = ({ selectedToken, onSelectToken }: ElementProps)
<Tag>{type === TransferType.deposit ? 'USDC' : selectedToken?.symbol}</Tag> <Tag>{type === TransferType.deposit ? 'USDC' : selectedToken?.symbol}</Tag>
</> </>
), ),
tooltip: 'swap',
}, },
]} ]}
> >
@@ -10,7 +10,7 @@ import { AlertType } from '@/constants/alerts';
import { ButtonSize } from '@/constants/buttons'; import { ButtonSize } from '@/constants/buttons';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks'; import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { NotificationStatus, TransferNotificationTypes } from '@/constants/notifications'; import { NotificationStatus } from '@/constants/notifications';
import { NumberSign } from '@/constants/numbers'; import { NumberSign } from '@/constants/numbers';
import { import {
@@ -45,7 +45,6 @@ import { getTransferInputs } from '@/state/inputsSelectors';
import abacusStateManager from '@/lib/abacus'; import abacusStateManager from '@/lib/abacus';
import { MustBigNumber } from '@/lib/numbers'; import { MustBigNumber } from '@/lib/numbers';
import { getNobleChainId } from '@/lib/squid';
import { TokenSelectMenu } from './TokenSelectMenu'; import { TokenSelectMenu } from './TokenSelectMenu';
import { WithdrawButtonAndReceipt } from './WithdrawForm/WithdrawButtonAndReceipt'; import { WithdrawButtonAndReceipt } from './WithdrawForm/WithdrawButtonAndReceipt';
@@ -168,16 +167,16 @@ export const WithdrawForm = () => {
}) })
); );
} else { } else {
const txHash = await sendSquidWithdraw(debouncedAmountBN.toNumber(), requestPayload.data, isCctp); const txHash = await sendSquidWithdraw(debouncedAmountBN.toNumber(), requestPayload.data);
if (txHash) { if (txHash?.hash) {
const hash = `0x${Buffer.from(txHash.hash).toString('hex')}`;
addTransferNotification({ addTransferNotification({
txHash: txHash, txHash: hash,
type: TransferNotificationTypes.Withdrawal, fromChainId: ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId,
fromChainId: !isCctp ? ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId : getNobleChainId(),
toChainId: chainIdStr || undefined, toChainId: chainIdStr || undefined,
toAmount: debouncedAmountBN.toNumber(), toAmount: debouncedAmountBN.toNumber(),
triggeredAt: Date.now(), triggeredAt: Date.now(),
isCctp, notificationStatus: NotificationStatus.Triggered,
}); });
abacusStateManager.clearTransferInputValues(); abacusStateManager.clearTransferInputValues();
setWithdrawAmount(''); setWithdrawAmount('');
+7 -8
View File
@@ -1,10 +1,10 @@
import { useCallback, useMemo } from 'react'; import { type Dispatch, type SetStateAction, useCallback, useMemo } from 'react';
import styled, { AnyStyledComponent, css } from 'styled-components'; import styled, { AnyStyledComponent, css } from 'styled-components';
import { Root, Thumb, Track } from '@radix-ui/react-slider'; import { Root, Thumb, Track } from '@radix-ui/react-slider';
import _ from 'lodash'; import _ from 'lodash';
import { OrderSide } from '@dydxprotocol/v4-client-js'; import { OrderSide } from '@dydxprotocol/v4-client-js';
import { TradeInputField } from '@/constants/abacus'; import { type Nullable, TradeInputField } from '@/constants/abacus';
import { PositionSide } from '@/constants/trade'; import { PositionSide } from '@/constants/trade';
import { MustBigNumber, type BigNumberish } from '@/lib/numbers'; import { MustBigNumber, type BigNumberish } from '@/lib/numbers';
@@ -12,11 +12,11 @@ import abacusStateManager from '@/lib/abacus';
type ElementProps = { type ElementProps = {
leverage?: BigNumberish | null; leverage?: BigNumberish | null;
leverageInputValue: string; leverageInputValue: Nullable<number>;
maxLeverage: BigNumberish | null; maxLeverage: BigNumberish | null;
orderSide: OrderSide; orderSide: OrderSide;
positionSide: PositionSide; positionSide: PositionSide;
setLeverageInputValue: (value: string) => void; setLeverageInputValue: Dispatch<SetStateAction<Nullable<number>>>;
}; };
type StyleProps = { className?: string }; type StyleProps = { className?: string };
@@ -33,7 +33,6 @@ export const LeverageSlider = ({
const leverageBN = MustBigNumber(leverage); const leverageBN = MustBigNumber(leverage);
const maxLeverageBN = MustBigNumber(maxLeverage); const maxLeverageBN = MustBigNumber(maxLeverage);
const leverageInputBN = MustBigNumber(leverageInputValue || leverage); const leverageInputBN = MustBigNumber(leverageInputValue || leverage);
const leverageInputNumber = isNaN(leverageInputBN.toNumber()) ? 0 : leverageInputBN.toNumber();
const sliderConfig = useMemo( const sliderConfig = useMemo(
() => ({ () => ({
@@ -80,12 +79,12 @@ export const LeverageSlider = ({
); );
const onSliderDrag = ([newLeverage]: number[]) => { const onSliderDrag = ([newLeverage]: number[]) => {
setLeverageInputValue(`${newLeverage}`); setLeverageInputValue(newLeverage);
debouncedSetAbacusLeverage(newLeverage); debouncedSetAbacusLeverage(newLeverage);
}; };
const onValueCommit = ([newLeverage]: number[]) => { const onValueCommit = ([newLeverage]: number[]) => {
setLeverageInputValue(`${newLeverage}`); setLeverageInputValue(newLeverage);
// Ensure Abacus is updated with the latest, committed value // Ensure Abacus is updated with the latest, committed value
debouncedSetAbacusLeverage.cancel(); debouncedSetAbacusLeverage.cancel();
@@ -103,7 +102,7 @@ export const LeverageSlider = ({
min={min} min={min}
max={max} max={max}
step={0.1} step={0.1}
value={[Math.min(Math.max(leverageInputNumber, min), max)]} value={[Math.min(Math.max(leverageInputBN.toNumber(), min), max)]}
onValueChange={onSliderDrag} onValueChange={onSliderDrag}
onValueCommit={onValueCommit} onValueCommit={onValueCommit}
> >
@@ -1,8 +1,9 @@
import type { Dispatch, SetStateAction } from 'react';
import { shallowEqual, useSelector } from 'react-redux'; import { shallowEqual, useSelector } from 'react-redux';
import styled, { AnyStyledComponent } from 'styled-components'; import styled, { AnyStyledComponent } from 'styled-components';
import { OrderSide } from '@dydxprotocol/v4-client-js'; import { OrderSide } from '@dydxprotocol/v4-client-js';
import { TradeInputField } from '@/constants/abacus'; import { TradeInputField, Nullable } from '@/constants/abacus';
import { ButtonShape } from '@/constants/buttons'; import { ButtonShape } from '@/constants/buttons';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { LEVERAGE_DECIMALS } from '@/constants/numbers'; import { LEVERAGE_DECIMALS } from '@/constants/numbers';
@@ -61,7 +62,21 @@ export const MarketLeverageInput = ({
const leveragePosition = postOrderLeverage ? newPositionSide : currentPositionSide; const leveragePosition = postOrderLeverage ? newPositionSide : currentPositionSide;
const getSignedLeverage = (newLeverage: string | number) => { const onLeverageInput = ({ value, floatValue }: { value: string; floatValue?: number }) => {
const newLeverage = MustBigNumber(floatValue).toFixed();
if (value === '' || newLeverage === 'NaN' || !floatValue) {
setLeverageInputValue('');
abacusStateManager.setTradeValue({
value: null,
field: TradeInputField.leverage,
});
} else {
updateLeverage(floatValue);
}
};
const updateLeverage = (newLeverage: string | number) => {
const newLeverageBN = MustBigNumber(newLeverage); const newLeverageBN = MustBigNumber(newLeverage);
const newLeverageSignedBN = const newLeverageSignedBN =
leveragePosition === PositionSide.Short || leveragePosition === PositionSide.Short ||
@@ -69,33 +84,10 @@ export const MarketLeverageInput = ({
? newLeverageBN.abs().negated() ? newLeverageBN.abs().negated()
: newLeverageBN.abs(); : newLeverageBN.abs();
return newLeverageSignedBN.toFixed(LEVERAGE_DECIMALS); setLeverageInputValue(newLeverageSignedBN.toString());
};
const onLeverageInput = ({
floatValue,
formattedValue,
}: {
floatValue?: number;
formattedValue: string;
}) => {
setLeverageInputValue(formattedValue);
const newLeverage = MustBigNumber(floatValue).toFixed();
abacusStateManager.setTradeValue({ abacusStateManager.setTradeValue({
value: value: newLeverageSignedBN.toFixed(LEVERAGE_DECIMALS),
formattedValue === '' || newLeverage === 'NaN' ? null : getSignedLeverage(formattedValue),
field: TradeInputField.leverage,
});
};
const updateLeverage = (newLeverage: string | number) => {
const newLeverageSigned = getSignedLeverage(newLeverage);
setLeverageInputValue(newLeverageSigned);
abacusStateManager.setTradeValue({
value: newLeverageSigned,
field: TradeInputField.leverage, field: TradeInputField.leverage,
}); });
}; };
@@ -138,7 +130,7 @@ export const MarketLeverageInput = ({
> >
<Styled.LeverageSlider <Styled.LeverageSlider
leverage={currentLeverage} leverage={currentLeverage}
leverageInputValue={getSignedLeverage(leverageInputValue)} leverageInputValue={leverageInputValue}
maxLeverage={maxLeverage} maxLeverage={maxLeverage}
orderSide={orderSide} orderSide={orderSide}
positionSide={currentPositionSide} positionSide={currentPositionSide}
@@ -77,7 +77,7 @@ export const TradeSizeInputs = () => {
floatValue?: number; floatValue?: number;
formattedValue: string; formattedValue: string;
}) => { }) => {
dispatch(setTradeFormInputs({ amountInput: formattedValue })); dispatch(setTradeFormInputs({ amountInput: MustBigNumber(floatValue).toString() }));
const newAmount = MustBigNumber(floatValue).toFixed(decimals); const newAmount = MustBigNumber(floatValue).toFixed(decimals);
abacusStateManager.setTradeValue({ abacusStateManager.setTradeValue({
@@ -93,7 +93,7 @@ export const TradeSizeInputs = () => {
floatValue?: number; floatValue?: number;
formattedValue: string; formattedValue: string;
}) => { }) => {
dispatch(setTradeFormInputs({ usdAmountInput: formattedValue })); dispatch(setTradeFormInputs({ usdAmountInput: MustBigNumber(floatValue).toString() }));
const newUsdcAmount = MustBigNumber(floatValue).toFixed(tickSizeDecimals || USD_DECIMALS); const newUsdcAmount = MustBigNumber(floatValue).toFixed(tickSizeDecimals || USD_DECIMALS);
abacusStateManager.setTradeValue({ abacusStateManager.setTradeValue({
@@ -12,11 +12,10 @@ import { LoadingSpinner } from '@/components/Loading/LoadingSpinner';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks'; import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { TransferNotificationTypes } from '@/constants/notifications';
type ElementProps = { type ElementProps = {
status?: StatusResponse; status?: StatusResponse;
type: TransferNotificationTypes; type: 'withdrawal' | 'deposit';
}; };
type StyleProps = { type StyleProps = {
@@ -47,13 +46,11 @@ export const TransferStatusSteps = ({ className, status, type }: ElementProps &
{ {
label: stringGetter({ label: stringGetter({
key: key:
type === TransferNotificationTypes.Deposit type === 'deposit' ? STRING_KEYS.INITIATED_DEPOSIT : STRING_KEYS.INITIATED_WITHDRAWAL,
? STRING_KEYS.INITIATED_DEPOSIT
: STRING_KEYS.INITIATED_WITHDRAWAL,
}), }),
step: TransferStatusStep.FromChain, step: TransferStatusStep.FromChain,
link: link:
type === TransferNotificationTypes.Deposit type === 'deposit'
? status?.fromChain?.transactionUrl ? status?.fromChain?.transactionUrl
: routeStatus?.[0]?.chainId === dydxChainId && routeStatus[0].txHash : routeStatus?.[0]?.chainId === dydxChainId && routeStatus[0].txHash
? `${mintscanTxUrl?.replace('{tx_hash}', routeStatus[0].txHash.replace('0x', ''))}` ? `${mintscanTxUrl?.replace('{tx_hash}', routeStatus[0].txHash.replace('0x', ''))}`
@@ -66,20 +63,14 @@ export const TransferStatusSteps = ({ className, status, type }: ElementProps &
}, },
{ {
label: stringGetter({ label: stringGetter({
key: key: type === 'deposit' ? STRING_KEYS.DEPOSIT_TO_CHAIN : STRING_KEYS.WITHDRAW_TO_CHAIN,
type === TransferNotificationTypes.Deposit
? STRING_KEYS.DEPOSIT_TO_CHAIN
: STRING_KEYS.WITHDRAW_TO_CHAIN,
params: { params: {
CHAIN: CHAIN: type === 'deposit' ? 'dYdX' : status?.toChain?.chainData?.chainName,
type === TransferNotificationTypes.Deposit
? 'dYdX'
: status?.toChain?.chainData?.chainName,
}, },
}), }),
step: TransferStatusStep.ToChain, step: TransferStatusStep.ToChain,
link: link:
type === TransferNotificationTypes.Withdrawal type === 'withdrawal'
? status?.toChain?.transactionUrl ? status?.toChain?.transactionUrl
: currentStatus?.chainId === dydxChainId && currentStatus?.txHash : currentStatus?.chainId === dydxChainId && currentStatus?.txHash
? `${mintscanTxUrl?.replace('{tx_hash}', currentStatus.txHash.replace('0x', ''))}` ? `${mintscanTxUrl?.replace('{tx_hash}', currentStatus.txHash.replace('0x', ''))}`
@@ -5,7 +5,7 @@ import { useInterval, useStringGetter } from '@/hooks';
import { AlertType } from '@/constants/alerts'; import { AlertType } from '@/constants/alerts';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { TransferNotifcation, TransferNotificationTypes } from '@/constants/notifications'; import { TransferNotifcation } from '@/constants/notifications';
import { formatSeconds } from '@/lib/timeUtils'; import { formatSeconds } from '@/lib/timeUtils';
@@ -22,7 +22,7 @@ import { layoutMixins } from '@/styles/layoutMixins';
import { TransferStatusSteps } from './TransferStatusSteps'; import { TransferStatusSteps } from './TransferStatusSteps';
type ElementProps = { type ElementProps = {
type: TransferNotificationTypes; type: 'withdrawal' | 'deposit';
transfer: TransferNotifcation; transfer: TransferNotifcation;
triggeredAt?: number; triggeredAt?: number;
}; };
@@ -55,7 +55,7 @@ export const TransferStatusNotification = ({
useInterval({ callback: updateSecondsLeft }); useInterval({ callback: updateSecondsLeft });
const inProgressStatusString = const inProgressStatusString =
type === TransferNotificationTypes.Deposit type === 'deposit'
? secondsLeft > 0 ? secondsLeft > 0
? STRING_KEYS.DEPOSIT_STATUS ? STRING_KEYS.DEPOSIT_STATUS
: STRING_KEYS.DEPOSIT_STATUS_SHORTLY : STRING_KEYS.DEPOSIT_STATUS_SHORTLY
@@ -64,7 +64,7 @@ export const TransferStatusNotification = ({
: STRING_KEYS.WITHDRAW_STATUS_SHORTLY; : STRING_KEYS.WITHDRAW_STATUS_SHORTLY;
const statusString = const statusString =
type === TransferNotificationTypes.Deposit type === 'deposit'
? status?.squidTransactionStatus === 'success' ? status?.squidTransactionStatus === 'success'
? STRING_KEYS.DEPOSIT_COMPLETE ? STRING_KEYS.DEPOSIT_COMPLETE
: inProgressStatusString : inProgressStatusString
+11 -2
View File
@@ -230,7 +230,14 @@ const getOrdersTableColumnDef = ({
label: `${stringGetter({ key: STRING_KEYS.STATUS })} / ${stringGetter({ label: `${stringGetter({ key: STRING_KEYS.STATUS })} / ${stringGetter({
key: STRING_KEYS.FILL, key: STRING_KEYS.FILL,
})}`, })}`,
renderCell: ({ asset, createdAtMilliseconds, size, status, totalFilled, resources }) => { renderCell: ({
asset,
createdAtMilliseconds,
size,
status,
totalFilled,
resources,
}) => {
const { statusIconColor, statusStringKey } = getStatusIconInfo({ const { statusIconColor, statusStringKey } = getStatusIconInfo({
status, status,
totalFilled, totalFilled,
@@ -338,7 +345,9 @@ export const OrdersTable = ({
if (hasUnseenOrderUpdates) dispatch(viewedOrders()); if (hasUnseenOrderUpdates) dispatch(viewedOrders());
}, [hasUnseenOrderUpdates]); }, [hasUnseenOrderUpdates]);
const symbol = currentMarket ? allAssets[allPerpetualMarkets[currentMarket]?.assetId]?.id : null; const symbol = currentMarket
? allAssets[allPerpetualMarkets[currentMarket]?.assetId]?.symbol
: null;
const ordersData = orders.map((order: SubaccountOrder) => const ordersData = orders.map((order: SubaccountOrder) =>
getHydratedTradingData({ getHydratedTradingData({