Compare commits
17
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ca6b266bb2 | ||
|
|
3f10e045f4 | ||
|
|
71d1a0321b | ||
|
|
0f16396c8d | ||
|
|
2709d79f59 | ||
|
|
ab0eec5d4f | ||
|
|
4a044da38f | ||
|
|
fbbfbc6580 | ||
|
|
2714c2b084 | ||
|
|
9979bc8a16 | ||
|
|
a958a59ea2 | ||
|
|
2bf9e66da5 | ||
|
|
2980144e40 | ||
|
|
5387fe8632 | ||
|
|
1132ea3bbd | ||
|
|
9188e08a4f | ||
|
|
941ef7f9dd |
+4
-4
@@ -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.4",
|
"@dydxprotocol/v4-abacus": "^1.1.24",
|
||||||
"@dydxprotocol/v4-client-js": "^1.0.6",
|
"@dydxprotocol/v4-client-js": "^1.0.11",
|
||||||
"@dydxprotocol/v4-localization": "^1.0.17",
|
"@dydxprotocol/v4-localization": "^1.0.18",
|
||||||
"@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.5"
|
"wagmi": "^1.4.12"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.22.5",
|
"@babel/core": "^7.22.5",
|
||||||
|
|||||||
Generated
+666
-123
File diff suppressed because it is too large
Load Diff
@@ -1,29 +1,9 @@
|
|||||||
[
|
[
|
||||||
{
|
|
||||||
"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",
|
||||||
|
|||||||
+29
-29
@@ -42,7 +42,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydxprotocol-testnet",
|
"dydxChainId": "dydxprotocol-testnet",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love",
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
|
||||||
"faucet": "https://faucet.v4dev.dydx.exchange"
|
"faucet": "https://faucet.v4dev.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -116,7 +116,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydxprotocol-testnet",
|
"dydxChainId": "dydxprotocol-testnet",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love"
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -189,7 +189,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydxprotocol-testnet",
|
"dydxChainId": "dydxprotocol-testnet",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love"
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -262,7 +262,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydxprotocol-testnet",
|
"dydxChainId": "dydxprotocol-testnet",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love"
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -335,7 +335,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydxprotocol-testnet",
|
"dydxChainId": "dydxprotocol-testnet",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love"
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -410,7 +410,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydxprotocol-testnet",
|
"dydxChainId": "dydxprotocol-testnet",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love"
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -483,7 +483,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydxprotocol-testnet",
|
"dydxChainId": "dydxprotocol-testnet",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love"
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -558,7 +558,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydx-testnet-4",
|
"dydxChainId": "dydx-testnet-4",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love",
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -637,7 +637,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydx-testnet-4",
|
"dydxChainId": "dydx-testnet-4",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love",
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -713,7 +713,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydx-testnet-4",
|
"dydxChainId": "dydx-testnet-4",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love",
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -789,7 +789,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydx-testnet-4",
|
"dydxChainId": "dydx-testnet-4",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love",
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -865,7 +865,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydx-testnet-4",
|
"dydxChainId": "dydx-testnet-4",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love",
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -941,7 +941,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydx-testnet-4",
|
"dydxChainId": "dydx-testnet-4",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love",
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -1008,7 +1008,7 @@
|
|||||||
"ethereumChainId": "5",
|
"ethereumChainId": "5",
|
||||||
"dydxChainId": "dydx-testnet-4",
|
"dydxChainId": "dydx-testnet-4",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "dYdX-api",
|
"squidIntegratorId": "dYdX-api",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
@@ -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://rpc.testnet.noble.strange.love",
|
"nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -1084,7 +1084,7 @@
|
|||||||
"ethereumChainId": "1",
|
"ethereumChainId": "1",
|
||||||
"dydxChainId": "[mainnet chain id]",
|
"dydxChainId": "[mainnet chain id]",
|
||||||
"chainName": "dYdX Chain",
|
"chainName": "dYdX Chain",
|
||||||
"chainLogo": "dydx-chain.png",
|
"chainLogo": "/dydx-chain.png",
|
||||||
"squidIntegratorId": "[mainnet squid integrator id]",
|
"squidIntegratorId": "[mainnet squid integrator id]",
|
||||||
"isMainNet": true,
|
"isMainNet": true,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ import { NotificationsProvider } from '@/hooks/useNotifications';
|
|||||||
import { LocalNotificationsProvider } from '@/hooks/useLocalNotifications';
|
import { LocalNotificationsProvider } from '@/hooks/useLocalNotifications';
|
||||||
import { RestrictionProvider } from '@/hooks/useRestrictions';
|
import { RestrictionProvider } from '@/hooks/useRestrictions';
|
||||||
import { SubaccountProvider } from '@/hooks/useSubaccount';
|
import { SubaccountProvider } from '@/hooks/useSubaccount';
|
||||||
import { TestFlagsProvider } from '@/hooks/useTestFlags';
|
|
||||||
|
|
||||||
import { GuardedMobileRoute } from '@/components/GuardedMobileRoute';
|
import { GuardedMobileRoute } from '@/components/GuardedMobileRoute';
|
||||||
|
|
||||||
@@ -123,7 +122,6 @@ const providers = [
|
|||||||
wrapProvider(QueryClientProvider, { client: queryClient }),
|
wrapProvider(QueryClientProvider, { client: queryClient }),
|
||||||
wrapProvider(GrazProvider),
|
wrapProvider(GrazProvider),
|
||||||
wrapProvider(WagmiConfig, { config }),
|
wrapProvider(WagmiConfig, { config }),
|
||||||
wrapProvider(TestFlagsProvider),
|
|
||||||
wrapProvider(LocaleProvider),
|
wrapProvider(LocaleProvider),
|
||||||
wrapProvider(RestrictionProvider),
|
wrapProvider(RestrictionProvider),
|
||||||
wrapProvider(DydxProvider),
|
wrapProvider(DydxProvider),
|
||||||
|
|||||||
@@ -31,10 +31,12 @@ type ElementProps<TabItemsValue> = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
type StyleProps = {
|
type StyleProps = {
|
||||||
fullWidthTabs?: boolean;
|
|
||||||
className?: string;
|
className?: string;
|
||||||
|
fullWidthTabs?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type CollapsibleTabsProps<TabItemsValue> = ElementProps<TabItemsValue> & StyleProps;
|
||||||
|
|
||||||
export const CollapsibleTabs = <TabItemsValue extends string>({
|
export const CollapsibleTabs = <TabItemsValue extends string>({
|
||||||
defaultValue,
|
defaultValue,
|
||||||
items,
|
items,
|
||||||
@@ -43,8 +45,9 @@ export const CollapsibleTabs = <TabItemsValue extends string>({
|
|||||||
onOpenChange,
|
onOpenChange,
|
||||||
|
|
||||||
fullWidthTabs,
|
fullWidthTabs,
|
||||||
|
|
||||||
className,
|
className,
|
||||||
}: ElementProps<TabItemsValue> & StyleProps) => {
|
}: CollapsibleTabsProps<TabItemsValue>) => {
|
||||||
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);
|
||||||
@@ -86,8 +89,8 @@ export const CollapsibleTabs = <TabItemsValue extends string>({
|
|||||||
</Styled.Header>
|
</Styled.Header>
|
||||||
|
|
||||||
<Styled.CollapsibleContent>
|
<Styled.CollapsibleContent>
|
||||||
{items.map(({ value, content }) => (
|
{items.map(({ asChild, value, content }) => (
|
||||||
<Styled.TabsContent key={value} value={value}>
|
<Styled.TabsContent key={value} asChild={asChild} value={value}>
|
||||||
{content}
|
{content}
|
||||||
</Styled.TabsContent>
|
</Styled.TabsContent>
|
||||||
))}
|
))}
|
||||||
@@ -219,7 +222,6 @@ Styled.Header = styled.header`
|
|||||||
|
|
||||||
Styled.CollapsibleContent = styled(CollapsibleContent)`
|
Styled.CollapsibleContent = styled(CollapsibleContent)`
|
||||||
${layoutMixins.stack}
|
${layoutMixins.stack}
|
||||||
${layoutMixins.perspectiveArea}
|
|
||||||
|
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
`;
|
`;
|
||||||
|
|||||||
+30
-21
@@ -10,7 +10,7 @@ import {
|
|||||||
USD_DECIMALS,
|
USD_DECIMALS,
|
||||||
} from '@/constants/numbers';
|
} from '@/constants/numbers';
|
||||||
|
|
||||||
import { BIG_NUMBERS, MustBigNumber } from '@/lib/numbers';
|
import { BIG_NUMBERS } from '@/lib/numbers';
|
||||||
import { useLocaleSeparators } from '@/hooks';
|
import { useLocaleSeparators } from '@/hooks';
|
||||||
|
|
||||||
export enum InputType {
|
export enum InputType {
|
||||||
@@ -29,31 +29,38 @@ type StyleProps = {
|
|||||||
type ElementProps = {
|
type ElementProps = {
|
||||||
type?: InputType;
|
type?: InputType;
|
||||||
value?: string | number | null;
|
value?: string | number | null;
|
||||||
|
|
||||||
allowNegative?: boolean;
|
|
||||||
decimals?: number;
|
|
||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
id?: string;
|
id?: string;
|
||||||
max?: number;
|
|
||||||
onBlur?: () => void;
|
onBlur?: () => void;
|
||||||
onChange?:
|
|
||||||
| Dispatch<SetStateAction<string>>
|
|
||||||
| React.ReactEventHandler<HTMLInputElement>
|
|
||||||
| ((values: NumberFormatValues, e: SourceInfo) => void);
|
|
||||||
onFocus?: () => void;
|
onFocus?: () => void;
|
||||||
onInput?: ({
|
|
||||||
value,
|
|
||||||
floatValue,
|
|
||||||
formattedValue,
|
|
||||||
}: {
|
|
||||||
value: string;
|
|
||||||
floatValue?: number;
|
|
||||||
formattedValue: string;
|
|
||||||
}) => void;
|
|
||||||
placeholder?: string;
|
placeholder?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type InputProps = ElementProps & StyleProps;
|
type ConditionalProps =
|
||||||
|
| {
|
||||||
|
allowNegative?: boolean;
|
||||||
|
decimals?: number;
|
||||||
|
max?: number;
|
||||||
|
onChange?: (values: NumberFormatValues, e: SourceInfo) => void;
|
||||||
|
onInput?: ({
|
||||||
|
value,
|
||||||
|
floatValue,
|
||||||
|
formattedValue,
|
||||||
|
}: {
|
||||||
|
value: string;
|
||||||
|
floatValue?: number;
|
||||||
|
formattedValue: string;
|
||||||
|
}) => void;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
allowNegative?: never;
|
||||||
|
decimals?: never;
|
||||||
|
max?: never;
|
||||||
|
onChange?: Dispatch<SetStateAction<string>> | React.ReactEventHandler<HTMLInputElement>;
|
||||||
|
onInput?: (e: SyntheticInputEvent) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type InputProps = ElementProps & StyleProps & ConditionalProps;
|
||||||
|
|
||||||
export const Input = forwardRef<HTMLInputElement, InputProps>(
|
export const Input = forwardRef<HTMLInputElement, InputProps>(
|
||||||
(
|
(
|
||||||
@@ -129,6 +136,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
|
|||||||
placeholder={placeholder}
|
placeholder={placeholder}
|
||||||
value={value}
|
value={value}
|
||||||
// Other
|
// Other
|
||||||
|
data-1p-ignore // prevent 1Password fill
|
||||||
{...otherProps}
|
{...otherProps}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
@@ -137,6 +145,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
|
|||||||
ref={ref as React.Ref<typeof NumericFormat<unknown>>}
|
ref={ref as React.Ref<typeof NumericFormat<unknown>>}
|
||||||
id={id}
|
id={id}
|
||||||
// NumericFormat
|
// NumericFormat
|
||||||
|
valueIsNumericString
|
||||||
allowNegative={allowNegative}
|
allowNegative={allowNegative}
|
||||||
decimalScale={decimals}
|
decimalScale={decimals}
|
||||||
decimalSeparator={LOCALE_DECIMAL_SEPARATOR}
|
decimalSeparator={LOCALE_DECIMAL_SEPARATOR}
|
||||||
@@ -160,7 +169,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
|
|||||||
? undefined
|
? undefined
|
||||||
: Number(formattedValue.replace(',', '.'));
|
: Number(formattedValue.replace(',', '.'));
|
||||||
|
|
||||||
onInput?.({ value, floatValue, formattedValue });
|
onInput?.({ value, floatValue, formattedValue, ...e });
|
||||||
}}
|
}}
|
||||||
// Native
|
// Native
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
@@ -168,6 +177,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
|
|||||||
value={formattedValue}
|
value={formattedValue}
|
||||||
autoComplete="off"
|
autoComplete="off"
|
||||||
autoCorrect="off"
|
autoCorrect="off"
|
||||||
|
data-1p-ignore // prevent 1Password fill
|
||||||
{...otherProps}
|
{...otherProps}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@@ -188,7 +198,6 @@ Styled.InputContainer = styled.div`
|
|||||||
border-radius: inherit;
|
border-radius: inherit;
|
||||||
|
|
||||||
input {
|
input {
|
||||||
user-select: all;
|
|
||||||
flex: 1;
|
flex: 1;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ 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> = {
|
||||||
@@ -41,6 +42,8 @@ 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,
|
||||||
@@ -107,9 +110,10 @@ export const Tabs = <TabItemsValue extends string>({
|
|||||||
sharedContent
|
sharedContent
|
||||||
) : (
|
) : (
|
||||||
<Styled.Stack>
|
<Styled.Stack>
|
||||||
{items.map(({ value, content, forceMount }) => (
|
{items.map(({ asChild, 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}
|
||||||
@@ -242,7 +246,6 @@ 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;
|
||||||
`;
|
`;
|
||||||
|
|||||||
@@ -46,4 +46,19 @@ export const MARKETS_TO_DISPLAY = [
|
|||||||
'SHIB-USD',
|
'SHIB-USD',
|
||||||
'COMP-USD',
|
'COMP-USD',
|
||||||
'LDO-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',
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -122,9 +122,15 @@ 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;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
MARKETS_TO_DISPLAY,
|
MARKETS_TO_DISPLAY,
|
||||||
} from '@/constants/markets';
|
} from '@/constants/markets';
|
||||||
|
|
||||||
import { testFlags } from '@/hooks/useTestFlags';
|
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';
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ 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';
|
||||||
@@ -152,20 +153,20 @@ export const notificationTypes: NotificationTypeConfig[] = [
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
for (const transfer of transferNotifications) {
|
for (const transfer of transferNotifications) {
|
||||||
const { fromChainId, status, txHash, toAmount } = transfer;
|
const { fromChainId, status, txHash, toAmount, type } = 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 type =
|
const transferType = type ??
|
||||||
fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
|
fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
|
||||||
? 'withdrawal'
|
? TransferNotificationTypes.Withdrawal
|
||||||
: 'deposit';
|
: TransferNotificationTypes.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,
|
||||||
}[type],
|
}[transferType],
|
||||||
});
|
});
|
||||||
|
|
||||||
const toChainEta = status?.toChain?.chainData?.estimatedRouteDuration || 0;
|
const toChainEta = status?.toChain?.chainData?.estimatedRouteDuration || 0;
|
||||||
@@ -190,7 +191,7 @@ export const notificationTypes: NotificationTypeConfig[] = [
|
|||||||
slotIcon={icon}
|
slotIcon={icon}
|
||||||
slotTitle={title}
|
slotTitle={title}
|
||||||
transfer={transfer}
|
transfer={transfer}
|
||||||
type={type}
|
type={transferType}
|
||||||
triggeredAt={transfer.triggeredAt}
|
triggeredAt={transfer.triggeredAt}
|
||||||
notification={notification}
|
notification={notification}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ 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);
|
||||||
@@ -293,12 +294,29 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
|
|||||||
);
|
);
|
||||||
|
|
||||||
const sendSquidWithdraw = useCallback(
|
const sendSquidWithdraw = useCallback(
|
||||||
async (amount: number, payload: string) => {
|
async (amount: number, payload: string, isCctp?: boolean) => {
|
||||||
|
|
||||||
|
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 await sendSquidWithdrawFromSubaccount({ subaccountClient, amount, payload });
|
return hashFromTx(tx?.hash);
|
||||||
},
|
},
|
||||||
[subaccountClient, sendSquidWithdrawFromSubaccount]
|
[subaccountClient, sendSquidWithdrawFromSubaccount]
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,53 +0,0 @@
|
|||||||
import { createContext, useContext, useEffect, useState } from 'react';
|
|
||||||
import { useLocation } from 'react-router-dom';
|
|
||||||
import queryString from 'query-string';
|
|
||||||
|
|
||||||
class TestFlags {
|
|
||||||
public queryParams: queryString.ParsedQuery<string>;
|
|
||||||
|
|
||||||
constructor() {
|
|
||||||
this.queryParams = {};
|
|
||||||
}
|
|
||||||
|
|
||||||
setQueryParams(flags: queryString.ParsedQuery<string>) {
|
|
||||||
this.queryParams = flags;
|
|
||||||
}
|
|
||||||
|
|
||||||
get displayInitializingMarkets() {
|
|
||||||
return !!this.queryParams.displayInitializingMarkets;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @description We are temporarily displaying a subset of ACTIVE markets, this flag will allow you to see all ACTIVE markets
|
|
||||||
*/
|
|
||||||
get displayAllMarkets() {
|
|
||||||
return !!this.queryParams.displayAllMarkets;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const testFlags = new TestFlags();
|
|
||||||
|
|
||||||
const useTestFlagsContext = () => {
|
|
||||||
const [queryParams, setQueryParams] = useState<queryString.ParsedQuery<string>>({});
|
|
||||||
const location = useLocation();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const parsedQueryParams = queryString.parse(location.search.substring(-1));
|
|
||||||
testFlags.setQueryParams(parsedQueryParams);
|
|
||||||
setQueryParams(parsedQueryParams);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
return {
|
|
||||||
...queryParams,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
type TestFlagsContextType = ReturnType<typeof useTestFlagsContext>;
|
|
||||||
const TestFlagsContext = createContext<TestFlagsContextType>({} as TestFlagsContextType);
|
|
||||||
TestFlagsContext.displayName = 'TestFlags';
|
|
||||||
|
|
||||||
export const TestFlagsProvider = ({ ...props }) => (
|
|
||||||
<TestFlagsContext.Provider value={useTestFlagsContext()} {...props} />
|
|
||||||
);
|
|
||||||
|
|
||||||
export const useTestFlags = () => useContext(TestFlagsContext);
|
|
||||||
@@ -11,22 +11,19 @@ export const useTradeFormInputs = () => {
|
|||||||
const { limitPriceInput, triggerPriceInput, trailingPercentInput } = tradeFormInputValues;
|
const { limitPriceInput, triggerPriceInput, trailingPercentInput } = tradeFormInputValues;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const floatValue = parseFloat(triggerPriceInput);
|
|
||||||
abacusStateManager.setTradeValue({
|
abacusStateManager.setTradeValue({
|
||||||
value: floatValue,
|
value: triggerPriceInput,
|
||||||
field: TradeInputField.triggerPrice,
|
field: TradeInputField.triggerPrice,
|
||||||
});
|
});
|
||||||
}, [triggerPriceInput]);
|
}, [triggerPriceInput]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const floatValue = parseFloat(limitPriceInput);
|
abacusStateManager.setTradeValue({ value: limitPriceInput, field: TradeInputField.limitPrice });
|
||||||
abacusStateManager.setTradeValue({ value: floatValue, field: TradeInputField.limitPrice });
|
|
||||||
}, [limitPriceInput]);
|
}, [limitPriceInput]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const floatValue = parseFloat(trailingPercentInput);
|
|
||||||
abacusStateManager.setTradeValue({
|
abacusStateManager.setTradeValue({
|
||||||
value: floatValue,
|
value: trailingPercentInput,
|
||||||
field: TradeInputField.trailingPercent,
|
field: TradeInputField.trailingPercent,
|
||||||
});
|
});
|
||||||
}, [trailingPercentInput]);
|
}, [trailingPercentInput]);
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ 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,
|
||||||
@@ -41,6 +42,7 @@ 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;
|
||||||
@@ -63,9 +65,13 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setNobleWallet(nobleWallet: LocalWallet) {
|
setNobleWallet(nobleWallet: LocalWallet) {
|
||||||
this.nobleWallet = nobleWallet;
|
try {
|
||||||
if (this.nobleClient) {
|
this.nobleWallet = nobleWallet;
|
||||||
this.nobleClient.connect(nobleWallet);
|
if (this.nobleClient) {
|
||||||
|
this.nobleClient.connect(nobleWallet);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
log('DydxChainTransactions/setNobleWallet', e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -112,10 +118,15 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
|||||||
|
|
||||||
this.compositeClient = compositeClient;
|
this.compositeClient = compositeClient;
|
||||||
|
|
||||||
if (nobleValidatorUrl) {
|
try {
|
||||||
this.nobleClient = new NobleClient(nobleValidatorUrl);
|
if (nobleValidatorUrl) {
|
||||||
if (this.nobleWallet) await this.nobleClient.connect(this.nobleWallet);
|
this.nobleClient = new NobleClient(nobleValidatorUrl);
|
||||||
|
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,
|
||||||
@@ -380,6 +391,90 @@ 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>,
|
||||||
@@ -414,6 +509,17 @@ 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;
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-14
@@ -33,6 +33,8 @@ import type { RootStore } from '@/state/_store';
|
|||||||
import { setTradeFormInputs } from '@/state/inputs';
|
import { setTradeFormInputs } from '@/state/inputs';
|
||||||
import { getInputTradeOptions, getTransferInputs } from '@/state/inputsSelectors';
|
import { getInputTradeOptions, getTransferInputs } from '@/state/inputsSelectors';
|
||||||
|
|
||||||
|
import { testFlags } from '@/lib/testFlags';
|
||||||
|
|
||||||
import AbacusRest from './rest';
|
import AbacusRest from './rest';
|
||||||
import AbacusAnalytics from './analytics';
|
import AbacusAnalytics from './analytics';
|
||||||
import AbacusWebsocket from './websocket';
|
import AbacusWebsocket from './websocket';
|
||||||
@@ -82,7 +84,8 @@ class AbacusStateManager {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const appConfigs = AbacusAppConfig.Companion.forWeb;
|
const appConfigs = AbacusAppConfig.Companion.forWeb;
|
||||||
if (!isMainnet) appConfigs.squidVersion = AbacusAppConfig.SquidVersion.V2DepositOnly;
|
if (!isMainnet || testFlags.withCCTP)
|
||||||
|
appConfigs.squidVersion = AbacusAppConfig.SquidVersion.V2;
|
||||||
|
|
||||||
this.stateManager = new AsyncAbacusStateManager(
|
this.stateManager = new AsyncAbacusStateManager(
|
||||||
'',
|
'',
|
||||||
@@ -187,7 +190,7 @@ class AbacusStateManager {
|
|||||||
if (nobleWallet) {
|
if (nobleWallet) {
|
||||||
this.chainTransactions.setNobleWallet(nobleWallet);
|
this.chainTransactions.setNobleWallet(nobleWallet);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
setTransfersSourceAddress = (evmAddress: string) => {
|
setTransfersSourceAddress = (evmAddress: string) => {
|
||||||
this.stateManager.sourceAddress = evmAddress;
|
this.stateManager.sourceAddress = evmAddress;
|
||||||
@@ -232,18 +235,6 @@ class AbacusStateManager {
|
|||||||
this.abacusFormatter.setLocaleSeparators({ group, decimal });
|
this.abacusFormatter.setLocaleSeparators({ group, decimal });
|
||||||
};
|
};
|
||||||
|
|
||||||
setTransferStatus = ({
|
|
||||||
hash,
|
|
||||||
fromChainId,
|
|
||||||
toChainId,
|
|
||||||
}: {
|
|
||||||
hash: string;
|
|
||||||
fromChainId?: string;
|
|
||||||
toChainId?: string;
|
|
||||||
}) => {
|
|
||||||
this.stateManager.transferStatus(hash, fromChainId, toChainId);
|
|
||||||
};
|
|
||||||
|
|
||||||
// ------ Transactions ------ //
|
// ------ Transactions ------ //
|
||||||
|
|
||||||
placeOrder = (
|
placeOrder = (
|
||||||
@@ -271,6 +262,14 @@ 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;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import {
|
|||||||
} from '@/constants/websocket';
|
} from '@/constants/websocket';
|
||||||
|
|
||||||
import { lastSuccessfulWebsocketRequestByOrigin } from '@/hooks/useAnalytics';
|
import { lastSuccessfulWebsocketRequestByOrigin } from '@/hooks/useAnalytics';
|
||||||
import { testFlags } from '@/hooks/useTestFlags';
|
import { testFlags } from '@/lib/testFlags';
|
||||||
|
|
||||||
import { subscriptionsByChannelId } from '@/lib/tradingView/dydxfeed/cache';
|
import { subscriptionsByChannelId } from '@/lib/tradingView/dydxfeed/cache';
|
||||||
import { mapCandle } from '@/lib/tradingView/utils';
|
import { mapCandle } from '@/lib/tradingView/utils';
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
export const hashFromTx = (
|
||||||
|
txHash: string | Uint8Array
|
||||||
|
): string => `0x${Buffer.from(txHash).toString('hex')}`;
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
class TestFlags {
|
||||||
|
public queryParams: { [key: string]: string };
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.queryParams = {};
|
||||||
|
const hash = window.location.hash;
|
||||||
|
const queryIndex = hash.indexOf('?');
|
||||||
|
if (queryIndex === -1) return
|
||||||
|
|
||||||
|
const queryParamsString = hash.substring(queryIndex + 1);
|
||||||
|
const params = new URLSearchParams(queryParamsString);
|
||||||
|
|
||||||
|
for (const [key, value] of params) {
|
||||||
|
this.queryParams[key] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
get displayInitializingMarkets() {
|
||||||
|
return !!this.queryParams.displayInitializingMarkets;
|
||||||
|
}
|
||||||
|
|
||||||
|
get displayAllMarkets() {
|
||||||
|
return !!this.queryParams.displayAllMarkets;
|
||||||
|
}
|
||||||
|
|
||||||
|
get withCCTP() {
|
||||||
|
return !!this.queryParams.withCCTP;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const testFlags = new TestFlags();
|
||||||
+131
-116
@@ -1,8 +1,7 @@
|
|||||||
import { useState } from 'react';
|
import { useMemo, 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';
|
||||||
@@ -28,7 +27,6 @@ import {
|
|||||||
getCurrentMarketTradeInfoNumbers,
|
getCurrentMarketTradeInfoNumbers,
|
||||||
getHasUnseenFillUpdates,
|
getHasUnseenFillUpdates,
|
||||||
getHasUnseenOrderUpdates,
|
getHasUnseenOrderUpdates,
|
||||||
getLatestOrderStatus,
|
|
||||||
getTradeInfoNumbers,
|
getTradeInfoNumbers,
|
||||||
} from '@/state/accountSelectors';
|
} from '@/state/accountSelectors';
|
||||||
|
|
||||||
@@ -82,125 +80,142 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
|
|||||||
showCurrentMarket ? numOpenOrders : numTotalOpenOrders
|
showCurrentMarket ? numOpenOrders : numTotalOpenOrders
|
||||||
);
|
);
|
||||||
|
|
||||||
const tabItems = [
|
const tabItems = useMemo(
|
||||||
{
|
() => [
|
||||||
value: InfoSection.Position,
|
{
|
||||||
label: stringGetter({
|
asChild: true,
|
||||||
key: showCurrentMarket ? STRING_KEYS.POSITION : STRING_KEYS.POSITIONS,
|
value: InfoSection.Position,
|
||||||
}),
|
label: stringGetter({
|
||||||
|
key: showCurrentMarket ? STRING_KEYS.POSITION : STRING_KEYS.POSITIONS,
|
||||||
|
}),
|
||||||
|
|
||||||
tag: showCurrentMarket ? null : shortenNumberForDisplay(numTotalPositions),
|
tag: showCurrentMarket ? null : shortenNumberForDisplay(numTotalPositions),
|
||||||
|
|
||||||
content: showCurrentMarket ? (
|
content: showCurrentMarket ? (
|
||||||
<PositionInfo showNarrowVariation={isTablet} />
|
<PositionInfo showNarrowVariation={isTablet} />
|
||||||
) : (
|
) : (
|
||||||
<PositionsTable
|
<PositionsTable
|
||||||
columnKeys={
|
columnKeys={
|
||||||
isTablet
|
isTablet
|
||||||
? [
|
? [
|
||||||
PositionsTableColumnKey.Details,
|
PositionsTableColumnKey.Details,
|
||||||
PositionsTableColumnKey.IndexEntry,
|
PositionsTableColumnKey.IndexEntry,
|
||||||
PositionsTableColumnKey.PnL,
|
PositionsTableColumnKey.PnL,
|
||||||
]
|
]
|
||||||
: [
|
: [
|
||||||
PositionsTableColumnKey.Market,
|
PositionsTableColumnKey.Market,
|
||||||
PositionsTableColumnKey.Side,
|
PositionsTableColumnKey.Side,
|
||||||
PositionsTableColumnKey.Size,
|
PositionsTableColumnKey.Size,
|
||||||
PositionsTableColumnKey.Leverage,
|
PositionsTableColumnKey.Leverage,
|
||||||
PositionsTableColumnKey.LiquidationAndOraclePrice,
|
PositionsTableColumnKey.LiquidationAndOraclePrice,
|
||||||
PositionsTableColumnKey.UnrealizedPnl,
|
PositionsTableColumnKey.UnrealizedPnl,
|
||||||
PositionsTableColumnKey.RealizedPnl,
|
PositionsTableColumnKey.RealizedPnl,
|
||||||
PositionsTableColumnKey.AverageOpenAndClose,
|
PositionsTableColumnKey.AverageOpenAndClose,
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
onNavigate={() => setView(PanelView.CurrentMarket)}
|
onNavigate={() => setView(PanelView.CurrentMarket)}
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: InfoSection.Orders,
|
asChild: true,
|
||||||
label: stringGetter({ key: STRING_KEYS.ORDERS }),
|
value: InfoSection.Orders,
|
||||||
|
label: stringGetter({ key: STRING_KEYS.ORDERS }),
|
||||||
|
|
||||||
slotRight: isWaitingForOrderToIndex ? (
|
slotRight: isWaitingForOrderToIndex ? (
|
||||||
<Styled.LoadingSpinner />
|
<Styled.LoadingSpinner />
|
||||||
) : (
|
) : (
|
||||||
ordersTagNumber && (
|
ordersTagNumber && (
|
||||||
<Tag type={TagType.Number} isHighlighted={hasUnseenOrderUpdates}>
|
<Tag type={TagType.Number} isHighlighted={hasUnseenOrderUpdates}>
|
||||||
{ordersTagNumber}
|
{ordersTagNumber}
|
||||||
|
</Tag>
|
||||||
|
)
|
||||||
|
),
|
||||||
|
|
||||||
|
content: (
|
||||||
|
<OrdersTable
|
||||||
|
currentMarket={showCurrentMarket ? currentMarketId : undefined}
|
||||||
|
columnKeys={
|
||||||
|
isTablet
|
||||||
|
? [OrdersTableColumnKey.StatusFill, OrdersTableColumnKey.PriceType]
|
||||||
|
: [
|
||||||
|
!showCurrentMarket && OrdersTableColumnKey.Market,
|
||||||
|
OrdersTableColumnKey.Status,
|
||||||
|
OrdersTableColumnKey.Side,
|
||||||
|
OrdersTableColumnKey.AmountFill,
|
||||||
|
OrdersTableColumnKey.Price,
|
||||||
|
OrdersTableColumnKey.Trigger,
|
||||||
|
OrdersTableColumnKey.GoodTil,
|
||||||
|
!isAccountViewOnly && OrdersTableColumnKey.Actions,
|
||||||
|
].filter(isTruthy)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
asChild: true,
|
||||||
|
value: InfoSection.Fills,
|
||||||
|
label: stringGetter({ key: STRING_KEYS.FILLS }),
|
||||||
|
|
||||||
|
slotRight: fillsTagNumber && (
|
||||||
|
<Tag type={TagType.Number} isHighlighted={hasUnseenFillUpdates}>
|
||||||
|
{fillsTagNumber}
|
||||||
</Tag>
|
</Tag>
|
||||||
)
|
),
|
||||||
),
|
|
||||||
|
|
||||||
content: (
|
content: (
|
||||||
<OrdersTable
|
<FillsTable
|
||||||
currentMarket={showCurrentMarket ? currentMarketId : undefined}
|
currentMarket={showCurrentMarket ? currentMarketId : undefined}
|
||||||
columnKeys={
|
columnKeys={
|
||||||
isTablet
|
isTablet
|
||||||
? [OrdersTableColumnKey.StatusFill, OrdersTableColumnKey.PriceType]
|
? [
|
||||||
: [
|
FillsTableColumnKey.Time,
|
||||||
!showCurrentMarket && OrdersTableColumnKey.Market,
|
FillsTableColumnKey.TypeAmount,
|
||||||
OrdersTableColumnKey.Status,
|
FillsTableColumnKey.PriceFee,
|
||||||
OrdersTableColumnKey.Side,
|
]
|
||||||
OrdersTableColumnKey.AmountFill,
|
: [
|
||||||
OrdersTableColumnKey.Price,
|
!showCurrentMarket && FillsTableColumnKey.Market,
|
||||||
OrdersTableColumnKey.Trigger,
|
FillsTableColumnKey.Time,
|
||||||
OrdersTableColumnKey.GoodTil,
|
FillsTableColumnKey.Type,
|
||||||
!isAccountViewOnly && OrdersTableColumnKey.Actions,
|
FillsTableColumnKey.Side,
|
||||||
].filter(isTruthy)
|
FillsTableColumnKey.AmountTag,
|
||||||
}
|
FillsTableColumnKey.Price,
|
||||||
/>
|
FillsTableColumnKey.TotalFee,
|
||||||
),
|
FillsTableColumnKey.Liquidity,
|
||||||
},
|
].filter(isTruthy)
|
||||||
{
|
}
|
||||||
value: InfoSection.Fills,
|
columnWidths={{
|
||||||
label: stringGetter({ key: STRING_KEYS.FILLS }),
|
[FillsTableColumnKey.TypeAmount]: '100%',
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
// TODO - TRCL-1693 - re-enable when funding payments are supported
|
||||||
|
// {
|
||||||
|
// value: InfoSection.Payments,
|
||||||
|
// label: stringGetter({ key: STRING_KEYS.PAYMENTS }),
|
||||||
|
|
||||||
slotRight: fillsTagNumber && (
|
// tag: shortenNumberForDisplay(
|
||||||
<Tag type={TagType.Number} isHighlighted={hasUnseenFillUpdates}>
|
// showCurrentMarket ? numFundingPayments : numTotalFundingPayments
|
||||||
{fillsTagNumber}
|
// ),
|
||||||
</Tag>
|
// content: (
|
||||||
),
|
// <FundingPaymentsTable currentMarket={showCurrentMarket ? currentMarket?.id : undefined} />
|
||||||
|
// ),
|
||||||
content: (
|
// },
|
||||||
<FillsTable
|
],
|
||||||
currentMarket={showCurrentMarket ? currentMarketId : undefined}
|
[
|
||||||
columnKeys={
|
stringGetter,
|
||||||
isTablet
|
currentMarketId,
|
||||||
? [
|
showCurrentMarket,
|
||||||
FillsTableColumnKey.Time,
|
isTablet,
|
||||||
FillsTableColumnKey.TypeAmount,
|
isWaitingForOrderToIndex,
|
||||||
FillsTableColumnKey.PriceFee,
|
isAccountViewOnly,
|
||||||
]
|
ordersTagNumber,
|
||||||
: [
|
fillsTagNumber,
|
||||||
!showCurrentMarket && FillsTableColumnKey.Market,
|
hasUnseenFillUpdates,
|
||||||
FillsTableColumnKey.Time,
|
hasUnseenOrderUpdates,
|
||||||
FillsTableColumnKey.Type,
|
]
|
||||||
FillsTableColumnKey.Side,
|
);
|
||||||
FillsTableColumnKey.AmountTag,
|
|
||||||
FillsTableColumnKey.Price,
|
|
||||||
FillsTableColumnKey.TotalFee,
|
|
||||||
FillsTableColumnKey.Liquidity,
|
|
||||||
].filter(isTruthy)
|
|
||||||
}
|
|
||||||
columnWidths={{
|
|
||||||
[FillsTableColumnKey.TypeAmount]: '100%',
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
// TODO - TRCL-1693 - re-enable when funding payments are supported
|
|
||||||
// {
|
|
||||||
// value: InfoSection.Payments,
|
|
||||||
// label: stringGetter({ key: STRING_KEYS.PAYMENTS }),
|
|
||||||
|
|
||||||
// tag: shortenNumberForDisplay(
|
|
||||||
// showCurrentMarket ? numFundingPayments : numTotalFundingPayments
|
|
||||||
// ),
|
|
||||||
// content: (
|
|
||||||
// <FundingPaymentsTable currentMarket={showCurrentMarket ? currentMarket?.id : undefined} />
|
|
||||||
// ),
|
|
||||||
// },
|
|
||||||
];
|
|
||||||
|
|
||||||
return isTablet ? (
|
return isTablet ? (
|
||||||
<MobileTabs defaultValue={InfoSection.Position} items={tabItems} withBorders={false} />
|
<MobileTabs defaultValue={InfoSection.Position} items={tabItems} withBorders={false} />
|
||||||
|
|||||||
@@ -877,11 +877,6 @@ export const layoutMixins: Record<
|
|||||||
}
|
}
|
||||||
`,
|
`,
|
||||||
|
|
||||||
perspectiveArea: css`
|
|
||||||
perspective: 100rem;
|
|
||||||
transform-style: preserve-3d;
|
|
||||||
`,
|
|
||||||
|
|
||||||
absolute: css`
|
absolute: css`
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ 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,7 +203,6 @@ 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)`
|
||||||
@@ -293,7 +292,14 @@ Styled.TransferButtons = styled.div`
|
|||||||
|
|
||||||
Styled.ConnectedAccountInfoContainer = styled.div<{ $showHeader?: boolean }>`
|
Styled.ConnectedAccountInfoContainer = styled.div<{ $showHeader?: boolean }>`
|
||||||
${layoutMixins.column}
|
${layoutMixins.column}
|
||||||
${layoutMixins.withOuterAndInnerBorders}
|
|
||||||
|
@media ${breakpoints.notTablet} {
|
||||||
|
${layoutMixins.withOuterAndInnerBorders}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media ${breakpoints.tablet} {
|
||||||
|
${layoutMixins.withInnerBorder}
|
||||||
|
}
|
||||||
|
|
||||||
${({ $showHeader }) =>
|
${({ $showHeader }) =>
|
||||||
$showHeader &&
|
$showHeader &&
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ 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 { MARKETS_TO_DISPLAY } from '@/constants/markets';
|
||||||
import { useBreakpoints, useStringGetter } from '@/hooks';
|
import { useBreakpoints, useStringGetter } from '@/hooks';
|
||||||
import { testFlags } from '@/hooks/useTestFlags';
|
import { testFlags } from '@/lib/testFlags';
|
||||||
import { breakpoints } from '@/styles';
|
import { breakpoints } from '@/styles';
|
||||||
import { layoutMixins } from '@/styles/layoutMixins';
|
import { layoutMixins } from '@/styles/layoutMixins';
|
||||||
|
|
||||||
|
|||||||
@@ -213,13 +213,8 @@ 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`
|
||||||
|
|||||||
@@ -453,13 +453,6 @@ 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 }>`
|
||||||
@@ -514,6 +507,7 @@ 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)`
|
||||||
|
|||||||
@@ -82,7 +82,6 @@ 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%;
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,6 @@ 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 } from '@/constants/notifications';
|
import { NotificationStatus, TransferNotificationTypes } from '@/constants/notifications';
|
||||||
import { NumberSign } from '@/constants/numbers';
|
import { NumberSign } from '@/constants/numbers';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -45,6 +45,7 @@ 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';
|
||||||
@@ -167,16 +168,16 @@ export const WithdrawForm = () => {
|
|||||||
})
|
})
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
const txHash = await sendSquidWithdraw(debouncedAmountBN.toNumber(), requestPayload.data);
|
const txHash = await sendSquidWithdraw(debouncedAmountBN.toNumber(), requestPayload.data, isCctp);
|
||||||
if (txHash?.hash) {
|
if (txHash) {
|
||||||
const hash = `0x${Buffer.from(txHash.hash).toString('hex')}`;
|
|
||||||
addTransferNotification({
|
addTransferNotification({
|
||||||
txHash: hash,
|
txHash: txHash,
|
||||||
fromChainId: ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId,
|
type: TransferNotificationTypes.Withdrawal,
|
||||||
|
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(),
|
||||||
notificationStatus: NotificationStatus.Triggered,
|
isCctp,
|
||||||
});
|
});
|
||||||
abacusStateManager.clearTransferInputValues();
|
abacusStateManager.clearTransferInputValues();
|
||||||
setWithdrawAmount('');
|
setWithdrawAmount('');
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ export const TradeForm = ({
|
|||||||
dispatch(setTradeFormInputs({ triggerPriceInput: value }));
|
dispatch(setTradeFormInputs({ triggerPriceInput: value }));
|
||||||
},
|
},
|
||||||
value: triggerPriceInput ?? '',
|
value: triggerPriceInput ?? '',
|
||||||
decimals: tickSizeDecimals || USD_DECIMALS,
|
decimals: tickSizeDecimals ?? USD_DECIMALS,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -226,7 +226,7 @@ export const TradeForm = ({
|
|||||||
dispatch(setTradeFormInputs({ limitPriceInput: value }));
|
dispatch(setTradeFormInputs({ limitPriceInput: value }));
|
||||||
},
|
},
|
||||||
value: limitPriceInput,
|
value: limitPriceInput,
|
||||||
decimals: tickSizeDecimals || USD_DECIMALS,
|
decimals: tickSizeDecimals ?? USD_DECIMALS,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import { type Dispatch, type SetStateAction, useCallback, useMemo } from 'react';
|
import { 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 { type Nullable, TradeInputField } from '@/constants/abacus';
|
import { 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: Nullable<number>;
|
leverageInputValue: string;
|
||||||
maxLeverage: BigNumberish | null;
|
maxLeverage: BigNumberish | null;
|
||||||
orderSide: OrderSide;
|
orderSide: OrderSide;
|
||||||
positionSide: PositionSide;
|
positionSide: PositionSide;
|
||||||
setLeverageInputValue: Dispatch<SetStateAction<Nullable<number>>>;
|
setLeverageInputValue: (value: string) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
type StyleProps = { className?: string };
|
type StyleProps = { className?: string };
|
||||||
@@ -33,6 +33,7 @@ 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(
|
||||||
() => ({
|
() => ({
|
||||||
@@ -79,12 +80,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();
|
||||||
@@ -102,7 +103,7 @@ export const LeverageSlider = ({
|
|||||||
min={min}
|
min={min}
|
||||||
max={max}
|
max={max}
|
||||||
step={0.1}
|
step={0.1}
|
||||||
value={[Math.min(Math.max(leverageInputBN.toNumber(), min), max)]}
|
value={[Math.min(Math.max(leverageInputNumber, min), max)]}
|
||||||
onValueChange={onSliderDrag}
|
onValueChange={onSliderDrag}
|
||||||
onValueCommit={onValueCommit}
|
onValueCommit={onValueCommit}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
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, Nullable } from '@/constants/abacus';
|
import { TradeInputField } 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';
|
||||||
@@ -62,21 +61,7 @@ export const MarketLeverageInput = ({
|
|||||||
|
|
||||||
const leveragePosition = postOrderLeverage ? newPositionSide : currentPositionSide;
|
const leveragePosition = postOrderLeverage ? newPositionSide : currentPositionSide;
|
||||||
|
|
||||||
const onLeverageInput = ({ value, floatValue }: { value: string; floatValue?: number }) => {
|
const getSignedLeverage = (newLeverage: string | 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 ||
|
||||||
@@ -84,10 +69,33 @@ export const MarketLeverageInput = ({
|
|||||||
? newLeverageBN.abs().negated()
|
? newLeverageBN.abs().negated()
|
||||||
: newLeverageBN.abs();
|
: newLeverageBN.abs();
|
||||||
|
|
||||||
setLeverageInputValue(newLeverageSignedBN.toString());
|
return newLeverageSignedBN.toFixed(LEVERAGE_DECIMALS);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onLeverageInput = ({
|
||||||
|
floatValue,
|
||||||
|
formattedValue,
|
||||||
|
}: {
|
||||||
|
floatValue?: number;
|
||||||
|
formattedValue: string;
|
||||||
|
}) => {
|
||||||
|
setLeverageInputValue(formattedValue);
|
||||||
|
const newLeverage = MustBigNumber(floatValue).toFixed();
|
||||||
|
|
||||||
abacusStateManager.setTradeValue({
|
abacusStateManager.setTradeValue({
|
||||||
value: newLeverageSignedBN.toFixed(LEVERAGE_DECIMALS),
|
value:
|
||||||
|
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,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@@ -130,7 +138,7 @@ export const MarketLeverageInput = ({
|
|||||||
>
|
>
|
||||||
<Styled.LeverageSlider
|
<Styled.LeverageSlider
|
||||||
leverage={currentLeverage}
|
leverage={currentLeverage}
|
||||||
leverageInputValue={leverageInputValue}
|
leverageInputValue={getSignedLeverage(leverageInputValue)}
|
||||||
maxLeverage={maxLeverage}
|
maxLeverage={maxLeverage}
|
||||||
orderSide={orderSide}
|
orderSide={orderSide}
|
||||||
positionSide={currentPositionSide}
|
positionSide={currentPositionSide}
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ export const TradeSizeInputs = () => {
|
|||||||
useSelector(getCurrentMarketConfig, shallowEqual) || {};
|
useSelector(getCurrentMarketConfig, shallowEqual) || {};
|
||||||
const { size, usdcSize, leverage, input: lastEditedInput } = inputTradeSizeData || {};
|
const { size, usdcSize, leverage, input: lastEditedInput } = inputTradeSizeData || {};
|
||||||
const { needsLeverage } = currentTradeInputOptions || {};
|
const { needsLeverage } = currentTradeInputOptions || {};
|
||||||
const decimals = stepSizeDecimals || TOKEN_DECIMALS;
|
const decimals = stepSizeDecimals ?? TOKEN_DECIMALS;
|
||||||
|
|
||||||
const { amountInput, usdAmountInput, leverageInput } = useSelector(
|
const { amountInput, usdAmountInput, leverageInput } = useSelector(
|
||||||
getTradeFormInputs,
|
getTradeFormInputs,
|
||||||
@@ -70,22 +70,34 @@ export const TradeSizeInputs = () => {
|
|||||||
}
|
}
|
||||||
}, [size, usdcSize, leverage, lastEditedInput]);
|
}, [size, usdcSize, leverage, lastEditedInput]);
|
||||||
|
|
||||||
const onSizeInput = ({ value, floatValue }: { value: string; floatValue?: number }) => {
|
const onSizeInput = ({
|
||||||
dispatch(setTradeFormInputs({ amountInput: value }));
|
floatValue,
|
||||||
|
formattedValue,
|
||||||
|
}: {
|
||||||
|
floatValue?: number;
|
||||||
|
formattedValue: string;
|
||||||
|
}) => {
|
||||||
|
dispatch(setTradeFormInputs({ amountInput: formattedValue }));
|
||||||
const newAmount = MustBigNumber(floatValue).toFixed(decimals);
|
const newAmount = MustBigNumber(floatValue).toFixed(decimals);
|
||||||
|
|
||||||
abacusStateManager.setTradeValue({
|
abacusStateManager.setTradeValue({
|
||||||
value: value === '' || newAmount === 'NaN' ? null : newAmount,
|
value: formattedValue === '' || newAmount === 'NaN' ? null : newAmount,
|
||||||
field: TradeInputField.size,
|
field: TradeInputField.size,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const onUSDCInput = ({ value, floatValue }: { value: string; floatValue?: number }) => {
|
const onUSDCInput = ({
|
||||||
dispatch(setTradeFormInputs({ usdAmountInput: value }));
|
floatValue,
|
||||||
const newUsdcAmount = MustBigNumber(floatValue).toFixed();
|
formattedValue,
|
||||||
|
}: {
|
||||||
|
floatValue?: number;
|
||||||
|
formattedValue: string;
|
||||||
|
}) => {
|
||||||
|
dispatch(setTradeFormInputs({ usdAmountInput: formattedValue }));
|
||||||
|
const newUsdcAmount = MustBigNumber(floatValue).toFixed(tickSizeDecimals || USD_DECIMALS);
|
||||||
|
|
||||||
abacusStateManager.setTradeValue({
|
abacusStateManager.setTradeValue({
|
||||||
value: value === '' || newUsdcAmount === 'NaN' ? null : newUsdcAmount,
|
value: formattedValue === '' || newUsdcAmount === 'NaN' ? null : newUsdcAmount,
|
||||||
field: TradeInputField.usdcSize,
|
field: TradeInputField.usdcSize,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -12,10 +12,11 @@ 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: 'withdrawal' | 'deposit';
|
type: TransferNotificationTypes;
|
||||||
};
|
};
|
||||||
|
|
||||||
type StyleProps = {
|
type StyleProps = {
|
||||||
@@ -46,11 +47,13 @@ export const TransferStatusSteps = ({ className, status, type }: ElementProps &
|
|||||||
{
|
{
|
||||||
label: stringGetter({
|
label: stringGetter({
|
||||||
key:
|
key:
|
||||||
type === 'deposit' ? STRING_KEYS.INITIATED_DEPOSIT : STRING_KEYS.INITIATED_WITHDRAWAL,
|
type === TransferNotificationTypes.Deposit
|
||||||
|
? STRING_KEYS.INITIATED_DEPOSIT
|
||||||
|
: STRING_KEYS.INITIATED_WITHDRAWAL,
|
||||||
}),
|
}),
|
||||||
step: TransferStatusStep.FromChain,
|
step: TransferStatusStep.FromChain,
|
||||||
link:
|
link:
|
||||||
type === 'deposit'
|
type === TransferNotificationTypes.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', ''))}`
|
||||||
@@ -63,14 +66,20 @@ export const TransferStatusSteps = ({ className, status, type }: ElementProps &
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: stringGetter({
|
label: stringGetter({
|
||||||
key: type === 'deposit' ? STRING_KEYS.DEPOSIT_TO_CHAIN : STRING_KEYS.WITHDRAW_TO_CHAIN,
|
key:
|
||||||
|
type === TransferNotificationTypes.Deposit
|
||||||
|
? STRING_KEYS.DEPOSIT_TO_CHAIN
|
||||||
|
: STRING_KEYS.WITHDRAW_TO_CHAIN,
|
||||||
params: {
|
params: {
|
||||||
CHAIN: type === 'deposit' ? 'dYdX' : status?.toChain?.chainData?.chainName,
|
CHAIN:
|
||||||
|
type === TransferNotificationTypes.Deposit
|
||||||
|
? 'dYdX'
|
||||||
|
: status?.toChain?.chainData?.chainName,
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
step: TransferStatusStep.ToChain,
|
step: TransferStatusStep.ToChain,
|
||||||
link:
|
link:
|
||||||
type === 'withdrawal'
|
type === TransferNotificationTypes.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 } from '@/constants/notifications';
|
import { TransferNotifcation, TransferNotificationTypes } 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: 'withdrawal' | 'deposit';
|
type: TransferNotificationTypes;
|
||||||
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 === 'deposit'
|
type === TransferNotificationTypes.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 === 'deposit'
|
type === TransferNotificationTypes.Deposit
|
||||||
? status?.squidTransactionStatus === 'success'
|
? status?.squidTransactionStatus === 'success'
|
||||||
? STRING_KEYS.DEPOSIT_COMPLETE
|
? STRING_KEYS.DEPOSIT_COMPLETE
|
||||||
: inProgressStatusString
|
: inProgressStatusString
|
||||||
|
|||||||
@@ -42,7 +42,11 @@ type StyleProps = {
|
|||||||
className?: string;
|
className?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
type RowData = OrderbookLine & { side: 'bid' | 'ask'; mine?: number };
|
type RowData = Pick<OrderbookLine, 'depth' | 'offset' | 'price' | 'size'> & {
|
||||||
|
side: 'bid' | 'ask';
|
||||||
|
mine?: number;
|
||||||
|
key: string;
|
||||||
|
};
|
||||||
|
|
||||||
const useCalculateOrderbookData = ({ maxRowsPerSide }: { maxRowsPerSide: number }) => {
|
const useCalculateOrderbookData = ({ maxRowsPerSide }: { maxRowsPerSide: number }) => {
|
||||||
const orderbook = useSelector(getCurrentMarketOrderbook, shallowEqual);
|
const orderbook = useSelector(getCurrentMarketOrderbook, shallowEqual);
|
||||||
@@ -53,8 +57,9 @@ const useCalculateOrderbookData = ({ maxRowsPerSide }: { maxRowsPerSide: number
|
|||||||
return useMemo(() => {
|
return useMemo(() => {
|
||||||
const asks = (orderbook?.asks?.toArray() ?? [])
|
const asks = (orderbook?.asks?.toArray() ?? [])
|
||||||
.map(
|
.map(
|
||||||
(row: OrderbookLine) =>
|
(row: OrderbookLine, idx: number) =>
|
||||||
({
|
({
|
||||||
|
key: `ask-${idx}`,
|
||||||
side: 'ask',
|
side: 'ask',
|
||||||
mine: openOrdersBySideAndPrice[OrderSide.SELL]?.[row.price]?.size,
|
mine: openOrdersBySideAndPrice[OrderSide.SELL]?.[row.price]?.size,
|
||||||
...row,
|
...row,
|
||||||
@@ -64,8 +69,9 @@ const useCalculateOrderbookData = ({ maxRowsPerSide }: { maxRowsPerSide: number
|
|||||||
|
|
||||||
const bids = (orderbook?.bids?.toArray() ?? [])
|
const bids = (orderbook?.bids?.toArray() ?? [])
|
||||||
.map(
|
.map(
|
||||||
(row: OrderbookLine) =>
|
(row: OrderbookLine, idx: number) =>
|
||||||
({
|
({
|
||||||
|
key: `bid-${idx}`,
|
||||||
side: 'bid',
|
side: 'bid',
|
||||||
mine: openOrdersBySideAndPrice[OrderSide.BUY]?.[row.price]?.size,
|
mine: openOrdersBySideAndPrice[OrderSide.BUY]?.[row.price]?.size,
|
||||||
...row,
|
...row,
|
||||||
@@ -97,15 +103,44 @@ const useCalculateOrderbookData = ({ maxRowsPerSide }: { maxRowsPerSide: number
|
|||||||
}
|
}
|
||||||
|
|
||||||
const spread =
|
const spread =
|
||||||
asks[0] && bids[0] ? MustBigNumber(asks[0]?.price ?? 0).minus(bids[0]?.price ?? 0) : null;
|
asks[0]?.price && bids[0]?.price ? MustBigNumber(asks[0].price).minus(bids[0].price) : null;
|
||||||
|
|
||||||
const spreadPercent = orderbook?.spreadPercent;
|
const spreadPercent = orderbook?.spreadPercent;
|
||||||
|
|
||||||
const histogramRange = Math.max(
|
const histogramRange = Math.max(
|
||||||
Number(bids[bids.length - 1]?.depth),
|
isNaN(Number(bids[bids.length - 1]?.depth)) ? 0 : Number(bids[bids.length - 1]?.depth),
|
||||||
Number(asks[asks.length - 1]?.depth)
|
isNaN(Number(asks[asks.length - 1]?.depth)) ? 0 : Number(asks[asks.length - 1]?.depth)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Ensure asks and bids are of length maxRowsPerSide by adding empty rows.
|
||||||
|
let idx = asks.length - 1;
|
||||||
|
while (asks.length < maxRowsPerSide) {
|
||||||
|
idx += 1;
|
||||||
|
|
||||||
|
asks.push({
|
||||||
|
key: `ask-${idx}`,
|
||||||
|
side: 'ask',
|
||||||
|
size: 0,
|
||||||
|
price: 0,
|
||||||
|
offset: 0,
|
||||||
|
depth: 0,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
idx = bids.length - 1;
|
||||||
|
while (bids.length < maxRowsPerSide) {
|
||||||
|
idx += 1;
|
||||||
|
|
||||||
|
bids.push({
|
||||||
|
key: `bid-${idx}`,
|
||||||
|
side: 'bid',
|
||||||
|
size: 0,
|
||||||
|
price: 0,
|
||||||
|
offset: 0,
|
||||||
|
depth: 0,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return { asks, bids, spread, spreadPercent, histogramRange, hasOrderbook: !!orderbook };
|
return { asks, bids, spread, spreadPercent, histogramRange, hasOrderbook: !!orderbook };
|
||||||
}, [orderbook, openOrdersBySideAndPrice]);
|
}, [orderbook, openOrdersBySideAndPrice]);
|
||||||
};
|
};
|
||||||
@@ -142,31 +177,33 @@ const OrderbookTable = ({
|
|||||||
getCellValue: (row: RowData) => row.size,
|
getCellValue: (row: RowData) => row.size,
|
||||||
label: stringGetter({ key: STRING_KEYS.ORDERBOOK_ORDER_SIZE }),
|
label: stringGetter({ key: STRING_KEYS.ORDERBOOK_ORDER_SIZE }),
|
||||||
tag: symbol,
|
tag: symbol,
|
||||||
renderCell: (row: RowData) => (
|
renderCell: (row: RowData) =>
|
||||||
<Styled.HistogramOutput
|
row.size > 0 && (
|
||||||
highlightText
|
<Styled.HistogramOutput
|
||||||
type={OutputType.Asset}
|
highlightText
|
||||||
value={row.size}
|
type={OutputType.Asset}
|
||||||
fractionDigits={stepSizeDecimals}
|
value={row.size}
|
||||||
histogramSide={histogramSide === 'left' && 'left'}
|
fractionDigits={stepSizeDecimals}
|
||||||
useGrouping={false}
|
histogramSide={histogramSide === 'left' && 'left'}
|
||||||
/>
|
useGrouping={false}
|
||||||
),
|
/>
|
||||||
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
columnKey: 'price',
|
columnKey: 'price',
|
||||||
getCellValue: (row: RowData) => row.price,
|
getCellValue: (row: RowData) => row.price,
|
||||||
label: stringGetter({ key: STRING_KEYS.PRICE }),
|
label: stringGetter({ key: STRING_KEYS.PRICE }),
|
||||||
tag: 'USD',
|
tag: 'USD',
|
||||||
renderCell: (row: RowData) => (
|
renderCell: (row: RowData) =>
|
||||||
<OrderbookTradesOutput
|
row.price > 0 && (
|
||||||
highlightText
|
<OrderbookTradesOutput
|
||||||
type={OutputType.Number}
|
highlightText
|
||||||
value={row.price}
|
type={OutputType.Number}
|
||||||
fractionDigits={tickSizeDecimals}
|
value={row.price}
|
||||||
useGrouping={false}
|
fractionDigits={tickSizeDecimals}
|
||||||
/>
|
useGrouping={false}
|
||||||
),
|
/>
|
||||||
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
columnKey: 'subaccount-orders',
|
columnKey: 'subaccount-orders',
|
||||||
@@ -194,12 +231,13 @@ const OrderbookTable = ({
|
|||||||
label="Orderbook"
|
label="Orderbook"
|
||||||
data={data}
|
data={data}
|
||||||
columns={columns}
|
columns={columns}
|
||||||
getRowKey={(row: RowData) => `${row.side}-${row.price}`}
|
getRowKey={(row: RowData) => row.key}
|
||||||
getRowAttributes={(row: RowData) => ({
|
getRowAttributes={(row: RowData) => ({
|
||||||
'data-side': row.side,
|
'data-side': row.side,
|
||||||
style: {
|
style: {
|
||||||
'--histogram-bucket-size': row.size,
|
'--histogram-bucket-size': row.size,
|
||||||
'--histogram-bucket-depth': row.depth,
|
'--histogram-bucket-depth': row.depth,
|
||||||
|
'--tr-pointerEvents': row.price ? 'auto' : 'none',
|
||||||
},
|
},
|
||||||
})}
|
})}
|
||||||
onRowAction={onRowAction}
|
onRowAction={onRowAction}
|
||||||
@@ -238,19 +276,10 @@ export const Orderbook = ({
|
|||||||
maxRowsPerSide,
|
maxRowsPerSide,
|
||||||
});
|
});
|
||||||
|
|
||||||
const [showRowsPerSide, setShowRowsPerSide] = useState(0);
|
|
||||||
|
|
||||||
// Make rows visible one by one so avoid jumps in initial scroll position
|
|
||||||
useEffect(() => {
|
|
||||||
if (showRowsPerSide < maxRowsPerSide) {
|
|
||||||
setShowRowsPerSide((showRows) => showRows + 1);
|
|
||||||
}
|
|
||||||
}, [showRowsPerSide]);
|
|
||||||
|
|
||||||
const data = useMemo(
|
const data = useMemo(
|
||||||
() =>
|
() =>
|
||||||
[
|
[
|
||||||
...bids.slice(0, showRowsPerSide).reverse(),
|
...bids.reverse(),
|
||||||
{
|
{
|
||||||
key: 'spread',
|
key: 'spread',
|
||||||
slotCustomRow: (props) => (
|
slotCustomRow: (props) => (
|
||||||
@@ -267,9 +296,9 @@ export const Orderbook = ({
|
|||||||
</Styled.SpreadTableRow>
|
</Styled.SpreadTableRow>
|
||||||
),
|
),
|
||||||
} as CustomRowConfig,
|
} as CustomRowConfig,
|
||||||
...asks.slice(0, showRowsPerSide),
|
...asks,
|
||||||
].reverse(),
|
].reverse(),
|
||||||
[asks, bids, spread, spreadPercent, showRowsPerSide, isTablet]
|
[asks, bids, spread, spreadPercent, isTablet]
|
||||||
);
|
);
|
||||||
|
|
||||||
const onRowAction = useCallback(
|
const onRowAction = useCallback(
|
||||||
@@ -325,7 +354,7 @@ export const Orderbook = ({
|
|||||||
</Styled.Header>
|
</Styled.Header>
|
||||||
<Styled.SplitOrderbook>
|
<Styled.SplitOrderbook>
|
||||||
<OrderbookTable data={asks} histogramSide="right" {...orderbookTableProps} />
|
<OrderbookTable data={asks} histogramSide="right" {...orderbookTableProps} />
|
||||||
<OrderbookTable data={bids} histogramSide="left" {...orderbookTableProps} />
|
<OrderbookTable data={bids.reverse()} histogramSide="left" {...orderbookTableProps} />
|
||||||
</Styled.SplitOrderbook>
|
</Styled.SplitOrderbook>
|
||||||
</Styled.HorizontalLayout>
|
</Styled.HorizontalLayout>
|
||||||
);
|
);
|
||||||
@@ -495,6 +524,7 @@ Styled.OrderbookTable = styled(OrderbookTradesTable)<StyleProps>`
|
|||||||
|
|
||||||
tr {
|
tr {
|
||||||
--histogram-bucket-depth: 0;
|
--histogram-bucket-depth: 0;
|
||||||
|
pointer-events: var(--tr-pointerEvents);
|
||||||
|
|
||||||
&[data-side='bid'] {
|
&[data-side='bid'] {
|
||||||
--accent-color: var(--color-positive);
|
--accent-color: var(--color-positive);
|
||||||
|
|||||||
@@ -230,14 +230,7 @@ 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: ({
|
renderCell: ({ asset, createdAtMilliseconds, size, status, totalFilled, resources }) => {
|
||||||
asset,
|
|
||||||
createdAtMilliseconds,
|
|
||||||
size,
|
|
||||||
status,
|
|
||||||
totalFilled,
|
|
||||||
resources,
|
|
||||||
}) => {
|
|
||||||
const { statusIconColor, statusStringKey } = getStatusIconInfo({
|
const { statusIconColor, statusStringKey } = getStatusIconInfo({
|
||||||
status,
|
status,
|
||||||
totalFilled,
|
totalFilled,
|
||||||
@@ -345,9 +338,7 @@ export const OrdersTable = ({
|
|||||||
if (hasUnseenOrderUpdates) dispatch(viewedOrders());
|
if (hasUnseenOrderUpdates) dispatch(viewedOrders());
|
||||||
}, [hasUnseenOrderUpdates]);
|
}, [hasUnseenOrderUpdates]);
|
||||||
|
|
||||||
const symbol = currentMarket
|
const symbol = currentMarket ? allAssets[allPerpetualMarkets[currentMarket]?.assetId]?.id : null;
|
||||||
? allAssets[allPerpetualMarkets[currentMarket]?.assetId]?.symbol
|
|
||||||
: null;
|
|
||||||
|
|
||||||
const ordersData = orders.map((order: SubaccountOrder) =>
|
const ordersData = orders.map((order: SubaccountOrder) =>
|
||||||
getHydratedTradingData({
|
getHydratedTradingData({
|
||||||
|
|||||||
Reference in New Issue
Block a user