Add link to help page

.env.example

@@ -6,5 +6,4 @@ VITE_PK_ENCRYPTION_KEY=
 
 VITE_WALLETCONNECT2_PROJECT_ID=
 
-VITE_V3_TOKEN_ADDRESS=
+VITE_V3_TOKEN_ADDRESS=
-VITE_TOKEN_MIGRATION_URI=

package.json

@@ -39,7 +39,7 @@
     "@cosmjs/proto-signing": "^0.31.0",
     "@cosmjs/stargate": "^0.31.0",
     "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^1.0.3",
+    "@dydxprotocol/v4-abacus": "^0.7.6",
     "@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: ^1.0.3
+    specifier: ^0.7.6
-    version: 1.0.3
+    version: 0.7.6
   '@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@1.0.3:
+  /@dydxprotocol/v4-abacus@0.7.6:
-    resolution: {integrity: sha512-GuX37/DMMNSke8ZFcw52II7IVJfUgVGHqoi1Uw2cUb+hgIjjSG3OtbyRWedm5r6nqWq8BNLOexI0VVFB6OMVYg==}
+    resolution: {integrity: sha512-FdDXRaFMfxhyrJJs0dNrb1KG6X95lPHelua1yCn/SVgzwGaAqlJczrzmdh98INntuRAgIxOu69R5mCGyekumyg==}
     dev: false
 
   /@dydxprotocol/v4-client-js@0.40.3:

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

@@ -8,43 +8,67 @@
                 ],
                 "components": [
                     {
-                        "/": "/"
+                        "/": "/trade/*"
                     },
                     {
-                        "/": "/#/"
+                        "/": "/r/*"
                     },
                     {
-                        "/": "*/markets"
+                        "/": "/portfolio/overview"
                     },
                     {
-                        "/": "*/trade"
+                        "/": "/portfolio/positions"
                     },
                     {
-                        "/": "*/trade/*"
+                        "/": "/portfolio/orders"
                     },
                     {
-                        "/": "*/portfolio"
+                        "/": "/portfolio/fees"
                     },
                     {
-                        "/": "*/portfolio/overview"
+                        "/": "/portfolio/history"
                     },
                     {
-                        "/": "*/portfolio/positions"
+                        "/": "/portfolio/history/trades"
                     },
                     {
-                        "/": "*/portfolio/orders"
+                        "/": "/portfolio/history/transfers"
                     },
                     {
-                        "/": "*/portfolio/fees"
+                        "/": "/portfolio/history/funding"
                     },
                     {
-                        "/": "*/portfolio/history/trades"
+                        "/": "/rewards"
                     },
                     {
-                        "/": "*/portfolio/history/transfers"
+                        "/": "/my-profile"
                     },
                     {
-                        "/": "*/portfolio/history/funding"
+                        "/": "/rankings/hedgies"
+                    },
+                    {
+                        "/": "/rankings/competition"
+                    },
+                    {
+                        "/": "/rankings/diamond"
+                    },
+                    {
+                        "/": "/rankings/platinum"
+                    },
+                    {
+                        "/": "/rankings/gold"
+                    },
+                    {
+                        "/": "/rankings/silver"
+                    },
+                    {
+                        "/": "/rankings/bronze"
+                    },
+                    {
+                        "/": "/rankings/pnl-absolute"
+                    },
+                    {
+                        "/": "/rankings/pnl-percent"
                     },
                     {
                         "/": "/walletsegue",

public/configs/env.json

@@ -25,8 +25,7 @@
             "dydxprotocol-testnet-dsrv",
             "dydxprotocol-testnet-nodefleet",
             "dydxprotocol-testnet-kingnodes",
-            "dydxprotocol-testnet-liquify",
+            "dydxprotocol-testnet-liquify"
-            "dydxprotocol-testnet-polkachu"
          ],
          "default": "dydxprotocol-testnet"
       }
@@ -308,7 +307,7 @@
             "tos": "https://dydx.exchange/v4-terms",
             "privacy": "https://dydx.exchange/privacy",
             "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://docs.dydx.exchange/",
+            "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",
@@ -372,7 +371,7 @@
             "tos": "https://dydx.exchange/v4-terms",
             "privacy": "https://dydx.exchange/privacy",
             "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://docs.dydx.exchange/",
+            "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",
@@ -427,7 +426,6 @@
                }
             ],
             "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"
@@ -439,7 +437,7 @@
             "tos": "https://dydx.exchange/v4-terms",
             "privacy": "https://dydx.exchange/privacy",
             "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://docs.dydx.exchange/",
