Update based on latest designs

* update migrate panel

* address feedback

.env.example

@@ -7,3 +7,4 @@ VITE_PK_ENCRYPTION_KEY=
 VITE_WALLETCONNECT2_PROJECT_ID=
 
 VITE_V3_TOKEN_ADDRESS=
+VITE_TOKEN_MIGRATION_URI=

LICENSE

@@ -1,45 +1,3 @@
-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.
-
-Parameters
-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 License’s 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 License’s 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.
-
-
-
-
-
-
-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.

README.md

@@ -1,10 +1,10 @@
 <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">
   <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>
 </div>
 

package.json

@@ -1,9 +1,9 @@
 {
   "name": "dydx-chain-web",
   "private": true,
-  "version": "0.0.1",
+  "version": "1.0.0",
   "type": "module",
-  "license": "BSL-1.1",
+  "license": "AGPL-3.0",
   "engines": {
     "node": ">=18"
   },
@@ -39,7 +39,7 @@
     "@cosmjs/proto-signing": "^0.31.0",
     "@cosmjs/stargate": "^0.31.0",
     "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^0.7.6",
+    "@dydxprotocol/v4-abacus": "^1.0.3",
     "@dydxprotocol/v4-client-js": "^0.40.3",
     "@dydxprotocol/v4-localization": "^0.1.32",
     "@ethersproject/providers": "^5.7.2",

pnpm-lock.yaml

@@ -27,8 +27,8 @@ dependencies:
     specifier: ^0.31.0
     version: 0.31.0
   '@dydxprotocol/v4-abacus':
-    specifier: ^0.7.6
+    specifier: ^1.0.3
-    version: 0.7.6
+    version: 1.0.3
   '@dydxprotocol/v4-client-js':
     specifier: ^0.40.3
     version: 0.40.3
@@ -979,8 +979,8 @@ packages:
     resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
     dev: true
 
-  /@dydxprotocol/v4-abacus@0.7.6:
+  /@dydxprotocol/v4-abacus@1.0.3:
-    resolution: {integrity: sha512-FdDXRaFMfxhyrJJs0dNrb1KG6X95lPHelua1yCn/SVgzwGaAqlJczrzmdh98INntuRAgIxOu69R5mCGyekumyg==}
+    resolution: {integrity: sha512-GuX37/DMMNSke8ZFcw52II7IVJfUgVGHqoi1Uw2cUb+hgIjjSG3OtbyRWedm5r6nqWq8BNLOexI0VVFB6OMVYg==}
     dev: false
 
   /@dydxprotocol/v4-client-js@0.40.3:

public/.well-known/apple-app-site-association

@@ -8,67 +8,43 @@
                 ],
                 "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",

public/configs/env.json

@@ -25,7 +25,8 @@
             "dydxprotocol-testnet-dsrv",
             "dydxprotocol-testnet-nodefleet",
             "dydxprotocol-testnet-kingnodes",
-            "dydxprotocol-testnet-liquify"
+            "dydxprotocol-testnet-liquify",
+            "dydxprotocol-testnet-polkachu"
          ],
          "default": "dydxprotocol-testnet"
       }
@@ -56,15 +57,15 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "http://indexer.v4dev.dydx.exchange",
+                  "api": "https://indexer.v4dev.dydx.exchange",
                   "socket": "wss://indexer.v4dev.dydx.exchange"
                }
             ],
             "validators": [
-               "http://validator.v4dev.dydx.exchange"
+               "https://validator.v4dev.dydx.exchange"
             ],
             "0xsquid": "https://testnet.api.0xsquid.com",
-            "faucet": "http://faucet.v4dev.dydx.exchange"
+            "faucet": "https://faucet.v4dev.dydx.exchange"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
@@ -307,10 +308,11 @@
             "tos": "https://dydx.exchange/v4-terms",
             "privacy": "https://dydx.exchange/privacy",
             "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"
