Do not get token balance on withdraw

* Use abacus for simulate transactions and balance polling

* address comment

* use dydx gas token

* address nits

.env

@@ -2,17 +2,5 @@ VITE_BASE_URL=https://v4.testnet.dydx.exchange
 
 VITE_ALCHEMY_API_KEY=FP275q327Yh7qswtZWenbPXdZZdnAFmC
 
-VITE_FAUCET_URL_DEV=https://faucet.v4dev.dydx.exchange/
-VITE_FAUCET_URL_STAGE=https://faucet.v4staging.dydx.exchange/
-VITE_FAUCET_URL_TESTNET2=https://faucet.v4testnet2.dydx.exchange/
-
-VITE_VALIDATOR_URL_DEV=http://52.192.187.113:26657/
-VITE_VALIDATOR_URL_STAGE=https://validator.v4staging.dydx.exchange/
-VITE_VALIDATOR_URL_TESTNET2=https://validator.v4testnet2.dydx.exchange/
-
-VITE_INDEXER_URL_DEV=http://dev-indexer-apne1-lb-public-890774175.ap-northeast-1.elb.amazonaws.com
-VITE_INDEXER_URL_STAGE=https://indexer.v4staging.dydx.exchange
-VITE_INDEXER_URL_TESTNET2=https://indexer.v4testnet2.dydx.exchange
-
 VITE_WALLETCONNECT1_BRIDGE=wss://api.dydx.exchange/wc/
 VITE_WALLETCONNECT2_PROJECT_ID=fbe94eaa691fa8d929561f8567062b32

.env.example

@@ -1,17 +1,8 @@
 VITE_BASE_URL=
 
 VITE_ALCHEMY_API_KEY=
+
 VITE_PK_ENCRYPTION_KEY=
+
+VITE_WALLETCONNECT1_BRIDGE=
 VITE_WALLETCONNECT2_PROJECT_ID=
-
-VITE_FAUCET_URL_DEV=
-VITE_FAUCET_URL_STAGE=
-VITE_FAUCET_URL_TESTNET2=
-
-VITE_VALIDATOR_URL_DEV=
-VITE_VALIDATOR_URL_STAGE=
-VITE_VALIDATOR_URL_TESTNET2=
-
-VITE_INDEXER_URL_DEV=
-VITE_INDEXER_URL_STAGE=
-VITE_INDEXER_URL_TESTNET2=

.eslintignore

@@ -5,15 +5,10 @@ vite.config.ts
 
 # Temporarily ignore, we will slowly remove each directory as we fix files to follow ESLint rules
 /src/components
-/src/dialogs
 /src/forms
 /src/hooks
-/src/history.ts
-/src/icons
 /src/lib
 /src/main.tsx
 /src/menus
 /src/pages
-/src/state
-/src/styles
 /src/views

.eslintrc.json

@@ -33,14 +33,11 @@
     "jsx-a11y/anchor-is-valid": "off",
     "jsx-a11y/click-events-have-key-events": "off",
     "no-continue": "off",
-    "no-console": [
+    "no-console": ["error"],
-      "error",
-      {
-        "devDependencies": ["./scripts/*.js"]
-      }
-    ],
     "no-lonely-if": "off",
+    "no-multi-assign": "off",
     "no-nested-ternary": "off",
+    "no-param-reassign": ["error", { "props": false }],
     "no-return-assign": "off",
     "no-return-await": "off",
     "no-underscore-dangle": "off",
@@ -65,6 +62,7 @@
     "react/sort-comp": "off",
     "@typescript-eslint/no-use-before-define": "off",
     "@typescript-eslint/comma-dangle": "off",