+            "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"
@@ -503,7 +501,7 @@
             "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/",
+            "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"
@@ -567,7 +565,7 @@
             "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/",
+            "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"
@@ -631,7 +629,7 @@
             "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/",
+            "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"
@@ -695,7 +693,7 @@
             "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/",
+            "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"
@@ -754,70 +752,6 @@
             "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",

src/components/Icon.tsx

@@ -24,10 +24,9 @@ import {
   CommentIcon,
   CopyIcon,
   CubeIcon,
-  DepositIcon,
-  DepthChartIcon,
   DiscordIcon,
   EtherscanIcon,
+  DepthChartIcon,
   ExportKeysIcon,
   FeedbackIcon,
   FileIcon,
@@ -41,7 +40,6 @@ import {
   LockIcon,
   LogoShortIcon,
   MenuIcon,
-  MigrateIcon,
   MintscanIcon,
   OrderbookIcon,
   OrderCanceledIcon,
@@ -70,7 +68,6 @@ import {
   WarningIcon,
   WebsiteIcon,
   WhitepaperIcon,
-  WithdrawIcon,
 } from '@/icons';
 
 export enum IconName {
@@ -95,7 +92,6 @@ export enum IconName {
   Comment = 'Comment',
   Copy = 'Copy',
   Cube = 'Cube',
-  Deposit = 'Deposit',
   DepthChart = 'DepthChart',
   Discord = 'Discord',
   Etherscan = 'Etherscan',
@@ -112,7 +108,6 @@ export enum IconName {
   Lock = 'Lock',
   LogoShort = 'LogoShort',
   Menu = 'Menu',
-  Migrate = 'Migrate',
   Mintscan = 'Mintscan',
   Onboarding = 'Onboarding',
   Orderbook = 'OrderbookIcon',
@@ -142,7 +137,6 @@ export enum IconName {
   Warning = 'Warning',
   Website = 'Website',
   Whitepaper = 'Whitepaper',
-  Withdraw = 'Withdraw',
 }
 
 const icons = {
@@ -167,7 +161,6 @@ const icons = {
   [IconName.Comment]: CommentIcon,
   [IconName.Copy]: CopyIcon,
   [IconName.Cube]: CubeIcon,
-  [IconName.Deposit]: DepositIcon,
   [IconName.DepthChart]: DepthChartIcon,
   [IconName.Discord]: DiscordIcon,
   [IconName.Etherscan]: EtherscanIcon,
@@ -184,7 +177,6 @@ const icons = {
   [IconName.Lock]: LockIcon,
   [IconName.LogoShort]: LogoShortIcon,
   [IconName.Menu]: MenuIcon,
-  [IconName.Migrate]: MigrateIcon,
   [IconName.Mintscan]: MintscanIcon,
   [IconName.Orderbook]: OrderbookIcon,
   [IconName.OrderCanceled]: OrderCanceledIcon,
@@ -213,7 +205,6 @@ 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,7 +8,6 @@ import { layoutMixins } from '@/styles/layoutMixins';
 type PanelProps = {
   slotHeaderContent?: string;
   slotHeader?: React.ReactNode;
-  slotRight?: React.ReactNode;
   children?: React.ReactNode;
   href?: string;
   onHeaderClick?: () => void;
@@ -23,7 +22,6 @@ type PanelStyleProps = {
 export const Panel = ({
   slotHeaderContent,
   slotHeader,
-  slotRight,
   children,
   href,
   onHeaderClick,
@@ -32,61 +30,55 @@ export const Panel = ({
   className,
 }: PanelProps & PanelStyleProps) => (
   <Styled.Panel onClick={onClick}>
-    <Styled.Left>
+    {href ? (
-      {href ? (
+      <Link to={href}>
-        <Link to={href}>
+        {slotHeader ? (
-          {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>
-      <Styled.Content className={className}>{children}</Styled.Content>
+    ) : slotHeader ? (
-    </Styled.Left>
+      slotHeader
-    {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.row}
+  ${layoutMixins.flexColumn}
 
   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;
 `;
 
@@ -94,5 +86,6 @@ Styled.Content = styled.div`
   ${layoutMixins.scrollArea}
   ${layoutMixins.stickyArea0}
   --stickyArea0-background: transparent;
-  padding: 1rem 1rem;
+
+  padding: 0.5rem 1rem;
 `;

src/icons/deposit.svg

@@ -1,11 +0,0 @@
-<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,7 +19,6 @@ 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';
@@ -36,7 +35,6 @@ 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';
@@ -60,7 +58,6 @@ 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

@@ -1,4 +0,0 @@
-<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://docs.dydx.exchange/',
+              href: 'https://v4-teacher.vercel.app/',
             },
             {
               value: 'MINTSCAN',

src/lib/wagmi.ts

@@ -46,8 +46,6 @@ import {
   WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
 } from '@/constants/wallets';
 
-import { isTruthy } from './isTruthy';
-
 // Config
 
 export const WAGMI_SUPPORTED_CHAINS: Chain[] = [
@@ -80,17 +78,13 @@ export const WAGMI_SUPPORTED_CHAINS: Chain[] = [
   celoAlfajores,
 ];
 
-const { chains, publicClient, webSocketPublicClient } = configureChains(
+const { chains, publicClient, webSocketPublicClient } = configureChains(WAGMI_SUPPORTED_CHAINS, [
-  WAGMI_SUPPORTED_CHAINS,
+  // alchemyProvider({ apiKey: import.meta.env.VITE_ALCHEMY_API_KEY }),
-  [
+  jsonRpcProvider({
-    import.meta.env.VITE_ALCHEMY_API_KEY &&
+    rpc: (chain) => ({ http: chain.rpcUrls.default.http[0] }),
-      alchemyProvider({ apiKey: import.meta.env.VITE_ALCHEMY_API_KEY }),
+  }),
-    jsonRpcProvider({
+  publicProvider(),
-      rpc: (chain) => ({ http: chain.rpcUrls.default.http[0] }),
+]);
-    }),
-    publicProvider(),
-  ].filter(isTruthy)
-);
 
 const injectedConnectorOptions = {
   chains,
@@ -208,7 +202,5 @@ export const resolveWagmiConnector = ({
     ? createInjectedConnectorWithProvider(walletConnection.provider)
     : walletConnection.type === WalletConnectionType.WalletConnect2 && walletConfig.walletconnect2Id
     ? createWalletConnect2ConnectorWithId(walletConfig.walletconnect2Id, walletConnectConfig)
-    : getConnectors(walletConnectConfig).find(
+    : getConnectors(walletConnectConfig).find(({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId);
-        ({ 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, useTokenConfigs } from '@/hooks';
+import { useAccounts, useStringGetter } from '@/hooks';
 
 import { getOnboardingState } from '@/state/accountSelectors';
 import { openDialog } from '@/state/dialogs';
@@ -37,7 +37,6 @@ const Profile = () => {
   const isConnected = onboardingState !== OnboardingState.Disconnected;
 
   const { evmAddress, dydxAddress, walletType } = useAccounts();
-  const { chainTokenLabel } = useTokenConfigs();
 
   const { data: ensName } = useEnsName({
     address: evmAddress,
@@ -138,11 +137,7 @@ const Profile = () => {
             layout="grid"
           />
         </Panel>
-        <Styled.RewardsPanel
+        <Styled.RewardsPanel header={stringGetter({ key: STRING_KEYS.REWARDS })} hasSeparator>
-          slotHeaderContent={stringGetter({ key: STRING_KEYS.REWARDS })}
-          href={`/${chainTokenLabel}`}
-          hasSeparator
-        >
           <Styled.Details
             items={[
               { key: 'maker', label: stringGetter({ key: STRING_KEYS.YOU_WILL_EARN }), value: '-' },
@@ -154,8 +149,8 @@ const Profile = () => {
       </Styled.EqualGrid>
 
       <Styled.TablePanel
-        slotHeaderContent={stringGetter({ key: STRING_KEYS.HISTORY })}
+        header={stringGetter({ key: STRING_KEYS.HISTORY })}
-        href={`${AppRoute.Portfolio}/${PortfolioRoute.History}/${HistoryRoute.Trades}`}
+        linkto={`${AppRoute.Portfolio}/${PortfolioRoute.History}/${HistoryRoute.Trades}`}
         hasSeparator
       >
         <FillsTable
@@ -278,21 +273,22 @@ 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: var(--color-layer-3);
+    background-color: transparent;
+
     thead {
       color: var(--color-text-0);
     }
 
     tbody {
+      background-color: transparent;
+
       tr {
         td:nth-child(2),
         td:nth-child(3) {

src/pages/rewards/MigratePanel.tsx

@@ -1,222 +0,0 @@
-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,49 +1,134 @@
 import styled, { AnyStyledComponent } from 'styled-components';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 
+import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
 import { STRING_KEYS } from '@/constants/localization';
-import { ButtonAction, ButtonSize } from '@/constants/buttons';
+import { ButtonAction, ButtonSize, ButtonState, ButtonType } from '@/constants/buttons';
 import { DialogTypes } from '@/constants/dialogs';
 
-import { useBreakpoints, useStringGetter } from '@/hooks';
+import { useAccountBalance, 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: consolidate help link urls to env variables
+// TODO: replace placeholder URL with real URLs when avaialble
 const GOVERNANCE_HELP_URL = 'https://help.dydx.exchange/';
-const STAKING_HELP_URL =
+const STAKING_HELP_URL = 'https://help.dydx.exchange/';
-  '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 panelArrow = (
+  const selectedNetwork = useSelector(getSelectedNetwork);
-    <Styled.Arrow>
+
-      <Styled.IconButton
+  // const chainId = Number(ENVIRONMENT_CONFIG_MAP[selectedNetwork].ethereumChainId);
-        action={ButtonAction.Base}
+
-        iconName={IconName.Arrow}
+  // const { balance } = useAccountBalance({
-        size={ButtonSize.Small}
+  //   addressOrDenom: import.meta.env.VITE_V3_TOKEN_ADDRESS,
-      />
+  //   assetSymbol: 'DYDX',
-    </Styled.Arrow>
+  //   chainId,
-  );
+  //   isCosmosChain: false,
+  // });
+
+  // const tokenBalance = import.meta.env.VITE_V3_TOKEN_ADDRESS ? balance : 0;
 
   return (
     <Styled.Page>
-      {import.meta.env.VITE_V3_TOKEN_ADDRESS && <MigratePanel />}
+      {/* {isNotTablet ? (
+        <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>
@@ -53,28 +138,42 @@ export const RewardsPage = () => {
 
         <Styled.Panel
           slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>}
-          slotRight={panelArrow}
           onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
         >
-          <Styled.Description>
+          <Styled.Row>
-            {stringGetter({ key: STRING_KEYS.GOVERNANCE_DESCRIPTION })}
+            <Styled.Description>
-            <Link href={GOVERNANCE_HELP_URL} onClick={(e) => e.stopPropagation()}>
+              {stringGetter({ key: STRING_KEYS.GOVERNANCE_DESCRIPTION })}
-              {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
+              <Link href={GOVERNANCE_HELP_URL} onClick={(e) => e.stopPropagation()}>
-            </Link>
+                {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-          </Styled.Description>
+              </Link>
+            </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.Description>
+          <Styled.Row>
-            {stringGetter({ key: STRING_KEYS.STAKING_DESCRIPTION })}
+            <Styled.Description>
-            <Link href={STAKING_HELP_URL} onClick={(e) => e.stopPropagation()}>
+              {stringGetter({ key: STRING_KEYS.STAKING_DESCRIPTION })}
-              {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
+              <Link href={STAKING_HELP_URL} onClick={(e) => e.stopPropagation()}>
-            </Link>
+                {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-          </Styled.Description>
+              </Link>
+            </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 && (
@@ -92,25 +191,61 @@ const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Page = styled.div`
   ${layoutMixins.contentContainerPage}
   gap: 1.5rem;
+
+  @media ${breakpoints.tablet} {
+    padding: 1rem;
+  }
 `;
 
 Styled.Panel = styled(Panel)`
-  padding: 1rem 1.5rem;
+  padding: 0 1.5rem 1rem;
+
+  @media ${breakpoints.tablet} {
+    max-width: calc(100vw - 2rem);
+  }
 `;
 
-Styled.Title = styled.h3`
+Styled.Row = styled.div`
-  font: var(--font-medium-book);
+  ${layoutMixins.spacedRow}
-  color: var(--color-text-2);
+  gap: 1rem;
-  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.PanelRow = styled.div`
+Styled.Migrate = styled.section`
-  ${layoutMixins.spacedRow}
+  max-width: min(100vw, var(--content-max-width));
+
+  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;
@@ -134,11 +269,65 @@ Styled.BalancePanelContainer = styled.div`
   }
 `;
 
-Styled.IconButton = styled(IconButton)`
+Styled.Title = styled.h3`
-  color: var(--color-text-0);
+  ${layoutMixins.inlineRow}
-  --color-border: var(--color-layer-6);
+  padding: 1.25rem 1.5rem 0.5rem;
+
+  font: var(--font-medium-book);
+  color: var(--color-text-2);
 `;
 
-Styled.Arrow = styled.div`
+Styled.MigrateTitle = styled(Styled.Title)`
-  padding: 1rem 1.5rem;
+  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);
 `;

src/views/dialogs/ExternalNavKeplrDialog.tsx

@@ -104,5 +104,4 @@ 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,14 +130,12 @@ 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/menus/AccountMenu.tsx

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