Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db3e7331b8 | ||
|
|
9979bc8a16 | ||
|
|
a958a59ea2 | ||
|
|
2bf9e66da5 | ||
|
|
2980144e40 | ||
|
|
5387fe8632 | ||
|
|
1132ea3bbd | ||
|
|
9188e08a4f | ||
|
|
941ef7f9dd | ||
|
|
b1ffa2e219 | ||
|
|
91ea68dc53 | ||
|
|
cf79528d05 | ||
|
|
ef81f9da57 | ||
|
|
60d59cd211 |
+3
-3
@@ -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.0.30",
|
"@dydxprotocol/v4-abacus": "^1.1.4",
|
||||||
"@dydxprotocol/v4-client-js": "^1.0.0",
|
"@dydxprotocol/v4-client-js": "^1.0.6",
|
||||||
"@dydxprotocol/v4-localization": "^1.0.8",
|
"@dydxprotocol/v4-localization": "^1.0.17",
|
||||||
"@ethersproject/providers": "^5.7.2",
|
"@ethersproject/providers": "^5.7.2",
|
||||||
"@js-joda/core": "^5.5.3",
|
"@js-joda/core": "^5.5.3",
|
||||||
"@radix-ui/react-checkbox": "^1.0.4",
|
"@radix-ui/react-checkbox": "^1.0.4",
|
||||||
|
|||||||
Generated
+16
-16
@@ -1,5 +1,9 @@
|
|||||||
lockfileVersion: '6.0'
|
lockfileVersion: '6.0'
|
||||||
|
|
||||||
|
settings:
|
||||||
|
autoInstallPeers: true
|
||||||
|
excludeLinksFromLockfile: false
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
'@0xsquid/sdk':
|
'@0xsquid/sdk':
|
||||||
specifier: ^1.10.0
|
specifier: ^1.10.0
|
||||||
@@ -23,14 +27,14 @@ dependencies:
|
|||||||
specifier: ^0.31.0
|
specifier: ^0.31.0
|
||||||
version: 0.31.0
|
version: 0.31.0
|
||||||
'@dydxprotocol/v4-abacus':
|
'@dydxprotocol/v4-abacus':
|
||||||
specifier: ^1.0.30
|
specifier: ^1.1.4
|
||||||
version: 1.0.30
|
version: 1.1.4
|
||||||
'@dydxprotocol/v4-client-js':
|
'@dydxprotocol/v4-client-js':
|
||||||
specifier: ^1.0.0
|
specifier: ^1.0.6
|
||||||
version: 1.0.0
|
version: 1.0.6
|
||||||
'@dydxprotocol/v4-localization':
|
'@dydxprotocol/v4-localization':
|
||||||
specifier: ^1.0.8
|
specifier: ^1.0.17
|
||||||
version: 1.0.8
|
version: 1.0.17
|
||||||
'@ethersproject/providers':
|
'@ethersproject/providers':
|
||||||
specifier: ^5.7.2
|
specifier: ^5.7.2
|
||||||
version: 5.7.2
|
version: 5.7.2
|
||||||
@@ -984,12 +988,12 @@ packages:
|
|||||||
resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
|
resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/@dydxprotocol/v4-abacus@1.0.30:
|
/@dydxprotocol/v4-abacus@1.1.4:
|
||||||
resolution: {integrity: sha512-zzJzNzMR3Stwv1Mu0XGUNlyo1V/ywo3yi3QSzE4mzUtXB+p5Shj5hRQCcwhHcNjLgp6a+T0BcRjBPa4QMETmwg==}
|
resolution: {integrity: sha512-gml6qheFsPShE9p3FmzFeStYM9ZVhgMq0K0+y12V7pObnMKbumkOIISgCzc47idkah0GMNhiqwi9faD5SjOy/A==}
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
/@dydxprotocol/v4-client-js@1.0.0:
|
/@dydxprotocol/v4-client-js@1.0.6:
|
||||||
resolution: {integrity: sha512-ehfHO+zQy795TcJRwtiawadFHZyh4HnpJNP26hCGsIjLE5q6LLHweQHpK/1N/sXU1PBOuQwc7iaJnFop6gYauQ==}
|
resolution: {integrity: sha512-xiWH+kbix+zhI6EsAnd+NDvkjBgxWtGwQmvpd0PjljWNYSFgUtNe5M+piDdRbl2nhy6YWbxAGTwwS3K/ih5qSw==}
|
||||||
dependencies:
|
dependencies:
|
||||||
'@cosmjs/amino': 0.30.1
|
'@cosmjs/amino': 0.30.1
|
||||||
'@cosmjs/encoding': 0.31.1
|
'@cosmjs/encoding': 0.31.1
|
||||||
@@ -1016,8 +1020,8 @@ packages:
|
|||||||
- utf-8-validate
|
- utf-8-validate
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
/@dydxprotocol/v4-localization@1.0.8:
|
/@dydxprotocol/v4-localization@1.0.17:
|
||||||
resolution: {integrity: sha512-h5CSkWHPct1BWmiwJBeX9vOauXSwlx8RK9ryOsaCipJWS4AnBni07p3/jj3L/HgmU1BZXwfcr2hBouXVxxZS8A==}
|
resolution: {integrity: sha512-fybNpi1ono1IdwFQJTszsHbHmGti2BdhTo1nz9KOmKh3tmXdhWObKb64Ve6/6Fjk6h/9+DeZ5ZG4UbYyYMyhCA==}
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
/@dydxprotocol/v4-proto@0.4.1:
|
/@dydxprotocol/v4-proto@0.4.1:
|
||||||
@@ -14136,7 +14140,3 @@ packages:
|
|||||||
/zwitch@2.0.4:
|
/zwitch@2.0.4:
|
||||||
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
|
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
settings:
|
|
||||||
autoInstallPeers: true
|
|
||||||
excludeLinksFromLockfile: false
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"chainId": "42161",
|
"chainId": "42161",
|
||||||
"tokenAddress": "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
|
"tokenAddress": "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
|
||||||
"name": "Arbitrum"
|
"name": "Arbitrum"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"chainId": "8453",
|
"chainId": "8453",
|
||||||
"tokenAddress": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
|
"tokenAddress": "0x66627F389ae46D881773B7131139b2411980E09E",
|
||||||
"name": "Base"
|
"name": "Base"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"chainId": "10",
|
"chainId": "10",
|
||||||
"tokenAddress": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
|
"tokenAddress": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607",
|
||||||
"name": "OP Mainnet"
|
"name": "OP Mainnet"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
+38
-22
@@ -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,6 +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",
|
||||||
"faucet": "https://faucet.v4dev.dydx.exchange"
|
"faucet": "https://faucet.v4dev.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -115,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": {
|
||||||
@@ -143,7 +144,8 @@
|
|||||||
"validators": [
|
"validators": [
|
||||||
"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"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -187,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": {
|
||||||
@@ -215,7 +217,8 @@
|
|||||||
"validators": [
|
"validators": [
|
||||||
"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"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -259,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": {
|
||||||
@@ -287,7 +290,8 @@
|
|||||||
"validators": [
|
"validators": [
|
||||||
"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"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -331,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": {
|
||||||
@@ -360,7 +364,8 @@
|
|||||||
"validators": [
|
"validators": [
|
||||||
"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"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -405,7 +410,8 @@
|
|||||||
"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",
|
||||||
"isMainNet": false,
|
"isMainNet": false,
|
||||||
"tokens": {
|
"tokens": {
|
||||||
"chain": {
|
"chain": {
|
||||||
@@ -433,7 +439,8 @@
|
|||||||
"validators": [
|
"validators": [
|
||||||
"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"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -476,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": {
|
||||||
@@ -505,7 +512,8 @@
|
|||||||
"validators": [
|
"validators": [
|
||||||
"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"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "https://dydx.exchange/v4-terms",
|
"tos": "https://dydx.exchange/v4-terms",
|
||||||
@@ -550,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": {
|
||||||
@@ -583,6 +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",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -628,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": {
|
||||||
@@ -657,6 +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",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -703,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": {
|
||||||
@@ -732,6 +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",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -778,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": {
|
||||||
@@ -807,6 +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",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -853,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": {
|
||||||
@@ -882,6 +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",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -928,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": {
|
||||||
@@ -957,6 +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",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -994,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": {
|
||||||
@@ -1023,6 +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",
|
||||||
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
"faucet": "https://faucet.v4testnet.dydx.exchange"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
@@ -1069,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": {
|
||||||
@@ -1099,7 +1114,8 @@
|
|||||||
"[Validator endpoint 1",
|
"[Validator endpoint 1",
|
||||||
"[Validator endpoint n]"
|
"[Validator endpoint n]"
|
||||||
],
|
],
|
||||||
"0xsquid": "[0xSquid endpoint for mainnet]"
|
"0xsquid": "[0xSquid endpoint for mainnet]",
|
||||||
|
"nobleValidator": "[noble validator endpoint for mainnet]"
|
||||||
},
|
},
|
||||||
"links": {
|
"links": {
|
||||||
"tos": "[HTTP link to TOS]",
|
"tos": "[HTTP link to TOS]",
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 300 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 9.6 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 481 KiB |
@@ -22,8 +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 { SquidProvider } from '@/hooks/useSquid';
|
|
||||||
import { TestFlagsProvider } from '@/hooks/useTestFlags';
|
|
||||||
|
|
||||||
import { GuardedMobileRoute } from '@/components/GuardedMobileRoute';
|
import { GuardedMobileRoute } from '@/components/GuardedMobileRoute';
|
||||||
|
|
||||||
@@ -124,13 +122,11 @@ 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),
|
||||||
wrapProvider(AccountsProvider),
|
wrapProvider(AccountsProvider),
|
||||||
wrapProvider(SubaccountProvider),
|
wrapProvider(SubaccountProvider),
|
||||||
wrapProvider(SquidProvider),
|
|
||||||
wrapProvider(LocalNotificationsProvider),
|
wrapProvider(LocalNotificationsProvider),
|
||||||
wrapProvider(NotificationsProvider),
|
wrapProvider(NotificationsProvider),
|
||||||
wrapProvider(DialogAreaProvider),
|
wrapProvider(DialogAreaProvider),
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ export const Button = forwardRef<HTMLButtonElement | HTMLAnchorElement, ButtonPr
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledBaseButton
|
<StyledBaseButton
|
||||||
disabled={state[ButtonState.Disabled]}
|
disabled={state[ButtonState.Disabled] || state[ButtonState.Loading]}
|
||||||
{...{ ref, action, size, shape, state, ...otherProps }}
|
{...{ ref, action, size, shape, state, ...otherProps }}
|
||||||
>
|
>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ import {
|
|||||||
HelpCircleIcon,
|
HelpCircleIcon,
|
||||||
HideIcon,
|
HideIcon,
|
||||||
HistoryIcon,
|
HistoryIcon,
|
||||||
|
LeaderboardIcon,
|
||||||
LinkOutIcon,
|
LinkOutIcon,
|
||||||
LockIcon,
|
LockIcon,
|
||||||
LogoShortIcon,
|
LogoShortIcon,
|
||||||
@@ -111,6 +112,7 @@ export enum IconName {
|
|||||||
HelpCircle = 'HelpCircle',
|
HelpCircle = 'HelpCircle',
|
||||||
Hide = 'Hide',
|
Hide = 'Hide',
|
||||||
History = 'History',
|
History = 'History',
|
||||||
|
Leaderboard = 'Leaderboard',
|
||||||
LinkOut = 'LinkOut',
|
LinkOut = 'LinkOut',
|
||||||
Lock = 'Lock',
|
Lock = 'Lock',
|
||||||
LogoShort = 'LogoShort',
|
LogoShort = 'LogoShort',
|
||||||
@@ -185,6 +187,7 @@ const icons = {
|
|||||||
[IconName.HelpCircle]: HelpCircleIcon,
|
[IconName.HelpCircle]: HelpCircleIcon,
|
||||||
[IconName.Hide]: HideIcon,
|
[IconName.Hide]: HideIcon,
|
||||||
[IconName.History]: HistoryIcon,
|
[IconName.History]: HistoryIcon,
|
||||||
|
[IconName.Leaderboard]: LeaderboardIcon,
|
||||||
[IconName.LinkOut]: LinkOutIcon,
|
[IconName.LinkOut]: LinkOutIcon,
|
||||||
[IconName.Lock]: LockIcon,
|
[IconName.Lock]: LockIcon,
|
||||||
[IconName.LogoShort]: LogoShortIcon,
|
[IconName.LogoShort]: LogoShortIcon,
|
||||||
|
|||||||
+30
-20
@@ -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}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ export enum DialogTypes {
|
|||||||
Deposit = 'Deposit',
|
Deposit = 'Deposit',
|
||||||
DisconnectWallet = 'DisconnectWallet',
|
DisconnectWallet = 'DisconnectWallet',
|
||||||
ExchangeOffline = 'ExchangeOffline',
|
ExchangeOffline = 'ExchangeOffline',
|
||||||
|
ExternalLink = 'ExternalLink',
|
||||||
FillDetails = 'FillDetails',
|
FillDetails = 'FillDetails',
|
||||||
Help = 'Help',
|
Help = 'Help',
|
||||||
ExternalNavKeplr = 'ExternalNavKeplr',
|
ExternalNavKeplr = 'ExternalNavKeplr',
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ export enum LocalStorageKey {
|
|||||||
SelectedTheme = 'dydx.SelectedTheme',
|
SelectedTheme = 'dydx.SelectedTheme',
|
||||||
SelectedTradeLayout = 'dydx.SelectedTradeLayout',
|
SelectedTradeLayout = 'dydx.SelectedTradeLayout',
|
||||||
TradingViewChartConfig = 'dydx.TradingViewChartConfig',
|
TradingViewChartConfig = 'dydx.TradingViewChartConfig',
|
||||||
|
HasSeenLaunchIncentives = 'dydx.HasSeenLaunchIncentives',
|
||||||
}
|
}
|
||||||
|
|
||||||
export const LOCAL_STORAGE_VERSIONS = {
|
export const LOCAL_STORAGE_VERSIONS = {
|
||||||
|
|||||||
@@ -36,4 +36,29 @@ export const MARKETS_TO_DISPLAY = [
|
|||||||
'ATOM-USD',
|
'ATOM-USD',
|
||||||
'AVAX-USD',
|
'AVAX-USD',
|
||||||
'APE-USD',
|
'APE-USD',
|
||||||
|
'XRP-USD',
|
||||||
|
'UNI-USD',
|
||||||
|
'ADA-USD',
|
||||||
|
'TRX-USD',
|
||||||
|
'OP-USD',
|
||||||
|
'MKR-USD',
|
||||||
|
'DOGE-USD',
|
||||||
|
'SHIB-USD',
|
||||||
|
'COMP-USD',
|
||||||
|
'LDO-USD',
|
||||||
|
'NEAR-USD',
|
||||||
|
'APT-USD',
|
||||||
|
'SUI-USD',
|
||||||
|
'DOT-USD',
|
||||||
|
'ETC-USD',
|
||||||
|
'ARB-USD',
|
||||||
|
'CRV-USD',
|
||||||
|
'BLUR-USD',
|
||||||
|
'FIL-USD',
|
||||||
|
'XLM-USD',
|
||||||
|
'PEPE-USD',
|
||||||
|
'WLD-USD',
|
||||||
|
'SEI-USD',
|
||||||
|
'LTC-USD',
|
||||||
|
'BCH-USD',
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -129,6 +129,7 @@ export type TransferNotifcation = {
|
|||||||
fromChainId?: string;
|
fromChainId?: string;
|
||||||
toAmount?: number;
|
toAmount?: number;
|
||||||
triggeredAt?: number;
|
triggeredAt?: number;
|
||||||
|
isCctp?: boolean;
|
||||||
errorCount?: number;
|
errorCount?: number;
|
||||||
status?: StatusResponse;
|
status?: StatusResponse;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { useCallback, useContext, createContext, useEffect, useState, useMemo }
|
|||||||
|
|
||||||
import { useDispatch } from 'react-redux';
|
import { useDispatch } from 'react-redux';
|
||||||
import { AES, enc } from 'crypto-js';
|
import { AES, enc } from 'crypto-js';
|
||||||
import { LocalWallet, type Subaccount } from '@dydxprotocol/v4-client-js';
|
import { NOBLE_BECH32_PREFIX, LocalWallet, type Subaccount } from '@dydxprotocol/v4-client-js';
|
||||||
|
|
||||||
import { OnboardingGuard, OnboardingState, type EvmDerivedAddresses } from '@/constants/account';
|
import { OnboardingGuard, OnboardingState, type EvmDerivedAddresses } from '@/constants/account';
|
||||||
import { DialogTypes } from '@/constants/dialogs';
|
import { DialogTypes } from '@/constants/dialogs';
|
||||||
@@ -219,6 +219,16 @@ const useAccountsContext = () => {
|
|||||||
else abacusStateManager.attemptDisconnectAccount();
|
else abacusStateManager.attemptDisconnectAccount();
|
||||||
}, [localDydxWallet]);
|
}, [localDydxWallet]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const setNobleWallet = async () => {
|
||||||
|
if (hdKey?.mnemonic) {
|
||||||
|
const nobleWallet = await LocalWallet.fromMnemonic(hdKey.mnemonic, NOBLE_BECH32_PREFIX);
|
||||||
|
abacusStateManager.setNobleWallet(nobleWallet);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
setNobleWallet();
|
||||||
|
}, [hdKey?.mnemonic]);
|
||||||
|
|
||||||
// clear subaccounts when no dydxAddress is set
|
// clear subaccounts when no dydxAddress is set
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
(async () => {
|
(async () => {
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import { createContext, useContext, useCallback, useEffect, useMemo } from 'react';
|
import { createContext, useContext, useCallback, useEffect, useMemo } from 'react';
|
||||||
import { useQuery } from 'react-query';
|
import { useQuery } from 'react-query';
|
||||||
import type { StatusResponse } from '@0xsquid/sdk';
|
|
||||||
|
|
||||||
import { LOCAL_STORAGE_VERSIONS, LocalStorageKey } from '@/constants/localStorage';
|
import { LOCAL_STORAGE_VERSIONS, LocalStorageKey } from '@/constants/localStorage';
|
||||||
import { type TransferNotifcation } from '@/constants/notifications';
|
import { type TransferNotifcation } from '@/constants/notifications';
|
||||||
import { useAccounts } from '@/hooks/useAccounts';
|
import { useAccounts } from '@/hooks/useAccounts';
|
||||||
import { STATUS_ERROR_GRACE_PERIOD, useSquid } from '@/hooks/useSquid';
|
|
||||||
|
import { fetchSquidStatus, STATUS_ERROR_GRACE_PERIOD } from '@/lib/squid';
|
||||||
|
|
||||||
import { useLocalStorage } from './useLocalStorage';
|
import { useLocalStorage } from './useLocalStorage';
|
||||||
|
|
||||||
@@ -68,8 +68,6 @@ const useLocalNotificationsContext = () => {
|
|||||||
[transferNotifications]
|
[transferNotifications]
|
||||||
);
|
);
|
||||||
|
|
||||||
const squid = useSquid();
|
|
||||||
|
|
||||||
useQuery({
|
useQuery({
|
||||||
queryKey: 'getTransactionStatus',
|
queryKey: 'getTransactionStatus',
|
||||||
queryFn: async () => {
|
queryFn: async () => {
|
||||||
@@ -81,23 +79,27 @@ const useLocalNotificationsContext = () => {
|
|||||||
toChainId,
|
toChainId,
|
||||||
fromChainId,
|
fromChainId,
|
||||||
triggeredAt,
|
triggeredAt,
|
||||||
|
isCctp,
|
||||||
errorCount,
|
errorCount,
|
||||||
status: currentStatus,
|
status: currentStatus,
|
||||||
} = transferNotification;
|
} = transferNotification;
|
||||||
|
|
||||||
|
// @ts-ignore status.errors is not in the type definition but can be returned
|
||||||
|
// also error can some time come back as an empty object so we need to ignore for that
|
||||||
|
const hasErrors = !!currentStatus?.errors ||
|
||||||
|
(currentStatus?.error && Object.keys(currentStatus.error).length !== 0);
|
||||||
|
|
||||||
if (
|
if (
|
||||||
// @ts-ignore status.errors is not in the type definition but can be returned
|
!hasErrors &&
|
||||||
!currentStatus?.errors &&
|
|
||||||
!currentStatus?.error &&
|
|
||||||
(!currentStatus?.squidTransactionStatus ||
|
(!currentStatus?.squidTransactionStatus ||
|
||||||
currentStatus?.squidTransactionStatus === 'ongoing')
|
currentStatus?.squidTransactionStatus === 'ongoing')
|
||||||
) {
|
) {
|
||||||
try {
|
try {
|
||||||
const status = await squid?.getStatus({
|
const status = await fetchSquidStatus({
|
||||||
transactionId: txHash,
|
transactionId: txHash,
|
||||||
toChainId,
|
toChainId,
|
||||||
fromChainId,
|
fromChainId,
|
||||||
});
|
}, isCctp);
|
||||||
|
|
||||||
if (status) {
|
if (status) {
|
||||||
transferNotification.status = status;
|
transferNotification.status = status;
|
||||||
|
|||||||
@@ -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';
|
||||||
|
|||||||
@@ -220,7 +220,7 @@ export const notificationTypes: NotificationTypeConfig[] = [
|
|||||||
body: stringGetter({
|
body: stringGetter({
|
||||||
key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.BODY',
|
key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.BODY',
|
||||||
params: {
|
params: {
|
||||||
BLOGPOST: (
|
DOS_BLOGPOST: (
|
||||||
<$Link
|
<$Link
|
||||||
href="https://www.dydxopsdao.com/blog/deep-dive-full-trading"
|
href="https://www.dydxopsdao.com/blog/deep-dive-full-trading"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
@@ -229,8 +229,7 @@ export const notificationTypes: NotificationTypeConfig[] = [
|
|||||||
{stringGetter({ key: STRING_KEYS.HERE })}
|
{stringGetter({ key: STRING_KEYS.HERE })}
|
||||||
</$Link>
|
</$Link>
|
||||||
),
|
),
|
||||||
// todo: update localization to flip the two
|
TRADING_BLOGPOST: (
|
||||||
DOS_BLOGPOST: (
|
|
||||||
<$Link
|
<$Link
|
||||||
href="https://dydx.exchange/blog/v4-full-trading"
|
href="https://dydx.exchange/blog/v4-full-trading"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
import { createContext, useContext, useEffect, useMemo, useState } from 'react';
|
|
||||||
import { useSelector } from 'react-redux';
|
|
||||||
import { Squid } from '@0xsquid/sdk';
|
|
||||||
|
|
||||||
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
|
|
||||||
|
|
||||||
import { getSelectedNetwork } from '@/state/appSelectors';
|
|
||||||
|
|
||||||
export const NATIVE_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
|
|
||||||
|
|
||||||
export const STATUS_ERROR_GRACE_PERIOD = 300_000;
|
|
||||||
|
|
||||||
const useSquidContext = () => {
|
|
||||||
const selectedNetwork = useSelector(getSelectedNetwork);
|
|
||||||
const [_, setInitialized] = useState(false);
|
|
||||||
|
|
||||||
const initializeClient = async () => {
|
|
||||||
setInitialized(false);
|
|
||||||
if (!squid) return;
|
|
||||||
await squid.init();
|
|
||||||
setInitialized(true);
|
|
||||||
};
|
|
||||||
|
|
||||||
const squid = useMemo(
|
|
||||||
() =>
|
|
||||||
new Squid({
|
|
||||||
baseUrl: ENVIRONMENT_CONFIG_MAP[selectedNetwork]?.endpoints['0xsquid'],
|
|
||||||
integratorId: ENVIRONMENT_CONFIG_MAP[selectedNetwork]?.squidIntegratorId,
|
|
||||||
}),
|
|
||||||
[selectedNetwork]
|
|
||||||
);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (squid) {
|
|
||||||
initializeClient();
|
|
||||||
}
|
|
||||||
}, [squid]);
|
|
||||||
|
|
||||||
return squid;
|
|
||||||
};
|
|
||||||
|
|
||||||
type SquidContextType = ReturnType<typeof useSquidContext>;
|
|
||||||
const SquidContext = createContext<SquidContextType | undefined>(undefined);
|
|
||||||
SquidContext.displayName = '0xSquid';
|
|
||||||
|
|
||||||
export const SquidProvider = ({ ...props }) => (
|
|
||||||
<SquidContext.Provider value={useSquidContext()} {...props} />
|
|
||||||
);
|
|
||||||
|
|
||||||
export const useSquid = () => useContext(SquidContext);
|
|
||||||
@@ -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]);
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ export { default as GiftboxIcon } from './giftbox.svg';
|
|||||||
export { default as HelpCircleIcon } from './help-circle.svg';
|
export { default as HelpCircleIcon } from './help-circle.svg';
|
||||||
export { default as HideIcon } from './hide.svg';
|
export { default as HideIcon } from './hide.svg';
|
||||||
export { default as HistoryIcon } from './history.svg';
|
export { default as HistoryIcon } from './history.svg';
|
||||||
|
export { default as LeaderboardIcon } from './leaderboard.svg';
|
||||||
export { default as LinkOutIcon } from './link-out.svg';
|
export { default as LinkOutIcon } from './link-out.svg';
|
||||||
export { default as LockIcon } from './lock.svg';
|
export { default as LockIcon } from './lock.svg';
|
||||||
export { default as LogoShortIcon } from './logo-short';
|
export { default as LogoShortIcon } from './logo-short';
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<svg width="13" height="14" viewBox="0 0 13 14" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M0.0996094 2.60156C0.0996094 2.07113 0.310323 1.56242 0.685396 1.18735C1.06047 0.812276 1.56918 0.601563 2.09961 0.601562H10.8996C11.43 0.601563 11.9387 0.812276 12.3138 1.18735C12.6889 1.56242 12.8996 2.07113 12.8996 2.60156C12.8996 3.132 12.6889 3.6407 12.3138 4.01578C11.9387 4.39085 11.43 4.60156 10.8996 4.60156H2.09961C1.56918 4.60156 1.06047 4.39085 0.685396 4.01578C0.310323 3.6407 0.0996094 3.132 0.0996094 2.60156ZM0.699609 6.26796C0.540479 6.26796 0.387867 6.33118 0.275345 6.4437C0.162823 6.55622 0.0996094 6.70883 0.0996094 6.86796C0.0996094 7.02709 0.162823 7.1797 0.275345 7.29223C0.387867 7.40475 0.540479 7.46796 0.699609 7.46796H12.2996C12.4587 7.46796 12.6114 7.40475 12.7239 7.29223C12.8364 7.1797 12.8996 7.02709 12.8996 6.86796C12.8996 6.70883 12.8364 6.55622 12.7239 6.4437C12.6114 6.33118 12.4587 6.26796 12.2996 6.26796H0.699609ZM0.699609 9.13196C0.540479 9.13196 0.387867 9.19518 0.275345 9.3077C0.162823 9.42022 0.0996094 9.57283 0.0996094 9.73196C0.0996094 9.89109 0.162823 10.0437 0.275345 10.1562C0.387867 10.2687 0.540479 10.332 0.699609 10.332H12.2996C12.4587 10.332 12.6114 10.2687 12.7239 10.1562C12.8364 10.0437 12.8996 9.89109 12.8996 9.73196C12.8996 9.57283 12.8364 9.42022 12.7239 9.3077C12.6114 9.19518 12.4587 9.13196 12.2996 9.13196H0.699609ZM0.699609 12.0016C0.540479 12.0016 0.387867 12.0648 0.275345 12.1773C0.162823 12.2898 0.0996094 12.4424 0.0996094 12.6016C0.0996094 12.7607 0.162823 12.9133 0.275345 13.0258C0.387867 13.1383 0.540479 13.2016 0.699609 13.2016H12.2996C12.4587 13.2016 12.6114 13.1383 12.7239 13.0258C12.8364 12.9133 12.8996 12.7607 12.8996 12.6016C12.8996 12.4424 12.8364 12.2898 12.7239 12.1773C12.6114 12.0648 12.4587 12.0016 12.2996 12.0016H0.699609Z" fill="currentColor"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.8 KiB |
@@ -11,6 +11,7 @@ import { DepositDialog } from '@/views/dialogs/DepositDialog';
|
|||||||
import { DisconnectDialog } from '@/views/dialogs/DisconnectDialog';
|
import { DisconnectDialog } from '@/views/dialogs/DisconnectDialog';
|
||||||
import { ExchangeOfflineDialog } from '@/views/dialogs/ExchangeOfflineDialog';
|
import { ExchangeOfflineDialog } from '@/views/dialogs/ExchangeOfflineDialog';
|
||||||
import { HelpDialog } from '@/views/dialogs/HelpDialog';
|
import { HelpDialog } from '@/views/dialogs/HelpDialog';
|
||||||
|
import { ExternalLinkDialog } from '@/views/dialogs/ExternalLinkDialog';
|
||||||
import { ExternalNavKeplrDialog } from '@/views/dialogs/ExternalNavKeplrDialog';
|
import { ExternalNavKeplrDialog } from '@/views/dialogs/ExternalNavKeplrDialog';
|
||||||
import { MnemonicExportDialog } from '@/views/dialogs/MnemonicExportDialog';
|
import { MnemonicExportDialog } from '@/views/dialogs/MnemonicExportDialog';
|
||||||
import { MobileSignInDialog } from '@/views/dialogs/MobileSignInDialog';
|
import { MobileSignInDialog } from '@/views/dialogs/MobileSignInDialog';
|
||||||
@@ -53,6 +54,7 @@ export const DialogManager = () => {
|
|||||||
[DialogTypes.FillDetails]: <FillDetailsDialog {...modalProps} />,
|
[DialogTypes.FillDetails]: <FillDetailsDialog {...modalProps} />,
|
||||||
[DialogTypes.Help]: <HelpDialog {...modalProps} />,
|
[DialogTypes.Help]: <HelpDialog {...modalProps} />,
|
||||||
[DialogTypes.ExternalNavKeplr]: <ExternalNavKeplrDialog {...modalProps} />,
|
[DialogTypes.ExternalNavKeplr]: <ExternalNavKeplrDialog {...modalProps} />,
|
||||||
|
[DialogTypes.ExternalLink]: <ExternalLinkDialog {...modalProps} />,
|
||||||
[DialogTypes.MnemonicExport]: <MnemonicExportDialog {...modalProps} />,
|
[DialogTypes.MnemonicExport]: <MnemonicExportDialog {...modalProps} />,
|
||||||
[DialogTypes.MobileSignIn]: <MobileSignInDialog {...modalProps} />,
|
[DialogTypes.MobileSignIn]: <MobileSignInDialog {...modalProps} />,
|
||||||
[DialogTypes.Onboarding]: <OnboardingDialog {...modalProps} />,
|
[DialogTypes.Onboarding]: <OnboardingDialog {...modalProps} />,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import styled, { type AnyStyledComponent } from 'styled-components';
|
import styled, { type AnyStyledComponent } from 'styled-components';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import { useDispatch } from 'react-redux';
|
import { useDispatch, useSelector } from 'react-redux';
|
||||||
|
|
||||||
import { ButtonShape } from '@/constants/buttons';
|
import { ButtonShape } from '@/constants/buttons';
|
||||||
import { DialogTypes } from '@/constants/dialogs';
|
import { DialogTypes } from '@/constants/dialogs';
|
||||||
@@ -8,6 +8,10 @@ import { STRING_KEYS } from '@/constants/localization';
|
|||||||
import { AppRoute } from '@/constants/routes';
|
import { AppRoute } from '@/constants/routes';
|
||||||
import { LogoShortIcon, BellStrokeIcon } from '@/icons';
|
import { LogoShortIcon, BellStrokeIcon } from '@/icons';
|
||||||
|
|
||||||
|
import { headerMixins } from '@/styles/headerMixins';
|
||||||
|
import { layoutMixins } from '@/styles/layoutMixins';
|
||||||
|
import breakpoints from '@/styles/breakpoints';
|
||||||
|
|
||||||
import { useTokenConfigs, useStringGetter, useURLConfigs } from '@/hooks';
|
import { useTokenConfigs, useStringGetter, useURLConfigs } from '@/hooks';
|
||||||
|
|
||||||
import { Icon, IconName } from '@/components/Icon';
|
import { Icon, IconName } from '@/components/Icon';
|
||||||
@@ -21,10 +25,7 @@ import { NotificationsMenu } from '@/views/menus/NotificationsMenu';
|
|||||||
import { LanguageSelector } from '@/views/menus/LanguageSelector';
|
import { LanguageSelector } from '@/views/menus/LanguageSelector';
|
||||||
|
|
||||||
import { openDialog } from '@/state/dialogs';
|
import { openDialog } from '@/state/dialogs';
|
||||||
|
import { getHasSeenLaunchIncentives } from '@/state/configsSelectors';
|
||||||
import { headerMixins } from '@/styles/headerMixins';
|
|
||||||
import { layoutMixins } from '@/styles/layoutMixins';
|
|
||||||
import breakpoints from '@/styles/breakpoints';
|
|
||||||
|
|
||||||
export const HeaderDesktop = () => {
|
export const HeaderDesktop = () => {
|
||||||
const stringGetter = useStringGetter();
|
const stringGetter = useStringGetter();
|
||||||
@@ -32,6 +33,8 @@ export const HeaderDesktop = () => {
|
|||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
const { chainTokenLabel } = useTokenConfigs();
|
const { chainTokenLabel } = useTokenConfigs();
|
||||||
|
|
||||||
|
const hasSeenLaunchIncentives = useSelector(getHasSeenLaunchIncentives);
|
||||||
|
|
||||||
const navItems = [
|
const navItems = [
|
||||||
{
|
{
|
||||||
group: 'navigation',
|
group: 'navigation',
|
||||||
@@ -55,6 +58,7 @@ export const HeaderDesktop = () => {
|
|||||||
value: chainTokenLabel,
|
value: chainTokenLabel,
|
||||||
label: chainTokenLabel,
|
label: chainTokenLabel,
|
||||||
href: `/${chainTokenLabel}`,
|
href: `/${chainTokenLabel}`,
|
||||||
|
slotAfter: !hasSeenLaunchIncentives && <Styled.UnreadIndicator />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: 'MORE',
|
value: 'MORE',
|
||||||
@@ -238,3 +242,10 @@ Styled.IconButton = styled(IconButton)<{ size?: string }>`
|
|||||||
--button-icon-size: 1rem;
|
--button-icon-size: 1rem;
|
||||||
--button-padding: 0 0.5em;
|
--button-padding: 0 0.5em;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
Styled.UnreadIndicator = styled.div`
|
||||||
|
width: 0.4375rem;
|
||||||
|
height: 0.4375rem;
|
||||||
|
border-radius: 50%;
|
||||||
|
background-color: var(--color-accent);
|
||||||
|
`;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import Abacus, { type Nullable } from '@dydxprotocol/v4-abacus';
|
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 { encodeJson } from '@dydxprotocol/v4-client-js';
|
import { GAS_MULTIPLIER, encodeJson } from '@dydxprotocol/v4-client-js';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
CompositeClient,
|
CompositeClient,
|
||||||
@@ -9,6 +9,7 @@ import {
|
|||||||
type LocalWallet,
|
type LocalWallet,
|
||||||
Network,
|
Network,
|
||||||
NetworkOptimizer,
|
NetworkOptimizer,
|
||||||
|
NobleClient,
|
||||||
SubaccountClient,
|
SubaccountClient,
|
||||||
ValidatorConfig,
|
ValidatorConfig,
|
||||||
OrderType,
|
OrderType,
|
||||||
@@ -43,8 +44,10 @@ import { log } from '../telemetry';
|
|||||||
|
|
||||||
class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
||||||
private compositeClient: CompositeClient | undefined;
|
private compositeClient: CompositeClient | undefined;
|
||||||
|
private nobleClient: NobleClient | undefined;
|
||||||
private store: RootStore | undefined;
|
private store: RootStore | undefined;
|
||||||
private localWallet: LocalWallet | undefined;
|
private localWallet: LocalWallet | undefined;
|
||||||
|
private nobleWallet: LocalWallet | undefined;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.compositeClient = undefined;
|
this.compositeClient = undefined;
|
||||||
@@ -59,6 +62,13 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
|||||||
this.localWallet = localWallet;
|
this.localWallet = localWallet;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setNobleWallet(nobleWallet: LocalWallet) {
|
||||||
|
this.nobleWallet = nobleWallet;
|
||||||
|
if (this.nobleClient) {
|
||||||
|
this.nobleClient.connect(nobleWallet);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async connectNetwork(
|
async connectNetwork(
|
||||||
paramsInJson: Nullable<string>,
|
paramsInJson: Nullable<string>,
|
||||||
callback: (p0: Nullable<string>) => void
|
callback: (p0: Nullable<string>) => void
|
||||||
@@ -70,6 +80,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
|||||||
websocketUrl,
|
websocketUrl,
|
||||||
validatorUrl,
|
validatorUrl,
|
||||||
chainId,
|
chainId,
|
||||||
|
nobleValidatorUrl,
|
||||||
USDC_DENOM,
|
USDC_DENOM,
|
||||||
USDC_DECIMALS,
|
USDC_DECIMALS,
|
||||||
USDC_GAS_DENOM,
|
USDC_GAS_DENOM,
|
||||||
@@ -101,6 +112,10 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
|||||||
|
|
||||||
this.compositeClient = compositeClient;
|
this.compositeClient = compositeClient;
|
||||||
|
|
||||||
|
if (nobleValidatorUrl) {
|
||||||
|
this.nobleClient = new NobleClient(nobleValidatorUrl);
|
||||||
|
if (this.nobleWallet) await this.nobleClient.connect(this.nobleWallet);
|
||||||
|
}
|
||||||
// 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,
|
||||||
@@ -325,6 +340,46 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async sendNobleIBC(
|
||||||
|
params: {
|
||||||
|
msgTypeUrl: string,
|
||||||
|
msg: any,
|
||||||
|
}
|
||||||
|
): Promise<string> {
|
||||||
|
if (!this.nobleClient?.isConnected) {
|
||||||
|
throw new Error('Missing nobleClient or localWallet');
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const ibcMsg = {
|
||||||
|
typeUrl: params.msgTypeUrl, // '/ibc.applications.transfer.v1.MsgTransfer',
|
||||||
|
value: params.msg,
|
||||||
|
};
|
||||||
|
const fee = await this.nobleClient.simulateTransaction([ibcMsg]);
|
||||||
|
|
||||||
|
// take out fee from amount before sweeping
|
||||||
|
const amount = parseInt(ibcMsg.value.token.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.token.amount = amount.toString();
|
||||||
|
const tx = await this.nobleClient.send([ibcMsg]);
|
||||||
|
|
||||||
|
const parsedTx = this.parseToPrimitives(tx);
|
||||||
|
|
||||||
|
return JSON.stringify(parsedTx);
|
||||||
|
} catch (error) {
|
||||||
|
log('DydxChainTransactions/sendNobleIBC', error);
|
||||||
|
|
||||||
|
return JSON.stringify({
|
||||||
|
error,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async transaction(
|
async transaction(
|
||||||
type: TransactionTypes,
|
type: TransactionTypes,
|
||||||
paramsInJson: Abacus.Nullable<string>,
|
paramsInJson: Abacus.Nullable<string>,
|
||||||
@@ -354,6 +409,11 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
|||||||
callback(result);
|
callback(result);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case TransactionType.SendNobleIBC: {
|
||||||
|
const result = await this.sendNobleIBC(params);
|
||||||
|
callback(result);
|
||||||
|
break;
|
||||||
|
}
|
||||||
default: {
|
default: {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -441,6 +501,13 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
|||||||
const parseDelegations = this.parseToPrimitives(delegations);
|
const parseDelegations = this.parseToPrimitives(delegations);
|
||||||
callback(JSON.stringify(parseDelegations));
|
callback(JSON.stringify(parseDelegations));
|
||||||
break;
|
break;
|
||||||
|
case QueryType.GetNobleBalance:
|
||||||
|
if (this.nobleClient?.isConnected) {
|
||||||
|
const nobleBalance = await this.nobleClient.getAccountBalance('uusdc');
|
||||||
|
const parsedNobleBalance = this.parseToPrimitives(nobleBalance);
|
||||||
|
callback(JSON.stringify(parsedNobleBalance));
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-14
@@ -26,13 +26,15 @@ import {
|
|||||||
} from '@/constants/abacus';
|
} from '@/constants/abacus';
|
||||||
|
|
||||||
import { DEFAULT_MARKETID } from '@/constants/markets';
|
import { DEFAULT_MARKETID } from '@/constants/markets';
|
||||||
import { CURRENT_ABACUS_DEPLOYMENT, type DydxNetwork } from '@/constants/networks';
|
import { CURRENT_ABACUS_DEPLOYMENT, type DydxNetwork, isMainnet } from '@/constants/networks';
|
||||||
import { CLEARED_SIZE_INPUTS, CLEARED_TRADE_INPUTS } from '@/constants/trade';
|
import { CLEARED_SIZE_INPUTS, CLEARED_TRADE_INPUTS } from '@/constants/trade';
|
||||||
|
|
||||||
import type { RootStore } from '@/state/_store';
|
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';
|
||||||
@@ -81,10 +83,14 @@ class AbacusStateManager {
|
|||||||
this.abacusFormatter
|
this.abacusFormatter
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const appConfigs = AbacusAppConfig.Companion.forWeb;
|
||||||
|
if (!isMainnet || testFlags.withCCTP)
|
||||||
|
appConfigs.squidVersion = AbacusAppConfig.SquidVersion.V2DepositOnly;
|
||||||
|
|
||||||
this.stateManager = new AsyncAbacusStateManager(
|
this.stateManager = new AsyncAbacusStateManager(
|
||||||
'',
|
'',
|
||||||
CURRENT_ABACUS_DEPLOYMENT,
|
CURRENT_ABACUS_DEPLOYMENT,
|
||||||
AbacusAppConfig.Companion.forWeb,
|
appConfigs,
|
||||||
ioImplementations,
|
ioImplementations,
|
||||||
uiImplementations,
|
uiImplementations,
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
@@ -180,6 +186,12 @@ class AbacusStateManager {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
setNobleWallet = (nobleWallet?: LocalWallet) => {
|
||||||
|
if (nobleWallet) {
|
||||||
|
this.chainTransactions.setNobleWallet(nobleWallet);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
setTransfersSourceAddress = (evmAddress: string) => {
|
setTransfersSourceAddress = (evmAddress: string) => {
|
||||||
this.stateManager.sourceAddress = evmAddress;
|
this.stateManager.sourceAddress = evmAddress;
|
||||||
};
|
};
|
||||||
@@ -223,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 = (
|
||||||
|
|||||||
@@ -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,48 @@
|
|||||||
|
import { isMainnet } from '@/constants/networks';
|
||||||
|
import { GetStatus, StatusResponse } from '@0xsquid/sdk';
|
||||||
|
|
||||||
|
export const NATIVE_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
|
||||||
|
|
||||||
|
export const STATUS_ERROR_GRACE_PERIOD = 300_000;
|
||||||
|
|
||||||
|
const getSquidStatusUrl = (isV2: boolean) => {
|
||||||
|
if (isV2) {
|
||||||
|
return isMainnet
|
||||||
|
? 'https://v2.api.squidrouter.com/v2/status'
|
||||||
|
: 'https://testnet.v2.api.squidrouter.com/v2/status';
|
||||||
|
}
|
||||||
|
return isMainnet
|
||||||
|
? 'https://api.squidrouter.com/v1/status'
|
||||||
|
: 'https://testnet.api.squidrouter.com/v1/status';
|
||||||
|
};
|
||||||
|
|
||||||
|
export const fetchSquidStatus = async (
|
||||||
|
params: GetStatus,
|
||||||
|
isV2?: boolean,
|
||||||
|
integratorId?: string
|
||||||
|
): Promise<StatusResponse> => {
|
||||||
|
const parsedParams: { [key: string]: string } = {
|
||||||
|
transactionId: params.transactionId,
|
||||||
|
fromChainId: String(params.fromChainId),
|
||||||
|
toChainId: String(params.toChainId),
|
||||||
|
};
|
||||||
|
if (isV2) parsedParams.bridgeType = 'cctp';
|
||||||
|
const url = `${getSquidStatusUrl(!!isV2)}?${new URLSearchParams(parsedParams).toString()}`;
|
||||||
|
|
||||||
|
const response = await fetch(url, {
|
||||||
|
headers: {
|
||||||
|
"x-integrator-id": integratorId || 'dYdX-api'
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const error = await response.json();
|
||||||
|
throw new Error(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getNobleChainId = () => {
|
||||||
|
return isMainnet ? 'noble-1' : 'grand-1';
|
||||||
|
}
|
||||||
@@ -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();
|
||||||
@@ -2,6 +2,7 @@ import type { ElementType } from 'react';
|
|||||||
import styled, { AnyStyledComponent } from 'styled-components';
|
import styled, { AnyStyledComponent } from 'styled-components';
|
||||||
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
||||||
|
|
||||||
|
import breakpoints from '@/styles/breakpoints';
|
||||||
import { layoutMixins } from '@/styles/layoutMixins';
|
import { layoutMixins } from '@/styles/layoutMixins';
|
||||||
import { useAccountBalance, useAccounts, useTokenConfigs, useStringGetter } from '@/hooks';
|
import { useAccountBalance, useAccounts, useTokenConfigs, useStringGetter } from '@/hooks';
|
||||||
|
|
||||||
@@ -116,12 +117,17 @@ const Styled: Record<string, AnyStyledComponent> = {};
|
|||||||
|
|
||||||
Styled.Panel = styled(Panel)`
|
Styled.Panel = styled(Panel)`
|
||||||
--panel-paddingX: 1.5rem;
|
--panel-paddingX: 1.5rem;
|
||||||
|
|
||||||
|
@media ${breakpoints.tablet} {
|
||||||
|
--panel-paddingY: 1.5rem;
|
||||||
|
--panel-content-paddingY: 1rem;
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
Styled.Header = styled.div`
|
Styled.Header = styled.div`
|
||||||
${layoutMixins.spacedRow}
|
${layoutMixins.spacedRow}
|
||||||
gap: 1rem;
|
gap: 1rem;
|
||||||
padding: 1rem 1.5rem 0;
|
padding: var(--panel-paddingY) var(--panel-paddingX) 0;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
Styled.Title = styled.h3`
|
Styled.Title = styled.h3`
|
||||||
|
|||||||
@@ -0,0 +1,296 @@
|
|||||||
|
import { useEffect } from 'react';
|
||||||
|
import { useDispatch } from 'react-redux';
|
||||||
|
import { useQuery } from 'react-query';
|
||||||
|
import styled, { AnyStyledComponent } from 'styled-components';
|
||||||
|
|
||||||
|
import { STRING_KEYS } from '@/constants/localization';
|
||||||
|
import { ButtonAction } from '@/constants/buttons';
|
||||||
|
import { DialogTypes } from '@/constants/dialogs';
|
||||||
|
|
||||||
|
import breakpoints from '@/styles/breakpoints';
|
||||||
|
import { useAccounts, useBreakpoints, useStringGetter } from '@/hooks';
|
||||||
|
|
||||||
|
import { layoutMixins } from '@/styles/layoutMixins';
|
||||||
|
|
||||||
|
import { Panel } from '@/components/Panel';
|
||||||
|
import { Button } from '@/components/Button';
|
||||||
|
|
||||||
|
import { Output, OutputType } from '@/components/Output';
|
||||||
|
import { Icon, IconName } from '@/components/Icon';
|
||||||
|
import { Tag, TagSize } from '@/components/Tag';
|
||||||
|
|
||||||
|
import { markLaunchIncentivesSeen } from '@/state/configs';
|
||||||
|
import { openDialog } from '@/state/dialogs';
|
||||||
|
|
||||||
|
import { log } from '@/lib/telemetry';
|
||||||
|
|
||||||
|
export const LaunchIncentivesPanel = () => {
|
||||||
|
const { isNotTablet } = useBreakpoints();
|
||||||
|
const dispatch = useDispatch();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
dispatch(markLaunchIncentivesSeen());
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return isNotTablet ? (
|
||||||
|
<Styled.Panel slotHeader={<LaunchIncentivesTitle />} slotRight={<EstimatedRewards />}>
|
||||||
|
<LaunchIncentivesContent />
|
||||||
|
</Styled.Panel>
|
||||||
|
) : (
|
||||||
|
<Styled.Panel>
|
||||||
|
<Styled.Column>
|
||||||
|
<EstimatedRewards />
|
||||||
|
<LaunchIncentivesTitle />
|
||||||
|
<LaunchIncentivesContent />
|
||||||
|
</Styled.Column>
|
||||||
|
</Styled.Panel>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const LaunchIncentivesTitle = () => {
|
||||||
|
const stringGetter = useStringGetter();
|
||||||
|
return (
|
||||||
|
<Styled.Title>
|
||||||
|
{stringGetter({
|
||||||
|
key: STRING_KEYS.LAUNCH_INCENTIVES_TITLE,
|
||||||
|
params: {
|
||||||
|
FOR_V4: <Styled.ForV4>{stringGetter({ key: STRING_KEYS.FOR_V4 })}</Styled.ForV4>,
|
||||||
|
},
|
||||||
|
})}
|
||||||
|
<Styled.NewTag size={TagSize.Medium}>{stringGetter({ key: STRING_KEYS.NEW })}</Styled.NewTag>
|
||||||
|
</Styled.Title>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const EstimatedRewards = () => {
|
||||||
|
const stringGetter = useStringGetter();
|
||||||
|
const { dydxAddress } = useAccounts();
|
||||||
|
|
||||||
|
const { data, isLoading } = useQuery({
|
||||||
|
enabled: !!dydxAddress,
|
||||||
|
queryKey: `launch_incentives_rewards_${dydxAddress ?? ''}`,
|
||||||
|
queryFn: async () => {
|
||||||
|
if (!dydxAddress) return undefined;
|
||||||
|
const resp = await fetch(`https://cloud.chaoslabs.co/query/api/dydx/points/${dydxAddress}`);
|
||||||
|
return (await resp.json())?.incentivePoints;
|
||||||
|
},
|
||||||
|
onError: (error: Error) => log('LaunchIncentives/fetchPoints', error),
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Styled.EstimatedRewardsCard>
|
||||||
|
<Styled.EstimatedRewardsCardContent>
|
||||||
|
<div>
|
||||||
|
<span>{stringGetter({ key: STRING_KEYS.ESTIMATED_REWARDS })}</span>
|
||||||
|
<Styled.Season>
|
||||||
|
{stringGetter({
|
||||||
|
key: STRING_KEYS.LAUNCH_INCENTIVES_SEASON_NUM,
|
||||||
|
params: {
|
||||||
|
SEASON_NUMBER: 1,
|
||||||
|
},
|
||||||
|
})}
|
||||||
|
</Styled.Season>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Styled.Points>
|
||||||
|
<Output type={OutputType.Number} value={data} isLoading={isLoading} fractionDigits={2} />
|
||||||
|
{data !== undefined && stringGetter({ key: STRING_KEYS.POINTS })}
|
||||||
|
</Styled.Points>
|
||||||
|
</Styled.EstimatedRewardsCardContent>
|
||||||
|
|
||||||
|
<Styled.Image src="/rewards-stars.svg" />
|
||||||
|
</Styled.EstimatedRewardsCard>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const LaunchIncentivesContent = () => {
|
||||||
|
const stringGetter = useStringGetter();
|
||||||
|
const dispatch = useDispatch();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Styled.Column>
|
||||||
|
<Styled.Description>
|
||||||
|
{stringGetter({ key: STRING_KEYS.LAUNCH_INCENTIVES_DESCRIPTION })}{' '}
|
||||||
|
</Styled.Description>
|
||||||
|
<Styled.ChaosLabsLogo src="/logos/chaos-labs.svg" />
|
||||||
|
<Styled.ButtonRow>
|
||||||
|
<Styled.AboutButton
|
||||||
|
action={ButtonAction.Base}
|
||||||
|
onClick={() => {
|
||||||
|
dispatch(
|
||||||
|
openDialog({
|
||||||
|
type: DialogTypes.ExternalLink,
|
||||||
|
dialogProps: { link: 'https://dydx.exchange/blog/v4-full-trading' },
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
slotRight={<Styled.LinkOutIcon iconName={IconName.LinkOut} />}
|
||||||
|
>
|
||||||
|
{stringGetter({ key: STRING_KEYS.ABOUT })}
|
||||||
|
</Styled.AboutButton>
|
||||||
|
<Styled.Button
|
||||||
|
action={ButtonAction.Primary}
|
||||||
|
onClick={() => {
|
||||||
|
dispatch(
|
||||||
|
openDialog({
|
||||||
|
type: DialogTypes.ExternalLink,
|
||||||
|
dialogProps: { link: 'https://community.chaoslabs.xyz/dydx-v4/risk/leaderboard' },
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
slotRight={<Styled.LinkOutIcon iconName={IconName.LinkOut} />}
|
||||||
|
slotLeft={<Icon iconName={IconName.Leaderboard} />}
|
||||||
|
>
|
||||||
|
{stringGetter({ key: STRING_KEYS.LEADERBOARD })}
|
||||||
|
</Styled.Button>
|
||||||
|
</Styled.ButtonRow>
|
||||||
|
</Styled.Column>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const Styled: Record<string, AnyStyledComponent> = {};
|
||||||
|
|
||||||
|
Styled.Panel = styled(Panel)`
|
||||||
|
--panel-paddingY: 1rem;
|
||||||
|
--panel-paddingX: 1.5rem;
|
||||||
|
|
||||||
|
background-color: var(--color-layer-4);
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
|
@media ${breakpoints.tablet} {
|
||||||
|
--panel-paddingY: 1.5rem;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.ForV4 = styled.span`
|
||||||
|
color: var(--color-text-0);
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.Title = styled.h3`
|
||||||
|
${layoutMixins.inlineRow}
|
||||||
|
font: var(--font-medium-book);
|
||||||
|
color: var(--color-text-2);
|
||||||
|
|
||||||
|
@media ${breakpoints.notTablet} {
|
||||||
|
padding: var(--panel-paddingY) var(--panel-paddingX) 0;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.Description = styled.div`
|
||||||
|
color: var(--color-text-0);
|
||||||
|
--link-color: var(--color-text-1);
|
||||||
|
|
||||||
|
a {
|
||||||
|
display: inline;
|
||||||
|
text-decoration: underline;
|
||||||
|
text-underline-offset: 0.25rem;
|
||||||
|
|
||||||
|
::before {
|
||||||
|
content: ' ';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.ButtonRow = styled.div`
|
||||||
|
${layoutMixins.inlineRow}
|
||||||
|
gap: 0.75rem;
|
||||||
|
margin-top: 0.5rem;
|
||||||
|
|
||||||
|
a:last-child {
|
||||||
|
--button-width: 100%;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.Button = styled(Button)`
|
||||||
|
--button-padding: 0 1rem;
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.LinkOutIcon = styled(Icon)`
|
||||||
|
color: var(--color-text-1);
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.AboutButton = styled(Styled.Button)`
|
||||||
|
--button-textColor: var(--color-text-2);
|
||||||
|
--button-backgroundColor: var(--color-layer-6);
|
||||||
|
--button-border: solid var(--border-width) var(--color-layer-7);
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.Column = styled.div`
|
||||||
|
${layoutMixins.flexColumn}
|
||||||
|
gap: 0.5rem;
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.EstimatedRewardsCard = styled.div`
|
||||||
|
${layoutMixins.spacedRow}
|
||||||
|
padding: 1rem 1.25rem;
|
||||||
|
min-width: 21.25rem;
|
||||||
|
height: calc(100% - calc(1.5rem * 2));
|
||||||
|
margin: 1.5rem;
|
||||||
|
|
||||||
|
background-color: var(--color-layer-5);
|
||||||
|
background-image: url('/dots-background.svg');
|
||||||
|
background-size: cover;
|
||||||
|
|
||||||
|
border-radius: 0.75rem;
|
||||||
|
border: solid var(--border-width) var(--color-layer-6);
|
||||||
|
color: var(--color-text-1);
|
||||||
|
|
||||||
|
@media ${breakpoints.tablet} {
|
||||||
|
margin: 0 0 0.5rem;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.EstimatedRewardsCardContent = styled.div`
|
||||||
|
${layoutMixins.flexColumn}
|
||||||
|
gap: 1rem;
|
||||||
|
height: 100%;
|
||||||
|
justify-content: space-between;
|
||||||
|
|
||||||
|
div {
|
||||||
|
${layoutMixins.flexColumn}
|
||||||
|
gap: 0.15rem;
|
||||||
|
font: var(--font-medium-book);
|
||||||
|
|
||||||
|
:first-child {
|
||||||
|
color: var(--color-text-2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.BackgroundDots = styled.img`
|
||||||
|
position: absolute;
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.Season = styled.span`
|
||||||
|
font: var(--font-small-book);
|
||||||
|
color: var(--color-text-1);
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.Points = styled.span`
|
||||||
|
${layoutMixins.inlineRow}
|
||||||
|
gap: 0.25rem;
|
||||||
|
font: var(--font-large-book);
|
||||||
|
color: var(--color-text-0);
|
||||||
|
|
||||||
|
output {
|
||||||
|
color: var(--color-text-2);
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.Image = styled.img`
|
||||||
|
position: relative;
|
||||||
|
float: right;
|
||||||
|
|
||||||
|
width: 5.25rem;
|
||||||
|
height: auto;
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.ChaosLabsLogo = styled.img`
|
||||||
|
height: 1.25rem;
|
||||||
|
align-self: start;
|
||||||
|
`;
|
||||||
|
|
||||||
|
Styled.NewTag = styled(Tag)`
|
||||||
|
color: var(--color-accent);
|
||||||
|
background-color: var(--color-accent-faded);
|
||||||
|
`;
|
||||||
@@ -7,6 +7,8 @@ import { ButtonAction, ButtonSize, ButtonType } from '@/constants/buttons';
|
|||||||
|
|
||||||
import { useAccountBalance, useBreakpoints, useStringGetter } from '@/hooks';
|
import { useAccountBalance, useBreakpoints, useStringGetter } from '@/hooks';
|
||||||
|
|
||||||
|
import { breakpoints } from '@/styles';
|
||||||
|
|
||||||
import { layoutMixins } from '@/styles/layoutMixins';
|
import { layoutMixins } from '@/styles/layoutMixins';
|
||||||
|
|
||||||
import { Details } from '@/components/Details';
|
import { Details } from '@/components/Details';
|
||||||
@@ -134,13 +136,22 @@ const Styled: Record<string, AnyStyledComponent> = {};
|
|||||||
Styled.MigratePanel = styled(Panel)`
|
Styled.MigratePanel = styled(Panel)`
|
||||||
--panel-paddingX: 1.5rem;
|
--panel-paddingX: 1.5rem;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
|
background-image: url('/dots-background.svg');
|
||||||
|
background-position: right;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
|
||||||
|
@media ${breakpoints.tablet} {
|
||||||
|
--panel-paddingY: 1.5rem;
|
||||||
|
--panel-content-paddingY: 1rem;
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
Styled.Title = styled.h3`
|
Styled.Title = styled.h3`
|
||||||
font: var(--font-medium-book);
|
font: var(--font-medium-book);
|
||||||
color: var(--color-text-2);
|
color: var(--color-text-2);
|
||||||
|
|
||||||
padding: 1rem 1.5rem 0;
|
padding: var(--panel-paddingY) var(--panel-paddingX) 0;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
Styled.MigrateAction = styled.div`
|
Styled.MigrateAction = styled.div`
|
||||||
@@ -164,6 +175,13 @@ Styled.Token = styled(Output)`
|
|||||||
Styled.Description = styled.div`
|
Styled.Description = styled.div`
|
||||||
color: var(--color-text-0);
|
color: var(--color-text-0);
|
||||||
--link-color: var(--color-text-1);
|
--link-color: var(--color-text-1);
|
||||||
|
|
||||||
|
a {
|
||||||
|
display: inline;
|
||||||
|
::before {
|
||||||
|
content: ' ';
|
||||||
|
}
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
Styled.Column = styled.div`
|
Styled.Column = styled.div`
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import { openDialog } from '@/state/dialogs';
|
|||||||
|
|
||||||
import { DYDXBalancePanel } from './DYDXBalancePanel';
|
import { DYDXBalancePanel } from './DYDXBalancePanel';
|
||||||
import { MigratePanel } from './MigratePanel';
|
import { MigratePanel } from './MigratePanel';
|
||||||
|
import { LaunchIncentivesPanel } from './LaunchIncentivesPanel';
|
||||||
|
|
||||||
export const RewardsPage = () => {
|
export const RewardsPage = () => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
@@ -39,9 +40,20 @@ export const RewardsPage = () => {
|
|||||||
return (
|
return (
|
||||||
<Styled.Page>
|
<Styled.Page>
|
||||||
{import.meta.env.VITE_V3_TOKEN_ADDRESS && <MigratePanel />}
|
{import.meta.env.VITE_V3_TOKEN_ADDRESS && <MigratePanel />}
|
||||||
<Styled.PanelRow>
|
|
||||||
{isTablet && <DYDXBalancePanel />}
|
|
||||||
|
|
||||||
|
{isTablet ? (
|
||||||
|
<>
|
||||||
|
<LaunchIncentivesPanel />
|
||||||
|
<DYDXBalancePanel />
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Styled.PanelRowIncentivesAndBalance>
|
||||||
|
<LaunchIncentivesPanel />
|
||||||
|
<DYDXBalancePanel />
|
||||||
|
</Styled.PanelRowIncentivesAndBalance>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<Styled.PanelRow>
|
||||||
<Styled.Panel
|
<Styled.Panel
|
||||||
slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>}
|
slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>}
|
||||||
slotRight={panelArrow}
|
slotRight={panelArrow}
|
||||||
@@ -67,8 +79,6 @@ export const RewardsPage = () => {
|
|||||||
</Link>
|
</Link>
|
||||||
</Styled.Description>
|
</Styled.Description>
|
||||||
</Styled.Panel>
|
</Styled.Panel>
|
||||||
|
|
||||||
{isNotTablet && <DYDXBalancePanel />}
|
|
||||||
</Styled.PanelRow>
|
</Styled.PanelRow>
|
||||||
</Styled.Page>
|
</Styled.Page>
|
||||||
);
|
);
|
||||||
@@ -99,6 +109,11 @@ Styled.Page = styled.div`
|
|||||||
|
|
||||||
Styled.Panel = styled(Panel)`
|
Styled.Panel = styled(Panel)`
|
||||||
--panel-paddingX: 1.5rem;
|
--panel-paddingX: 1.5rem;
|
||||||
|
|
||||||
|
@media ${breakpoints.tablet} {
|
||||||
|
--panel-paddingY: 1.5rem;
|
||||||
|
--panel-content-paddingY: 1rem;
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
Styled.Title = styled.h3`
|
Styled.Title = styled.h3`
|
||||||
@@ -110,20 +125,29 @@ Styled.Title = styled.h3`
|
|||||||
Styled.Description = styled.div`
|
Styled.Description = styled.div`
|
||||||
color: var(--color-text-0);
|
color: var(--color-text-0);
|
||||||
--link-color: var(--color-text-1);
|
--link-color: var(--color-text-1);
|
||||||
|
|
||||||
|
a {
|
||||||
|
display: inline;
|
||||||
|
::before {
|
||||||
|
content: ' ';
|
||||||
|
}
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
Styled.PanelRow = styled.div`
|
Styled.PanelRow = styled.div`
|
||||||
${layoutMixins.gridEqualColumns}
|
${layoutMixins.gridEqualColumns}
|
||||||
gap: 1.5rem;
|
gap: 1.5rem;
|
||||||
|
|
||||||
align-items: flex-start;
|
|
||||||
|
|
||||||
@media ${breakpoints.tablet} {
|
@media ${breakpoints.tablet} {
|
||||||
grid-auto-flow: row;
|
grid-auto-flow: row;
|
||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
Styled.PanelRowIncentivesAndBalance = styled(Styled.PanelRow)`
|
||||||
|
grid-template-columns: 2fr 1fr;
|
||||||
|
`;
|
||||||
|
|
||||||
Styled.IconButton = styled(IconButton)`
|
Styled.IconButton = styled(IconButton)`
|
||||||
color: var(--color-text-0);
|
color: var(--color-text-0);
|
||||||
--color-border: var(--color-layer-6);
|
--color-border: var(--color-layer-6);
|
||||||
|
|||||||
+10
-1
@@ -17,6 +17,7 @@ export interface ConfigsState {
|
|||||||
feeTiers?: kollections.List<FeeTier>;
|
feeTiers?: kollections.List<FeeTier>;
|
||||||
feeDiscounts?: FeeDiscount[];
|
feeDiscounts?: FeeDiscount[];
|
||||||
network?: NetworkConfigs;
|
network?: NetworkConfigs;
|
||||||
|
hasSeenLaunchIncentives: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const DOCUMENT_THEME_MAP = {
|
const DOCUMENT_THEME_MAP = {
|
||||||
@@ -43,6 +44,10 @@ const initialState: ConfigsState = {
|
|||||||
feeDiscounts: undefined,
|
feeDiscounts: undefined,
|
||||||
feeTiers: undefined,
|
feeTiers: undefined,
|
||||||
network: undefined,
|
network: undefined,
|
||||||
|
hasSeenLaunchIncentives: getLocalStorage({
|
||||||
|
key: LocalStorageKey.HasSeenLaunchIncentives,
|
||||||
|
defaultValue: false,
|
||||||
|
}),
|
||||||
};
|
};
|
||||||
|
|
||||||
changeTheme(initialState.appTheme);
|
changeTheme(initialState.appTheme);
|
||||||
@@ -60,7 +65,11 @@ export const configsSlice = createSlice({
|
|||||||
...state,
|
...state,
|
||||||
...action.payload,
|
...action.payload,
|
||||||
}),
|
}),
|
||||||
|
markLaunchIncentivesSeen: (state: ConfigsState) => {
|
||||||
|
setLocalStorage({ key: LocalStorageKey.HasSeenLaunchIncentives, value: true });
|
||||||
|
state.hasSeenLaunchIncentives = true;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export const { setAppTheme, setConfigs } = configsSlice.actions;
|
export const { setAppTheme, setConfigs, markLaunchIncentivesSeen } = configsSlice.actions;
|
||||||
|
|||||||
@@ -5,3 +5,6 @@ export const getAppTheme = (state: RootState) => state.configs.appTheme;
|
|||||||
export const getFeeTiers = (state: RootState) => state.configs.feeTiers?.toArray();
|
export const getFeeTiers = (state: RootState) => state.configs.feeTiers?.toArray();
|
||||||
|
|
||||||
export const getFeeDiscounts = (state: RootState) => state.configs.feeDiscounts;
|
export const getFeeDiscounts = (state: RootState) => state.configs.feeDiscounts;
|
||||||
|
|
||||||
|
export const getHasSeenLaunchIncentives = (state: RootState) =>
|
||||||
|
state.configs.hasSeenLaunchIncentives;
|
||||||
|
|||||||
+4
-1
@@ -47,7 +47,10 @@ export const inputsSlice = createSlice({
|
|||||||
inputErrors: errors?.toArray(),
|
inputErrors: errors?.toArray(),
|
||||||
tradeInputs: trade,
|
tradeInputs: trade,
|
||||||
closePositionInputs: closePosition,
|
closePositionInputs: closePosition,
|
||||||
transferInputs: transfer,
|
transferInputs: {
|
||||||
|
...transfer,
|
||||||
|
isCctp: !!transfer?.isCctp,
|
||||||
|
} as Nullable<TransferInputs>,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -116,6 +116,7 @@
|
|||||||
|
|
||||||
--color-gradient-positive: hsla(158, 49%, 48%, 0.16);
|
--color-gradient-positive: hsla(158, 49%, 48%, 0.16);
|
||||||
--color-gradient-negative: hsla(0, 100%, 66%, 0.16);
|
--color-gradient-negative: hsla(0, 100%, 66%, 0.16);
|
||||||
|
--color-accent-faded: hsla(var(--theme-classic-hue-purple), 100%, 70%, 0.16);
|
||||||
|
|
||||||
--color-risk-low: var(--theme-classic-color-green);
|
--color-risk-low: var(--theme-classic-color-green);
|
||||||
--color-risk-medium: var(--theme-classic-color-yellow);
|
--color-risk-medium: var(--theme-classic-color-yellow);
|
||||||
|
|||||||
@@ -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';
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
import styled, { type AnyStyledComponent } from 'styled-components';
|
||||||
|
|
||||||
|
import { ButtonAction, ButtonType } from '@/constants/buttons';
|
||||||
|
import { STRING_KEYS } from '@/constants/localization';
|
||||||
|
import { useStringGetter } from '@/hooks';
|
||||||
|
|
||||||
|
import { Button } from '@/components/Button';
|
||||||
|
import { Dialog } from '@/components/Dialog';
|
||||||
|
|
||||||
|
import { layoutMixins } from '@/styles/layoutMixins';
|
||||||
|
|
||||||
|
type ElementProps = {
|
||||||
|
link: string;
|
||||||
|
linkDescription?: string;
|
||||||
|
setIsOpen: (open: boolean) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const ExternalLinkDialog = ({ setIsOpen, link, linkDescription }: ElementProps) => {
|
||||||
|
const stringGetter = useStringGetter();
|
||||||
|
return (
|
||||||
|
<Dialog
|
||||||
|
isOpen
|
||||||
|
setIsOpen={setIsOpen}
|
||||||
|
title={stringGetter({ key: STRING_KEYS.LEAVING_WEBSITE })}
|
||||||
|
description={
|
||||||
|
linkDescription ?? stringGetter({ key: STRING_KEYS.LEAVING_WEBSITE_DESCRIPTION })
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<Styled.Content>
|
||||||
|
<p>{stringGetter({ key: STRING_KEYS.LEAVING_WEBSITE_DISCLAIMER })}.</p>
|
||||||
|
<Button type={ButtonType.Link} action={ButtonAction.Primary} href={link}>
|
||||||
|
{stringGetter({ key: STRING_KEYS.CONTINUE })}
|
||||||
|
</Button>
|
||||||
|
</Styled.Content>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const Styled: Record<string, AnyStyledComponent> = {};
|
||||||
|
|
||||||
|
Styled.Content = styled.div`
|
||||||
|
${layoutMixins.flexColumn}
|
||||||
|
gap: 1rem;
|
||||||
|
|
||||||
|
font: var(--font-base-book);
|
||||||
|
`;
|
||||||
@@ -18,7 +18,6 @@ import type { EvmAddress } from '@/constants/wallets';
|
|||||||
import { useAccounts, useDebounce, useStringGetter, useSelectedNetwork } from '@/hooks';
|
import { useAccounts, useDebounce, useStringGetter, useSelectedNetwork } from '@/hooks';
|
||||||
import { useAccountBalance, CHAIN_DEFAULT_TOKEN_ADDRESS } from '@/hooks/useAccountBalance';
|
import { useAccountBalance, CHAIN_DEFAULT_TOKEN_ADDRESS } from '@/hooks/useAccountBalance';
|
||||||
import { useLocalNotifications } from '@/hooks/useLocalNotifications';
|
import { useLocalNotifications } from '@/hooks/useLocalNotifications';
|
||||||
import { NATIVE_TOKEN_ADDRESS, useSquid } from '@/hooks/useSquid';
|
|
||||||
|
|
||||||
import { layoutMixins } from '@/styles/layoutMixins';
|
import { layoutMixins } from '@/styles/layoutMixins';
|
||||||
import { formMixins } from '@/styles/formMixins';
|
import { formMixins } from '@/styles/formMixins';
|
||||||
@@ -38,6 +37,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, NATIVE_TOKEN_ADDRESS } from '@/lib/squid';
|
||||||
import { log } from '@/lib/telemetry';
|
import { log } from '@/lib/telemetry';
|
||||||
import { parseWalletError } from '@/lib/wallet';
|
import { parseWalletError } from '@/lib/wallet';
|
||||||
|
|
||||||
@@ -69,6 +69,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
|
|||||||
summary,
|
summary,
|
||||||
errors: routeErrors,
|
errors: routeErrors,
|
||||||
errorMessage: routeErrorMessage,
|
errorMessage: routeErrorMessage,
|
||||||
|
isCctp,
|
||||||
} = useSelector(getTransferInputs, shallowEqual) || {};
|
} = useSelector(getTransferInputs, shallowEqual) || {};
|
||||||
const chainId = chainIdStr ? parseInt(chainIdStr) : undefined;
|
const chainId = chainIdStr ? parseInt(chainIdStr) : undefined;
|
||||||
|
|
||||||
@@ -84,7 +85,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const [fromAmount, setFromAmount] = useState('');
|
const [fromAmount, setFromAmount] = useState('');
|
||||||
const [slippage, setSlippage] = useState(0.01); // 1% slippage
|
const [slippage, setSlippage] = useState(isCctp ? 0 : 0.01); // 1% slippage
|
||||||
const debouncedAmount = useDebounce<string>(fromAmount, 500);
|
const debouncedAmount = useDebounce<string>(fromAmount, 500);
|
||||||
|
|
||||||
// Async Data
|
// Async Data
|
||||||
@@ -99,6 +100,8 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
|
|||||||
const debouncedAmountBN = MustBigNumber(debouncedAmount);
|
const debouncedAmountBN = MustBigNumber(debouncedAmount);
|
||||||
const balanceBN = MustBigNumber(balance);
|
const balanceBN = MustBigNumber(balance);
|
||||||
|
|
||||||
|
useEffect(() => setSlippage(isCctp ? 0 : 0.01), [isCctp]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const hasInvalidInput =
|
const hasInvalidInput =
|
||||||
debouncedAmountBN.isNaN() || debouncedAmountBN.lte(0) || debouncedAmountBN.gt(balanceBN);
|
debouncedAmountBN.isNaN() || debouncedAmountBN.lte(0) || debouncedAmountBN.gt(balanceBN);
|
||||||
@@ -250,11 +253,11 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
|
|||||||
if (txHash) {
|
if (txHash) {
|
||||||
addTransferNotification({
|
addTransferNotification({
|
||||||
txHash: txHash,
|
txHash: txHash,
|
||||||
toChainId: ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId,
|
toChainId: !isCctp ? ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId : getNobleChainId(),
|
||||||
fromChainId: chainIdStr || undefined,
|
fromChainId: chainIdStr || undefined,
|
||||||
toAmount: summary?.usdcSize || undefined,
|
toAmount: summary?.usdcSize || undefined,
|
||||||
triggeredAt: Date.now(),
|
triggeredAt: Date.now(),
|
||||||
notificationStatus: NotificationStatus.Triggered,
|
isCctp,
|
||||||
});
|
});
|
||||||
abacusStateManager.clearTransferInputValues();
|
abacusStateManager.clearTransferInputValues();
|
||||||
setFromAmount('');
|
setFromAmount('');
|
||||||
|
|||||||
@@ -109,6 +109,8 @@ export const DepositButtonAndReceipt = ({
|
|||||||
? stringGetter({ key: STRING_KEYS.HIDE_ALL_DETAILS })
|
? stringGetter({ key: STRING_KEYS.HIDE_ALL_DETAILS })
|
||||||
: stringGetter({ key: STRING_KEYS.SHOW_ALL_DETAILS });
|
: stringGetter({ key: STRING_KEYS.SHOW_ALL_DETAILS });
|
||||||
|
|
||||||
|
const totalFees = (summary?.bridgeFee || 0) + (summary?.gasFee || 0);
|
||||||
|
|
||||||
const submitButtonReceipt = [
|
const submitButtonReceipt = [
|
||||||
{
|
{
|
||||||
key: 'equity',
|
key: 'equity',
|
||||||
@@ -158,9 +160,7 @@ export const DepositButtonAndReceipt = ({
|
|||||||
{
|
{
|
||||||
key: 'total-fees',
|
key: 'total-fees',
|
||||||
label: <span>{stringGetter({ key: STRING_KEYS.TOTAL_FEES })}</span>,
|
label: <span>{stringGetter({ key: STRING_KEYS.TOTAL_FEES })}</span>,
|
||||||
value: typeof summary?.bridgeFee === 'number' && typeof summary?.gasFee === 'number' && (
|
value: <Output type={OutputType.Fiat} value={totalFees} />,
|
||||||
<Output type={OutputType.Fiat} value={summary?.bridgeFee + summary?.gasFee} />
|
|
||||||
),
|
|
||||||
subitems: feeSubitems,
|
subitems: feeSubitems,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -183,7 +183,12 @@ export const DepositButtonAndReceipt = ({
|
|||||||
type={OutputType.Text}
|
type={OutputType.Text}
|
||||||
value={stringGetter({
|
value={stringGetter({
|
||||||
key: STRING_KEYS.X_MINUTES_LOWERCASED,
|
key: STRING_KEYS.X_MINUTES_LOWERCASED,
|
||||||
params: { X: Math.round(summary?.estimatedRouteDuration / 60) },
|
params: {
|
||||||
|
X:
|
||||||
|
summary?.estimatedRouteDuration < 60
|
||||||
|
? '< 1'
|
||||||
|
: Math.round(summary?.estimatedRouteDuration / 60),
|
||||||
|
},
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -58,11 +58,6 @@ export const WithdrawForm = () => {
|
|||||||
const { sendSquidWithdraw } = useSubaccount();
|
const { sendSquidWithdraw } = useSubaccount();
|
||||||
const { freeCollateral } = useSelector(getSubaccount, shallowEqual) || {};
|
const { freeCollateral } = useSelector(getSubaccount, shallowEqual) || {};
|
||||||
|
|
||||||
// User input
|
|
||||||
const [withdrawAmount, setWithdrawAmount] = useState('');
|
|
||||||
const [slippage, setSlippage] = useState(0.01); // 0.1% slippage
|
|
||||||
const debouncedAmount = useDebounce<string>(withdrawAmount, 500);
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
requestPayload,
|
requestPayload,
|
||||||
token,
|
token,
|
||||||
@@ -71,8 +66,15 @@ export const WithdrawForm = () => {
|
|||||||
resources,
|
resources,
|
||||||
errors: routeErrors,
|
errors: routeErrors,
|
||||||
errorMessage: routeErrorMessage,
|
errorMessage: routeErrorMessage,
|
||||||
|
isCctp
|
||||||
} = useSelector(getTransferInputs, shallowEqual) || {};
|
} = useSelector(getTransferInputs, shallowEqual) || {};
|
||||||
|
|
||||||
|
// User input
|
||||||
|
const [withdrawAmount, setWithdrawAmount] = useState('');
|
||||||
|
const [slippage, setSlippage] = useState(isCctp ? 0 : 0.01); // 0.1% slippage
|
||||||
|
const debouncedAmount = useDebounce<string>(withdrawAmount, 500);
|
||||||
|
|
||||||
|
|
||||||
const isValidAddress = toAddress && isAddress(toAddress);
|
const isValidAddress = toAddress && isAddress(toAddress);
|
||||||
|
|
||||||
const toToken = useMemo(
|
const toToken = useMemo(
|
||||||
@@ -89,6 +91,8 @@ export const WithdrawForm = () => {
|
|||||||
[freeCollateral?.current]
|
[freeCollateral?.current]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
useEffect(() => setSlippage(isCctp ? 0 : 0.01), [isCctp]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
abacusStateManager.setTransferValue({
|
abacusStateManager.setTransferValue({
|
||||||
field: TransferInputField.type,
|
field: TransferInputField.type,
|
||||||
|
|||||||
@@ -90,13 +90,13 @@ export const WithdrawButtonAndReceipt = ({
|
|||||||
? stringGetter({ key: STRING_KEYS.HIDE_ALL_DETAILS })
|
? stringGetter({ key: STRING_KEYS.HIDE_ALL_DETAILS })
|
||||||
: stringGetter({ key: STRING_KEYS.SHOW_ALL_DETAILS });
|
: stringGetter({ key: STRING_KEYS.SHOW_ALL_DETAILS });
|
||||||
|
|
||||||
|
const totalFees = (summary?.bridgeFee || 0) + (summary?.gasFee || 0);
|
||||||
|
|
||||||
const submitButtonReceipt = [
|
const submitButtonReceipt = [
|
||||||
{
|
{
|
||||||
key: 'total-fees',
|
key: 'total-fees',
|
||||||
label: <span>{stringGetter({ key: STRING_KEYS.TOTAL_FEES })}</span>,
|
label: <span>{stringGetter({ key: STRING_KEYS.TOTAL_FEES })}</span>,
|
||||||
value: typeof summary?.bridgeFee === 'number' && typeof summary?.gasFee === 'number' && (
|
value: <Output type={OutputType.Fiat} value={totalFees} />,
|
||||||
<Output type={OutputType.Fiat} value={summary?.bridgeFee + summary?.gasFee} />
|
|
||||||
),
|
|
||||||
subitems: feeSubitems,
|
subitems: feeSubitems,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -165,7 +165,12 @@ export const WithdrawButtonAndReceipt = ({
|
|||||||
type={OutputType.Text}
|
type={OutputType.Text}
|
||||||
value={stringGetter({
|
value={stringGetter({
|
||||||
key: STRING_KEYS.X_MINUTES_LOWERCASED,
|
key: STRING_KEYS.X_MINUTES_LOWERCASED,
|
||||||
params: { X: Math.round(summary?.estimatedRouteDuration / 60) },
|
params: {
|
||||||
|
X:
|
||||||
|
summary?.estimatedRouteDuration < 60
|
||||||
|
? '< 1'
|
||||||
|
: Math.round(summary?.estimatedRouteDuration / 60),
|
||||||
|
},
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -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,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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: MustBigNumber(floatValue).toString() }));
|
||||||
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: MustBigNumber(floatValue).toString() }));
|
||||||
|
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,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ export const TransferStatusNotification = ({
|
|||||||
|
|
||||||
// @ts-ignore status.errors is not in the type definition but can be returned
|
// @ts-ignore status.errors is not in the type definition but can be returned
|
||||||
const error = status?.errors?.length ? status?.errors[0] : status?.error;
|
const error = status?.errors?.length ? status?.errors[0] : status?.error;
|
||||||
|
const hasError = error && Object.keys(error).length !== 0;
|
||||||
|
|
||||||
const updateSecondsLeft = useCallback(() => {
|
const updateSecondsLeft = useCallback(() => {
|
||||||
const fromChainEta = (status?.fromChain?.chainData?.estimatedRouteDuration || 0) * 1000;
|
const fromChainEta = (status?.fromChain?.chainData?.estimatedRouteDuration || 0) * 1000;
|
||||||
@@ -87,7 +88,7 @@ export const TransferStatusNotification = ({
|
|||||||
},
|
},
|
||||||
})}
|
})}
|
||||||
</Styled.Status>
|
</Styled.Status>
|
||||||
{error && (
|
{hasError && (
|
||||||
<AlertMessage type={AlertType.Error}>
|
<AlertMessage type={AlertType.Error}>
|
||||||
{stringGetter({
|
{stringGetter({
|
||||||
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
|
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
|
||||||
@@ -112,7 +113,7 @@ export const TransferStatusNotification = ({
|
|||||||
) : (
|
) : (
|
||||||
<Styled.BridgingStatus>
|
<Styled.BridgingStatus>
|
||||||
{content}
|
{content}
|
||||||
{!isToast && status?.squidTransactionStatus !== 'success' && (
|
{!isToast && status?.squidTransactionStatus !== 'success' && !hasError && (
|
||||||
<Styled.TransferStatusSteps status={status} type={type} />
|
<Styled.TransferStatusSteps status={status} type={type} />
|
||||||
)}
|
)}
|
||||||
</Styled.BridgingStatus>
|
</Styled.BridgingStatus>
|
||||||
@@ -120,8 +121,7 @@ export const TransferStatusNotification = ({
|
|||||||
}
|
}
|
||||||
slotAction={
|
slotAction={
|
||||||
isToast &&
|
isToast &&
|
||||||
status &&
|
status && (
|
||||||
!error && (
|
|
||||||
<Styled.Trigger
|
<Styled.Trigger
|
||||||
isOpen={open}
|
isOpen={open}
|
||||||
onClick={(e: MouseEvent) => {
|
onClick={(e: MouseEvent) => {
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user