+            "blogs": "https://www.dydx.foundation/blog",
+            "help": "https://help.dydx.exchange"
          },
          "wallets": {
             "walletconnect": {
@@ -370,10 +372,11 @@
             "tos": "https://dydx.exchange/v4-terms",
             "privacy": "https://dydx.exchange/privacy",
             "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"
+            "blogs": "https://www.dydx.foundation/blog",
+            "help": "https://help.dydx.exchange"
          },
          "wallets": {
             "walletconnect": {
@@ -424,6 +427,7 @@
                }
             ],
             "validators": [
+               "https://dydx-testnet-rpc.polkachu.com/",
                "https://dydx-testnet.nodefleet.org",
                "https://test-dydx.kingnodes.com",
                "https://dydx-rpc.liquify.com/api=8878132/dydx"
@@ -435,7 +439,7 @@
             "tos": "https://dydx.exchange/v4-terms",
             "privacy": "https://dydx.exchange/privacy",
             "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"
@@ -499,7 +503,7 @@
             "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/",
+            "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"
@@ -563,7 +567,7 @@
             "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/",
+            "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"
@@ -627,7 +631,7 @@
             "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/",
+            "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"
@@ -691,7 +695,7 @@
             "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/",
+            "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"
@@ -750,6 +754,70 @@
             "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"
+         },
+         "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",
+         "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",
@@ -822,7 +890,8 @@
             "documentation": "[HTTP link to documentation, can be null]",
             "community": "[HTTP link to community, can be null]",
             "feedback": "[HTTP link to feedback form, can be null]",
-            "blogs": "[HTTP link to blogs, can be null]"
+            "blogs": "[HTTP link to blogs, can be null]",
+            "help": "[HTTP link to help page, can be null]"
          },
          "wallets": {
             "walletconnect": {

src/components/Icon.tsx

@@ -24,9 +24,10 @@ import {
   CommentIcon,
   CopyIcon,
   CubeIcon,
+  DepositIcon,
+  DepthChartIcon,
   DiscordIcon,
   EtherscanIcon,
-  DepthChartIcon,
   ExportKeysIcon,
   FeedbackIcon,
   FileIcon,
@@ -40,6 +41,7 @@ import {
   LockIcon,
   LogoShortIcon,
   MenuIcon,
+  MigrateIcon,
   MintscanIcon,
   OrderbookIcon,
   OrderCanceledIcon,
@@ -68,6 +70,7 @@ import {
   WarningIcon,
   WebsiteIcon,
   WhitepaperIcon,
+  WithdrawIcon,
 } from '@/icons';
 
 export enum IconName {
@@ -92,6 +95,7 @@ export enum IconName {
   Comment = 'Comment',
   Copy = 'Copy',
   Cube = 'Cube',
+  Deposit = 'Deposit',
   DepthChart = 'DepthChart',
   Discord = 'Discord',
   Etherscan = 'Etherscan',
@@ -108,6 +112,7 @@ export enum IconName {
   Lock = 'Lock',
   LogoShort = 'LogoShort',
   Menu = 'Menu',
+  Migrate = 'Migrate',
   Mintscan = 'Mintscan',
   Onboarding = 'Onboarding',
   Orderbook = 'OrderbookIcon',
@@ -137,6 +142,7 @@ export enum IconName {
   Warning = 'Warning',
   Website = 'Website',
   Whitepaper = 'Whitepaper',
+  Withdraw = 'Withdraw',
 }
 
 const icons = {
@@ -161,6 +167,7 @@ const icons = {
   [IconName.Comment]: CommentIcon,
   [IconName.Copy]: CopyIcon,
   [IconName.Cube]: CubeIcon,
+  [IconName.Deposit]: DepositIcon,
   [IconName.DepthChart]: DepthChartIcon,
   [IconName.Discord]: DiscordIcon,
   [IconName.Etherscan]: EtherscanIcon,
@@ -177,6 +184,7 @@ const icons = {
   [IconName.Lock]: LockIcon,
   [IconName.LogoShort]: LogoShortIcon,
   [IconName.Menu]: MenuIcon,
+  [IconName.Migrate]: MigrateIcon,
   [IconName.Mintscan]: MintscanIcon,
   [IconName.Orderbook]: OrderbookIcon,
   [IconName.OrderCanceled]: OrderCanceledIcon,
@@ -205,6 +213,7 @@ const icons = {
   [IconName.Warning]: WarningIcon,
   [IconName.Website]: WebsiteIcon,
   [IconName.Whitepaper]: WhitepaperIcon,
+  [IconName.Withdraw]: WithdrawIcon,
 } as Record<IconName, ElementType>;
 
 type ElementProps = {

src/components/Panel.tsx

@@ -8,6 +8,7 @@ import { layoutMixins } from '@/styles/layoutMixins';
 type PanelProps = {
   slotHeaderContent?: string;
   slotHeader?: React.ReactNode;
+  slotRight?: React.ReactNode;
   children?: React.ReactNode;
   href?: string;
   onHeaderClick?: () => void;
@@ -22,6 +23,7 @@ type PanelStyleProps = {
 export const Panel = ({
   slotHeaderContent,
   slotHeader,
+  slotRight,
   children,
   href,
   onHeaderClick,
@@ -30,55 +32,61 @@ export const Panel = ({
   className,
 }: PanelProps & PanelStyleProps) => (
   <Styled.Panel onClick={onClick}>
-    {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}>
             {slotHeaderContent}
-            <Styled.Icon iconName={IconName.ChevronRight} />
           </Styled.Header>
-        )}
+        )
-      </Link>
+      )}
-    ) : slotHeader ? (
+      <Styled.Content className={className}>{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>
 );
 
 const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.Panel = styled.section`
-  ${layoutMixins.flexColumn}
+  ${layoutMixins.row}
 
   background-color: var(--color-layer-3);
   border-radius: 0.875rem;
 `;
 
+Styled.Left = styled.div`
+  ${layoutMixins.flexColumn}
+  width: 100%;
+`;
+
 Styled.Header = styled.header<{ hasSeparator?: boolean }>`
   ${layoutMixins.spacedRow}
-
+  padding: 1rem 1rem;
-  padding: 0.875rem 1rem 0.625rem;
-  font-size: 0.875rem;
 
   ${({ hasSeparator }) =>
     hasSeparator &&
     css`
+      padding-bottom: 0.625rem;
       box-shadow: 0 var(--border-width) var(--border-color);
     `}
 `;
 
 Styled.Icon = styled(Icon)`
   color: var(--color-text-0);
-
   font-size: 0.625rem;
 `;
 
@@ -86,6 +94,5 @@ Styled.Content = styled.div`
   ${layoutMixins.scrollArea}
   ${layoutMixins.stickyArea0}
   --stickyArea0-background: transparent;
-
+  padding: 1rem 1rem;
-  padding: 0.5rem 1rem;
 `;

src/hooks/tradingView/useTradingView.ts

@@ -44,7 +44,7 @@ export const useTradingView = ({
   const hasMarkets = marketIds.length > 0;
 
   useEffect(() => {
-    if (hasMarkets && isClientConnected) {
+    if (hasMarkets && isClientConnected && marketId) {
       const widgetOptions = getWidgetOptions();
       const widgetOverrides = getWidgetOverrides(appTheme);
       const options = {
@@ -75,7 +75,7 @@ export const useTradingView = ({
       tvWidgetRef.current = null;
       setIsChartReady(false);
     };
-  }, [getCandlesForDatafeed, isClientConnected, hasMarkets, selectedLocale, selectedNetwork]);
+  }, [getCandlesForDatafeed, isClientConnected, hasMarkets, selectedLocale, selectedNetwork, !!marketId]);
 
   return { savedResolution };
 };

src/hooks/useAccountBalance.ts

@@ -6,7 +6,6 @@ import { useQuery } from 'react-query';
 import { formatUnits } from 'viem';
 
 import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
-import { QUANTUM_MULTIPLIER } from '@/constants/numbers';
 import { EvmAddress } from '@/constants/wallets';
 
 import { convertBech32Address } from '@/lib/addressUtils';
@@ -21,7 +20,6 @@ import { useTokenConfigs } from './useTokenConfigs';
 type UseAccountBalanceProps = {
   // Token Items
   addressOrDenom?: string;
-  assetSymbol?: string;
   decimals?: number;
 
   // Chain Items
@@ -40,7 +38,6 @@ export const CHAIN_DEFAULT_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeee
 
 export const useAccountBalance = ({
   addressOrDenom,
-  assetSymbol,
   bech32AddrPrefix,
   chainId,
   decimals = 0,
@@ -91,7 +88,7 @@ export const useAccountBalance = ({
   });
 
   const { formatted: evmBalance } = evmQuery.data || {};
-  const balance = !assetSymbol ? '0' : isCosmosChain ? cosmosQuery.data : evmBalance;
+  const balance = isCosmosChain ? cosmosQuery.data : evmBalance;
 
   const nativeTokenCoinBalance = balances?.[chainTokenDenom];
   const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount);

src/icons/deposit.svg

@@ -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>

src/icons/index.ts

@@ -19,6 +19,7 @@ export { default as CoinsIcon } from './coins.svg';
 export { default as CommentIcon } from './comment.svg';
 export { default as CopyIcon } from './copy.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 DiscordIcon } from './discord.svg';
 export { default as ExportKeysIcon } from './export-keys.svg';
@@ -35,6 +36,7 @@ export { default as LockIcon } from './lock.svg';
 export { default as LogoShortIcon } from './logo-short';
 export { default as MarketsIcon } from './markets.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 OrderbookIcon } from './orderbook.svg';
 export { default as OverviewIcon } from './overview.svg';
@@ -58,6 +60,7 @@ export { default as TransferIcon } from './transfer.svg';
 export { default as TriangleIcon } from './triangle.svg';
 export { default as TryAgainIcon } from './try-again.svg';
 export { default as WarningIcon } from './warning.svg';
+export { default as WithdrawIcon } from './withdraw.svg';
 
 // Wallets
 export { default as BitkeepIcon } from './wallets/bitkeep.svg';

src/icons/withdraw.svg

@@ -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>

src/layout/Header/HeaderDesktop.tsx

@@ -62,7 +62,7 @@ export const HeaderDesktop = () => {
               value: 'DOCUMENTATION',
               slotBefore: <Icon iconName={IconName.Terminal} />,
               label: stringGetter({ key: STRING_KEYS.DOCUMENTATION }),
-              href: 'https://v4-teacher.vercel.app/',
+              href: 'https://docs.dydx.exchange/',
             },
             {
               value: 'MINTSCAN',

src/lib/orders.ts

@@ -107,8 +107,8 @@ export const getHydratedTradingData = ({
   perpetualMarkets?: Record<string, PerpetualMarket>;
 }) => ({
   ...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) }),
 });

src/lib/wagmi.ts

@@ -46,6 +46,8 @@ import {
   WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
 } from '@/constants/wallets';
 
+import { isTruthy } from './isTruthy';
+
 // Config
 
 export const WAGMI_SUPPORTED_CHAINS: Chain[] = [
@@ -78,13 +80,17 @@ export const WAGMI_SUPPORTED_CHAINS: Chain[] = [
   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 = {
   chains,
@@ -202,5 +208,7 @@ export const resolveWagmiConnector = ({
     ? createInjectedConnectorWithProvider(walletConnection.provider)
     : walletConnection.type === WalletConnectionType.WalletConnect2 && walletConfig.walletconnect2Id
     ? createWalletConnect2ConnectorWithId(walletConfig.walletconnect2Id, walletConnectConfig)
-    : getConnectors(walletConnectConfig).find(({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId);
+    : getConnectors(walletConnectConfig).find(
+        ({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId
+      );
 };

src/pages/Profile.tsx

@@ -17,7 +17,7 @@ import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
 import { AppRoute, PortfolioRoute, HistoryRoute } from '@/constants/routes';
 import { wallets, WalletType } from '@/constants/wallets';
-import { useAccounts, useStringGetter } from '@/hooks';
+import { useAccounts, useStringGetter, useTokenConfigs } from '@/hooks';
 
 import { getOnboardingState } from '@/state/accountSelectors';
 import { openDialog } from '@/state/dialogs';
@@ -37,6 +37,7 @@ const Profile = () => {
   const isConnected = onboardingState !== OnboardingState.Disconnected;
 
   const { evmAddress, dydxAddress, walletType } = useAccounts();
+  const { chainTokenLabel } = useTokenConfigs();
 
   const { data: ensName } = useEnsName({
     address: evmAddress,
@@ -137,7 +138,11 @@ const Profile = () => {
             layout="grid"
           />
         </Panel>
-        <Styled.RewardsPanel header={stringGetter({ key: STRING_KEYS.REWARDS })} hasSeparator>
+        <Styled.RewardsPanel
+          slotHeaderContent={stringGetter({ key: STRING_KEYS.REWARDS })}
+          href={`/${chainTokenLabel}`}
+          hasSeparator
+        >
           <Styled.Details
             items={[
               { key: 'maker', label: stringGetter({ key: STRING_KEYS.YOU_WILL_EARN }), value: '-' },
@@ -149,8 +154,8 @@ const Profile = () => {
       </Styled.EqualGrid>
 
       <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
       >
         <FillsTable
@@ -273,22 +278,21 @@ Styled.RewardsPanel = styled(Panel)`
 `;
 
 Styled.TablePanel = styled(Panel)`
-  padding: 0;
   max-width: calc(100vw - 2rem);
   max-height: 10rem;
+  margin-top: 0.5rem;
+  padding: 0;
+  border-radius: 0.875rem;
 
   table {
     --tableCell-padding: 0.25rem 1rem;
-
+    --tableRow-backgroundColor: var(--color-layer-3);
-    background-color: transparent;
+    background-color: var(--color-layer-3);
-
     thead {
       color: var(--color-text-0);
     }
 
     tbody {
-      background-color: transparent;
-
       tr {
         td:nth-child(2),
         td:nth-child(3) {

src/pages/rewards/DYDXBalancePanel.tsx

@@ -22,7 +22,6 @@ import { OnboardingTriggerButton } from '@/views/dialogs/OnboardingTriggerButton
 import { openDialog } from '@/state/dialogs';
 import { calculateCanAccountTrade } from '@/state/accountCalculators';
 
-// TODO(@aforaleka): replace with real data
 export const DYDXBalancePanel = () => {
   const dispatch = useDispatch();
   const stringGetter = useStringGetter();
@@ -110,7 +109,7 @@ export const DYDXBalancePanel = () => {
               value: (
                 <Output
                   type={OutputType.Asset}
-                  value={nativeTokenBalance + nativeStakingBalance}
+                  value={nativeTokenBalance.plus(nativeStakingBalance)}
                   tag={chainTokenLabel}
                 />
               ),
@@ -126,7 +125,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.Header = styled.div`
   ${layoutMixins.spacedRow}
-  padding: 1.25rem 1.5rem 0.5rem;
+  padding: 1rem 1.5rem 0;
 `;
 
 Styled.Title = styled.h3`
@@ -155,7 +154,6 @@ Styled.ReceiveButton = styled(Button)`
 Styled.Content = styled.div`
   ${layoutMixins.flexColumn}
   gap: 0.75rem;
-  padding: 0 0.5rem 0.5rem;
 `;
 
 Styled.IconContainer = styled.div`

src/pages/rewards/MigratePanel.tsx

@@ -0,0 +1,222 @@
+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.MobileMigratePanel
+      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.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.MobileMigratePanel>
+  );
+};
+
+const Styled: Record<string, AnyStyledComponent> = {};
+
+Styled.MigratePanel = styled(Panel)`
+  padding: 1rem 1.5rem;
+`;
+
+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.MobileMigratePanel = styled(Panel)`
+  ${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);
+`;

src/pages/rewards/RewardsPage.tsx

@@ -1,134 +1,49 @@
 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 { ButtonAction, ButtonSize, ButtonState, ButtonType } from '@/constants/buttons';
+import { ButtonAction, ButtonSize } from '@/constants/buttons';
 import { DialogTypes } from '@/constants/dialogs';
 
-import { useAccountBalance, useBreakpoints, useStringGetter } from '@/hooks';
+import { useBreakpoints, useStringGetter } from '@/hooks';
 
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
 
-import { Details } from '@/components/Details';
 import { Panel } from '@/components/Panel';
 import { IconName } from '@/components/Icon';
-import { Button } from '@/components/Button';
 import { IconButton } from '@/components/IconButton';
 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 { getSelectedNetwork } from '@/state/appSelectors';
 
 import { DYDXBalancePanel } from './DYDXBalancePanel';
+import { MigratePanel } from './MigratePanel';
 
-// TODO: replace placeholder URL with real URLs when avaialble
+// TODO: consolidate help link urls to env variables
 const GOVERNANCE_HELP_URL = 'https://help.dydx.exchange/';
-const STAKING_HELP_URL = 'https://help.dydx.exchange/';
+const STAKING_HELP_URL =
+  'https://docs.dydx.community/dydx-chain-documentation/staking/how-to-stake';
 
 export const RewardsPage = () => {
   const dispatch = useDispatch();
   const stringGetter = useStringGetter();
+
   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 (
     <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>
         {isTablet && (
           <Styled.BalancePanelContainer>
@@ -138,42 +53,28 @@ export const RewardsPage = () => {
 
         <Styled.Panel
           slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>}
+          slotRight={panelArrow}
           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={GOVERNANCE_HELP_URL} 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
           slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.STAKING })}</Styled.Title>}
+          slotRight={panelArrow}
           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={STAKING_HELP_URL} 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>
 
         {isNotTablet && (
@@ -191,61 +92,25 @@ const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Page = styled.div`
   ${layoutMixins.contentContainerPage}
   gap: 1.5rem;
-
-  @media ${breakpoints.tablet} {
-    padding: 1rem;
-  }
 `;
 
 Styled.Panel = styled(Panel)`
-  padding: 0 1.5rem 1rem;
+  padding: 1rem 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`
   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.spacedRow}
-
-  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;
   max-width: min(100vw, var(--content-max-width));
   align-items: flex-start;
@@ -269,65 +134,11 @@ Styled.BalancePanelContainer = styled.div`
   }
 `;
 
-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)`
   color: var(--color-text-0);
+  --color-border: var(--color-layer-6);
+`;
+
+Styled.Arrow = styled.div`
+  padding: 1rem 1.5rem;
 `;

src/views/dialogs/ExternalNavKeplrDialog.tsx

@@ -104,4 +104,5 @@ Styled.Button = styled(Button)`
 
 Styled.IconButton = styled(IconButton)`
   color: var(--color-text-0);
+  --color-border: var(--color-layer-6);
 `;

src/views/dialogs/OnboardingDialog/GenerateKeys.tsx

@@ -130,12 +130,14 @@ export const GenerateKeys = ({
           }
         }
       } catch (error) {
+        setStatus(EvmDerivedAccountStatus.NotDerived);
         const { message } = parseWalletError({ error, stringGetter });
 
         if (message) {
           track(AnalyticsEvent.OnboardingWalletIsNonDeterministic);
           setError(message);
         }
+        return;
       }
 
       await setWalletFromEvmSignature(signature);

src/views/forms/AccountManagementForms/DepositForm.tsx

@@ -87,7 +87,6 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
   // Async Data
   const { balance, queryStatus, isQueryFetching } = useAccountBalance({
     addressOrDenom: sourceToken?.address || CHAIN_DEFAULT_TOKEN_ADDRESS,
-    assetSymbol: sourceToken?.symbol || undefined,
     chainId: chainId,
     decimals: sourceToken?.decimals || undefined,
     isCosmosChain: false,

src/views/menus/AccountMenu.tsx

@@ -139,7 +139,7 @@ export const AccountMenu = () => {
                     fractionDigits={2}
                   />
                 </div>
-                <AssetActions asset={DydxChainAsset.USDC} dispatch={dispatch} />
+                <AssetActions asset={DydxChainAsset.USDC} dispatch={dispatch} withOnboarding />
               </div>
             </Styled.Balances>
           </Styled.AccountInfo>
@@ -212,28 +212,45 @@ export const AccountMenu = () => {
   );
 };
 
-const AssetActions = memo(({ asset, dispatch }: { asset: DydxChainAsset; dispatch: Dispatch }) => (
+const AssetActions = memo(
-  <Styled.InlineRow>
+  ({
-    {[
+    asset,
-      // TODO(@rosepuppy): Add withdraw action for USDC
+    dispatch,
-      {
+    withOnboarding,
-        dialogType: DialogTypes.Receive,
+  }: {
-        iconName: IconName.Qr,
+    asset: DydxChainAsset;
-      },
+    dispatch: Dispatch;
-      { dialogType: DialogTypes.Transfer, iconName: IconName.Send },
+    withOnboarding?: boolean;
-    ].map(({ iconName, dialogType }) => (
+  }) => (
-      <IconButton
+    <Styled.InlineRow>
-        key={dialogType}
+      {[
-        action={ButtonAction.Base}
+        withOnboarding && {
-        shape={ButtonShape.Square}
+          dialogType: DialogTypes.Withdraw,
-        iconName={iconName}
+          iconName: IconName.Withdraw,
-        onClick={() =>
+        },
-          dispatch(openDialog({ type: dialogType, dialogProps: { selectedAsset: asset } }))
+        withOnboarding && {
-        }
+          dialogType: DialogTypes.Deposit,
-      />
+          iconName: IconName.Deposit,
-    ))}
+        },
-  </Styled.InlineRow>
+        {
-));
+          dialogType: DialogTypes.Transfer,
+          dialogProps: { selectedAsset: asset },
+          iconName: IconName.Send,
+        },
+      ]
+        .filter(isTruthy)
+        .map(({ iconName, dialogType, dialogProps }) => (
+          <Styled.IconButton
+            key={dialogType}
+            action={ButtonAction.Base}
+            shape={ButtonShape.Square}
+            iconName={iconName}
+            onClick={() => dispatch(openDialog({ type: dialogType, dialogProps }))}
+          />
+        ))}
+    </Styled.InlineRow>
+  )
+);
 
 const Styled: Record<string, AnyStyledComponent> = {};
 
@@ -351,3 +368,7 @@ Styled.ConnectToChain = styled(Styled.Column)`
     font: var(--font-small-book);
   }
 `;
+
+Styled.IconButton = styled(IconButton)`
+  --button-padding: 0 0.25rem;
+`;

src/views/tables/FillsTable.tsx

@@ -161,7 +161,7 @@ const getFillsTableColumnDef = ({
                 }[orderSide],
               })}
             </Styled.Side>
-            <Output type={OutputType.Text} value={asset.id} />
+            <Output type={OutputType.Text} value={asset?.id} />
           </Styled.TableCell>
         ),
       },