Compare commits

...
Author SHA1 Message Date
Bill He 514a2d3ab3 use decimals: 2023-11-06 17:35:57 -08:00
Bill He c58d94e477 Fix decimal overflow bug 2023-11-06 17:26:27 -08:00
Rui 68f3552569 Add app configuration to env.json (#121) 2023-11-06 13:02:38 -08:00
aleka 18b12591ca Update LICENSE (#123) 2023-11-06 11:10:31 -08:00
Bill 3f963ffb07 Add Env var descriptions to readme (#124)
* Add Env var descriptions to readme

* update

* remove examples

* grammar
2023-11-06 10:50:45 -08:00
aleka aac024fd5e showing negative buying power as - (#119) 2023-11-06 13:31:41 -05:00
Christopher-Li 4913c690ec Update all dev4 endpoints to use https and wss (#117)
* Update all dev endpoints to use https and wss

* dev4
2023-11-06 09:33:22 -08:00
Bill b0db577b28 Configurable squid integrator id (#120)
* Configurable squid integrator id

* bump abacus
2023-11-03 14:18:15 -07:00
Bill 9815437a80 Account dropdown onboarding entrypoints (#113)
* Account dropdown onboarding entrypoints

* Update based on latest designs
2023-10-31 14:29:36 -07:00
aleka 890a4b2c0e Padding fixes, markets data null fix, update .env.example (#112)
* update .env.example for token migration

* bump icon size in icon button

* add padding in rewards / fees page, panel changes

* fix markets data crashing

* fix market details overflow on tablet

* fix market filters

* prevent fees table overflow

* remove notifications close button on mobile

* fix nested button console warning

* update ToggleGroup value change logic

* panel hover impact button hover

* update dropdown icon in header
2023-10-31 17:11:46 -04:00
Bill 8d3cc76d14 Configurable URLs (#107)
* Configurable URLs

* add learnmore to tooltip

* Learnmore -> LearnMore
2023-10-31 11:02:45 -07:00
Adam Fraser c7ad4b3028 Remove DSRV from Testnet node config options (#108)
* Remove DSRV from Testnet node config options

* Add Bware to testnet node config
2023-10-31 10:52:49 -07:00
Rui c88d5dd411 Add Android config to wallets.json (#114) 2023-10-31 09:35:59 -07:00
Jared Vu d6ab547055 Update README.md (#111)
* Add README in scripts directory

* Add Cloudflare instructions to README
2023-10-30 15:17:12 -07:00
aleka 2fe6c2bb3b reorder header, center align header, update collapse caret icons (#110) 2023-10-27 23:32:51 -04:00
aleka e6858ca917 show loading state instead of "Unavailable" for place order button (#104)
* show loading instead of unavailable for place order button
2023-10-27 17:39:12 -04:00
aleka d92b49f4fa bump packages, fix missing asset symbol (#106) 2023-10-27 16:47:34 -04:00
aleka e7da21962a add entry point to token migration (#98)
* update migrate panel

* address feedback
2023-10-27 16:14:34 -04:00
aleka b479531e34 update v4 docs link (#102) 2023-10-27 16:13:48 -04:00
Bill 0d4c5a547a Abort key derivation if second signature fails (#109) 2023-10-27 11:41:00 -07:00
Rui 5b235ee53f Add link to help page (#103) 2023-10-27 09:15:31 -07:00
Adam Fraser 18dee0586b Add Polkachu as RPC Node for Testnet (#105)
* Update env.json

* Add Polkachu option to environments

* Fix trailing comma error
2023-10-25 18:21:27 -04:00
mikemag-dev 9f1f5987ee Update apple-app-site-association (#100) 2023-10-24 18:33:41 -04:00
James Jia 7f531516ca v1.0: Update LICENSE and README (#101)
* Update LICENSE and README

* Update README, package.json

* Update package.json
2023-10-24 14:14:49 -07:00
aleka 3fd71558c0 fix trading view error (#96)
* fix trading view error

* only init trading view if market id is first defined, and nits re fills table with empty asset
2023-10-24 17:06:00 -04:00
aleka 575856b77b remove asset symbol for account balance logic (#95) 2023-10-23 17:51:13 -04:00
John Huang e3609782ed Indexer and validator are on https for DEV (#97) 2023-10-23 14:49:03 -07:00
Bill 5ca923984d Update acknowledge copies (#94)
* update acknowledgement dialog with new copies

* update
2023-10-23 13:59:04 -07:00
Bill d97626f543 Fix auto-deposit (#93) 2023-10-23 12:02:05 -07:00
Jared Vu 835f82dbcc Support Intercom (#92)
* Add ChatIcon

* FooterDesktop Help&Support

* HelpDialog w/ triggers

* Add other links

* item gap css var passing

* inject script

* Add quotes to script

* Close modal on select

* Remove feedback form
2023-10-20 16:30:22 -07:00
Bill 051bdda73a update v4-client init in useDydxClient (#91)
* update v4-client init in useDydxClient

* fix nit
2023-10-20 11:00:03 -07:00
Bill 27b79957d4 Bump v4 clients (#89)
* Have tokens be configurable, bump v4-client

* bump

* chain -> chaintoken

* use cancelRawOrder

* address comments

* add TODO
2023-10-19 11:01:12 -07:00
aleka 4bacc901dc use wallet connect config from envs (#88)
* use wallet connect config from envs

* update readme
2023-10-19 11:35:17 -04:00
aleka 82d32a91a9 fix dialog not showing up (#87) 2023-10-19 07:16:13 -07:00
aleka 2a794f9459 add empty terms + privacy pages (#80)
* add empty terms + privacy pages

* nit
2023-10-18 19:44:15 -04:00
lucas-dydx 5c26a0c270 Update dev2 validator IP address (#86) 2023-10-18 12:38:08 -07:00
Jared Vu e4991cc31d Update Abacus 0.7.0 & Misc. bug fixes (#84)
* Add Notification icon w/ stroke

* Update to abacus0.7.0

* Fix goodTilTime string

* Fix tradingView initial load

* Temp remove notif onClick

* remove isConnected state from dydxClient
2023-10-18 11:08:39 -07:00
aleka da908c826a Revert "Revert "remove offline message for testnet4 (#76)" (#78)" (#85)
This reverts commit 14316163e4.
2023-10-18 13:04:25 -04:00
John Huang af46278539 18 for adv4tnt, 6 for uusdc (#83)
* 18 for adv4tnt, 6 for uusdc

* Changed "exponents" to "decimals"
2023-10-17 15:42:00 -07:00
Jared Vu ea58b55152 Bump localStorage version to wipe EvmDerivedAddresses (#79) 2023-10-17 14:49:51 -07:00
aleka 54d65bb81c override walletconnect explorer recs (#81) 2023-10-17 17:42:41 -04:00
aleka e047a49bbc remove wc1 support and fix typo in env.json (#82) 2023-10-17 17:12:50 -04:00
aleka 14316163e4 Revert "remove offline message for testnet4 (#76)" (#78)
This reverts commit ac619a9da1.
2023-10-17 13:37:26 -04:00
aleka ac619a9da1 remove offline message for testnet4 (#76) 2023-10-17 13:03:50 -04:00
Bill cb7f542a99 Onboarding status do not rely on squidAPI to determine if deposit/withdraw (#73) 2023-10-16 17:35:07 -07:00
aleka bc5569c4c9 testnet4 followup, switch offline msg (#75) 2023-10-16 17:26:29 -04:00
John Huang dd087ae786 TRCL-3010 Change test net chain ID and token denom (#74) 2023-10-16 17:26:21 -04:00
aleka eb023ff0ff update signing message for testnet for reset (#72) 2023-10-16 16:44:29 -04:00
aleka 348e82293e show exchange offline dialog for testnet reset (#71) 2023-10-16 13:08:54 -04:00
Jared Vu 48a48b4d70 Screen (#56)
* useDydxClient: Add screen endpoint

* Screen api in onboarding flow

* PnlChart rounding

* UnauthorizedDialog

* Add RateLimitDialog

* Update dialog open logic

* nits

* Screen before Transfer

* Validate network, remove input autofill color

* Use screenAddresses from dydxClient

* Check recipientAddresses

* lock-file

* Change Wallet Restricted Dialog to v4-blocked message

* nits

* Unused param

* consolidate environment validateFn

* Remove extra space, simplify WithdrawForm error msg

* Simply map logic, rearrange priority of screened messages

* WalletRestricted -> RestrictedWallet

* Update restriction modal title and add something went wrong

* Handle 429 rate limit
2023-10-16 09:36:09 -07:00
Bill 944cea0d3d Hide wallet options (#70)
* Hide wallet options

* remove WC 1

* gitignore .env

* remove .env

* remove wc1
2023-10-16 09:07:35 -07:00
Rui 4ea2bdf53d Updated wallets.json and add chain name and logo to env.json (#68) 2023-10-13 14:44:34 -07:00
aleka c40f5eb549 update about wallets link and localized string nits (#69)
* update about wallets link and localized string nits

* udpate wallet connect2 metadata
2023-10-12 17:10:51 -04:00
129 changed files with 3280 additions and 2018 deletions
-6
View File
@@ -1,6 +0,0 @@
VITE_BASE_URL=https://v4.testnet.dydx.exchange
VITE_ALCHEMY_API_KEY=FP275q327Yh7qswtZWenbPXdZZdnAFmC
VITE_WALLETCONNECT1_BRIDGE=wss://api.dydx.exchange/wc/
VITE_WALLETCONNECT2_PROJECT_ID=fbe94eaa691fa8d929561f8567062b32
+7 -3
View File
@@ -4,7 +4,11 @@ VITE_ALCHEMY_API_KEY=
VITE_PK_ENCRYPTION_KEY= VITE_PK_ENCRYPTION_KEY=
VITE_WALLETCONNECT1_BRIDGE= VITE_V3_TOKEN_ADDRESS=
VITE_WALLETCONNECT2_PROJECT_ID= VITE_TOKEN_MIGRATION_URI=
VITE_V3_TOKEN_ADDRESS= AMPLITUDE_API_KEY=
BUGSNAG_API_KEY=
IOS_APP_ID=
INTERCOM_APP_ID=
STATUS_PAGE_SCRIPT_URI=
+1
View File
@@ -13,6 +13,7 @@ dist
dist-ssr dist-ssr
*.local *.local
*.key *.key
.env
# Editor directories and files # Editor directories and files
.vscode/* .vscode/*
+2 -41
View File
@@ -1,48 +1,9 @@
Subject to your compliance with applicable law, you are granted the right to use the Licensed Work (defined below) under the terms of the below licenses; provided, however, that if you violate any such applicable law in your use of the Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Licensed Work will automatically and immediately terminate.
Use of this software before the Change Date specified in the LICENSE file is governed by the Business Source License included in the LICENSE file and at https://spdx.org/licenses/BUSL-1.1.html.
On and after the Change Date specified in the LICENSE file, use of this software will be governed by the Change License (GNU Affero GPL v3) as specified in the LICENSE file.
Business Source License 1.1
Business Source License text copyright © 2023 MariaDB plc, All Rights Reserved. “Business Source License” is a trademark of MariaDB plc.
Copyright (C) 2023 dYdX Trading Inc. Copyright (C) 2023 dYdX Trading Inc.
Parameters Subject to your compliance with applicable law and the v4 Terms of Use, available at dydx.exchange/legal, you are granted the right to use the Program or Licensed Work (defined below) under the terms of the GNU Affero General Public License as set forth below; provided, however, that if you violate any such applicable law in your use of the Program or Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Program or Licensed Work will automatically and immediately terminate.
Licensor: dYdX Trading Inc.
Licensed Work: dydxprotocol/cosmos-sdk, dydxprotocol/cometbft, dydxprotocol/v4-chain, dydxprotocol/v4-clients, dydxprotocol/v4-web, dydxprotocol/v4-abacus, dydxprotocol/v4-localization, dydxprotocol/v4-documentation, and any dYdX or dYdX Trading Inc. github repository reflecting a copy of this license, or link to this license.
Additional Use Grant: None
Change Date: On the later to occur of (i) the release of the Licensed Work labeled “dYdX Version 1.0 Affero GPL”, and which includes a document uploaded to the relevant github repository stating “The software in this repository is Version 1.0, subject to Affero GPL license”, and (ii) September 30, 2023 (approximate projected release of “Version 1.0” of this software).
Change License: GNU Affero GPL License v3
License text copyright © 2023 MariaDB plc, All Rights Reserved. “Business Source License” is a trademark of MariaDB plc.
Terms
The Licensor hereby grants you the right to copy, modify, create derivative works, redistribute, and make non-production use of the Licensed Work. The Licensor may make an Additional Use Grant, above, permitting limited production use.
Effective on the Change Date, or the fourth anniversary of the first publicly available distribution of a specific version of the Licensed Work under this License, whichever comes first, the Licensor hereby grants you rights under the terms of the Change License, and the rights granted in the paragraph above terminate.
If your use of the Licensed Work does not comply with the requirements currently in effect as described in this License, you must purchase a commercial license from the Licensor, its affiliated entities, or authorized resellers, or you must refrain from using the Licensed Work.
All copies of the original and modified Licensed Work, and derivative works of the Licensed Work, are subject to this License. This License applies separately for each version of the Licensed Work and the Change Date may vary for each version of the Licensed Work released by Licensor.
You must conspicuously display this License on each original or modified copy of the Licensed Work. If you receive the Licensed Work in original or modified form from a third party, the terms and conditions set forth in this License apply to your use of that work.
Any use of the Licensed Work in violation of this License will automatically terminate your rights under this License for the current and all other versions of the Licensed Work.
This License does not grant you any right in any trademark or logo of Licensor or its affiliates (provided that you may use a trademark or logo of Licensor as expressly required by this License).TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE. MariaDB hereby grants you permission to use this Licenses text to license your works, and to refer to it using the trademark “Business Source License”, as long as you comply with the Covenants of Licensor below.
Covenants of Licensor
In consideration of the right to use this Licenses text and the “Business Source License” name and trademark, Licensor covenants to MariaDB, and to all other recipients of the licensed work to be provided by Licensor:
To specify as the Change License the GPL Version 2.0 or any later version, or a license that is compatible with GPL Version 2.0 or a later version, where “compatible” means that software provided under the Change License can be included in a program with software provided under GPL Version 2.0 or a later version. Licensor may specify additional Change Licenses without limitation.
To either: (a) specify an additional grant of rights to use that does not impose any additional restriction on the right granted in this License, as the Additional Use Grant; or (b) insert the text “None” to specify a Change Date. Not to modify this License in any other way.
Notice
The Business Source License (this document, or the “License”) is not an Open Source license. However, the Licensed Work will eventually be made available under an Open Source License, as stated in this License.
The “Program” or “Licensed Work” shall mean any of the following: dydxprotocol/cosmos-sdk, dydxprotocol/cometbft, dydxprotocol/v4-chain, dydxprotocol/v4-clients, dydxprotocol/v4-web, dydxprotocol/v4-abacus, dydxprotocol/v4-localization, dydxprotocol/v4-documentation, and any dYdX or dYdX Trading Inc. repository reflecting a copy of, or link to, this license.
OPEN SOURCE LICENSE BELOW - TO BE APPLIED AFTER THE CHANGE DATE.
Copyright (C) 2023 dYdX Trading Inc.
Subject to your compliance with applicable law, you are granted the right to use the Licensed Work (defined below) under the terms of the GNU Affero General Public License as set forth below; provided, however, that if you violate any such applicable law in your use of the Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Licensed Work will automatically and immediately terminate.
The GNU Affero General Public License The GNU Affero General Public License
+46 -6
View File
@@ -1,16 +1,17 @@
<p align="center"><img src="https://dydx.exchange/icon.svg?" width="256" /></p> <p align="center"><img src="https://dydx.exchange/icon.svg?" width="256" /></p>
<h1 align="center">v4 Web</h1> <h1 align="center">dYdX Chain Web</h1>
<div align="center"> <div align="center">
<a href='https://github.com/dydxprotocol/v4-web/blob/main/LICENSE'> <a href='https://github.com/dydxprotocol/v4-web/blob/main/LICENSE'>
<img src='https://img.shields.io/badge/License-BSL_1.1-blue' alt='License' /> <img src='https://img.shields.io/badge/License-AGPL_v3-blue.svg' alt='License' />
</a> </a>
</div> </div>
## Prerequisites ## Prerequisites
- Node.js version 18 and `pnpm` installed on your system - Node.js version 18 and `pnpm` installed on your system
- Wallet Connect account
For deploying with Vercel, create an account with [Vercel](https://vercel.com/signup) if you don't have one already. For deploying with Vercel, create an account with [Vercel](https://vercel.com/signup) if you don't have one already.
@@ -25,7 +26,7 @@ Alternatively, follow the [IPFS Kubo installation guide](https://docs.ipfs.tech
## Part 1: Setting up your local environment ## Part 1: Setting up your local environment
### Step 1: Clone the repo ### 1. Clone the repo
Clone the repository and navigate to its directory: Clone the repository and navigate to its directory:
@@ -34,7 +35,7 @@ git clone https://github.com/dydxprotocol/v4-web.git
cd v4-web cd v4-web
``` ```
### Step 2: Install pnpm and dependencies ### 2. Install pnpm and dependencies
Install pnpm and the project dependencies: Install pnpm and the project dependencies:
@@ -61,7 +62,31 @@ pnpm ladle
This will automatically open your default browser at `http://localhost:61000`. This will automatically open your default browser at `http://localhost:61000`.
## Part 3: Deploying with Vercel ## Part 3: Configuring environment
Add or modify the relevant endpoints, links and options in `/public/configs/env.json`.
You'll need to provide a Wallet Connect project id to enable onboarding and wallet connection:
- Create a project on https://cloud.walletconnect.com/app
- Copy over the project ID into this [field](https://github.com/dydxprotocol/v4-web/blob/67ecbd75b43e0c264b7b4d2d9b3d969830b0621c/public/configs/env.json#L822C33-L822C46)
## Part 4: Set Enviornment variables
Set environment variables via `.env`.
- `VITE_BASE_URL` (required): The base URL of the deployment (e.g., `https://www.example.com`).
- `VITE_ALCHEMY_API_KEY` (optional): Add an Alchemy API key for EVM interactions; the app will fall back to public RPCs if not provided.
- `VITE_PK_ENCRYPTION_KEY` (optional): AES encryption key used for signature obfuscation; necessary for enabling the "Remember Me" feature.
- `VITE_V3_TOKEN_ADDRESS` (optional): Address of the V3 $DYDX token.
- `VITE_TOKEN_MIGRATION_URI` (optional): The URL of the token migration website.
- `AMPLITUDE_API_KEY` (optional): Amplitude API key for enabling Amplitude; used with `pnpm run build:inject-amplitude`.
- `BUGSNAG_API_KEY` (optional): API key for enabling Bugsnag; used with `pnpm run build:inject-bugsnag`.
- `IOS_APP_ID` (optional): iOS app ID used for enabling deep linking to the iOS app; used with `pnpm run build:inject-app-deeplinks`.
- `INTERCOM_APP_ID` (optional): Used for enabling Intercom; utilized with `pnpm run build:inject-intercom`.
- `STATUS_PAGE_SCRIPT_URI` (optional): Used for enabling the status page; used with `pnpm run build:inject-statuspage`.
# Deployments
## Deploying with Vercel
### Step 1: Connect your repository to Vercel ### Step 1: Connect your repository to Vercel
@@ -78,7 +103,7 @@ If you wish to incorporate analytics via Amplitude and Bugsnag, you can use our
For more details, check out Vercel's [official documentation](https://vercel.com/docs). For more details, check out Vercel's [official documentation](https://vercel.com/docs).
## Part 4: Deploying to IPFS ## Deploying to IPFS
### web3.storage: deploy to IPFS via web3.storage using the provided script ### web3.storage: deploy to IPFS via web3.storage using the provided script
@@ -110,3 +135,18 @@ To access your content on IPFS:
2. **Public IPFS gateway:** Access your content via a public IPFS gateway, such as [https://dweb.link](https://dweb.link/) or [https://w3s.link/](https://w3s.link/). Use the gateway URL with your CID appended, like `https://dweb.link/ipfs/your_cid`. 2. **Public IPFS gateway:** Access your content via a public IPFS gateway, such as [https://dweb.link](https://dweb.link/) or [https://w3s.link/](https://w3s.link/). Use the gateway URL with your CID appended, like `https://dweb.link/ipfs/your_cid`.
Replace `your_cid` with the actual CID. Replace `your_cid` with the actual CID.
## Cloudflare Settings
We recommend that you add your website to Cloudflare for additional security settings.
To block OFAC Sanctioned countries:
1. Navigate Websites > Domain > Security > WAF
2. Create Rule with the following settings:
* If incoming requests match
`(ip.geoip.country eq "CU") or (ip.geoip.country eq "IR") or (ip.geoip.country eq "KP") or (ip.geoip.country eq "SY") or (ip.geoip.country eq "MM") or (ip.geoip.subdivision_1_iso_code eq "UA-09") or (ip.geoip.subdivision_1_iso_code eq "UA-14") or (ip.geoip.subdivision_1_iso_code eq "UA-43")`
* This rule will bring up a Cloudflare page when a restricted geography tries to access your site. You will have the option to display:
1. Custom Text
- (e.g. `Because you appear to be a resident of, or trading from, a jurisdiction that violates our terms of use, or have engaged in activity that violates our terms of use, you have been blocked. You may withdraw your funds from the protocol at any time.`)
2. Default Cloudflare WAF block page
+6 -5
View File
@@ -1,9 +1,9 @@
{ {
"name": "dydx-chain-web", "name": "dydx-chain-web",
"private": true, "private": true,
"version": "0.0.1", "version": "1.0.0",
"type": "module", "type": "module",
"license": "BSL-1.1", "license": "AGPL-3.0",
"engines": { "engines": {
"node": ">=18" "node": ">=18"
}, },
@@ -13,6 +13,7 @@
"build:inject-app-deeplinks": "sh scripts/inject-app-deeplinks.sh", "build:inject-app-deeplinks": "sh scripts/inject-app-deeplinks.sh",
"build:inject-amplitude": "node scripts/inject-amplitude.js", "build:inject-amplitude": "node scripts/inject-amplitude.js",
"build:inject-bugsnag": "node scripts/inject-bugsnag.js", "build:inject-bugsnag": "node scripts/inject-bugsnag.js",
"build:inject-intercom": "node scripts/inject-intercom.js",
"build:inject-statuspage": "node scripts/inject-statuspage.js", "build:inject-statuspage": "node scripts/inject-statuspage.js",
"deploy:ipfs": "node scripts/upload-ipfs.js --verbose", "deploy:ipfs": "node scripts/upload-ipfs.js --verbose",
"deploy:update-ipns": "node scripts/update-ipns.js", "deploy:update-ipns": "node scripts/update-ipns.js",
@@ -38,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": "^0.6.4", "@dydxprotocol/v4-abacus": "^1.0.10",
"@dydxprotocol/v4-client-js": "^0.36.1", "@dydxprotocol/v4-client-js": "^1.0.0",
"@dydxprotocol/v4-localization": "^0.1.24", "@dydxprotocol/v4-localization": "^1.0.0",
"@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-collapsible": "^1.0.3", "@radix-ui/react-collapsible": "^1.0.3",
+28 -27
View File
@@ -27,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: ^0.6.4 specifier: ^1.0.10
version: 0.6.4 version: 1.0.10
'@dydxprotocol/v4-client-js': '@dydxprotocol/v4-client-js':
specifier: ^0.36.1 specifier: ^1.0.0
version: 0.36.1 version: 1.0.0
'@dydxprotocol/v4-localization': '@dydxprotocol/v4-localization':
specifier: ^0.1.24 specifier: ^1.0.0
version: 0.1.24 version: 1.0.0
'@ethersproject/providers': '@ethersproject/providers':
specifier: ^5.7.2 specifier: ^5.7.2
version: 5.7.2 version: 5.7.2
@@ -645,7 +645,7 @@ packages:
/@confio/ics23@0.6.8: /@confio/ics23@0.6.8:
resolution: {integrity: sha512-wB6uo+3A50m0sW/EWcU64xpV/8wShZ6bMTa7pF8eYsTrSkQA7oLUIJcs/wb8g4y2Oyq701BaGiO6n/ak5WXO1w==} resolution: {integrity: sha512-wB6uo+3A50m0sW/EWcU64xpV/8wShZ6bMTa7pF8eYsTrSkQA7oLUIJcs/wb8g4y2Oyq701BaGiO6n/ak5WXO1w==}
dependencies: dependencies:
'@noble/hashes': 1.3.1 '@noble/hashes': 1.3.2
protobufjs: 6.11.4 protobufjs: 6.11.4
dev: false dev: false
@@ -717,7 +717,7 @@ packages:
'@cosmjs/encoding': 0.30.1 '@cosmjs/encoding': 0.30.1
'@cosmjs/math': 0.30.1 '@cosmjs/math': 0.30.1
'@cosmjs/utils': 0.30.1 '@cosmjs/utils': 0.30.1
'@noble/hashes': 1.3.1 '@noble/hashes': 1.3.2
bn.js: 5.2.1 bn.js: 5.2.1
elliptic: 6.5.4 elliptic: 6.5.4
libsodium-wrappers: 0.7.11 libsodium-wrappers: 0.7.11
@@ -979,12 +979,12 @@ packages:
resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==} resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
dev: true dev: true
/@dydxprotocol/v4-abacus@0.6.4: /@dydxprotocol/v4-abacus@1.0.10:
resolution: {integrity: sha512-eH+/9Q/OnQtwzBwM1BJyXybFPdivGmFQWrxM71MFWGs6uIQGbZX775mpoa8deweSTyQ/QrRLRQ1mP2BPDgBQYg==} resolution: {integrity: sha512-SdxI/JcyxM1ydtR9ImWujeurea3gbxj37qYnw1wz829BQiZ05uNEtll3xJCI0MjpG+01ARsxVys7SHbpjSxwOg==}
dev: false dev: false
/@dydxprotocol/v4-client-js@0.36.1: /@dydxprotocol/v4-client-js@1.0.0:
resolution: {integrity: sha512-KJ3MtWI61wmm+xZtXQd7/hYKIoVFG32TRdyyVaXXO8vpW9Oqd0JD8QSM/wuegkciAh5YmP/BrDzYuu77zHO6yg==} resolution: {integrity: sha512-ehfHO+zQy795TcJRwtiawadFHZyh4HnpJNP26hCGsIjLE5q6LLHweQHpK/1N/sXU1PBOuQwc7iaJnFop6gYauQ==}
dependencies: dependencies:
'@cosmjs/amino': 0.30.1 '@cosmjs/amino': 0.30.1
'@cosmjs/encoding': 0.31.1 '@cosmjs/encoding': 0.31.1
@@ -993,14 +993,15 @@ packages:
'@cosmjs/stargate': 0.30.1 '@cosmjs/stargate': 0.30.1
'@cosmjs/tendermint-rpc': 0.30.1 '@cosmjs/tendermint-rpc': 0.30.1
'@cosmjs/utils': 0.31.1 '@cosmjs/utils': 0.31.1
'@dydxprotocol/v4-proto': 0.2.1 '@dydxprotocol/v4-proto': 0.4.1
'@osmonauts/lcd': 0.6.0 '@osmonauts/lcd': 0.6.0
'@scure/bip32': 1.3.1 '@scure/bip32': 1.3.2
'@scure/bip39': 1.2.1 '@scure/bip39': 1.2.1
axios: 1.1.3 axios: 1.1.3
bech32: 1.1.4 bech32: 1.1.4
bignumber.js: 9.1.1 bignumber.js: 9.1.1
ethereum-cryptography: 2.1.2 ethereum-cryptography: 2.1.2
ethers: 6.6.1
long: 4.0.0 long: 4.0.0
protobufjs: 6.11.4 protobufjs: 6.11.4
ws: 8.13.0(bufferutil@4.0.7)(utf-8-validate@5.0.10) ws: 8.13.0(bufferutil@4.0.7)(utf-8-validate@5.0.10)
@@ -1010,12 +1011,12 @@ packages:
- utf-8-validate - utf-8-validate
dev: false dev: false
/@dydxprotocol/v4-localization@0.1.24: /@dydxprotocol/v4-localization@1.0.0:
resolution: {integrity: sha512-zSiu8+/6BWNWZXxe73zUp/UjuLG1Cp5UuhXKtbATqqkeZyVCs01QxbBCTs1MLfgsLh02IrfhXCPHvXnzZyReEw==} resolution: {integrity: sha512-U7QjOlzpfSAVEchkNDB3xYRx7okzdeYi83XsnHwI+EHa2quFm/2Y2dhrBkT5fqpZmhcwxb/vG8AZmFSToOf9hA==}
dev: false dev: false
/@dydxprotocol/v4-proto@0.2.1: /@dydxprotocol/v4-proto@0.4.1:
resolution: {integrity: sha512-Q5b/g331DoyMjBpO2/jtrxUX3WF5UaIKZp/unK332xuefHNFnkMYtZ05p0V71iSdO35tBdz8yt0VYP2WtUsp+w==} resolution: {integrity: sha512-2pBkokufWcxfIpiXE6QuQOBXUe154OTp6ojCIdOPW9TFLxzchoygxXnb5dL6rAQVNj9Qbg+hhXBllutt4m99dw==}
dependencies: dependencies:
protobufjs: 6.11.4 protobufjs: 6.11.4
dev: false dev: false
@@ -4708,8 +4709,8 @@ packages:
resolution: {integrity: sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==} resolution: {integrity: sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==}
dependencies: dependencies:
'@noble/curves': 1.1.0 '@noble/curves': 1.1.0
'@noble/hashes': 1.3.1 '@noble/hashes': 1.3.2
'@scure/base': 1.1.1 '@scure/base': 1.1.3
dev: false dev: false
/@scure/bip32@1.3.2: /@scure/bip32@1.3.2:
@@ -4731,7 +4732,7 @@ packages:
resolution: {integrity: sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==} resolution: {integrity: sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==}
dependencies: dependencies:
'@noble/hashes': 1.3.2 '@noble/hashes': 1.3.2
'@scure/base': 1.1.1 '@scure/base': 1.1.3
dev: false dev: false
/@solana/buffer-layout@4.0.1: /@solana/buffer-layout@4.0.1:
@@ -4745,8 +4746,8 @@ packages:
resolution: {integrity: sha512-up5VG1dK+GPhykmuMIozJZBbVqpm77vbOG6/r5dS7NBGZonwHfTLdBbsYc3rjmaQ4DpCXUa3tUc4RZHRORvZrw==} resolution: {integrity: sha512-up5VG1dK+GPhykmuMIozJZBbVqpm77vbOG6/r5dS7NBGZonwHfTLdBbsYc3rjmaQ4DpCXUa3tUc4RZHRORvZrw==}
dependencies: dependencies:
'@babel/runtime': 7.22.10 '@babel/runtime': 7.22.10
'@noble/curves': 1.1.0 '@noble/curves': 1.2.0
'@noble/hashes': 1.3.1 '@noble/hashes': 1.3.2
'@solana/buffer-layout': 4.0.1 '@solana/buffer-layout': 4.0.1
agentkeepalive: 4.5.0 agentkeepalive: 4.5.0
bigint-buffer: 1.1.5 bigint-buffer: 1.1.5
@@ -7144,7 +7145,7 @@ packages:
/bip39@3.1.0: /bip39@3.1.0:
resolution: {integrity: sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==} resolution: {integrity: sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==}
dependencies: dependencies:
'@noble/hashes': 1.3.1 '@noble/hashes': 1.3.2
dev: false dev: false
/bl@5.1.0: /bl@5.1.0:
@@ -7655,7 +7656,7 @@ packages:
resolution: {integrity: sha512-WIdaQ8uW1vIbYvNnAVunkC6yxTrneJC7VQ5UUQ0kuw8b0C0A39KTIpoQHCfc8tV7o9vF4niwRhdXEdfAgQEsQQ==} resolution: {integrity: sha512-WIdaQ8uW1vIbYvNnAVunkC6yxTrneJC7VQ5UUQ0kuw8b0C0A39KTIpoQHCfc8tV7o9vF4niwRhdXEdfAgQEsQQ==}
dependencies: dependencies:
cosmos-directory-types: 0.0.6 cosmos-directory-types: 0.0.6
node-fetch-native: 1.4.0 node-fetch-native: 1.4.1
dev: false dev: false
/cosmos-directory-types@0.0.6: /cosmos-directory-types@0.0.6:
@@ -11286,8 +11287,8 @@ packages:
engines: {node: '>=10.5.0'} engines: {node: '>=10.5.0'}
dev: true dev: true
/node-fetch-native@1.4.0: /node-fetch-native@1.4.1:
resolution: {integrity: sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==} resolution: {integrity: sha512-NsXBU0UgBxo2rQLOeWNZqS3fvflWePMECr8CoSWoSTqCqGbVVsvl9vZu1HfQicYN0g5piV9Gh8RTEvo/uP752w==}
dev: false dev: false
/node-fetch@2.6.12: /node-fetch@2.6.12:
+13 -37
View File
@@ -8,67 +8,43 @@
], ],
"components": [ "components": [
{ {
"/": "/trade/*" "/": "/"
}, },
{ {
"/": "/r/*" "/": "/#/"
}, },
{ {
"/": "/portfolio/overview" "/": "*/markets"
}, },
{ {
"/": "/portfolio/positions" "/": "*/trade"
}, },
{ {
"/": "/portfolio/orders" "/": "*/trade/*"
}, },
{ {
"/": "/portfolio/fees" "/": "*/portfolio"
}, },
{ {
"/": "/portfolio/history" "/": "*/portfolio/overview"
}, },
{ {
"/": "/portfolio/history/trades" "/": "*/portfolio/positions"
}, },
{ {
"/": "/portfolio/history/transfers" "/": "*/portfolio/orders"
}, },
{ {
"/": "/portfolio/history/funding" "/": "*/portfolio/fees"
}, },
{ {
"/": "/rewards" "/": "*/portfolio/history/trades"
}, },
{ {
"/": "/my-profile" "/": "*/portfolio/history/transfers"
}, },
{ {
"/": "/rankings/hedgies" "/": "*/portfolio/history/funding"
},
{
"/": "/rankings/competition"
},
{
"/": "/rankings/diamond"
},
{
"/": "/rankings/platinum"
},
{
"/": "/rankings/gold"
},
{
"/": "/rankings/silver"
},
{
"/": "/rankings/bronze"
},
{
"/": "/rankings/pnl-absolute"
},
{
"/": "/rankings/pnl-percent"
}, },
{ {
"/": "/walletsegue", "/": "/walletsegue",
Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 KiB

After

Width:  |  Height:  |  Size: 122 KiB

+398 -161
View File
@@ -1,4 +1,9 @@
{ {
"apps": {
"iOS": {
"scheme": "dydxv4"
}
},
"deployments": { "deployments": {
"MAINNET": { "MAINNET": {
"environments": [ "environments": [
@@ -22,10 +27,11 @@
"dydxprotocol-staging-west", "dydxprotocol-staging-west",
"dydxprotocol-testnet", "dydxprotocol-testnet",
"dydxprotocol-testnet-dydx", "dydxprotocol-testnet-dydx",
"dydxprotocol-testnet-dsrv",
"dydxprotocol-testnet-nodefleet", "dydxprotocol-testnet-nodefleet",
"dydxprotocol-testnet-kingnodes", "dydxprotocol-testnet-kingnodes",
"dydxprotocol-testnet-liquify" "dydxprotocol-testnet-liquify",
"dydxprotocol-testnet-polkachu",
"dydxprotocol-testnet-bware"
], ],
"default": "dydxprotocol-testnet" "default": "dydxprotocol-testnet"
} }
@@ -35,38 +41,55 @@
"name": "v4 Dev", "name": "v4 Dev",
"ethereumChainId": "5", "ethereumChainId": "5",
"dydxChainId": "dydxprotocol-testnet", "dydxChainId": "dydxprotocol-testnet",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false, "isMainNet": false,
"tokens": { "tokens": {
"chain": { "chain": {
"name": "DYDX", "name": "Dv4TNT",
"denom": "dv4tnt", "denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
"endpoints": { "endpoints": {
"indexers": [ "indexers": [
{ {
"api": "http://indexer.v4dev.dydx.exchange", "api": "https://indexer.v4dev.dydx.exchange",
"socket": "wss://indexer.v4dev.dydx.exchange" "socket": "wss://indexer.v4dev.dydx.exchange"
} }
], ],
"validators": [ "validators": [
"http://validator.v4dev.dydx.exchange" "https://validator.v4dev.dydx.exchange"
], ],
"0xsquid": "https://testnet.api.0xsquid.com", "0xsquid": "https://testnet.api.0xsquid.com",
"faucet": "http://faucet.v4dev.dydx.exchange" "faucet": "https://faucet.v4dev.dydx.exchange"
}, },
"links": { "links": {
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -75,9 +98,6 @@
"description": "dYdX v4 App", "description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png" "iconUrl": "/logos/dydx-x.png"
}, },
"v1": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
},
"v2": { "v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
} }
@@ -94,17 +114,22 @@
"name": "v4 Dev 2", "name": "v4 Dev 2",
"ethereumChainId": "5", "ethereumChainId": "5",
"dydxChainId": "dydxprotocol-testnet", "dydxChainId": "dydxprotocol-testnet",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false, "isMainNet": false,
"tokens": { "tokens": {
"chain": { "chain": {
"name": "DYDX", "name": "Dv4TNT",
"denom": "dv4tnt", "denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
@@ -116,7 +141,7 @@
} }
], ],
"validators": [ "validators": [
"http://35.75.227.118" "http://54.92.118.111"
], ],
"0xsquid": "https://testnet.api.0xsquid.com" "0xsquid": "https://testnet.api.0xsquid.com"
}, },
@@ -124,7 +149,19 @@
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -133,9 +170,6 @@
"description": "dYdX v4 App", "description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png" "iconUrl": "/logos/dydx-x.png"
}, },
"v1": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
},
"v2": { "v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
} }
@@ -152,25 +186,30 @@
"name": "v4 Dev 4", "name": "v4 Dev 4",
"ethereumChainId": "5", "ethereumChainId": "5",
"dydxChainId": "dydxprotocol-testnet", "dydxChainId": "dydxprotocol-testnet",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false, "isMainNet": false,
"tokens": { "tokens": {
"chain": { "chain": {
"name": "DYDX", "name": "Dv4TNT",
"denom": "dv4tnt", "denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
"endpoints": { "endpoints": {
"indexers": [ "indexers": [
{ {
"api": "http://indexer.v4dev4.dydx.exchange", "api": "https://indexer.v4dev4.dydx.exchange",
"socket": "ws://indexer.v4dev4.dydx.exchange" "socket": "wss://indexer.v4dev4.dydx.exchange"
} }
], ],
"validators": [ "validators": [
@@ -182,7 +221,19 @@
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -191,9 +242,6 @@
"description": "dYdX v4 App", "description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png" "iconUrl": "/logos/dydx-x.png"
}, },
"v1": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
},
"v2": { "v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
} }
@@ -210,17 +258,22 @@
"name": "v4 Dev 5", "name": "v4 Dev 5",
"ethereumChainId": "5", "ethereumChainId": "5",
"dydxChainId": "dydxprotocol-testnet", "dydxChainId": "dydxprotocol-testnet",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false, "isMainNet": false,
"tokens": { "tokens": {
"chain": { "chain": {
"name": "DYDX", "name": "Dv4TNT",
"denom": "dv4tnt", "denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
@@ -240,7 +293,19 @@
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -249,9 +314,6 @@
"description": "dYdX v4 App", "description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png" "iconUrl": "/logos/dydx-x.png"
}, },
"v1": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
},
"v2": { "v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
} }
@@ -268,17 +330,22 @@
"name": "v4 Staging", "name": "v4 Staging",
"ethereumChainId": "5", "ethereumChainId": "5",
"dydxChainId": "dydxprotocol-testnet", "dydxChainId": "dydxprotocol-testnet",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false, "isMainNet": false,
"tokens": { "tokens": {
"chain": { "chain": {
"name": "DYDX", "name": "Dv4TNT",
"denom": "dv4tnt", "denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
@@ -299,10 +366,20 @@
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"documentation": "https://v4-teacher.vercel.app/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"help": "https://help.dydx.exchange",
"foundation": "https://www.dydx.foundation",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -311,9 +388,6 @@
"description": "dYdX v4 App", "description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png" "iconUrl": "/logos/dydx-x.png"
}, },
"v1": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
},
"v2": { "v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
} }
@@ -330,17 +404,22 @@
"name": "v4 Staging West", "name": "v4 Staging West",
"ethereumChainId": "5", "ethereumChainId": "5",
"dydxChainId": "dydxprotocol-testnet", "dydxChainId": "dydxprotocol-testnet",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false, "isMainNet": false,
"tokens": { "tokens": {
"chain": { "chain": {
"name": "DYDX", "name": "Dv4TNT",
"denom": "dv4tnt", "denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
@@ -361,10 +440,20 @@
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"documentation": "https://v4-teacher.vercel.app/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"help": "https://help.dydx.exchange",
"foundation": "https://www.dydx.foundation",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -373,9 +462,6 @@
"description": "dYdX v4 App", "description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png" "iconUrl": "/logos/dydx-x.png"
}, },
"v1": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
},
"v2": { "v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
} }
@@ -391,18 +477,23 @@
"dydxprotocol-testnet": { "dydxprotocol-testnet": {
"name": "v4 Public Testnet", "name": "v4 Public Testnet",
"ethereumChainId": "5", "ethereumChainId": "5",
"dydxChainId": "dydx-testnet-3", "dydxChainId": "dydx-testnet-4",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false, "isMainNet": false,
"tokens": { "tokens": {
"chain": { "chain": {
"name": "DYDX", "name": "Dv4TNT",
"denom": "dv4tnt", "denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
@@ -414,6 +505,8 @@
} }
], ],
"validators": [ "validators": [
"https://dydx-testnet-full-rpc.public.blastapi.io/",
"https://dydx-testnet-rpc.polkachu.com/",
"https://dydx-testnet.nodefleet.org", "https://dydx-testnet.nodefleet.org",
"https://test-dydx.kingnodes.com", "https://test-dydx.kingnodes.com",
"https://dydx-rpc.liquify.com/api=8878132/dydx" "https://dydx-rpc.liquify.com/api=8878132/dydx"
@@ -425,10 +518,20 @@
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"documentation": "https://v4-teacher.vercel.app/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -437,9 +540,6 @@
"description": "dYdX v4 App", "description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png" "iconUrl": "/logos/dydx-x.png"
}, },
"v1": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
},
"v2": { "v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
} }
@@ -448,25 +548,30 @@
"callbackUrl": "/walletsegue" "callbackUrl": "/walletsegue"
}, },
"images": "/wallets/", "images": "/wallets/",
"signTypedDataAction": "dYdX V4 Onboarding", "signTypedDataAction": "dYdX Chain Onboarding",
"signTypedDataDomainName": "dYdX V4" "signTypedDataDomainName": "dYdX V4"
} }
}, },
"dydxprotocol-testnet-dydx": { "dydxprotocol-testnet-dydx": {
"name": "v4 Public Testnet/dYdX", "name": "v4 Public Testnet/dYdX",
"ethereumChainId": "5", "ethereumChainId": "5",
"dydxChainId": "dydx-testnet-3", "dydxChainId": "dydx-testnet-4",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false, "isMainNet": false,
"tokens": { "tokens": {
"chain": { "chain": {
"name": "DYDX", "name": "Dv4TNT",
"denom": "dv4tnt", "denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
@@ -488,10 +593,20 @@
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"statusPage": "https://status.v4testnet.dydx.exchange/", "statusPage": "https://status.v4testnet.dydx.exchange/",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"documentation": "https://v4-teacher.vercel.app/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -500,9 +615,6 @@
"description": "dYdX v4 App", "description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png" "iconUrl": "/logos/dydx-x.png"
}, },
"v1": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
},
"v2": { "v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
} }
@@ -511,88 +623,30 @@
"callbackUrl": "/walletsegue" "callbackUrl": "/walletsegue"
}, },
"images": "/wallets/", "images": "/wallets/",
"signTypedDataAction": "dYdX V4 Onboarding", "signTypedDataAction": "dYdX Chain Onboarding",
"signTypedDataDomainName": "dYdX V4"
}
},
"dydxprotocol-testnet-dsrv": {
"name": "v4 Public Testnet/DSRV",
"ethereumChainId": "5",
"dydxChainId": "dydx-testnet-3",
"isMainNet": false,
"tokens": {
"chain": {
"name": "DYDX",
"denom": "dv4tnt",
"image": "/currencies/dydx.png"
},
"usdc": {
"name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc",
"image": "/currencies/usdc.png"
}
},
"endpoints": {
"indexers": [
{
"api": "https://dydx-testnet.imperator.co",
"socket": "wss://dydx-testnet.imperator.co"
}
],
"validators": [
"https://dydx-testnet-archive.allthatnode.com:26657/XZvMM41hESf8PJrEQiTzbCOMVyFca79R"
],
"0xsquid": "https://testnet.api.squidrouter.com",
"faucet": "https://faucet.v4testnet.dydx.exchange"
},
"links": {
"tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy",
"statusPage": "https://status.v4testnet.dydx.exchange/",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"documentation": "https://v4-teacher.vercel.app/",
"community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog"
},
"wallets": {
"walletconnect": {
"client": {
"name": "dYdX v4",
"description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png"
},
"v1": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
},
"v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
}
},
"walletSegue": {
"callbackUrl": "/walletsegue"
},
"images": "/wallets/",
"signTypedDataAction": "dYdX V4 Onboarding",
"signTypedDataDomainName": "dYdX V4" "signTypedDataDomainName": "dYdX V4"
} }
}, },
"dydxprotocol-testnet-nodefleet": { "dydxprotocol-testnet-nodefleet": {
"name": "v4 Public Testnet/nodefleet", "name": "v4 Public Testnet/nodefleet",
"ethereumChainId": "5", "ethereumChainId": "5",
"dydxChainId": "dydx-testnet-3", "dydxChainId": "dydx-testnet-4",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false, "isMainNet": false,
"tokens": { "tokens": {
"chain": { "chain": {
"name": "DYDX", "name": "Dv4TNT",
"denom": "dv4tnt", "denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
@@ -614,10 +668,20 @@
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"statusPage": "https://status.v4testnet.dydx.exchange/", "statusPage": "https://status.v4testnet.dydx.exchange/",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"documentation": "https://v4-teacher.vercel.app/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -626,9 +690,6 @@
"description": "dYdX v4 App", "description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png" "iconUrl": "/logos/dydx-x.png"
}, },
"v1": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
},
"v2": { "v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
} }
@@ -637,25 +698,30 @@
"callbackUrl": "/walletsegue" "callbackUrl": "/walletsegue"
}, },
"images": "/wallets/", "images": "/wallets/",
"signTypedDataAction": "dYdX V4 Onboarding", "signTypedDataAction": "dYdX Chain Onboarding",
"signTypedDataDomainName": "dYdX V4" "signTypedDataDomainName": "dYdX V4"
} }
}, },
"dydxprotocol-testnet-kingnodes": { "dydxprotocol-testnet-kingnodes": {
"name": "v4 Public Testnet/KingNodes", "name": "v4 Public Testnet/KingNodes",
"ethereumChainId": "5", "ethereumChainId": "5",
"dydxChainId": "dydx-testnet-3", "dydxChainId": "dydx-testnet-4",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false, "isMainNet": false,
"tokens": { "tokens": {
"chain": { "chain": {
"name": "DYDX", "name": "Dv4TNT",
"denom": "dv4tnt", "denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
@@ -677,10 +743,20 @@
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"statusPage": "https://status.v4testnet.dydx.exchange/", "statusPage": "https://status.v4testnet.dydx.exchange/",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"documentation": "https://v4-teacher.vercel.app/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -689,9 +765,6 @@
"description": "dYdX v4 App", "description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png" "iconUrl": "/logos/dydx-x.png"
}, },
"v1": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
},
"v2": { "v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
} }
@@ -700,25 +773,30 @@
"callbackUrl": "/walletsegue" "callbackUrl": "/walletsegue"
}, },
"images": "/wallets/", "images": "/wallets/",
"signTypedDataAction": "dYdX V4 Onboarding", "signTypedDataAction": "dYdX Chain Onboarding",
"signTypedDataDomainName": "dYdX V4" "signTypedDataDomainName": "dYdX V4"
} }
}, },
"dydxprotocol-testnet-liquify": { "dydxprotocol-testnet-liquify": {
"name": "v4 Public Testnet/Liquify", "name": "v4 Public Testnet/Liquify",
"ethereumChainId": "5", "ethereumChainId": "5",
"dydxChainId": "dydx-testnet-3", "dydxChainId": "dydx-testnet-4",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false, "isMainNet": false,
"tokens": { "tokens": {
"chain": { "chain": {
"name": "DYDX", "name": "Dv4TNT",
"denom": "dv4tnt", "denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
@@ -740,7 +818,82 @@
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"statusPage": "https://status.v4testnet.dydx.exchange/", "statusPage": "https://status.v4testnet.dydx.exchange/",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"documentation": "https://v4-teacher.vercel.app/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
},
"wallets": {
"walletconnect": {
"client": {
"name": "dYdX v4",
"description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png"
},
"v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
}
},
"walletSegue": {
"callbackUrl": "/walletsegue"
},
"images": "/wallets/",
"signTypedDataAction": "dYdX Chain Onboarding",
"signTypedDataDomainName": "dYdX V4"
}
},
"dydxprotocol-testnet-polkachu": {
"name": "v4 Public Testnet/Polkahcu",
"ethereumChainId": "5",
"dydxChainId": "dydx-testnet-4",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false,
"tokens": {
"chain": {
"name": "Dv4TNT",
"denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png"
},
"usdc": {
"name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png"
}
},
"endpoints": {
"indexers": [
{
"api": "https://dydx-testnet.imperator.co",
"socket": "wss://dydx-testnet.imperator.co"
}
],
"validators": [
"https://dydx-testnet-rpc.polkachu.com/"
],
"0xsquid": "https://testnet.api.squidrouter.com",
"faucet": "https://faucet.v4testnet.dydx.exchange"
},
"links": {
"tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy",
"statusPage": "https://status.v4testnet.dydx.exchange/",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog"
@@ -752,8 +905,80 @@
"description": "dYdX v4 App", "description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png" "iconUrl": "/logos/dydx-x.png"
}, },
"v1": { "v2": {
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
}
},
"walletSegue": {
"callbackUrl": "/walletsegue"
},
"images": "/wallets/",
"signTypedDataAction": "dYdX Chain Onboarding",
"signTypedDataDomainName": "dYdX V4"
}
},
"dydxprotocol-testnet-bware": {
"name": "v4 Public Testnet/BWare",
"ethereumChainId": "5",
"dydxChainId": "dydx-testnet-4",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "dYdX-api",
"isMainNet": false,
"tokens": {
"chain": {
"name": "Dv4TNT",
"denom": "adv4tnt",
"decimals": 18,
"image": "/currencies/dydx.png"
},
"usdc": {
"name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png"
}
},
"endpoints": {
"indexers": [
{
"api": "https://dydx-testnet.imperator.co",
"socket": "wss://dydx-testnet.imperator.co"
}
],
"validators": [
"https://dydx-testnet-full-rpc.public.blastapi.io/"
],
"0xsquid": "https://testnet.api.squidrouter.com",
"faucet": "https://faucet.v4testnet.dydx.exchange"
},
"links": {
"tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy",
"statusPage": "https://status.v4testnet.dydx.exchange/",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnmore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnmore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnmore": "https://help.dydx.exchange",
"stakingLearnmore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnmore": "https://help.dydx.exchange",
"walletLearnmore": "https://www.dydx.academy/video/defi-wallet"
},
"wallets": {
"walletconnect": {
"client": {
"name": "dYdX v4",
"description": "dYdX v4 App",
"iconUrl": "/logos/dydx-x.png"
}, },
"v2": { "v2": {
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e" "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
@@ -763,26 +988,31 @@
"callbackUrl": "/walletsegue" "callbackUrl": "/walletsegue"
}, },
"images": "/wallets/", "images": "/wallets/",
"signTypedDataAction": "dYdX V4 Onboarding", "signTypedDataAction": "dYdX Chain Onboarding",
"signTypedDataDomainName": "dYdX V4" "signTypedDataDomainName": "dYdX V4"
} }
}, },
"dydxprotocol-mainet": { "dydxprotocol-mainnet": {
"name": "v4", "name": "v4",
"ethereumChainId": "1", "ethereumChainId": "1",
"dydxChainId": "[mainnet chain id]", "dydxChainId": "[mainnet chain id]",
"chainName": "dYdX Chain",
"chainLogo": "dydx-chain.png",
"squidIntegratorId": "[mainnet squid integrator id]",
"isMainNet": true, "isMainNet": true,
"tokens": { "tokens": {
"comment": "Change according to mainnet release", "comment": "Change according to mainnet release",
"chain": { "chain": {
"name": "DYDX", "name": "TokenName",
"denom": "dv4tnt", "denom": "tokenDenom",
"decimals": 18,
"image": "/currencies/dydx.png" "image": "/currencies/dydx.png"
}, },
"usdc": { "usdc": {
"name": "USDC", "name": "USDC",
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5", "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"gasDenom": "uusdc", "gasDenom": "uusdc",
"decimals": 6,
"image": "/currencies/usdc.png" "image": "/currencies/usdc.png"
} }
}, },
@@ -803,10 +1033,20 @@
"tos": "[HTTP link to TOS]", "tos": "[HTTP link to TOS]",
"privacy": "[HTTP link to Privacy Policy]", "privacy": "[HTTP link to Privacy Policy]",
"mintscan": "[HTTP link to Mintscan, with {tx_hash} placeholder]", "mintscan": "[HTTP link to Mintscan, with {tx_hash} placeholder]",
"mintscanBase": "[HTTP link to TOS mintsacn base url]",
"feedback": "[HTTP link to feedback form, can be null]",
"blogs": "[HTTP link to blogs, can be null]",
"foundation": "[HTTP link to foundation, can be null]",
"initialMarginFractionLearnMore": "[HTTP link to initial margin fraction learn more, can be null]",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"documentation": "[HTTP link to documentation, can be null]", "documentation": "[HTTP link to documentation, can be null]",
"community": "[HTTP link to community, can be null]", "community": "[HTTP link to community, can be null]",
"feedback": "[HTTP link to feedback form, can be null]", "help": "[HTTP link to help page, can be null]",
"blogs": "[HTTP link to blogs, can be null]" "governanceLearnMore": "[HTTP link to governance learn more, can be null]",
"stakingLearnMore": "[HTTP link to staking learn more, can be null]",
"keplrDashboard": "[HTTP link to keplr dashboard, can be null]",
"accountExportLearnMore": "[HTTP link to account export learn more, can be null]",
"walletLearnMore": "[HTTP link to wallet learn more, can be null]"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -815,9 +1055,6 @@
"description": "[Description of the app]", "description": "[Description of the app]",
"iconUrl": "[Relative URL of the icon URL]" "iconUrl": "[Relative URL of the icon URL]"
}, },
"v1": {
"bridgeUrl": "[Bridge URL]"
},
"v2": { "v2": {
"projectId": "[Project ID]" "projectId": "[Project ID]"
} }
@@ -831,4 +1068,4 @@
} }
} }
} }
} }
+447 -449
View File
@@ -1,474 +1,472 @@
[ [
{ {
"id":"c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96", "id": "c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96",
"name":"MetaMask", "name": "MetaMask",
"description":"", "description": "",
"homepage":"https://metamask.io/", "homepage": "https://metamask.io/",
"chains":[ "chains": [
"eip155:1", "eip155:1",
"eip155:42161", "eip155:42161",
"eip155:43114" "eip155:43114"
], ],
"versions":[ "versions": [
"1" "1"
], ],
"app":{ "app": {
"browser":"", "browser": "",
"ios":"https://apps.apple.com/us/app/metamask/id1438144202", "ios": "https://apps.apple.com/us/app/metamask/id1438144202",
"android":"https://play.google.com/store/apps/details?id=io.metamask", "android": "https://play.google.com/store/apps/details?id=io.metamask",
"mac":"", "mac": "",
"windows":"", "windows": "",
"linux":"" "linux": ""
}, },
"mobile":{ "mobile": {
"native":"metamask:", "native": "metamask:",
"universal":"https://metamask.app.link" "universal": "https://metamask.app.link"
}, },
"desktop":{ "desktop": {
"native":"", "native": "",
"universal":"" "universal": ""
}, },
"metadata":{ "metadata": {
"shortName":"MetaMask", "shortName": "MetaMask",
"colors":{ "colors": {
"primary":"rgb(255, 255, 255)", "primary": "rgb(255, 255, 255)",
"secondary":"" "secondary": ""
}
},
"config": {
"comment": "MetaMask",
"iosMinVersion": "0",
"imageUrl": "",
"encoding": "=\"#%/<>?@\\^`{|}:&",
"androidPackage": "io.metamask",
"connections": [
{
"type": "walletConnectV2",
"native": "metamask:",
"universal": "https://metamask.app.link"
} }
}, ],
"config":{ "methods": [
"comment":"MetaMask", "eth_sendTransaction",
"iosMinVersion":"0", "personal_sign",
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/metamask.png", "eth_signTypedData",
"image":"metamask.png", "wallet_addEthereumChain"
"encoding":"=\"#%/<>?@\\^`{|}:&", ]
"connections":[ },
{ "userFields": {
"type":"walletConnectV2", "analyticEvent": "METAMASK",
"native":"metamask:", "imageName": "metamask.png"
"universal":"https://metamask.app.link" }
}
]
},
"userFields":{
"analyticEvent":"METAMASK"
}
}, },
{ {
"id":"coinbase-wallet", "id": "coinbase-wallet",
"name":"Coinbase Wallet", "name": "Coinbase Wallet",
"description":"", "description": "",
"homepage":"https://www.coinbase.com/wallet", "homepage": "https://www.coinbase.com/wallet",
"chains":[ "chains": [
"eip155:1" "eip155:1"
], ],
"versions":[ "versions": [
"1" "1"
], ],
"app":{ "app": {
"browser":"", "browser": "",
"ios":"https://apps.apple.com/us/app/coinbase-wallet-nfts-crypto/id1278383455", "ios": "https://apps.apple.com/us/app/coinbase-wallet-nfts-crypto/id1278383455",
"android":"https://play.google.com/store/apps/details?id=org.toshi", "android": "https://play.google.com/store/apps/details?id=org.toshi",
"mac":"", "mac": "",
"windows":"", "windows": "",
"linux":"" "linux": ""
}, },
"mobile":{ "mobile": {
"native":"cbwallet:", "native": "cbwallet:",
"universal":"" "universal": ""
}, },
"desktop":{ "desktop": {
"native":"", "native": "",
"universal":"" "universal": ""
}, },
"metadata":{ "metadata": {
"shortName":"Coinbase", "shortName": "Coinbase",
"colors":{ "colors": {
"primary":"rgb(255, 255, 255)", "primary": "rgb(255, 255, 255)",
"secondary":"" "secondary": ""
}
},
"config": {
"comment": "Coinbase",
"iosMinVersion": "1.8.0",
"imageUrl": "",
"encoding": "=\"#%/<>?@\\^`{|}:&",
"androidPackage": "org.toshi",
"connections": [
{
"type": "walletSegue",
"native": "cbwallet:",
"universal": ""
} }
}, ],
"config":{ "methods": [
"comment":"Coinbase", "eth_sendTransaction",
"iosMinVersion":"1.8.0", "personal_sign",
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/coinbase-wallet.png", "eth_signTypedData",
"image":"coinbase-wallet.png", "wallet_addEthereumChain"
"encoding":"=\"#%/<>?@\\^`{|}:&", ]
"connections":[ },
{ "userFields": {
"type":"walletSegue", "analyticEvent": "COINBASE_WALLET",
"native":"cbwallet:", "imageName": "coinbase-wallet.png"
"universal":"" }
}
]
},
"userFields":{
"analyticEvent":"COINBASE_WALLET"
}
}, },
{ {
"id":"9d373b43ad4d2cf190fb1a774ec964a1addf406d6fd24af94ab7596e58c291b2", "id": "9d373b43ad4d2cf190fb1a774ec964a1addf406d6fd24af94ab7596e58c291b2",
"name":"imToken", "name": "imToken",
"description":"", "description": "",
"homepage":"https://token.im/", "homepage": "https://token.im/",
"chains":[ "chains": [
"eip155:1" "eip155:1"
], ],
"versions":[ "versions": [
"1" "1"
], ],
"app":{ "app": {
"browser":"", "browser": "",
"ios":"https://itunes.apple.com/us/app/imtoken2/id1384798940", "ios": "https://itunes.apple.com/us/app/imtoken2/id1384798940",
"android":"https://play.google.com/store/apps/details?id=im.token.app", "android": "https://play.google.com/store/apps/details?id=im.token.app",
"mac":"", "mac": "",
"windows":"", "windows": "",
"linux":"" "linux": ""
}, },
"mobile":{ "mobile": {
"native":"imtokenv2:", "native": "imtokenv2:",
"universal":"" "universal": ""
}, },
"desktop":{ "desktop": {
"native":"", "native": "",
"universal":"" "universal": ""
}, },
"metadata":{ "metadata": {
"shortName":"imToken", "shortName": "imToken",
"colors":{ "colors": {
"primary":"rgb(255, 255, 255)", "primary": "rgb(255, 255, 255)",
"secondary":"" "secondary": ""
}
},
"config": {
"comment": "imToken",
"iosMinVersion": "0",
"imageUrl": "",
"androidPackage": "im.token.app",
"connections": [
{
"type": "walletConnectV2",
"native": "imtokenv2:",
"universal": ""
} }
}, ],
"config":{ "methods": [
"comment":"imToken", "eth_sendTransaction",
"iosMinVersion":"0", "personal_sign",
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/imtoken.png", "eth_signTypedData"
"image":"imtoken.png", ]
"connections":[ },
{ "userFields": {
"type":"walletConnect", "analyticEvent": "IMTOKEN",
"native":"imtokenv2:", "imageName": "imtoken.png"
"universal":"" }
}
]
},
"userFields":{
"analyticEvent":"IMTOKEN"
}
}, },
{ {
"id":"4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0", "id": "4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0",
"name":"Trust Wallet", "name": "Trust Wallet",
"description":"", "description": "",
"homepage":"https://trustwallet.com/", "homepage": "https://trustwallet.com/",
"chains":[ "chains": [
"eip155:1", "eip155:1",
"eip155:42161", "eip155:42161",
"eip155:43114" "eip155:43114"
], ],
"versions":[ "versions": [
"1" "1"
], ],
"app":{ "app": {
"browser":"", "browser": "",
"ios":"https://apps.apple.com/app/apple-store/id1288339409", "ios": "https://apps.apple.com/app/apple-store/id1288339409",
"android":"https://play.google.com/store/apps/details?id=com.wallet.crypto.trustapp", "android": "https://play.google.com/store/apps/details?id=com.wallet.crypto.trustapp",
"mac":"", "mac": "",
"windows":"", "windows": "",
"linux":"" "linux": ""
}, },
"mobile":{ "mobile": {
"native":"trust:", "native": "trust:",
"universal":"https://link.trustwallet.com" "universal": "https://link.trustwallet.com"
}, },
"desktop":{ "desktop": {
"native":"", "native": "",
"universal":"" "universal": ""
}, },
"metadata":{ "metadata": {
"shortName":"Trust", "shortName": "Trust",
"colors":{ "colors": {
"primary":"rgb(51, 117, 187)", "primary": "rgb(51, 117, 187)",
"secondary":"" "secondary": ""
}
},
"config": {
"comment": "Trust Wallet",
"iosMinVersion": "0",
"encoding": "=\"#%/<>?@\\^`{|}:&",
"imageUrl": "",
"androidPackage": "com.wallet.crypto.trustapp",
"connections": [
{
"type": "walletConnectV2",
"native": "trust:",
"universal": "https://link.trustwallet.com"
} }
}, ],
"config":{ "methods": [
"comment":"Trust Wallet", "eth_sendTransaction",
"iosMinVersion":"0", "personal_sign",
"encoding":"=\"#%/<>?@\\^`{|}:&", "eth_signTypedData"
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/trust-wallet.png", ]
"image":"trust-wallet.png", },
"connections":[ "userFields": {
{ "analyticEvent": "TRUST_WALLET",
"type":"walletConnectV2", "imageName": "trust-wallet.png"
"native":"trust:", }
"universal":"https://link.trustwallet.com"
}
]
},
"userFields":{
"analyticEvent":"TRUST_WALLET"
}
}, },
{ {
"id":"Zerion", "id": "Zerion",
"name":"Zerion", "name": "Zerion",
"description":"", "description": "",
"homepage":"https://zerion.io/", "homepage": "https://zerion.io/",
"chains":[ "chains": [
"eip155:1" "eip155:1"
], ],
"versions":[ "versions": [
"1" "1"
], ],
"app":{ "app": {
"browser":"", "browser": "",
"ios":"https://apps.apple.com/app/apple-store/id1456732565", "ios": "https://apps.apple.com/app/apple-store/id1456732565",
"android":"https://play.google.com/store/apps/details?id=io.zerion.android", "android": "https://play.google.com/store/apps/details?id=io.zerion.android",
"mac":"", "mac": "",
"windows":"", "windows": "",
"linux":"" "linux": ""
}, },
"mobile":{ "mobile": {
"native":"zerion:", "native": "zerion:",
"universal":"" "universal": ""
}, },
"desktop":{ "desktop": {
"native":"", "native": "",
"universal":"" "universal": ""
}, },
"metadata":{ "metadata": {
"shortName":"Zerion", "shortName": "Zerion",
"colors":{ "colors": {
"primary":"rgb(51, 117, 187)", "primary": "rgb(51, 117, 187)",
"secondary":"" "secondary": ""
}
},
"config": {
"comment": "Zerion Wallet",
"iosMinVersion": "0",
"encoding": "=\"#%/<>?@\\^`{|}:&",
"imageUrl": "",
"androidPackage": "io.zerion.android",
"connections": [
{
"type": "walletConnectV2",
"native": "zerion:",
"universal": ""
} }
}, ],
"config":{ "methods": [
"comment":"Zerion Wallet", "eth_sendTransaction",
"iosMinVersion":"0", "personal_sign",
"encoding":"=\"#%/<>?@\\^`{|}:&", "eth_signTypedData"
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/zerion.png", ]
"image":"zerion.png", },
"connections":[ "userFields": {
{ "analyticEvent": "ZERION",
"type":"walletConnectV2", "imageName": "zerion.png"
"native":"zerion:", }
"universal":""
}
]
},
"userFields":{
"analyticEvent":"ZERION"
}
}, },
{ {
"id":"20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66", "id": "20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66",
"name":"TokenPocket", "name": "TokenPocket",
"description":"", "description": "",
"homepage":"https://tokenpocket.pro/", "homepage": "https://tokenpocket.pro/",
"chains":[ "chains": [
"eip155:1" "eip155:1"
], ],
"versions":[ "versions": [
"1" "1"
], ],
"app":{ "app": {
"browser":"", "browser": "",
"ios":"https://apps.apple.com/us/app/tokenpocket-trusted-wallet/id1436028697", "ios": "https://apps.apple.com/us/app/tokenpocket-trusted-wallet/id1436028697",
"android":"https://play.google.com/store/apps/details?id=vip.mytokenpocket", "android": "https://play.google.com/store/apps/details?id=vip.mytokenpocket",
"mac":"", "mac": "",
"windows":"", "windows": "",
"linux":"" "linux": ""
}, },
"mobile":{ "mobile": {
"native":"tpoutside:", "native": "tpoutside:",
"universal":"" "universal": ""
}, },
"desktop":{ "desktop": {
"native":"", "native": "",
"universal":"" "universal": ""
}, },
"metadata":{ "metadata": {
"shortName":"TokenPocket", "shortName": "TokenPocket",
"colors":{ "colors": {
"primary":"rgb(41, 128, 254)", "primary": "rgb(41, 128, 254)",
"secondary":"" "secondary": ""
}
},
"config": {
"comment": "TokenPocket",
"iosMinVersion": "0",
"imageUrl": "",
"androidPackage": "vip.mytokenpocket",
"connections": [
{
"type": "walletConnectV2",
"native": "tpoutside:",
"universal": ""
} }
}, ],
"config":{ "methods": [
"comment":"TokenPocket", "eth_sendTransaction",
"iosMinVersion":"0", "personal_sign",
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/tokenpocket.png", "eth_signTypedData"
"image":"tokenpocket.png", ]
"connections":[ },
{ "userFields": {
"type":"walletConnect", "analyticEvent": "TOKEN_POCKET",
"native":"tpoutside:", "imageName": "tokenpocket.png"
"universal":"" }
}
]
},
"userFields":{
"analyticEvent":"TOKEN_POCKET"
}
}, },
{ {
"id":"1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369", "id": "1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369",
"name":"Rainbow", "name": "Rainbow",
"description":"", "description": "",
"homepage":"https://rainbow.me/", "homepage": "https://rainbow.me/",
"chains":[ "chains": [
"eip155:1" "eip155:1"
], ],
"versions":[ "versions": [
"1" "1"
], ],
"app":{ "app": {
"browser":"", "browser": "",
"ios":"https://apps.apple.com/us/app/rainbow-ethereum-wallet/id1457119021", "ios": "https://apps.apple.com/us/app/rainbow-ethereum-wallet/id1457119021",
"android":"", "android": "",
"mac":"", "mac": "",
"windows":"", "windows": "",
"linux":"" "linux": ""
}, },
"mobile":{ "mobile": {
"native":"rainbow:", "native": "rainbow:",
"universal":"https://rnbwapp.com" "universal": "https://rnbwapp.com"
}, },
"desktop":{ "desktop": {
"native":"", "native": "",
"universal":"" "universal": ""
}, },
"metadata":{ "metadata": {
"shortName":"Rainbow", "shortName": "Rainbow",
"colors":{ "colors": {
"primary":"rgb(0, 30, 89)", "primary": "rgb(0, 30, 89)",
"secondary":"" "secondary": ""
}
},
"config": {
"comment": "Rainbow",
"iosMinVersion": "0",
"encoding": "=\"#%/<>?@\\^`{|}:&",
"androidPackage": "me.rainbow",
"backlinked": true,
"imageUrl": "",
"connections": [
{
"type": "walletConnectV2",
"native": "rainbow:",
"universal": "https://rnbwapp.com"
} }
}, ],
"config":{ "methods": [
"comment":"Rainbow", "eth_sendTransaction",
"iosMinVersion":"0", "personal_sign",
"encoding":"=\"#%/<>?@\\^`{|}:&", "eth_signTypedData"
"backlinked":true, ]
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/rainbow-wallet.png", },
"image":"rainbow-wallet.png", "userFields": {
"connections":[ "analyticEvent": "RAINBOW_WALLET",
{ "imageName": "rainbow-wallet.png"
"type":"walletConnectV2", }
"native":"rainbow:",
"universal":"https://rnbwapp.com"
}
]
},
"userFields":{
"analyticEvent":"RAINBOW_WALLET"
}
}, },
{ {
"id":"09102e7bbbd3f92001eda104abe23803181629f695e8f1b95af96d88ff7d5890", "id": "09102e7bbbd3f92001eda104abe23803181629f695e8f1b95af96d88ff7d5890",
"name":"1inch Wallet", "name": "1inch Wallet",
"description":"", "description": "",
"homepage":"https://1inch.io/wallet/", "homepage": "https://1inch.io/wallet/",
"chains":[ "chains": [
"eip155:1", "eip155:1",
"eip155:56" "eip155:56"
], ],
"versions":[ "versions": [
"1" "1"
], ],
"app":{ "app": {
"browser":"", "browser": "",
"ios":"https://apps.apple.com/us/app/1inch-defi-wallet/id1546049391", "ios": "https://apps.apple.com/us/app/1inch-defi-wallet/id1546049391",
"android":"", "android": "",
"mac":"", "mac": "",
"windows":"", "windows": "",
"linux":"" "linux": ""
}, },
"mobile":{ "mobile": {
"native":"oneinch:", "native": "oneinch:",
"universal":"https://wallet.1inch.io" "universal": "https://wallet.1inch.io"
}, },
"desktop":{ "desktop": {
"native":"", "native": "",
"universal":"" "universal": ""
}, },
"metadata":{ "metadata": {
"shortName":"1inch", "shortName": "1inch",
"colors":{ "colors": {
"primary":"rgb(31, 36, 46)", "primary": "rgb(31, 36, 46)",
"secondary":"" "secondary": ""
}
},
"config": {
"comment": "1inch",
"iosMinVersion": "0",
"encoding": "=\"#%/<>?@\\^`{|}:&",
"androidPackage": "io.oneinch.android",
"imageUrl": "",
"connections": [
{
"type": "walletConnectV2",
"native": "oneinch:",
"universal": "https://wallet.1inch.io"
} }
}, ],
"config":{ "methods": [
"comment":"1inch", "eth_sendTransaction",
"iosMinVersion":"0", "personal_sign",
"encoding":"=\"#%/<>?@\\^`{|}:&", "eth_signTypedData"
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/1inch.png", ]
"image":"1inch.png", },
"connections":[ "userFields": {
{ "analyticEvent": "1INCH",
"type":"walletConnect", "imageName": "1inch.png"
"native":"oneinch:", }
"universal":"https://wallet.1inch.io"
}
]
},
"userFields":{
"analyticEvent":"1INCH"
}
},
{
"id":"bae74827272509a6d63ea25514d9c68ad235c14e45e183518c7ded4572a1b0c4",
"name":"Huobi Wallet",
"description":"",
"homepage":"https://huobiwallet.com/",
"chains":[
"eip155:1"
],
"versions":[
"1"
],
"app":{
"browser":"",
"ios":"https://apps.apple.com/us/app/id1433883012",
"android":"https://play.google.com/store/apps/details?id=com.huobionchainwallet.gp",
"mac":"",
"windows":"",
"linux":""
},
"mobile":{
"native":"huobiwallet:",
"universal":""
},
"desktop":{
"native":"",
"universal":""
},
"metadata":{
"shortName":"Huobi",
"colors":{
"primary":"rgb(45,101,248)",
"secondary":""
}
},
"config":{
"comment":"Huobi",
"iosMinVersion":"0",
"encoding":"=\"#%/<>?@\\^`{|}:&",
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/huobi-wallet.png",
"image":"huobi-wallet.png",
"connections":[
{
"type":"walletConnect",
"native":"huobiwallet:",
"universal":""
}
]
},
"userFields":{
"analyticEvent":"HUOBI_WALLET"
}
} }
] ]
Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

+38
View File
@@ -0,0 +1,38 @@
## App Integrations
### Amplitude
Analytics service used to collect data to help the dYdX Product team make informed product decisions.
<b>To use with dydxprotocol/v4-web:</b>
1. Amplitude account with API key.
2. Add API key in Github > Secrets and Variables > Actions as `AMPLITUDE_API_KEY`
3. In your deploy scripts add `pnpm run build:inject-amplitude` after your pnpm build / vite build command.
### Bugsnag
Error handling service used to collect handled/unhandled errors within the app. The information collected is used to help debug and alert the engineering team of crashes/unhandled errors within the app to improve stability.
<b>To use with dydxprotocol/v4-web:</b>
1. Bugsnag account with API key.
2. Add API key in Github > Secrets and Variables > Actions as `BUGSNAG_API_KEY`
3. In your deploy scripts add `pnpm run build:inject-bugsnag` after your pnpm build / vite build command.
4. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-bugsnag`
### StatusPage
Service used to inform users of any status updates to our platform. These status updates are manually set and updated by the On Call engineers.
<b>To use with dydxprotocol/v4-web:</b>
1. StatusPage account and script URI
2. Add API key in Github > Secrets and Variables > Actions as `STATUS_PAGE_SCRIPT_URI`
3. In your deploy scripts add `pnpm run build:inject-statuspage` after your pnpm build / vite build command.
4. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-statuspage`
### Intercom
Service used for live customer support (chat/inbox) as well as home for Help Articles.
<b>To use with dydxprotocol/v4-web:</b>
1. Create Intercom account
2. In Intercom UI
Getting started > Set up Messenger > will give you your API Key on Step 2
Customize Intercom Messenger by adding logo and brand colors
3. Add API key in Github > Secrets and Variables > Actions as `INTERCOM_APP_ID`
4. In your deploy scripts add `pnpm run build:inject-intercom` after your pnpm build / vite build command.
5. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-intercom`
+76
View File
@@ -0,0 +1,76 @@
/* eslint-disable no-console */
import fs from 'fs/promises';
import path from 'path';
import { fileURLToPath } from 'url';
const INTERCOM_APP_ID = process.env.INTERCOM_APP_ID;
const currentPath = fileURLToPath(import.meta.url);
const projectRoot = path.dirname(currentPath);
const htmlFilePath = path.resolve(projectRoot, '../dist/index.html');
if (INTERCOM_APP_ID) {
try {
const html = await fs.readFile(htmlFilePath, 'utf-8');
const intercomScripts = `
<!-- Intercom -->
<script>
window.intercomSettings = {
api_base: 'https://api-iam.intercom.io',
app_id: '${INTERCOM_APP_ID}',
custom_launcher_selector: '.custom_intercom',
hide_default_launcher: true,
};
</script>
<script>
// We pre-filled your app ID in the widget URL: 'https://widget.intercom.io/widget/${INTERCOM_APP_ID}'
(function () {
var w = window;
var ic = w.Intercom;
if (typeof ic === 'function') {
ic('reattach_activator');
ic('update', w.intercomSettings);
} else {
var d = document;
var i = function () {
i.c(arguments);
};
i.q = [];
i.c = function (args) {
i.q.push(args);
};
w.Intercom = i;
var l = function () {
var s = d.createElement('script');
s.type = 'text/javascript';
s.async = true;
s.src = 'https://widget.intercom.io/widget/${INTERCOM_APP_ID}';
var x = d.getElementsByTagName('script')[0];
x.parentNode.insertBefore(s, x);
};
if (document.readyState === 'complete') {
l();
} else if (w.attachEvent) {
w.attachEvent('onload', l);
} else {
w.addEventListener('load', l, false);
}
}
})();
</script>
`;
const injectedHtml = html.replace(
'<div id="root"></div>',
`<div id="root"></div>\n${intercomScripts}\n`
);
await fs.writeFile(htmlFilePath, injectedHtml, 'utf-8');
console.log('Intercom scripts successfully injected.');
} catch (err) {
console.error('Error injecting Intercom scripts:', err);
}
}
+18 -2
View File
@@ -7,13 +7,20 @@ import { GrazProvider } from 'graz';
import { AppRoute, DEFAULT_TRADE_ROUTE } from '@/constants/routes'; import { AppRoute, DEFAULT_TRADE_ROUTE } from '@/constants/routes';
import { useBreakpoints, useInitializePage, useShouldShowFooter, useAnalytics } from '@/hooks'; import {
useBreakpoints,
useTokenConfigs,
useInitializePage,
useShouldShowFooter,
useAnalytics,
} from '@/hooks';
import { DydxProvider } from '@/hooks/useDydxClient'; import { DydxProvider } from '@/hooks/useDydxClient';
import { AccountsProvider } from '@/hooks/useAccounts'; import { AccountsProvider } from '@/hooks/useAccounts';
import { DialogAreaProvider, useDialogArea } from '@/hooks/useDialogArea'; import { DialogAreaProvider, useDialogArea } from '@/hooks/useDialogArea';
import { LocaleProvider } from '@/hooks/useLocaleSeparators'; import { LocaleProvider } from '@/hooks/useLocaleSeparators';
import { NotificationsProvider } from '@/hooks/useNotifications'; import { NotificationsProvider } from '@/hooks/useNotifications';
import { LocalNotificationsProvider } from '@/hooks/useLocalNotifications'; import { LocalNotificationsProvider } from '@/hooks/useLocalNotifications';
import { RestrictionProvider } from '@/hooks/useRestrictions';
import { SubaccountProvider } from '@/hooks/useSubaccount'; import { SubaccountProvider } from '@/hooks/useSubaccount';
import { SquidProvider } from '@/hooks/useSquid'; import { SquidProvider } from '@/hooks/useSquid';
@@ -26,6 +33,8 @@ import ProfilePage from '@/pages/Profile';
import { SettingsPage } from '@/pages/settings/Settings'; import { SettingsPage } from '@/pages/settings/Settings';
import TradePage from '@/pages/trade/Trade'; import TradePage from '@/pages/trade/Trade';
import { RewardsPage } from '@/pages/rewards/RewardsPage'; import { RewardsPage } from '@/pages/rewards/RewardsPage';
import { TermsOfUsePage } from '@/pages/TermsOfUsePage';
import { PrivacyPolicyPage } from '@/pages/PrivacyPolicyPage';
import { HeaderDesktop } from '@/layout/Header/HeaderDesktop'; import { HeaderDesktop } from '@/layout/Header/HeaderDesktop';
import { FooterDesktop } from '@/layout/Footer/FooterDesktop'; import { FooterDesktop } from '@/layout/Footer/FooterDesktop';
@@ -54,6 +63,7 @@ const Content = () => {
const { isTablet, isNotTablet } = useBreakpoints(); const { isTablet, isNotTablet } = useBreakpoints();
const isShowingHeader = isNotTablet; const isShowingHeader = isNotTablet;
const isShowingFooter = useShouldShowFooter(); const isShowingFooter = useShouldShowFooter();
const { chainTokenLabel } = useTokenConfigs();
return ( return (
<Styled.Content isShowingHeader={isShowingHeader} isShowingFooter={isShowingFooter}> <Styled.Content isShowingHeader={isShowingHeader} isShowingFooter={isShowingFooter}>
@@ -66,8 +76,9 @@ const Content = () => {
<Route path=":market" element={<TradePage />} /> <Route path=":market" element={<TradePage />} />
<Route path={AppRoute.Trade} element={<TradePage />} /> <Route path={AppRoute.Trade} element={<TradePage />} />
</Route> </Route>
<Route path={AppRoute.Markets} element={<MarketsPage />} /> <Route path={AppRoute.Markets} element={<MarketsPage />} />
<Route path={AppRoute.Rewards} element={<RewardsPage />} /> <Route path={`/${chainTokenLabel}`} element={<RewardsPage />} />
{isTablet && ( {isTablet && (
<> <>
<Route path={AppRoute.Alerts} element={<AlertsPage />} /> <Route path={AppRoute.Alerts} element={<AlertsPage />} />
@@ -79,6 +90,10 @@ const Content = () => {
<Route element={<GuardedMobileRoute />}> <Route element={<GuardedMobileRoute />}>
<Route path={`${AppRoute.Portfolio}/*`} element={<PortfolioPage />} /> <Route path={`${AppRoute.Portfolio}/*`} element={<PortfolioPage />} />
</Route> </Route>
<Route path={AppRoute.Terms} element={<TermsOfUsePage />} />
<Route path={AppRoute.Privacy} element={<PrivacyPolicyPage />} />
<Route path="*" element={<Navigate to={DEFAULT_TRADE_ROUTE} replace />} /> <Route path="*" element={<Navigate to={DEFAULT_TRADE_ROUTE} replace />} />
</Routes> </Routes>
</Suspense> </Suspense>
@@ -109,6 +124,7 @@ const providers = [
wrapProvider(GrazProvider), wrapProvider(GrazProvider),
wrapProvider(WagmiConfig, { config }), wrapProvider(WagmiConfig, { config }),
wrapProvider(LocaleProvider), wrapProvider(LocaleProvider),
wrapProvider(RestrictionProvider),
wrapProvider(DydxProvider), wrapProvider(DydxProvider),
wrapProvider(AccountsProvider), wrapProvider(AccountsProvider),
wrapProvider(SubaccountProvider), wrapProvider(SubaccountProvider),
+1 -1
View File
@@ -80,7 +80,7 @@ Styled.TriggerIcon = styled.span`
width: var(--trigger-icon-width); width: var(--trigger-icon-width);
display: inline-flex; display: inline-flex;
transition: transform 0.3s var(--ease-out-expo); transition: rotate 0.3s var(--ease-out-expo);
color: var(--trigger-icon-color); color: var(--trigger-icon-color);
${Styled.Trigger}[data-state='open'] & { ${Styled.Trigger}[data-state='open'] & {
+1
View File
@@ -225,6 +225,7 @@ Styled.CollapsibleContent = styled(CollapsibleContent)`
`; `;
Styled.IconButton = styled(IconButton)` Styled.IconButton = styled(IconButton)`
--button-icon-size: 1em;
${Styled.CollapsibleRoot}[data-state='closed'] & { ${Styled.CollapsibleRoot}[data-state='closed'] & {
rotate: -0.5turn; rotate: -0.5turn;
} }
+38 -17
View File
@@ -3,31 +3,44 @@ import styled, { AnyStyledComponent } from 'styled-components';
import { type MenuConfig } from '@/constants/menus'; import { type MenuConfig } from '@/constants/menus';
import { Dialog, DialogPlacement } from '@/components/Dialog'; import { Dialog, DialogPlacement, type DialogProps } from '@/components/Dialog';
import { ComboboxMenu } from '@/components/ComboboxMenu'; import { ComboboxMenu, type ComboboxMenuProps } from '@/components/ComboboxMenu';
type ElementProps<MenuItemValue extends string | number, MenuGroupValue extends string | number> = { type ElementProps<MenuItemValue extends string | number, MenuGroupValue extends string | number> = {
isOpen?: boolean;
setIsOpen?: (open: boolean) => void;
title?: React.ReactNode; title?: React.ReactNode;
description?: React.ReactNode; description?: React.ReactNode;
slotTrigger?: React.ReactNode;
slotHeaderInner?: React.ReactNode;
slotFooter?: React.ReactNode;
children?: React.ReactNode; children?: React.ReactNode;
items: MenuConfig<MenuItemValue, MenuGroupValue>; items: MenuConfig<MenuItemValue, MenuGroupValue>;
onItemSelected?: () => void;
inputPlaceholder?: string;
slotEmpty?: React.ReactNode;
}; };
type StyleProps = { type StyleProps = {
placement: DialogPlacement,
className?: string; className?: string;
}; };
export const ComboboxDialogMenu = <MenuItemValue extends string | number, MenuGroupValue extends string | number>({ type PickComboxMenuProps<
MenuItemValue extends string | number,
MenuGroupValue extends string | number
> = Pick<
ComboboxMenuProps<MenuItemValue, MenuGroupValue>,
'inputPlaceholder' | 'onItemSelected' | 'slotEmpty' | 'withSearch' | 'withStickyLayout'
>;
type PickDialogProps = Pick<
DialogProps,
| 'description'
| 'isOpen'
| 'placement'
| 'setIsOpen'
| 'slotHeaderInner'
| 'slotTrigger'
| 'slotFooter'
| 'preventClose'
>;
export const ComboboxDialogMenu = <
MenuItemValue extends string | number,
MenuGroupValue extends string | number
>({
isOpen = false, isOpen = false,
setIsOpen, setIsOpen,
title, title,
@@ -40,11 +53,17 @@ export const ComboboxDialogMenu = <MenuItemValue extends string | number, MenuGr
onItemSelected, onItemSelected,
inputPlaceholder, inputPlaceholder,
slotEmpty, slotEmpty,
withSearch,
withStickyLayout = true,
children, children,
placement = DialogPlacement.Default, placement = DialogPlacement.Default,
preventClose,
className, className,
}: ElementProps<MenuItemValue, MenuGroupValue> & StyleProps) => ( }: ElementProps<MenuItemValue, MenuGroupValue> &
PickComboxMenuProps<MenuItemValue, MenuGroupValue> &
PickDialogProps &
StyleProps) => (
// TODO: sub-menu state management // TODO: sub-menu state management
<Styled.Dialog <Styled.Dialog
isOpen={isOpen} isOpen={isOpen}
@@ -54,8 +73,8 @@ export const ComboboxDialogMenu = <MenuItemValue extends string | number, MenuGr
slotHeaderInner={slotHeaderInner} slotHeaderInner={slotHeaderInner}
slotTrigger={slotTrigger} slotTrigger={slotTrigger}
slotFooter={slotFooter} slotFooter={slotFooter}
placement={placement} placement={placement}
preventClose={preventClose}
className={className} className={className}
> >
<Styled.ComboboxMenu <Styled.ComboboxMenu
@@ -64,7 +83,8 @@ export const ComboboxDialogMenu = <MenuItemValue extends string | number, MenuGr
title={title} title={title}
inputPlaceholder={inputPlaceholder} inputPlaceholder={inputPlaceholder}
slotEmpty={slotEmpty} slotEmpty={slotEmpty}
withStickyLayout withSearch={withSearch}
withStickyLayout={withStickyLayout}
/> />
{children} {children}
</Styled.Dialog> </Styled.Dialog>
@@ -98,4 +118,5 @@ Styled.Dialog = styled(Dialog)`
Styled.ComboboxMenu = styled(ComboboxMenu)` Styled.ComboboxMenu = styled(ComboboxMenu)`
--comboboxMenu-backgroundColor: var(--comboboxDialogMenu-backgroundColor); --comboboxMenu-backgroundColor: var(--comboboxDialogMenu-backgroundColor);
--comboboxMenu-item-gap: var(--comboxDialogMenu-item-gap, 0.5rem);
`; `;
+10 -5
View File
@@ -8,7 +8,7 @@ import { layoutMixins } from '@/styles/layoutMixins';
import { Tag } from '@/components/Tag'; import { Tag } from '@/components/Tag';
type ElementProps<MenuItemValue extends string, MenuGroupValue extends string> = { type ElementProps<MenuItemValue extends string | number, MenuGroupValue extends string | number> = {
items: MenuConfig<MenuItemValue, MenuGroupValue>; items: MenuConfig<MenuItemValue, MenuGroupValue>;
onItemSelected?: () => void; onItemSelected?: () => void;
@@ -23,6 +23,11 @@ type StyleProps = {
withStickyLayout?: boolean; withStickyLayout?: boolean;
}; };
export type ComboboxMenuProps<
MenuItemValue extends string | number,
MenuGroupValue extends string | number
> = ElementProps<MenuItemValue, MenuGroupValue> & StyleProps;
export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extends string>({ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extends string>({
items, items,
onItemSelected, onItemSelected,
@@ -34,7 +39,7 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
className, className,
withStickyLayout, withStickyLayout,
}: ElementProps<MenuItemValue, MenuGroupValue> & StyleProps) => { }: ComboboxMenuProps<MenuItemValue, MenuGroupValue>) => {
const [highlightedCommand, setHighlightedCommand] = useState<MenuItemValue>(); const [highlightedCommand, setHighlightedCommand] = useState<MenuItemValue>();
const [searchValue, setSearchValue] = useState(''); const [searchValue, setSearchValue] = useState('');
// const inputRef = useRef<HTMLInputElement | null>(null); // const inputRef = useRef<HTMLInputElement | null>(null);
@@ -171,6 +176,7 @@ Styled.Command = styled(Command)<{ $withStickyLayout?: boolean }>`
--comboboxMenu-item-highlighted-backgroundColor: var(--color-layer-3); --comboboxMenu-item-highlighted-backgroundColor: var(--color-layer-3);
--comboboxMenu-item-highlighted-textColor: var(--color-text-1); --comboboxMenu-item-highlighted-textColor: var(--color-text-1);
--comboboxMenu-item-backgroundColor: ; --comboboxMenu-item-backgroundColor: ;
--comboboxMenu-item-gap: 0.5rem;
display: grid; display: grid;
align-content: start; align-content: start;
@@ -269,18 +275,17 @@ Styled.List = styled(Command.List)<{ $withStickyLayout?: boolean }>`
`; `;
Styled.Item = styled(Command.Item)` Styled.Item = styled(Command.Item)`
${layoutMixins.scrollSnapItem}
${popoverMixins.item} ${popoverMixins.item}
--item-checked-backgroundColor: var(--comboboxMenu-item-checked-backgroundColor); --item-checked-backgroundColor: var(--comboboxMenu-item-checked-backgroundColor);
--item-checked-textColor: var(--comboboxMenu-item-checked-textColor); --item-checked-textColor: var(--comboboxMenu-item-checked-textColor);
--item-highlighted-textColor: var(--comboboxMenu-item-highlighted-textColor); --item-highlighted-textColor: var(--comboboxMenu-item-highlighted-textColor);
--item-gap: var(--comboboxMenu-item-gap);
${layoutMixins.scrollSnapItem}
background-color: var(--comboboxMenu-backgroundColor, inherit); background-color: var(--comboboxMenu-backgroundColor, inherit);
display: flex; display: flex;
align-items: center; align-items: center;
gap: 0.5rem;
&[aria-disabled='true'] { &[aria-disabled='true'] {
opacity: 0.75; opacity: 0.75;
+3 -1
View File
@@ -48,6 +48,8 @@ type StyleProps = {
className?: string; className?: string;
}; };
export type DialogProps = ElementProps & StyleProps;
const DialogPortal = ({ const DialogPortal = ({
withPortal, withPortal,
container, container,
@@ -82,7 +84,7 @@ export const Dialog = ({
hasHeaderBorder = false, hasHeaderBorder = false,
children, children,
className, className,
}: ElementProps & StyleProps) => { }: DialogProps) => {
const closeButtonRef = useRef<HTMLButtonElement>(); const closeButtonRef = useRef<HTMLButtonElement>();
const showOverlay = ![DialogPlacement.Inline, DialogPlacement.FullScreen].includes(placement); const showOverlay = ![DialogPlacement.Inline, DialogPlacement.FullScreen].includes(placement);
+3 -1
View File
@@ -33,9 +33,11 @@ export const DropdownHeaderMenu = <MenuItemValue extends string>({
return ( return (
<Root> <Root>
<Styled.Trigger className={className}> <Styled.Trigger className={className} asChild>
<div>
{children} {children}
<Styled.DropdownIconButton iconName={IconName.Caret} isToggle /> <Styled.DropdownIconButton iconName={IconName.Caret} isToggle />
</div>
</Styled.Trigger> </Styled.Trigger>
<Portal> <Portal>
<Styled.Content <Styled.Content
+21 -2
View File
@@ -6,11 +6,14 @@ import {
AddressConnectorIcon, AddressConnectorIcon,
ArrowIcon, ArrowIcon,
Bar3Icon, Bar3Icon,
BellIcon,
BellStrokeIcon,
BoxCloseIcon, BoxCloseIcon,
CalculatorIcon, CalculatorIcon,
CaretIcon, CaretIcon,
CautionCircleStrokeIcon, CautionCircleStrokeIcon,
CautionCircleIcon, CautionCircleIcon,
ChatIcon,
CheckIcon, CheckIcon,
ChevronLeftIcon, ChevronLeftIcon,
ChevronRightIcon, ChevronRightIcon,
@@ -21,9 +24,10 @@ import {
CommentIcon, CommentIcon,
CopyIcon, CopyIcon,
CubeIcon, CubeIcon,
DepositIcon,
DepthChartIcon,
DiscordIcon, DiscordIcon,
EtherscanIcon, EtherscanIcon,
DepthChartIcon,
ExportKeysIcon, ExportKeysIcon,
FeedbackIcon, FeedbackIcon,
FileIcon, FileIcon,
@@ -37,6 +41,7 @@ import {
LockIcon, LockIcon,
LogoShortIcon, LogoShortIcon,
MenuIcon, MenuIcon,
MigrateIcon,
MintscanIcon, MintscanIcon,
OrderbookIcon, OrderbookIcon,
OrderCanceledIcon, OrderCanceledIcon,
@@ -65,17 +70,21 @@ import {
WarningIcon, WarningIcon,
WebsiteIcon, WebsiteIcon,
WhitepaperIcon, WhitepaperIcon,
WithdrawIcon,
} from '@/icons'; } from '@/icons';
export enum IconName { export enum IconName {
AddressConnector = 'AddressConnector', AddressConnector = 'AddressConnector',
Arrow = 'Arrow', Arrow = 'Arrow',
Bar3 = 'Bar3', Bar3 = 'Bar3',
Bell = 'Bell',
BellStroked = 'BellStroked',
BoxClose = 'BoxClose', BoxClose = 'BoxClose',
Calculator = 'Calculator', Calculator = 'Calculator',
Caret = 'Caret', Caret = 'Caret',
CautionCircle = 'CautionCircle', CautionCircle = 'CautionCircle',
CautionCircleStroked = 'CautionCircleStroked', CautionCircleStroked = 'CautionCircleStroked',
Chat = 'Chat',
Check = 'Check', Check = 'Check',
ChevronLeft = 'ChevronLeft', ChevronLeft = 'ChevronLeft',
ChevronRight = 'ChevronRight', ChevronRight = 'ChevronRight',
@@ -86,6 +95,7 @@ export enum IconName {
Comment = 'Comment', Comment = 'Comment',
Copy = 'Copy', Copy = 'Copy',
Cube = 'Cube', Cube = 'Cube',
Deposit = 'Deposit',
DepthChart = 'DepthChart', DepthChart = 'DepthChart',
Discord = 'Discord', Discord = 'Discord',
Etherscan = 'Etherscan', Etherscan = 'Etherscan',
@@ -102,6 +112,7 @@ export enum IconName {
Lock = 'Lock', Lock = 'Lock',
LogoShort = 'LogoShort', LogoShort = 'LogoShort',
Menu = 'Menu', Menu = 'Menu',
Migrate = 'Migrate',
Mintscan = 'Mintscan', Mintscan = 'Mintscan',
Onboarding = 'Onboarding', Onboarding = 'Onboarding',
Orderbook = 'OrderbookIcon', Orderbook = 'OrderbookIcon',
@@ -131,17 +142,21 @@ export enum IconName {
Warning = 'Warning', Warning = 'Warning',
Website = 'Website', Website = 'Website',
Whitepaper = 'Whitepaper', Whitepaper = 'Whitepaper',
Withdraw = 'Withdraw',
} }
const icons = { const icons = {
[IconName.AddressConnector]: AddressConnectorIcon, [IconName.AddressConnector]: AddressConnectorIcon,
[IconName.Arrow]: ArrowIcon, [IconName.Arrow]: ArrowIcon,
[IconName.Bar3]: Bar3Icon, [IconName.Bar3]: Bar3Icon,
[IconName.Bell]: BellIcon,
[IconName.BellStroked]: BellStrokeIcon,
[IconName.BoxClose]: BoxCloseIcon, [IconName.BoxClose]: BoxCloseIcon,
[IconName.Calculator]: CalculatorIcon, [IconName.Calculator]: CalculatorIcon,
[IconName.Caret]: CaretIcon, [IconName.Caret]: CaretIcon,
[IconName.CautionCircle]: CautionCircleIcon, [IconName.CautionCircle]: CautionCircleIcon,
[IconName.CautionCircleStroked]: CautionCircleStrokeIcon, [IconName.CautionCircleStroked]: CautionCircleStrokeIcon,
[IconName.Chat]: ChatIcon,
[IconName.Check]: CheckIcon, [IconName.Check]: CheckIcon,
[IconName.ChevronLeft]: ChevronLeftIcon, [IconName.ChevronLeft]: ChevronLeftIcon,
[IconName.ChevronRight]: ChevronRightIcon, [IconName.ChevronRight]: ChevronRightIcon,
@@ -152,6 +167,7 @@ const icons = {
[IconName.Comment]: CommentIcon, [IconName.Comment]: CommentIcon,
[IconName.Copy]: CopyIcon, [IconName.Copy]: CopyIcon,
[IconName.Cube]: CubeIcon, [IconName.Cube]: CubeIcon,
[IconName.Deposit]: DepositIcon,
[IconName.DepthChart]: DepthChartIcon, [IconName.DepthChart]: DepthChartIcon,
[IconName.Discord]: DiscordIcon, [IconName.Discord]: DiscordIcon,
[IconName.Etherscan]: EtherscanIcon, [IconName.Etherscan]: EtherscanIcon,
@@ -168,6 +184,7 @@ const icons = {
[IconName.Lock]: LockIcon, [IconName.Lock]: LockIcon,
[IconName.LogoShort]: LogoShortIcon, [IconName.LogoShort]: LogoShortIcon,
[IconName.Menu]: MenuIcon, [IconName.Menu]: MenuIcon,
[IconName.Migrate]: MigrateIcon,
[IconName.Mintscan]: MintscanIcon, [IconName.Mintscan]: MintscanIcon,
[IconName.Orderbook]: OrderbookIcon, [IconName.Orderbook]: OrderbookIcon,
[IconName.OrderCanceled]: OrderCanceledIcon, [IconName.OrderCanceled]: OrderCanceledIcon,
@@ -196,6 +213,7 @@ const icons = {
[IconName.Warning]: WarningIcon, [IconName.Warning]: WarningIcon,
[IconName.Website]: WebsiteIcon, [IconName.Website]: WebsiteIcon,
[IconName.Whitepaper]: WhitepaperIcon, [IconName.Whitepaper]: WhitepaperIcon,
[IconName.Withdraw]: WithdrawIcon,
} as Record<IconName, ElementType>; } as Record<IconName, ElementType>;
type ElementProps = { type ElementProps = {
@@ -213,7 +231,8 @@ export const Icon = styled(
iconComponent: Component = iconName && icons[iconName], iconComponent: Component = iconName && icons[iconName],
className, className,
...props ...props
}: ElementProps & StyleProps) => (Component ? <Component className={className} {...props} /> : null) }: ElementProps & StyleProps) =>
Component ? <Component className={className} {...props} /> : null
)` )`
width: 1em; width: 1em;
height: 1em; height: 1em;
+1
View File
@@ -67,6 +67,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
const buttonMixin = css` const buttonMixin = css`
// Params // Params
--button-icon-size: 1.125em; --button-icon-size: 1.125em;
--button-padding: 0;
// Rules // Rules
> * { > * {
+10
View File
@@ -207,6 +207,16 @@ const InputStyle = css`
color: var(--color-text-0); color: var(--color-text-0);
opacity: 1; opacity: 1;
} }
// Input autofill Styles
&:-webkit-autofill,
&:-webkit-autofill:focus {
transition: background-color 600000s 0s, color 600000s 0s;
}
&[data-autocompleted] {
background-color: var(--input-backgroundColor) !important;
}
`; `;
Styled.NumericFormat = styled(NumericFormat)` Styled.NumericFormat = styled(NumericFormat)`
+4 -1
View File
@@ -71,7 +71,7 @@ const NavItem = forwardRef(
)} )}
</span> </span>
{slotAfter} {slotAfter}
{subitems?.length && <Styled.Icon iconName={IconName.Caret} />} {subitems?.length && <Styled.Icon iconName={IconName.Triangle} />}
</> </>
); );
@@ -525,6 +525,9 @@ Styled.NavItem = styled(NavItem)<{ orientation: 'horizontal' | 'vertical' }>`
`; `;
Styled.Icon = styled(Icon)` Styled.Icon = styled(Icon)`
font-size: 0.375em;
transition: rotate 0.3s var(--ease-out-expo);
${Styled.List}[data-orientation="menu"] & { ${Styled.List}[data-orientation="menu"] & {
rotate: -0.25turn; rotate: -0.25turn;
} }
+52 -27
View File
@@ -8,6 +8,7 @@ import { layoutMixins } from '@/styles/layoutMixins';
type PanelProps = { type PanelProps = {
slotHeaderContent?: string; slotHeaderContent?: string;
slotHeader?: React.ReactNode; slotHeader?: React.ReactNode;
slotRight?: React.ReactNode;
children?: React.ReactNode; children?: React.ReactNode;
href?: string; href?: string;
onHeaderClick?: () => void; onHeaderClick?: () => void;
@@ -22,6 +23,7 @@ type PanelStyleProps = {
export const Panel = ({ export const Panel = ({
slotHeaderContent, slotHeaderContent,
slotHeader, slotHeader,
slotRight,
children, children,
href, href,
onHeaderClick, onHeaderClick,
@@ -29,56 +31,80 @@ export const Panel = ({
hasSeparator, hasSeparator,
className, className,
}: PanelProps & PanelStyleProps) => ( }: PanelProps & PanelStyleProps) => (
<Styled.Panel onClick={onClick}> <Styled.Panel onClick={onClick} className={className}>
{href ? ( <Styled.Left>
<Link to={href}> {href ? (
{slotHeader ? ( <Link to={href}>
slotHeader {slotHeader ? (
) : ( slotHeader
) : (
<Styled.Header role="button" onClick={onHeaderClick} hasSeparator={hasSeparator}>
{slotHeaderContent}
<Styled.Icon iconName={IconName.ChevronRight} />
</Styled.Header>
)}
</Link>
) : slotHeader ? (
slotHeader
) : (
slotHeaderContent && (
<Styled.Header role="button" onClick={onHeaderClick} hasSeparator={hasSeparator}> <Styled.Header role="button" onClick={onHeaderClick} hasSeparator={hasSeparator}>
{slotHeaderContent} {slotHeaderContent}
<Styled.Icon iconName={IconName.ChevronRight} />
</Styled.Header> </Styled.Header>
)} )
</Link> )}
) : slotHeader ? ( <Styled.Content>{children}</Styled.Content>
slotHeader </Styled.Left>
) : ( {slotRight}
slotHeaderContent && (
<Styled.Header role="button" onClick={onHeaderClick} hasSeparator={hasSeparator}>
{slotHeaderContent}
</Styled.Header>
)
)}
<Styled.Content className={className}>{children}</Styled.Content>
</Styled.Panel> </Styled.Panel>
); );
const Styled: Record<string, AnyStyledComponent> = {}; const Styled: Record<string, AnyStyledComponent> = {};
Styled.Panel = styled.section` Styled.Panel = styled.section<{ onClick?: () => void }>`
${layoutMixins.flexColumn} --panel-paddingY: 1rem;
--panel-paddingX: 1rem;
--panel-content-paddingY: var(--panel-paddingY);
--panel-content-paddingX: var(--panel-paddingX);
${layoutMixins.row}
background-color: var(--color-layer-3); background-color: var(--color-layer-3);
border-radius: 0.875rem; border-radius: 0.875rem;
${({ onClick }) =>
onClick &&
css`
cursor: pointer;
&:hover {
button:not(:disabled) {
color: var(--button-hover-textColor);
filter: var(--button-hover-filter);
}
}
`}
`;
Styled.Left = styled.div`
${layoutMixins.flexColumn}
width: 100%;
`; `;
Styled.Header = styled.header<{ hasSeparator?: boolean }>` Styled.Header = styled.header<{ hasSeparator?: boolean }>`
${layoutMixins.spacedRow} ${layoutMixins.spacedRow}
padding: var(--panel-paddingY) var(--panel-paddingX);
padding: 0.875rem 1rem 0.625rem;
font-size: 0.875rem;
${({ hasSeparator }) => ${({ hasSeparator }) =>
hasSeparator && hasSeparator &&
css` css`
padding-bottom: 0.625rem;
box-shadow: 0 var(--border-width) var(--border-color); box-shadow: 0 var(--border-width) var(--border-color);
`} `}
`; `;
Styled.Icon = styled(Icon)` Styled.Icon = styled(Icon)`
color: var(--color-text-0); color: var(--color-text-0);
font-size: 0.625rem; font-size: 0.625rem;
`; `;
@@ -86,6 +112,5 @@ Styled.Content = styled.div`
${layoutMixins.scrollArea} ${layoutMixins.scrollArea}
${layoutMixins.stickyArea0} ${layoutMixins.stickyArea0}
--stickyArea0-background: transparent; --stickyArea0-background: transparent;
padding: var(--panel-content-paddingY) var(--panel-content-paddingX);
padding: 0.5rem 1rem;
`; `;
+15 -4
View File
@@ -7,13 +7,15 @@ import { ButtonShape, ButtonSize } from '@/constants/buttons';
import { useBreakpoints } from '@/hooks'; import { useBreakpoints } from '@/hooks';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import { type BaseButtonProps } from '@/components/BaseButton'; import { type BaseButtonProps } from '@/components/BaseButton';
import { ToggleButton } from '@/components/ToggleButton'; import { ToggleButton } from '@/components/ToggleButton';
type ElementProps<MenuItemValue extends string> = { type ElementProps<MenuItemValue extends string> = {
items: MenuItem<MenuItemValue>[]; items: MenuItem<MenuItemValue>[];
value: MenuItemValue; value: MenuItemValue;
onValueChange: (value: MenuItemValue) => void; onValueChange: (value: any) => void;
onInteraction?: () => void;
ensureSelected?: boolean;
}; };
type StyleProps = { type StyleProps = {
@@ -25,10 +27,14 @@ export const ToggleGroup = forwardRef(
{ {
items, items,
value, value,
ensureSelected = true,
onValueChange, onValueChange,
onInteraction,
className, className,
size, size,
shape = ButtonShape.Pill, shape = ButtonShape.Pill,
...buttonProps ...buttonProps
}: ElementProps<MenuItemValue> & StyleProps & BaseButtonProps, }: ElementProps<MenuItemValue> & StyleProps & BaseButtonProps,
ref: Ref<HTMLDivElement> ref: Ref<HTMLDivElement>
@@ -40,12 +46,17 @@ export const ToggleGroup = forwardRef(
ref={ref} ref={ref}
type="single" type="single"
value={value} value={value}
onValueChange={onValueChange} onValueChange={(newValue: MenuItemValue) => {
if ((ensureSelected && newValue) || !ensureSelected) {
onValueChange(newValue);
}
onInteraction?.();
}}
className={className} className={className}
loop loop
> >
{items.map((item) => ( {items.map((item) => (
<Item key={item.value} value={item.value} aria-label={item.label} asChild> <Item key={item.value} value={item.value} asChild>
<ToggleButton <ToggleButton
size={size ? size : isTablet ? ButtonSize.Small : ButtonSize.XSmall} size={size ? size : isTablet ? ButtonSize.Small : ButtonSize.XSmall}
shape={shape} shape={shape}
+19 -2
View File
@@ -2,11 +2,13 @@ import type { ReactNode } from 'react';
import styled, { AnyStyledComponent } from 'styled-components'; import styled, { AnyStyledComponent } from 'styled-components';
import { Content, Portal, Provider, Root, Trigger, Arrow } from '@radix-ui/react-tooltip'; import { Content, Portal, Provider, Root, Trigger, Arrow } from '@radix-ui/react-tooltip';
import { STRING_KEYS } from '@/constants/localization';
import { tooltipStrings } from '@/constants/tooltips'; import { tooltipStrings } from '@/constants/tooltips';
import { useStringGetter } from '@/hooks'; import { useStringGetter, useURLConfigs } from '@/hooks';
import { Icon, IconName } from '@/components/Icon'; import { Icon, IconName } from '@/components/Icon';
import { Link } from '@/components/Link';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import { popoverMixins } from '@/styles/popoverMixins'; import { popoverMixins } from '@/styles/popoverMixins';
@@ -38,20 +40,24 @@ export const WithTooltip = ({
slotTooltip, slotTooltip,
}: ElementProps & StyleProps) => { }: ElementProps & StyleProps) => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const urlConfigs = useURLConfigs();
const getTooltipStrings = tooltip && tooltipStrings[tooltip]; const getTooltipStrings = tooltip && tooltipStrings[tooltip];
if (!getTooltipStrings && !tooltipString && !slotTooltip) return <>{children}</>; if (!getTooltipStrings && !tooltipString && !slotTooltip) return <>{children}</>;
let tooltipTitle; let tooltipTitle;
let tooltipBody; let tooltipBody;
let tooltipLearnMore;
if (getTooltipStrings) { if (getTooltipStrings) {
const { title, body } = getTooltipStrings({ const { title, body, learnMoreLink } = getTooltipStrings({
stringGetter, stringGetter,
stringParams, stringParams,
urlConfigs,
}); });
tooltipTitle = title; tooltipTitle = title;
tooltipBody = body; tooltipBody = body;
tooltipLearnMore = learnMoreLink;
} else { } else {
tooltipBody = tooltipString; tooltipBody = tooltipString;
} }
@@ -72,6 +78,13 @@ export const WithTooltip = ({
<dl> <dl>
{tooltipTitle && <dt>{tooltipTitle}</dt>} {tooltipTitle && <dt>{tooltipTitle}</dt>}
{tooltipBody && <dd>{tooltipBody}</dd>} {tooltipBody && <dd>{tooltipBody}</dd>}
{tooltipLearnMore && (
<dd>
<Styled.LearnMore href={tooltipLearnMore}>
{stringGetter({ key: STRING_KEYS.LEARN_MORE })}
</Styled.LearnMore>
</dd>
)}
<Styled.Arrow /> <Styled.Arrow />
</dl> </dl>
)} )}
@@ -142,3 +155,7 @@ Styled.Arrow = styled(Arrow)`
Styled.Icon = styled(Icon)` Styled.Icon = styled(Icon)`
color: var(--color-text-0); color: var(--color-text-0);
`; `;
Styled.LearnMore = styled(Link)`
--link-color: var(--color-accent);
`;
+28 -10
View File
@@ -59,16 +59,6 @@ export const TransactionType = Abacus.exchange.dydx.abacus.protocols.Transaction
const transactionTypes = [...TransactionType.values()] as const; const transactionTypes = [...TransactionType.values()] as const;
export type TransactionTypes = (typeof transactionTypes)[number]; export type TransactionTypes = (typeof transactionTypes)[number];
export type NetworkConfig = {
chainId: string;
indexerUrl: string;
indexerSocketUrl: string;
validatorUrl: string;
faucetUrl?: string | null;
};
export type ConnectNetworkEvent = CustomEvent<Partial<NetworkConfig>>;
// ------ State ------ // ------ State ------
export type AbacusApiState = Abacus.exchange.dydx.abacus.state.manager.ApiState; export type AbacusApiState = Abacus.exchange.dydx.abacus.state.manager.ApiState;
export const AbacusApiStatus = Abacus.exchange.dydx.abacus.state.manager.ApiStatus; export const AbacusApiStatus = Abacus.exchange.dydx.abacus.state.manager.ApiStatus;
@@ -78,8 +68,13 @@ export const Changes = Abacus.exchange.dydx.abacus.state.changes.Changes;
export type PerpetualStateChanges = Abacus.exchange.dydx.abacus.state.changes.StateChanges; export type PerpetualStateChanges = Abacus.exchange.dydx.abacus.state.changes.StateChanges;
export const AsyncAbacusStateManager = export const AsyncAbacusStateManager =
Abacus.exchange.dydx.abacus.state.manager.AsyncAbacusStateManager; Abacus.exchange.dydx.abacus.state.manager.AsyncAbacusStateManager;
// ------ Parsing Errors ------ //
export type ParsingError = Abacus.exchange.dydx.abacus.responses.ParsingError; export type ParsingError = Abacus.exchange.dydx.abacus.responses.ParsingError;
export type ParsingErrors = kollections.List<ParsingError>; export type ParsingErrors = kollections.List<ParsingError>;
export const ParsingErrorType = Abacus.exchange.dydx.abacus.responses.ParsingErrorType;
const parsingErrorTypes = [...ParsingErrorType.values()] as const;
export type ParsingErrorTypes = (typeof parsingErrorTypes)[number];
// ------ Perpetuals/Markets ------ // // ------ Perpetuals/Markets ------ //
export type PerpetualState = Abacus.exchange.dydx.abacus.output.PerpetualState; export type PerpetualState = Abacus.exchange.dydx.abacus.output.PerpetualState;
@@ -199,6 +194,12 @@ export type RiskLevels = (typeof riskLevels)[number];
// ------ Notifications ------ // // ------ Notifications ------ //
export type AbacusNotification = Abacus.exchange.dydx.abacus.output.Notification; export type AbacusNotification = Abacus.exchange.dydx.abacus.output.Notification;
// ------ Restrictions ------ //
export type UsageRestriction = Abacus.exchange.dydx.abacus.output.UsageRestriction;
export const RestrictionType = Abacus.exchange.dydx.abacus.output.Restriction;
const restrictionTypes = [...RestrictionType.values()] as const;
export type RestrictionTypes = (typeof restrictionTypes)[number];
// ------ Enum Conversions ------ // // ------ Enum Conversions ------ //
type IfEquals<X, Y, A, B> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 type IfEquals<X, Y, A, B> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2
? A ? A
@@ -256,3 +257,20 @@ export const TRADE_TYPES: Record<
[AbacusOrderType.liquidation.name]: null, [AbacusOrderType.liquidation.name]: null,
[AbacusOrderType.trailingStop.name]: null, [AbacusOrderType.trailingStop.name]: null,
}; };
// Custom types involving Abacus
export type NetworkConfig = Partial<{
indexerUrl: Nullable<string>;
websocketUrl: Nullable<string>;
validatorUrl: Nullable<string>;
chainId: Nullable<string>;
faucetUrl: Nullable<string>;
USDC_DENOM: Nullable<string>;
USDC_DECIMALS: Nullable<number>;
USDC_GAS_DENOM: Nullable<string>;
CHAINTOKEN_DENOM: Nullable<string>;
CHAINTOKEN_DECIMALS: Nullable<number>;
}>;
export type ConnectNetworkEvent = CustomEvent<Partial<NetworkConfig>>;
+1 -1
View File
@@ -44,4 +44,4 @@ export type EvmDerivedAddresses = {
}; };
}; };
export const AMOUNT_RESERVED_FOR_GAS_USDC = 100_000; export const AMOUNT_RESERVED_FOR_GAS_USDC = 0.1;
+3
View File
@@ -10,7 +10,10 @@ export enum DialogTypes {
MobileSignIn = 'MobileSignIn', MobileSignIn = 'MobileSignIn',
Onboarding = 'Onboarding', Onboarding = 'Onboarding',
OrderDetails = 'OrderDetails', OrderDetails = 'OrderDetails',
RateLimit = 'RateLimit',
Receive = 'Receive', Receive = 'Receive',
RestrictedGeo = 'RestrictedGeo',
RestrictedWallet = 'RestrictedWallet',
Trade = 'Trade', Trade = 'Trade',
Transfer = 'Transfer', Transfer = 'Transfer',
Withdraw = 'Withdraw', Withdraw = 'Withdraw',
+1 -1
View File
@@ -24,6 +24,6 @@ export enum LocalStorageKey {
} }
export const LOCAL_STORAGE_VERSIONS = { export const LOCAL_STORAGE_VERSIONS = {
[LocalStorageKey.EvmDerivedAddresses]: 'v1', [LocalStorageKey.EvmDerivedAddresses]: 'v2',
// TODO: version all localStorage keys // TODO: version all localStorage keys
}; };
+4
View File
@@ -8,6 +8,8 @@ import {
WARNINGS_STRING_KEYS, WARNINGS_STRING_KEYS,
} from '@dydxprotocol/v4-localization'; } from '@dydxprotocol/v4-localization';
import { type LinksConfigs } from '@/hooks/useURLConfigs';
export { TOOLTIP_STRING_KEYS } from '@dydxprotocol/v4-localization'; export { TOOLTIP_STRING_KEYS } from '@dydxprotocol/v4-localization';
export enum SupportedLocales { export enum SupportedLocales {
@@ -79,9 +81,11 @@ export type TooltipStrings = {
[key: string]: ({ [key: string]: ({
stringGetter, stringGetter,
stringParams, stringParams,
urlConfigs,
}: { }: {
stringGetter: StringGetterFunction; stringGetter: StringGetterFunction;
stringParams?: any; stringParams?: any;
urlConfigs?: LinksConfigs;
}) => { }) => {
title: string; title: string;
body: string; body: string;
+1 -1
View File
@@ -21,7 +21,7 @@ export type MenuItem<MenuItemValue, MenuItemTypes = string> = {
value: MenuItemValue; value: MenuItemValue;
slotBefore?: React.ReactNode; slotBefore?: React.ReactNode;
label: string; label: React.ReactNode;
labelRight?: React.ReactNode; labelRight?: React.ReactNode;
tag?: React.ReactNode; tag?: React.ReactNode;
slotAfter?: React.ReactNode; slotAfter?: React.ReactNode;
+2 -5
View File
@@ -7,7 +7,8 @@ export enum AppRoute {
Profile = '/profile', Profile = '/profile',
Alerts = '/alerts', Alerts = '/alerts',
Settings = '/settings', Settings = '/settings',
Rewards = '/DV4TNT', Terms = '/terms',
Privacy = '/privacy',
} }
export enum PortfolioRoute { export enum PortfolioRoute {
@@ -36,7 +37,3 @@ export const HISTORY_ROUTE = `${AppRoute.Portfolio}/${PortfolioRoute.History}/:s
export const DEFAULT_TRADE_ROUTE = `${AppRoute.Trade}/${DEFAULT_MARKETID}`; export const DEFAULT_TRADE_ROUTE = `${AppRoute.Trade}/${DEFAULT_MARKETID}`;
export const SETTINGS_ROUTE = `${AppRoute.Settings}/*`; export const SETTINGS_ROUTE = `${AppRoute.Settings}/*`;
export const DEFAULT_DOCUMENT_TITLE = 'dYdX'; export const DEFAULT_DOCUMENT_TITLE = 'dYdX';
export enum ExternalLink {
Foundation = 'https://dydx.foundation',
}
+4 -4
View File
@@ -57,10 +57,10 @@ export const tradeTooltips: TooltipStrings = {
title: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_TITLE }), title: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_TITLE }),
body: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_BODY }), body: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_BODY }),
}), }),
'initial-margin-fraction': ({ stringGetter }) => ({ 'initial-margin-fraction': ({ stringGetter, urlConfigs }) => ({
title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_TITLE }), title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_TITLE }),
body: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_BODY }), body: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_BODY }),
learnMoreLink: 'https://help.dydx.exchange/articles/5232637-maximum-position-sizes', learnMoreLink: urlConfigs?.initialMarginFractionLearnMore,
}), }),
'initial-stop': ({ stringGetter }) => ({ 'initial-stop': ({ stringGetter }) => ({
title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_STOP_TITLE }), title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_STOP_TITLE }),
@@ -146,10 +146,10 @@ export const tradeTooltips: TooltipStrings = {
title: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_TITLE }), title: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_TITLE }),
body: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_BODY }), body: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_BODY }),
}), }),
'reduce-only': ({ stringGetter }) => ({ 'reduce-only': ({ stringGetter, urlConfigs }) => ({
title: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_TITLE }), title: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_TITLE }),
body: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_BODY }), body: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_BODY }),
learnMoreLink: 'https://help.dydx.exchange/articles/6345793-reduce-only-orders', learnMoreLink: urlConfigs?.reduceOnlyLearnMore,
}), }),
spread: () => ({ spread: () => ({
title: 'Spread', title: 'Spread',
+50 -97
View File
@@ -1,5 +1,5 @@
import type { ExternalProvider } from '@ethersproject/providers'; import type { ExternalProvider } from '@ethersproject/providers';
import { USDC_DENOM, type onboarding, DYDX_DENOM } from '@dydxprotocol/v4-client-js'; import { type onboarding } from '@dydxprotocol/v4-client-js';
import type { suggestChain } from 'graz'; import type { suggestChain } from 'graz';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
@@ -32,7 +32,6 @@ export enum WalletConnectionType {
CoinbaseWalletSdk = 'coinbaseWalletSdk', CoinbaseWalletSdk = 'coinbaseWalletSdk',
CosmosSigner = 'CosmosSigner', CosmosSigner = 'CosmosSigner',
InjectedEip1193 = 'injectedEip1193', InjectedEip1193 = 'injectedEip1193',
WalletConnect1 = 'walletConnect1',
WalletConnect2 = 'walletConnect2', WalletConnect2 = 'walletConnect2',
} }
@@ -62,10 +61,6 @@ export const walletConnectionTypes: Record<WalletConnectionType, WalletConnectio
name: 'injected EIP-1193 provider', name: 'injected EIP-1193 provider',
wagmiConnectorId: 'injected', wagmiConnectorId: 'injected',
}, },
[WalletConnectionType.WalletConnect1]: {
name: 'WalletConnect 1.0',
wagmiConnectorId: 'walletConnectLegacy',
},
[WalletConnectionType.WalletConnect2]: { [WalletConnectionType.WalletConnect2]: {
name: 'WalletConnect 2.0', name: 'WalletConnect 2.0',
wagmiConnectorId: 'walletConnect', wagmiConnectorId: 'walletConnect',
@@ -92,19 +87,35 @@ export enum WalletType {
Rainbow = 'RAINBOW_WALLET', Rainbow = 'RAINBOW_WALLET',
TokenPocket = 'TOKEN_POCKET', TokenPocket = 'TOKEN_POCKET',
TrustWallet = 'TRUST_WALLET', TrustWallet = 'TRUST_WALLET',
WalletConnect = 'WALLETCONNECT',
WalletConnect2 = 'WALLETCONNECT_2', WalletConnect2 = 'WALLETCONNECT_2',
// TestWallet = 'TEST_WALLET', // TestWallet = 'TEST_WALLET',
OtherWallet = 'OTHER_WALLET', OtherWallet = 'OTHER_WALLET',
} }
const WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS = {
Metamask: 'c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96',
imToken: 'ef333840daf915aafdc4a004525502d6d49d77bd9c65e0642dbaefb3c2893bef',
TokenPocket: '20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66',
Trust: '4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0',
Rainbow: '1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369',
Zerion: 'ecc4036f814562b41a5268adc86270fba1365471402006302e70169465b7ac18',
Ledger: '19177a98252e07ddfc9af2083ba8e07ef627cb6103467ffebb3f8f4205fd7927',
Fireblocks: '5864e2ced7c293ed18ac35e0db085c09ed567d67346ccb6f58a0327a75137489',
Uniswap: 'c03dfee351b6fcc421b4494ea33b9d4b92a984f87aa76d1663bb28705e95034a',
Robinhood: '8837dd9413b1d9b585ee937d27a816590248386d9dbf59f5cd3422dbbb65683e',
'1inch': 'c286eebc742a537cd1d6818363e9dc53b21759a1e8e5d9b263d0c03ec7703576',
};
export const WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS = Object.values(
WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS
);
type WalletConfig = { type WalletConfig = {
type: WalletType; type: WalletType;
stringKey: string; stringKey: string;
icon: string; icon: string;
connectionTypes: WalletConnectionType[]; connectionTypes: WalletConnectionType[];
matchesInjectedEip1193?: (provider: ExternalProvider & any) => boolean; matchesInjectedEip1193?: (provider: ExternalProvider & any) => boolean;
walletconnect1Name?: string;
walletconnect2Id?: string; walletconnect2Id?: string;
}; };
@@ -117,7 +128,6 @@ export const wallets: Record<WalletType, WalletConfig> = {
WalletConnectionType.InjectedEip1193, WalletConnectionType.InjectedEip1193,
// WalletConnectionType.CoinbaseWalletSdk, // WalletConnectionType.CoinbaseWalletSdk,
WalletConnectionType.WalletConnect2, WalletConnectionType.WalletConnect2,
WalletConnectionType.WalletConnect1,
], ],
matchesInjectedEip1193: (provider) => matchesInjectedEip1193: (provider) =>
Object.entries(wallets).every( Object.entries(wallets).every(
@@ -131,30 +141,22 @@ export const wallets: Record<WalletType, WalletConfig> = {
type: WalletType.BitKeep, type: WalletType.BitKeep,
stringKey: STRING_KEYS.BITKEEP, stringKey: STRING_KEYS.BITKEEP,
icon: BitkeepIcon, icon: BitkeepIcon,
connectionTypes: [ connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
WalletConnectionType.InjectedEip1193,
WalletConnectionType.WalletConnect2,
WalletConnectionType.WalletConnect1,
],
matchesInjectedEip1193: (provider) => provider.isBitKeep, // isBitKeepChrome, isBitEthereum matchesInjectedEip1193: (provider) => provider.isBitKeep, // isBitKeepChrome, isBitEthereum
walletconnect1Name: 'bitkeep',
walletconnect2Id: '38f5d18bd8522c244bdd70cb4a68e0e718865155811c043f052fb9f1c51de662',
}, },
[WalletType.BitPie]: { [WalletType.BitPie]: {
type: WalletType.BitPie, type: WalletType.BitPie,
stringKey: STRING_KEYS.BITPIE, stringKey: STRING_KEYS.BITPIE,
icon: BitpieIcon, icon: BitpieIcon,
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect1], connectionTypes: [WalletConnectionType.InjectedEip1193],
matchesInjectedEip1193: (provider) => provider.isBitpie, matchesInjectedEip1193: (provider) => provider.isBitpie,
walletconnect1Name: 'bitpie',
}, },
[WalletType.CloverWallet]: { [WalletType.CloverWallet]: {
type: WalletType.CloverWallet, type: WalletType.CloverWallet,
stringKey: STRING_KEYS.CLOVER_WALLET, stringKey: STRING_KEYS.CLOVER_WALLET,
icon: CloverWalletIcon, icon: CloverWalletIcon,
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect1], connectionTypes: [WalletConnectionType.InjectedEip1193],
matchesInjectedEip1193: (provider) => provider.isClover, matchesInjectedEip1193: (provider) => provider.isClover,
// walletconnect1Name: 'clover',
}, },
[WalletType.CoinbaseWallet]: { [WalletType.CoinbaseWallet]: {
type: WalletType.CoinbaseWallet, type: WalletType.CoinbaseWallet,
@@ -163,109 +165,71 @@ export const wallets: Record<WalletType, WalletConfig> = {
connectionTypes: [ connectionTypes: [
WalletConnectionType.CoinbaseWalletSdk, WalletConnectionType.CoinbaseWalletSdk,
WalletConnectionType.InjectedEip1193, WalletConnectionType.InjectedEip1193,
WalletConnectionType.WalletConnect1, WalletConnectionType.WalletConnect2,
], ],
matchesInjectedEip1193: (provider) => provider.isCoinbaseWallet, // provider.selectedProvider?.isCoinbaseWallet, matchesInjectedEip1193: (provider) => provider.isCoinbaseWallet, // provider.selectedProvider?.isCoinbaseWallet,
walletconnect1Name: 'coinbase',
}, },
[WalletType.Coin98]: { [WalletType.Coin98]: {
type: WalletType.Coin98, type: WalletType.Coin98,
stringKey: STRING_KEYS.COIN98, stringKey: STRING_KEYS.COIN98,
icon: Coin98Icon, icon: Coin98Icon,
connectionTypes: [ connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
WalletConnectionType.InjectedEip1193,
WalletConnectionType.WalletConnect2,
WalletConnectionType.WalletConnect1,
],
matchesInjectedEip1193: (provider) => provider.isCoin98, matchesInjectedEip1193: (provider) => provider.isCoin98,
walletconnect1Name: 'coin98',
walletconnect2Id: '2a3c89040ac3b723a1972a33a125b1db11e258a6975d3a61252cd64e6ea5ea01',
}, },
[WalletType.HuobiWallet]: { [WalletType.HuobiWallet]: {
type: WalletType.HuobiWallet, type: WalletType.HuobiWallet,
stringKey: STRING_KEYS.HUOBI_WALLET, stringKey: STRING_KEYS.HUOBI_WALLET,
icon: HuobiIcon, icon: HuobiIcon,
connectionTypes: [ connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
WalletConnectionType.InjectedEip1193,
WalletConnectionType.WalletConnect2,
WalletConnectionType.WalletConnect1,
],
matchesInjectedEip1193: (provider) => provider.isHbWallet, matchesInjectedEip1193: (provider) => provider.isHbWallet,
walletconnect2Id: '797c615e2c556b610c048eb35535f212c0dd58de5d03e763120e90a7d1350a77',
}, },
[WalletType.ImToken]: { [WalletType.ImToken]: {
type: WalletType.ImToken, type: WalletType.ImToken,
stringKey: STRING_KEYS.IMTOKEN, stringKey: STRING_KEYS.IMTOKEN,
icon: ImTokenIcon, icon: ImTokenIcon,
connectionTypes: [ connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
WalletConnectionType.InjectedEip1193,
WalletConnectionType.WalletConnect2,
WalletConnectionType.WalletConnect1,
],
matchesInjectedEip1193: (provider) => provider.isImToken, matchesInjectedEip1193: (provider) => provider.isImToken,
walletconnect1Name: 'imtoken', walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.imToken,
walletconnect2Id: 'ef333840daf915aafdc4a004525502d6d49d77bd9c65e0642dbaefb3c2893bef',
}, },
[WalletType.MathWallet]: { [WalletType.MathWallet]: {
type: WalletType.MathWallet, type: WalletType.MathWallet,
stringKey: STRING_KEYS.MATH_WALLET, stringKey: STRING_KEYS.MATH_WALLET,
icon: MathWalletIcon, icon: MathWalletIcon,
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect1], connectionTypes: [WalletConnectionType.InjectedEip1193],
matchesInjectedEip1193: (provider) => provider.isMathWallet, matchesInjectedEip1193: (provider) => provider.isMathWallet,
walletconnect1Name: 'math',
walletconnect2Id: '7674bb4e353bf52886768a3ddc2a4562ce2f4191c80831291218ebd90f5f5e26', walletconnect2Id: '7674bb4e353bf52886768a3ddc2a4562ce2f4191c80831291218ebd90f5f5e26',
}, },
[WalletType.MetaMask]: { [WalletType.MetaMask]: {
type: WalletType.MetaMask, type: WalletType.MetaMask,
stringKey: STRING_KEYS.METAMASK, stringKey: STRING_KEYS.METAMASK,
icon: MetaMaskIcon, icon: MetaMaskIcon,
connectionTypes: [ connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
WalletConnectionType.InjectedEip1193,
WalletConnectionType.WalletConnect2,
WalletConnectionType.WalletConnect1,
],
matchesInjectedEip1193: isMetaMask, matchesInjectedEip1193: isMetaMask,
walletconnect1Name: 'metamask', walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Metamask,
walletconnect2Id: 'c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96',
}, },
[WalletType.Rainbow]: { [WalletType.Rainbow]: {
type: WalletType.Rainbow, type: WalletType.Rainbow,
stringKey: STRING_KEYS.RAINBOW_WALLET, stringKey: STRING_KEYS.RAINBOW_WALLET,
icon: RainbowIcon, icon: RainbowIcon,
connectionTypes: [ connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
WalletConnectionType.InjectedEip1193,
WalletConnectionType.WalletConnect2,
WalletConnectionType.WalletConnect1,
],
matchesInjectedEip1193: (provider) => provider.isRainbowWallet, matchesInjectedEip1193: (provider) => provider.isRainbowWallet,
walletconnect1Name: 'rainbow', walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Rainbow,
walletconnect2Id: '1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369',
}, },
[WalletType.TokenPocket]: { [WalletType.TokenPocket]: {
type: WalletType.TokenPocket, type: WalletType.TokenPocket,
stringKey: STRING_KEYS.TOKEN_POCKET, stringKey: STRING_KEYS.TOKEN_POCKET,
icon: TokenPocketIcon, icon: TokenPocketIcon,
connectionTypes: [ connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
WalletConnectionType.InjectedEip1193,
WalletConnectionType.WalletConnect2,
WalletConnectionType.WalletConnect1,
],
matchesInjectedEip1193: (provider) => provider.isTokenPocket, matchesInjectedEip1193: (provider) => provider.isTokenPocket,
walletconnect1Name: 'tokenpocket', walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.TokenPocket,
walletconnect2Id: '20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66',
}, },
[WalletType.TrustWallet]: { [WalletType.TrustWallet]: {
type: WalletType.TrustWallet, type: WalletType.TrustWallet,
stringKey: STRING_KEYS.TRUST_WALLET, stringKey: STRING_KEYS.TRUST_WALLET,
icon: TrustWalletIcon, icon: TrustWalletIcon,
connectionTypes: [ connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
WalletConnectionType.InjectedEip1193,
WalletConnectionType.WalletConnect2,
WalletConnectionType.WalletConnect1,
],
matchesInjectedEip1193: (provider) => provider.isTrust, matchesInjectedEip1193: (provider) => provider.isTrust,
walletconnect1Name: 'trust', walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Trust,
walletconnect2Id: '4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0',
}, },
[WalletType.WalletConnect2]: { [WalletType.WalletConnect2]: {
type: WalletType.WalletConnect2, type: WalletType.WalletConnect2,
@@ -273,12 +237,6 @@ export const wallets: Record<WalletType, WalletConfig> = {
icon: WalletConnectIcon, icon: WalletConnectIcon,
connectionTypes: [WalletConnectionType.WalletConnect2], connectionTypes: [WalletConnectionType.WalletConnect2],
}, },
[WalletType.WalletConnect]: {
type: WalletType.WalletConnect,
stringKey: STRING_KEYS.WALLET_CONNECT,
icon: WalletConnectIcon,
connectionTypes: [WalletConnectionType.WalletConnect1],
},
[WalletType.Keplr]: { [WalletType.Keplr]: {
type: WalletType.Keplr, type: WalletType.Keplr,
stringKey: STRING_KEYS.KEPLR, stringKey: STRING_KEYS.KEPLR,
@@ -344,10 +302,10 @@ export type DydxAddress = `dydx${string}`;
export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = { export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
rpc: 'https://dydx-testnet-archive.allthatnode.com:26657', rpc: 'https://dydx-testnet-archive.allthatnode.com:26657',
rest: 'https://dydx-testnet-archive.allthatnode.com:1317', rest: 'https://dydx-testnet-archive.allthatnode.com:1317',
chainId: 'dydx-testnet-3', chainId: 'dydx-testnet-4',
chainName: 'dYdX Public Testnet', chainName: 'dYdX Public Testnet',
chainSymbolImageUrl: chainSymbolImageUrl:
'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-3/chain.png', 'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-4/chain.png',
bech32Config: { bech32Config: {
bech32PrefixAccPub: 'dydxpub', bech32PrefixAccPub: 'dydxpub',
bech32PrefixValPub: 'dydxvaloperpub', bech32PrefixValPub: 'dydxvaloperpub',
@@ -361,26 +319,31 @@ export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
}, },
stakeCurrency: { stakeCurrency: {
coinDenom: 'DV4TNT', coinDenom: 'DV4TNT',
coinDecimals: 6, coinDecimals: 18,
coinMinimalDenom: 'dv4tnt', coinMinimalDenom: 'adv4tnt',
}, },
currencies: [ currencies: [
{ {
coinDenom: 'DV4TNT', coinDenom: 'DV4TNT',
coinDecimals: 6, coinDecimals: 18,
coinMinimalDenom: 'dv4tnt', coinMinimalDenom: 'adv4tnt',
}, },
{ {
coinDenom: 'USDC', coinDenom: 'USDC',
coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
coinDecimals: 6, coinDecimals: 6,
coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
}, },
], ],
feeCurrencies: [ feeCurrencies: [
{ {
coinDenom: 'DV4TNT', coinDenom: 'DV4TNT',
coinDecimals: 18,
coinMinimalDenom: 'adv4tnt',
},
{
coinDenom: 'USDC',
coinDecimals: 6, coinDecimals: 6,
coinMinimalDenom: 'dv4tnt', coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
}, },
], ],
features: [], features: [],
@@ -389,15 +352,5 @@ export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
// TODO: export this type from abacus instead // TODO: export this type from abacus instead
export enum DydxChainAsset { export enum DydxChainAsset {
USDC = 'usdc', USDC = 'usdc',
DYDX = 'dydx', CHAINTOKEN = 'chain',
} }
export const DYDX_CHAIN_ASSET_COIN_DENOM: Record<DydxChainAsset, string> = {
[DydxChainAsset.USDC]: USDC_DENOM,
[DydxChainAsset.DYDX]: DYDX_DENOM,
};
export const DYDX_CHAIN_ASSET_TAGS: Record<DydxChainAsset, string> = {
[DydxChainAsset.USDC]: 'USDC',
[DydxChainAsset.DYDX]: 'Dv4TNT',
};
+6
View File
@@ -1,5 +1,6 @@
import { useApiState } from './useApiState'; import { useApiState } from './useApiState';
import { useBreakpoints } from './useBreakpoints'; import { useBreakpoints } from './useBreakpoints';
import { useTokenConfigs } from './useTokenConfigs';
import { useCommandMenu } from './useCommandMenu'; import { useCommandMenu } from './useCommandMenu';
import { useCurrentMarketId } from './useCurrentMarketId'; import { useCurrentMarketId } from './useCurrentMarketId';
import { useDebounce } from './useDebounce'; import { useDebounce } from './useDebounce';
@@ -16,14 +17,17 @@ import { useLocalStorage } from './useLocalStorage';
import { useNow } from './useNow'; import { useNow } from './useNow';
import { useOnClickOutside } from './useOnClickOutside'; import { useOnClickOutside } from './useOnClickOutside';
import { usePageTitlePriceUpdates } from './usePageTitlePriceUpdates'; import { usePageTitlePriceUpdates } from './usePageTitlePriceUpdates';
import { useRestrictions } from './useRestrictions';
import { useShouldShowFooter } from './useShouldShowFooter'; import { useShouldShowFooter } from './useShouldShowFooter';
import { useSelectedNetwork } from './useSelectedNetwork'; import { useSelectedNetwork } from './useSelectedNetwork';
import { useStringGetter } from './useStringGetter'; import { useStringGetter } from './useStringGetter';
import { useSubaccount } from './useSubaccount'; import { useSubaccount } from './useSubaccount';
import { useURLConfigs } from './useURLConfigs';
export { export {
useApiState, useApiState,
useBreakpoints, useBreakpoints,
useTokenConfigs,
useCommandMenu, useCommandMenu,
useCurrentMarketId, useCurrentMarketId,
useDebounce, useDebounce,
@@ -40,8 +44,10 @@ export {
useNow, useNow,
useOnClickOutside, useOnClickOutside,
usePageTitlePriceUpdates, usePageTitlePriceUpdates,
useRestrictions,
useShouldShowFooter, useShouldShowFooter,
useSelectedNetwork, useSelectedNetwork,
useStringGetter, useStringGetter,
useSubaccount, useSubaccount,
useURLConfigs,
}; };
+3 -3
View File
@@ -33,7 +33,7 @@ export const useTradingView = ({
const marketIds = useSelector(getMarketIds, shallowEqual); const marketIds = useSelector(getMarketIds, shallowEqual);
const selectedLocale = useSelector(getSelectedLocale); const selectedLocale = useSelector(getSelectedLocale);
const selectedNetwork = useSelector(getSelectedNetwork); const selectedNetwork = useSelector(getSelectedNetwork);
const { getCandlesForDatafeed } = useDydxClient(); const { getCandlesForDatafeed, isConnected: isClientConnected } = useDydxClient();
const [savedTvChartConfig, setTvChartConfig] = useLocalStorage<object | undefined>({ const [savedTvChartConfig, setTvChartConfig] = useLocalStorage<object | undefined>({
key: LocalStorageKey.TradingViewChartConfig, key: LocalStorageKey.TradingViewChartConfig,
@@ -44,7 +44,7 @@ export const useTradingView = ({
const hasMarkets = marketIds.length > 0; const hasMarkets = marketIds.length > 0;
useEffect(() => { useEffect(() => {
if (hasMarkets) { if (hasMarkets && isClientConnected && marketId) {
const widgetOptions = getWidgetOptions(); const widgetOptions = getWidgetOptions();
const widgetOverrides = getWidgetOverrides(appTheme); const widgetOverrides = getWidgetOverrides(appTheme);
const options = { const options = {
@@ -75,7 +75,7 @@ export const useTradingView = ({
tvWidgetRef.current = null; tvWidgetRef.current = null;
setIsChartReady(false); setIsChartReady(false);
}; };
}, [getCandlesForDatafeed, hasMarkets, selectedLocale, selectedNetwork]); }, [getCandlesForDatafeed, isClientConnected, hasMarkets, selectedLocale, selectedNetwork, !!marketId]);
return { savedResolution }; return { savedResolution };
}; };
+9 -16
View File
@@ -5,10 +5,7 @@ import { StargateClient } from '@cosmjs/stargate';
import { useQuery } from 'react-query'; import { useQuery } from 'react-query';
import { formatUnits } from 'viem'; import { formatUnits } from 'viem';
import { USDC_DENOM, DYDX_DENOM } from '@dydxprotocol/v4-client-js';
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks'; import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { QUANTUM_MULTIPLIER } from '@/constants/numbers';
import { EvmAddress } from '@/constants/wallets'; import { EvmAddress } from '@/constants/wallets';
import { convertBech32Address } from '@/lib/addressUtils'; import { convertBech32Address } from '@/lib/addressUtils';
@@ -18,11 +15,11 @@ import { getBalances, getStakingBalances } from '@/state/accountSelectors';
import { getSelectedNetwork } from '@/state/appSelectors'; import { getSelectedNetwork } from '@/state/appSelectors';
import { useAccounts } from './useAccounts'; import { useAccounts } from './useAccounts';
import { useTokenConfigs } from './useTokenConfigs';
type UseAccountBalanceProps = { type UseAccountBalanceProps = {
// Token Items // Token Items
addressOrDenom?: string; addressOrDenom?: string;
assetSymbol?: string;
decimals?: number; decimals?: number;
// Chain Items // Chain Items
@@ -41,7 +38,6 @@ export const CHAIN_DEFAULT_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeee
export const useAccountBalance = ({ export const useAccountBalance = ({
addressOrDenom, addressOrDenom,
assetSymbol,
bech32AddrPrefix, bech32AddrPrefix,
chainId, chainId,
decimals = 0, decimals = 0,
@@ -52,6 +48,7 @@ export const useAccountBalance = ({
const selectedNetwork = useSelector(getSelectedNetwork); const selectedNetwork = useSelector(getSelectedNetwork);
const balances = useSelector(getBalances, shallowEqual); const balances = useSelector(getBalances, shallowEqual);
const { chainTokenDenom, usdcDenom } = useTokenConfigs();
const evmChainId = Number(ENVIRONMENT_CONFIG_MAP[selectedNetwork].ethereumChainId); const evmChainId = Number(ENVIRONMENT_CONFIG_MAP[selectedNetwork].ethereumChainId);
const stakingBalances = useSelector(getStakingBalances, shallowEqual); const stakingBalances = useSelector(getStakingBalances, shallowEqual);
@@ -91,20 +88,16 @@ export const useAccountBalance = ({
}); });
const { formatted: evmBalance } = evmQuery.data || {}; const { formatted: evmBalance } = evmQuery.data || {};
const balance = !assetSymbol ? '0' : isCosmosChain ? cosmosQuery.data : evmBalance; const balance = isCosmosChain ? cosmosQuery.data : evmBalance;
const nativeTokenCoinBalance = balances?.[DYDX_DENOM]; const nativeTokenCoinBalance = balances?.[chainTokenDenom];
const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount) const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount);
.div(QUANTUM_MULTIPLIER)
.toNumber();
const usdcCoinBalance = balances?.[USDC_DENOM]; const usdcCoinBalance = balances?.[usdcDenom];
const usdcBalance = MustBigNumber(usdcCoinBalance?.amount).div(QUANTUM_MULTIPLIER).toNumber(); const usdcBalance = MustBigNumber(usdcCoinBalance?.amount).toNumber();
const nativeStakingCoinBalanace = stakingBalances?.[DYDX_DENOM]; const nativeStakingCoinBalanace = stakingBalances?.[chainTokenDenom];
const nativeStakingBalance = MustBigNumber(nativeStakingCoinBalanace?.amount) const nativeStakingBalance = MustBigNumber(nativeStakingCoinBalanace?.amount).toNumber();
.div(QUANTUM_MULTIPLIER)
.toNumber();
return { return {
balance, balance,
+25 -16
View File
@@ -2,21 +2,23 @@ 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, USDC_DENOM, type Subaccount } from '@dydxprotocol/v4-client-js'; import { 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 { LocalStorageKey, LOCAL_STORAGE_VERSIONS } from '@/constants/localStorage'; import { LocalStorageKey, LOCAL_STORAGE_VERSIONS } from '@/constants/localStorage';
import { DydxAddress, EvmAddress, PrivateInformation } from '@/constants/wallets'; import { DydxAddress, EvmAddress, PrivateInformation } from '@/constants/wallets';
import { setOnboardingState, setOnboardingGuard } from '@/state/account'; import { setOnboardingState, setOnboardingGuard } from '@/state/account';
import { forceOpenDialog } from '@/state/dialogs';
import abacusStateManager from '@/lib/abacus'; import abacusStateManager from '@/lib/abacus';
import { log } from '@/lib/telemetry'; import { log } from '@/lib/telemetry';
import { useLocalStorage } from './useLocalStorage';
import { useWalletConnection } from './useWalletConnection';
import { useDydxClient } from './useDydxClient'; import { useDydxClient } from './useDydxClient';
import { useLocalStorage } from './useLocalStorage';
import { useRestrictions } from './useRestrictions';
import { useWalletConnection } from './useWalletConnection';
const AccountsContext = createContext<ReturnType<typeof useAccountsContext> | undefined>(undefined); const AccountsContext = createContext<ReturnType<typeof useAccountsContext> | undefined>(undefined);
@@ -57,7 +59,9 @@ const useAccountsContext = () => {
forgetEvmSignature(previousEvmAddress); forgetEvmSignature(previousEvmAddress);
} }
if (evmAddress) abacusStateManager.setTransfersSourceAddress(evmAddress); if (evmAddress) {
abacusStateManager.setTransfersSourceAddress(evmAddress);
}
setPreviousEvmAddress(evmAddress); setPreviousEvmAddress(evmAddress);
}, [evmAddress]); }, [evmAddress]);
@@ -126,16 +130,8 @@ const useAccountsContext = () => {
// dYdX subaccounts // dYdX subaccounts
const [dydxSubaccounts, setDydxSubaccounts] = useState<Subaccount[] | undefined>(); const [dydxSubaccounts, setDydxSubaccounts] = useState<Subaccount[] | undefined>();
const { getAccountBalance, getSubaccounts } = useMemo( const { getSubaccounts } = useMemo(
() => ({ () => ({
getAccountBalance: async ({
dydxAddress,
denom = USDC_DENOM,
}: {
dydxAddress: DydxAddress;
denom?: string;
}) => await compositeClient?.validatorClient.get.getAccountBalance(dydxAddress, denom),
getSubaccounts: async ({ dydxAddress }: { dydxAddress: DydxAddress }) => { getSubaccounts: async ({ dydxAddress }: { dydxAddress: DydxAddress }) => {
try { try {
const response = await compositeClient?.indexerClient.account.getSubaccounts(dydxAddress); const response = await compositeClient?.indexerClient.account.getSubaccounts(dydxAddress);
@@ -217,7 +213,6 @@ const useAccountsContext = () => {
}, [evmAddress, evmDerivedAddresses, signerWagmi, connectedDydxAddress, signerGraz]); }, [evmAddress, evmDerivedAddresses, signerWagmi, connectedDydxAddress, signerGraz]);
// abacus // abacus
// TODO: useAbacus({ dydxAddress })
useEffect(() => { useEffect(() => {
if (dydxAddress) abacusStateManager.setAccount(localDydxWallet); if (dydxAddress) abacusStateManager.setAccount(localDydxWallet);
else abacusStateManager.attemptDisconnectAccount(); else abacusStateManager.attemptDisconnectAccount();
@@ -258,6 +253,21 @@ const useAccountsContext = () => {
); );
}, [dydxSubaccounts]); }, [dydxSubaccounts]);
// Restrictions
const { isBadActor, sanctionedAddresses } = useRestrictions();
useEffect(() => {
if (
dydxAddress &&
(isBadActor ||
sanctionedAddresses.has(dydxAddress) ||
(evmAddress && sanctionedAddresses.has(evmAddress)))
) {
dispatch(forceOpenDialog({ type: DialogTypes.RestrictedWallet }));
disconnect();
}
}, [isBadActor, evmAddress, dydxAddress, sanctionedAddresses]);
// Disconnect wallet / accounts // Disconnect wallet / accounts
const disconnectLocalDydxWallet = () => { const disconnectLocalDydxWallet = () => {
setLocalDydxWallet(undefined); setLocalDydxWallet(undefined);
@@ -308,7 +318,6 @@ const useAccountsContext = () => {
disconnect, disconnect,
// dydxClient Account methods // dydxClient Account methods
getAccountBalance,
getSubaccounts, getSubaccounts,
}; };
}; };
+5 -2
View File
@@ -44,6 +44,9 @@ export const useCurrentMarketId = () => {
}, [validId]); }, [validId]);
useEffect(() => { useEffect(() => {
abacusStateManager.setMarket(marketId ?? DEFAULT_MARKETID); // Check for marketIds otherwise Abacus will silently fail its isMarketValid check
}, [selectedNetwork, marketId]); if (marketIds) {
abacusStateManager.setMarket(marketId ?? DEFAULT_MARKETID);
}
}, [selectedNetwork, marketIds, marketId]);
}; };
+9 -13
View File
@@ -2,27 +2,23 @@ import { WalletType } from '@/constants/wallets';
import { isTruthy } from '@/lib/isTruthy'; import { isTruthy } from '@/lib/isTruthy';
import { useSelectedNetwork } from './useSelectedNetwork';
export const useDisplayedWallets = () => { export const useDisplayedWallets = () => {
const { selectedNetwork } = useSelectedNetwork();
return [ return [
WalletType.MetaMask, WalletType.MetaMask,
import.meta.env.MODE !== 'production' && WalletType.Keplr, import.meta.env.MODE !== 'production' && WalletType.Keplr,
WalletType.WalletConnect2, WalletType.WalletConnect2,
WalletType.WalletConnect,
WalletType.CoinbaseWallet, WalletType.CoinbaseWallet,
WalletType.ImToken, // Hide these wallet options until they can be properly tested on mainnet
WalletType.Rainbow, // WalletType.ImToken,
WalletType.TrustWallet, // WalletType.Rainbow,
WalletType.HuobiWallet, // WalletType.TrustWallet,
WalletType.BitKeep, // WalletType.HuobiWallet,
WalletType.Coin98, // WalletType.BitKeep,
// WalletType.Coin98,
WalletType.OtherWallet, WalletType.OtherWallet,
].filter(isTruthy); ].filter(isTruthy);
+41 -6
View File
@@ -13,12 +13,17 @@ import {
import type { ResolutionString } from 'public/tradingview/charting_library'; import type { ResolutionString } from 'public/tradingview/charting_library';
import type { NetworkConfig, ConnectNetworkEvent } from '@/constants/abacus'; import type { ConnectNetworkEvent, NetworkConfig } from '@/constants/abacus';
import { type Candle, RESOLUTION_MAP } from '@/constants/candles'; import { type Candle, RESOLUTION_MAP } from '@/constants/candles';
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { DydxChainAsset } from '@/constants/wallets';
import { getSelectedNetwork } from '@/state/appSelectors'; import { getSelectedNetwork } from '@/state/appSelectors';
import { log } from '@/lib/telemetry'; import { log } from '@/lib/telemetry';
import { useRestrictions } from './useRestrictions';
type DydxContextType = ReturnType<typeof useDydxClientContext>; type DydxContextType = ReturnType<typeof useDydxClientContext>;
const DydxContext = createContext<DydxContextType>({} as DydxContextType); const DydxContext = createContext<DydxContextType>({} as DydxContextType);
DydxContext.displayName = 'dYdXClient'; DydxContext.displayName = 'dYdXClient';
@@ -33,8 +38,9 @@ const useDydxClientContext = () => {
// ------ Network ------ // // ------ Network ------ //
const selectedNetwork = useSelector(getSelectedNetwork); const selectedNetwork = useSelector(getSelectedNetwork);
const tokensConfigs = ENVIRONMENT_CONFIG_MAP[selectedNetwork].tokens;
const [networkConfig, setNetworkConfig] = useState<Partial<NetworkConfig>>(); const [networkConfig, setNetworkConfig] = useState<NetworkConfig>();
useEffect(() => { useEffect(() => {
const onConnectNetwork = (event: ConnectNetworkEvent) => setNetworkConfig(event.detail); const onConnectNetwork = (event: ConnectNetworkEvent) => setNetworkConfig(event.detail);
@@ -54,15 +60,22 @@ const useDydxClientContext = () => {
if ( if (
networkConfig?.chainId && networkConfig?.chainId &&
networkConfig?.indexerUrl && networkConfig?.indexerUrl &&
networkConfig?.indexerSocketUrl && networkConfig?.websocketUrl &&
networkConfig?.validatorUrl networkConfig?.validatorUrl
) { ) {
try { try {
const initializedClient = await CompositeClient.connect( const initializedClient = await CompositeClient.connect(
new Network( new Network(
selectedNetwork, selectedNetwork,
new IndexerConfig(networkConfig.indexerUrl, networkConfig.indexerSocketUrl), new IndexerConfig(networkConfig.indexerUrl, networkConfig.websocketUrl),
new ValidatorConfig(networkConfig.validatorUrl, networkConfig.chainId, { new ValidatorConfig(networkConfig.validatorUrl, networkConfig.chainId,
{
USDC_DENOM: tokensConfigs[DydxChainAsset.USDC].denom,
USDC_DECIMALS: tokensConfigs[DydxChainAsset.USDC].decimals,
USDC_GAS_DENOM: tokensConfigs[DydxChainAsset.USDC].gasDenom,
CHAINTOKEN_DENOM: tokensConfigs[DydxChainAsset.CHAINTOKEN].denom,
CHAINTOKEN_DECIMALS: tokensConfigs[DydxChainAsset.CHAINTOKEN].decimals,
}, {
broadcastPollIntervalMs: 3_000, broadcastPollIntervalMs: 3_000,
broadcastTimeoutMs: 60_000, broadcastTimeoutMs: 60_000,
}) })
@@ -178,7 +191,27 @@ const useDydxClientContext = () => {
[requestCandles] [requestCandles]
); );
// ------ Subacount Methods ------ // const { updateSanctionedAddresses } = useRestrictions();
const screenAddresses = useCallback(
async ({ addresses }: { addresses: string[] }) => {
if (compositeClient) {
const promises = addresses.map((address) =>
compositeClient.indexerClient.utility.screen(address)
);
const results = await Promise.all(promises);
const screenedAddresses = Object.fromEntries(
addresses.map((address, index) => [address, results[index]?.restricted])
);
updateSanctionedAddresses(screenedAddresses);
return screenedAddresses;
}
},
[compositeClient]
);
return { return {
// Client initialization // Client initialization
@@ -186,11 +219,13 @@ const useDydxClientContext = () => {
networkConfig, networkConfig,
compositeClient, compositeClient,
faucetClient, faucetClient,
isConnected: !!compositeClient,
// Wallet Methods // Wallet Methods
getWalletFromEvmSignature, getWalletFromEvmSignature,
// Public Methods // Public Methods
getCandlesForDatafeed, getCandlesForDatafeed,
screenAddresses,
}; };
}; };
+2
View File
@@ -10,6 +10,7 @@ import { useLocalStorage } from '@/hooks';
import { initializeLocalization } from '@/state/app'; import { initializeLocalization } from '@/state/app';
import abacusStateManager from '@/lib/abacus'; import abacusStateManager from '@/lib/abacus';
import { validateAgainstAvailableEnvironments } from '@/lib/network';
export const useInitializePage = () => { export const useInitializePage = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
@@ -18,6 +19,7 @@ export const useInitializePage = () => {
const [localStorageNetwork] = useLocalStorage<DydxNetwork>({ const [localStorageNetwork] = useLocalStorage<DydxNetwork>({
key: LocalStorageKey.SelectedNetwork, key: LocalStorageKey.SelectedNetwork,
defaultValue: DEFAULT_APP_ENVIRONMENT, defaultValue: DEFAULT_APP_ENVIRONMENT,
validateFn: validateAgainstAvailableEnvironments,
}); });
useEffect(() => { useEffect(() => {
+12 -8
View File
@@ -6,8 +6,10 @@ import { MarketFilters, MARKET_FILTER_LABELS, type MarketData } from '@/constant
import { getAssets } from '@/state/assetsSelectors'; import { getAssets } from '@/state/assetsSelectors';
import { getPerpetualMarkets } from '@/state/perpetualsSelectors'; import { getPerpetualMarkets } from '@/state/perpetualsSelectors';
import { isTruthy } from '@/lib/isTruthy';
const filterFunctions = { const filterFunctions = {
[MarketFilters.ALL]: (market: MarketData) => true, [MarketFilters.ALL]: () => true,
[MarketFilters.LAYER_1]: (market: MarketData) => { [MarketFilters.LAYER_1]: (market: MarketData) => {
return market.asset.tags?.toArray().includes('Layer 1'); return market.asset.tags?.toArray().includes('Layer 1');
}, },
@@ -28,13 +30,15 @@ export const useMarketsData = (
const allAssets = useSelector(getAssets, shallowEqual) || {}; const allAssets = useSelector(getAssets, shallowEqual) || {};
const markets = useMemo(() => { const markets = useMemo(() => {
return Object.values(allPerpetualMarkets).map((marketData) => ({ return Object.values(allPerpetualMarkets)
asset: allAssets[marketData.assetId], .filter(isTruthy)
tickSizeDecimals: marketData.configs?.tickSizeDecimals, .map((marketData) => ({
...marketData, asset: allAssets[marketData.assetId],
...marketData.perpetual, tickSizeDecimals: marketData.configs?.tickSizeDecimals,
...marketData.configs, ...marketData,
})) as MarketData[]; ...marketData.perpetual,
...marketData.configs,
})) as MarketData[];
}, [allPerpetualMarkets, allAssets]); }, [allPerpetualMarkets, allAssets]);
const filteredMarkets = useMemo(() => { const filteredMarkets = useMemo(() => {
+42 -25
View File
@@ -4,15 +4,14 @@ import { useSelector, shallowEqual, useDispatch } from 'react-redux';
import { groupBy } from 'lodash'; import { groupBy } from 'lodash';
import { AlertType } from '@/constants/alerts'; import { AlertType } from '@/constants/alerts';
import { AbacusOrderStatus, ORDER_SIDES, ORDER_STATUS_STRINGS } from '@/constants/abacus'; import { AbacusOrderStatus, ORDER_SIDES } from '@/constants/abacus';
import { DialogTypes } from '@/constants/dialogs'; import { DialogTypes } from '@/constants/dialogs';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS, StringKey } from '@/constants/localization';
import { type NotificationTypeConfig, NotificationType } from '@/constants/notifications'; import { type NotificationTypeConfig, NotificationType } from '@/constants/notifications';
import { ORDER_SIDE_STRINGS, TRADE_TYPE_STRINGS, TradeTypes } from '@/constants/trade'; import { ORDER_SIDE_STRINGS } from '@/constants/trade';
import { useLocalNotifications } from '@/hooks/useLocalNotifications'; import { useLocalNotifications } from '@/hooks/useLocalNotifications';
import { AlertMessage } from '@/components/AlertMessage';
import { Icon, IconName } from '@/components/Icon'; import { Icon, IconName } from '@/components/Icon';
import { Output, OutputType } from '@/components/Output'; import { Output, OutputType } from '@/components/Output';
import { TransferStatusToast } from '@/views/TransferStatus'; import { TransferStatusToast } from '@/views/TransferStatus';
@@ -69,11 +68,11 @@ export const notificationTypes = [
<OrderStatusIcon status={order.status} totalFilled={order.totalFilled ?? 0} /> <OrderStatusIcon status={order.status} totalFilled={order.totalFilled ?? 0} />
), ),
title: `${stringGetter({ title: `${stringGetter({
key: TRADE_TYPE_STRINGS[order.type.rawValue as TradeTypes].tradeTypeKey, key: order.resources.typeStringKey as StringKey,
})} ${ })} ${
order.status === AbacusOrderStatus.open && (order?.totalFilled ?? 0) > 0 order.status === AbacusOrderStatus.open && (order?.totalFilled ?? 0) > 0
? stringGetter({ key: STRING_KEYS.PARTIALLY_FILLED }) ? stringGetter({ key: STRING_KEYS.PARTIALLY_FILLED })
: stringGetter({ key: ORDER_STATUS_STRINGS[order.status.name] }) : stringGetter({ key: order.resources.statusStringKey as StringKey })
}`, }`,
description: `${stringGetter({ description: `${stringGetter({
key: ORDER_SIDE_STRINGS[ORDER_SIDES[order.side.name]], key: ORDER_SIDE_STRINGS[ORDER_SIDES[order.side.name]],
@@ -91,18 +90,34 @@ export const notificationTypes = [
}, [orderIds]); }, [orderIds]);
}, },
useNotificationAction: () => { // useNotificationAction: () => {
const dispatch = useDispatch(); // const dispatch = useDispatch();
// const orders = useSelector(getSubaccountOrders, shallowEqual) || [];
// const ordersByOrderId = Object.fromEntries(orders.map((order) => [order.id, order]));
return (orderId) => { // const fills = useSelector(getSubaccountFills, shallowEqual) || [];
dispatch( // const fillsByOrderId = groupBy(fills, (fill) => fill.orderId);
openDialog({
type: DialogTypes.OrderDetails, // return (id) => {
dialogProps: { orderId }, // if (ordersByOrderId[id]) {
}) // dispatch(
); // openDialog({
}; // type: DialogTypes.OrderDetails,
}, // dialogProps: { orderId: id },
// })
// );
// } else if (fillsByOrderId[id]) {
// const fillId = fillsByOrderId[id][0].id;
// dispatch(
// openDialog({
// type: DialogTypes.FillDetails,
// dialogProps: { fillId },
// })
// );
// }
// };
// },
} as NotificationTypeConfig<string, [string, number]>, } as NotificationTypeConfig<string, [string, number]>,
{ {
type: NotificationType.SquidTransfer, type: NotificationType.SquidTransfer,
@@ -110,18 +125,18 @@ export const notificationTypes = [
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { transferNotifications } = useLocalNotifications(); const { transferNotifications } = useLocalNotifications();
const getTitleStringKey = useCallback((type: 'deposit' | 'withdraw', finished: boolean) => { const getTitleStringKey = useCallback((type: 'deposit' | 'withdrawal', finished: boolean) => {
if (type === 'deposit' && !finished) return STRING_KEYS.DEPOSIT_IN_PROGRESS; if (type === 'deposit' && !finished) return STRING_KEYS.DEPOSIT_IN_PROGRESS;
if (type === 'deposit' && finished) return STRING_KEYS.DEPOSIT; if (type === 'deposit' && finished) return STRING_KEYS.DEPOSIT;
if (type === 'withdraw' && !finished) return STRING_KEYS.WITHDRAW_IN_PROGRESS; if (type === 'withdrawal' && !finished) return STRING_KEYS.WITHDRAW_IN_PROGRESS;
return STRING_KEYS.WITHDRAW; return STRING_KEYS.WITHDRAW;
}, []); }, []);
useEffect(() => { useEffect(() => {
for (const transfer of transferNotifications) { for (const transfer of transferNotifications) {
const { toChainId, status, txHash, toAmount } = transfer; const { fromChainId, status, txHash, toAmount } = transfer;
const finished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing'; const finished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
const type = toChainId === TESTNET_CHAIN_ID ? 'deposit' : 'withdraw'; const type = fromChainId === TESTNET_CHAIN_ID ? 'withdrawal' : 'deposit';
// @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;
@@ -138,7 +153,8 @@ export const notificationTypes = [
{stringGetter({ {stringGetter({
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE, key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
params: { params: {
ERROR_MESSAGE: error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }), ERROR_MESSAGE:
error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
}, },
})} })}
</Styled.ErrorMessage> </Styled.ErrorMessage>
@@ -154,6 +170,7 @@ export const notificationTypes = [
description: description, description: description,
customContent: ( customContent: (
<TransferStatusToast <TransferStatusToast
type={type}
toAmount={transfer.toAmount} toAmount={transfer.toAmount}
triggeredAt={transfer.triggeredAt} triggeredAt={transfer.triggeredAt}
status={transfer.status} status={transfer.status}
@@ -162,7 +179,7 @@ export const notificationTypes = [
customMenuContent: !finished && ( customMenuContent: !finished && (
<div> <div>
{description} {description}
<TransferStatusSteps status={transfer.status} /> <TransferStatusSteps status={transfer.status} type={type} />
</div> </div>
), ),
toastSensitivity: 'foreground', toastSensitivity: 'foreground',
@@ -181,8 +198,8 @@ Styled.TransferText = styled.span`
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
gap: 0.5ch; gap: 0.5ch;
` `;
Styled.ErrorMessage = styled.div` Styled.ErrorMessage = styled.div`
max-width: 13rem; max-width: 13rem;
`; `;
+53
View File
@@ -0,0 +1,53 @@
import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { RestrictionType } from '@/constants/abacus';
import { DialogTypes } from '@/constants/dialogs';
import { getRestrictionType } from '@/state/accountSelectors';
import { forceOpenDialog } from '@/state/dialogs';
import { isTruthy } from '@/lib/isTruthy';
const useRestrictionContext = () => {
const dispatch = useDispatch();
const restrictionType = useSelector(getRestrictionType, shallowEqual);
const [sanctionedAddresses, setSanctionedAddresses] = useState<string[]>([]);
useEffect(() => {
if (restrictionType === RestrictionType.GEO_RESTRICTED) {
dispatch(
forceOpenDialog({ type: DialogTypes.RestrictedGeo, dialogProps: { preventClose: true } })
);
}
}, [restrictionType, dispatch]);
const updateSanctionedAddresses = useCallback(
(screenedAddresses: { [address: string]: boolean }) => {
const toAdd = Object.entries(screenedAddresses)
.filter(([, isSanctioned]) => isSanctioned)
.map(([address]) => address);
if (toAdd.length) {
setSanctionedAddresses([...sanctionedAddresses, ...toAdd]);
}
},
[sanctionedAddresses]
);
return {
isBadActor: restrictionType === RestrictionType.USER_RESTRICTED,
isGeoRestricted: restrictionType === RestrictionType.GEO_RESTRICTED,
updateSanctionedAddresses,
sanctionedAddresses: useMemo(() => new Set(sanctionedAddresses), [sanctionedAddresses]),
};
};
type RestrictionContextType = ReturnType<typeof useRestrictionContext>;
const RestrictionContext = createContext<RestrictionContextType>({} as RestrictionContextType);
RestrictionContext.displayName = 'Restriction';
export const RestrictionProvider = ({ ...props }) => (
<RestrictionContext.Provider value={useRestrictionContext()} {...props} />
);
export const useRestrictions = () => useContext(RestrictionContext);
+4 -1
View File
@@ -2,13 +2,15 @@ import { useCallback } from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { LocalStorageKey } from '@/constants/localStorage'; import { LocalStorageKey } from '@/constants/localStorage';
import { DEFAULT_APP_ENVIRONMENT, DydxNetwork } from '@/constants/networks'; import { DEFAULT_APP_ENVIRONMENT, DydxNetwork, ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { useAccounts, useLocalStorage } from '@/hooks'; import { useAccounts, useLocalStorage } from '@/hooks';
import { setSelectedNetwork } from '@/state/app'; import { setSelectedNetwork } from '@/state/app';
import { getSelectedNetwork } from '@/state/appSelectors'; import { getSelectedNetwork } from '@/state/appSelectors';
import { validateAgainstAvailableEnvironments } from '@/lib/network';
export const useSelectedNetwork = (): { export const useSelectedNetwork = (): {
switchNetwork: (network: DydxNetwork) => void; switchNetwork: (network: DydxNetwork) => void;
selectedNetwork: DydxNetwork; selectedNetwork: DydxNetwork;
@@ -20,6 +22,7 @@ export const useSelectedNetwork = (): {
const [, setLocalStorageNetwork] = useLocalStorage<DydxNetwork>({ const [, setLocalStorageNetwork] = useLocalStorage<DydxNetwork>({
key: LocalStorageKey.SelectedNetwork, key: LocalStorageKey.SelectedNetwork,
defaultValue: DEFAULT_APP_ENVIRONMENT, defaultValue: DEFAULT_APP_ENVIRONMENT,
validateFn: validateAgainstAvailableEnvironments,
}); });
const switchNetwork = useCallback( const switchNetwork = useCallback(
+5 -1
View File
@@ -22,7 +22,11 @@ const useSquidContext = () => {
}; };
const squid = useMemo( const squid = useMemo(
() => new Squid({ baseUrl: ENVIRONMENT_CONFIG_MAP[selectedNetwork]?.endpoints['0xsquid'] }), () =>
new Squid({
baseUrl: ENVIRONMENT_CONFIG_MAP[selectedNetwork]?.endpoints['0xsquid'],
integratorId: ENVIRONMENT_CONFIG_MAP[selectedNetwork]?.squidIntegratorId,
}),
[selectedNetwork] [selectedNetwork]
); );
+102 -65
View File
@@ -3,15 +3,10 @@ import { shallowEqual, useSelector, useDispatch } from 'react-redux';
import type { Nullable } from '@dydxprotocol/v4-abacus'; import 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 type { EncodeObject, Coin } from '@cosmjs/proto-signing'; import type { EncodeObject } from '@cosmjs/proto-signing';
import { Method } from '@cosmjs/tendermint-rpc'; import { Method } from '@cosmjs/tendermint-rpc';
import { import { type LocalWallet, SubaccountClient } from '@dydxprotocol/v4-client-js';
type LocalWallet,
SubaccountClient,
DYDX_DENOM,
USDC_DENOM,
} from '@dydxprotocol/v4-client-js';
import type { import type {
AccountBalance, AccountBalance,
@@ -34,9 +29,9 @@ import { MustBigNumber } from '@/lib/numbers';
import { log } from '@/lib/telemetry'; import { log } from '@/lib/telemetry';
import { useAccounts } from './useAccounts'; import { useAccounts } from './useAccounts';
import { useTokenConfigs } from './useTokenConfigs';
import { useDydxClient } from './useDydxClient'; import { useDydxClient } from './useDydxClient';
type SubaccountContextType = ReturnType<typeof useSubaccountContext>; type SubaccountContextType = ReturnType<typeof useSubaccountContext>;
const SubaccountContext = createContext<SubaccountContextType>({} as SubaccountContextType); const SubaccountContext = createContext<SubaccountContextType>({} as SubaccountContextType);
SubaccountContext.displayName = 'Subaccount'; SubaccountContext.displayName = 'Subaccount';
@@ -53,6 +48,7 @@ export const useSubaccount = () => useContext(SubaccountContext);
export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: LocalWallet }) => { export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: LocalWallet }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const { usdcDenom, usdcDecimals } = useTokenConfigs();
const { compositeClient, faucetClient } = useDydxClient(); const { compositeClient, faucetClient } = useDydxClient();
const { getFaucetFunds } = useMemo( const { getFaucetFunds } = useMemo(
@@ -78,22 +74,39 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
() => ({ () => ({
depositToSubaccount: async ({ depositToSubaccount: async ({
subaccountClient, subaccountClient,
assetId = 0,
amount, amount,
}: { }: {
subaccountClient: SubaccountClient; subaccountClient: SubaccountClient;
assetId?: number; assetId?: number;
amount: Long; amount: number;
}) => await compositeClient?.validatorClient.post.deposit(subaccountClient, assetId, amount), }) => {
try {
return await compositeClient?.depositToSubaccount(
subaccountClient,
amount.toFixed(usdcDecimals)
);
} catch (error) {
log('useSubaccount/depositToSubaccount', error);
throw error;
}
},
withdrawFromSubaccount: async ({ withdrawFromSubaccount: async ({
subaccountClient, subaccountClient,
amount, amount,
}: { }: {
subaccountClient: SubaccountClient; subaccountClient: SubaccountClient;
amount: number; amount: number;
}) => await compositeClient?.withdrawFromSubaccount(subaccountClient, amount), }) => {
try {
return await compositeClient?.withdrawFromSubaccount(
subaccountClient,
amount.toFixed(usdcDecimals)
);
} catch (error) {
log('useSubaccount/withdrawFromSubaccount', error);
throw error;
}
},
transferFromSubaccountToAddress: async ({ transferFromSubaccountToAddress: async ({
subaccountClient, subaccountClient,
assetId = 0, assetId = 0,
@@ -104,27 +117,33 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
assetId?: number; assetId?: number;
amount: number; amount: number;
recipient: string; recipient: string;
}) => }) => {
await compositeClient?.validatorClient.post.send( try {
subaccountClient?.wallet, return await compositeClient?.validatorClient.post.send(
() => subaccountClient?.wallet,
new Promise((resolve) => { () =>
const msg = new Promise((resolve) => {
compositeClient?.validatorClient.post.composer.composeMsgWithdrawFromSubaccount( const msg =
subaccountClient.address, compositeClient?.validatorClient.post.composer.composeMsgWithdrawFromSubaccount(
subaccountClient.subaccountNumber, subaccountClient.address,
assetId, subaccountClient.subaccountNumber,
Long.fromNumber(amount * QUANTUM_MULTIPLIER), assetId,
recipient Long.fromNumber(amount * QUANTUM_MULTIPLIER),
); recipient
);
resolve([msg]); resolve([msg]);
}), }),
false, false,
undefined, undefined,
undefined, undefined,
Method.BroadcastTxCommit Method.BroadcastTxCommit
), );
} catch (error) {
log('useSubaccount/transferFromSubaccountToAddress', error);
throw error;
}
},
transferNativeToken: async ({ transferNativeToken: async ({
subaccountClient, subaccountClient,
@@ -134,15 +153,30 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
subaccountClient: SubaccountClient; subaccountClient: SubaccountClient;
amount: number; amount: number;
recipient: string; recipient: string;
}) => }) => {
await compositeClient?.validatorClient.post.sendToken( try {
subaccountClient, return await compositeClient?.validatorClient.post.send(
recipient, subaccountClient.wallet,
DYDX_DENOM, () =>
Long.fromNumber(amount * QUANTUM_MULTIPLIER), new Promise((resolve) => {
false, const msg = compositeClient?.sendTokenMessage(
Method.BroadcastTxCommit subaccountClient.wallet,
), amount.toString(),
recipient
);
resolve([msg]);
}),
false,
compositeClient?.validatorClient?.post.defaultDydxGasPrice,
undefined,
Method.BroadcastTxCommit
);
} catch (error) {
log('useSubaccount/transferNativeToken', error);
throw error;
}
},
sendSquidWithdrawFromSubaccount: async ({ sendSquidWithdrawFromSubaccount: async ({
subaccountClient, subaccountClient,
@@ -154,20 +188,27 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
payload: string; payload: string;
}) => { }) => {
if (!compositeClient) throw new Error('client not initialized'); if (!compositeClient) throw new Error('client not initialized');
try {
const transaction = JSON.parse(payload);
const transaction = JSON.parse(payload); const msg = compositeClient.withdrawFromSubaccountMessage(
subaccountClient,
amount.toFixed(usdcDecimals)
);
const ibcMsg: EncodeObject = {
typeUrl: transaction.msgTypeUrl,
value: transaction.msg,
};
const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount); return await compositeClient.send(
const ibcMsg: EncodeObject = { subaccountClient.wallet,
typeUrl: transaction.msgTypeUrl, () => Promise.resolve([msg, ibcMsg]),
value: transaction.msg, false
}; );
} catch (error) {
return await compositeClient.send( log('useSubaccount/sendSquidWithdrawFromSubaccount', error);
subaccountClient.wallet, throw error;
() => Promise.resolve([msg, ibcMsg]), }
false
);
}, },
}), }),
[compositeClient] [compositeClient]
@@ -196,13 +237,9 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
async (balance: AccountBalance) => { async (balance: AccountBalance) => {
if (!localDydxWallet) return; if (!localDydxWallet) return;
const amountAfterDust = MustBigNumber(balance.amount) const amount = parseFloat(balance.amount) - AMOUNT_RESERVED_FOR_GAS_USDC;
.minus(AMOUNT_RESERVED_FOR_GAS_USDC) // keep 0.1 USDC in user's wallet for gas
.toString();
const amount = Long.fromString(amountAfterDust || '0'); if (amount > 0) {
if (amount.greaterThan(Long.ZERO)) {
const subaccountClient = new SubaccountClient(localDydxWallet, 0); const subaccountClient = new SubaccountClient(localDydxWallet, 0);
await depositToSubaccount({ amount, subaccountClient }); await depositToSubaccount({ amount, subaccountClient });
} }
@@ -211,7 +248,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
); );
const balances = useSelector(getBalances, shallowEqual); const balances = useSelector(getBalances, shallowEqual);
const usdcCoinBalance = balances?.[USDC_DENOM]; const usdcCoinBalance = balances?.[usdcDenom];
useEffect(() => { useEffect(() => {
if (usdcCoinBalance) { if (usdcCoinBalance) {
@@ -220,7 +257,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
}, [usdcCoinBalance]); }, [usdcCoinBalance]);
const deposit = useCallback( const deposit = useCallback(
async (amount: Long) => { async (amount: number) => {
if (!subaccountClient) { if (!subaccountClient) {
return; return;
} }
@@ -248,8 +285,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
if (!subaccountClient) { if (!subaccountClient) {
return; return;
} }
return (await (coinDenom === usdcDenom
return (await (coinDenom === USDC_DENOM
? transferFromSubaccountToAddress ? transferFromSubaccountToAddress
: transferNativeToken)({ subaccountClient, amount, recipient })) as IndexedTx; : transferNativeToken)({ subaccountClient, amount, recipient })) as IndexedTx;
}, },
@@ -275,6 +311,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
await getFaucetFunds({ dydxAddress, subaccountNumber }); await getFaucetFunds({ dydxAddress, subaccountNumber });
} catch (error) { } catch (error) {
log('useSubaccount/getFaucetFunds', error); log('useSubaccount/getFaucetFunds', error);
throw error;
} }
}, [dydxAddress, getFaucetFunds, subaccountNumber]); }, [dydxAddress, getFaucetFunds, subaccountNumber]);
+40
View File
@@ -0,0 +1,40 @@
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { DydxChainAsset } from '@/constants/wallets';
import { useSelectedNetwork } from '@/hooks';
export const useTokenConfigs = (): {
tokensConfigs: {
[DydxChainAsset.USDC]: {
denom: string;
name: string;
decimals: number;
gasDenom?: string;
},
[DydxChainAsset.CHAINTOKEN]: {
denom: string;
name: string;
decimals: number;
gasDenom?: string;
},
};
usdcDenom: string;
usdcDecimals: number;
usdcLabel: string;
chainTokenDenom: string;
chainTokenDecimals: number;
chainTokenLabel: string;
} => {
const { selectedNetwork } = useSelectedNetwork();
const tokensConfigs = ENVIRONMENT_CONFIG_MAP[selectedNetwork].tokens;
return {
tokensConfigs,
usdcDenom: tokensConfigs[DydxChainAsset.USDC].denom,
usdcDecimals: tokensConfigs[DydxChainAsset.USDC].decimals,
usdcLabel: tokensConfigs[DydxChainAsset.USDC].name,
chainTokenDenom: tokensConfigs[DydxChainAsset.CHAINTOKEN].denom,
chainTokenDecimals: tokensConfigs[DydxChainAsset.CHAINTOKEN].decimals,
chainTokenLabel: tokensConfigs[DydxChainAsset.CHAINTOKEN].name,
};
};
+50
View File
@@ -0,0 +1,50 @@
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { useSelectedNetwork } from '@/hooks';
const FALLBACK_URL = 'https://help.dydx.exchange/';
export interface LinksConfigs {
tos: string,
privacy: string,
mintscan: string,
mintscanBase: string,
feedback?: string,
help?: string,
blogs?: string,
foundation?: string,
initialMarginFractionLearnMore?: string,
reduceOnlyLearnMore?: string,
documentation?: string,
community?: string,
governanceLearnMore?: string,
stakingLearnMore?: string,
keplrDashboard?: string,
accountExportLearnMore?: string,
walletLearnMore?: string
}
export const useURLConfigs = (): LinksConfigs => {
const { selectedNetwork } = useSelectedNetwork();
const linksConfigs = ENVIRONMENT_CONFIG_MAP[selectedNetwork].links as LinksConfigs;
return {
tos: linksConfigs.tos,
privacy: linksConfigs.privacy,
mintscan: linksConfigs.mintscan,
mintscanBase: linksConfigs.mintscanBase,
feedback: linksConfigs.feedback || FALLBACK_URL,
help: linksConfigs.help || FALLBACK_URL,
blogs: linksConfigs.blogs || FALLBACK_URL,
foundation: linksConfigs.foundation || FALLBACK_URL,
initialMarginFractionLearnMore: linksConfigs.initialMarginFractionLearnMore || FALLBACK_URL,
reduceOnlyLearnMore: linksConfigs.reduceOnlyLearnMore || FALLBACK_URL,
documentation: linksConfigs.documentation || FALLBACK_URL,
community: linksConfigs.community || FALLBACK_URL,
governanceLearnMore: linksConfigs.governanceLearnMore || FALLBACK_URL,
stakingLearnMore: linksConfigs.stakingLearnMore || FALLBACK_URL,
keplrDashboard: linksConfigs.keplrDashboard || FALLBACK_URL,
accountExportLearnMore: linksConfigs.accountExportLearnMore || FALLBACK_URL,
walletLearnMore: linksConfigs.walletLearnMore || FALLBACK_URL,
};
};
+10 -1
View File
@@ -1,6 +1,8 @@
import { useCallback, useEffect, useState } from 'react'; import { useCallback, useEffect, useState } from 'react';
import { useSelector } from 'react-redux';
import { LocalStorageKey } from '@/constants/localStorage'; import { LocalStorageKey } from '@/constants/localStorage';
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { import {
type DydxAddress, type DydxAddress,
@@ -28,6 +30,8 @@ import {
WalletType as CosmosWalletType, WalletType as CosmosWalletType,
} from 'graz'; } from 'graz';
import { getSelectedNetwork } from '@/state/appSelectors';
import { resolveWagmiConnector } from '@/lib/wagmi'; import { resolveWagmiConnector } from '@/lib/wagmi';
import { getWalletConnection, parseWalletError } from '@/lib/wallet'; import { getWalletConnection, parseWalletError } from '@/lib/wallet';
import { log } from '@/lib/telemetry'; import { log } from '@/lib/telemetry';
@@ -84,6 +88,9 @@ export const useWalletConnection = () => {
// Wallet connection // Wallet connection
const selectedNetwork = useSelector(getSelectedNetwork);
const walletConnectConfig = ENVIRONMENT_CONFIG_MAP[selectedNetwork].wallets.walletconnect;
const { connectAsync: connectWagmi } = const { connectAsync: connectWagmi } =
walletType && walletConnectionType walletType && walletConnectionType
? useConnectWagmi({ ? useConnectWagmi({
@@ -92,6 +99,7 @@ export const useWalletConnection = () => {
walletConnection: { walletConnection: {
type: walletConnectionType, type: walletConnectionType,
}, },
walletConnectConfig,
}), }),
}) })
: useConnectWagmi(); : useConnectWagmi();
@@ -127,6 +135,7 @@ export const useWalletConnection = () => {
connector: resolveWagmiConnector({ connector: resolveWagmiConnector({
walletType, walletType,
walletConnection, walletConnection,
walletConnectConfig,
}), }),
}); });
} }
@@ -217,7 +226,7 @@ export const useWalletConnection = () => {
evmAddressWagmi, evmAddressWagmi,
signerWagmi, signerWagmi,
publicClientWagmi, publicClientWagmi,
// Wallet connection (Cosmos) // Wallet connection (Cosmos)
dydxAddress, dydxAddress,
dydxAddressGraz, dydxAddressGraz,
+3
View File
@@ -0,0 +1,3 @@
<svg width="16" height="18" viewBox="0 0 16 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.3811 13.235C11.9338 13.0512 13.4593 12.6847 14.9261 12.1433C13.6839 10.7673 12.9975 8.97875 13.0003 7.125V6.54167V6.5C13.0003 5.17392 12.4735 3.90215 11.5358 2.96447C10.5981 2.02678 9.32636 1.5 8.00028 1.5C6.67419 1.5 5.40242 2.02678 4.46474 2.96447C3.52706 3.90215 3.00028 5.17392 3.00028 6.5V7.125C3.00279 8.97886 2.3161 10.7675 1.07361 12.1433C2.51778 12.6767 4.04027 13.0475 5.61944 13.235M10.3811 13.235C8.79943 13.4226 7.20112 13.4226 5.61944 13.235M10.3811 13.235C10.5012 13.6099 10.5311 14.0078 10.4683 14.3964C10.4055 14.785 10.2518 15.1533 10.0198 15.4713C9.78772 15.7893 9.48386 16.048 9.13293 16.2263C8.78201 16.4047 8.39392 16.4976 8.00028 16.4976C7.60663 16.4976 7.21854 16.4047 6.86762 16.2263C6.51669 16.048 6.21283 15.7893 5.98079 15.4713C5.74875 15.1533 5.59508 14.785 5.53229 14.3964C5.46949 14.0078 5.49936 13.6099 5.61944 13.235" stroke="currentColor" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

+1 -1
View File
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 24"><path fill="currentColor" d="M11 0C8.5 0 6.101.948 4.333 2.636 2.565 4.324 1.57 6.613 1.57 9v5.379l-1.11 1.06c-.22.21-.37.477-.43.768-.061.291-.03.593.089.867s.32.508.578.673c.259.165.562.253.873.253h18.86c.31 0 .614-.088.873-.253.258-.165.46-.399.578-.673.12-.274.15-.576.09-.867a1.48 1.48 0 0 0-.43-.768l-1.111-1.06V9c0-2.387-.993-4.676-2.762-6.364C15.9.948 13.501 0 11 0Zm0 24a4.83 4.83 0 0 1-3.334-1.318 4.399 4.399 0 0 1-1.38-3.182h9.428a4.399 4.399 0 0 1-1.38 3.182A4.83 4.83 0 0 1 11 24Z"/></svg> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 24"><path fill="currentColor" d="M11 0C8.5 0 6.101.948 4.333 2.636 2.565 4.324 1.57 6.613 1.57 9v5.379l-1.11 1.06c-.22.21-.37.477-.43.768-.061.291-.03.593.089.867s.32.508.578.673c.259.165.562.253.873.253h18.86c.31 0 .614-.088.873-.253.258-.165.46-.399.578-.673.12-.274.15-.576.09-.867a1.48 1.48 0 0 0-.43-.768l-1.111-1.06V9c0-2.387-.993-4.676-2.762-6.364C15.9.948 13.501 0 11 0Zm0 24a4.83 4.83 0 0 1-3.334-1.318 4.399 4.399 0 0 1-1.38-3.182h9.428a4.399 4.399 0 0 1-1.38 3.182A4.83 4.83 0 0 1 11 24Z"/></svg>

Before

Width:  |  Height:  |  Size: 563 B

After

Width:  |  Height:  |  Size: 564 B

+1
View File
@@ -0,0 +1 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M5.625 6.1875h6.75m-6.75 2.25H9M1.6875 9.57c0 1.2.84225 2.2455 2.03025 2.4203.84675.1245 1.7025.2197 2.56725.2842.2625.0195.5025.1575.64875.3758L9 15.75l2.0663-3.0997c.0724-.1078.1685-.1977.2809-.2628.1125-.0651.2382-.1038.3678-.113.8589-.0641 1.7152-.1589 2.5672-.2842 1.188-.1748 2.0303-1.2195 2.0303-2.42105v-4.5135c0-1.2015-.8423-2.24625-2.0303-2.421A36.294434 36.294434 0 0 0 9 2.25c-1.794 0-3.558.13125-5.28225.38475-1.188.17475-2.03025 1.22025-2.03025 2.421V9.57Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>

After

Width:  |  Height:  |  Size: 672 B

+11
View File
@@ -0,0 +1,11 @@
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
<g clip-path="url(#clip0_18204_36775)">
<path d="M13.2426 6.25736C14.0817 7.09647 14.6531 8.16557 14.8846 9.32946C15.1162 10.4933 14.9973 11.6997 14.5432 12.7961C14.0891 13.8925 13.32 14.8295 12.3334 15.4888C11.3467 16.1481 10.1866 16.5 8.99993 16.5C7.81324 16.5 6.6532 16.1481 5.66651 15.4888C4.67981 14.8295 3.91078 13.8925 3.45665 12.7961C3.00253 11.6997 2.88371 10.4933 3.11522 9.32946C3.34673 8.16557 3.91817 7.09647 4.75729 6.25736" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round"/>
<path d="M11.25 9L9 11.25M9 11.25L6.75 9M9 11.25V1.6875" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round" stroke-linejoin="round"/>
</g>
<defs>
<clipPath id="clip0_18204_36775">
<rect width="18" height="18" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 886 B

+1 -1
View File
@@ -1 +1 @@
<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15 8C15 9.53527 14.6867 10.8758 14.2269 11.7954C13.77 12.7092 13.3116 12.9664 13.0527 12.9968L12.6636 12.8953C12.4116 12.7511 12.092 12.4331 11.7731 11.7954C11.3133 10.8758 11 9.53527 11 8C11 6.46473 11.3133 5.12424 11.7731 4.20457C12.0924 3.56607 12.4124 3.24815 12.6645 3.10417L13.0519 3.00311C13.3107 3.0331 13.7696 3.28991 14.2269 4.20457C14.6867 5.12424 15 6.46473 15 8ZM12.2928 2.16768L1.41963 5.00415C0.628571 5.08768 0 6.39699 0 7.99992C0 9.60346 0.629045 10.9131 1.42053 10.9958L2.50023 11.2774V12.9998C2.50023 13.8283 3.17181 14.4998 4.00023 14.4998C4.82866 14.4998 5.50023 13.8283 5.50023 12.9998V12.0601L12.2914 13.8317C12.5186 13.9417 12.7559 14 13 14C14.6569 14 16 11.3137 16 8C16 4.68629 14.6569 2 13 2C12.7564 2 12.5196 2.05808 12.2928 2.16768ZM10.9931 3.5402L2.49607 5.75681C2.80523 6.30634 3 7.10764 3 7.99992C3 8.89214 2.80525 9.69339 2.49614 10.2429L10.9929 12.4595C10.3833 11.3612 10 9.77013 10 8C10 6.22968 10.3834 4.63843 10.9931 3.5402ZM2 7.99992C2 8.70677 1.85462 9.29725 1.66623 9.67403C1.59961 9.80728 1.54246 9.88955 1.5 9.93955C1.45754 9.88955 1.40039 9.80728 1.33377 9.67403C1.14538 9.29725 1 8.70677 1 7.99992C1 7.29308 1.14538 6.70259 1.33377 6.32582C1.40039 6.19256 1.45754 6.11029 1.5 6.06029C1.54246 6.11029 1.59961 6.19256 1.66623 6.32582C1.85462 6.70259 2 7.29308 2 7.99992ZM1.41964 10.0124C1.41962 10.0124 1.42071 10.0118 1.42296 10.0109C1.42079 10.0121 1.41966 10.0125 1.41964 10.0124ZM1.57704 10.0109C1.57929 10.0118 1.58038 10.0124 1.58036 10.0124C1.58033 10.0125 1.57921 10.0121 1.57704 10.0109ZM1.58036 5.9874C1.58038 5.98747 1.57929 5.98808 1.57704 5.98899C1.57921 5.98778 1.58034 5.98732 1.58036 5.9874ZM1.42296 5.98899C1.42071 5.98808 1.41962 5.98747 1.41964 5.9874C1.41966 5.98732 1.42079 5.98778 1.42296 5.98899ZM3.50023 12.9998V11.5383L4.50023 11.7992V12.9998C4.50023 13.276 4.27638 13.4998 4.00023 13.4998C3.72409 13.4998 3.50023 13.276 3.50023 12.9998Z" fill="currentColor"/></svg> <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15 8C15 9.53527 14.6867 10.8758 14.2269 11.7954C13.77 12.7092 13.3116 12.9664 13.0527 12.9968L12.6636 12.8953C12.4116 12.7511 12.092 12.4331 11.7731 11.7954C11.3133 10.8758 11 9.53527 11 8C11 6.46473 11.3133 5.12424 11.7731 4.20457C12.0924 3.56607 12.4124 3.24815 12.6645 3.10417L13.0519 3.00311C13.3107 3.0331 13.7696 3.28991 14.2269 4.20457C14.6867 5.12424 15 6.46473 15 8ZM12.2928 2.16768L1.41963 5.00415C0.628571 5.08768 0 6.39699 0 7.99992C0 9.60346 0.629045 10.9131 1.42053 10.9958L2.50023 11.2774V12.9998C2.50023 13.8283 3.17181 14.4998 4.00023 14.4998C4.82866 14.4998 5.50023 13.8283 5.50023 12.9998V12.0601L12.2914 13.8317C12.5186 13.9417 12.7559 14 13 14C14.6569 14 16 11.3137 16 8C16 4.68629 14.6569 2 13 2C12.7564 2 12.5196 2.05808 12.2928 2.16768ZM10.9931 3.5402L2.49607 5.75681C2.80523 6.30634 3 7.10764 3 7.99992C3 8.89214 2.80525 9.69339 2.49614 10.2429L10.9929 12.4595C10.3833 11.3612 10 9.77013 10 8C10 6.22968 10.3834 4.63843 10.9931 3.5402ZM2 7.99992C2 8.70677 1.85462 9.29725 1.66623 9.67403C1.59961 9.80728 1.54246 9.88955 1.5 9.93955C1.45754 9.88955 1.40039 9.80728 1.33377 9.67403C1.14538 9.29725 1 8.70677 1 7.99992C1 7.29308 1.14538 6.70259 1.33377 6.32582C1.40039 6.19256 1.45754 6.11029 1.5 6.06029C1.54246 6.11029 1.59961 6.19256 1.66623 6.32582C1.85462 6.70259 2 7.29308 2 7.99992ZM1.41964 10.0124C1.41962 10.0124 1.42071 10.0118 1.42296 10.0109C1.42079 10.0121 1.41966 10.0125 1.41964 10.0124ZM1.57704 10.0109C1.57929 10.0118 1.58038 10.0124 1.58036 10.0124C1.58033 10.0125 1.57921 10.0121 1.57704 10.0109ZM1.58036 5.9874C1.58038 5.98747 1.57929 5.98808 1.57704 5.98899C1.57921 5.98778 1.58034 5.98732 1.58036 5.9874ZM1.42296 5.98899C1.42071 5.98808 1.41962 5.98747 1.41964 5.9874C1.41966 5.98732 1.42079 5.98778 1.42296 5.98899ZM3.50023 12.9998V11.5383L4.50023 11.7992V12.9998C4.50023 13.276 4.27638 13.4998 4.00023 13.4998C3.72409 13.4998 3.50023 13.276 3.50023 12.9998Z" fill="currentColor"/></svg>

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

+5
View File
@@ -2,11 +2,13 @@ export { default as AddressConnectorIcon } from './address-connector.svg';
export { default as ArrowIcon } from './arrow.svg'; export { default as ArrowIcon } from './arrow.svg';
export { default as Bar3Icon } from './bar3.svg'; export { default as Bar3Icon } from './bar3.svg';
export { default as BellIcon } from './bell.svg'; export { default as BellIcon } from './bell.svg';
export { default as BellStrokeIcon } from './bell-stroke.svg';
export { default as BoxCloseIcon } from './box-close.svg'; export { default as BoxCloseIcon } from './box-close.svg';
export { default as CalculatorIcon } from './calculator.svg'; export { default as CalculatorIcon } from './calculator.svg';
export { default as CaretIcon } from './caret-down.svg'; export { default as CaretIcon } from './caret-down.svg';
export { default as CautionCircleIcon } from './caution-circle.svg'; export { default as CautionCircleIcon } from './caution-circle.svg';
export { default as CautionCircleStrokeIcon } from './caution-circle-stroke.svg'; export { default as CautionCircleStrokeIcon } from './caution-circle-stroke.svg';
export { default as ChatIcon } from './chat-bubble.svg';
export { default as CheckIcon } from './check.svg'; export { default as CheckIcon } from './check.svg';
export { default as ChevronLeftIcon } from './chevron-left.svg'; export { default as ChevronLeftIcon } from './chevron-left.svg';
export { default as ChevronRightIcon } from './chevron-right.svg'; export { default as ChevronRightIcon } from './chevron-right.svg';
@@ -17,6 +19,7 @@ export { default as CoinsIcon } from './coins.svg';
export { default as CommentIcon } from './comment.svg'; export { default as CommentIcon } from './comment.svg';
export { default as CopyIcon } from './copy.svg'; export { default as CopyIcon } from './copy.svg';
export { default as CubeIcon } from './cube.svg'; export { default as CubeIcon } from './cube.svg';
export { default as DepositIcon } from './deposit.svg';
export { default as DepthChartIcon } from './depth-chart.svg'; export { default as DepthChartIcon } from './depth-chart.svg';
export { default as DiscordIcon } from './discord.svg'; export { default as DiscordIcon } from './discord.svg';
export { default as ExportKeysIcon } from './export-keys.svg'; export { default as ExportKeysIcon } from './export-keys.svg';
@@ -33,6 +36,7 @@ export { default as LockIcon } from './lock.svg';
export { default as LogoShortIcon } from './logo-short'; export { default as LogoShortIcon } from './logo-short';
export { default as MarketsIcon } from './markets.svg'; export { default as MarketsIcon } from './markets.svg';
export { default as MenuIcon } from './menu.svg'; export { default as MenuIcon } from './menu.svg';
export { default as MigrateIcon } from './migrate.svg';
export { default as MintscanIcon } from './logos/mintscan.svg'; export { default as MintscanIcon } from './logos/mintscan.svg';
export { default as OrderbookIcon } from './orderbook.svg'; export { default as OrderbookIcon } from './orderbook.svg';
export { default as OverviewIcon } from './overview.svg'; export { default as OverviewIcon } from './overview.svg';
@@ -56,6 +60,7 @@ export { default as TransferIcon } from './transfer.svg';
export { default as TriangleIcon } from './triangle.svg'; export { default as TriangleIcon } from './triangle.svg';
export { default as TryAgainIcon } from './try-again.svg'; export { default as TryAgainIcon } from './try-again.svg';
export { default as WarningIcon } from './warning.svg'; export { default as WarningIcon } from './warning.svg';
export { default as WithdrawIcon } from './withdraw.svg';
// Wallets // Wallets
export { default as BitkeepIcon } from './wallets/bitkeep.svg'; export { default as BitkeepIcon } from './wallets/bitkeep.svg';
File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 694 KiB

+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
<path d="M13.2426 6.2573C14.0817 7.09641 14.6531 8.16551 14.8846 9.3294C15.1162 10.4933 14.9973 11.6997 14.5432 12.796C14.0891 13.8924 13.32 14.8295 12.3334 15.4888C11.3467 16.148 10.1866 16.4999 8.99993 16.4999C7.81324 16.4999 6.6532 16.148 5.66651 15.4888C4.67981 14.8295 3.91078 13.8924 3.45665 12.796C3.00253 11.6997 2.88371 10.4933 3.11522 9.3294C3.34673 8.16551 3.91817 7.09641 4.75729 6.2573" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round"/>
<path d="M11.25 2.9375L9 0.6875M9 0.6875L6.75 2.9375M9 0.6875V10.25" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 723 B

+6
View File
@@ -15,9 +15,12 @@ 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';
import { OnboardingDialog } from '@/views/dialogs/OnboardingDialog'; import { OnboardingDialog } from '@/views/dialogs/OnboardingDialog';
import { RateLimitDialog } from '@/views/dialogs/RateLimitDialog';
import { ReceiveDialog } from '@/views/dialogs/ReceiveDialog'; import { ReceiveDialog } from '@/views/dialogs/ReceiveDialog';
import { RestrictedGeoDialog } from '@/views/dialogs/RestrictedGeoDialog';
import { TradeDialog } from '@/views/dialogs/TradeDialog'; import { TradeDialog } from '@/views/dialogs/TradeDialog';
import { TransferDialog } from '@/views/dialogs/TransferDialog'; import { TransferDialog } from '@/views/dialogs/TransferDialog';
import { RestrictedWalletDialog } from '@/views/dialogs/RestrictedWalletDialog';
import { WithdrawDialog } from '@/views/dialogs/WithdrawDialog'; import { WithdrawDialog } from '@/views/dialogs/WithdrawDialog';
import { OrderDetailsDialog } from '@/views/dialogs/DetailsDialog/OrderDetailsDialog'; import { OrderDetailsDialog } from '@/views/dialogs/DetailsDialog/OrderDetailsDialog';
@@ -53,7 +56,10 @@ export const DialogManager = () => {
[DialogTypes.MobileSignIn]: <MobileSignInDialog {...modalProps} />, [DialogTypes.MobileSignIn]: <MobileSignInDialog {...modalProps} />,
[DialogTypes.Onboarding]: <OnboardingDialog {...modalProps} />, [DialogTypes.Onboarding]: <OnboardingDialog {...modalProps} />,
[DialogTypes.OrderDetails]: <OrderDetailsDialog {...modalProps} />, [DialogTypes.OrderDetails]: <OrderDetailsDialog {...modalProps} />,
[DialogTypes.RateLimit]: <RateLimitDialog {...modalProps} />,
[DialogTypes.Receive]: <ReceiveDialog {...modalProps} />, [DialogTypes.Receive]: <ReceiveDialog {...modalProps} />,
[DialogTypes.RestrictedGeo]: <RestrictedGeoDialog {...modalProps} />,
[DialogTypes.RestrictedWallet]: <RestrictedWalletDialog {...modalProps} />,
[DialogTypes.Trade]: <TradeDialog {...modalProps} />, [DialogTypes.Trade]: <TradeDialog {...modalProps} />,
[DialogTypes.Transfer]: <TransferDialog {...modalProps} />, [DialogTypes.Transfer]: <TransferDialog {...modalProps} />,
[DialogTypes.Withdraw]: <WithdrawDialog {...modalProps} />, [DialogTypes.Withdraw]: <WithdrawDialog {...modalProps} />,
+64 -23
View File
@@ -1,12 +1,16 @@
import styled, { type AnyStyledComponent, css } from 'styled-components'; import styled, { type AnyStyledComponent, css } from 'styled-components';
import { AbacusApiStatus } from '@/constants/abacus'; import { AbacusApiStatus } from '@/constants/abacus';
import { ButtonSize } from '@/constants/buttons';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { useApiState, useStringGetter } from '@/hooks'; import { useApiState, useSelectedNetwork, useStringGetter } from '@/hooks';
import { ChatIcon, LinkOutIcon } from '@/icons';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import { Button } from '@/components/Button';
import { Details } from '@/components/Details'; import { Details } from '@/components/Details';
import { Output, OutputType } from '@/components/Output'; import { Output, OutputType } from '@/components/Output';
import { WithTooltip } from '@/components/WithTooltip'; import { WithTooltip } from '@/components/WithTooltip';
@@ -24,6 +28,8 @@ enum ExchangeStatus {
export const FooterDesktop = () => { export const FooterDesktop = () => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { height, indexerHeight, status, statusErrorMessage } = useApiState(); const { height, indexerHeight, status, statusErrorMessage } = useApiState();
const { selectedNetwork } = useSelectedNetwork();
const { statusPage } = ENVIRONMENT_CONFIG_MAP[selectedNetwork].links;
const { exchangeStatus, label } = const { exchangeStatus, label } =
!status || status === AbacusApiStatus.NORMAL !status || status === AbacusApiStatus.NORMAL
@@ -38,20 +44,37 @@ export const FooterDesktop = () => {
return ( return (
<Styled.Footer> <Styled.Footer>
<WithTooltip <Styled.Row>
slotTooltip={ <WithTooltip
statusErrorMessage && ( slotTooltip={
<dl> statusErrorMessage && (
<dd>{statusErrorMessage}</dd> <dl>
</dl> <dd>{statusErrorMessage}</dd>
) </dl>
} )
> }
<Styled.Row> >
<Styled.StatusDot exchangeStatus={exchangeStatus} /> <Styled.FooterButton
<span>{label}</span> slotLeft={<Styled.StatusDot exchangeStatus={exchangeStatus} />}
</Styled.Row> slotRight={statusPage && <LinkOutIcon />}
</WithTooltip> size={ButtonSize.XSmall}
state={{ isDisabled: !statusPage }}
>
{label}
</Styled.FooterButton>
</WithTooltip>
{globalThis?.Intercom && (
<Styled.FooterButton
slotLeft={<ChatIcon />}
size={ButtonSize.XSmall}
onClick={() => globalThis.Intercom('show')}
>
{stringGetter({ key: STRING_KEYS.HELP_AND_SUPPORT })}
</Styled.FooterButton>
)}
</Styled.Row>
{import.meta.env.MODE !== 'production' && ( {import.meta.env.MODE !== 'production' && (
<Styled.Details <Styled.Details
withSeparators withSeparators
@@ -82,20 +105,22 @@ Styled.Footer = styled.footer`
${layoutMixins.stickyFooter} ${layoutMixins.stickyFooter}
${layoutMixins.spacedRow} ${layoutMixins.spacedRow}
grid-area: Footer; grid-area: Footer;
font-size: 0.66em;
`; `;
Styled.Row = styled.div` Styled.Row = styled.div`
${layoutMixins.row} ${layoutMixins.row}
padding: 0 1rem; ${layoutMixins.spacedRow}
gap: 0.5rem; width: var(--sidebar-width);
padding: 0 0.5rem;
border-right: 1px solid var(--color-border);
`; `;
Styled.StatusDot = styled.div<{ exchangeStatus: ExchangeStatus }>` Styled.StatusDot = styled.div<{ exchangeStatus: ExchangeStatus }>`
width: 1em; width: 0.5rem;
height: 1em; height: 0.5rem;
border-radius: 50%; border-radius: 50%;
margin-right: 0.25rem;
background-color: ${({ exchangeStatus }) => background-color: ${({ exchangeStatus }) =>
({ ({
@@ -104,12 +129,28 @@ Styled.StatusDot = styled.div<{ exchangeStatus: ExchangeStatus }>`
}[exchangeStatus])}; }[exchangeStatus])};
`; `;
Styled.FooterButton = styled(Button)`
--button-height: 1.5rem;
--button-radius: 0.25rem;
--button-backgroundColor: var(--color-layer-2);
--button-border: none;
--button-textColor: var(--color-text-0);
&:hover:not(:disabled) {
--button-backgroundColor: var(--color-layer-3);
--button-textColor: var(--color-text-1);
}
&:disabled {
cursor: default;
}
`;
Styled.WarningOutput = styled(Output)` Styled.WarningOutput = styled(Output)`
color: var(--color-warning); color: var(--color-warning);
`; `;
Styled.Details = styled(Details)` Styled.Details = styled(Details)`
${layoutMixins.scrollArea} ${layoutMixins.scrollArea}
font: var(--font-tiny-book);
padding: 0 0.5em;
`; `;
+39 -20
View File
@@ -6,8 +6,9 @@ import { ButtonShape } from '@/constants/buttons';
import { DialogTypes } from '@/constants/dialogs'; import { DialogTypes } from '@/constants/dialogs';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { AppRoute } from '@/constants/routes'; import { AppRoute } from '@/constants/routes';
import { useStringGetter } from '@/hooks'; import { LogoShortIcon, BellStrokeIcon } from '@/icons';
import { LogoShortIcon, BellIcon } from '@/icons';
import { useTokenConfigs, useStringGetter, useURLConfigs } from '@/hooks';
import { Icon, IconName } from '@/components/Icon'; import { Icon, IconName } from '@/components/Icon';
import { IconButton } from '@/components/IconButton'; import { IconButton } from '@/components/IconButton';
@@ -23,35 +24,38 @@ import { openDialog } from '@/state/dialogs';
import { headerMixins } from '@/styles/headerMixins'; import { headerMixins } from '@/styles/headerMixins';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import breakpoints from '@/styles/breakpoints';
export const HeaderDesktop = () => { export const HeaderDesktop = () => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { documentation, community, mintscanBase } = useURLConfigs();
const dispatch = useDispatch(); const dispatch = useDispatch();
const { chainTokenLabel } = useTokenConfigs();
const navItems = [ const navItems = [
{ {
group: 'navigation', group: 'navigation',
items: [ items: [
{
value: 'MARKET',
label: stringGetter({ key: STRING_KEYS.MARKET }),
href: AppRoute.Markets,
},
{ {
value: 'TRADE', value: 'TRADE',
label: stringGetter({ key: STRING_KEYS.TRADE }), label: stringGetter({ key: STRING_KEYS.TRADE }),
href: AppRoute.Trade, href: AppRoute.Trade,
}, },
{
value: 'Dv4TNT',
label: 'Dv4TNT',
href: AppRoute.Rewards,
},
{ {
value: 'PORTFOLIO', value: 'PORTFOLIO',
label: stringGetter({ key: STRING_KEYS.PORTFOLIO }), label: stringGetter({ key: STRING_KEYS.PORTFOLIO }),
href: AppRoute.Portfolio, href: AppRoute.Portfolio,
}, },
{
value: 'MARKETS',
label: stringGetter({ key: STRING_KEYS.MARKETS }),
href: AppRoute.Markets,
},
{
value: chainTokenLabel,
label: chainTokenLabel,
href: `/${chainTokenLabel}`,
},
{ {
value: 'MORE', value: 'MORE',
label: stringGetter({ key: STRING_KEYS.MORE }), label: stringGetter({ key: STRING_KEYS.MORE }),
@@ -60,31 +64,31 @@ export const HeaderDesktop = () => {
value: 'DOCUMENTATION', value: 'DOCUMENTATION',
slotBefore: <Icon iconName={IconName.Terminal} />, slotBefore: <Icon iconName={IconName.Terminal} />,
label: stringGetter({ key: STRING_KEYS.DOCUMENTATION }), label: stringGetter({ key: STRING_KEYS.DOCUMENTATION }),
href: 'https://v4-teacher.vercel.app/', href: documentation,
}, },
{ {
value: 'MINTSCAN', value: 'MINTSCAN',
slotBefore: <Icon iconName={IconName.Mintscan} />, slotBefore: <Icon iconName={IconName.Mintscan} />,
label: stringGetter({ key: STRING_KEYS.MINTSCAN }), label: stringGetter({ key: STRING_KEYS.MINTSCAN }),
href: 'https://testnet.mintscan.io/dydx-testnet', href: mintscanBase,
}, },
{ {
value: 'COMMUNITY', value: 'COMMUNITY',
slotBefore: <Icon iconName={IconName.Discord} />, slotBefore: <Icon iconName={IconName.Discord} />,
label: stringGetter({ key: STRING_KEYS.COMMUNITY }), label: stringGetter({ key: STRING_KEYS.COMMUNITY }),
href: 'https://discord.gg/dydx', href: community,
}, },
{ {
value: 'TERMS_OF_USE', value: 'TERMS_OF_USE',
slotBefore: <Icon iconName={IconName.File} />, slotBefore: <Icon iconName={IconName.File} />,
label: stringGetter({ key: STRING_KEYS.TERMS_OF_USE }), label: stringGetter({ key: STRING_KEYS.TERMS_OF_USE }),
href: 'https://dydx.exchange/terms', href: AppRoute.Terms,
}, },
{ {
value: 'PRIVACY_POLICY', value: 'PRIVACY_POLICY',
slotBefore: <Icon iconName={IconName.Privacy} />, slotBefore: <Icon iconName={IconName.Privacy} />,
label: stringGetter({ key: STRING_KEYS.PRIVACY_POLICY }), label: stringGetter({ key: STRING_KEYS.PRIVACY_POLICY }),
href: 'https://dydx.exchange/privacy', href: AppRoute.Privacy,
}, },
{ {
value: 'HELP', value: 'HELP',
@@ -131,7 +135,9 @@ export const HeaderDesktop = () => {
<VerticalSeparator /> <VerticalSeparator />
<NotificationsMenu <NotificationsMenu
slotTrigger={<Styled.IconButton shape={ButtonShape.Rectangle} iconComponent={BellIcon} />} slotTrigger={
<Styled.IconButton shape={ButtonShape.Rectangle} iconComponent={BellStrokeIcon} />
}
/> />
<VerticalSeparator /> <VerticalSeparator />
@@ -146,6 +152,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
Styled.Header = styled.header` Styled.Header = styled.header`
--header-horizontal-padding-mobile: 0.5rem; --header-horizontal-padding-mobile: 0.5rem;
--trigger-height: 2.25rem;
--logo-width: 3.5rem; --logo-width: 3.5rem;
${layoutMixins.container} ${layoutMixins.container}
@@ -153,6 +160,8 @@ Styled.Header = styled.header`
${layoutMixins.scrollSnapItem} ${layoutMixins.scrollSnapItem}
backdrop-filter: none; backdrop-filter: none;
height: var(--page-currentHeaderHeight);
grid-area: Header; grid-area: Header;
display: grid; display: grid;
@@ -165,7 +174,15 @@ Styled.Header = styled.header`
) )
var(--border-width) 1fr var(--border-width) auto; var(--border-width) 1fr var(--border-width) auto;
font-size: 0.9375em; @media ${breakpoints.tablet} {
--trigger-height: 3rem;
}
@media ${breakpoints.mobile} {
--navBefore-width: 7rem;
}
font-size: 0.9375rem;
:before { :before {
backdrop-filter: blur(10px); backdrop-filter: blur(10px);
@@ -175,6 +192,7 @@ Styled.Header = styled.header`
Styled.NavigationMenu = styled(NavigationMenu)` Styled.NavigationMenu = styled(NavigationMenu)`
& { & {
--navigationMenu-height: var(--stickyArea-topHeight); --navigationMenu-height: var(--stickyArea-topHeight);
--navigationMenu-item-height: var(--trigger-height);
} }
${layoutMixins.scrollArea} ${layoutMixins.scrollArea}
@@ -214,7 +232,8 @@ Styled.NavAfter = styled.div`
} }
`; `;
Styled.IconButton = styled(IconButton)` Styled.IconButton = styled(IconButton)<{ size?: string }>`
${headerMixins.button} ${headerMixins.button}
--button-border: none; --button-border: none;
--button-icon-size: 1rem;
`; `;
+49 -34
View File
@@ -14,8 +14,6 @@ import {
OrderSide, OrderSide,
OrderTimeInForce, OrderTimeInForce,
OrderExecution, OrderExecution,
DYDX_DENOM,
GAS_PRICE_DYDX_DENOM,
} from '@dydxprotocol/v4-client-js'; } from '@dydxprotocol/v4-client-js';
import { import {
@@ -61,22 +59,42 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
} }
async connectNetwork( async connectNetwork(
indexerUrl: string, paramsInJson: Nullable<string>,
indexerSocketUrl: string,
validatorUrl: string,
chainId: string,
faucetUrl: Nullable<string> | undefined,
callback: (p0: Nullable<string>) => void callback: (p0: Nullable<string>) => void
): Promise<void> { ): Promise<void> {
try { try {
const parsedParams = paramsInJson ? JSON.parse(paramsInJson) : {};
const {
indexerUrl,
websocketUrl,
validatorUrl,
chainId,
USDC_DENOM,
USDC_DECIMALS,
USDC_GAS_DENOM,
CHAINTOKEN_DENOM,
CHAINTOKEN_DECIMALS,
} = parsedParams;
const compositeClient = await CompositeClient.connect( const compositeClient = await CompositeClient.connect(
new Network( new Network(
chainId, chainId,
new IndexerConfig(indexerUrl, indexerSocketUrl), new IndexerConfig(indexerUrl, websocketUrl),
new ValidatorConfig(validatorUrl, chainId, { new ValidatorConfig(
broadcastPollIntervalMs: 3_000, validatorUrl,
broadcastTimeoutMs: 60_000, chainId,
}) {
USDC_DENOM,
USDC_DECIMALS,
USDC_GAS_DENOM,
CHAINTOKEN_DENOM,
CHAINTOKEN_DECIMALS,
},
{
broadcastPollIntervalMs: 3_000,
broadcastTimeoutMs: 60_000,
}
)
) )
); );
@@ -84,13 +102,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
// 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: { detail: parsedParams,
indexerUrl,
indexerSocketUrl,
validatorUrl,
chainId,
faucetUrl,
},
}); });
globalThis.dispatchEvent(customEvent); globalThis.dispatchEvent(customEvent);
@@ -99,9 +111,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
this.store?.dispatch( this.store?.dispatch(
openDialog({ type: DialogTypes.ExchangeOffline, dialogProps: { preventClose: true } }) openDialog({ type: DialogTypes.ExchangeOffline, dialogProps: { preventClose: true } })
); );
log('DydxChainTransactions/connectNetwork', error); log('DydxChainTransactions/connectNetwork', error);
return;
} }
} }
@@ -213,13 +223,13 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
params ?? {}; params ?? {};
try { try {
const tx = await this.compositeClient?.cancelOrder( const tx = await this.compositeClient?.cancelRawOrder(
new SubaccountClient(this.localWallet, subaccountNumber), new SubaccountClient(this.localWallet, subaccountNumber),
clientId, clientId,
orderFlags, orderFlags,
clobPairId, clobPairId,
goodTilBlock ?? undefined, goodTilBlock || undefined,
goodTilBlockTime ?? undefined goodTilBlockTime || undefined,
); );
const parsedTx = this.parseToPrimitives(tx); const parsedTx = this.parseToPrimitives(tx);
@@ -251,7 +261,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount); const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount);
resolve([msg]); resolve([msg]);
}), })
); );
const parsedTx = this.parseToPrimitives(tx); const parsedTx = this.parseToPrimitives(tx);
@@ -266,7 +276,9 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
} }
} }
async simulateTransferNativeTokenTransaction(params: HumanReadableTransferPayload): Promise<string> { async simulateTransferNativeTokenTransaction(
params: HumanReadableTransferPayload
): Promise<string> {
if (!this.compositeClient || !this.localWallet) { if (!this.compositeClient || !this.localWallet) {
throw new Error('Missing compositeClient or localWallet'); throw new Error('Missing compositeClient or localWallet');
} }
@@ -280,16 +292,18 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
this.localWallet, this.localWallet,
() => () =>
new Promise((resolve) => { new Promise((resolve) => {
const msg = compositeClient?.validatorClient.post.composer.composeMsgSendToken( if (!this.localWallet) {
subaccountClient.address, throw new Error('Missing compositeClient or localWallet');
}
const msg = compositeClient?.sendTokenMessage(
this.localWallet,
amount,
recipient, recipient,
DYDX_DENOM,
Long.fromNumber(amount * QUANTUM_MULTIPLIER)
); );
resolve([msg]); resolve([msg]);
}), }),
GAS_PRICE_DYDX_DENOM, this.compositeClient?.validatorClient?.post.defaultDydxGasPrice,
); );
const parsedTx = this.parseToPrimitives(tx); const parsedTx = this.parseToPrimitives(tx);
@@ -397,9 +411,10 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
break; break;
case QueryType.GetAccountBalances: case QueryType.GetAccountBalances:
if (!this.localWallet?.address) throw new Error('Missing localWallet'); if (!this.localWallet?.address) throw new Error('Missing localWallet');
const accountBalances = await this.compositeClient?.validatorClient.get.getAccountBalances( const accountBalances =
this.localWallet.address await this.compositeClient?.validatorClient.get.getAccountBalances(
); this.localWallet.address
);
const parsedAccountBalances = this.parseToPrimitives(accountBalances); const parsedAccountBalances = this.parseToPrimitives(accountBalances);
callback(JSON.stringify(parsedAccountBalances)); callback(JSON.stringify(parsedAccountBalances));
break; break;
+5
View File
@@ -47,6 +47,11 @@ class AbacusRest implements AbacusRestProtocol {
body, body,
}; };
if (!url) {
callback(null, 0);
return;
}
fetch(url, options) fetch(url, options)
.then(async (response) => { .then(async (response) => {
const data = await response.text(); const data = await response.text();
+5
View File
@@ -25,6 +25,7 @@ import {
setFundingPayments, setFundingPayments,
setHistoricalPnl, setHistoricalPnl,
setLatestOrder, setLatestOrder,
setRestrictionType,
setSubaccount, setSubaccount,
setTransfers, setTransfers,
setWallet, setWallet,
@@ -121,6 +122,10 @@ class AbacusStateNotifier implements AbacusStateNotificationProtocol {
); );
} }
if (changes.has(Changes.restriction)) {
dispatch(setRestrictionType(updatedState.restriction));
}
subaccountNumbers?.forEach((subaccountId: number) => { subaccountNumbers?.forEach((subaccountId: number) => {
if (subaccountId !== null) { if (subaccountId !== null) {
if (changes.has(Changes.subaccount)) { if (changes.has(Changes.subaccount)) {
+4
View File
@@ -0,0 +1,4 @@
import { type DydxNetwork, ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
export const validateAgainstAvailableEnvironments = (value: DydxNetwork) =>
Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value);
+3 -3
View File
@@ -107,8 +107,8 @@ export const getHydratedTradingData = ({
perpetualMarkets?: Record<string, PerpetualMarket>; perpetualMarkets?: Record<string, PerpetualMarket>;
}) => ({ }) => ({
...data, ...data,
asset: assets && perpetualMarkets && assets[perpetualMarkets[data.marketId].assetId], asset: assets && perpetualMarkets && assets[perpetualMarkets[data.marketId]?.assetId],
stepSizeDecimals: perpetualMarkets?.[data.marketId].configs?.stepSizeDecimals, stepSizeDecimals: perpetualMarkets?.[data.marketId]?.configs?.stepSizeDecimals,
tickSizeDecimals: perpetualMarkets?.[data.marketId].configs?.tickSizeDecimals, tickSizeDecimals: perpetualMarkets?.[data.marketId]?.configs?.tickSizeDecimals,
...('side' in data && { orderSide: convertAbacusOrderSide(data.side) }), ...('side' in data && { orderSide: convertAbacusOrderSide(data.side) }),
}); });
+59 -68
View File
@@ -36,7 +36,17 @@ import { CoinbaseWalletConnector } from 'wagmi/connectors/coinbaseWallet';
import { InjectedConnector } from 'wagmi/connectors/injected'; import { InjectedConnector } from 'wagmi/connectors/injected';
import { MetaMaskConnector } from 'wagmi/connectors/metaMask'; import { MetaMaskConnector } from 'wagmi/connectors/metaMask';
import { WalletConnectConnector } from 'wagmi/connectors/walletConnect'; import { WalletConnectConnector } from 'wagmi/connectors/walletConnect';
import { WalletConnectLegacyConnector } from 'wagmi/connectors/walletConnectLegacy';
import {
type WalletConnection,
WalletConnectionType,
type WalletType,
walletConnectionTypes,
wallets,
WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
} from '@/constants/wallets';
import { isTruthy } from './isTruthy';
// Config // Config
@@ -70,13 +80,17 @@ export const WAGMI_SUPPORTED_CHAINS: Chain[] = [
celoAlfajores, celoAlfajores,
]; ];
const { chains, publicClient, webSocketPublicClient } = configureChains(WAGMI_SUPPORTED_CHAINS, [ const { chains, publicClient, webSocketPublicClient } = configureChains(
// alchemyProvider({ apiKey: import.meta.env.VITE_ALCHEMY_API_KEY }), WAGMI_SUPPORTED_CHAINS,
jsonRpcProvider({ [
rpc: (chain) => ({ http: chain.rpcUrls.default.http[0] }), import.meta.env.VITE_ALCHEMY_API_KEY &&
}), alchemyProvider({ apiKey: import.meta.env.VITE_ALCHEMY_API_KEY }),
publicProvider(), jsonRpcProvider({
]); rpc: (chain) => ({ http: chain.rpcUrls.default.http[0] }),
}),
publicProvider(),
].filter(isTruthy)
);
const injectedConnectorOptions = { const injectedConnectorOptions = {
chains, chains,
@@ -87,53 +101,46 @@ const injectedConnectorOptions = {
}, },
}; };
const walletconnect1ConnectorOptions = { type WalletConnectConfig = {
chains, client: {
options: { name: string;
bridge: import.meta.env.VITE_WALLETCONNECT1_BRIDGE, description: string;
qrcode: true, iconUrl: string;
}, };
v2: {
projectId: string;
};
}; };
const walletconnect2ConnectorOptions: ConstructorParameters<typeof WalletConnectConnector>[0] = { const getWalletconnect2ConnectorOptions = (
config: WalletConnectConfig
): ConstructorParameters<typeof WalletConnectConnector>[0] => ({
chains, chains,
options: { options: {
projectId: import.meta.env.VITE_WALLETCONNECT2_PROJECT_ID, projectId: config.v2.projectId,
metadata: { metadata: {
// TODO: update to local URLs/images name: config.client.name,
name: 'dYdX', description: config.client.description,
description: '', url: import.meta.env.VITE_BASE_URL,
url: 'https://trade.dydx.exchange', icons: [config.client.iconUrl],
icons: ['https://trade.dydx.exchange/cbw-image.png'],
}, },
showQrModal: true, showQrModal: true,
qrModalOptions: { qrModalOptions: {
themeMode: 'dark' as const, themeMode: 'dark' as const,
themeVariables: { themeVariables: {
'--w3m-accent-color': '#5973fe', '--wcm-accent-color': '#5973fe',
'--w3m-background-color': '#5973fe', '--wcm-font-family': 'var(--fontFamily-base)',
'--w3m-color-bg-1': 'var(--color-layer-3)',
'--w3m-color-bg-2': 'var(--color-layer-4)',
'--w3m-color-bg-3': 'var(--color-layer-5)',
'--w3m-font-family': 'var(--fontFamily-base)',
'--w3m-font-feature-settings': 'none',
'--w3m-overlay-backdrop-filter': 'blur(6px)',
// '--w3m-logo-image-url': 'https://trade.dydx.exchange/cbw-image.png',
}, },
enableExplorer: true, explorerRecommendedWalletIds: WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
explorerAllowList: [],
explorerDenyList: [],
chainImages: {},
}, },
}, },
}; });
const connectors = [ const getConnectors = (walletConnectConfig: WalletConnectConfig) => [
new MetaMaskConnector({ new MetaMaskConnector({
chains, chains,
options: { options: {
shimDisconnect: true, shimDisconnect: true,
shimChainChangedDisconnect: false,
}, },
}), }),
new CoinbaseWalletConnector({ new CoinbaseWalletConnector({
@@ -143,8 +150,7 @@ const connectors = [
reloadOnDisconnect: false, reloadOnDisconnect: false,
}, },
}), }),
new WalletConnectLegacyConnector(walletconnect1ConnectorOptions), new WalletConnectConnector(getWalletconnect2ConnectorOptions(walletConnectConfig)),
new WalletConnectConnector(walletconnect2ConnectorOptions),
new InjectedConnector(injectedConnectorOptions), new InjectedConnector(injectedConnectorOptions),
]; ];
@@ -166,58 +172,43 @@ const createInjectedConnectorWithProvider = (provider: ExternalProvider) =>
provider as unknown as Awaited<ReturnType<InjectedConnector['getProvider']>>; provider as unknown as Awaited<ReturnType<InjectedConnector['getProvider']>>;
})(injectedConnectorOptions) as InjectedConnector; })(injectedConnectorOptions) as InjectedConnector;
// Create a custom wagmi WalletConnectLegacyConnector with a modal showing only wallet links matching the given name const createWalletConnect2ConnectorWithId = (
const createWalletConnect1ConnectorWithName = (walletconnect1Name: string) => walletconnectId: string,
new WalletConnectLegacyConnector({ walletConnectConfig: WalletConnectConfig
...walletconnect1ConnectorOptions, ) => {
options: { const walletconnect2ConnectorOptions = getWalletconnect2ConnectorOptions(walletConnectConfig);
...walletconnect1ConnectorOptions.options, return new WalletConnectConnector({
qrcodeModalOptions: {
desktopLinks: [walletconnect1Name],
mobileLinks: [walletconnect1Name],
},
},
});
const createWalletConnect2ConnectorWithId = (walletconnect2Id: string) =>
new WalletConnectConnector({
...walletconnect2ConnectorOptions, ...walletconnect2ConnectorOptions,
options: { options: {
...walletconnect2ConnectorOptions.options, ...walletconnect2ConnectorOptions.options,
qrModalOptions: { qrModalOptions: {
...walletconnect2ConnectorOptions.options.qrModalOptions, ...walletconnect2ConnectorOptions.options.qrModalOptions,
explorerRecommendedWalletIds: [walletconnect2Id], explorerRecommendedWalletIds: [walletconnectId],
explorerExcludedWalletIds: 'ALL', explorerExcludedWalletIds: 'ALL',
chainImages: {},
}, },
}, },
}); });
};
// Custom connector from wallet selection // Custom connector from wallet selection
import {
type WalletConnection,
WalletConnectionType,
type WalletType,
walletConnectionTypes,
wallets,
} from '@/constants/wallets';
export const resolveWagmiConnector = ({ export const resolveWagmiConnector = ({
walletType, walletType,
walletConnection, walletConnection,
walletConnectConfig,
}: { }: {
walletType: WalletType; walletType: WalletType;
walletConnection: WalletConnection; walletConnection: WalletConnection;
walletConnectConfig: WalletConnectConfig;
}) => { }) => {
const walletConfig = wallets[walletType]; const walletConfig = wallets[walletType];
const walletConnectionConfig = walletConnectionTypes[walletConnection.type]; const walletConnectionConfig = walletConnectionTypes[walletConnection.type];
return walletConnection.type === WalletConnectionType.InjectedEip1193 && walletConnection.provider return walletConnection.type === WalletConnectionType.InjectedEip1193 && walletConnection.provider
? createInjectedConnectorWithProvider(walletConnection.provider) ? createInjectedConnectorWithProvider(walletConnection.provider)
: walletConnection.type === WalletConnectionType.WalletConnect1 &&
walletConfig.walletconnect1Name
? createWalletConnect1ConnectorWithName(walletConfig.walletconnect1Name)
: walletConnection.type === WalletConnectionType.WalletConnect2 && walletConfig.walletconnect2Id : walletConnection.type === WalletConnectionType.WalletConnect2 && walletConfig.walletconnect2Id
? createWalletConnect2ConnectorWithId(walletConfig.walletconnect2Id) ? createWalletConnect2ConnectorWithId(walletConfig.walletconnect2Id, walletConnectConfig)
: connectors.find(({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId); : getConnectors(walletConnectConfig).find(
({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId
);
}; };
-6
View File
@@ -45,12 +45,6 @@ export const getWalletConnection = ({
break; break;
} }
case WalletConnectionType.WalletConnect1: {
return {
type: WalletConnectionType.WalletConnect1,
};
}
case WalletConnectionType.WalletConnect2: { case WalletConnectionType.WalletConnect2: {
return { return {
type: WalletConnectionType.WalletConnect2, type: WalletConnectionType.WalletConnect2,
+17
View File
@@ -0,0 +1,17 @@
import styled, { AnyStyledComponent } from 'styled-components';
import { articleMixins } from '@/styles/articleMixins';
export const PrivacyPolicyPage = () => (
<Styled.Article>
<header>
<h1>Privacy Policy</h1>
</header>
</Styled.Article>
);
const Styled: Record<string, AnyStyledComponent> = {};
Styled.Article = styled.article`
${articleMixins.article}
`;
+21 -13
View File
@@ -17,7 +17,7 @@ import { DialogTypes } from '@/constants/dialogs';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { AppRoute, PortfolioRoute, HistoryRoute } from '@/constants/routes'; import { AppRoute, PortfolioRoute, HistoryRoute } from '@/constants/routes';
import { wallets, WalletType } from '@/constants/wallets'; import { wallets, WalletType } from '@/constants/wallets';
import { useAccounts, useStringGetter } from '@/hooks'; import { useAccounts, useStringGetter, useTokenConfigs } from '@/hooks';
import { getOnboardingState } from '@/state/accountSelectors'; import { getOnboardingState } from '@/state/accountSelectors';
import { openDialog } from '@/state/dialogs'; import { openDialog } from '@/state/dialogs';
@@ -37,6 +37,7 @@ const Profile = () => {
const isConnected = onboardingState !== OnboardingState.Disconnected; const isConnected = onboardingState !== OnboardingState.Disconnected;
const { evmAddress, dydxAddress, walletType } = useAccounts(); const { evmAddress, dydxAddress, walletType } = useAccounts();
const { chainTokenLabel } = useTokenConfigs();
const { data: ensName } = useEnsName({ const { data: ensName } = useEnsName({
address: evmAddress, address: evmAddress,
@@ -137,7 +138,11 @@ const Profile = () => {
layout="grid" layout="grid"
/> />
</Panel> </Panel>
<Styled.RewardsPanel header={stringGetter({ key: STRING_KEYS.REWARDS })} hasSeparator> <Styled.RewardsPanel
slotHeaderContent={stringGetter({ key: STRING_KEYS.REWARDS })}
href={`/${chainTokenLabel}`}
hasSeparator
>
<Styled.Details <Styled.Details
items={[ items={[
{ key: 'maker', label: stringGetter({ key: STRING_KEYS.YOU_WILL_EARN }), value: '-' }, { key: 'maker', label: stringGetter({ key: STRING_KEYS.YOU_WILL_EARN }), value: '-' },
@@ -149,8 +154,8 @@ const Profile = () => {
</Styled.EqualGrid> </Styled.EqualGrid>
<Styled.TablePanel <Styled.TablePanel
header={stringGetter({ key: STRING_KEYS.HISTORY })} slotHeaderContent={stringGetter({ key: STRING_KEYS.HISTORY })}
linkto={`${AppRoute.Portfolio}/${PortfolioRoute.History}/${HistoryRoute.Trades}`} href={`${AppRoute.Portfolio}/${PortfolioRoute.History}/${HistoryRoute.Trades}`}
hasSeparator hasSeparator
> >
<FillsTable <FillsTable
@@ -175,7 +180,7 @@ Styled.MobileProfileLayout = styled.div`
${layoutMixins.contentContainerPage} ${layoutMixins.contentContainerPage}
gap: 1rem; gap: 1rem;
padding: 1rem; padding: 1.25rem;
`; `;
Styled.Header = styled.header` Styled.Header = styled.header`
@@ -273,22 +278,25 @@ Styled.RewardsPanel = styled(Panel)`
`; `;
Styled.TablePanel = styled(Panel)` Styled.TablePanel = styled(Panel)`
padding: 0; --panel-content-paddingY: 0;
max-width: calc(100vw - 2rem); --panel-content-paddingX: 0;
max-height: 10rem;
> div > div {
margin-top: 0.5rem;
--scrollArea-height: 10rem;
border-radius: 0.875rem;
}
table { table {
max-height: 10rem;
--tableCell-padding: 0.25rem 1rem; --tableCell-padding: 0.25rem 1rem;
--tableRow-backgroundColor: var(--color-layer-3);
background-color: transparent; background-color: var(--color-layer-3);
thead { thead {
color: var(--color-text-0); color: var(--color-text-0);
} }
tbody { tbody {
background-color: transparent;
tr { tr {
td:nth-child(2), td:nth-child(2),
td:nth-child(3) { td:nth-child(3) {
+17
View File
@@ -0,0 +1,17 @@
import styled, { AnyStyledComponent } from 'styled-components';
import { articleMixins } from '@/styles/articleMixins';
export const TermsOfUsePage = () => (
<Styled.Article>
<header>
<h1>Terms of Use</h1>
</header>
</Styled.Article>
);
const Styled: Record<string, AnyStyledComponent> = {};
Styled.Article = styled.article`
${articleMixins.article}
`;
@@ -2,6 +2,7 @@ import { useMemo, useState } from 'react';
import styled, { AnyStyledComponent, css } from 'styled-components'; import styled, { AnyStyledComponent, css } from 'styled-components';
import { shallowEqual, useSelector } from 'react-redux'; import { shallowEqual, useSelector } from 'react-redux';
import { TooltipContextType } from '@visx/xychart'; import { TooltipContextType } from '@visx/xychart';
import BigNumber from 'bignumber.js';
import type { Nullable } from '@/constants/abacus'; import type { Nullable } from '@/constants/abacus';
import { OnboardingState } from '@/constants/account'; import { OnboardingState } from '@/constants/account';
@@ -25,7 +26,6 @@ import { OnboardingTriggerButton } from '@/views/dialogs/OnboardingTriggerButton
import { isTruthy } from '@/lib/isTruthy'; import { isTruthy } from '@/lib/isTruthy';
import { MustBigNumber } from '@/lib/numbers'; import { MustBigNumber } from '@/lib/numbers';
export const usePortfolioValues = ({ export const usePortfolioValues = ({
equity, equity,
visibleData, visibleData,
@@ -131,7 +131,7 @@ export const AccountDetailsAndHistory = () => {
key: 'BuyingPower', key: 'BuyingPower',
labelKey: STRING_KEYS.BUYING_POWER, labelKey: STRING_KEYS.BUYING_POWER,
type: OutputType.Fiat, type: OutputType.Fiat,
value: buyingPower?.current, value: MustBigNumber(buyingPower?.current).lt(0) ? undefined : buyingPower?.current, // show '-' when buying power is negative
}, },
].filter(isTruthy); ].filter(isTruthy);
@@ -140,7 +140,12 @@ export const AccountDetailsAndHistory = () => {
<Styled.AccountValue> <Styled.AccountValue>
<Styled.WithLabel label={accountValueLabel}> <Styled.WithLabel label={accountValueLabel}>
<Styled.AccountEquity> <Styled.AccountEquity>
<Output type={OutputType.Fiat} value={accountEquity} withBaseFont /> <Output
type={OutputType.Fiat}
value={accountEquity}
roundingMode={BigNumber.ROUND_FLOOR}
withBaseFont
/>
</Styled.AccountEquity> </Styled.AccountEquity>
<Styled.PnlDiff isPositive={MustBigNumber(pnlDiff).gte(0)}> <Styled.PnlDiff isPositive={MustBigNumber(pnlDiff).gte(0)}>
{pnlDiff && <TriangleIndicator value={MustBigNumber(pnlDiff)} />} {pnlDiff && <TriangleIndicator value={MustBigNumber(pnlDiff)} />}
+131 -106
View File
@@ -1,12 +1,12 @@
import { useCallback, useEffect, useMemo, useState } from 'react'; import { useCallback, useMemo } from 'react';
import { Nullable } from '@dydxprotocol/v4-abacus'; import { Nullable } from '@dydxprotocol/v4-abacus';
import styled, { AnyStyledComponent } from 'styled-components'; import styled, { AnyStyledComponent } from 'styled-components';
import { shallowEqual, useSelector } from 'react-redux'; import { shallowEqual, useSelector } from 'react-redux';
import { FeeTier } from '@/constants/abacus'; import { FeeTier } from '@/constants/abacus';
import { FEE_DECIMALS, QUANTUM_MULTIPLIER } from '@/constants/numbers'; import { FEE_DECIMALS } from '@/constants/numbers';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { useAccounts, useBreakpoints, useStringGetter } from '@/hooks'; import { useBreakpoints, useStringGetter } from '@/hooks';
import { breakpoints } from '@/styles'; import { breakpoints } from '@/styles';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import { tableMixins } from '@/styles/tableMixins'; import { tableMixins } from '@/styles/tableMixins';
@@ -29,9 +29,8 @@ const EQUALITY_SYMBOL_MAP = {
}; };
export const Fees = () => { export const Fees = () => {
const { dydxAddress } = useAccounts();
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { isNotTablet } = useBreakpoints(); const { isTablet, isNotTablet } = useBreakpoints();
const userFeeTier = useSelector(getUserFeeTier, shallowEqual); const userFeeTier = useSelector(getUserFeeTier, shallowEqual);
const userStats = useSelector(getUserStats, shallowEqual); const userStats = useSelector(getUserStats, shallowEqual);
const feeTiers = useSelector(getFeeTiers, shallowEqual); const feeTiers = useSelector(getFeeTiers, shallowEqual);
@@ -56,28 +55,28 @@ export const Fees = () => {
<Styled.AdditionalConditions> <Styled.AdditionalConditions>
{!isAdditional && !totalShare && !makerShare && <Output type={OutputType.Text} />} {!isAdditional && !totalShare && !makerShare && <Output type={OutputType.Text} />}
{!!totalShare && ( {!!totalShare && (
<Styled.TextRow> <Styled.AdditionalConditionsText>
{isAdditional && <span>{stringGetter({ key: STRING_KEYS.AND })}</span>} {isAdditional && stringGetter({ key: STRING_KEYS.AND })}{' '}
<span>{stringGetter({ key: STRING_KEYS.EXCHANGE_MARKET_SHARE })}</span> {stringGetter({ key: STRING_KEYS.EXCHANGE_MARKET_SHARE })}{' '}
<Styled.Highlighted>{'>'}</Styled.Highlighted> <Styled.Highlighted>{'>'}</Styled.Highlighted>{' '}
<Styled.HighlightOutput <Styled.HighlightOutput
type={OutputType.Percent} type={OutputType.Percent}
value={totalShare} value={totalShare}
fractionDigits={0} fractionDigits={0}
/> />
</Styled.TextRow> </Styled.AdditionalConditionsText>
)} )}
{!!makerShare && ( {!!makerShare && (
<Styled.TextRow> <Styled.AdditionalConditionsText>
{isAdditional && <span>{stringGetter({ key: STRING_KEYS.AND })}</span>} {isAdditional && stringGetter({ key: STRING_KEYS.AND })}{' '}
<span>{stringGetter({ key: STRING_KEYS.MAKER_MARKET_SHARE })}</span> {stringGetter({ key: STRING_KEYS.MAKER_MARKET_SHARE })}{' '}
<Styled.Highlighted>{'>'}</Styled.Highlighted> <Styled.Highlighted>{'>'}</Styled.Highlighted>{' '}
<Styled.HighlightOutput <Styled.HighlightOutput
type={OutputType.Percent} type={OutputType.Percent}
value={makerShare} value={makerShare}
fractionDigits={0} fractionDigits={0}
/> />
</Styled.TextRow> </Styled.AdditionalConditionsText>
)} )}
</Styled.AdditionalConditions> </Styled.AdditionalConditions>
), ),
@@ -103,91 +102,90 @@ export const Fees = () => {
}, },
]} ]}
/> />
<div>
<Styled.FeeTable <Styled.FeeTable
label="Fee Tiers" label="Fee Tiers"
data={feeTiers || []} data={feeTiers || []}
getRowKey={(row: FeeTier) => row.tier} getRowKey={(row: FeeTier) => row.tier}
getRowAttributes={(row: FeeTier) => ({ getRowAttributes={(row: FeeTier) => ({
'data-yours': row.tier === userFeeTier, 'data-yours': row.tier === userFeeTier,
})} })}
columns={( columns={(
[ [
{ {
columnKey: 'tier', columnKey: 'tier',
getCellValue: (row) => row.tier, getCellValue: (row) => row.tier,
label: stringGetter({ key: STRING_KEYS.TIER }), label: stringGetter({ key: STRING_KEYS.TIER }),
allowsSorting: false, allowsSorting: false,
renderCell: ({ tier }) => ( renderCell: ({ tier }) => (
<Styled.Tier> <Styled.Tier>
<Styled.Output type={OutputType.Text} value={tier} /> <Styled.Output type={OutputType.Text} value={tier} />
{tier === userFeeTier && ( {tier === userFeeTier && (
<Styled.YouTag size={TagSize.Medium}> <Styled.YouTag size={TagSize.Medium}>
{stringGetter({ key: STRING_KEYS.YOU })} {stringGetter({ key: STRING_KEYS.YOU })}
</Styled.YouTag> </Styled.YouTag>
)} )}
</Styled.Tier> </Styled.Tier>
), ),
}, },
{ {
columnKey: 'volume', columnKey: 'volume',
getCellValue: (row) => row.volume, getCellValue: (row) => row.volume,
label: stringGetter({ key: STRING_KEYS.VOLUME_30D }), label: stringGetter({ key: STRING_KEYS.VOLUME_30D }),
allowsSorting: false, allowsSorting: false,
renderCell: ({ symbol, volume, makerShare, totalShare }) => ( renderCell: ({ symbol, volume, makerShare, totalShare }) => (
<> <>
<span>{`${ <span>{`${
symbol in EQUALITY_SYMBOL_MAP symbol in EQUALITY_SYMBOL_MAP
? EQUALITY_SYMBOL_MAP[symbol as keyof typeof EQUALITY_SYMBOL_MAP] ? EQUALITY_SYMBOL_MAP[symbol as keyof typeof EQUALITY_SYMBOL_MAP]
: symbol : symbol
} `}</span> } `}</span>
<Styled.HighlightOutput type={OutputType.CompactFiat} value={volume} /> <Styled.HighlightOutput type={OutputType.CompactFiat} value={volume} />
{!isNotTablet && {isTablet &&
AdditionalConditions({ totalShare, makerShare, isAdditional: true })} AdditionalConditions({ totalShare, makerShare, isAdditional: true })}
</> </>
), ),
}, },
isNotTablet && { isNotTablet && {
columnKey: 'condition', columnKey: 'condition',
getCellValue: (row) => row.volume, getCellValue: (row) => row.volume,
label: stringGetter({ key: STRING_KEYS.ADDITIONAL_CONDITION }), label: stringGetter({ key: STRING_KEYS.ADDITIONAL_CONDITION }),
allowsSorting: false, allowsSorting: false,
renderCell: ({ totalShare, makerShare }) => renderCell: ({ totalShare, makerShare }) =>
AdditionalConditions({ totalShare, makerShare }), AdditionalConditions({ totalShare, makerShare }),
}, },
{ {
columnKey: 'maker', columnKey: 'maker',
getCellValue: (row) => row.maker, getCellValue: (row) => row.maker,
label: stringGetter({ key: STRING_KEYS.MAKER }), label: stringGetter({ key: STRING_KEYS.MAKER }),
allowsSorting: false, allowsSorting: false,
renderCell: ({ maker }) => ( renderCell: ({ maker }) => (
<Styled.HighlightOutput <Styled.HighlightOutput
type={OutputType.SmallPercent} type={OutputType.SmallPercent}
value={maker} value={maker}
fractionDigits={FEE_DECIMALS} fractionDigits={FEE_DECIMALS}
/> />
), ),
}, },
{ {
columnKey: 'taker', columnKey: 'taker',
getCellValue: (row) => row.taker, getCellValue: (row) => row.taker,
label: stringGetter({ key: STRING_KEYS.TAKER }), label: stringGetter({ key: STRING_KEYS.TAKER }),
allowsSorting: false, allowsSorting: false,
renderCell: ({ taker }) => ( renderCell: ({ taker }) => (
<Styled.HighlightOutput <Styled.HighlightOutput
type={OutputType.SmallPercent} type={OutputType.SmallPercent}
value={taker} value={taker}
fractionDigits={FEE_DECIMALS} fractionDigits={FEE_DECIMALS}
/> />
), ),
}, },
] as ColumnDef<FeeTier>[] ] as ColumnDef<FeeTier>[]
).filter(isTruthy)} ).filter(isTruthy)}
selectionBehavior="replace" selectionBehavior="replace"
withOuterBorder={isNotTablet} withOuterBorder={isNotTablet}
withInnerBorders withInnerBorders
/> />
</div>
</Styled.ContentWrapper> </Styled.ContentWrapper>
</AttachedExpandingSection> </AttachedExpandingSection>
); );
@@ -198,21 +196,43 @@ const Styled: Record<string, AnyStyledComponent> = {};
Styled.ContentWrapper = styled.div` Styled.ContentWrapper = styled.div`
${layoutMixins.flexColumn} ${layoutMixins.flexColumn}
gap: 1.5rem; gap: 1.5rem;
max-width: 100vw;
`; `;
Styled.AdditionalConditions = styled.div` Styled.AdditionalConditions = styled.div`
${tableMixins.cellContentColumn} ${tableMixins.cellContentColumn}
justify-content: end;
color: var(--color-text-0); color: var(--color-text-0);
font: var(--font-small-book);
> :nth-child(2) { > :nth-child(2) {
font: var(--font-base-book); font: var(--font-small-book);
}
`;
Styled.AdditionalConditionsText = styled.span`
display: flex;
gap: 0.5ch;
@media ${breakpoints.mobile} {
display: inline;
max-width: 8rem;
min-width: 0;
output {
display: inline;
}
} }
`; `;
Styled.FeesDetails = styled(Details)` Styled.FeesDetails = styled(Details)`
gap: 1rem; gap: 1rem;
@media ${breakpoints.notTablet} {
margin: 0 1.25rem;
}
@media ${breakpoints.tablet} { @media ${breakpoints.tablet} {
padding: 1rem 1rem 0 1rem; padding: 1rem 1rem 0 1rem;
--details-grid-numColumns: 1; --details-grid-numColumns: 1;
@@ -237,11 +257,7 @@ Styled.FeesDetails = styled(Details)`
} }
output { output {
font: var(--font-medium-book); font: var(--font-base-book);
@media ${breakpoints.tablet} {
font: var(--font-base-book);
}
} }
`; `;
@@ -271,6 +287,11 @@ Styled.FeeTable = styled(Table)`
font: var(--font-base-book); font: var(--font-base-book);
@media ${breakpoints.mobile} {
--tableCell-padding: 1rem 1.25rem;
font: var(--font-small-book);
}
tbody tr { tbody tr {
&[data-yours='true'] { &[data-yours='true'] {
background-color: var(--color-layer-3); background-color: var(--color-layer-3);
@@ -283,6 +304,10 @@ Styled.FeeTable = styled(Table)`
@media ${breakpoints.notTablet} { @media ${breakpoints.notTablet} {
--tableHeader-backgroundColor: var(--color-layer-1); --tableHeader-backgroundColor: var(--color-layer-1);
thead tr {
--border-width: 0;
}
} }
`; `;
+20 -11
View File
@@ -3,7 +3,7 @@ import styled, { AnyStyledComponent } from 'styled-components';
import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import { useAccountBalance, useAccounts, useStringGetter } from '@/hooks'; import { useAccountBalance, useAccounts, useTokenConfigs, useStringGetter } from '@/hooks';
import { ButtonAction, ButtonSize } from '@/constants/buttons'; import { ButtonAction, ButtonSize } from '@/constants/buttons';
import { DialogTypes } from '@/constants/dialogs'; import { DialogTypes } from '@/constants/dialogs';
@@ -22,7 +22,6 @@ import { OnboardingTriggerButton } from '@/views/dialogs/OnboardingTriggerButton
import { openDialog } from '@/state/dialogs'; import { openDialog } from '@/state/dialogs';
import { calculateCanAccountTrade } from '@/state/accountCalculators'; import { calculateCanAccountTrade } from '@/state/accountCalculators';
// TODO(@aforaleka): replace with real data
export const DYDXBalancePanel = () => { export const DYDXBalancePanel = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
@@ -30,14 +29,15 @@ export const DYDXBalancePanel = () => {
const { walletType } = useAccounts(); const { walletType } = useAccounts();
const canAccountTrade = useSelector(calculateCanAccountTrade, shallowEqual); const canAccountTrade = useSelector(calculateCanAccountTrade, shallowEqual);
const { nativeTokenBalance, nativeStakingBalance } = useAccountBalance(); const { nativeTokenBalance, nativeStakingBalance } = useAccountBalance();
const { chainTokenLabel } = useTokenConfigs();
return ( return (
<Panel <Styled.Panel
slotHeader={ slotHeader={
<Styled.Header> <Styled.Header>
<Styled.Title> <Styled.Title>
{/* <AssetIcon symbol="DYDX" /> */} <AssetIcon symbol={chainTokenLabel} />
Dv4TNT {chainTokenLabel}
</Styled.Title> </Styled.Title>
<Styled.ReceiveAndTransferButtons> <Styled.ReceiveAndTransferButtons>
{!canAccountTrade ? ( {!canAccountTrade ? (
@@ -106,20 +106,31 @@ export const DYDXBalancePanel = () => {
{ {
key: 'totalBalance', key: 'totalBalance',
label: 'Total balance', label: 'Total balance',
value: <Output type={OutputType.Asset} value={nativeTokenBalance + nativeStakingBalance} tag="Dv4TNT" />, value: (
<Output
type={OutputType.Asset}
value={nativeTokenBalance.plus(nativeStakingBalance)}
tag={chainTokenLabel}
/>
),
}, },
]} ]}
/> />
</Styled.Content> </Styled.Content>
</Panel> </Styled.Panel>
); );
}; };
const Styled: Record<string, AnyStyledComponent> = {}; const Styled: Record<string, AnyStyledComponent> = {};
Styled.Panel = styled(Panel)`
--panel-paddingX: 1.5rem;
`;
Styled.Header = styled.div` Styled.Header = styled.div`
${layoutMixins.spacedRow} ${layoutMixins.spacedRow}
padding: 1.25rem 1.5rem 0.5rem; gap: 1rem;
padding: 1rem 1.5rem 0;
`; `;
Styled.Title = styled.h3` Styled.Title = styled.h3`
@@ -148,7 +159,6 @@ Styled.ReceiveButton = styled(Button)`
Styled.Content = styled.div` Styled.Content = styled.div`
${layoutMixins.flexColumn} ${layoutMixins.flexColumn}
gap: 0.75rem; gap: 0.75rem;
padding: 0 0.5rem 0.5rem;
`; `;
Styled.IconContainer = styled.div` Styled.IconContainer = styled.div`
@@ -172,8 +182,7 @@ Styled.WalletAndStakedBalance = styled(Details)`
--details-item-backgroundColor: var(--color-layer-6); --details-item-backgroundColor: var(--color-layer-6);
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
gap: 0.5rem; gap: 1rem;
> div { > div {
gap: 1rem; gap: 1rem;
+224
View File
@@ -0,0 +1,224 @@
import styled, { AnyStyledComponent } from 'styled-components';
import { useSelector } from 'react-redux';
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { STRING_KEYS } from '@/constants/localization';
import { ButtonAction, ButtonSize, ButtonType } from '@/constants/buttons';
import { useAccountBalance, useBreakpoints, useStringGetter } from '@/hooks';
import { layoutMixins } from '@/styles/layoutMixins';
import { Details } from '@/components/Details';
import { Panel } from '@/components/Panel';
import { Button } from '@/components/Button';
import { Link } from '@/components/Link';
import { IconName, Icon } from '@/components/Icon';
import { Output, OutputType } from '@/components/Output';
import { VerticalSeparator } from '@/components/Separator';
import { Tag } from '@/components/Tag';
import { WithReceipt } from '@/components/WithReceipt';
import { getSelectedNetwork } from '@/state/appSelectors';
import { MustBigNumber } from '@/lib/numbers';
const TOKEN_MIGRATION_LEARN_MORE_LINK =
'https://www.dydx.foundation/blog/update-on-exploring-the-future-of-dydx';
export const MigratePanel = () => {
const { isNotTablet } = useBreakpoints();
const stringGetter = useStringGetter();
const selectedNetwork = useSelector(getSelectedNetwork);
const chainId = Number(ENVIRONMENT_CONFIG_MAP[selectedNetwork].ethereumChainId);
// v3 token is only on mainnet
const { balance: tokenBalance } = useAccountBalance({
addressOrDenom: chainId === 1 ? import.meta.env.VITE_V3_TOKEN_ADDRESS : undefined,
chainId: 1,
isCosmosChain: false,
});
return isNotTablet ? (
<Styled.MigratePanel
slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.MIGRATE })}</Styled.Title>}
slotRight={
<Styled.MigrateAction>
<div>
<div>{stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE })}</div>
<Styled.Token type={OutputType.Asset} value={tokenBalance} />
</div>
{import.meta.env.VITE_TOKEN_MIGRATION_URI && (
<Button
action={MustBigNumber(tokenBalance).gt(0) ? ButtonAction.Primary : ButtonAction.Base}
type={ButtonType.Link}
href={import.meta.env.VITE_TOKEN_MIGRATION_URI}
slotRight={<Icon iconName={IconName.LinkOut} />}
>
{stringGetter({ key: STRING_KEYS.MIGRATE_NOW })}
</Button>
)}
</Styled.MigrateAction>
}
>
<Styled.Description>
{stringGetter({ key: STRING_KEYS.MIGRATE_DESCRIPTION })}
<Link href={TOKEN_MIGRATION_LEARN_MORE_LINK}>
{stringGetter({ key: STRING_KEYS.LEARN_MORE })}
</Link>
</Styled.Description>
</Styled.MigratePanel>
) : (
<Styled.MigratePanel
slotHeader={
<Styled.MobileMigrateHeader>
<h3>
<Icon iconName={IconName.Migrate} />
{stringGetter({ key: STRING_KEYS.MIGRATE })}
</h3>
<Styled.VerticalSeparator />
<span>
{stringGetter({
key: STRING_KEYS.FROM_TO,
params: { FROM: <b>Ethereum</b>, TO: <b>dYdX Chain</b> },
})}
</span>
</Styled.MobileMigrateHeader>
}
>
<Styled.Column>
<Styled.WithReceipt
slotReceipt={
<Styled.Details
items={[
{
key: 'available-to-migrate',
label: (
<Styled.InlineRow>
{stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE })}
<Tag>DYDX</Tag>
</Styled.InlineRow>
),
value: <Output type={OutputType.Asset} value={tokenBalance} />,
},
]}
/>
}
>
{import.meta.env.VITE_TOKEN_MIGRATION_URI && (
<Button
action={tokenBalance ? ButtonAction.Primary : ButtonAction.Base}
size={ButtonSize.Medium}
slotRight={<Icon iconName={IconName.LinkOut} />}
href={import.meta.env.VITE_TOKEN_MIGRATION_URI}
>
{stringGetter({ key: STRING_KEYS.MIGRATE_NOW })}
</Button>
)}
</Styled.WithReceipt>
<Styled.InlineRow>
{stringGetter({ key: STRING_KEYS.WANT_TO_LEARN })}
<Link href={TOKEN_MIGRATION_LEARN_MORE_LINK} withIcon>
{stringGetter({ key: STRING_KEYS.CLICK_HERE })}
</Link>
</Styled.InlineRow>
</Styled.Column>
</Styled.MigratePanel>
);
};
const Styled: Record<string, AnyStyledComponent> = {};
Styled.MigratePanel = styled(Panel)`
--panel-paddingX: 1.5rem;
width: 100%;
`;
Styled.Title = styled.h3`
font: var(--font-medium-book);
color: var(--color-text-2);
padding: 1rem 1.5rem 0;
`;
Styled.MigrateAction = styled.div`
${layoutMixins.flexEqualColumns}
align-items: center;
margin-right: 1rem;
gap: 1rem;
padding: 1rem;
width: 100%;
background-color: var(--color-layer-2);
border: solid var(--border-width) var(--color-border);
border-radius: 0.75rem;
`;
Styled.Token = styled(Output)`
font: var(--font-large-book);
color: var(--color-text-2);
`;
Styled.Description = styled.div`
color: var(--color-text-0);
--link-color: var(--color-text-1);
`;
Styled.Column = styled.div`
${layoutMixins.flexColumn}
gap: 1rem;
align-items: center;
`;
Styled.MobileMigrateHeader = styled.div`
${layoutMixins.inlineRow}
gap: 1ch;
font: var(--font-small-book);
color: var(--color-text-0);
padding: 1rem 1.5rem 0;
h3 {
${layoutMixins.inlineRow}
font: var(--font-large-book);
color: var(--color-text-2);
svg {
font-size: 1.75rem;
}
}
span {
margin-top: 0.2rem;
b {
font-weight: var(--fontWeight-book);
color: var(--color-text-1);
}
}
`;
Styled.VerticalSeparator = styled(VerticalSeparator)`
z-index: 1;
&& {
height: 1.5rem;
}
`;
Styled.Details = styled(Details)`
padding: 0.5rem 1rem;
`;
Styled.WithReceipt = styled(WithReceipt)`
width: 100%;
`;
Styled.InlineRow = styled.div`
${layoutMixins.inlineRow}
color: var(--color-text-0);
--link-color: var(--color-text-1);
`;
+58 -257
View File
@@ -1,186 +1,74 @@
import styled, { AnyStyledComponent } from 'styled-components'; import styled, { AnyStyledComponent } from 'styled-components';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch } from 'react-redux';
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { ButtonAction, ButtonSize, ButtonState, ButtonType } from '@/constants/buttons'; import { ButtonAction, ButtonSize } from '@/constants/buttons';
import { DialogTypes } from '@/constants/dialogs'; import { DialogTypes } from '@/constants/dialogs';
import { useAccountBalance, useBreakpoints, useStringGetter } from '@/hooks'; import { useBreakpoints, useStringGetter, useURLConfigs } from '@/hooks';
import { breakpoints } from '@/styles'; import { breakpoints } from '@/styles';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import { Details } from '@/components/Details';
import { Panel } from '@/components/Panel'; import { Panel } from '@/components/Panel';
import { IconName } from '@/components/Icon'; import { IconName } from '@/components/Icon';
import { Button } from '@/components/Button';
import { IconButton } from '@/components/IconButton'; import { IconButton } from '@/components/IconButton';
import { Link } from '@/components/Link'; import { Link } from '@/components/Link';
import { Output, OutputType } from '@/components/Output';
import { VerticalSeparator } from '@/components/Separator';
import { WithReceipt } from '@/components/WithReceipt';
import { openDialog } from '@/state/dialogs'; import { openDialog } from '@/state/dialogs';
import { getSelectedNetwork } from '@/state/appSelectors';
import { DYDXBalancePanel } from './DYDXBalancePanel'; import { DYDXBalancePanel } from './DYDXBalancePanel';
import { MigratePanel } from './MigratePanel';
// TODO: replace placeholder URL with real URLs when avaialble
const GOVERNANCE_HELP_URL = 'https://help.dydx.exchange/';
const STAKING_HELP_URL = 'https://help.dydx.exchange/';
export const RewardsPage = () => { export const RewardsPage = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { governanceLearnMore, stakingLearnMore } = useURLConfigs();
const { isTablet, isNotTablet } = useBreakpoints(); const { isTablet, isNotTablet } = useBreakpoints();
const selectedNetwork = useSelector(getSelectedNetwork); const panelArrow = (
<Styled.Arrow>
// const chainId = Number(ENVIRONMENT_CONFIG_MAP[selectedNetwork].ethereumChainId); <Styled.IconButton
action={ButtonAction.Base}
// const { balance } = useAccountBalance({ iconName={IconName.Arrow}
// addressOrDenom: import.meta.env.VITE_V3_TOKEN_ADDRESS, size={ButtonSize.Small}
// assetSymbol: 'DYDX', />
// chainId, </Styled.Arrow>
// isCosmosChain: false, );
// });
// const tokenBalance = import.meta.env.VITE_V3_TOKEN_ADDRESS ? balance : 0;
return ( return (
<Styled.Page> <Styled.Page>
{/* {isNotTablet ? ( {import.meta.env.VITE_V3_TOKEN_ADDRESS && <MigratePanel />}
<Styled.Migrate>
<Styled.TwoItemRow>
<div>
<Styled.MigrateTitle>
{stringGetter({ key: STRING_KEYS.MIGRATE })}
</Styled.MigrateTitle>
<Styled.Description>
{stringGetter({ key: STRING_KEYS.MIGRATE_DESCRIPTION })}
<Link href={MIGRATE_HELP_URL}>
{stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
</Link>
</Styled.Description>
</div>
<Styled.MigrateAction>
<div>
<div>{stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE })}</div>
<div>
<Styled.Token type={OutputType.Asset} value={tokenBalance} />
</div>
</div>
<Button
action={tokenBalance ? ButtonAction.Primary : ButtonAction.Base}
// type={ButtonType.Link}
// href={BRIDGE_URL}
disabled
>
{tokenBalance
? `${stringGetter({ key: STRING_KEYS.MIGRATE_NOW })} →`
: stringGetter({ key: STRING_KEYS.NO_TOKENS_TO_MIGRATE })}
</Button>
</Styled.MigrateAction>
</Styled.TwoItemRow>
</Styled.Migrate>
) : (
<Styled.MobileMigrateCard
slotHeader={
<Styled.MobileMigrateHeader>
<h3>{stringGetter({ key: STRING_KEYS.MIGRATE })}</h3>
<VerticalSeparator />
<span>
{stringGetter({
key: STRING_KEYS.FROM_TO,
params: { FROM: <strong>Ethereum</strong>, TO: <strong>dYdX Chain</strong> },
})}
</span>
</Styled.MobileMigrateHeader>
}
>
<Styled.WithReceipt
slotReceipt={
<Styled.Details
items={[
{
key: 'available-to-migrate',
label: stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE }),
value: <Output type={OutputType.Asset} value={tokenBalance} />,
},
]}
/>
}
>
<Button
action={tokenBalance ? ButtonAction.Primary : ButtonAction.Base}
size={ButtonSize.Medium}
disabled
>
{tokenBalance
? `${stringGetter({ key: STRING_KEYS.MIGRATE_NOW })} →`
: stringGetter({ key: STRING_KEYS.NO_TOKENS_TO_MIGRATE })}
</Button>
</Styled.WithReceipt>
<Styled.LearnMore>
{stringGetter({ key: STRING_KEYS.WANT_TO_LEARN })}
<Link href={MIGRATE_HELP_URL}>{stringGetter({ key: STRING_KEYS.CLICK_HERE })}</Link>
</Styled.LearnMore>
</Styled.MobileMigrateCard>
)} */}
<Styled.PanelRow> <Styled.PanelRow>
{isTablet && ( {isTablet && <DYDXBalancePanel />}
<Styled.BalancePanelContainer>
<DYDXBalancePanel />
</Styled.BalancePanelContainer>
)}
<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}
onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))} onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
> >
<Styled.Row> <Styled.Description>
<Styled.Description> {stringGetter({ key: STRING_KEYS.GOVERNANCE_DESCRIPTION })}
{stringGetter({ key: STRING_KEYS.GOVERNANCE_DESCRIPTION })} <Link href={governanceLearnMore} onClick={(e) => e.stopPropagation()}>
<Link href={GOVERNANCE_HELP_URL} onClick={(e) => e.stopPropagation()}> {stringGetter({ key: STRING_KEYS.LEARN_MORE })}
{stringGetter({ key: STRING_KEYS.LEARN_MORE })} </Link>
</Link> </Styled.Description>
</Styled.Description>
{/* TODO: vertically center based on Panel height */}
<Styled.IconButton
action={ButtonAction.Base}
iconName={IconName.Arrow}
size={ButtonSize.Small}
/>
</Styled.Row>
</Styled.Panel> </Styled.Panel>
<Styled.Panel <Styled.Panel
slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.STAKING })}</Styled.Title>} slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.STAKING })}</Styled.Title>}
slotRight={panelArrow}
onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))} onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
> >
<Styled.Row> <Styled.Description>
<Styled.Description> {stringGetter({ key: STRING_KEYS.STAKING_DESCRIPTION })}
{stringGetter({ key: STRING_KEYS.STAKING_DESCRIPTION })} <Link href={stakingLearnMore} onClick={(e) => e.stopPropagation()}>
<Link href={STAKING_HELP_URL} onClick={(e) => e.stopPropagation()}> {stringGetter({ key: STRING_KEYS.LEARN_MORE })}
{stringGetter({ key: STRING_KEYS.LEARN_MORE })} </Link>
</Link> </Styled.Description>
</Styled.Description>
{/* TODO: vertically center based on Panel height */}
<Styled.IconButton
action={ButtonAction.Base}
iconName={IconName.Arrow}
size={ButtonSize.Small}
/>
</Styled.Row>
</Styled.Panel> </Styled.Panel>
{isNotTablet && ( {isNotTablet && <DYDXBalancePanel />}
<Styled.BalancePanelContainer>
<DYDXBalancePanel />
</Styled.BalancePanelContainer>
)}
</Styled.PanelRow> </Styled.PanelRow>
</Styled.Page> </Styled.Page>
); );
@@ -191,143 +79,56 @@ const Styled: Record<string, AnyStyledComponent> = {};
Styled.Page = styled.div` Styled.Page = styled.div`
${layoutMixins.contentContainerPage} ${layoutMixins.contentContainerPage}
gap: 1.5rem; gap: 1.5rem;
padding: 2rem;
align-items: center;
> * {
--content-max-width: 70rem;
max-width: min(calc(100vw - 4rem), var(--content-max-width));
}
@media ${breakpoints.tablet} { @media ${breakpoints.tablet} {
padding: 1rem; padding: 1.25rem;
> * {
max-width: calc(100vw - 2.5rem);
width: 100%;
}
} }
`; `;
Styled.Panel = styled(Panel)` Styled.Panel = styled(Panel)`
padding: 0 1.5rem 1rem; --panel-paddingX: 1.5rem;
@media ${breakpoints.tablet} {
max-width: calc(100vw - 2rem);
}
`; `;
Styled.Row = styled.div` Styled.Title = styled.h3`
${layoutMixins.spacedRow} font: var(--font-medium-book);
gap: 1rem; color: var(--color-text-2);
padding: 1rem 1.5rem 0;
align-items: center;
`; `;
Styled.Description = styled.div` Styled.Description = styled.div`
color: var(--color-text-0); color: var(--color-text-0);
--link-color: var(--color-text-1);
a {
color: var(--color-text-1);
}
`; `;
Styled.Migrate = styled.section` Styled.PanelRow = styled.div`
max-width: min(100vw, var(--content-max-width)); ${layoutMixins.gridEqualColumns}
padding: 1.5rem;
background-color: var(--color-layer-3);
border-radius: 0.875rem;
`;
Styled.TwoItemRow = styled(Styled.Row)`
grid-template-columns: 1fr 1fr;
`;
Styled.MigrateAction = styled(Styled.TwoItemRow)`
padding: 1rem;
background-color: var(--color-layer-2);
border: solid var(--border-width) var(--color-border);
border-radius: 0.75rem;
`;
Styled.Token = styled(Output)`
font: var(--font-large-book);
`;
Styled.PanelRow = styled(Styled.Row)`
gap: 1.5rem; gap: 1.5rem;
max-width: min(100vw, var(--content-max-width));
align-items: flex-start;
> section { align-items: flex-start;
cursor: pointer;
}
@media ${breakpoints.tablet} { @media ${breakpoints.tablet} {
grid-auto-flow: row; grid-auto-flow: row;
grid-template-columns: 1fr; grid-template-columns: 1fr;
max-width: auto;
} }
`; `;
Styled.BalancePanelContainer = styled.div`
width: 21.25rem;
@media ${breakpoints.tablet} {
width: auto;
}
`;
Styled.Title = styled.h3`
${layoutMixins.inlineRow}
padding: 1.25rem 1.5rem 0.5rem;
font: var(--font-medium-book);
color: var(--color-text-2);
`;
Styled.MigrateTitle = styled(Styled.Title)`
padding: 0 0 0.5rem;
`;
Styled.MobileMigrateCard = styled(Styled.Panel)`
${layoutMixins.flexColumn}
gap: 1rem;
align-items: center;
`;
Styled.MobileMigrateHeader = styled(Styled.Title)`
${layoutMixins.inlineRow}
gap: 1ch;
padding-bottom: 1rem;
font: var(--font-small-book);
color: var(--color-text-0);
h3 {
${layoutMixins.inlineRow}
font: var(--font-large-book);
color: var(--color-text-2);
svg {
font-size: 1.75rem;
}
}
span {
margin-top: 0.2rem;
b {
font-weight: var(--fontWeight-book);
color: var(--color-text-1);
}
}
`;
Styled.Details = styled(Details)`
padding: 0.5rem 1rem;
`;
Styled.WithReceipt = styled(WithReceipt)`
width: 100%;
`;
Styled.LearnMore = styled(Styled.Description)`
${layoutMixins.row}
gap: 1ch;
`;
Styled.IconButton = styled(IconButton)` Styled.IconButton = styled(IconButton)`
color: var(--color-text-0); color: var(--color-text-0);
--color-border: var(--color-layer-6);
`;
Styled.Arrow = styled.div`
padding: 1rem;
`; `;
+2 -2
View File
@@ -227,8 +227,8 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
}, },
]} ]}
value={view} value={view}
onValueChange={(newView: string) => { onValueChange={setView}
setView((newView || view) as PanelView); onInteraction={() => {
setIsOpen?.(true); setIsOpen?.(true);
}} }}
/> />
+2 -2
View File
@@ -17,7 +17,7 @@ import { MustBigNumber } from '@/lib/numbers';
import { MidMarketPrice } from '@/views/MidMarketPrice'; import { MidMarketPrice } from '@/views/MidMarketPrice';
export const TradeHeaderMobile = () => { export const TradeHeaderMobile = () => {
const { name, symbol } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {}; const { name, id } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
const navigate = useNavigate(); const navigate = useNavigate();
const { market, priceChange24H, priceChange24HPercent } = const { market, priceChange24H, priceChange24HPercent } =
@@ -27,7 +27,7 @@ export const TradeHeaderMobile = () => {
<Styled.Header> <Styled.Header>
<BackButton onClick={() => navigate(AppRoute.Markets)} /> <BackButton onClick={() => navigate(AppRoute.Markets)} />
<Styled.MarketName> <Styled.MarketName>
<Styled.AssetIcon symbol={symbol} /> <Styled.AssetIcon symbol={id} />
<Styled.Name> <Styled.Name>
<h3>{name}</h3> <h3>{name}</h3>
<span>{market}</span> <span>{market}</span>
+2
View File
@@ -13,4 +13,6 @@ declare global {
'abacus:connectNetwork': CustomEvent; 'abacus:connectNetwork': CustomEvent;
} }
var Intercom: any;
} }
-4
View File
@@ -3,7 +3,6 @@ import { configureStore } from '@reduxjs/toolkit';
import abacusStateManager from '@/lib/abacus'; import abacusStateManager from '@/lib/abacus';
import appMiddleware from './appMiddleware'; import appMiddleware from './appMiddleware';
import localizationMiddleware from './localizationMiddleware'; import localizationMiddleware from './localizationMiddleware';
import routerMiddleware from './routerMiddleware';
import { accountSlice } from './account'; import { accountSlice } from './account';
import { appSlice } from './app'; import { appSlice } from './app';
@@ -13,7 +12,6 @@ import { dialogsSlice } from './dialogs';
import { inputsSlice } from './inputs'; import { inputsSlice } from './inputs';
import { layoutSlice } from './layout'; import { layoutSlice } from './layout';
import { localizationSlice } from './localization'; import { localizationSlice } from './localization';
import { navigationSlice } from './navigation';
import { perpetualsSlice } from './perpetuals'; import { perpetualsSlice } from './perpetuals';
export const commandMenuSlices = [layoutSlice, localizationSlice]; export const commandMenuSlices = [layoutSlice, localizationSlice];
@@ -28,7 +26,6 @@ export const store = configureStore({
inputs: inputsSlice.reducer, inputs: inputsSlice.reducer,
layout: layoutSlice.reducer, layout: layoutSlice.reducer,
localization: localizationSlice.reducer, localization: localizationSlice.reducer,
navigation: navigationSlice.reducer,
perpetuals: perpetualsSlice.reducer, perpetuals: perpetualsSlice.reducer,
}, },
@@ -38,7 +35,6 @@ export const store = configureStore({
}), }),
appMiddleware, appMiddleware,
localizationMiddleware, localizationMiddleware,
routerMiddleware,
], ],
devTools: process.env.NODE_ENV !== 'production', devTools: process.env.NODE_ENV !== 'production',
+40 -18
View File
@@ -12,6 +12,7 @@ import type {
SubaccountTransfers, SubaccountTransfers,
HistoricalPnlPeriods, HistoricalPnlPeriods,
SubAccountHistoricalPNLs, SubAccountHistoricalPNLs,
UsageRestriction,
} from '@/constants/abacus'; } from '@/constants/abacus';
import { OnboardingGuard, OnboardingState } from '@/constants/account'; import { OnboardingGuard, OnboardingState } from '@/constants/account';
@@ -21,34 +22,46 @@ import { WalletType } from '@/constants/wallets';
import { getLocalStorage } from '@/lib/localStorage'; import { getLocalStorage } from '@/lib/localStorage';
export type AccountState = { export type AccountState = {
balances?: Record<string, AccountBalance>;
stakingBalances?: Record<string, AccountBalance>;
wallet?: Nullable<Wallet>;
walletType?: WalletType;
subaccount?: Nullable<Subaccount>;
fills?: SubaccountFills; fills?: SubaccountFills;
fundingPayments?: SubaccountFundingPayments; fundingPayments?: SubaccountFundingPayments;
transfers?: SubaccountTransfers; transfers?: SubaccountTransfers;
historicalPnl?: SubAccountHistoricalPNLs;
onboardingGuards: Record<OnboardingGuard, boolean | undefined>;
onboardingState: OnboardingState;
clearedOrderIds?: string[]; clearedOrderIds?: string[];
hasUnseenFillUpdates: boolean; hasUnseenFillUpdates: boolean;
hasUnseenOrderUpdates: boolean; hasUnseenOrderUpdates: boolean;
historicalPnl?: SubAccountHistoricalPNLs;
latestOrder?: Nullable<SubaccountOrder>; latestOrder?: Nullable<SubaccountOrder>;
onboardingGuards: Record<OnboardingGuard, boolean | undefined>;
onboardingState: OnboardingState;
subaccount?: Nullable<Subaccount>;
uncommittedOrderClientIds: number[];
wallet?: Nullable<Wallet>;
walletType?: WalletType;
historicalPnlPeriod?: HistoricalPnlPeriods; historicalPnlPeriod?: HistoricalPnlPeriods;
balances?: Record<string, AccountBalance>; uncommittedOrderClientIds: number[];
stakingBalances?: Record<string, AccountBalance>;
restriction?: Nullable<UsageRestriction>;
}; };
const initialState: AccountState = { const initialState: AccountState = {
// Wallet
balances: undefined,
wallet: undefined,
walletType: getLocalStorage<WalletType>({
key: LocalStorageKey.OnboardingSelectedWalletType,
}),
// Subaccount
subaccount: undefined,
fills: undefined, fills: undefined,
fundingPayments: undefined, fundingPayments: undefined,
transfers: undefined, transfers: undefined,
clearedOrderIds: undefined,
hasUnseenFillUpdates: false,
hasUnseenOrderUpdates: false,
historicalPnl: undefined, historicalPnl: undefined,
latestOrder: undefined,
// Onboarding
onboardingGuards: { onboardingGuards: {
[OnboardingGuard.hasAcknowledgedTerms]: Boolean( [OnboardingGuard.hasAcknowledgedTerms]: Boolean(
getLocalStorage<boolean>({ getLocalStorage<boolean>({
@@ -59,12 +72,17 @@ const initialState: AccountState = {
[OnboardingGuard.hasPreviousTransactions]: undefined, [OnboardingGuard.hasPreviousTransactions]: undefined,
}, },
onboardingState: OnboardingState.Disconnected, onboardingState: OnboardingState.Disconnected,
subaccount: undefined,
// UI
clearedOrderIds: undefined,
hasUnseenFillUpdates: false,
hasUnseenOrderUpdates: false,
latestOrder: undefined,
uncommittedOrderClientIds: [], uncommittedOrderClientIds: [],
wallet: undefined, historicalPnlPeriod: undefined,
walletType: getLocalStorage<WalletType>({
key: LocalStorageKey.OnboardingSelectedWalletType, // Restriction
}), restriction: undefined,
}; };
export const accountSlice = createSlice({ export const accountSlice = createSlice({
@@ -124,6 +142,9 @@ export const accountSlice = createSlice({
state.historicalPnl = action.payload; state.historicalPnl = action.payload;
} }
}, },
setRestrictionType: (state, action: PayloadAction<Nullable<UsageRestriction>>) => {
state.restriction = action.payload;
},
setSubaccount: (state, action: PayloadAction<Nullable<Subaccount>>) => { setSubaccount: (state, action: PayloadAction<Nullable<Subaccount>>) => {
const existingOrderIds = state.subaccount?.orders const existingOrderIds = state.subaccount?.orders
? state.subaccount.orders.toArray().map((order) => order.id) ? state.subaccount.orders.toArray().map((order) => order.id)
@@ -178,6 +199,7 @@ export const {
setOnboardingGuard, setOnboardingGuard,
setOnboardingState, setOnboardingState,
setHistoricalPnl, setHistoricalPnl,
setRestrictionType,
setSubaccount, setSubaccount,
setWallet, setWallet,
viewedFills, viewedFills,
+10
View File
@@ -342,3 +342,13 @@ export const getBalances = (state: RootState) => state.account?.balances;
* @returns user wallet staking balances * @returns user wallet staking balances
* */ * */
export const getStakingBalances = (state: RootState) => state.account?.stakingBalances; export const getStakingBalances = (state: RootState) => state.account?.stakingBalances;
/**
* @returns UsageRestriction of the current session
*/
export const getUsageRestriction = (state: RootState) => state.account.restriction;
/**
* @returns RestrictionType from the current session
*/
export const getRestrictionType = (state: RootState) => state.account.restriction?.restriction;
+2 -1
View File
@@ -2,10 +2,10 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
import { AbacusApiState } from '@/constants/abacus'; import { AbacusApiState } from '@/constants/abacus';
import { LocalStorageKey } from '@/constants/localStorage'; import { LocalStorageKey } from '@/constants/localStorage';
import { DEFAULT_APP_ENVIRONMENT, type DydxNetwork } from '@/constants/networks'; import { DEFAULT_APP_ENVIRONMENT, type DydxNetwork } from '@/constants/networks';
import { getLocalStorage } from '@/lib/localStorage'; import { getLocalStorage } from '@/lib/localStorage';
import { validateAgainstAvailableEnvironments } from '@/lib/network';
export interface AppState { export interface AppState {
apiState: AbacusApiState | undefined; apiState: AbacusApiState | undefined;
@@ -19,6 +19,7 @@ const initialState: AppState = {
selectedNetwork: getLocalStorage({ selectedNetwork: getLocalStorage({
key: LocalStorageKey.SelectedNetwork, key: LocalStorageKey.SelectedNetwork,
defaultValue: DEFAULT_APP_ENVIRONMENT, defaultValue: DEFAULT_APP_ENVIRONMENT,
validateFn: validateAgainstAvailableEnvironments,
}), }),
}; };
+23 -24
View File
@@ -23,39 +23,38 @@ export const dialogsSlice = createSlice({
name: 'Dialogs', name: 'Dialogs',
initialState, initialState,
reducers: { reducers: {
addDialogToQueue: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => { openDialog: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => {
const dialogQueue = state.dialogQueue; if (state.activeDialog?.type === action.payload.type) return;
dialogQueue.push(action.payload);
return { if (state.activeDialog) {
...state, state.dialogQueue.push(action.payload);
dialogQueue, } else {
}; state.activeDialog = action.payload;
}
},
closeDialog: (state: DialogsState) => {
state.activeDialog = state.dialogQueue.shift();
},
forceOpenDialog: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => {
if (state.activeDialog) {
state.dialogQueue.unshift(state.activeDialog);
}
state.activeDialog = action.payload;
},
closeDialogInTradeBox: (state: DialogsState) => {
state.activeTradeBoxDialog = undefined;
}, },
closeDialog: (state: DialogsState) => ({
...state,
activeDialog: state.dialogQueue.shift(),
}),
openDialog: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => ({
...state,
activeDialog: action.payload,
}),
closeDialogInTradeBox: (state: DialogsState) => ({
...state,
activeTradeBoxDialog: undefined,
}),
openDialogInTradeBox: ( openDialogInTradeBox: (
state: DialogsState, state: DialogsState,
action: PayloadAction<DialogInfo<TradeBoxDialogTypes>> action: PayloadAction<DialogInfo<TradeBoxDialogTypes>>
) => ({ ) => {
...state, state.activeTradeBoxDialog = action.payload;
activeTradeBoxDialog: action.payload, },
}),
}, },
}); });
export const { export const {
addDialogToQueue, forceOpenDialog,
closeDialog, closeDialog,
closeDialogInTradeBox, closeDialogInTradeBox,
openDialog, openDialog,
-42
View File
@@ -1,42 +0,0 @@
import { createSlice } from '@reduxjs/toolkit';
export interface NavigationState {
tradeLocation: {
hash: string;
key: string;
pathname: string;
search: string;
state: any;
};
}
export const CLEAR_TRADE_LOCATION = {
hash: '',
key: '',
pathname: '',
search: '',
state: null,
};
const initialState: NavigationState = {
tradeLocation: {
hash: '',
key: '',
pathname: '',
search: '',
state: null,
},
};
export const navigationSlice = createSlice({
name: 'Navigation',
initialState,
reducers: {
setTradeLocation: (state, { payload }) => ({
...state,
tradeLocation: payload,
}),
},
});
export const { setTradeLocation } = navigationSlice.actions;
-33
View File
@@ -1,33 +0,0 @@
import type { PayloadAction } from '@reduxjs/toolkit';
import { LocalStorageKey } from '@/constants/localStorage';
import { closeDialogInTradeBox } from '@/state/dialogs';
import { setTradeLocation } from '@/state/navigation';
import abacusStateManager from '@/lib/abacus';
import { setLocalStorage } from '@/lib/localStorage';
import { getMarketIdFromLocation } from '@/lib/tradeData';
export default (store: any) => (next: any) => async (action: PayloadAction<any>) => {
next(action);
const { type, payload } = action;
switch (type) {
case setTradeLocation.type: {
const marketId = getMarketIdFromLocation(payload);
if (marketId) {
abacusStateManager.setMarket(marketId);
store.dispatch(closeDialogInTradeBox());
setLocalStorage({ key: LocalStorageKey.LastViewedMarket, value: marketId });
}
break;
}
default: {
break;
}
}
};
+53
View File
@@ -0,0 +1,53 @@
import {
css,
type FlattenInterpolation,
type FlattenSimpleInterpolation,
type ThemeProps,
} from 'styled-components';
export const articleMixins: Record<
string,
FlattenSimpleInterpolation | FlattenInterpolation<ThemeProps<any>>
> = {
article: css`
padding: 2rem;
overflow-wrap: break-word;
user-select: text;
margin: 0 auto;
width: 60rem;
max-width: 100vw;
header {
color: var(--color-text-0);
margin-bottom: 2rem;
h1 {
font: var(--font-extra-book);
color: var(--color-text-2);
}
}
h2 {
font: var(--font-large-book);
color: var(--color-text-2);
padding: 0.5rem 0;
}
h3,
strong {
font-weight: 700;
}
strong {
color: var(--color-text-2);
}
p {
padding: 0.5rem 0;
}
ul {
padding: 0.5rem 1rem;
}
`,
};
+4 -5
View File
@@ -36,11 +36,10 @@
--single-unit-height: 9.375rem; --single-unit-height: 9.375rem;
/* Modal constants */ /* Modal constants */
--sidebar-modal-width: 18.75rem; --dialog-small-width: 18.75rem;
--modal-small-width: 18.75rem; --dialog-medium-width: 20.5rem;
--modal-medium-width: 20.5rem; --dialog-large-width: 26.25rem;
--modal-large-width: 26.25rem; --dialog-header-height: 4rem;
--modal-header-height: 4rem;
/* Market Selector constants */ /* Market Selector constants */
--marketsDropdown-openWidth: 45rem; --marketsDropdown-openWidth: 45rem;
+2 -1
View File
@@ -188,13 +188,14 @@ export const popoverMixins = {
--item-highlighted-backgroundColor: var(--color-layer-2); --item-highlighted-backgroundColor: var(--color-layer-2);
--item-highlighted-textColor: var(--color-text-2); --item-highlighted-textColor: var(--color-text-2);
--item-gap: 0.5em;
--item-radius: 0px; --item-radius: 0px;
--item-padding: 0.5em 1em; --item-padding: 0.5em 1em;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
gap: 0.5em; gap: var(--item-gap);
padding: var(--item-padding); padding: var(--item-padding);
border-radius: var(--item-radius); border-radius: var(--item-radius);
@@ -75,16 +75,14 @@ export const AccountInfoConnectedState = () => {
<Styled.Header> <Styled.Header>
<span>{stringGetter({ key: STRING_KEYS.ACCOUNT })}</span> <span>{stringGetter({ key: STRING_KEYS.ACCOUNT })}</span>
<Styled.TransferButtons> <Styled.TransferButtons>
{import.meta.env.MODE !== 'production' && ( <Styled.Button
<Styled.Button state={{ isDisabled: !dydxAccounts }}
state={{ isDisabled: !dydxAccounts }} onClick={() => dispatch(openDialog({ type: DialogTypes.Withdraw }))}
onClick={() => dispatch(openDialog({ type: DialogTypes.Withdraw }))} shape={ButtonShape.Pill}
shape={ButtonShape.Pill} size={ButtonSize.XSmall}
size={ButtonSize.XSmall} >
> {stringGetter({ key: STRING_KEYS.WITHDRAW })}
{stringGetter({ key: STRING_KEYS.WITHDRAW })} </Styled.Button>
</Styled.Button>
)}
<Styled.Button <Styled.Button
state={{ isDisabled: !dydxAccounts }} state={{ isDisabled: !dydxAccounts }}
onClick={() => dispatch(openDialog({ type: DialogTypes.Deposit }))} onClick={() => dispatch(openDialog({ type: DialogTypes.Deposit }))}
@@ -153,7 +151,10 @@ export const AccountInfoConnectedState = () => {
), ),
label: stringGetter({ key: STRING_KEYS.BUYING_POWER }), label: stringGetter({ key: STRING_KEYS.BUYING_POWER }),
type: OutputType.Fiat, type: OutputType.Fiat,
value: buyingPower, value:
MustBigNumber(buyingPower?.current).lt(0) && buyingPower?.postOrder === null
? undefined
: buyingPower,
}, },
].map( ].map(
({ ({
+1 -1
View File
@@ -29,7 +29,7 @@ export const MarketFilter = ({
<> <>
{!isSearch && ( {!isSearch && (
<ToggleGroup <ToggleGroup
items={Object.entries(filters).map(([key, value]) => ({ items={Object.values(filters).map((value) => ({
label: stringGetter({ key: MARKET_FILTER_LABELS[value] }), label: stringGetter({ key: MARKET_FILTER_LABELS[value] }),
value, value,
}))} }))}
-2
View File
@@ -198,8 +198,6 @@ Styled.Details = styled(Details)`
@media ${breakpoints.tablet} { @media ${breakpoints.tablet} {
${layoutMixins.withOuterAndInnerBorders} ${layoutMixins.withOuterAndInnerBorders}
display: grid;
grid-template-columns: repeat(auto-fit, minmax(9rem, 1fr));
font: var(--font-small-book); font: var(--font-small-book);
> * { > * {
+4 -8
View File
@@ -1,6 +1,5 @@
import { useCallback, useState, useMemo } from 'react'; import { useCallback, useState, useMemo } from 'react';
import styled, { type AnyStyledComponent } from 'styled-components'; import styled, { type AnyStyledComponent } from 'styled-components';
import { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
import { Root, Trigger, Content } from '@radix-ui/react-collapsible'; import { Root, Trigger, Content } from '@radix-ui/react-collapsible';
import { StatusResponse } from '@0xsquid/sdk'; import { StatusResponse } from '@0xsquid/sdk';
@@ -21,12 +20,14 @@ import { LoadingDots } from '@/components/Loading/LoadingDots';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
type ElementProps = { type ElementProps = {
type: 'withdrawal' | 'deposit';
toAmount?: number; toAmount?: number;
triggeredAt?: number; triggeredAt?: number;
status?: StatusResponse; status?: StatusResponse;
}; };
export const TransferStatusToast = ({ export const TransferStatusToast = ({
type,
toAmount, toAmount,
triggeredAt = Date.now(), triggeredAt = Date.now(),
status, status,
@@ -38,11 +39,6 @@ export const TransferStatusToast = ({
// @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 type = useMemo(
() => (status?.toChain?.chainData?.chainId === TESTNET_CHAIN_ID ? 'deposit' : 'withdrawal'),
[status]
);
const updateSecondsLeft = useCallback(() => { const updateSecondsLeft = useCallback(() => {
const fromChainEta = (status?.fromChain?.chainData?.estimatedRouteDuration || 0) * 1000; const fromChainEta = (status?.fromChain?.chainData?.estimatedRouteDuration || 0) * 1000;
const toChainEta = (status?.toChain?.chainData?.estimatedRouteDuration || 0) * 1000; const toChainEta = (status?.toChain?.chainData?.estimatedRouteDuration || 0) * 1000;
@@ -69,7 +65,7 @@ export const TransferStatusToast = ({
side="bottom" side="bottom"
slotReceipt={ slotReceipt={
<Styled.Receipt> <Styled.Receipt>
<TransferStatusSteps status={status} /> <TransferStatusSteps status={status} type={type} />
</Styled.Receipt> </Styled.Receipt>
} }
> >
@@ -172,7 +168,7 @@ Styled.TriggerIcon = styled.span`
width: 0.75em; width: 0.75em;
display: inline-flex; display: inline-flex;
transition: transform 0.3s var(--ease-out-expo); transition: rotate 0.3s var(--ease-out-expo);
${Styled.Trigger}[data-state='open'] & { ${Styled.Trigger}[data-state='open'] & {
rotate: -0.5turn; rotate: -0.5turn;
+7 -4
View File
@@ -1,7 +1,6 @@
import { useMemo } from 'react'; import { useMemo } from 'react';
import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components'; import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components';
import { StatusResponse } from '@0xsquid/sdk'; import { StatusResponse } from '@0xsquid/sdk';
import { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
import { useStringGetter } from '@/hooks'; import { useStringGetter } from '@/hooks';
@@ -15,6 +14,7 @@ import { STRING_KEYS } from '@/constants/localization';
type ElementProps = { type ElementProps = {
status?: StatusResponse; status?: StatusResponse;
type: 'withdrawal' | 'deposit';
}; };
enum TransferStatusStep { enum TransferStatusStep {
@@ -24,14 +24,13 @@ enum TransferStatusStep {
Complete, Complete,
} }
export const TransferStatusSteps = ({ status }: ElementProps) => { export const TransferStatusSteps = ({ status, type }: ElementProps) => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { currentStep, steps, type } = useMemo(() => { const { currentStep, steps } = useMemo(() => {
const routeStatus = status?.routeStatus; const routeStatus = status?.routeStatus;
const fromChain = status?.fromChain?.chainData?.chainId; const fromChain = status?.fromChain?.chainData?.chainId;
const toChain = status?.toChain?.chainData?.chainId; const toChain = status?.toChain?.chainData?.chainId;
const type = toChain === TESTNET_CHAIN_ID ? 'deposit' : 'withdrawal';
const steps = [ const steps = [
{ {
@@ -74,6 +73,10 @@ export const TransferStatusSteps = ({ status }: ElementProps) => {
currentStep = TransferStatusStep.FromChain; currentStep = TransferStatusStep.FromChain;
} }
if (status?.squidTransactionStatus === 'success') {
currentStep = TransferStatusStep.Complete;
}
return { return {
currentStep, currentStep,
steps, steps,
+1 -3
View File
@@ -246,9 +246,7 @@ export const FundingChart = ({ selectedLocale }: ElementProps) => {
}[rate] || '', }[rate] || '',
}))} }))}
value={fundingRateView} value={fundingRateView}
onValueChange={(newRate: FundingRateResolution) => { onValueChange={setFundingRateView}
if (newRate) setFundingRateView(newRate);
}}
size={ButtonSize.XSmall} size={ButtonSize.XSmall}
/> />
</Styled.FundingRateToggle> </Styled.FundingRateToggle>

Some files were not shown because too many files have changed in this diff Show More