+    "@typescript-eslint/no-unused-vars": "error",
     "@typescript-eslint/member-delimiter-style": [
       "error",
       {

README.md

@@ -1,4 +1,12 @@
-# v4 Web App
+<p align="center"><img src="https://dydx.exchange/icon.svg?" width="256" /></p>
+
+<h1 align="center">v4 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' />
+  </a>
+</div>
 
 ## Prerequisites
 
@@ -102,47 +110,3 @@ To access your content on IPFS:
 2. **Public IPFS gateway:** Access your content via a public IPFS gateway, such as [https://dweb.link](https://dweb.link/) or [https://w3s.link/](https://w3s.link/). Use the gateway URL with your CID appended, like `https://dweb.link/ipfs/your_cid`.
 
 Replace `your_cid` with the actual CID.
-
-
-## Part 5: Customization
-
-### Using CircularXX font
-
-1. **Procure a license for CircularXX:** Visit [Lineto](https://lineto.com/shop/select?family=circular&set=DOPhtVQR-8m) and add `Circular/Family Package` + `Circular Mono/Regular` to your cart. Check the applicable boxes in the `Configure` step to fill out licensing information. After the `Payment` step, download the `.woff2` files.
-
-2. **Add the fonts to `v4-web`:** Add `CircularXXWeb-Bold.woff2`, `CircularXXWeb-Book.woff2`, `CircularXXWeb-Medium.woff2`, and `CircularXXMonoWeb-Regular.woff2` to the `src/styles/fonts` directory.
-
-3. **Add font-family to stylesheets:** In `src/styles/fonts.css`, add the following code to import your newly purchased `Circular` font.
-```css
-  @font-face {
-    src: url("fonts/CircularXXWeb-Book.woff2") format("woff2");
-    font-family: "Circular";
-    font-weight: 450;
-  }
-
-  @font-face {
-    src: url("fonts/CircularXXWeb-Medium.woff2") format("woff2");
-    font-family: "Circular";
-    font-weight: 500;
-  }
-
-  @font-face {
-    src: url("fonts/CircularXXWeb-Bold.woff2") format("woff2");
-    font-family: "Circular";
-    font-weight: 700;
-  }
-
-  @font-face {
-    src: url("fonts/CircularXXMonoWeb-Regular.woff2") format("woff2");
-    font-family: "CircularMono";
-    font-weight: 400;
-  }
-```
-
-In `src/styles/text.css`, update lines `4` and `5` to
-```css
-  --fontFamily-base: "Circular", "Satoshi", system-ui, -apple-system, Helvetica, Arial, sans-serif;
-  --fontFamily-monospace: "CircularMono", Courier, monospace, var(--fontFamily-base);
-```
-
-Enjoy the newly installed font.

package.json

@@ -37,9 +37,9 @@
     "@cosmjs/proto-signing": "^0.31.0",
     "@cosmjs/stargate": "^0.31.0",
     "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/abacus": "^0.4.16",
+    "@dydxprotocol/v4-abacus": "^0.5.4",
-    "@dydxprotocol/v4-client-js": "^0.32.0",
+    "@dydxprotocol/v4-client-js": "^0.36.1",
-    "@dydxprotocol/v4-localization": "^0.0.25",
+    "@dydxprotocol/v4-localization": "^0.1.11",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@radix-ui/react-collapsible": "^1.0.3",

pnpm-lock.yaml

@@ -26,15 +26,15 @@ dependencies:
   '@cosmjs/tendermint-rpc':
     specifier: ^0.31.0
     version: 0.31.0
-  '@dydxprotocol/abacus':
+  '@dydxprotocol/v4-abacus':
-    specifier: ^0.4.16
+    specifier: ^0.5.4
-    version: 0.4.16
+    version: 0.5.4
   '@dydxprotocol/v4-client-js':
-    specifier: ^0.32.0
+    specifier: ^0.36.1
-    version: 0.32.0
+    version: 0.36.1
   '@dydxprotocol/v4-localization':
-    specifier: ^0.0.25
+    specifier: ^0.1.11
-    version: 0.0.25
+    version: 0.1.11
   '@ethersproject/providers':
     specifier: ^5.7.2
     version: 5.7.2
@@ -614,74 +614,6 @@ packages:
       '@babel/helper-validator-identifier': 7.22.5
       to-fast-properties: 2.0.0
 
-  /@bufbuild/buf-darwin-arm64@1.19.0-1:
-    resolution: {integrity: sha512-HsWPii21wm3QSyuxrNq9+Yf8iAgpnC4rNCy4x3d6P1fd/LmgE1NPzQW0ghEZvl9dgAQKkL/4S5bKhlm7kbUdmQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@bufbuild/buf-darwin-x64@1.19.0-1:
-    resolution: {integrity: sha512-2+Ig7ylYpVh4kms/OeJJVY+X0KX4awPA6hYr7L7aZOIcHwZEM8lWtSTO/se5pQc7dc8FXNiC4YUqHC8yfxxX6Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@bufbuild/buf-linux-aarch64@1.19.0-1:
-    resolution: {integrity: sha512-g/Vxg3WiBr3nhsxsRr2Q81xXJD+0ktHIO3ZJggTG2Sbbl3dh8kyg1iKM6MjJiMP7su5RKCylLigzoEJzVTShyA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@bufbuild/buf-linux-x64@1.19.0-1:
-    resolution: {integrity: sha512-anYuGx8k/2kp8GPX3eHNUf3IY/01Zpnyw0HaLPXK1Btqyy6XkapVywrDqg7YUzMd1ySFEp1wD9UqRNdEFNCQ4A==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@bufbuild/buf-win32-arm64@1.19.0-1:
-    resolution: {integrity: sha512-xXgF1qYnCfRKbGx1FqvPbpZ6ajh4ddxpXhSxI3VCeb3MsMBuIbiLqX4fQAL3ls/Zwz8tVIITuSwOhYmSEGcpBA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@bufbuild/buf-win32-x64@1.19.0-1:
-    resolution: {integrity: sha512-futmqgpMQCR1lcAzZJEGjPr7ECw1gYTPIV8crm5SY+iCJ7sOeStOBNt7q5hV4LKmmeWmvm03XIMZPjhQzjH5NQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@bufbuild/buf@1.19.0-1:
-    resolution: {integrity: sha512-TIsLTTQUntr/Xq/IMSULv3dlC3/ZsVwQtWgxmJ++IzSuOW79TFQfq59vFeTWrPa6+QXFMz5t6jkMyD4ghzO5nw==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@bufbuild/buf-darwin-arm64': 1.19.0-1
-      '@bufbuild/buf-darwin-x64': 1.19.0-1
-      '@bufbuild/buf-linux-aarch64': 1.19.0-1
-      '@bufbuild/buf-linux-x64': 1.19.0-1
-      '@bufbuild/buf-win32-arm64': 1.19.0-1
-      '@bufbuild/buf-win32-x64': 1.19.0-1
-    dev: false
-
   /@coinbase/wallet-sdk@3.7.1:
     resolution: {integrity: sha512-LjyoDCB+7p0waQXfK+fUgcAs3Ezk6S6e+LYaoFjpJ6c9VTop3NyZF40Pi7df4z7QJohCwzuIDjz0Rhtig6Y7Pg==}
     engines: {node: '>= 10.0.0'}
@@ -726,15 +658,6 @@ packages:
       '@cosmjs/utils': 0.27.1
     dev: false
 
-  /@cosmjs/amino@0.29.3:
-    resolution: {integrity: sha512-BFz1++ERerIggiFc7iGHhGe1CeV3rCv8BvkoBQTBN/ZwzHOaKvqQj8smDlRGlQxX3HWlTwgiLN2A+OB5yX4ZRw==}
-    dependencies:
-      '@cosmjs/crypto': 0.29.5
-      '@cosmjs/encoding': 0.29.5
-      '@cosmjs/math': 0.29.5
-      '@cosmjs/utils': 0.29.5
-    dev: false
-
   /@cosmjs/amino@0.30.1:
     resolution: {integrity: sha512-yNHnzmvAlkETDYIpeCTdVqgvrdt1qgkOXwuRVi8s27UKI5hfqyE9fJ/fuunXE6ZZPnKkjIecDznmuUOMrMvw4w==}
     dependencies:
@@ -788,18 +711,6 @@ packages:
       sha.js: 2.4.11
     dev: false
 
-  /@cosmjs/crypto@0.29.5:
-    resolution: {integrity: sha512-2bKkaLGictaNL0UipQCL6C1afaisv6k8Wr/GCLx9FqiyFkh9ZgRHDyetD64ZsjnWV/N/D44s/esI+k6oPREaiQ==}
-    dependencies:
-      '@cosmjs/encoding': 0.29.5
-      '@cosmjs/math': 0.29.5
-      '@cosmjs/utils': 0.29.5
-      '@noble/hashes': 1.3.1
-      bn.js: 5.2.1
-      elliptic: 6.5.4
-      libsodium-wrappers: 0.7.11
-    dev: false
-
   /@cosmjs/crypto@0.30.1:
     resolution: {integrity: sha512-rAljUlake3MSXs9xAm87mu34GfBLN0h/1uPPV6jEwClWjNkAMotzjC0ab9MARy5FFAvYHL3lWb57bhkbt2GtzQ==}
     dependencies:
@@ -832,14 +743,6 @@ packages:
       readonly-date: 1.0.0
     dev: false
 
-  /@cosmjs/encoding@0.29.5:
-    resolution: {integrity: sha512-G4rGl/Jg4dMCw5u6PEZHZcoHnUBlukZODHbm/wcL4Uu91fkn5jVo5cXXZcvs4VCkArVGrEj/52eUgTZCmOBGWQ==}
-    dependencies:
-      base64-js: 1.5.1
-      bech32: 1.1.4
-      readonly-date: 1.0.0
-    dev: false
-
   /@cosmjs/encoding@0.30.1:
     resolution: {integrity: sha512-rXmrTbgqwihORwJ3xYhIgQFfMSrwLu1s43RIK9I8EBudPx3KmnmyAKzMOVsRDo9edLFNuZ9GIvysUCwQfq3WlQ==}
     dependencies:
@@ -856,11 +759,12 @@ packages:
       readonly-date: 1.0.0
     dev: false
 
-  /@cosmjs/json-rpc@0.29.5:
+  /@cosmjs/encoding@0.31.1:
-    resolution: {integrity: sha512-C78+X06l+r9xwdM1yFWIpGl03LhB9NdM1xvZpQHwgCOl0Ir/WV8pw48y3Ez2awAoUBRfTeejPe4KvrE6NoIi/w==}
+    resolution: {integrity: sha512-IuxP6ewwX6vg9sUJ8ocJD92pkerI4lyG8J5ynAM3NaX3q+n+uMoPRSQXNeL9bnlrv01FF1kIm8if/f5F7ZPtkA==}
     dependencies:
-      '@cosmjs/stream': 0.29.5
+      base64-js: 1.5.1
-      xstream: 11.14.0
+      bech32: 1.1.4
+      readonly-date: 1.0.0
     dev: false
 
   /@cosmjs/json-rpc@0.30.1:
@@ -897,12 +801,6 @@ packages:
       bn.js: 5.2.1
     dev: false
 
-  /@cosmjs/math@0.29.5:
-    resolution: {integrity: sha512-2GjKcv+A9f86MAWYLUkjhw1/WpRl2R1BTb3m9qPG7lzMA7ioYff9jY5SPCfafKdxM4TIQGxXQlYGewQL16O68Q==}
-    dependencies:
-      bn.js: 5.2.1
-    dev: false
-
   /@cosmjs/math@0.30.1:
     resolution: {integrity: sha512-yaoeI23pin9ZiPHIisa6qqLngfnBR/25tSaWpkTm8Cy10MX70UF5oN4+/t1heLaM6SSmRrhk3psRkV4+7mH51Q==}
     dependencies:
@@ -915,16 +813,10 @@ packages:
       bn.js: 5.2.1
     dev: false
 
-  /@cosmjs/proto-signing@0.29.3:
+  /@cosmjs/math@0.31.1:
-    resolution: {integrity: sha512-Ai3l9THjMOrLJ4Ebn1Dgptwg6W5ZIRJqtnJjijHhGwTVC1WT0WdYU3aMZ7+PwubcA/cA1rH4ZTK7jrfYbra63g==}
+    resolution: {integrity: sha512-kiuHV6m6DSB8/4UV1qpFhlc4ul8SgLXTGRlYkYiIIP4l0YNeJ+OpPYaOlEgx4Unk2mW3/O2FWYj7Jc93+BWXng==}
     dependencies:
-      '@cosmjs/amino': 0.29.3
+      bn.js: 5.2.1
-      '@cosmjs/crypto': 0.29.5
-      '@cosmjs/encoding': 0.29.5
-      '@cosmjs/math': 0.29.5
-      '@cosmjs/utils': 0.29.5
-      cosmjs-types: 0.5.2
-      long: 4.0.0
     dev: false
 
   /@cosmjs/proto-signing@0.30.1:
@@ -951,18 +843,6 @@ packages:
       long: 4.0.0
     dev: false
 
-  /@cosmjs/socket@0.29.5:
-    resolution: {integrity: sha512-5VYDupIWbIXq3ftPV1LkS5Ya/T7Ol/AzWVhNxZ79hPe/mBfv1bGau/LqIYOm2zxGlgm9hBHOTmWGqNYDwr9LNQ==}
-    dependencies:
-      '@cosmjs/stream': 0.29.5
-      isomorphic-ws: 4.0.1(ws@7.5.9)
-      ws: 7.5.9
-      xstream: 11.14.0
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-    dev: false
-
   /@cosmjs/socket@0.30.1:
     resolution: {integrity: sha512-r6MpDL+9N+qOS/D5VaxnPaMJ3flwQ36G+vPvYJsXArj93BjgyFB7BwWwXCQDzZ+23cfChPUfhbINOenr8N2Kow==}
     dependencies:
@@ -987,27 +867,6 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@cosmjs/stargate@0.29.3:
-    resolution: {integrity: sha512-455TgXStCi6E8KDjnhDAM8wt6aLSjobH4Dixvd7Up1DfCH6UB9NkC/G0fMJANNcNXMaM4wSX14niTXwD1d31BA==}
-    dependencies:
-      '@confio/ics23': 0.6.8
-      '@cosmjs/amino': 0.29.3
-      '@cosmjs/encoding': 0.29.5
-      '@cosmjs/math': 0.29.5
-      '@cosmjs/proto-signing': 0.29.3
-      '@cosmjs/stream': 0.29.5
-      '@cosmjs/tendermint-rpc': 0.29.5
-      '@cosmjs/utils': 0.29.5
-      cosmjs-types: 0.5.2
-      long: 4.0.0
-      protobufjs: 6.11.4
-      xstream: 11.14.0
-    transitivePeerDependencies:
-      - bufferutil
-      - debug
-      - utf-8-validate
-    dev: false
-
   /@cosmjs/stargate@0.30.1:
     resolution: {integrity: sha512-RdbYKZCGOH8gWebO7r6WvNnQMxHrNXInY/gPHPzMjbQF6UatA6fNM2G2tdgS5j5u7FTqlCI10stNXrknaNdzog==}
     dependencies:
@@ -1050,12 +909,6 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@cosmjs/stream@0.29.5:
-    resolution: {integrity: sha512-TToTDWyH1p05GBtF0Y8jFw2C+4783ueDCmDyxOMM6EU82IqpmIbfwcdMOCAm0JhnyMh+ocdebbFvnX/sGKzRAA==}
-    dependencies:
-      xstream: 11.14.0
-    dev: false
-
   /@cosmjs/stream@0.30.1:
     resolution: {integrity: sha512-Fg0pWz1zXQdoxQZpdHRMGvUH5RqS6tPv+j9Eh7Q953UjMlrwZVo0YFLC8OTf/HKVf10E4i0u6aM8D69Q6cNkgQ==}
     dependencies:
@@ -1068,25 +921,6 @@ packages:
       xstream: 11.14.0
     dev: false
 
-  /@cosmjs/tendermint-rpc@0.29.5:
-    resolution: {integrity: sha512-ar80twieuAxsy0x2za/aO3kBr2DFPAXDmk2ikDbmkda+qqfXgl35l9CVAAjKRqd9d+cRvbQyb5M4wy6XQpEV6w==}
-    dependencies:
-      '@cosmjs/crypto': 0.29.5
-      '@cosmjs/encoding': 0.29.5
-      '@cosmjs/json-rpc': 0.29.5
-      '@cosmjs/math': 0.29.5
-      '@cosmjs/socket': 0.29.5
-      '@cosmjs/stream': 0.29.5
-      '@cosmjs/utils': 0.29.5
-      axios: 0.21.4
-      readonly-date: 1.0.0
-      xstream: 11.14.0
-    transitivePeerDependencies:
-      - bufferutil
-      - debug
-      - utf-8-validate
-    dev: false
-
   /@cosmjs/tendermint-rpc@0.30.1:
     resolution: {integrity: sha512-Z3nCwhXSbPZJ++v85zHObeUggrEHVfm1u18ZRwXxFE9ZMl5mXTybnwYhczuYOl7KRskgwlB+rID0WYACxj4wdQ==}
     dependencies:
@@ -1129,10 +963,6 @@ packages:
     resolution: {integrity: sha512-VG7QPDiMUzVPxRdJahDV8PXxVdnuAHiIuG56hldV4yPnOz/si/DLNd7VAUUA5923b6jS1Hhev0Hr6AhEkcxBMg==}
     dev: false
 
-  /@cosmjs/utils@0.29.5:
-    resolution: {integrity: sha512-m7h+RXDUxOzEOGt4P+3OVPX7PuakZT3GBmaM/Y2u+abN3xZkziykD/NvedYFvvCCdQo714XcGl33bwifS9FZPQ==}
-    dev: false
-
   /@cosmjs/utils@0.30.1:
     resolution: {integrity: sha512-KvvX58MGMWh7xA+N+deCfunkA/ZNDvFLw4YbOmX3f/XBIkqrVY7qlotfy2aNb1kgp6h4B6Yc8YawJPDTfvWX7g==}
     dev: false
@@ -1141,39 +971,29 @@ packages:
     resolution: {integrity: sha512-nNcycZWUYLNJlrIXgpcgVRqdl6BXjF4YlXdxobQWpW9Tikk61bEGeAFhDYtC0PwHlokCNw0KxWiHGJL4nL7Q5A==}
     dev: false
 
+  /@cosmjs/utils@0.31.1:
+    resolution: {integrity: sha512-n4Se1wu4GnKwztQHNFfJvUeWcpvx3o8cWhSbNs9JQShEuB3nv3R5lqFBtDCgHZF/emFQAP+ZjF8bTfCs9UBGhA==}
+    dev: false
+
   /@cush/relative@1.0.0:
     resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
     dev: true
 
-  /@dydxprotocol/abacus@0.4.16:
+  /@dydxprotocol/v4-abacus@0.5.4:
-    resolution: {integrity: sha512-FTvzgVZ0xjMRmfHwlyoluUSG4Uu4FUHPnaTvLLPl0ER0junmaVDrmBydAUMWMEYGiLyx/k0ln1cLUDrYF2aX6A==}
+    resolution: {integrity: sha512-LMwmyXCih2bBdLX3vO5OwbdGWg3oZ8WSGj+4nqr8tn/bn1qCSKdYdZZ9/U20Yir2rMAcoC0jmznMcBwthlSp/w==}
     dev: false
 
-  /@dydxprotocol/dydxjs@0.3.0:
+  /@dydxprotocol/v4-client-js@0.36.1:
-    resolution: {integrity: sha512-ygNeBs0f3H7sJk1qLUjfNwaXgc5TmjD+qZf7BFDbi7+boHJI9xuOWrGpjfBo7OTUZxS6O5jZG323CgU5XqMSPw==}
+    resolution: {integrity: sha512-KJ3MtWI61wmm+xZtXQd7/hYKIoVFG32TRdyyVaXXO8vpW9Oqd0JD8QSM/wuegkciAh5YmP/BrDzYuu77zHO6yg==}
     dependencies:
-      '@babel/runtime': 7.22.10
-      '@bufbuild/buf': 1.19.0-1
       '@cosmjs/amino': 0.30.1
+      '@cosmjs/encoding': 0.31.1
+      '@cosmjs/math': 0.31.1
       '@cosmjs/proto-signing': 0.30.1
       '@cosmjs/stargate': 0.30.1
       '@cosmjs/tendermint-rpc': 0.30.1
-      osmojs: 15.5.0
+      '@cosmjs/utils': 0.31.1
-      protobufjs: 6.11.4
+      '@dydxprotocol/v4-proto': 0.2.1
-    transitivePeerDependencies:
-      - bufferutil
-      - debug
-      - utf-8-validate
-    dev: false
-
-  /@dydxprotocol/v4-client-js@0.32.0:
-    resolution: {integrity: sha512-KvKActMgWLcsRQ7RQhpi/F8xeQ7MWUp3G5+4IPNZ4wyRwAxDSbcrfYbTetI/IesHyelRPSeYxam9eYq3wXwZ1A==}
-    dependencies:
-      '@cosmjs/amino': 0.30.1
-      '@cosmjs/proto-signing': 0.30.1
-      '@cosmjs/stargate': 0.30.1
-      '@cosmjs/tendermint-rpc': 0.30.1
-      '@dydxprotocol/dydxjs': 0.3.0
       '@osmonauts/lcd': 0.6.0
       '@scure/bip32': 1.3.1
       '@scure/bip39': 1.2.1
@@ -1182,6 +1002,7 @@ packages:
       bignumber.js: 9.1.1
       ethereum-cryptography: 2.1.2
       long: 4.0.0
+      protobufjs: 6.11.4
       ws: 8.13.0(bufferutil@4.0.7)(utf-8-validate@5.0.10)
     transitivePeerDependencies:
       - bufferutil
@@ -1189,8 +1010,14 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@dydxprotocol/v4-localization@0.0.25:
+  /@dydxprotocol/v4-localization@0.1.11:
-    resolution: {integrity: sha512-Rp6VHA8z+nwgvTjjB3fvL8gY7bd4DYDHV+NPoL0MFuRm39vhFxGlBVAGDkXPkQTh6YU5BlZV2yXLkDeSfFqEBQ==}
+    resolution: {integrity: sha512-eW88t8KJuDT0fNEgaw615+n3gEYxDZYPeHhdBYquVDXjnkhLNznaH8ftmlLPVPyfu7o5aFeU/cw8ZiqRrf/Stw==}
+    dev: false
+
+  /@dydxprotocol/v4-proto@0.2.1:
+    resolution: {integrity: sha512-Q5b/g331DoyMjBpO2/jtrxUX3WF5UaIKZp/unK332xuefHNFnkMYtZ05p0V71iSdO35tBdz8yt0VYP2WtUsp+w==}
+    dependencies:
+      protobufjs: 6.11.4
     dev: false
 
   /@emotion/is-prop-valid@1.2.1:
@@ -2246,15 +2073,6 @@ packages:
       fastq: 1.15.0
     dev: true
 
-  /@osmonauts/lcd@0.10.0:
-    resolution: {integrity: sha512-PzmXk9x9MHyLn2fUztpAqWqvDmMiEJaQv/JcAoAOE8VdHrD9Hf/KWnE1RZtamuS2ngQRqvQPD0xotCGXW7eTxA==}
-    dependencies:
-      '@babel/runtime': 7.22.10
-      axios: 0.27.2
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
   /@osmonauts/lcd@0.6.0:
     resolution: {integrity: sha512-vz9VavXrEfxZoXbSAfNfk90MLpn34XtBYPV3L9YilE+s56AhqYxUh83nne9J5somnTRfGnyR3oeV8C+lHkqiuA==}
     dependencies:
@@ -7787,13 +7605,6 @@ packages:
       path-type: 4.0.0
     dev: true
 
-  /cosmjs-types@0.5.2:
-    resolution: {integrity: sha512-zxCtIJj8v3Di7s39uN4LNcN3HIE1z0B9Z0SPE8ZNQR0oSzsuSe1ACgxoFkvhkS7WBasCAFcglS11G2hyfd5tPg==}
-    dependencies:
-      long: 4.0.0
-      protobufjs: 6.11.4
-    dev: false
-
   /cosmjs-types@0.7.2:
     resolution: {integrity: sha512-vf2uLyktjr/XVAgEq0DjMxeAWh1yYREe7AMHDKd7EiHVqxBPCaBS+qEEQUkXbR9ndnckqr1sUG8BQhazh4X5lA==}
     dependencies:
@@ -11641,23 +11452,6 @@ packages:
       type-check: 0.4.0
     dev: true
 
-  /osmojs@15.5.0:
-    resolution: {integrity: sha512-7wy3QEYu+R+c8imfLEPS1PliYA8uw0qdFYjc2PToHteYG4hzYt4Noa7X0lM9O59s7nxo9ozT1N9z7uwB/1qHkA==}
-    dependencies:
-      '@babel/runtime': 7.22.10
-      '@cosmjs/amino': 0.29.3
-      '@cosmjs/proto-signing': 0.29.3
-      '@cosmjs/stargate': 0.29.3
-      '@cosmjs/tendermint-rpc': 0.29.5
-      '@osmonauts/lcd': 0.10.0
-      long: 5.2.3
-      protobufjs: 6.11.4
-    transitivePeerDependencies:
-      - bufferutil
-      - debug
-      - utf-8-validate
-    dev: false
-
   /p-defer@3.0.0:
     resolution: {integrity: sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==}
     engines: {node: '>=8'}

src/App.tsx

@@ -10,11 +10,11 @@ import { AppRoute, DEFAULT_TRADE_ROUTE } from '@/constants/routes';
 import { useBreakpoints, useInitializePage, useShouldShowFooter, useAnalytics } from '@/hooks';
 import { DydxProvider } from '@/hooks/useDydxClient';
 import { AccountsProvider } from '@/hooks/useAccounts';
-import { DialogAreaProvider, useDialogArea } from './hooks/useDialogArea';
+import { DialogAreaProvider, useDialogArea } from '@/hooks/useDialogArea';
-import { LocaleProvider } from './hooks/useLocaleSeparators';
+import { LocaleProvider } from '@/hooks/useLocaleSeparators';
-import { NotificationsProvider } from './hooks/useNotifications';
+import { NotificationsProvider } from '@/hooks/useNotifications';
-import { LocalNotificationsProvider } from './hooks/useLocalNotifications';
+import { LocalNotificationsProvider } from '@/hooks/useLocalNotifications';
-import { SubaccountProvider } from './hooks/useSubaccount';
+import { SubaccountProvider } from '@/hooks/useSubaccount';
 import { SquidProvider } from '@/hooks/useSquid';
 
 import { GuardedMobileRoute } from '@/components/GuardedMobileRoute';
@@ -100,6 +100,7 @@ const Content = () => {
 };
 
 const wrapProvider = (Component: React.ComponentType<any>, props?: any) => {
+  // eslint-disable-next-line react/display-name
   return ({ children }: { children: React.ReactNode }) => (
     <Component {...props}>{children}</Component>
   );

src/constants/abacus.ts

@@ -1,4 +1,4 @@
-import Abacus, { kollections } from '@dydxprotocol/abacus';
+import Abacus, { kollections } from '@dydxprotocol/v4-abacus';
 import { OrderSide } from '@dydxprotocol/v4-client-js';
 import { PositionSide, TradeTypes } from './trade';
 import { STRING_KEYS } from './localization';
@@ -40,6 +40,10 @@ export type AbacusFileSystemProtocol = Omit<
   Abacus.exchange.dydx.abacus.protocols.FileSystemProtocol,
   '__doNotUseOrImplementIt'
 >;
+export type AbacusTrackingProtocol = Omit<
+  Abacus.exchange.dydx.abacus.protocols.TrackingProtocol,
+  '__doNotUseOrImplementIt'
+>;
 
 export type FileLocation = Abacus.exchange.dydx.abacus.protocols.FileLocation;
 export type ThreadingType = Abacus.exchange.dydx.abacus.protocols.ThreadingType;
@@ -118,6 +122,7 @@ export const InputSelectionOption = Abacus.exchange.dydx.abacus.output.input.Sel
 
 // ------ Wallet ------ //
 export type Wallet = Abacus.exchange.dydx.abacus.output.Wallet;
+export type AccountBalance = Abacus.exchange.dydx.abacus.output.AccountBalance;
 export type Subaccount = Abacus.exchange.dydx.abacus.output.Subaccount;
 export type SubaccountPosition = Abacus.exchange.dydx.abacus.output.SubaccountPosition;
 export type SubaccountOrder = Abacus.exchange.dydx.abacus.output.SubaccountOrder;
@@ -184,6 +189,10 @@ export type HumanReadablePlaceOrderPayload =
   Abacus.exchange.dydx.abacus.state.manager.HumanReadablePlaceOrderPayload;
 export type HumanReadableCancelOrderPayload =
   Abacus.exchange.dydx.abacus.state.manager.HumanReadableCancelOrderPayload;
+export type HumanReadableWithdrawPayload =
+  Abacus.exchange.dydx.abacus.state.manager.HumanReadableWithdrawPayload;
+export type HumanReadableTransferPayload =
+  Abacus.exchange.dydx.abacus.state.manager.HumanReadableTransferPayload;
 
 // ------ Helpers ------ //
 export const AbacusHelper = Abacus.exchange.dydx.abacus.utils.AbacusHelper;

src/constants/account.ts

@@ -1,18 +1,5 @@
-/**
+import type { DydxAddress, EvmAddress } from './wallets';
- * OnboardingSteps
+
- * 1. Choose between 3 options
- *  a. Ethereum EOA (current)
- *  b. Keplr or Other Cosmos (future)
- *  c. Social (future)
- * 2. Key derivation
- *  a. If wallet has no dYdX Chain transactions and not on whitelist, sign twice (future)
- *   i. Success
- *   ii. Signatures don't match error (Wallet is non-deterministic)
- *  b. Success
- * 3. Post Registration items (Only on first onboarding)
- *  a. Acknowledge Terms
- *  b. DepositFunds
- */
 export enum OnboardingSteps {
   ChooseWallet = 'ChooseWallet',
   KeyDerivation = 'KeyDerivation',
@@ -49,14 +36,12 @@ export enum EvmDerivedAccountStatus {
   Derived,
 }
 
-import type { DydxAddress, EvmAddress } from './wallets';
-
 export type EvmDerivedAddresses = {
   version?: string;
   [EvmAddress: EvmAddress]: {
     encryptedSignature?: string;
     dydxAddress?: DydxAddress;
   };
-}
+};
 
-export const AMOUNT_RESERVED_FOR_GAS_USDC = 100_000;
+export const AMOUNT_RESERVED_FOR_GAS_USDC = 100_000;

src/constants/analytics.ts

@@ -71,6 +71,7 @@ export enum AnalyticsEvent {
 
   // Transfers
   TransferFaucet = 'TransferFaucet',
+  TransferFaucetConfirmed = 'TransferFaucetConfirmed',
   TransferDeposit = 'TransferDeposit',
   TransferWithdraw = 'TransferWithdraw',
 
@@ -78,6 +79,7 @@ export enum AnalyticsEvent {
   TradeOrderTypeSelected = 'TradeOrderTypeSelected',
   TradePlaceOrder = 'TradePlaceOrder',
   TradePlaceOrderConfirmed = 'TradePlaceOrderConfirmed',
+  TradeCancelOrder = 'TradeCancelOrder',
   TradeCancelOrderConfirmed = 'TradeCancelOrderConfirmed',
 }
 
@@ -133,6 +135,13 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
     : // Transfers
     T extends AnalyticsEvent.TransferFaucet
     ? {}
+    : T extends AnalyticsEvent.TransferFaucetConfirmed
+    ? {
+        /** roundtrip time between user placing an order and confirmation from indexer (client → validator → indexer → client) */
+        roundtripMs: number;
+        /** URL/IP of node the order was sent to */
+        validatorUrl: string;
+      }
     : T extends AnalyticsEvent.TransferDeposit
     ? {}
     : T extends AnalyticsEvent.TransferWithdraw
@@ -151,13 +160,15 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
         /** roundtrip time between user placing an order and confirmation from indexer (client → validator → indexer → client) */
         roundtripMs: number;
         /** URL/IP of node the order was sent to */
-        validator: string;
+        validatorUrl: string;
       }
+    : T extends AnalyticsEvent.TradeCancelOrder
+    ? {}
     : T extends AnalyticsEvent.TradeCancelOrderConfirmed
     ? {
         /** roundtrip time between user canceling an order and confirmation from indexer (client → validator → indexer → client) */
         roundtripMs: number;
         /** URL/IP of node the order was sent to */
-        validator: string;
+        validatorUrl: string;
       }
     : never;

src/constants/localization.ts

@@ -88,19 +88,3 @@ export type TooltipStrings = {
     learnMoreLink?: string;
   };
 };
-
-export const ORDER_ERROR_CODE_MAP: { [key: number]: string } = {
-  2000: STRING_KEYS['2000_FILL_OR_KILL_ORDER_COULD_NOT_BE_FULLY_FILLED'],
-  2001: STRING_KEYS['2001_REDUCE_ONLY_WOULD_INCREASE_POSITION_SIZE'],
-  2002: STRING_KEYS['2002_REDUCE_ONLY_WOULD_CHANGE_POSITION_SIDE'],
-  2003: STRING_KEYS['2003_POST_ONLY_WOULD_CROSS_MAKER_ORDER'],
-  3000: STRING_KEYS['3000_INVALID_ORDER_FLAGS'],
-  3001: STRING_KEYS['3001_INVALID_STATEFUL_ORDER_GOOD_TIL_BLOCK_TIME'],
-  3002: STRING_KEYS['3002_STATEFUL_ORDERS_CANNOT_REQUIRE_IMMEDIATE_EXECUTION'],
-  3003: STRING_KEYS['3003_TIME_EXCEEDS_GOOD_TIL_BLOCK_TIME'],
-  3004: STRING_KEYS['3004_GOOD_TIL_BLOCK_TIME_EXCEEDS_STATEFUL_ORDER_TIME_WINDOW'],
-  3005: STRING_KEYS['3005_STATEFUL_ORDER_ALREADY_EXISTS'],
-  3006: STRING_KEYS['3006_STATEFUL_ORDER_DOES_NOT_EXIST'],
-  3007: STRING_KEYS['3007_STATEFUL_ORDER_COLLATERALIZATION_CHECK_FAILED'],
-  3008: STRING_KEYS['3008_STATEFUL_ORDER_PREVIOUSLY_CANCELLED'],
-};

src/constants/notifications.ts

@@ -1,4 +1,4 @@
-import { StatusResponse } from "@0xsquid/sdk";
+import { StatusResponse } from '@0xsquid/sdk';
 
 /** implemented in useNotificationTypes */
 export enum NotificationType {
@@ -11,7 +11,7 @@ export enum NotificationComponentType {}
 export type NotificationId = string | number;
 
 export type NotificationTypeConfig<
-  _NotificationId extends NotificationId = string,
+  NotificationIdType extends NotificationId = string,
   NotificationUpdateKey = any
 > = {
   type: NotificationType;
@@ -20,7 +20,7 @@ export type NotificationTypeConfig<
   useTrigger: (_: {
     trigger: (
       /** Unique ID for the triggered notification */
-      id: _NotificationId,
+      id: NotificationIdType,
 
       /** Display data for the triggered notification */
       displayData: NotificationDisplayData,
@@ -43,7 +43,7 @@ export type NotificationTypeConfig<
   }) => void;
 
   /** Callback for notification action (Toast action button click, NotificationsMenu item click, or native push notification interaction) */
-  useNotificationAction?: () => (id: _NotificationId) => any;
+  useNotificationAction?: () => (id: NotificationIdType) => any;
 };
 
 export enum NotificationStatus {
@@ -65,10 +65,10 @@ export enum NotificationStatus {
 
 /** Notification state. Serialized and cached into localStorage. */
 export type Notification<
-  _NotificationId extends NotificationId = string,
+  NotificationIdType extends NotificationId = string,
   NotificationUpdateKey = any
 > = {
-  id: _NotificationId;
+  id: NotificationIdType;
   type: NotificationType;
   status: NotificationStatus;
   timestamps: Partial<Record<NotificationStatus, number>>;

src/constants/numbers.ts

@@ -1,5 +1,3 @@
-import { getSeparator } from '@/lib/numbers';
-
 export const USD_DECIMALS = 2;
 export const SMALL_USD_DECIMALS = 4;
 

src/constants/tooltips/trade.ts

@@ -5,6 +5,10 @@ export const tradeTooltips: TooltipStrings = {
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.ACCOUNT_LEVERAGE_TITLE }),
     body: stringGetter({ key: TOOLTIP_STRING_KEYS.ACCOUNT_LEVERAGE_BODY }),
   }),
+  'base-position-notional': ({ stringGetter }) => ({
+    title: stringGetter({ key: TOOLTIP_STRING_KEYS.BASE_POSITION_NOTIONAL_TITLE }),
+    body: stringGetter({ key: TOOLTIP_STRING_KEYS.BASE_POSITION_NOTIONAL_BODY }),
+  }),
   'bracket-sl': ({ stringGetter }) => ({
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.BRACKET_ORDER_SL_TITLE }),
     body: stringGetter({ key: TOOLTIP_STRING_KEYS.BRACKET_ORDER_SL_BODY }),

src/constants/trade.ts

@@ -27,7 +27,7 @@ export enum PositionSide {
   Short = 'SHORT',
 }
 
-export const UNCOMMITTED_ORDER_TIMEOUT = 10_000;
+export const UNCOMMITTED_ORDER_TIMEOUT_MS = 10_000;
 
 export const ORDER_SIDE_STRINGS = {
   [OrderSide.BUY]: STRING_KEYS.BUY,

src/constants/wallets.ts

@@ -1,4 +1,6 @@
 import type { ExternalProvider } from '@ethersproject/providers';
+import { USDC_DENOM, type onboarding, DYDX_DENOM } from '@dydxprotocol/v4-client-js';
+import type { suggestChain } from 'graz';
 
 import { STRING_KEYS } from '@/constants/localization';
 
@@ -313,10 +315,6 @@ export type WalletConnection = {
 };
 
 // dYdX Chain wallets
-
-import { USDC_DENOM, type onboarding, DYDX_DENOM } from '@dydxprotocol/v4-client-js';
-import type { suggestChain } from 'graz';
-
 export const COSMOS_DERIVATION_PATH = "m/44'/118'/0'/0/0";
 
 /**
@@ -341,12 +339,12 @@ export type EvmAddress = `0x${string}`;
 export type DydxAddress = `dydx${string}`;
 
 export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
-  rpc: '13.59.4.93:26657',
+  rpc: 'https://dydx-testnet-archive.allthatnode.com:26657',
-  rest: '13.59.4.93:1317',
+  rest: 'https://dydx-testnet-archive.allthatnode.com:1317',
-  chainId: 'dydx-testnet-2',
+  chainId: 'dydx-testnet-3',
   chainName: 'dYdX Public Testnet',
   chainSymbolImageUrl:
-    'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-2/chain.png',
+    'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-3/chain.png',
   bech32Config: {
     bech32PrefixAccPub: 'dydxpub',
     bech32PrefixValPub: 'dydxvaloperpub',
@@ -385,12 +383,18 @@ export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
   features: [],
 };
 
+// TODO: export this type from abacus instead
 export enum DydxChainAsset {
-  USDC = 'USDC',
+  USDC = 'usdc',
-  DYDX = 'Dv4TNT',
+  DYDX = 'dydx',
 }
 
 export const DYDX_CHAIN_ASSET_COIN_DENOM: Record<DydxChainAsset, string> = {
   [DydxChainAsset.USDC]: USDC_DENOM,
   [DydxChainAsset.DYDX]: DYDX_DENOM,
 };
+
+export const DYDX_CHAIN_ASSET_TAGS: Record<DydxChainAsset, string> = {
+  [DydxChainAsset.USDC]: 'USDC',
+  [DydxChainAsset.DYDX]: 'Dv4TNT',
+};

src/hooks/useAccountBalance.ts

@@ -1,10 +1,12 @@
 import { useCallback } from 'react';
-import { useSelector } from 'react-redux';
+import { shallowEqual, useSelector } from 'react-redux';
 import { useBalance } from 'wagmi';
 import { StargateClient } from '@cosmjs/stargate';
 import { useQuery } from 'react-query';
 import { formatUnits } from 'viem';
 
+import { USDC_DENOM, DYDX_DENOM } from '@dydxprotocol/v4-client-js';
+
 import { CLIENT_NETWORK_CONFIGS } from '@/constants/networks';
 import { QUANTUM_MULTIPLIER } from '@/constants/numbers';
 import { EvmAddress } from '@/constants/wallets';
@@ -12,11 +14,10 @@ import { EvmAddress } from '@/constants/wallets';
 import { convertBech32Address } from '@/lib/addressUtils';
 import { MustBigNumber } from '@/lib/numbers';
 
+import { getBalances } from '@/state/accountSelectors';
 import { getSelectedNetwork } from '@/state/appSelectors';
 
 import { useAccounts } from './useAccounts';
-import { usePollNativeTokenBalance } from './usePollNativeTokenBalance';
-import { usePollUSDCBalance } from './usePollUSDCBalance';
 
 type UseAccountBalanceProps = {
   // Token Items
@@ -50,6 +51,7 @@ export const useAccountBalance = ({
   const { evmAddress, dydxAddress } = useAccounts();
 
   const selectedNetwork = useSelector(getSelectedNetwork);
+  const balances = useSelector(getBalances, shallowEqual);
   const evmChainId = Number(CLIENT_NETWORK_CONFIGS[selectedNetwork].ethereumChainId);
 
   const evmQuery = useBalance({
@@ -92,12 +94,12 @@ export const useAccountBalance = ({
   const { formatted: evmBalance } = evmQuery.data || {};
   const balance = !assetSymbol ? '0' : isCosmosChain ? cosmosQuery.data : evmBalance;
 
-  const nativeTokenCoinBalance = usePollNativeTokenBalance({ dydxAddress });
+  const nativeTokenCoinBalance = balances?.[DYDX_DENOM];
   const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount)
     .div(QUANTUM_MULTIPLIER)
     .toNumber();
-
+  
-  const usdcCoinBalance = usePollUSDCBalance({ dydxAddress });
+  const usdcCoinBalance = balances?.[USDC_DENOM];
   const usdcBalance = MustBigNumber(usdcCoinBalance?.amount).div(QUANTUM_MULTIPLIER).toNumber();
 
   return {

src/hooks/useAccounts.tsx

@@ -8,10 +8,7 @@ import { OnboardingGuard, OnboardingState, type EvmDerivedAddresses } from '@/co
 import { LocalStorageKey, LOCAL_STORAGE_VERSIONS } from '@/constants/localStorage';
 import { DydxAddress, EvmAddress, PrivateInformation } from '@/constants/wallets';
 
-import {
+import { setOnboardingState, setOnboardingGuard } from '@/state/account';
-  setOnboardingState,
-  setOnboardingGuard,
-} from '@/state/account';
 
 import abacusStateManager from '@/lib/abacus';
 import { log } from '@/lib/telemetry';
@@ -222,9 +219,9 @@ const useAccountsContext = () => {
   // abacus
   // TODO: useAbacus({ dydxAddress })
   useEffect(() => {
-    if (dydxAddress) abacusStateManager.setAccount(dydxAddress);
+    if (dydxAddress) abacusStateManager.setAccount(localDydxWallet);
     else abacusStateManager.attemptDisconnectAccount();
-  }, [dydxAddress]);
+  }, [localDydxWallet]);
 
   // clear subaccounts when no dydxAddress is set
   useEffect(() => {

src/hooks/useDydxClient.tsx

@@ -114,7 +114,7 @@ const useDydxClientContext = () => {
     }): Promise<Candle[]> => {
       try {
         const { candles } =
-          (await compositeClient!.indexerClient.markets.getPerpetualMarketCandles(
+          (await compositeClient?.indexerClient.markets.getPerpetualMarketCandles(
             marketId,
             RESOLUTION_MAP[resolution],
             fromIso,

src/hooks/useLocalNotifications.tsx

@@ -6,7 +6,7 @@ import { LocalStorageKey } from '@/constants/localStorage';
 import { type TransferNotifcation } from '@/constants/notifications';
 
 import { useAccounts } from '@/hooks/useAccounts';
-import { useSquid } from '@/hooks/useSquid';
+import { SQUID_ERROR_TYPES, useSquid } from '@/hooks/useSquid';
 import { useLocalStorage } from './useLocalStorage';
 
 const LocalNotificationsContext = createContext<
@@ -66,11 +66,14 @@ const useLocalNotificationsContext = () => {
       } of transferNotifications) {
         try {
           if (currentStatus && currentStatus?.squidTransactionStatus !== 'ongoing') continue;
-  
+
           const status = await squid?.getStatus({ transactionId: txHash, toChainId, fromChainId });
           if (status) statuses[txHash] = status;
         } catch (error) {
-          console.error(error);
+          // ignore not found errors since the route might not be available yet
+          if (error?.errors?.length && error.errors[0].errorType !== SQUID_ERROR_TYPES.NotFoundError) {
+            statuses[txHash] = error;
+          }
         }
       }
       return statuses;

src/hooks/useMarketsData.ts

@@ -29,7 +29,7 @@ export const useMarketsData = (
 
   const markets = useMemo(() => {
     return Object.values(allPerpetualMarkets)
-      .filter(({ assetId }) => allAssets[assetId]) // Filter out markets with no asset information
+      .filter((market) => allAssets[market?.assetId]) // Filter out markets with no asset information
       .map((marketData) => ({
         asset: allAssets[marketData.assetId],
         tickSizeDecimals: marketData.configs?.tickSizeDecimals,

src/hooks/useNotificationTypes.tsx

@@ -1,7 +1,9 @@
 import { useCallback, useEffect, useMemo } from 'react';
+import styled, { type AnyStyledComponent } from 'styled-components';
 import { useSelector, shallowEqual, useDispatch } from 'react-redux';
 import { groupBy } from 'lodash';
 
+import { AlertType } from '@/constants/alerts';
 import { AbacusOrderStatus, ORDER_SIDES, ORDER_STATUS_STRINGS } from '@/constants/abacus';
 import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
@@ -10,6 +12,7 @@ import { ORDER_SIDE_STRINGS, TRADE_TYPE_STRINGS, TradeTypes } from '@/constants/
 
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';
 
+import { AlertMessage } from '@/components/AlertMessage';
 import { Icon, IconName } from '@/components/Icon';
 import { Output, OutputType } from '@/components/Output';
 import { TransferStatusToast } from '@/views/TransferStatus';
@@ -119,19 +122,36 @@ export const notificationTypes = [
           const { toChainId, status, txHash, toAmount } = transfer;
           const finished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
           const type = toChainId === TESTNET_CHAIN_ID ? 'deposit' : 'withdraw';
+          // @ts-ignore status.errors is not in the type definition but can be returned
+          const error = status?.errors?.length ? status?.errors[0] : status?.error;
+
+          // TODO: confirm with design what the description should be
+          const description = (
+            <div>
+              <Styled.TransferText>
+                {type === 'deposit' ? 'Deposit of ' : 'Withdraw of '}
+                <Output type={OutputType.Fiat} value={toAmount} />
+              </Styled.TransferText>
+
+              {error && (
+                <Styled.ErrorMessage type={AlertType.Error}>
+                  {stringGetter({
+                    key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
+                    params: {
+                      ERROR_MESSAGE: error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
+                    },
+                  })}
+                </Styled.ErrorMessage>
+              )}
+            </div>
+          );
 
           trigger(
             txHash,
             {
               icon: <Icon iconName={finished ? IconName.Transfer : IconName.Clock} />,
               title: stringGetter({ key: getTitleStringKey(type, finished) }),
-              // TODO: confirm with design what the description should be
+              description: description,
-              description: (
-                <>
-                  <span>{type === 'deposit' ? 'Deposit of ' : 'Withdraw of'}</span>
-                  <Output type={OutputType.Fiat} value={toAmount} />
-                </>
-              ),
               customContent: (
                 <TransferStatusToast
                   toAmount={transfer.toAmount}
@@ -139,7 +159,12 @@ export const notificationTypes = [
                   status={transfer.status}
                 />
               ),
-              customMenuContent: !finished && <TransferStatusSteps status={transfer.status} />,
+              customMenuContent: !finished && (
+                <div>
+                  {description}
+                  <TransferStatusSteps status={transfer.status} />
+                </div>
+              ),
               toastSensitivity: 'foreground',
             },
             []
@@ -149,3 +174,15 @@ export const notificationTypes = [
     },
   },
 ] satisfies NotificationTypeConfig[];
+
+const Styled: Record<string, AnyStyledComponent> = {};
+
+Styled.TransferText = styled.span`
+  display: inline-flex;
+  align-items: center;
+  gap: 0.5ch;
+`
+
+Styled.ErrorMessage = styled.div`
+  max-width: 13rem;
+`;

src/hooks/useOnLastOrderIndexed.ts

@@ -0,0 +1,26 @@
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+
+import { getLatestOrderClientId } from '@/state/accountSelectors';
+
+/**
+ * @description This hook will fire a callback when the latest order has been updated to a non-pending state from the Indexer.
+ * @param { callback: () => void }
+ */
+export const useOnLastOrderIndexed = ({ callback }: { callback: () => void }) => {
+  const [unIndexedClientId, setUnIndexedClientId] = useState<number | undefined>();
+  const latestOrderClientId = useSelector(getLatestOrderClientId);
+
+  useEffect(() => {
+    if (unIndexedClientId) {
+      if (unIndexedClientId === latestOrderClientId) {
+        callback();
+        setUnIndexedClientId(undefined);
+      }
+    }
+  }, [callback, latestOrderClientId, unIndexedClientId]);
+
+  return {
+    setUnIndexedClientId,
+  };
+};

src/hooks/usePollNativeTokenBalance.ts

@@ -1,31 +0,0 @@
-import { useQuery } from 'react-query';
-
-import { useAccounts } from '@/hooks';
-
-import { DydxAddress } from '@/constants/wallets';
-import { DYDX_DENOM } from '@dydxprotocol/v4-client-js';
-
-const ACCOUNT_BALANCE_POLLING_INTERVAL = 60_000;
-
-export const usePollNativeTokenBalance = ({
-  dydxAddress,
-  interval = ACCOUNT_BALANCE_POLLING_INTERVAL,
-}: {
-  dydxAddress?: DydxAddress;
-  interval?: number;
-}) => {
-  const { getAccountBalance } = useAccounts();
-
-  const { data } = useQuery({
-    enabled: dydxAddress !== undefined,
-    queryKey: ['usePollNativeTokenBalance', { dydxAddress }],
-    queryFn: async () => {
-      if (!dydxAddress) return;
-      return await getAccountBalance({ dydxAddress, denom: DYDX_DENOM });
-    },
-    refetchInterval: interval,
-    staleTime: interval,
-  });
-
-  return data;
-};

src/hooks/usePollUSDCBalance.ts

@@ -1,30 +0,0 @@
-import { useQuery } from 'react-query';
-
-import { useAccounts } from '@/hooks';
-
-import { DydxAddress } from '@/constants/wallets';
-
-const ACCOUNT_BALANCE_POLLING_INTERVAL = 60_000;
-
-export const usePollUSDCBalance = ({
-  dydxAddress,
-  interval = ACCOUNT_BALANCE_POLLING_INTERVAL,
-}: {
-  dydxAddress?: DydxAddress;
-  interval?: number;
-}) => {
-  const { getAccountBalance } = useAccounts();
-
-  const { data } = useQuery({
-    enabled: dydxAddress !== undefined,
-    queryKey: ['usePollUSDCBalance', { dydxAddress }],
-    queryFn: async () => {
-      if (!dydxAddress) return;
-      return await getAccountBalance({ dydxAddress });
-    },
-    refetchInterval: interval,
-    staleTime: interval,
-  });
-
-  return data;
-};

src/hooks/useSquid.tsx

@@ -1,14 +1,17 @@
 import { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
 import { Squid } from '@0xsquid/sdk';
 
-import { CLIENT_NETWORK_CONFIGS, DydxV4Network, isDydxV4Network } from '@/constants/networks';
+import { CLIENT_NETWORK_CONFIGS, isDydxV4Network } from '@/constants/networks';
 
 import { getSelectedNetwork } from '@/state/appSelectors';
 
 export const NATIVE_TOKEN_ADDRESS = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 
+export enum SQUID_ERROR_TYPES {
+  NotFoundError = 'NotFoundError',
+}
+
 const useSquidContext = () => {
   const selectedNetwork = useSelector(getSelectedNetwork);
   const [_, setInitialized] = useState(false);

src/hooks/useSubaccount.tsx

@@ -1,53 +1,41 @@
 import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { useDispatch } from 'react-redux';
+import { shallowEqual, useSelector, useDispatch } from 'react-redux';
-import type { Nullable } from '@dydxprotocol/abacus';
+import type { Nullable } from '@dydxprotocol/v4-abacus';
 import Long from 'long';
 import type { IndexedTx } from '@cosmjs/stargate';
 import type { EncodeObject, Coin } from '@cosmjs/proto-signing';
 import { Method } from '@cosmjs/tendermint-rpc';
 
 import {
-  LocalWallet,
+  type LocalWallet,
-  OrderExecution,
-  OrderFlags,
-  OrderSide,
-  OrderTimeInForce,
-  OrderType,
   SubaccountClient,
   DYDX_DENOM,
   USDC_DENOM,
-  GAS_PRICE_DYDX_DENOM,
 } from '@dydxprotocol/v4-client-js';
 
 import type {
-  HumanReadableCancelOrderPayload,
+  AccountBalance,
   HumanReadablePlaceOrderPayload,
+  ParsingError,
   SubAccountHistoricalPNLs,
 } from '@/constants/abacus';
 
 import { AMOUNT_RESERVED_FOR_GAS_USDC } from '@/constants/account';
 import { AnalyticsEvent } from '@/constants/analytics';
-import { ORDER_ERROR_CODE_MAP } from '@/constants/localization';
 import { QUANTUM_MULTIPLIER } from '@/constants/numbers';
-import { UNCOMMITTED_ORDER_TIMEOUT } from '@/constants/trade';
 import { DydxAddress } from '@/constants/wallets';
 
-import {
+import { setSubaccount, setHistoricalPnl, removeUncommittedOrderClientId } from '@/state/account';
-  addUncommittedOrderClientId,
+import { getBalances } from '@/state/accountSelectors';
-  removeUncommittedOrderClientId,
-  setSubaccount,
-  setHistoricalPnl,
-} from '@/state/account';
 
 import abacusStateManager from '@/lib/abacus';
 import { track } from '@/lib/analytics';
-import { StatefulOrderError } from '@/lib/errors';
 import { MustBigNumber } from '@/lib/numbers';
 import { log } from '@/lib/telemetry';
 
 import { useAccounts } from './useAccounts';
 import { useDydxClient } from './useDydxClient';
-import { usePollUSDCBalance } from './usePollUSDCBalance';
+
 
 type SubaccountContextType = ReturnType<typeof useSubaccountContext>;
 const SubaccountContext = createContext<SubaccountContextType>({} as SubaccountContextType);
@@ -83,12 +71,8 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
   const {
     depositToSubaccount,
     withdrawFromSubaccount,
-    simulateWithdrawFromSubaccount,
     transferFromSubaccountToAddress,
     transferNativeToken,
-    simulateTransferNativeToken,
-    placeOrderForSubaccount,
-    cancelOrderForSubaccount,
     sendSquidWithdrawFromSubaccount,
   } = useMemo(
     () => ({
@@ -110,31 +94,6 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         amount: number;
       }) => await compositeClient?.withdrawFromSubaccount(subaccountClient, amount),
 
-      simulateWithdrawFromSubaccount: async ({
-        subaccountClient,
-        amount,
-        recipient,
-      }: {
-        subaccountClient: SubaccountClient;
-        amount: number;
-        recipient?: string;
-      }) => {
-        return await compositeClient?.simulate(
-          subaccountClient?.wallet,
-          () =>
-            new Promise((resolve) => {
-              const msg = compositeClient?.withdrawFromSubaccountMessage(
-                subaccountClient,
-                amount,
-                recipient
-              );
-
-              resolve([msg]);
-            }),
-          undefined
-        );
-      },
-
       transferFromSubaccountToAddress: async ({
         subaccountClient,
         assetId = 0,
@@ -185,125 +144,6 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
           Method.BroadcastTxCommit
         ),
 
-      simulateTransferNativeToken: async ({
-        subaccountClient,
-        amount,
-        recipient,
-      }: {
-        subaccountClient: SubaccountClient;
-        amount: number;
-        recipient: string;
-      }) =>
-        await compositeClient?.simulate(
-          subaccountClient?.wallet,
-          () =>
-            new Promise((resolve) => {
-              const msg = compositeClient?.validatorClient.post.composer.composeMsgSendToken(
-                subaccountClient.address,
-                recipient,
-                DYDX_DENOM,
-                Long.fromNumber(amount * QUANTUM_MULTIPLIER)
-              );
-
-              resolve([msg]);
-            }),
-          GAS_PRICE_DYDX_DENOM,
-          undefined
-        ),
-
-      placeOrderForSubaccount: async ({
-        subaccount,
-        marketId,
-        type,
-        side,
-        price,
-        triggerPrice,
-        size,
-        clientId,
-        timeInForce,
-        goodTilTimeInSeconds,
-        execution,
-        postOnly,
-        reduceOnly,
-      }: {
-        subaccount: SubaccountClient;
-        marketId: string;
-        type: OrderType;
-        side: OrderSide;
-        price: number;
-        triggerPrice: Nullable<number>;
-        size: number;
-        clientId: number;
-        timeInForce: OrderTimeInForce;
-        goodTilTimeInSeconds: number;
-        execution: OrderExecution;
-        postOnly: boolean;
-        reduceOnly: boolean;
-      }) => {
-        const startTimestamp = performance.now();
-
-        const result = await compositeClient?.placeOrder(
-          subaccount,
-          marketId,
-          type,
-          side,
-          price,
-          size,
-          clientId,
-          timeInForce,
-          goodTilTimeInSeconds,
-          execution,
-          postOnly,
-          reduceOnly,
-          triggerPrice ?? undefined
-        );
-
-        const endTimestamp = performance.now();
-
-        track(AnalyticsEvent.TradePlaceOrderConfirmed, {
-          roundtripMs: endTimestamp - startTimestamp,
-          validator: compositeClient!.validatorClient.config.restEndpoint,
-        });
-
-        return result;
-      },
-
-      cancelOrderForSubaccount: async ({
-        subaccount,
-        clientId,
-        clobPairId,
-        orderFlags,
-        goodTilBlock,
-        goodTilBlockTime,
-      }: {
-        subaccount: SubaccountClient;
-        clientId: number;
-        orderFlags: OrderFlags;
-        clobPairId: number;
-        goodTilBlock?: number;
-        goodTilBlockTime?: number;
-      }) => {
-        const startTimestamp = performance.now();
-
-        const result = await compositeClient?.cancelOrder(
-          subaccount,
-          clientId,
-          orderFlags,
-          clobPairId,
-          goodTilBlock,
-          goodTilBlockTime
-        );
-
-        const endTimestamp = performance.now();
-
-        track(AnalyticsEvent.TradeCancelOrderConfirmed, {
-          roundtripMs: endTimestamp - startTimestamp,
-          validator: compositeClient!.validatorClient.config.restEndpoint,
-        });
-
-        return result;
-      },
-
       sendSquidWithdrawFromSubaccount: async ({
         subaccountClient,
         amount,
@@ -353,10 +193,10 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
 
   // ------ Deposit/Withdraw Methods ------ //
   const depositFunds = useCallback(
-    async (balance?: Coin) => {
+    async (balance: AccountBalance) => {
       if (!localDydxWallet) return;
 
-      const amountAfterDust = MustBigNumber(balance?.amount)
+      const amountAfterDust = MustBigNumber(balance.amount)
         .minus(AMOUNT_RESERVED_FOR_GAS_USDC) // keep 0.1 USDC in user's wallet for gas
         .toString();
 
@@ -370,11 +210,14 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
     [localDydxWallet, depositToSubaccount]
   );
 
-  const balance = usePollUSDCBalance({ dydxAddress });
+  const balances = useSelector(getBalances, shallowEqual);
+  const usdcCoinBalance = balances?.[USDC_DENOM];
 
   useEffect(() => {
-    depositFunds(balance);
+    if (usdcCoinBalance) {
-  }, [balance]);
+      depositFunds(usdcCoinBalance);
+    }
+  }, [usdcCoinBalance]);
 
   const deposit = useCallback(
     async (amount: Long) => {
@@ -413,30 +256,6 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
     [subaccountClient, transferFromSubaccountToAddress, transferNativeToken]
   );
 
-  const simulateTransfer = useCallback(
-    async (amount: number, recipient: string, coinDenom: string) => {
-      if (!subaccountClient) {
-        return;
-      }
-
-      return await (coinDenom === USDC_DENOM
-        ? simulateWithdrawFromSubaccount
-        : simulateTransferNativeToken)({ subaccountClient, amount, recipient });
-    },
-    [subaccountClient, simulateWithdrawFromSubaccount, simulateTransferNativeToken]
-  );
-
-  const simulateWithdraw = useCallback(
-    async (amount: number) => {
-      if (!subaccountClient) {
-        return;
-      }
-
-      return await simulateWithdrawFromSubaccount({ subaccountClient, amount });
-    },
-    [subaccountClient, simulateWithdrawFromSubaccount]
-  );
-
   const sendSquidWithdraw = useCallback(
     async (amount: number, payload: string) => {
       if (!subaccountClient) {
@@ -467,101 +286,41 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
       onSuccess,
     }: {
       isClosePosition?: boolean;
-      onError?: (onErrorParams?: { errorStringKey?: string }) => void;
+      onError?: (onErrorParams?: { errorStringKey?: Nullable<string> }) => void;
-      onSuccess?: () => void;
+      onSuccess?: (placeOrderPayload: Nullable<HumanReadablePlaceOrderPayload>) => void;
     }) => {
-      let orderParams: Nullable<HumanReadablePlaceOrderPayload>;
+      const callback = (
+        success: boolean,
+        parsingError?: Nullable<ParsingError>,
+        data?: Nullable<HumanReadablePlaceOrderPayload>
+      ) => {
+        if (success) {
+          onSuccess?.(data);
+        } else {
+          onError?.({ errorStringKey: parsingError?.stringKey });
 
-      if (!subaccountClient) return;
+          if (data?.clientId !== undefined) {
-
+            dispatch(removeUncommittedOrderClientId(data.clientId));
-      try {
+          }
-        orderParams = isClosePosition
-          ? abacusStateManager.closePositionPayload()
-          : abacusStateManager.placeOrderPayload();
-
-        if (!orderParams) {
-          throw new Error('Missing order params');
         }
+      };
 
-        const {
+      let placeOrderParams;
-          marketId,
-          type,
-          side,
-          price,
-          triggerPrice,
-          size,
-          clientId,
-          timeInForce,
-          goodTilTimeInSeconds,
-          execution,
-          postOnly,
-          reduceOnly,
-        } = orderParams;
 
-        dispatch(addUncommittedOrderClientId(clientId));
+      if (isClosePosition) {
-
+        placeOrderParams = abacusStateManager.closePosition(callback);
-        // Remove uncommitted order after timeout if it hasn't already been removed
+      } else {
-        setTimeout(() => {
+        placeOrderParams = abacusStateManager.placeOrder(callback);
-          dispatch(removeUncommittedOrderClientId(clientId));
-        }, UNCOMMITTED_ORDER_TIMEOUT);
-
-        console.log('useSubaccount/placeOrder', {
-          ...orderParams,
-        });
-
-        const response = await placeOrderForSubaccount({
-          subaccount: subaccountClient,
-          marketId,
-          type: type as OrderType,
-          side: side as OrderSide,
-          price,
-          triggerPrice,
-          size,
-          clientId,
-          timeInForce: timeInForce as OrderTimeInForce,
-          goodTilTimeInSeconds: goodTilTimeInSeconds ?? 0,
-          execution: execution as OrderExecution,
-          postOnly,
-          reduceOnly,
-        });
-
-        // Handle Stateful orders
-        if ((response as IndexedTx)?.code !== 0) {
-          throw new StatefulOrderError('Stateful order has failed to commit.', response);
-        }
-
-        if (orderParams?.clientId) {
-          dispatch(removeUncommittedOrderClientId(orderParams.clientId));
-        }
-
-        if (response?.hash) {
-          console.log(
-            isClosePosition
-              ? 'useSubaccount/closePosition'
-              : 'useSubaccount/placeOrderForSubaccount',
-            {
-              txHash: Buffer.from(response.hash).toString('hex').toUpperCase(),
-            }
-          );
-        }
-
-        track(AnalyticsEvent.TradePlaceOrder, {
-          ...orderParams,
-          isClosePosition,
-        } as HumanReadablePlaceOrderPayload & { isClosePosition: boolean });
-        onSuccess?.();
-      } catch (error) {
-        const errorCode: number | undefined = error?.code;
-        const errorStringKey = errorCode ? ORDER_ERROR_CODE_MAP[errorCode] : undefined;
-        onError?.({ errorStringKey });
-
-        log('useSubaccount/placeOrder', error, {
-          orderParams,
-          isClosePosition,
-        });
       }
+
+      track(AnalyticsEvent.TradePlaceOrder, {
+        ...placeOrderParams,
+        isClosePosition,
+      } as HumanReadablePlaceOrderPayload & { isClosePosition: boolean });
+
+      return placeOrderParams;
     },
-    [subaccountClient, placeOrderForSubaccount]
+    [subaccountClient]
   );
 
   const closePosition = useCallback(
@@ -569,8 +328,8 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
       onError,
       onSuccess,
     }: {
-      onError: (onErrorParams?: { errorStringKey?: string }) => void;
+      onError: (onErrorParams?: { errorStringKey?: Nullable<string> }) => void;
-      onSuccess?: () => void;
+      onSuccess?: (placeOrderPayload: Nullable<HumanReadablePlaceOrderPayload>) => void;
     }) => await placeOrder({ isClosePosition: true, onError, onSuccess }),
     [placeOrder]
   );
@@ -582,53 +341,21 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
       onSuccess,
     }: {
       orderId: string;
-      onError?: ({ errorMsg }?: { errorMsg?: string }) => void;
+      onError?: ({ errorStringKey }?: { errorStringKey?: Nullable<string> }) => void;
       onSuccess?: () => void;
     }) => {
-      let cancelOrderParams: Nullable<HumanReadableCancelOrderPayload>;
+      const callback = (success: boolean, parsingError?: Nullable<ParsingError>) => {
-
+        if (success) {
-      if (!subaccountClient) return;
+          track(AnalyticsEvent.TradeCancelOrder);
-
+          onSuccess?.();
-      try {
+        } else {
-        cancelOrderParams = abacusStateManager.cancelOrderPayload(orderId);
+          onError?.({ errorStringKey: parsingError?.stringKey });
-
-        if (!cancelOrderParams) {
-          throw new Error('Missing cancel order params');
         }
+      };
 
-        const { clientId, clobPairId, goodTilBlock, goodTilBlockTime, orderFlags } =
+      abacusStateManager.cancelOrder(orderId, callback);
-          cancelOrderParams;
-
-        // Keep for debugging
-        console.log('useSubaccount/cancelOrder', cancelOrderParams);
-
-        const response = await cancelOrderForSubaccount({
-          subaccount: subaccountClient,
-          clientId,
-          orderFlags,
-          clobPairId,
-          goodTilBlock: goodTilBlock || undefined,
-          goodTilBlockTime: goodTilBlockTime || undefined,
-        });
-
-        // Handle Stateful orders
-        if ((response as IndexedTx)?.code !== 0) {
-          throw new StatefulOrderError('Stateful cancel has failed to commit.', response);
-        }
-
-        if (response?.hash) {
-          console.log('useSubaccount/cancelOrderForSubaccount', {
-            txHash: Buffer.from(response.hash).toString('hex').toUpperCase(),
-          });
-        }
-
-        onSuccess?.();
-      } catch (error) {
-        onError?.();
-        log('useSubaccount/cancelOrder', error, cancelOrderParams);
-      }
     },
-    [subaccountClient, cancelOrderForSubaccount]
+    [subaccountClient]
   );
 
   return {
@@ -638,9 +365,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
     requestFaucetFunds,
 
     // Transfer Methods
-    simulateTransfer,
     transfer,
-    simulateWithdraw,
     sendSquidWithdraw,
 
     // Trading Methods

src/icons/logo-short.tsx

@@ -1,4 +1,4 @@
-const LogoShortIcon: React.FC<{ id?: string }> = ({ id }) => (
+const LogoShortIcon: React.FC<{ id?: string }> = ({ id }: { id?: string }) => (
   <svg
     width="135"
     height="145"

src/layout/Header/HeaderDesktop.tsx

@@ -7,10 +7,9 @@ import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
 import { AppRoute } from '@/constants/routes';
 import { useStringGetter } from '@/hooks';
-import { LogoShortIcon } from '@/icons';
+import { LogoShortIcon, BellIcon } from '@/icons';
 
 import { Icon, IconName } from '@/components/Icon';
-import { BellIcon } from '@/icons';
 import { IconButton } from '@/components/IconButton';
 import { NavigationMenu } from '@/components/NavigationMenu';
 import { VerticalSeparator } from '@/components/Separator';

src/layout/NotificationsToastArea.tsx

@@ -15,12 +15,20 @@ type StyleProps = {
 };
 
 export const NotificationsToastArea = ({ className }: StyleProps) => {
-  const { notifications, getKey, getDisplayData, markUnseen, markSeen, isMenuOpen, onNotificationAction } = useNotifications();
+  const {
+    notifications,
+    getKey,
+    getDisplayData,
+    markUnseen,
+    markSeen,
+    isMenuOpen,
+    onNotificationAction,
+  } = useNotifications();
 
   const { isMobile } = useBreakpoints();
 
   return (
-    <$ToastArea swipeDirection={isMobile ? 'up' : 'right'} className={className}>
+    <StyledToastArea swipeDirection={isMobile ? 'up' : 'right'} className={className}>
       {Object.values(notifications)
         // Sort by time of first trigger
         .sort(
@@ -53,19 +61,20 @@ export const NotificationsToastArea = ({ className }: StyleProps) => {
             sensitivity={displayData.toastSensitivity}
             setIsOpen={(isOpen, isClosedFromTimeout) => {
               if (!isOpen)
-                // Toast timer expired without user interaction
+                if (isClosedFromTimeout)
-                if (isClosedFromTimeout) markUnseen(notification);
+                  // Toast timer expired without user interaction
+                  markUnseen(notification);
                 // Toast interacted with or dismissed
                 else markSeen(notification);
             }}
             lastUpdated={notification.timestamps[notification.status]}
           />
         ))}
-    </$ToastArea>
+    </StyledToastArea>
   );
 };
 
-const $ToastArea = styled(ToastArea)`
+const StyledToastArea = styled(ToastArea)`
   position: absolute;
   width: min(16rem, 100%);
   inset: 0 0 0 auto;

src/lib/abacus/analytics.ts

@@ -0,0 +1,18 @@
+import type { AbacusTrackingProtocol, Nullable } from '@/constants/abacus';
+import type { AnalyticsEvent } from '@/constants/analytics';
+
+import { track } from '../analytics';
+import { log as telemetryLog } from '../telemetry';
+
+class AbacusAnalytics implements AbacusTrackingProtocol {
+  log(event: string, data: Nullable<string>) {
+    try {
+      const parsedData = data ? JSON.parse(data) : {};
+      track(event as AnalyticsEvent, parsedData);
+    } catch (error) {
+      telemetryLog('AbacusAnalytics/log', error);
+    }
+  }
+}
+
+export default AbacusAnalytics;

src/lib/abacus/dydxChainTransactions.ts

@@ -1,28 +1,63 @@
-import Abacus, { Nullable } from '@dydxprotocol/abacus';
+import Abacus, { type Nullable } from '@dydxprotocol/v4-abacus';
 import Long from 'long';
+import type { IndexedTx } from '@cosmjs/stargate';
 
 import {
   CompositeClient,
   IndexerConfig,
+  type LocalWallet,
   Network,
   NetworkOptimizer,
+  SubaccountClient,
   ValidatorConfig,
+  OrderType,
+  OrderSide,
+  OrderTimeInForce,
+  OrderExecution,
+  DYDX_DENOM,
+  GAS_PRICE_DYDX_DENOM,
 } from '@dydxprotocol/v4-client-js';
 
 import {
   type AbacusDYDXChainTransactionsProtocol,
   QueryType,
   type QueryTypes,
+  TransactionType,
   type TransactionTypes,
+  type HumanReadablePlaceOrderPayload,
+  type HumanReadableCancelOrderPayload,
+  type HumanReadableWithdrawPayload,
+  type HumanReadableTransferPayload,
 } from '@/constants/abacus';
 
+import { DialogTypes } from '@/constants/dialogs';
+import { UNCOMMITTED_ORDER_TIMEOUT_MS } from '@/constants/trade';
+import { QUANTUM_MULTIPLIER } from '@/constants/numbers';
+
+import { RootStore } from '@/state/_store';
+import { addUncommittedOrderClientId, removeUncommittedOrderClientId } from '@/state/account';
+import { openDialog } from '@/state/dialogs';
+
+import { StatefulOrderError } from '../errors';
+import { bytesToBigInt } from '../numbers';
 import { log } from '../telemetry';
 
 class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
   private compositeClient: CompositeClient | undefined;
+  private store: RootStore | undefined;
+  private localWallet: LocalWallet | undefined;
 
   constructor() {
     this.compositeClient = undefined;
+    this.store = undefined;
+  }
+
+  setStore(store: RootStore): void {
+    this.store = store;
+  }
+
+  setLocalWallet(localWallet: LocalWallet) {
+    this.localWallet = localWallet;
   }
 
   async connectNetwork(
@@ -33,30 +68,41 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
     faucetUrl: Nullable<string> | undefined,
     callback: (p0: Nullable<string>) => void
   ): Promise<void> {
-    this.compositeClient = await CompositeClient.connect(
+    try {
-      new Network(
+      const compositeClient = await CompositeClient.connect(
-        chainId,
+        new Network(
-        new IndexerConfig(indexerUrl, indexerSocketUrl),
+          chainId,
-        new ValidatorConfig(validatorUrl, chainId, {
+          new IndexerConfig(indexerUrl, indexerSocketUrl),
-          broadcastPollIntervalMs: 3_000,
+          new ValidatorConfig(validatorUrl, chainId, {
-          broadcastTimeoutMs: 60_000,
+            broadcastPollIntervalMs: 3_000,
-        })
+            broadcastTimeoutMs: 60_000,
-      )
+          })
-    );
+        )
+      );
 
-    // Dispatch custom event to notify other parts of the app that the network has been connected
+      this.compositeClient = compositeClient;
-    const customEvent = new CustomEvent('abacus:connectNetwork', {
-      detail: {
-        indexerUrl,
-        indexerSocketUrl,
-        validatorUrl,
-        chainId,
-        faucetUrl,
-      },
-    });
 
-    globalThis.dispatchEvent(customEvent);
+      // Dispatch custom event to notify other parts of the app that the network has been connected
-    callback(JSON.stringify({ success: true }));
+      const customEvent = new CustomEvent('abacus:connectNetwork', {
+        detail: {
+          indexerUrl,
+          indexerSocketUrl,
+          validatorUrl,
+          chainId,
+          faucetUrl,
+        },
+      });
+
+      globalThis.dispatchEvent(customEvent);
+      callback(JSON.stringify({ success: true }));
+    } catch (error) {
+      this.store?.dispatch(
+        openDialog({ type: DialogTypes.ExchangeOffline, dialogProps: { preventClose: true } })
+      );
+
+      log('DydxChainTransactions/connectNetwork', error);
+      return;
+    }
   }
 
   parseToPrimitives<T>(x: T): T {
@@ -72,6 +118,10 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
       return x.toString() as T;
     }
 
+    if (x instanceof Uint8Array) {
+      return bytesToBigInt(x).toString() as T;
+    }
+
     if (typeof x === 'object') {
       const parsedObj: { [key: string]: any } = {};
       for (const key in x) {
@@ -85,14 +135,218 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
     throw new Error(`Unsupported data type: ${typeof x}`);
   }
 
+  async placeOrderTransaction(params: HumanReadablePlaceOrderPayload): Promise<string> {
+    if (!this.compositeClient || !this.localWallet)
+      throw new Error('Missing compositeClient or localWallet');
+
+    try {
+      const {
+        subaccountNumber,
+        marketId,
+        type,
+        side,
+        price,
+        size,
+        clientId,
+        timeInForce,
+        goodTilTimeInSeconds,
+        execution,
+        postOnly,
+        reduceOnly,
+        triggerPrice,
+      } = params || {};
+
+      // Observe uncommitted order
+      this.store?.dispatch(addUncommittedOrderClientId(clientId));
+
+      setTimeout(() => {
+        this.store?.dispatch(removeUncommittedOrderClientId(clientId));
+      }, UNCOMMITTED_ORDER_TIMEOUT_MS);
+
+      // Place order
+      const tx = await this.compositeClient?.placeOrder(
+        new SubaccountClient(this.localWallet, subaccountNumber),
+        marketId,
+        type as OrderType,
+        side as OrderSide,
+        price,
+        size,
+        clientId,
+        timeInForce as OrderTimeInForce,
+        goodTilTimeInSeconds ?? 0,
+        execution as OrderExecution,
+        postOnly,
+        reduceOnly,
+        triggerPrice ?? undefined
+      );
+
+      // Handle stateful orders
+      if ((tx as IndexedTx)?.code !== 0) {
+        throw new StatefulOrderError('Stateful order has failed to commit.', tx);
+      }
+
+      const parsedTx = this.parseToPrimitives(tx);
+      const hash = parsedTx?.hash;
+
+      if (import.meta.env.MODE === 'production') {
+        console.log(`https://testnet.mintscan.io/dydx-testnet/txs/${hash}`);
+      } else console.log(`txHash: ${hash}`);
+
+      return JSON.stringify(parsedTx);
+    } catch (error) {
+      if (error?.name !== 'BroadcastError') {
+        log('DydxChainTransactions/placeOrderTransaction', error);
+      }
+
+      return JSON.stringify({
+        error,
+      });
+    }
+  }
+
+  async cancelOrderTransaction(params: HumanReadableCancelOrderPayload): Promise<string> {
+    if (!this.compositeClient || !this.localWallet) {
+      throw new Error('Missing compositeClient or localWallet');
+    }
+
+    const { subaccountNumber, clientId, orderFlags, clobPairId, goodTilBlock, goodTilBlockTime } =
+      params ?? {};
+
+    try {
+      const tx = await this.compositeClient?.cancelOrder(
+        new SubaccountClient(this.localWallet, subaccountNumber),
+        clientId,
+        orderFlags,
+        clobPairId,
+        goodTilBlock ?? undefined,
+        goodTilBlockTime ?? undefined
+      );
+
+      const parsedTx = this.parseToPrimitives(tx);
+
+      return JSON.stringify(parsedTx);
+    } catch (error) {
+      log('DydxChainTransactions/cancelOrderTransaction', error);
+
+      return JSON.stringify({
+        error,
+      });
+    }
+  }
+
+  async simulateWithdrawTransaction(params: HumanReadableWithdrawPayload): Promise<string> {
+    if (!this.compositeClient || !this.localWallet) {
+      throw new Error('Missing compositeClient or localWallet');
+    }
+
+    const { subaccountNumber, amount } = params ?? {};
+    const compositeClient = this.compositeClient;
+    const subaccountClient = new SubaccountClient(this.localWallet, subaccountNumber);
+
+    try {
+      const tx = await compositeClient.simulate(
+        this.localWallet,
+        () =>
+          new Promise((resolve) => {
+            const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount);
+
+            resolve([msg]);
+          }),
+      );
+
+      const parsedTx = this.parseToPrimitives(tx);
+
+      return JSON.stringify(parsedTx);
+    } catch (error) {
+      log('DydxChainTransactions/simulateWithdrawTransaction', error);
+
+      return JSON.stringify({
+        error,
+      });
+    }
+  }
+
+  async simulateTransferNativeTokenTransaction(params: HumanReadableTransferPayload): Promise<string> {
+    if (!this.compositeClient || !this.localWallet) {
+      throw new Error('Missing compositeClient or localWallet');
+    }
+
+    const { subaccountNumber, amount, recipient } = params ?? {};
+    const compositeClient = this.compositeClient;
+    const subaccountClient = new SubaccountClient(this.localWallet, subaccountNumber);
+
+    try {
+      const tx = await compositeClient.simulate(
+        this.localWallet,
+        () =>
+          new Promise((resolve) => {
+            const msg = compositeClient?.validatorClient.post.composer.composeMsgSendToken(
+              subaccountClient.address,
+              recipient,
+              DYDX_DENOM,
+              Long.fromNumber(amount * QUANTUM_MULTIPLIER)
+            );
+
+            resolve([msg]);
+          }),
+        GAS_PRICE_DYDX_DENOM,
+      );
+
+      const parsedTx = this.parseToPrimitives(tx);
+
+      return JSON.stringify(parsedTx);
+    } catch (error) {
+      log('DydxChainTransactions/simulateTransferNativeTokenTransaction', error);
+
+      return JSON.stringify({
+        error,
+      });
+    }
+  }
 
   async transaction(
     type: TransactionTypes,
     paramsInJson: Abacus.Nullable<string>,
     callback: (p0: Abacus.Nullable<string>) => void
   ): Promise<void> {
-    // To be implemented
+    try {
-    return;
+      const params = paramsInJson ? JSON.parse(paramsInJson) : undefined;
+
+      switch (type) {
+        case TransactionType.PlaceOrder: {
+          const result = await this.placeOrderTransaction(params);
+          callback(result);
+          break;
+        }
+        case TransactionType.CancelOrder: {
+          const result = await this.cancelOrderTransaction(params);
+          callback(result);
+          break;
+        }
+        case TransactionType.simulateWithdraw: {
+          const result = await this.simulateWithdrawTransaction(params);
+          callback(result);
+          break;
+        }
+        case TransactionType.simulateTransferNativeToken: {
+          const result = await this.simulateTransferNativeTokenTransaction(params);
+          callback(result);
+          break;
+        }
+        default: {
+          break;
+        }
+      }
+    } catch (error) {
+      try {
+        const serializedError = JSON.stringify(error);
+        callback(serializedError);
+      } catch (parseError) {
+        log('DydxChainTransactions/transaction', parseError);
+      }
+
+      log('DydxChainTransactions/transaction', error);
+    }
   }
 
   async get(
@@ -116,6 +370,12 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
           );
           callback(JSON.stringify({ url: optimalNode }));
           break;
+        case QueryType.EquityTiers:
+          const equityTiers =
+            await this.compositeClient?.validatorClient.get.getEquityTierLimitConfiguration();
+          const parsedEquityTiers = this.parseToPrimitives(equityTiers);
+          callback(JSON.stringify(parsedEquityTiers));
+          break;
         case QueryType.FeeTiers:
           const feeTiers = await this.compositeClient?.validatorClient.get.getFeeTiers();
           const parsedFeeTiers = this.parseToPrimitives(feeTiers);
@@ -135,6 +395,14 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
           const parsedUserStats = this.parseToPrimitives(userStats);
           callback(JSON.stringify(parsedUserStats));
           break;
+        case QueryType.GetAccountBalances:
+          if (!this.localWallet?.address) throw new Error('Missing localWallet');
+          const accountBalances = await this.compositeClient?.validatorClient.get.getAccountBalances(
+            this.localWallet.address
+          );
+          const parsedAccountBalances = this.parseToPrimitives(accountBalances);
+          callback(JSON.stringify(parsedAccountBalances));
+          break;
         // Do not implement Transfers (yet)
         case QueryType.Transfers:
         default:

src/lib/abacus/index.ts

@@ -1,3 +1,5 @@
+import type { LocalWallet } from '@dydxprotocol/v4-client-js';
+
 import type {
   ClosePositionInputFields,
   Nullable,
@@ -6,6 +8,7 @@ import type {
   TradeInputFields,
   TransferInputFields,
   HistoricalPnlPeriods,
+  ParsingError,
 } from '@/constants/abacus';
 
 import {
@@ -30,6 +33,7 @@ import { getInputTradeOptions } from '@/state/inputsSelectors';
 import { getTransferInputs } from '@/state/inputsSelectors';
 
 import AbacusRest from './rest';
+import AbacusAnalytics from './analytics';
 import AbacusWebsocket from './websocket';
 import AbacusChainTransaction from './dydxChainTransactions';
 import AbacusStateNotifier from './stateNotification';
@@ -45,21 +49,25 @@ class AbacusStateManager {
   stateManager: InstanceType<typeof AsyncAbacusStateManager>;
   websocket: AbacusWebsocket;
   stateNotifier: AbacusStateNotifier;
+  analytics: AbacusAnalytics;
   abacusFormatter: AbacusFormatter;
+  chainTransactions: AbacusChainTransaction;
 
   constructor() {
     this.store = undefined;
     this.currentMarket = undefined;
     this.stateNotifier = new AbacusStateNotifier();
+    this.analytics = new AbacusAnalytics();
     this.websocket = new AbacusWebsocket();
     this.abacusFormatter = new AbacusFormatter();
+    this.chainTransactions = new AbacusChainTransaction();
 
     const ioImplementations = new IOImplementations(
       // @ts-ignore
       new AbacusRest(),
       this.websocket,
-      new AbacusChainTransaction(),
+      this.chainTransactions,
-      null,
+      this.analytics,
       new AbacusThreading(),
       new CoroutineTimer(),
       new AbacusFileSystem()
@@ -155,10 +163,14 @@ class AbacusStateManager {
   setStore = (store: RootStore) => {
     this.store = store;
     this.stateNotifier.setStore(store);
+    this.chainTransactions.setStore(store);
   };
 
-  setAccount = (walletAddress: string) => {
+  setAccount = (localWallet?: LocalWallet) => {
-    this.stateManager.accountAddress = walletAddress;
+    if (localWallet) {
+      this.stateManager.accountAddress = localWallet.address;
+      this.chainTransactions.setLocalWallet(localWallet);
+    }
   };
 
   setTransfersSourceAddress = (evmAddress: string) => {
@@ -216,16 +228,34 @@ class AbacusStateManager {
     this.stateManager.transferStatus(hash, fromChainId, toChainId);
   };
 
+  // ------ Transactions ------ //
+
+  placeOrder = (
+    callback: (
+      success: boolean,
+      parsingError: Nullable<ParsingError>,
+      data: Nullable<HumanReadablePlaceOrderPayload>
+    ) => void
+  ): Nullable<HumanReadablePlaceOrderPayload> => this.stateManager.commitPlaceOrder(callback);
+
+  closePosition = (
+    callback: (
+      success: boolean,
+      parsingError: Nullable<ParsingError>,
+      data: Nullable<HumanReadablePlaceOrderPayload>
+    ) => void
+  ): Nullable<HumanReadablePlaceOrderPayload> => this.stateManager.commitClosePosition(callback);
+
+  cancelOrder = (
+    orderId: string,
+    callback: (
+      success: boolean,
+      parsingError: Nullable<ParsingError>,
+      data: Nullable<HumanReadableCancelOrderPayload>
+    ) => void
+  ) => this.stateManager.cancelOrder(orderId, callback);
+
   // ------ Utils ------ //
-  placeOrderPayload = (): Nullable<HumanReadablePlaceOrderPayload> =>
-    this.stateManager.placeOrderPayload();
-
-  closePositionPayload = (): Nullable<HumanReadablePlaceOrderPayload> =>
-    this.stateManager.closePositionPayload();
-
-  cancelOrderPayload = (orderId: string): Nullable<HumanReadableCancelOrderPayload> =>
-    this.stateManager.cancelOrderPayload(orderId);
-
   getHistoricalPnlPeriod = (): Nullable<HistoricalPnlPeriods> =>
     this.stateManager.historicalPnlPeriod;
 

src/lib/abacus/rest.ts

@@ -1,4 +1,4 @@
-import type { Nullable, kollections } from '@dydxprotocol/abacus';
+import type { Nullable, kollections } from '@dydxprotocol/v4-abacus';
 
 import type { AbacusRestProtocol } from '@/constants/abacus';
 

src/lib/abacus/stateNotification.ts

@@ -1,6 +1,7 @@
-import { kollections } from '@dydxprotocol/abacus';
+import { kollections } from '@dydxprotocol/v4-abacus';
 
 import type {
+  AccountBalance,
   AbacusApiState,
   AbacusNotification,
   AbacusStateNotificationProtocol,
@@ -18,9 +19,11 @@ import { Changes } from '@/constants/abacus';
 import type { RootStore } from '@/state/_store';
 
 import {
+  setBalances,
   setFills,
   setFundingPayments,
   setHistoricalPnl,
+  setLatestOrder,
   setSubaccount,
   setTransfers,
   setWallet,
@@ -71,6 +74,16 @@ class AbacusStateNotifier implements AbacusStateNotificationProtocol {
         );
       }
 
+      if (changes.has(Changes.accountBalances)) {
+        if (updatedState.account?.balances) {
+          const balances: Record<string, AccountBalance> = {}
+          for (const { k, v } of updatedState.account.balances.toArray()) {
+            balances[k] = v;
+          }
+          dispatch(setBalances(balances));
+        }
+      }
+
       if (changes.has(Changes.configs)) {
         dispatch(setConfigs(updatedState.configs));
       }
@@ -155,7 +168,9 @@ class AbacusStateNotifier implements AbacusStateNotificationProtocol {
     }
   }
 
-  lastOrderChanged(order: SubaccountOrder) {}
+  lastOrderChanged(order: SubaccountOrder) {
+    this.store?.dispatch(setLatestOrder(order));
+  }
 
   errorsEmitted(errors: ParsingErrors) {
     console.error('parse errors', errors.toArray());

src/lib/analytics.ts

@@ -5,10 +5,15 @@ import type {
   AnalyticsEventData,
 } from '@/constants/analytics';
 
+const DEBUG_ANALYTICS = false;
+
 export const identify = <T extends AnalyticsUserProperty>(
   property: T,
   propertyValue: AnalyticsUserPropertyValue<T>
 ) => {
+  if (DEBUG_ANALYTICS) {
+    console.log(`[Analytics:Identify] ${property}`, propertyValue);
+  }
   const customEvent = new CustomEvent('dydx:identify', {
     detail: { property, propertyValue },
   });
@@ -20,6 +25,9 @@ export const track = <T extends AnalyticsEvent>(
   eventType: T,
   eventData?: AnalyticsEventData<T>
 ) => {
+  if (DEBUG_ANALYTICS) {
+    console.log(`[Analytics] ${eventType}`, eventData);
+  }
   const customEvent = new CustomEvent('dydx:track', {
     detail: { eventType, eventData },
   });

src/lib/numbers.ts

@@ -48,7 +48,7 @@ export const isNumber = (value: any): value is number =>
 /**
  * @description Returns null if input is 0 or null, '99+' if input is greater than 99, otherwise original input number
  */
-export const shorternNumberForDisplay = (num?: number) =>
+export const shortenNumberForDisplay = (num?: number) =>
   MustBigNumber(num).eq(0) ? null : MustBigNumber(num).gt(99) ? '99+' : num;
 
 /**
@@ -66,3 +66,17 @@ export const getSeparator = ({
   Intl.NumberFormat(browserLanguage)
     .formatToParts(1000.1)
     .find?.((part) => part.type === separatorType)?.value;
+
+/**
+ * Converts a byte array (representing an arbitrary-size signed integer) into a bigint.
+ * @param u Array of bytes represented as a Uint8Array.
+ */
+export function bytesToBigInt(u: Uint8Array): bigint {
+  if (u.length <= 1) {
+    return BigInt(0);
+  }
+  const negated: boolean = (u[0] & 1) === 1;
+  const hex: string = Buffer.from(u.slice(1)).toString('hex');
+  const abs: bigint = BigInt(`0x${hex}`);
+  return negated ? -abs : abs;
+}

src/lib/orders.ts

@@ -58,6 +58,12 @@ export const getStatusIconInfo = ({
         statusIconColor: `var(--color-negative)`,
       };
     }
+    case AbacusOrderStatus.untriggered: {
+      return {
+        statusIcon: IconName.OrderUntriggered,
+        statusIconColor: `var(--color-text-2)`,
+      };
+    }
     case AbacusOrderStatus.pending:
     default: {
       return {

src/lib/telemetry.ts

@@ -1,5 +1,7 @@
 export const log = (location: string, error: Error, metadata?: any) => {
-  // console.warn(error);
+  if (import.meta.env.MODE !== 'production') {
+    console.warn('telemetry/log:', { location, error, metadata });
+  }
 
   const customEvent = new CustomEvent('dydx:log', {
     detail: {
@@ -16,7 +18,10 @@ export const log = (location: string, error: Error, metadata?: any) => {
 globalThis.addEventListener('unhandledrejection', (event) => {
   event.preventDefault();
 
-  log('window/onunhandledrejection', new Error(`Promise rejected and uncaught; reason: ${event.reason}`));
+  log(
+    'window/onunhandledrejection',
+    new Error(`Promise rejected and uncaught; reason: ${event.reason}`)
+  );
 });
 
 // Log rejected Promises that are caught late (handler attached at a later time)
@@ -25,7 +30,10 @@ globalThis.addEventListener(
   (event) => {
     event.preventDefault();
 
-    log('window/onrejectionhandled', new Error(`Promise rejected and caught late; reason: ${event.reason}`));
+    log(
+      'window/onrejectionhandled',
+      new Error(`Promise rejected and caught late; reason: ${event.reason}`)
+    );
   },
   false
 );

src/pages/portfolio/Fees.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Nullable } from '@dydxprotocol/abacus';
+import { Nullable } from '@dydxprotocol/v4-abacus';
 import styled, { AnyStyledComponent } from 'styled-components';
 import { shallowEqual, useSelector } from 'react-redux';
 
@@ -270,11 +270,11 @@ Styled.FeeTable = styled(Table)`
   --table-cell-align: end;
 
   font: var(--font-base-book);
- 
+
   tbody tr {
     &[data-yours='true'] {
       background-color: var(--color-layer-3);
-      
+
       td:first-child {
         border-left: 0.125rem solid var(--color-accent);
       }

src/pages/trade/HorizontalPanel.tsx

@@ -2,6 +2,7 @@ import { useState } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import styled, { type AnyStyledComponent } from 'styled-components';
 
+import { AbacusOrderStatus } from '@/constants/abacus';
 import { STRING_KEYS } from '@/constants/localization';
 
 import { useBreakpoints, useStringGetter } from '@/hooks';
@@ -18,20 +19,23 @@ import { FillsTable, FillsTableColumnKey } from '@/views/tables/FillsTable';
 import { OrdersTable, OrdersTableColumnKey } from '@/views/tables/OrdersTable';
 import { PositionsTable, PositionsTableColumnKey } from '@/views/tables/PositionsTable';
 
-import { calculateIsAccountViewOnly } from '@/state/accountCalculators';
-
 import {
   calculateHasUncommittedOrders,
+  calculateIsAccountViewOnly,
+} from '@/state/accountCalculators';
+
+import {
   getCurrentMarketTradeInfoNumbers,
   getHasUnseenFillUpdates,
   getHasUnseenOrderUpdates,
+  getLatestOrderStatus,
   getTradeInfoNumbers,
 } from '@/state/accountSelectors';
 
 import { getCurrentMarketAssetId, getCurrentMarketId } from '@/state/perpetualsSelectors';
 
 import { isTruthy } from '@/lib/isTruthy';
-import { shorternNumberForDisplay } from '@/lib/numbers';
+import { shortenNumberForDisplay } from '@/lib/numbers';
 
 import { PositionInfo } from '@/views/PositionInfo';
 
@@ -69,13 +73,12 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
   const hasUnseenOrderUpdates = useSelector(getHasUnseenOrderUpdates);
   const hasUnseenFillUpdates = useSelector(getHasUnseenFillUpdates);
   const isAccountViewOnly = useSelector(calculateIsAccountViewOnly);
-  const hasUncommittedOrders = useSelector(calculateHasUncommittedOrders);
+  const isWaitingForOrderToIndex = useSelector(calculateHasUncommittedOrders);
-
   const showCurrentMarket = isTablet || view === PanelView.CurrentMarket;
 
-  const fillsTagNumber = shorternNumberForDisplay(showCurrentMarket ? numFills : numTotalFills);
+  const fillsTagNumber = shortenNumberForDisplay(showCurrentMarket ? numFills : numTotalFills);
 
-  const ordersTagNumber = shorternNumberForDisplay(
+  const ordersTagNumber = shortenNumberForDisplay(
     showCurrentMarket ? numOpenOrders : numTotalOpenOrders
   );
 
@@ -86,7 +89,7 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
         key: showCurrentMarket ? STRING_KEYS.POSITION : STRING_KEYS.POSITIONS,
       }),
 
-      tag: showCurrentMarket ? null : shorternNumberForDisplay(numTotalPositions),
+      tag: showCurrentMarket ? null : shortenNumberForDisplay(numTotalPositions),
 
       content: showCurrentMarket ? (
         <PositionInfo showNarrowVariation={isTablet} />
@@ -118,7 +121,7 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
       value: InfoSection.Orders,
       label: stringGetter({ key: STRING_KEYS.ORDERS }),
 
-      slotRight: hasUncommittedOrders ? (
+      slotRight: isWaitingForOrderToIndex ? (
         <Styled.LoadingSpinner />
       ) : (
         ordersTagNumber && (
@@ -190,7 +193,7 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
     //   value: InfoSection.Payments,
     //   label: stringGetter({ key: STRING_KEYS.PAYMENTS }),
 
-    //   tag: shorternNumberForDisplay(
+    //   tag: shortenNumberForDisplay(
     //     showCurrentMarket ? numFundingPayments : numTotalFundingPayments
     //   ),
     //   content: (

src/state/_store.ts

@@ -1,9 +1,9 @@
 import { configureStore } from '@reduxjs/toolkit';
 
+import abacusStateManager from '@/lib/abacus';
 import appMiddleware from './appMiddleware';
 import localizationMiddleware from './localizationMiddleware';
 import routerMiddleware from './routerMiddleware';
-import tradeMiddleware from './tradeMiddleware';
 
 import { accountSlice } from './account';
 import { appSlice } from './app';
@@ -16,8 +16,6 @@ import { localizationSlice } from './localization';
 import { navigationSlice } from './navigation';
 import { perpetualsSlice } from './perpetuals';
 
-import abacusStateManager from '@/lib/abacus';
-
 export const commandMenuSlices = [layoutSlice, localizationSlice];
 
 export const store = configureStore({
@@ -41,7 +39,6 @@ export const store = configureStore({
     appMiddleware,
     localizationMiddleware,
     routerMiddleware,
-    tradeMiddleware,
   ],
 
   devTools: process.env.NODE_ENV !== 'production',

src/state/account.ts

@@ -1,7 +1,7 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
-import _ from 'lodash';
 
 import type {
+  AccountBalance,
   SubaccountFill,
   Nullable,
   Subaccount,
@@ -25,16 +25,18 @@ export type AccountState = {
   fundingPayments?: SubaccountFundingPayments;
   transfers?: SubaccountTransfers;
   clearedOrderIds?: string[];
-  uncommittedOrderClientIds?: number[];
   hasUnseenFillUpdates: boolean;
   hasUnseenOrderUpdates: boolean;
   historicalPnl?: SubAccountHistoricalPNLs;
+  latestOrder?: Nullable<SubaccountOrder>;
   onboardingGuards: Record<OnboardingGuard, boolean | undefined>;
   onboardingState: OnboardingState;
   subaccount?: Nullable<Subaccount>;
+  uncommittedOrderClientIds: number[];
   wallet?: Nullable<Wallet>;
   walletType?: WalletType;
   historicalPnlPeriod?: HistoricalPnlPeriods;
+  balances?: Record<string, AccountBalance>;
 };
 
 const initialState: AccountState = {
@@ -42,10 +44,10 @@ const initialState: AccountState = {
   fundingPayments: undefined,
   transfers: undefined,
   clearedOrderIds: undefined,
-  uncommittedOrderClientIds: undefined,
   hasUnseenFillUpdates: false,
   hasUnseenOrderUpdates: false,
   historicalPnl: undefined,
+  latestOrder: undefined,
   onboardingGuards: {
     [OnboardingGuard.hasAcknowledgedTerms]: Boolean(
       getLocalStorage<boolean>({
@@ -57,6 +59,7 @@ const initialState: AccountState = {
   },
   onboardingState: OnboardingState.Disconnected,
   subaccount: undefined,
+  uncommittedOrderClientIds: [],
   wallet: undefined,
   walletType: getLocalStorage<WalletType>({
     key: LocalStorageKey.OnboardingSelectedWalletType,
@@ -87,6 +90,16 @@ export const accountSlice = createSlice({
     setTransfers: (state, action: PayloadAction<any>) => {
       state.transfers = action.payload;
     },
+    setLatestOrder: (state, action: PayloadAction<Nullable<SubaccountOrder>>) => {
+      const { clientId } = action.payload ?? {};
+      state.latestOrder = action.payload;
+
+      if (clientId) {
+        state.uncommittedOrderClientIds = state.uncommittedOrderClientIds.filter(
+          (id) => id !== clientId
+        );
+      }
+    },
     clearOrder: (state, action: PayloadAction<string>) => ({
       ...state,
       clearedOrderIds: [...(state.clearedOrderIds || []), action.payload],
@@ -132,22 +145,23 @@ export const accountSlice = createSlice({
       ...state,
       wallet: action.payload,
     }),
-    addUncommittedOrderClientId: (state, action: PayloadAction<number>) => {
-      state.uncommittedOrderClientIds = state.uncommittedOrderClientIds
-        ? [...state.uncommittedOrderClientIds, action.payload]
-        : [action.payload];
-    },
-    removeUncommittedOrderClientId: (state, action: PayloadAction<number>) => {
-      state.uncommittedOrderClientIds = state.uncommittedOrderClientIds?.filter(
-        (clientId) => clientId !== action.payload
-      );
-    },
     viewedFills: (state) => {
       state.hasUnseenFillUpdates = false;
     },
     viewedOrders: (state) => {
       state.hasUnseenOrderUpdates = false;
     },
+    setBalances: (state, action: PayloadAction<Record<string, AccountBalance>>) => {
+      state.balances = action.payload;
+    },
+    addUncommittedOrderClientId: (state, action: PayloadAction<number>) => {
+      state.uncommittedOrderClientIds.push(action.payload);
+    },
+    removeUncommittedOrderClientId: (state, action: PayloadAction<number>) => {
+      state.uncommittedOrderClientIds = state.uncommittedOrderClientIds.filter(
+        (id) => id !== action.payload
+      );
+    },
   },
 });
 
@@ -155,14 +169,16 @@ export const {
   setFills,
   setFundingPayments,
   setTransfers,
+  setLatestOrder,
   clearOrder,
   setOnboardingGuard,
   setOnboardingState,
   setHistoricalPnl,
   setSubaccount,
   setWallet,
-  addUncommittedOrderClientId,
-  removeUncommittedOrderClientId,
   viewedFills,
   viewedOrders,
+  setBalances,
+  addUncommittedOrderClientId,
+  removeUncommittedOrderClientId,
 } = accountSlice.actions;

src/state/accountCalculators.ts

@@ -9,6 +9,7 @@ import {
   getOnboardingGuards,
   getOnboardingState,
   getSubaccountId,
+  getUncommittedOrderClientIds,
 } from '@/state/accountSelectors';
 
 import { getSelectedNetwork } from '@/state/appSelectors';
@@ -69,6 +70,11 @@ export const calculateHasOpenPositions = createSelector(
   (openPositions?: SubaccountPosition[]) => (openPositions?.length || 0) > 0
 );
 
+export const calculateHasUncommittedOrders = createSelector(
+  [getUncommittedOrderClientIds],
+  (uncommittedOrderClientIds: number[]) => uncommittedOrderClientIds.length > 0
+);
+
 /**
  * @description calculate whether the client is loading info.
  * (account is connected but subaccountId is till missing)

src/state/accountSelectors.ts

@@ -12,9 +12,8 @@ import {
 
 import { OnboardingState } from '@/constants/account';
 
-import type { RootState } from './_store';
-
 import { getHydratedTradingData } from '@/lib/orders';
+import type { RootState } from './_store';
 
 import { getCurrentMarketId, getPerpetualMarkets } from './perpetualsSelectors';
 import { getAssets } from './assetsSelectors';
@@ -79,6 +78,12 @@ export const getCurrentMarketPositionData = (state: RootState) => {
 export const getSubaccountOrders = (state: RootState) =>
   state.account.subaccount?.orders?.toArray();
 
+/**
+ * @param state
+ * @returns latestOrder of the currently connected subaccount throughout this session
+ */
+export const getLatestOrder = (state: RootState) => state.account?.latestOrder;
+
 /**
  * @param state
  * @returns list of order ids that user has cleared and should be hidden
@@ -106,25 +111,46 @@ export const getSubaccountOpenOrdersBySideAndPrice = createSelector(
   [getSubaccountOpenOrders],
   (openOrders = []) => {
     const ordersBySide: Partial<Record<OrderSide, Record<number, SubaccountOrder>>> = {};
-    for (const order of openOrders) {
+    openOrders.forEach((order) => {
       const side = ORDER_SIDES[order.side.name];
       const byPrice = (ordersBySide[side] ??= {});
       byPrice[order.price] = order;
-    }
+    });
     return ordersBySide;
   }
 );
 
 /**
- * @param state
+ * @returns the clientId of the latest order
+ */
+export const getLatestOrderClientId = createSelector([getLatestOrder], (order) => order?.clientId);
+
+/**
+ * @returns the rawValue status of the latest order
+ */
+export const getLatestOrderStatus = createSelector(
+  [getLatestOrder],
+  (order) => order?.status.rawValue
+);
+
+/**
+ * @returns a list of clientIds belonging to uncommmited orders
+ */
+export const getUncommittedOrderClientIds = (state: RootState) =>
+  state.account.uncommittedOrderClientIds;
+
+/**
+ * @param orderId
  * @returns order details with the given orderId
  */
 export const getOrderDetails = (orderId: string) =>
   createSelector(
     [getSubaccountOrders, getAssets, getPerpetualMarkets],
     (orders, assets, perpetualMarkets) => {
-      const order = orders?.find((order) => order.id === orderId);
+      const matchingOrder = orders?.find((order) => order.id === orderId);
-      return order ? getHydratedTradingData({ data: order, assets, perpetualMarkets }) : undefined;
+      return matchingOrder
+        ? getHydratedTradingData({ data: matchingOrder, assets, perpetualMarkets })
+        : undefined;
     }
   );
 
@@ -178,8 +204,10 @@ export const getFillDetails = (fillId: string) =>
   createSelector(
     [getSubaccountFills, getAssets, getPerpetualMarkets],
     (fills, assets, perpetualMarkets) => {
-      const fill = fills?.find((fill) => fill.id === fillId);
+      const matchingFill = fills?.find((fill) => fill.id === fillId);
-      return fill ? getHydratedTradingData({ data: fill, assets, perpetualMarkets }) : undefined;
+      return matchingFill
+        ? getHydratedTradingData({ data: matchingFill, assets, perpetualMarkets })
+        : undefined;
     }
   );
 
@@ -280,21 +308,6 @@ export const getIsAccountConnected = (state: RootState) =>
  */
 export const getOnboardingGuards = (state: RootState) => state.account.onboardingGuards;
 
-/**
- * @param state
- * @returns a boolean indicating whether the user has uncommitted orders
- */
-export const calculateHasUncommittedOrders = (state: RootState) => {
-  return !!state.account.uncommittedOrderClientIds?.length;
-};
-
-/**
- * @param state
- * @returns List of uncommitted order clientIds
- */
-export const getUncommittedOrderClientIds = (state: RootState) =>
-  state.account.uncommittedOrderClientIds;
-
 /**
  * @param state
  * @returns Whether there are unseen fill updates
@@ -319,3 +332,8 @@ export const getUserStats = (state: RootState) => ({
   makerVolume30D: state.account?.wallet?.user?.makerVolume30D,
   takerVolume30D: state.account?.wallet?.user?.takerVolume30D,
 });
+
+/**
+ * @returns user wallet balances
+ */
+export const getBalances = (state: RootState) => state.account?.balances;

src/state/app.ts

@@ -47,9 +47,5 @@ export const appSlice = createSlice({
   },
 });
 
-export const {
+export const { initializeLocalization, initializeWebsocket, setApiState, setSelectedNetwork } =
-  initializeLocalization,
+  appSlice.actions;
-  initializeWebsocket,
-  setApiState,
-  setSelectedNetwork,
-} = appSlice.actions;

src/state/configs.ts

@@ -1,5 +1,5 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
-import type { kollections } from '@dydxprotocol/abacus';
+import type { kollections } from '@dydxprotocol/v4-abacus';
 
 import type { Configs, FeeDiscount, FeeTier, NetworkConfigs, Nullable } from '@/constants/abacus';
 import { LocalStorageKey } from '@/constants/localStorage';

src/state/dialogsSelectors.ts

@@ -2,4 +2,4 @@ import { type RootState } from './_store';
 
 export const getActiveDialog = (state: RootState) => state.dialogs.activeDialog;
 
-export const getActiveTradeBoxDialog = (state: RootState) => state.dialogs.activeTradeBoxDialog;
+export const getActiveTradeBoxDialog = (state: RootState) => state.dialogs.activeTradeBoxDialog;

src/state/localizationSelectors.ts

@@ -40,7 +40,7 @@ export const getStringGetterForLocaleData = (localeData: LocaleData) => {
     params?: { [key: string]: string | React.ReactNode };
   }): string | Array<string | React.ReactNode> => {
     // Fallback to english whenever a key doesn't exist for other languages
-    let formattedString: string = _.get(localeData, key) || _.get(EN_LOCALE_DATA, key) || '';
+    const formattedString: string = _.get(localeData, key) || _.get(EN_LOCALE_DATA, key) || '';
 
     return formatString(formattedString, params);
   };

src/state/perpetualsSelectors.ts

@@ -1,11 +1,10 @@
-import { matchPath } from 'react-router-dom';
 import { createSelector } from 'reselect';
 
 import { Candle, TradingViewBar } from '@/constants/candles';
-import { TRADE_ROUTE } from '@/constants/routes';
+
+import { mapCandle } from '@/lib/tradingView/utils';
 
 import type { RootState } from './_store';
-import { mapCandle } from '@/lib/tradingView/utils';
 
 /**
  * @param state

src/state/tradeMiddleware.ts

@@ -1,39 +0,0 @@
-import type { PayloadAction } from '@reduxjs/toolkit';
-
-import type { SubaccountOrder } from '@/constants/abacus';
-
-import { removeUncommittedOrderClientId, setSubaccount } from '@/state/account';
-
-import { getSubaccountOrders, getUncommittedOrderClientIds } from '@/state/accountSelectors';
-
-export default (store: any) => (next: any) => async (action: PayloadAction<any>) => {
-  const { type, payload } = action;
-  const state = store.getState();
-  next(action);
-
-  switch (type) {
-    case setSubaccount.type: {
-      const updatedOrders = payload?.orders?.toArray() || [];
-      const orders = getSubaccountOrders(state);
-      const uncommittedOrderClientIds = getUncommittedOrderClientIds(state);
-
-      if (uncommittedOrderClientIds?.length && updatedOrders?.length !== orders?.length) {
-        const updatedOrdersClientIds = Object.fromEntries(
-          updatedOrders.map((order: SubaccountOrder) => [order.clientId, order])
-        );
-
-        const receivedClientId = uncommittedOrderClientIds.find(
-          (clientId) => updatedOrdersClientIds[clientId]
-        );
-
-        if (receivedClientId) {
-          store.dispatch(removeUncommittedOrderClientId(receivedClientId));
-        }
-      }
-      break;
-    }
-    default: {
-      break;
-    }
-  }
-};

src/styles/breakpointMixins.ts

@@ -1,4 +1,4 @@
-import styled, { css, type FlattenSimpleInterpolation } from 'styled-components';
+import { css } from 'styled-components';
 
 import breakpoints from './breakpoints';
 

src/styles/layoutMixins.ts

@@ -6,8 +6,6 @@ import {
   type ThemeProps,
 } from 'styled-components';
 
-import breakpoints from './breakpoints';
-
 export const layoutMixins: Record<
   string,
   FlattenSimpleInterpolation | FlattenInterpolation<ThemeProps<any>>

src/styles/tableMixins.ts

@@ -5,7 +5,6 @@ import {
   type ThemeProps,
 } from 'styled-components';
 
-import breakpoints from './breakpoints';
 import { layoutMixins } from './layoutMixins';
 
 export const tableMixins: Record<

src/views/AccountInfo/AccountInfoConnectedState.tsx

@@ -62,8 +62,10 @@ export const AccountInfoConnectedState = () => {
   const { buyingPower, equity, marginUsage, leverage } = subAccount || {};
 
   const hasDiff =
-    marginUsage?.postOrder != null &&
+    (marginUsage?.postOrder !== null &&
-    !MustBigNumber(marginUsage?.postOrder).eq(MustBigNumber(marginUsage?.current));
+      !MustBigNumber(marginUsage?.postOrder).eq(MustBigNumber(marginUsage?.current))) ||
+    (buyingPower?.postOrder !== null &&
+      !MustBigNumber(buyingPower?.postOrder).eq(MustBigNumber(buyingPower?.current)));
 
   const showHeader = !hasDiff && !isTablet;
 

src/views/MarketDetails.tsx

@@ -29,6 +29,7 @@ export const MarketDetails: React.FC = () => {
   if (!configs) return null;
 
   const {
+    basePositionNotional,
     tickSize,
     stepSize,
     initialMarginFraction,
@@ -113,11 +114,17 @@ export const MarketDetails: React.FC = () => {
       ),
     },
     {
-      key: 'initial-margin-fraction',
+      key: 'base-initial-margin-fraction',
-      label: stringGetter({ key: STRING_KEYS.INITIAL_MARGIN_FRACTION }),
+      label: stringGetter({ key: STRING_KEYS.BASE_INITIAL_MARGIN_FRACTION }),
       tooltip: 'initial-margin-fraction',
       value: <Output useGrouping value={initialMarginFraction} type={OutputType.SmallPercent} />,
     },
+    {
+      key: 'base-position-notional',
+      label: stringGetter({ key: STRING_KEYS.BASE_POSITION_NOTIONAL }),
+      tooltip: 'base-position-notional',
+      value: <Output useGrouping value={basePositionNotional} type={OutputType.Number} />,
+    },
   ];
 
   return (

src/views/MarketLinks.tsx

@@ -15,14 +15,17 @@ export const MarketLinks = () => {
 
   const linkItems = [
     {
+      key: 'coinmarketcap',
       href: coinMarketCapsLink,
       icon: IconName.CoinMarketCap,
     },
     {
+      key: 'whitepaper',
       href: whitepaperLink,
       icon: IconName.Whitepaper,
     },
     {
+      key: 'project-website',
       href: websiteLink,
       icon: IconName.Website,
     },
@@ -31,8 +34,8 @@ export const MarketLinks = () => {
   return (
     <Styled.MarketLinks>
       {linkItems.map(
-        ({ href, icon }) =>
+        ({ key, href, icon }) =>
-          href && <IconButton key={href} href={href} iconName={icon} type={ButtonType.Link} />
+          href && <IconButton key={key} href={href} iconName={icon} type={ButtonType.Link} />
       )}
     </Styled.MarketLinks>
   );

src/views/TradeBoxOrderView.tsx

@@ -49,7 +49,6 @@ const useTradeTypeOptions = () => {
                   value && {
                     value: value as TradeTypes,
                     label,
-                    disabled: import.meta.env.MODE === 'production', // TODO: Remove this when stop orders are supported on testnet
                   }
               )
               .filter(isTruthy),

src/views/TransferStatus.tsx

@@ -7,9 +7,11 @@ import { StatusResponse } from '@0xsquid/sdk';
 import { useInterval, useStringGetter } from '@/hooks';
 
 import { STRING_KEYS } from '@/constants/localization';
+import { AlertType } from '@/constants/alerts';
 
 import { formatSeconds } from '@/lib/timeUtils';
 
+import { AlertMessage } from '@/components/AlertMessage';
 import { Output, OutputType } from '@/components/Output';
 import { WithReceipt } from '@/components/WithReceipt';
 import { Icon, IconName } from '@/components/Icon';
@@ -33,6 +35,9 @@ export const TransferStatusToast = ({
   const [open, setOpen] = useState<boolean>(false);
   const [secondsLeft, setSecondsLeft] = useState<number | undefined>();
 
+  // @ts-ignore status.errors is not in the type definition but can be returned
+  const error = status?.errors?.length ? status?.errors[0] : status?.error;
+
   const type = useMemo(
     () => (status?.toChain?.chainData?.chainId === TESTNET_CHAIN_ID ? 'deposit' : 'withdrawal'),
     [status]
@@ -74,6 +79,16 @@ export const TransferStatusToast = ({
               },
             })}
           </Styled.Status>
+          {error && (
+            <AlertMessage type={AlertType.Error}>
+              {stringGetter({
+                key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
+                params: {
+                  ERROR_MESSAGE: error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
+                },
+              })}
+            </AlertMessage>
+          )}
           <Styled.Trigger>
             <Styled.TriggerIcon>
               <Icon iconName={IconName.Caret} />

src/views/TransferStatusSteps.tsx

@@ -59,7 +59,7 @@ export const TransferStatusSteps = ({ status }: ElementProps) => {
       },
     ];
 
-    const currentStatus = routeStatus[routeStatus?.length - 1];
+    const currentStatus = routeStatus?.[routeStatus?.length - 1];
 
     let currentStep = TransferStatusStep.Bridge;
 

src/views/dialogs/DetailsDialog/OrderDetailsDialog.tsx

@@ -7,7 +7,7 @@ import { layoutMixins } from '@/styles/layoutMixins';
 
 import { AbacusOrderStatus, AbacusOrderTypes, type Nullable } from '@/constants/abacus';
 import { ButtonAction } from '@/constants/buttons';
-import { STRING_KEYS } from '@/constants/localization';
+import { STRING_KEYS, type StringKey } from '@/constants/localization';
 
 import { AssetIcon } from '@/components/AssetIcon';
 import { Button } from '@/components/Button';
@@ -47,7 +47,7 @@ export const OrderDetailsDialog = ({ orderId, setIsOpen }: ElementProps) => {
   const { cancelOrder } = useSubaccount();
 
   const {
-    asset = {},
+    asset,
     cancelReason,
     createdAtMilliseconds,
     expiresAtMilliseconds,
@@ -57,7 +57,7 @@ export const OrderDetailsDialog = ({ orderId, setIsOpen }: ElementProps) => {
     price,
     reduceOnly,
     totalFilled,
-    resources = {},
+    resources,
     size,
     status,
     stepSizeDecimals,
@@ -121,7 +121,9 @@ export const OrderDetailsDialog = ({ orderId, setIsOpen }: ElementProps) => {
     {
       key: 'cancel-reason',
       label: stringGetter({ key: STRING_KEYS.CANCEL_REASON }),
-      value: cancelReason ? stringGetter({ key: STRING_KEYS[cancelReason] }) : undefined,
+      value: cancelReason
+        ? stringGetter({ key: STRING_KEYS[cancelReason as StringKey] })
+        : undefined,
     },
     {
       key: 'amount',
@@ -182,8 +184,7 @@ export const OrderDetailsDialog = ({ orderId, setIsOpen }: ElementProps) => {
 
   const onCancelClick = async () => {
     setIsPlacingCancel(true);
-    await cancelOrder({ orderId });
+    await cancelOrder({ orderId, onError: () => setIsPlacingCancel(false) });
-    setIsPlacingCancel(false);
   };
 
   const onClearClick = () => {

src/views/dialogs/ExchangeOfflineDialog.tsx

@@ -1,11 +1,9 @@
 import { useEffect } from 'react';
 import styled, { AnyStyledComponent } from 'styled-components';
-import { useDispatch, useSelector } from 'react-redux';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 
 import { AbacusApiStatus } from '@/constants/abacus';
-import { CLIENT_NETWORK_CONFIGS } from '@/constants/networks';
+import { DialogTypes } from '@/constants/dialogs';
-import { UNICODE } from '@/constants/unicode';
-
 import { STRING_KEYS } from '@/constants/localization';
 import { useApiState, useStringGetter } from '@/hooks';
 import { layoutMixins } from '@/styles/layoutMixins';
@@ -17,6 +15,7 @@ import { NetworkSelectMenu } from '@/views/menus/NetworkSelectMenu';
 import { closeDialog } from '@/state/dialogs';
 
 import { getSelectedNetwork } from '@/state/appSelectors';
+import { getActiveDialog } from '@/state/dialogsSelectors';
 
 type ElementProps = {
   preventClose?: boolean;
@@ -28,9 +27,10 @@ export const ExchangeOfflineDialog = ({ preventClose, setIsOpen }: ElementProps)
   const stringGetter = useStringGetter();
   const { status, statusErrorMessage } = useApiState();
   const selectedNetwork = useSelector(getSelectedNetwork);
+  const activeDialog = useSelector(getActiveDialog, shallowEqual);
 
   useEffect(() => {
-    if (status === AbacusApiStatus.NORMAL) {
+    if (activeDialog?.type === DialogTypes.ExchangeOffline && status === AbacusApiStatus.NORMAL) {
       dispatch(closeDialog());
     }
   }, [status, selectedNetwork]);
@@ -44,11 +44,6 @@ export const ExchangeOfflineDialog = ({ preventClose, setIsOpen }: ElementProps)
     >
       <Styled.Content>
         <p>{statusErrorMessage}</p>
-        {CLIENT_NETWORK_CONFIGS[selectedNetwork].dydxChainId === 'dydx-testnet-2' && (
-          <Styled.Link href="https://status.v4testnet.dydx.exchange">
-            {stringGetter({ key: STRING_KEYS.LEARN_MORE })} {UNICODE.ARROW_RIGHT}
-          </Styled.Link>
-        )}
         {import.meta.env.MODE !== 'production' && <NetworkSelectMenu />}
       </Styled.Content>
     </Dialog>

src/views/dialogs/TradeDialog.tsx

@@ -17,7 +17,7 @@ import { Ring } from '@/components/Ring';
 import { ToggleGroup } from '@/components/ToggleGroup';
 
 import { getCurrentMarketAssetData } from '@/state/assetsSelectors';
-import { getInputTradeData } from '@/state/inputsSelectors';
+import { getInputTradeData, getInputTradeOptions } from '@/state/inputsSelectors';
 
 import abacusStateManager from '@/lib/abacus';
 import { getSelectedTradeType } from '@/lib/tradeData';
@@ -35,6 +35,15 @@ export const TradeDialog = ({ isOpen, setIsOpen, slotTrigger }: ElementProps) =>
   const currentTradeData = useSelector(getInputTradeData, shallowEqual);
   const { type } = currentTradeData || {};
   const selectedTradeType = getSelectedTradeType(type);
+  const { typeOptions } = useSelector(getInputTradeOptions, shallowEqual) ?? {};
+
+  const allTradeTypeItems = typeOptions?.toArray()?.map(({ type, stringKey }) => ({
+    value: type,
+    label: stringGetter({
+      key: stringKey,
+    }),
+    slotBefore: <AssetIcon symbol={symbol} />,
+  }));
 
   const [currentStep, setCurrentStep] = useState<MobilePlaceOrderSteps>(
     MobilePlaceOrderSteps.EditOrder
@@ -62,11 +71,7 @@ export const TradeDialog = ({ isOpen, setIsOpen, slotTrigger }: ElementProps) =>
         [MobilePlaceOrderSteps.EditOrder]: {
           title: (
             <Styled.ToggleGroup
-              items={[TradeTypes.LIMIT, TradeTypes.MARKET].map((tradeType: TradeTypes) => ({
+              items={allTradeTypeItems}
-                value: tradeType,
-                label: stringGetter({ key: TRADE_TYPE_STRINGS[tradeType].tradeTypeKey }),
-                slotBefore: <AssetIcon symbol={symbol} />,
-              }))}
               value={selectedTradeType}
               onValueChange={(tradeType: TradeTypes) =>
                 onTradeTypeChange(tradeType || selectedTradeType)
@@ -126,6 +131,8 @@ Styled.Dialog = styled(Dialog)<{ currentStep: MobilePlaceOrderSteps }>`
 `;
 
 Styled.ToggleGroup = styled(ToggleGroup)`
+  overflow-x: auto;
+
   button[data-state='off'] {
     gap: 0;
 

src/views/forms/AccountManagementForms/DepositForm.tsx

@@ -38,6 +38,7 @@ import { getTransferInputs } from '@/state/inputsSelectors';
 import abacusStateManager from '@/lib/abacus';
 import { MustBigNumber } from '@/lib/numbers';
 import { log } from '@/lib/telemetry';
+import { parseWalletError } from '@/lib/wallet';
 
 import { ChainSelectMenu } from './ChainSelectMenu';
 import { TokenSelectMenu } from './TokenSelectMenu';
@@ -286,12 +287,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
 
   const errorMessage = useMemo(() => {
     if (error) {
-      return error?.message
+      return parseWalletError({ error, stringGetter }).message;
-        ? stringGetter({
-            key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
-            params: { ERROR_MESSAGE: error.message },
-          })
-        : stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG });
     }
 
     if (fromAmount) {

src/views/forms/AccountManagementForms/WithdrawForm.tsx

@@ -43,7 +43,7 @@ export const WithdrawForm = () => {
   const [error, setError] = useState<Error | null>(null);
   const [isLoading, setIsLoading] = useState(false);
 
-  const { simulateWithdraw, sendSquidWithdraw } = useSubaccount();
+  const { sendSquidWithdraw } = useSubaccount();
   const { freeCollateral } = useSelector(getSubaccount, shallowEqual) || {};
 
   // User input
@@ -97,16 +97,10 @@ export const WithdrawForm = () => {
             field: TransferInputField.usdcSize,
           });
         } else {
-          const stdFee = await simulateWithdraw(parseFloat(debouncedAmount));
-          const amount =
-            parseFloat(debouncedAmount) -
-            parseFloat(stdFee?.amount[0]?.amount || '0') / QUANTUM_MULTIPLIER;
-
           abacusStateManager.setTransferValue({
-            value: amount.toString(),
+            value: debouncedAmount,
             field: TransferInputField.usdcSize,
           });
-
           setError(null);
         }
       } catch (error) {

src/views/forms/AccountManagementForms/WithdrawForm/WithdrawButtonAndReceipt.tsx

@@ -49,15 +49,15 @@ export const WithdrawButtonAndReceipt = ({
   const [isEditingSlippage, setIsEditingSlipapge] = useState(false);
   const stringGetter = useStringGetter();
 
-  const { balance, queryStatus } = useAccountBalance({
-    addressOrDenom: withdrawToken?.address || undefined,
-    assetSymbol: withdrawToken?.symbol || undefined,
-    chainId: withdrawChain ? parseInt(withdrawChain) : undefined,
-    decimals: withdrawToken?.decimals || undefined,
-    isCosmosChain: false,
-  });
-
   // TODO: uncomment when we have a way to get token amount estimate from abacus
+  // const { balance, queryStatus } = useAccountBalance({
+  //   addressOrDenom: withdrawToken?.address || undefined,
+  //   assetSymbol: withdrawToken?.symbol || undefined,
+  //   chainId: withdrawChain ? parseInt(withdrawChain) : undefined,
+  //   decimals: withdrawToken?.decimals || undefined,
+  //   isCosmosChain: false,
+  // });
+
   // const balanceBN = MustBigNumber(balance);
   // const newBalance =
   //   // toAmountMin && withdrawToken && parseUnits(toAmountMin, withdrawToken.decimals).toString();
@@ -158,7 +158,7 @@ export const WithdrawButtonAndReceipt = ({
     // },
   ];
 
-  const isFormValid = !isDisabled && !isEditingSlippage && queryStatus !== 'error';
+  const isFormValid = !isDisabled && !isEditingSlippage;
 
   return (
     <Styled.WithReceipt

src/views/forms/ClosePositionForm.tsx

@@ -1,14 +1,19 @@
-import { type FormEvent, useEffect, useState } from 'react';
+import { type FormEvent, useCallback, useEffect, useState } from 'react';
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 
-import { ClosePositionInputField } from '@/constants/abacus';
+import {
+  ClosePositionInputField,
+  type HumanReadablePlaceOrderPayload,
+  type Nullable,
+} from '@/constants/abacus';
 import { AlertType } from '@/constants/alerts';
 import { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons';
 import { TOKEN_DECIMALS } from '@/constants/numbers';
 import { STRING_KEYS } from '@/constants/localization';
 import { MobilePlaceOrderSteps } from '@/constants/trade';
 import { useBreakpoints, useIsFirstRender, useStringGetter, useSubaccount } from '@/hooks';
+import { useOnLastOrderIndexed } from '@/hooks/useOnLastOrderIndexed';
 
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
@@ -27,10 +32,7 @@ import { Orderbook, orderbookMixins, type OrderbookScrollBehavior } from '@/view
 
 import { PositionPreview } from '@/views/forms/TradeForm/PositionPreview';
 
-import {
+import { getCurrentMarketPositionData } from '@/state/accountSelectors';
-  calculateHasUncommittedOrders,
-  getCurrentMarketPositionData,
-} from '@/state/accountSelectors';
 
 import { getCurrentMarketAssetData } from '@/state/assetsSelectors';
 import { getInputClosePositionData } from '@/state/inputsSelectors';
@@ -82,9 +84,7 @@ export const ClosePositionForm = ({
   const { stepSizeDecimals } = useSelector(getCurrentMarketConfig, shallowEqual) || {};
   const { size: sizeData, summary } = useSelector(getInputClosePositionData, shallowEqual) || {};
   const { size, percent } = sizeData || {};
-  const hasUncommittedOrders = useSelector(calculateHasUncommittedOrders);
   const currentInput = useSelector(getCurrentInput);
-
   const currentPositionData = useSelector(getCurrentMarketPositionData, shallowEqual);
   const { size: currentPositionSize } = currentPositionData || {};
   const { current: currentSize } = currentPositionSize || {};
@@ -106,17 +106,22 @@ export const ClosePositionForm = ({
     }
   }, [currentInput, market, currentStep]);
 
-  useEffect(() => {
+  const onLastOrderIndexed = useCallback(() => {
-    // close has been placed
+    if (!isFirstRender) {
-    if (!isFirstRender && !hasUncommittedOrders) {
       abacusStateManager.clearClosePositionInputValues({ shouldFocusOnTradeInput: true });
       onClosePositionSuccess?.();
 
       if (currentStep === MobilePlaceOrderSteps.PlacingOrder) {
         setCurrentStep?.(MobilePlaceOrderSteps.Confirmation);
       }
+
+      setIsClosingPosition(false);
     }
-  }, [hasUncommittedOrders]);
+  }, [currentStep, isFirstRender]);
+
+  const { setUnIndexedClientId } = useOnLastOrderIndexed({
+    callback: onLastOrderIndexed,
+  });
 
   const onAmountInput = ({ floatValue }: { floatValue?: number }) => {
     if (currentSize == null) return;
@@ -165,14 +170,16 @@ export const ClosePositionForm = ({
     setIsClosingPosition(true);
 
     await closePosition({
-      onError: (errorParams?: { errorStringKey?: string }) => {
+      onError: (errorParams?: { errorStringKey?: Nullable<string> }) => {
         setClosePositionError(
           stringGetter({ key: errorParams?.errorStringKey || STRING_KEYS.SOMETHING_WENT_WRONG })
         );
+        setIsClosingPosition(false);
+      },
+      onSuccess: (placeOrderPayload: Nullable<HumanReadablePlaceOrderPayload>) => {
+        setUnIndexedClientId(placeOrderPayload?.clientId);
       },
     });
-
-    setIsClosingPosition(false);
   };
 
   const alertMessage = closePositionError && (

src/views/forms/TradeForm.tsx

@@ -1,4 +1,4 @@
-import { type FormEvent, useState, useEffect, Ref } from 'react';
+import { type FormEvent, useState, Ref, useCallback } from 'react';
 import styled, { AnyStyledComponent, css } from 'styled-components';
 import { shallowEqual, useSelector } from 'react-redux';
 import type { NumberFormatValues, SourceInfo } from 'react-number-format';
@@ -7,6 +7,8 @@ import { AlertType } from '@/constants/alerts';
 
 import {
   ErrorType,
+  type HumanReadablePlaceOrderPayload,
+  type Nullable,
   TradeInputErrorAction,
   TradeInputField,
   ValidationError,
@@ -19,6 +21,7 @@ import { InputErrorData, TradeBoxKeys, MobilePlaceOrderSteps } from '@/constants
 
 import { breakpoints } from '@/styles';
 import { useStringGetter, useSubaccount } from '@/hooks';
+import { useOnLastOrderIndexed } from '@/hooks/useOnLastOrderIndexed';
 
 import { layoutMixins } from '@/styles/layoutMixins';
 import { formMixins } from '@/styles/formMixins';
@@ -34,7 +37,6 @@ import { WithTooltip } from '@/components/WithTooltip';
 
 import { Orderbook } from '@/views/tables/Orderbook';
 
-import { calculateHasUncommittedOrders } from '@/state/accountSelectors';
 import { getCurrentInput, useTradeFormData } from '@/state/inputsSelectors';
 import { getCurrentMarketConfig } from '@/state/perpetualsSelectors';
 
@@ -97,7 +99,6 @@ export const TradeForm = ({
   } = useTradeFormData();
 
   const { limitPrice, triggerPrice, trailingPercent } = price || {};
-  const hasUncommittedOrders = useSelector(calculateHasUncommittedOrders);
   const currentInput = useSelector(getCurrentInput);
   const { tickSizeDecimals, stepSizeDecimals } =
     useSelector(getCurrentMarketConfig, shallowEqual) || {};
@@ -154,30 +155,33 @@ export const TradeForm = ({
     }
   };
 
-  useEffect(() => {
+  const onLastOrderIndexed = useCallback(() => {
-    // order has been placed
+    if (!currentStep || currentStep === MobilePlaceOrderSteps.PlacingOrder) {
-    if (
-      (!currentStep || currentStep === MobilePlaceOrderSteps.PlacingOrder) &&
-      !hasUncommittedOrders
-    ) {
       setIsPlacingOrder(false);
       abacusStateManager.clearTradeInputValues({ shouldResetSize: true });
       setCurrentStep?.(MobilePlaceOrderSteps.Confirmation);
     }
-  }, [currentStep, hasUncommittedOrders]);
+  }, [currentStep]);
+
+  const { setUnIndexedClientId } = useOnLastOrderIndexed({
+    callback: onLastOrderIndexed,
+  });
 
   const onPlaceOrder = async () => {
     setPlaceOrderError(undefined);
     setIsPlacingOrder(true);
 
     await placeOrder({
-      onError: (errorParams?: { errorStringKey?: string }) => {
+      onError: (errorParams?: { errorStringKey?: Nullable<string> }) => {
         setPlaceOrderError(
           stringGetter({ key: errorParams?.errorStringKey || STRING_KEYS.SOMETHING_WENT_WRONG })
         );
 
         setIsPlacingOrder(false);
       },
+      onSuccess: (placeOrderPayload?: Nullable<HumanReadablePlaceOrderPayload>) => {
+        setUnIndexedClientId(placeOrderPayload?.clientId);
+      },
     });
   };
 

src/views/forms/TradeForm/PlaceOrderButtonAndReceipt.tsx

@@ -136,7 +136,7 @@ export const PlaceOrderButtonAndReceipt = ({
 
   const buttonState = currentStep
     ? buttonStatesPerStep[currentStep].buttonState
-    : { isDisabled: !shouldEnableTrade, isLoading };
+    : { isDisabled: !shouldEnableTrade || isLoading, isLoading };
 
   return (
     <WithDetailsReceipt detailItems={items}>

src/views/forms/TransferForm.tsx

@@ -13,7 +13,7 @@ import { ButtonShape, ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
 import { CLIENT_NETWORK_CONFIGS } from '@/constants/networks';
 import { NumberSign, QUANTUM_MULTIPLIER } from '@/constants/numbers';
-import { DYDX_CHAIN_ASSET_COIN_DENOM, DYDX_CHAIN_INFO, DydxChainAsset } from '@/constants/wallets';
+import { DYDX_CHAIN_ASSET_COIN_DENOM, DYDX_CHAIN_ASSET_TAGS, DydxChainAsset } from '@/constants/wallets';
 
 import {
   useAccountBalance,
@@ -52,28 +52,6 @@ type TransferFormProps = {
   className?: string;
 };
 
-const debouncedEstimateFee = debounce(
-  async ({ amount, recipientAddress, asset, setFees, simulateTransfer }) => {
-    if (!amount || !recipientAddress) {
-      return;
-    }
-
-    try {
-      const coinDenom = DYDX_CHAIN_ASSET_COIN_DENOM[asset as DydxChainAsset];
-      const stdFee: StdFee = await simulateTransfer(amount, recipientAddress, coinDenom);
-
-      const fee = stdFee?.amount.find((coin) => coin.denom === coinDenom)?.amount;
-      const feeAmount = MustBigNumber(fee).div(QUANTUM_MULTIPLIER).toNumber();
-
-      setFees(feeAmount);
-    } catch (error) {
-      console.error('TransferForm > : debouncedEstimateFee > ', error);
-    }
-  },
-  1000,
-  { trailing: true }
-);
-
 export const TransferForm = ({
   selectedAsset = DydxChainAsset.DYDX,
   onDone,
@@ -82,8 +60,8 @@ export const TransferForm = ({
   const stringGetter = useStringGetter();
   const { freeCollateral } = useSelector(getSubaccount, shallowEqual) || {};
   const { dydxAddress } = useAccounts();
-  const { address: recipientAddress, size } = useSelector(getTransferInputs, shallowEqual) || {};
+  const { address: recipientAddress, size, fee } = useSelector(getTransferInputs, shallowEqual) || {};
-  const { transfer, simulateTransfer } = useSubaccount();
+  const { transfer } = useSubaccount();
   const { nativeTokenBalance, usdcBalance } = useAccountBalance();
   const { selectedNetwork } = useSelectedNetwork();
 
@@ -93,7 +71,6 @@ export const TransferForm = ({
   // Form states
   const [error, setError] = useState<Error | undefined>();
   const [isLoading, setIsLoading] = useState(false);
-  const [fees, setFees] = useState<number>();
 
   const balance = asset === DydxChainAsset.USDC ? freeCollateral?.current : nativeTokenBalance;
   const newBalance =
@@ -104,7 +81,7 @@ export const TransferForm = ({
           .toNumber();
   const amount = asset === DydxChainAsset.USDC ? size?.usdcSize : size?.size;
 
-  const showNotEnoughGasWarning = fees && asset === DydxChainAsset.USDC && usdcBalance < fees;
+  const showNotEnoughGasWarning = fee && asset === DydxChainAsset.USDC && usdcBalance < fee;
 
   // BN
   const amountBN = MustBigNumber(amount);
@@ -134,34 +111,21 @@ export const TransferForm = ({
 
   useEffect(() => {
     setError(undefined);
-    debouncedEstimateFee.cancel();
+    abacusStateManager.setTransferValue({
-
+      value: asset,
-    if (isAmountValid && isAddressValid) {
+      field: TransferInputField.token,
-      debouncedEstimateFee({
+    });
-        amount,
-        recipientAddress,
-        asset,
-        setFees,
-        simulateTransfer,
-      });
-    } else {
-      setFees(undefined);
-    }
-  }, [asset, amount, recipientAddress]);
-
-  useEffect(() => {
-    setError(undefined);
   }, [asset]);
 
   const onTransfer = async () => {
-    if (!isAmountValid || !isAddressValid || !fees) return;
+    if (!isAmountValid || !isAddressValid || !fee) return;
     setIsLoading(true);
     setError(undefined);
 
     try {
       // Subtract fees from amount if sending native tokens
       const amountToTransfer = (
-        asset === DydxChainAsset.DYDX ? amountBN.minus(fees) : amountBN
+        asset === DydxChainAsset.DYDX ? amountBN.minus(fee) : amountBN
       ).toNumber();
 
       const txResponse = await transfer(
@@ -212,7 +176,7 @@ export const TransferForm = ({
       value: DydxChainAsset.USDC,
       label: (
         <Styled.InlineRow>
-          <AssetIcon symbol="USDC" /> USDC
+          <AssetIcon symbol="USDC" /> {DYDX_CHAIN_ASSET_TAGS[DydxChainAsset.USDC]}
         </Styled.InlineRow>
       ),
     },
@@ -221,7 +185,7 @@ export const TransferForm = ({
       label: (
         <Styled.InlineRow>
           {/* <AssetIcon symbol="DYDX" />  */}
-          Dv4TNT
+          {DYDX_CHAIN_ASSET_TAGS[DydxChainAsset.DYDX]}
         </Styled.InlineRow>
       ),
     },
@@ -243,7 +207,7 @@ export const TransferForm = ({
       key: 'amount',
       label: (
         <span>
-          {stringGetter({ key: STRING_KEYS.AVAILABLE })} <Tag>{asset}</Tag>
+          {stringGetter({ key: STRING_KEYS.AVAILABLE })} <Tag>{DYDX_CHAIN_ASSET_TAGS[asset]}</Tag>
         </span>
       ),
       value: (
@@ -375,9 +339,9 @@ export const TransferForm = ({
       <Styled.Footer>
         <TransferButtonAndReceipt
           selectedAsset={asset}
-          fees={fees}
+          fees={fee || undefined}
-          isDisabled={!isAmountValid || !isAddressValid || !fees}
+          isDisabled={!isAmountValid || !isAddressValid || !fee}
-          isLoading={isLoading || Boolean(isAmountValid && isAddressValid && !fees)}
+          isLoading={isLoading || Boolean(isAmountValid && isAddressValid && !fee)}
         />
       </Styled.Footer>
     </Styled.Form>

src/views/forms/TransferForm/TransferButtonAndReceipt.tsx

@@ -3,7 +3,7 @@ import { shallowEqual, useSelector } from 'react-redux';
 import { ButtonAction, ButtonSize, ButtonType } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
 import { NumberSign } from '@/constants/numbers';
-import { DydxChainAsset } from '@/constants/wallets';
+import { DYDX_CHAIN_ASSET_TAGS, DydxChainAsset } from '@/constants/wallets';
 
 import { useAccountBalance, useStringGetter } from '@/hooks';
 
@@ -60,7 +60,7 @@ export const TransferButtonAndReceipt = ({
       key: 'fees',
       label: (
         <span>
-          {stringGetter({ key: STRING_KEYS.FEES })} <Tag>{selectedAsset}</Tag>
+          {stringGetter({ key: STRING_KEYS.FEES })} <Tag>{DYDX_CHAIN_ASSET_TAGS[selectedAsset]}</Tag>
         </span>
       ),
       value: <Output type={OutputType.Asset} value={fees} />,
@@ -69,7 +69,7 @@ export const TransferButtonAndReceipt = ({
       key: 'balance',
       label: (
         <span>
-          {stringGetter({ key: STRING_KEYS.BALANCE })} <Tag>{selectedAsset}</Tag>
+          {stringGetter({ key: STRING_KEYS.BALANCE })} <Tag>{DYDX_CHAIN_ASSET_TAGS[selectedAsset]}</Tag>
         </span>
       ),
       value: (

src/views/tables/FillsTable.tsx

@@ -3,12 +3,12 @@ import styled, { type AnyStyledComponent, css } from 'styled-components';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { OrderSide } from '@dydxprotocol/v4-client-js';
 import type { ColumnSize } from '@react-types/table';
+import { Nullable } from '@dydxprotocol/v4-abacus';
 
 import { type Asset, type SubaccountFill } from '@/constants/abacus';
 import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS, StringGetterFunction } from '@/constants/localization';
 
-import { Nullable } from '@dydxprotocol/abacus';
 import { useBreakpoints, useStringGetter } from '@/hooks';
 
 import { layoutMixins } from '@/styles/layoutMixins';

src/views/tables/OrdersTable/OrderActionsCell.tsx

@@ -1,5 +1,5 @@
-import { useCallback, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
-import { useDispatch } from 'react-redux';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import styled, { AnyStyledComponent } from 'styled-components';
 
 import { AbacusOrderStatus, type OrderStatus } from '@/constants/abacus';
@@ -29,8 +29,7 @@ export const OrderActionsCell = ({ orderId, status, isDisabled }: ElementProps)
 
   const onCancel = useCallback(async () => {
     setIsCanceling(true);
-    await cancelOrder({ orderId });
+    await cancelOrder({ orderId, onError: () => setIsCanceling(false) });
-    setIsCanceling(false);
   }, []);
 
   return (