diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 1d7c5760d..3cc258ca1 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -130,7 +130,9 @@ jobs:
 
     services:
       devnet:
-        image: shardlabs/starknet-devnet-rs:latest-seed0
+        # Temporary pin the previous version of the devnet image to avoid a bug introduced in the latest version
+        image: shardlabs/starknet-devnet-rs:78527decb3f76c4c808fa35f46228557af3df385-seed0
+        # image: shardlabs/starknet-devnet-rs:latest-seed0
         ports:
           - 5050:5050
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a5c23719f..f5dd457f3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,36 +7,37 @@ on:
     tags:
       - "**"
 
-env:
-  FEATURE_PRIVACY_SETTINGS: "true"
-  FEATURE_EXPERIMENTAL_SETTINGS: "false"
-  FEATURE_BETA_FEATURES: "false"
-  FEATURE_BANXA: "true"
-  FEATURE_LAYERSWAP: "true"
-  FEATURE_ORBITER: "true"
-  FEATURE_VERIFIED_DAPPS: "true"
-  ARGENT_SHIELD_NETWORK_ID: "mainnet-alpha"
-  FEATURE_MULTISIG: "true"
-  SENTRY_ENVIRONMENT: "production"
-  NPM_ACCESS_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
-  SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY }}
-  SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-  SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-  RAMP_API_KEY: ${{ secrets.RAMP_API_KEY }}
-  FILENAME: argent-extension
-  SAFE_ENV_VARS: true
-  ARGENT_API_BASE_URL: ${{ vars.ARGENT_API_BASE_URL }}
-  ARGENT_TESTNET_RPC_URL: ${{ vars.ARGENT_TESTNET_RPC_URL }}
-  ARGENT_X_STATUS_URL: ${{ vars.ARGENT_X_STATUS_URL }}
-  ARGENT_X_ENVIRONMENT: "prod"
-  MULTICALL_MAX_BATCH_SIZE: 20
-  FAST: 20 # 20s
-  MEDIUM: 60 # 60s
-  SLOW: 60 * 5 # 5m
-  VERY_SLOW: 24 * 60 * 60 # 1d
-
 jobs:
   build:
+    environment: "prod"
+    env:
+      FEATURE_PRIVACY_SETTINGS: "true"
+      FEATURE_EXPERIMENTAL_SETTINGS: "false"
+      FEATURE_BETA_FEATURES: "false"
+      FEATURE_BANXA: "true"
+      FEATURE_LAYERSWAP: "true"
+      FEATURE_ORBITER: "true"
+      FEATURE_VERIFIED_DAPPS: "true"
+      ARGENT_SHIELD_NETWORK_ID: "mainnet-alpha"
+      FEATURE_MULTISIG: "true"
+      SENTRY_ENVIRONMENT: "production"
+      NPM_ACCESS_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
+      SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY }}
+      SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      RAMP_API_KEY: ${{ secrets.RAMP_API_KEY }}
+      FILENAME: argent-extension
+      SAFE_ENV_VARS: true
+      ARGENT_API_BASE_URL: ${{ vars.ARGENT_API_BASE_URL }}
+      ARGENT_TESTNET_RPC_URL: ${{ vars.ARGENT_TESTNET_RPC_URL }}
+      ARGENT_X_STATUS_URL: ${{ vars.ARGENT_X_STATUS_URL }}
+      ARGENT_X_ENVIRONMENT: "prod"
+      MULTICALL_MAX_BATCH_SIZE: 20
+      FAST: 20 # 20s
+      MEDIUM: 60 # 60s
+      SLOW: 60 * 5 # 5m
+      VERY_SLOW: 24 * 60 * 60 # 1d
+
     if: ${{ !startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/tags/') && contains(github.ref, 'extension') }}
     runs-on: ubuntu-latest
     permissions:
diff --git a/.nvmrc b/.nvmrc
index 87ec8842b..d5a159609 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18.18.2
+20.10.0
diff --git a/package.json b/package.json
index e014f3d15..e5928a8e4 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
     "ts-node": "^10.9.1"
   },
   "resolutions": {
-    "@babel/preset-react": "7.22.15",
-    "@babel/plugin-transform-react-jsx": "7.22.15"
+    "@babel/preset-react": "7.23.3",
+    "@babel/plugin-transform-react-jsx": "7.23.4"
   },
   "scripts": {
     "format": "prettier --loglevel warn --write \"**/*.{js,jsx,ts,tsx,css,md,yml,json}\"",
diff --git a/packages/dapp/package.json b/packages/dapp/package.json
index 49d7e60d9..2ffb47161 100644
--- a/packages/dapp/package.json
+++ b/packages/dapp/package.json
@@ -14,17 +14,17 @@
     "@argent/ui": "^6.3.1",
     "@argent/x-sessions": "^6.3.1",
     "@chakra-ui/react": "^2.6.1",
-    "@starknet-react/chains": "0.1.0-next.1",
-    "@starknet-react/core": "2.0.0-next.6",
+    "@starknet-react/chains": "0.1.0",
+    "@starknet-react/core": "2.1.1",
     "micro-starknet": "^0.2.3",
     "next": "^13.4.6",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "starknet": "5.24.3",
-    "starknetkit": "^1.0.21"
+    "starknetkit": "^1.0.22"
   },
   "devDependencies": {
-    "@types/node": "20.8.10",
+    "@types/node": "20.10.4",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "eslint": "8",
diff --git a/packages/dapp/src/pages/_app.tsx b/packages/dapp/src/pages/_app.tsx
index f8dd18f80..727172a27 100644
--- a/packages/dapp/src/pages/_app.tsx
+++ b/packages/dapp/src/pages/_app.tsx
@@ -1,10 +1,8 @@
 import type { AppProps } from "next/app"
 import { ThemeProvider } from "@argent/ui"
 import { FC } from "react"
-import { useColorModeValue } from "@chakra-ui/react"
 
 const GlobalStyle: FC = () => {
-  const bgColor = useColorModeValue("#F9F9F9", "neutrals.1000")
   return (
     <>
       <style>
@@ -12,6 +10,7 @@ const GlobalStyle: FC = () => {
           html, body {
             background-color: #333;
           }
+
           * {
             font-family: Barlow, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
               Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue,
diff --git a/packages/e2e/extension/src/languages/ILanguage.ts b/packages/e2e/extension/src/languages/ILanguage.ts
index 21c3a0888..249930d9c 100644
--- a/packages/e2e/extension/src/languages/ILanguage.ts
+++ b/packages/e2e/extension/src/languages/ILanguage.ts
@@ -43,6 +43,7 @@ export interface ILanguage {
     shortAddressError: string
     invalidCheckSumError: string
     invalidAddress: string
+    createMultisig: string
   }
   wallet: {
     //first screen
@@ -106,6 +107,7 @@ export interface ILanguage {
   dapps: {
     connect: string
     reject: string
-    resetAll: string
+    disconnectAll: string
+    noConnectedDapps: string
   }
 }
diff --git a/packages/e2e/extension/src/languages/en/index.ts b/packages/e2e/extension/src/languages/en/index.ts
index 2990985cf..5334efad7 100644
--- a/packages/e2e/extension/src/languages/en/index.ts
+++ b/packages/e2e/extension/src/languages/en/index.ts
@@ -46,6 +46,7 @@ const texts = {
     shortAddressError: "Address must be 66 characters long",
     invalidCheckSumError: "Invalid address (checksum error)",
     invalidAddress: "Invalid address",
+    createMultisig: "Create multisig",
   },
   wallet: {
     //first screen
@@ -114,7 +115,8 @@ const texts = {
   dapps: {
     connect: "Connect",
     reject: "Reject",
-    resetAll: "Reset all dapp connections",
+    disconnectAll: "Disconnect all",
+    noConnectedDapps: "No connected dapps",
   },
 }
 
diff --git a/packages/e2e/extension/src/page-objects/Account.ts b/packages/e2e/extension/src/page-objects/Account.ts
index 053694909..81139e0d1 100644
--- a/packages/e2e/extension/src/page-objects/Account.ts
+++ b/packages/e2e/extension/src/page-objects/Account.ts
@@ -1,7 +1,7 @@
 import { Page, expect } from "@playwright/test"
 
 import { lang } from "../languages"
-import Navigation from "./Navigation"
+import Activity from "./Activity"
 
 type TokenName = "Ethereum"
 export interface IAsset {
@@ -10,12 +10,14 @@ export interface IAsset {
   unit: string
 }
 
-export default class Account extends Navigation {
+export default class Account extends Activity {
   constructor(page: Page) {
     super(page)
   }
   accountName1 = "Account 1"
   accountName2 = "Account 2"
+  accountNameMulti1 = "Multisig 1"
+  accountNameMulti2 = "Multisig 2"
 
   get noAccountBanner() {
     return this.page.locator(`div h5:has-text("${lang.account.noAccounts}")`)
@@ -69,6 +71,18 @@ export default class Account extends Navigation {
     return this.page.locator('[aria-label="Standard Account"]')
   }
 
+  get addMultisigAccountFromNewAccountScreen() {
+    return this.page.locator('[aria-label="Multisig Account"]')
+  }
+
+  get createNewMultisig() {
+    return this.page.locator('[aria-label="Create new multisig"]')
+  }
+
+  get joinExistingMultisig() {
+    return this.page.locator('[aria-label="Join existing multisig"]')
+  }
+
   get assetsList() {
     return this.page.locator('button[role="alert"] ~ button')
   }
@@ -107,19 +121,12 @@ export default class Account extends Navigation {
     return this.page.locator('[data-testid="account-tokens"] h2')
   }
 
-  /** FIME: revert to this function once testnet starknet id is returing a 'not found' state */
-  _invalidStarkIdError(id: string) {
+  invalidStarkIdError(id: string) {
     return this.page.locator(
       `form label:has-text('${id}${lang.account.invalidStarkIdError}')`,
     )
   }
 
-  invalidStarkIdError(_id: string) {
-    return this.page.locator(
-      `form label:has-text('Could not get address from stark name')`,
-    )
-  }
-
   get shortAddressError() {
     return this.page.locator(
       `form label:has-text('${lang.account.shortAddressError}')`,
@@ -366,12 +373,16 @@ export default class Account extends Navigation {
     return this.page.locator(`div h6:text-is("${label}")`)
   }
 
-  get dappsBanner() {
-    return this.page.locator('[title="Dappland"]')
+  get avnuBanner() {
+    return this.page.locator('p:text-is("Swap with AVNU")')
+  }
+
+  get ekuboBanner() {
+    return this.page.locator('p:text-is("Provide liquidity on Ekubo")')
   }
 
-  get dappsBannerClose() {
-    return this.page.locator('[title="Dappland"] svg')
+  get avnuBannerClose() {
+    return this.page.locator('[data-testid="close-banner"]')
   }
 
   async saveRecoveryPhrase() {
@@ -433,7 +444,157 @@ export default class Account extends Navigation {
     await this.pinInput.first().fill(pin)
   }
 
+  async setupRecovery() {
+    await this.accountAddressFromAssetsView.click()
+    return this.saveRecoveryPhrase().then((adr) => String(adr))
+  }
+
+  // Multisig
   get deployNeededWarning() {
     return this.page.locator(`p:has-text("${lang.account.deployFirst}")`)
   }
+
+  get increaseThreshold() {
+    return this.page.locator(`[data-testid="increase-threshold"]`)
+  }
+
+  get decreaseThreshold() {
+    return this.page.locator(`[data-testid="decrease-threshold"]`)
+  }
+
+  get manageOwners() {
+    return this.page.locator(`button:text-is("Manage owners")`)
+  }
+
+  get setConfirmationsLocator() {
+    return this.page.locator(`button:has-text("Set confirmations")`)
+  }
+
+  async addMultisigAccount({
+    signers = [],
+    confirmations = 1,
+  }: {
+    signers?: string[]
+    confirmations?: number
+  }) {
+    await this.accountListSelector.click()
+    await this.addANewccountFromAccountList.click()
+    await this.addMultisigAccountFromNewAccountScreen.click()
+
+    const [pages] = await Promise.all([
+      this.page.context().waitForEvent("page"),
+      this.createNewMultisig.click(),
+    ])
+    const tabs = pages.context().pages()
+    await tabs[1].waitForLoadState("load")
+    await expect(tabs[1].locator('[name^="signerKeys.0.key"]')).toHaveCount(1)
+    if (signers.length > 0) {
+      for (let index = 0; index < signers.length; index++) {
+        await tabs[1]
+          .locator(`[name="signerKeys\\.${index}\\.key"]`)
+          .isVisible()
+          .then(async (visible) => {
+            if (!visible) {
+              await tabs[1].locator('[data-testid="addOwnerButton"]').click()
+            }
+          })
+        await tabs[1]
+          .locator(`[name="signerKeys.${index}.key"]`)
+          .fill(signers[index])
+      }
+    }
+
+    //remove empty inputs
+    const locs = await tabs[1].locator('[name^="signerKeys"]').all()
+    if (locs.length > signers.length) {
+      for (let index = locs.length; index > signers.length + 1; index--) {
+        await tabs[1]
+          .locator(`[data-testid="closeButton.${index - 2}"]`)
+          .click()
+      }
+    }
+
+    await tabs[1].locator('button:text-is("Next")').click()
+    const currentTheshold = await tabs[1]
+      .locator('[data-testid="threshold"]')
+      .innerText()
+      .then((v) => parseInt(v!))
+
+    //set confirmations
+    if (confirmations > currentTheshold) {
+      for (let i = currentTheshold; i < confirmations; i++) {
+        await tabs[1].locator('[data-testid="increase-threshold"]').click()
+      }
+    }
+
+    await tabs[1]
+      .locator(`button:text-is("${lang.account.createMultisig}")`)
+      .click()
+    await tabs[1].locator(`button:text-is("${lang.wallet.finish}")`).click()
+  }
+
+  async joinMultisig() {
+    await this.accountListSelector.click()
+    await this.addANewccountFromAccountList.click()
+    await this.addMultisigAccountFromNewAccountScreen.click()
+
+    await this.joinExistingMultisig.click()
+    await this.page.locator('[data-testid="copy-pubkey"]').click()
+    await this.page.locator('[data-testid="button-done"]').click()
+    return String(await this.page.evaluate(`navigator.clipboard.readText()`))
+  }
+
+  ensureMultisigActivated() {
+    return Promise.all([
+      expect(this.page.locator("label:has-text('Not activated')")).toBeHidden({
+        timeout: 60000,
+      }),
+      expect(
+        this.page.locator('[data-testid="activating-multisig"]'),
+      ).toBeHidden({ timeout: 60000 }),
+    ])
+  }
+
+  accountListConfirmations(accountName: string) {
+    return this.page.locator(
+      `[aria-label="Select ${accountName}"] [data-testid="confirmations"]`,
+    )
+  }
+
+  get accountViewConfirmations() {
+    return this.page.locator('[data-testid="confirmations"]')
+  }
+
+  async acceptTx(tx: string) {
+    await this.menuActivity.click()
+    await this.page.locator(`[data-tx-hash="${tx}"]`).click()
+    await this.confirm.click()
+  }
+
+  async setConfirmations(accountName: string, confirmations: number) {
+    await this.ensureSelectedAccount(accountName)
+    await this.showSettings.click()
+    await this.account(accountName).click()
+    await this.setConfirmationsLocator.click()
+
+    const currentTheshold = await this.page
+      .locator('[data-testid="threshold"]')
+      .innerText()
+      .then((v) => parseInt(v!))
+    if (confirmations > currentTheshold) {
+      for (let i = currentTheshold; i < confirmations; i++) {
+        await this.increaseThreshold.click()
+      }
+    } else if (confirmations < currentTheshold) {
+      for (let i = currentTheshold; i > confirmations; i--) {
+        await this.decreaseThreshold.click()
+      }
+    }
+    await this.page.locator('[data-testid="update-confirmations"]').click()
+    await this.confirm.click()
+    await Promise.all([
+      expect(this.confirm).toBeHidden(),
+      expect(this.menuActivity).toBeVisible(),
+    ])
+  }
 }
diff --git a/packages/e2e/extension/src/page-objects/Activity.ts b/packages/e2e/extension/src/page-objects/Activity.ts
index dd229d9d7..2ebeaaac2 100644
--- a/packages/e2e/extension/src/page-objects/Activity.ts
+++ b/packages/e2e/extension/src/page-objects/Activity.ts
@@ -44,4 +44,14 @@ export default class Activity extends Navigation {
     const loc = await this.page.locator("button[data-tx-hash]").all()
     return Promise.all(loc.map((el) => el.getAttribute("data-tx-hash")))
   }
+
+  async getLastTxHash() {
+    await this.menuActivityActive.isVisible().then(async (visible) => {
+      if (!visible) {
+        await this.menuActivity.click()
+      }
+    })
+    const txHashs = await this.activityTxHashs()
+    return txHashs[0]
+  }
 }
diff --git a/packages/e2e/extension/src/page-objects/Dapps.ts b/packages/e2e/extension/src/page-objects/Dapps.ts
index c40f5c7e2..e7a5f612a 100644
--- a/packages/e2e/extension/src/page-objects/Dapps.ts
+++ b/packages/e2e/extension/src/page-objects/Dapps.ts
@@ -8,20 +8,36 @@ export default class Dapps extends Navigation {
     super(page)
   }
 
+  account(accountName: string) {
+    return this.page.locator(`[data-testid="${accountName}"]`)
+  }
+
+  connectedDapps(accountName: string, nbrConnectedDapps: number) {
+    return nbrConnectedDapps > 1
+      ? this.page.locator(
+          `[data-testid="${accountName}"]:has-text("${nbrConnectedDapps} dapps connected")`,
+        )
+      : this.page.locator(
+          `[data-testid="${accountName}"]:has-text("${nbrConnectedDapps} dapp connected")`,
+        )
+  }
+
+  get noConnectedDapps() {
+    return this.page.locator(`text=${lang.dapps.noConnectedDapps}`)
+  }
+
   connected(url: string) {
-    return this.page.locator(
-      `//button/*[contains(text(),'${url.slice(0, 30)}')]`,
-    )
+    return this.page.locator(`//div/*[contains(text(),'${url.slice(8, 30)}')]`)
   }
 
   disconnect(url: string) {
     return this.page.locator(
-      `//button/*[contains(text(),'${url.slice(0, 30)}')]/following::button[1]`,
+      `//div/*[contains(text(),'${url.slice(8, 30)}')]/following::button[1]`,
     )
   }
 
-  resetAll() {
-    return this.page.locator(`button:text-is("${lang.dapps.resetAll}")`)
+  disconnectAll() {
+    return this.page.locator(`p:text-is("${lang.dapps.disconnectAll}")`)
   }
 
   get accept() {
diff --git a/packages/e2e/extension/src/page-objects/DeveloperSettings.ts b/packages/e2e/extension/src/page-objects/DeveloperSettings.ts
index 54a2ec17a..5933a1928 100644
--- a/packages/e2e/extension/src/page-objects/DeveloperSettings.ts
+++ b/packages/e2e/extension/src/page-objects/DeveloperSettings.ts
@@ -31,7 +31,7 @@ export default class DeveloperSettings {
 
   // Manage networks
   get addNetwork() {
-    return this.page.locator('[data-testid="AddIcon"]')
+    return this.page.locator('button[aria-label="add"]')
   }
 
   get networkName() {
@@ -61,12 +61,12 @@ export default class DeveloperSettings {
   }
 
   networkByName(name: string) {
-    return this.page.locator(`button:has-text("${name}")`)
+    return this.page.locator(`h6:has-text("${name}")`)
   }
 
   deleteNetworkByName(name: string) {
     return this.page.locator(
-      `//button/*[contains(text(),'${name}')]/following::button[1]`,
+      `//div/*[contains(text(),'${name}')]/following::button[1]`,
     )
   }
 }
diff --git a/packages/e2e/extension/src/page-objects/ExtensionPage.ts b/packages/e2e/extension/src/page-objects/ExtensionPage.ts
index c31c8ff16..f104b3568 100644
--- a/packages/e2e/extension/src/page-objects/ExtensionPage.ts
+++ b/packages/e2e/extension/src/page-objects/ExtensionPage.ts
@@ -120,7 +120,6 @@ export default class ExtensionPage {
   }
 
   async activate2fa(accountName: string, email: string, pin = "111111") {
-    //await this.page.pause()
     await this.account.ensureSelectedAccount(accountName)
     await this.navigation.showSettings.click()
     await this.settings.account(accountName).click()
@@ -159,10 +158,7 @@ export default class ExtensionPage {
   }) {
     await this.wallet.newWalletOnboarding()
     await this.open()
-    await this.account.accountAddressFromAssetsView.click()
-    const seed = await this.account
-      .saveRecoveryPhrase()
-      .then((adr) => String(adr))
+    const seed = await this.account.setupRecovery()
     const accountAddresses: string[] = []
 
     for (const [accIndex, acc] of accountsToSetup.entries()) {
@@ -196,15 +192,30 @@ export default class ExtensionPage {
     return { accountAddresses, seed }
   }
 
-  async validateTx(reciever: string, amount?: number) {
-    await this.navigation.menuActivity.click()
+  async validateTx(
+    txHash: string,
+    reciever: string,
+    amount?: number,
+    uniqLocator?: boolean,
+  ) {
+    await this.navigation.menuActivityActive
+      .isVisible()
+      .then(async (visible) => {
+        if (!visible) {
+          await this.navigation.menuActivity.click()
+        }
+      })
     if (amount) {
-      const activityAmount = await this.page
-        .locator("button[ data-tx-hash] [data-value]")
-        .first()
+      const activityAmountLocator = this.page.locator(
+        `button[data-tx-hash$="${txHash.substring(3)}"] [data-value]`,
+      )
+      let activityAmountElement = activityAmountLocator
+      if (uniqLocator) {
+        activityAmountElement = activityAmountLocator.first()
+      }
+      const activityAmount = await activityAmountElement
         .textContent()
-        .then((text) => text?.replace(/[^0-9.]+/, ""))
-
+        .then((text) => text?.match(/[\d|.]+/)![0])
       if (amount.toString().length > 6) {
         expect(activityAmount).toBe(
           parseFloat(amount.toString())
@@ -217,7 +228,43 @@ export default class ExtensionPage {
       }
     }
     await this.activity.ensureNoPendingTransactions()
-    const txs = await this.activity.activityTxHashs()
-    await validateTx(txs[0]!, reciever, amount)
+    await validateTx(txHash, reciever, amount)
+  }
+
+  async fundMultisigAccount({
+    accountName,
+    amount,
+  }: {
+    accountName: string
+    amount: number
+  }) {
+    await this.account.ensureSelectedAccount(accountName)
+    await this.account.copyAddress.click()
+    const accountAddress = await this.getClipboard().then((adr) => String(adr))
+    await transferEth(
+      `${amount * Math.pow(10, 18)}`, // amount Ethereum has 18 decimals
+      accountAddress, // reciever wallet address
+    )
+    await this.account.ensureAsset(accountName, "Ethereum", `${amount} ETH`)
+  }
+
+  async activateMultisig(accountName: string) {
+    await this.account.ensureSelectedAccount(accountName)
+    await expect(
+      this.page.locator("label:has-text('Not activated')"),
+    ).toBeVisible()
+    await this.page.locator('[data-testid="activate-multisig"]').click()
+    await this.navigation.confirm.click()
+    await expect(
+      this.page.locator('[data-testid="activating-multisig"]'),
+    ).toBeVisible()
+    await Promise.all([
+      expect(this.page.locator("label:has-text('Not activated')")).toBeHidden({
+        timeout: 60000,
+      }),
+      expect(
+        this.page.locator('[data-testid="activating-multisig"]'),
+      ).toBeHidden({ timeout: 60000 }),
+    ])
   }
 }
diff --git a/packages/e2e/extension/src/page-objects/Navigation.ts b/packages/e2e/extension/src/page-objects/Navigation.ts
index 1ea755224..650fa7dd6 100644
--- a/packages/e2e/extension/src/page-objects/Navigation.ts
+++ b/packages/e2e/extension/src/page-objects/Navigation.ts
@@ -20,10 +20,6 @@ export default class Navigation {
     return this.page.locator(`button:text-is("${lang.common.confirm}")`)
   }
 
-  get confirm() {
-    return this.page.locator(`button:text-is("${lang.common.confirm}")`)
-  }
-
   get next() {
     return this.page.locator(`button:text-is("${lang.common.next}")`)
   }
@@ -59,7 +55,7 @@ export default class Navigation {
   }
 
   get lockWallet() {
-    return this.page.locator(`[aria-label="${lang.common.lockWallet}"]`)
+    return this.page.locator(`//button//*[text()="${lang.common.lockWallet}"]`)
   }
 
   get reset() {
@@ -90,6 +86,10 @@ export default class Navigation {
     return this.page.locator('[aria-label="Activity"]')
   }
 
+  get menuActivityActive() {
+    return this.page.locator('[aria-label="Activity"][class*="active"]')
+  }
+
   get save() {
     return this.page.locator(`button:text-is("${lang.common.save}")`)
   }
diff --git a/packages/e2e/extension/src/specs/addressBook.spec.ts b/packages/e2e/extension/src/specs/addressBook.spec.ts
index 71b7ac37c..6617ffa2c 100644
--- a/packages/e2e/extension/src/specs/addressBook.spec.ts
+++ b/packages/e2e/extension/src/specs/addressBook.spec.ts
@@ -43,7 +43,8 @@ test.describe("Address Book", () => {
     await extension.navigation.reviewSend.click()
     await extension.navigation.confirm.click()
 
-    await extension.validateTx(config.account1Seed2!)
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.validateTx(txHash!, config.account1Seed2!)
 
     //delete address
     await extension.navigation.menuTokens.click()
@@ -78,8 +79,8 @@ test.describe("Address Book", () => {
     await extension.account.sendMax.click()
     await extension.navigation.reviewSend.click()
     await extension.navigation.confirm.click()
-
-    await extension.validateTx(config.account1Seed2!)
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.validateTx(txHash!, config.account1Seed2!)
   })
 
   test("Add address from send window", async ({ extension }) => {
@@ -106,6 +107,7 @@ test.describe("Address Book", () => {
     await extension.navigation.reviewSend.click()
     await extension.navigation.confirm.click()
 
-    await extension.validateTx(config.account1Seed2!)
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.validateTx(txHash!, config.account1Seed2!)
   })
 })
diff --git a/packages/e2e/extension/src/specs/dapps.spec.ts b/packages/e2e/extension/src/specs/dapps.spec.ts
index d2701d920..8766058a1 100644
--- a/packages/e2e/extension/src/specs/dapps.spec.ts
+++ b/packages/e2e/extension/src/specs/dapps.spec.ts
@@ -3,7 +3,7 @@ import { expect } from "@playwright/test"
 import test from "../test"
 
 const aspectUrl = "https://testnet.aspect.co"
-const testDappUrl = "https://dapp-argentlabs.vercel.app/"
+const testDappUrl = "https://dapp-argentlabs.vercel.app"
 
 test.describe("Dapps", () => {
   test("connect from aspect", async ({ extension, browserContext }) => {
@@ -16,10 +16,15 @@ test.describe("Dapps", () => {
     //check connect dapps
     await extension.navigation.showSettings.click()
     await extension.settings.connectedDapps.click()
+    await expect(
+      extension.dapps.connectedDapps(extension.account.accountName1, 1),
+    ).toBeVisible()
+    await extension.dapps.account(extension.account.accountName1).click()
     await expect(extension.dapps.connected(aspectUrl)).toBeVisible()
     //disconnect dapp from ArgentX
     await extension.dapps.disconnect(aspectUrl).click()
-    await expect(extension.dapps.connected(aspectUrl)).toBeHidden()
+    await expect(extension.dapps.connected(testDappUrl)).toBeHidden()
+    await expect(extension.dapps.noConnectedDapps.first()).toBeVisible()
   })
 
   test("connect from testDapp", async ({ extension, browserContext }) => {
@@ -32,10 +37,15 @@ test.describe("Dapps", () => {
     //check connect dapps
     await extension.navigation.showSettings.click()
     await extension.settings.connectedDapps.click()
+    await expect(
+      extension.dapps.connectedDapps(extension.account.accountName1, 1),
+    ).toBeVisible()
+    await extension.dapps.account(extension.account.accountName1).click()
     await expect(extension.dapps.connected(testDappUrl)).toBeVisible()
     //disconnect dapp from ArgentX
     await extension.dapps.disconnect(testDappUrl).click()
     await expect(extension.dapps.connected(testDappUrl)).toBeHidden()
+    await expect(extension.dapps.noConnectedDapps.first()).toBeVisible()
   })
 
   test("reset all connections", async ({ extension, browserContext }) => {
@@ -50,16 +60,22 @@ test.describe("Dapps", () => {
     await extension.dapps.accept.click()
     await extension.navigation.showSettings.click()
     await extension.settings.connectedDapps.click()
+    await expect(
+      extension.dapps.connectedDapps(extension.account.accountName1, 2),
+    ).toBeVisible()
+    await extension.dapps.account(extension.account.accountName1).click()
+
     await Promise.all([
       expect(extension.dapps.connected(testDappUrl)).toBeVisible(),
       expect(extension.dapps.connected(aspectUrl)).toBeVisible(),
     ])
 
-    await extension.dapps.resetAll().click()
+    await extension.dapps.disconnectAll().click()
     await Promise.all([
       expect(extension.dapps.connected(testDappUrl)).toBeHidden(),
       expect(extension.dapps.connected(aspectUrl)).toBeHidden(),
     ])
+    await expect(extension.dapps.noConnectedDapps.first()).toBeVisible()
   })
 
   test("disconnect only one connected dapp", async ({
@@ -77,6 +93,11 @@ test.describe("Dapps", () => {
     await extension.dapps.accept.click()
     await extension.navigation.showSettings.click()
     await extension.settings.connectedDapps.click()
+    await expect(
+      extension.dapps.connectedDapps(extension.account.accountName1, 2),
+    ).toBeVisible()
+    await extension.dapps.account(extension.account.accountName1).click()
+
     await Promise.all([
       expect(extension.dapps.connected(testDappUrl)).toBeVisible(),
       expect(extension.dapps.connected(aspectUrl)).toBeVisible(),
@@ -87,5 +108,50 @@ test.describe("Dapps", () => {
       expect(extension.dapps.connected(testDappUrl)).toBeHidden(),
       expect(extension.dapps.connected(aspectUrl)).toBeVisible(),
     ])
+    await extension.navigation.back.click()
+    await expect(
+      extension.dapps.connectedDapps(extension.account.accountName1, 1),
+    ).toBeVisible()
+  })
+
+  test("connect dapps by account", async ({ extension, browserContext }) => {
+    //setup wallet
+    await extension.setupWallet({
+      accountsToSetup: [{ initialBalance: 0 }, { initialBalance: 0 }],
+    })
+
+    await extension.open()
+    await extension.account.selectAccount(extension.account.accountName1)
+
+    await extension.dapps.requestConnectionFromDapp(browserContext, aspectUrl)
+    //accept connection from ArgentX
+    await extension.dapps.accept.click()
+    await extension.account.selectAccount(extension.account.accountName2)
+    await extension.dapps.requestConnectionFromDapp(browserContext, testDappUrl)
+    //accept connection from ArgentX
+    await extension.dapps.accept.click()
+    await extension.navigation.showSettings.click()
+    await extension.settings.connectedDapps.click()
+    await Promise.all([
+      expect(
+        extension.dapps.connectedDapps(extension.account.accountName1, 1),
+      ).toBeVisible(),
+      expect(
+        extension.dapps.connectedDapps(extension.account.accountName2, 1),
+      ).toBeVisible(),
+    ])
+
+    await extension.dapps.account(extension.account.accountName1).click()
+    await Promise.all([
+      expect(extension.dapps.connected(testDappUrl)).toBeHidden(),
+      expect(extension.dapps.connected(aspectUrl)).toBeVisible(),
+    ])
+
+    await extension.navigation.back.click()
+    await extension.dapps.account(extension.account.accountName2).click()
+    await Promise.all([
+      expect(extension.dapps.connected(testDappUrl)).toBeVisible(),
+      expect(extension.dapps.connected(aspectUrl)).toBeHidden(),
+    ])
   })
 })
diff --git a/packages/e2e/extension/src/specs/dappsBanner.spec.ts b/packages/e2e/extension/src/specs/dappsBanner.spec.ts
index f2d3c340a..83842f3e2 100644
--- a/packages/e2e/extension/src/specs/dappsBanner.spec.ts
+++ b/packages/e2e/extension/src/specs/dappsBanner.spec.ts
@@ -4,22 +4,16 @@ import test from "../test"
 import config from "../config"
 
 test.describe("Banner", () => {
-  test("dapps banner should be visible after login", async ({ extension }) => {
+  test("avnu banner should be visible after login", async ({ extension }) => {
     await extension.setupWallet({
       accountsToSetup: [{ initialBalance: 0.0001 }],
     })
 
     await expect(extension.network.networkSelector).toBeVisible()
-    await expect(extension.account.dappsBanner).toBeVisible()
-    let href = await extension.account.dappsBanner.getAttribute("href")
-    expect(href).toContain("https://www.dappland.com")
-    //check settings banner
-    await extension.navigation.showSettings.click()
-    href = await extension.account.dappsBanner.getAttribute("href")
-    expect(href).toContain("https://www.dappland.com")
+    await expect(extension.account.avnuBanner).toBeVisible()
   })
 
-  test("dapps banner should not be visible after dismissed", async ({
+  test("avnu banner should not be visible after dismissed", async ({
     extension,
   }) => {
     await extension.setupWallet({
@@ -27,16 +21,30 @@ test.describe("Banner", () => {
     })
 
     await expect(extension.network.networkSelector).toBeVisible()
-    await expect(extension.account.dappsBanner).toBeVisible()
-    await extension.account.dappsBannerClose.click()
-    await expect(extension.account.dappsBanner).toBeHidden()
+    await expect(extension.account.avnuBanner).toBeVisible()
+    await extension.account.avnuBannerClose.click()
+    await expect(extension.account.avnuBanner).toBeHidden()
   })
 
-  test("dapps banner shoud be visible after account recovery", async ({
+  test("avnu banner shoud be visible after account recovery", async ({
     extension,
   }) => {
     await extension.open()
     await extension.recoverWallet(config.testNetSeed1!)
-    await expect(extension.account.dappsBanner).toBeVisible()
+    await expect(extension.account.avnuBanner).toBeVisible()
+  })
+
+  test("ekubo banner should be visible after avnu banner has been dismissed", async ({
+    extension,
+  }) => {
+    await extension.setupWallet({
+      accountsToSetup: [{ initialBalance: 0.0001 }],
+    })
+
+    await expect(extension.network.networkSelector).toBeVisible()
+    await expect(extension.account.avnuBanner).toBeVisible()
+    await extension.account.avnuBannerClose.click()
+    await expect(extension.account.avnuBanner).toBeHidden()
+    await expect(extension.account.ekuboBanner).toBeVisible()
   })
 })
diff --git a/packages/e2e/extension/src/specs/multisig.spec.ts b/packages/e2e/extension/src/specs/multisig.spec.ts
new file mode 100644
index 000000000..193f64b82
--- /dev/null
+++ b/packages/e2e/extension/src/specs/multisig.spec.ts
@@ -0,0 +1,305 @@
+import { expect } from "@playwright/test"
+import test from "../test"
+import config from "../config"
+import { sleep } from "../utils/common"
+
+test.describe("Multisig", () => {
+  test("add and activate 1/1 multisig ", async ({ extension }) => {
+    await extension.setupWallet({
+      accountsToSetup: [],
+    })
+    await extension.account.addMultisigAccount({})
+    await extension.navigation.close.click()
+    await extension.fundMultisigAccount({
+      accountName: extension.account.accountNameMulti1,
+      amount: 0.002,
+    })
+    await extension.activateMultisig(extension.account.accountNameMulti1)
+
+    const amountTrx = await extension.account.transfer({
+      originAccountName: extension.account.accountNameMulti1,
+      recipientAddress: config.destinationAddress!,
+      tokenName: "Ethereum",
+      amount: "MAX",
+    })
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.validateTx(
+      txHash!,
+      config.destinationAddress!,
+      amountTrx,
+      true,
+    )
+    await extension.navigation.menuTokens.click()
+
+    //ensure that balance is updated
+    await expect(extension.account.currentBalance("Ethereum")).toContainText(
+      "0.000",
+      { timeout: 60000 },
+    )
+  })
+
+  test("add and activate 1/2 multisig ", async ({
+    extension,
+    secondExtension,
+  }) => {
+    await extension.setupWallet({
+      accountsToSetup: [],
+    })
+    await secondExtension.setupWallet({
+      accountsToSetup: [],
+    })
+    const pubKey = await secondExtension.account.joinMultisig()
+    await extension.account.addMultisigAccount({ signers: [pubKey] })
+    await extension.navigation.close.click()
+    await extension.fundMultisigAccount({
+      accountName: extension.account.accountNameMulti1,
+      amount: 0.002,
+    })
+    await extension.activateMultisig(extension.account.accountNameMulti1)
+
+    await expect(
+      secondExtension.account.accountListConfirmations(
+        secondExtension.account.accountNameMulti1,
+      ),
+    ).toHaveText("1/2")
+    await secondExtension.navigation.close.click()
+    await secondExtension.account.selectAccount(
+      secondExtension.account.accountNameMulti1,
+    )
+    await Promise.all([
+      expect(extension.account.accountViewConfirmations).toHaveText(
+        "1/2 multisig",
+      ),
+      expect(secondExtension.account.accountViewConfirmations).toHaveText(
+        "1/2 multisig",
+      ),
+    ])
+
+    const amountTrx = await extension.account.transfer({
+      originAccountName: extension.account.accountNameMulti1,
+      recipientAddress: config.destinationAddress!,
+      tokenName: "Ethereum",
+      amount: "MAX",
+    })
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.validateTx(
+      txHash!,
+      config.destinationAddress!,
+      amountTrx,
+      true,
+    )
+    await extension.navigation.menuTokens.click()
+
+    //ensure that balance is updated
+    await Promise.all([
+      expect(extension.account.currentBalance("Ethereum")).toContainText(
+        "0.000",
+        { timeout: 120000 },
+      ),
+      expect(secondExtension.account.currentBalance("Ethereum")).toContainText(
+        "0.000",
+        { timeout: 120000 },
+      ),
+    ])
+    await secondExtension.validateTx(
+      txHash!,
+      config.destinationAddress!,
+      amountTrx,
+      true,
+    )
+  })
+
+  test("add and activate 2/2 multisig ", async ({
+    extension,
+    secondExtension,
+  }) => {
+    await extension.setupWallet({
+      accountsToSetup: [],
+    })
+    await secondExtension.setupWallet({
+      accountsToSetup: [],
+    })
+    const pubKey = await secondExtension.account.joinMultisig()
+    await extension.account.addMultisigAccount({
+      signers: [pubKey],
+      confirmations: 2,
+    })
+    await extension.navigation.close.click()
+    await extension.fundMultisigAccount({
+      accountName: extension.account.accountNameMulti1,
+      amount: 0.002,
+    })
+    await extension.activateMultisig(extension.account.accountNameMulti1)
+
+    await expect(
+      secondExtension.account.accountListConfirmations(
+        secondExtension.account.accountNameMulti1,
+      ),
+    ).toHaveText("2/2")
+    await secondExtension.navigation.close.click()
+    await secondExtension.account.selectAccount(
+      secondExtension.account.accountNameMulti1,
+    )
+    await Promise.all([
+      expect(extension.account.accountViewConfirmations).toHaveText(
+        "2/2 multisig",
+      ),
+      expect(secondExtension.account.accountViewConfirmations).toHaveText(
+        "2/2 multisig",
+      ),
+    ])
+
+    const amountTrx = await extension.account.transfer({
+      originAccountName: extension.account.accountNameMulti1,
+      recipientAddress: config.destinationAddress!,
+      tokenName: "Ethereum",
+      amount: "MAX",
+    })
+    await extension.navigation.menuActivity.click()
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.navigation.menuTokens.click()
+
+    //acept tx from second extension
+    await expect(
+      secondExtension.activity.menuPendingTransactionsIndicator,
+    ).toBeVisible({ timeout: 120000 })
+
+    await secondExtension.account.acceptTx(txHash!)
+
+    await extension.validateTx(
+      txHash!,
+      config.destinationAddress!,
+      amountTrx,
+      true,
+    )
+    await extension.navigation.menuTokens.click()
+    await secondExtension.navigation.menuTokens.click()
+
+    //ensure that balance is updated
+    await Promise.all([
+      expect(extension.account.currentBalance("Ethereum")).toContainText(
+        "0.000",
+        { timeout: 120000 },
+      ),
+      expect(secondExtension.account.currentBalance("Ethereum")).toContainText(
+        "0.000",
+        { timeout: 120000 },
+      ),
+    ])
+  })
+
+  test("decrease approvals from 2/2 to 1/2 multisig", async ({
+    extension,
+    secondExtension,
+  }) => {
+    await extension.setupWallet({
+      accountsToSetup: [],
+    })
+    await secondExtension.setupWallet({
+      accountsToSetup: [],
+    })
+    const pubKey = await secondExtension.account.joinMultisig()
+    await extension.account.addMultisigAccount({
+      signers: [pubKey],
+      confirmations: 2,
+    })
+    await extension.navigation.close.click()
+    await extension.fundMultisigAccount({
+      accountName: extension.account.accountNameMulti1,
+      amount: 0.002,
+    })
+    await extension.activateMultisig(extension.account.accountNameMulti1)
+
+    await expect(
+      secondExtension.account.accountListConfirmations(
+        secondExtension.account.accountNameMulti1,
+      ),
+    ).toHaveText("2/2")
+    await secondExtension.navigation.close.click()
+    await secondExtension.account.selectAccount(
+      secondExtension.account.accountNameMulti1,
+    )
+    await Promise.all([
+      expect(extension.account.accountViewConfirmations).toHaveText(
+        "2/2 multisig",
+      ),
+      expect(secondExtension.account.accountViewConfirmations).toHaveText(
+        "2/2 multisig",
+      ),
+    ])
+
+    //set threshold (confirmations) to 1
+    await extension.account.setConfirmations(
+      extension.account.accountNameMulti1,
+      1,
+    )
+    let txHash = await extension.activity.getLastTxHash()
+
+    await secondExtension.account.acceptTx(txHash!)
+    await secondExtension.navigation.menuTokens.click()
+    await extension.navigation.menuTokens.click()
+    await Promise.all([
+      expect(extension.account.menuPendingTransactionsIndicator).toBeHidden({
+        timeout: 120000,
+      }),
+      expect(
+        secondExtension.account.menuPendingTransactionsIndicator,
+      ).toBeHidden({ timeout: 120000 }),
+    ])
+
+    //wait for events to be updated
+    await sleep(20 * 1000)
+    await Promise.all([
+      expect(extension.account.accountViewConfirmations).toHaveText(
+        "1/2 multisig",
+      ),
+      expect(secondExtension.account.accountViewConfirmations).toHaveText(
+        "1/2 multisig",
+      ),
+    ])
+    //transfer
+    const amountTrx = await extension.account.transfer({
+      originAccountName: extension.account.accountNameMulti1,
+      recipientAddress: config.destinationAddress!,
+      tokenName: "Ethereum",
+      amount: "MAX",
+    })
+    txHash = await extension.activity.getLastTxHash()
+    //wait for events to be updated
+    await sleep(20 * 1000)
+    await Promise.all([
+      expect(extension.account.menuPendingTransactionsIndicator).toBeHidden({
+        timeout: 120000,
+      }),
+      expect(
+        secondExtension.account.menuPendingTransactionsIndicator,
+      ).toBeHidden({ timeout: 120000 }),
+    ])
+
+    await extension.validateTx(
+      txHash!,
+      config.destinationAddress!,
+      amountTrx,
+      true,
+    )
+    await extension.navigation.menuTokens.click()
+
+    //ensure that balance is updated
+    await Promise.all([
+      expect(extension.account.currentBalance("Ethereum")).toContainText(
+        "0.000",
+        { timeout: 120000 },
+      ),
+      expect(secondExtension.account.currentBalance("Ethereum")).toContainText(
+        "0.000",
+        { timeout: 120000 },
+      ),
+    ])
+    await secondExtension.validateTx(
+      txHash!,
+      config.destinationAddress!,
+      amountTrx,
+      true,
+    )
+  })
+})
diff --git a/packages/e2e/extension/src/specs/sendMaxFunds.spec.ts b/packages/e2e/extension/src/specs/sendMaxFunds.spec.ts
index 252606bf2..78ea94904 100644
--- a/packages/e2e/extension/src/specs/sendMaxFunds.spec.ts
+++ b/packages/e2e/extension/src/specs/sendMaxFunds.spec.ts
@@ -14,7 +14,8 @@ test.describe("Send funds", () => {
       tokenName: "Ethereum",
       amount: "MAX",
     })
-    await extension.validateTx(accountAddresses[1], amountTrx)
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.validateTx(txHash!, accountAddresses[1], amountTrx)
     await extension.navigation.menuTokens.click()
 
     //ensure that balance is updated
@@ -48,7 +49,8 @@ test.describe("Send funds", () => {
       amount: "MAX",
     })
 
-    await extension.validateTx(config.destinationAddress!, amountTrx)
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.validateTx(txHash!, config.destinationAddress!, amountTrx)
     await extension.navigation.menuTokens.click()
 
     //ensure that balance is updated
@@ -72,6 +74,7 @@ test.describe("Send funds", () => {
       tokenName: "Ethereum",
       amount: "MAX",
     })
-    await extension.validateTx(config.account1Seed3!, amountTrx)
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.validateTx(txHash!, config.account1Seed3!, amountTrx)
   })
 })
diff --git a/packages/e2e/extension/src/specs/sendPartialFunds.spec.ts b/packages/e2e/extension/src/specs/sendPartialFunds.spec.ts
index 2923f7a0f..8876b7456 100644
--- a/packages/e2e/extension/src/specs/sendPartialFunds.spec.ts
+++ b/packages/e2e/extension/src/specs/sendPartialFunds.spec.ts
@@ -14,8 +14,8 @@ test.describe("Send funds", () => {
       tokenName: "Ethereum",
       amount: 0.005,
     })
-
-    await extension.validateTx(accountAddresses[1], amountTrx)
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.validateTx(txHash!, accountAddresses[1], amountTrx)
     await extension.navigation.menuTokens.click()
 
     //ensure that balance is updated
@@ -47,7 +47,8 @@ test.describe("Send funds", () => {
       fillRecipientAddress: "typing",
     })
 
-    await extension.validateTx(config.destinationAddress!, amountTrx)
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.validateTx(txHash!, config.destinationAddress!, amountTrx)
     await extension.navigation.menuTokens.click()
 
     //ensure that balance is updated
@@ -79,6 +80,7 @@ test.describe("Send funds", () => {
       tokenName: "Ethereum",
       amount: "MAX",
     })
-    await extension.validateTx(config.account1Seed3!, amountTrx)
+    const txHash = await extension.activity.getLastTxHash()
+    await extension.validateTx(txHash!, config.account1Seed3!, amountTrx)
   })
 })
diff --git a/packages/e2e/extension/src/utils/account.ts b/packages/e2e/extension/src/utils/account.ts
index f27d5ca6b..c8e87c485 100644
--- a/packages/e2e/extension/src/utils/account.ts
+++ b/packages/e2e/extension/src/utils/account.ts
@@ -6,7 +6,7 @@ import {
   RpcProvider,
   constants,
 } from "starknet"
-import { bigDecimal } from "@argent/shared"
+import { bigDecimal, isEqualAddress } from "@argent/shared"
 import { getBatchProvider } from "@argent/x-multicall"
 import config from "../config"
 import { expect } from "@playwright/test"
@@ -27,24 +27,16 @@ if (!process.env.ARGENT_TESTNET_RPC_URL) {
 const provider = new RpcProvider({
   nodeUrl: process.env.ARGENT_TESTNET_RPC_URL,
   chainId: constants.StarknetChainId.SN_GOERLI,
+  headers: {
+    "argent-version": process.env.VERSION || "Unknown version",
+    "argent-client": "argent-x",
+  },
 })
 const tnkETH =
   "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7" // address of ETH
 
 const maxRetries = 4
 
-const isEqualAddress = (a: string, b: string) => {
-  try {
-    return (
-      num.hexToDecimalString(a.toLocaleLowerCase()) ===
-      num.hexToDecimalString(b.toLocaleLowerCase())
-    )
-  } catch {
-    // ignore parsing error
-  }
-  return false
-}
-
 const formatAmount = (amount: string) => {
   return parseInt(amount, 16) / Math.pow(10, 18)
 }
@@ -142,6 +134,7 @@ export async function validateTx(
   reciever: string,
   amount?: number,
 ) {
+  console.log("txHash:", txHash)
   await provider.waitForTransaction(txHash)
   const txData = await provider.getTransaction(txHash)
   if (!("calldata" in txData)) {
diff --git a/packages/eslint-plugin-local/package.json b/packages/eslint-plugin-local/package.json
index ff1f0077a..ba6779b15 100644
--- a/packages/eslint-plugin-local/package.json
+++ b/packages/eslint-plugin-local/package.json
@@ -19,6 +19,6 @@
     "dev": "tsc --build --watch",
     "build": "tsc --build",
     "lint": "eslint . --cache --ext .ts",
-    "setup": "yarn build"
+    "setup": "pnpm build"
   }
 }
diff --git a/packages/extension/.eslintrc.js b/packages/extension/.eslintrc.js
index 5d148b59f..6d0205de9 100644
--- a/packages/extension/.eslintrc.js
+++ b/packages/extension/.eslintrc.js
@@ -15,7 +15,7 @@ module.exports = {
       },
     ],
     "@argent/local/code-import-patterns": [
-      "warn",
+      "error",
       {
         target: "packages/extension/src/ui/**",
         disallow: ["packages/extension/src/background/**"],
diff --git a/packages/extension/CHANGELOG.md b/packages/extension/CHANGELOG.md
index 30c553e61..085fcb817 100644
--- a/packages/extension/CHANGELOG.md
+++ b/packages/extension/CHANGELOG.md
@@ -1,5 +1,69 @@
 # @argent-x/extension
 
+## 6.12.8
+
+### Patch Changes
+
+- 74b9f9a1a: Release
+
+## 6.12.7
+
+### Patch Changes
+
+- 34a7190b3: Release
+
+## 6.12.6
+
+### Patch Changes
+
+- 0971a5d80: Release
+
+## 6.12.5
+
+### Patch Changes
+
+- 6e01d0331: Release
+- Updated dependencies [6e01d0331]
+  - @argent/x-sessions@6.5.2
+
+## 6.12.4
+
+### Patch Changes
+
+- ce8935719: Release
+- Updated dependencies [ce8935719]
+  - @argent/x-sessions@6.5.1
+
+## 6.12.3
+
+### Patch Changes
+
+- 3b6c526af: Release
+
+## 6.12.2
+
+### Patch Changes
+
+- 90be4c4c6: Release
+
+## 6.12.1
+
+### Patch Changes
+
+- e459cea52: Release
+
+## 6.12.0
+
+### Minor Changes
+
+- 5e36dfc39: Release
+
+## 6.11.1
+
+### Patch Changes
+
+- 8cec95de4: Release
+
 ## 6.11.0
 
 ### Minor Changes
diff --git a/packages/extension/manifest/v2.json b/packages/extension/manifest/v2.json
index 60615a7dc..0a3b2b561 100644
--- a/packages/extension/manifest/v2.json
+++ b/packages/extension/manifest/v2.json
@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/chrome-manifest.json",
   "name": "Argent X",
   "description": "The security of Ethereum with the scale of StarkNet",
-  "version": "5.11.0",
+  "version": "5.12.8",
   "manifest_version": 2,
   "browser_action": {
     "default_icon": {
diff --git a/packages/extension/manifest/v3.json b/packages/extension/manifest/v3.json
index ba14cb01d..c709d536a 100644
--- a/packages/extension/manifest/v3.json
+++ b/packages/extension/manifest/v3.json
@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/chrome-manifest.json",
   "name": "Argent X",
   "description": "The security of Ethereum with the scale of StarkNet",
-  "version": "5.11.0",
+  "version": "5.12.8",
   "manifest_version": 3,
   "action": {
     "default_icon": {
diff --git a/packages/extension/package.json b/packages/extension/package.json
index 2d5eb23eb..39f1901a5 100644
--- a/packages/extension/package.json
+++ b/packages/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@argent-x/extension",
-  "version": "6.11.0",
+  "version": "6.12.8",
   "main": "index.js",
   "private": true,
   "license": "MIT",
@@ -10,12 +10,12 @@
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",
     "@types/async-retry": "^1.4.5",
-    "@types/chrome": "^0.0.248",
+    "@types/chrome": "^0.0.254",
     "@types/fs-extra": "^11.0.1",
     "@types/lodash-es": "^4.17.6",
     "@types/object-hash": "^3.0.2",
     "@types/react": "^18.0.0",
-    "@types/react-copy-to-clipboard": "5.0.6",
+    "@types/react-copy-to-clipboard": "5.0.7",
     "@types/react-dom": "^18.0.0",
     "@types/react-measure": "^2.0.8",
     "@types/semver": "^7.3.10",
@@ -25,8 +25,10 @@
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "@vitejs/plugin-react-swc": "^3.3.1",
-    "@vitest/coverage-istanbul": "^0.34.0",
-    "@vitest/coverage-v8": "^0.34.0",
+    "@vitest/browser": "1.0.2",
+    "@vitest/coverage-istanbul": "^1.0.0",
+    "@vitest/coverage-v8": "1.0.2",
+    "@vitest/ui": "1.0.2",
     "chokidar": "^3.5.2",
     "concurrently": "^8.0.1",
     "copy-webpack-plugin": "^11.0.0",
@@ -41,10 +43,9 @@
     "file-loader": "^6.2.0",
     "fork-ts-checker-webpack-plugin": "^9.0.0",
     "fs-extra": "^11.1.1",
-    "happy-dom": "^12.0.0",
+    "happy-dom": "^12.10.3",
     "html-webpack-plugin": "^5.5.0",
     "isomorphic-fetch": "^3.0.0",
-    "jsdom": "^22.0.0",
     "minimatch": "^9.0.1",
     "msw": "^1.0.0",
     "raw-loader": "^4.0.2",
@@ -53,8 +54,8 @@
     "typescript": "^5.0.4",
     "typescript-styled-plugin": "^0.18.2",
     "url-loader": "^4.1.1",
-    "vite": "^4.3.8",
-    "vitest": "^0.33.0",
+    "vite": "^5.0.0",
+    "vitest": "1.0.2",
     "wait-for-expect": "^3.0.2",
     "webpack": "^5.88.0",
     "webpack-cli": "^5.1.1",
@@ -79,8 +80,7 @@
     "@argent/stack-router": "^6.3.1",
     "@argent/ui": "^6.3.1",
     "@argent/x-multicall": "^7.0.12",
-    "@argent/x-sessions": "^6.5.0",
-    "@argent/x-swap": "^6.3.1",
+    "@argent/x-sessions": "^6.5.2",
     "@argent/x-window": "^6.3.1",
     "@chakra-ui/icons": "^2.0.15",
     "@chakra-ui/react": "^2.6.1",
@@ -100,7 +100,7 @@
     "@tippyjs/react": "^4.2.6",
     "@trpc/client": "^10.28.0",
     "@trpc/server": "^10.31.0",
-    "@vitest/coverage-istanbul": "^0.34.0",
+    "@vitest/coverage-istanbul": "^1.0.0",
     "async-retry": "^1.3.3",
     "bignumber.js": "^9.1.2",
     "colord": "^2.9.3",
@@ -132,12 +132,13 @@
     "starknet4-deprecated": "npm:starknet@4.4.0",
     "styled-components": "^5.3.5",
     "styled-normalize": "^8.0.7",
+    "superjson": "^2.2.1",
     "swr": "^1.3.0",
-    "trpc-browser": "^1.3.6",
+    "trpc-browser": "^1.3.7",
     "url-join": "^5.0.0",
     "webextension-polyfill": "^0.10.0",
     "yup": "^1.0.0-beta.4",
     "zod": "^3.20.2",
-    "zustand": "^4.3.6"
+    "zustand": "^4.4.4"
   }
 }
diff --git a/packages/extension/src/assets/default-tokens.json b/packages/extension/src/assets/default-tokens.json
index 9af9f5a69..90aee589b 100644
--- a/packages/extension/src/assets/default-tokens.json
+++ b/packages/extension/src/assets/default-tokens.json
@@ -39,6 +39,15 @@
     "iconUrl": "https://dv3jj1unlp2jl.cloudfront.net/128/color/eth.png",
     "showAlways": true
   },
+  {
+    "id": 2,
+    "address": "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
+    "name": "Stark",
+    "symbol": "STRK",
+    "decimals": "18",
+    "network": "integration",
+    "showAlways": true
+  },
   {
     "id": 6,
     "address": "0x00da114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3",
@@ -110,30 +119,5 @@
     "decimals": "6",
     "network": "goerli-alpha",
     "iconUrl": "https://dv3jj1unlp2jl.cloudfront.net/128/color/usdt.png"
-  },
-  {
-    "address": "0x0148f970a06fc95ee0682140e23a980351be8fad26168c5f0465e63940c46514",
-    "name": "Angle agEUR",
-    "symbol": "agEUR",
-    "decimals": "18",
-    "network": "mainnet-alpha",
-    "iconUrl": "https://dv3jj1unlp2jl.cloudfront.net/128/color/ageur.png"
-  },
-  {
-    "address": "0x05ef98e7dc5865f49bcec200df508d27669b3ef7f9d2439decd127350359f291",
-    "name": "Wrapped Lido ETH",
-    "symbol": "wstETH",
-    "decimals": "18",
-    "network": "mainnet-alpha",
-    "iconUrl": "https://dv3jj1unlp2jl.cloudfront.net/128/color/steth.png"
-  },
-  {
-    "id": 270,
-    "address": "0x0319111a5037cbec2b3e638cc34a3474e2d2608299f3e62866e9cc683208c610",
-    "name": "Rocket Pool ETH",
-    "symbol": "rETH",
-    "decimals": "18",
-    "network": "mainnet-alpha",
-    "iconUrl": "https://dv3jj1unlp2jl.cloudfront.net/128/color/reth.png"
   }
 ]
diff --git a/packages/extension/src/background/__new/procedures/accountMessaging/escapeAndChangeGuardian.ts b/packages/extension/src/background/__new/procedures/accountMessaging/escapeAndChangeGuardian.ts
index 4116a22c9..e76542c84 100644
--- a/packages/extension/src/background/__new/procedures/accountMessaging/escapeAndChangeGuardian.ts
+++ b/packages/extension/src/background/__new/procedures/accountMessaging/escapeAndChangeGuardian.ts
@@ -2,7 +2,6 @@ import { z } from "zod"
 
 import { extensionOnlyProcedure } from "../permissions"
 import { baseWalletAccountSchema } from "../../../../shared/wallet.model"
-import { isEqualAddress } from "../../../../ui/services/addresses"
 import { constants, num, Account } from "starknet"
 import { getEntryPointSafe } from "../../../../shared/utils/transactions"
 import { AccountMessagingError } from "../../../../shared/errors/accountMessaging"
@@ -10,6 +9,7 @@ import { AccountError } from "../../../../shared/errors/account"
 import {
   changeGuardianCalldataSchema,
   escapeGuardianCalldataSchema,
+  isEqualAddress,
 } from "@argent/shared"
 
 const escapeAndChangeGuardianSchema = z.object({
diff --git a/packages/extension/src/background/__new/procedures/accountMessaging/getAccountDeploymentPayload.ts b/packages/extension/src/background/__new/procedures/accountMessaging/getAccountDeploymentPayload.ts
index 230606fdb..5236a326c 100644
--- a/packages/extension/src/background/__new/procedures/accountMessaging/getAccountDeploymentPayload.ts
+++ b/packages/extension/src/background/__new/procedures/accountMessaging/getAccountDeploymentPayload.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 
-import { extensionOnlyProcedure } from "../permissions"
+import { connectedDappsProcedure } from "../permissions"
 import { baseWalletAccountSchema } from "../../../../shared/wallet.model"
 import { AccountMessagingError } from "../../../../shared/errors/accountMessaging"
 import { SessionError } from "../../../../shared/errors/session"
@@ -11,9 +11,11 @@ import {
   rawArgsSchema,
 } from "@argent/shared"
 
-const getAccountDeploymentPayloadInputSchema = z.object({
-  account: baseWalletAccountSchema,
-})
+const getAccountDeploymentPayloadInputSchema = z
+  .object({
+    account: baseWalletAccountSchema,
+  })
+  .optional()
 
 const deployAccountContractSchema = z.object({
   classHash: z.string(),
@@ -22,12 +24,12 @@ const deployAccountContractSchema = z.object({
   contractAddress: addressSchema.optional(),
 })
 
-export const getAccountDeploymentPayloadProcedure = extensionOnlyProcedure
+export const getAccountDeploymentPayloadProcedure = connectedDappsProcedure
   .input(getAccountDeploymentPayloadInputSchema)
   .output(deployAccountContractSchema)
   .query(
     async ({
-      input: { account },
+      input,
       ctx: {
         services: { wallet },
       },
@@ -38,7 +40,9 @@ export const getAccountDeploymentPayloadProcedure = extensionOnlyProcedure
         })
       }
       try {
-        const walletAccount = await wallet.getAccount(account)
+        const walletAccount = input?.account
+          ? await wallet.getAccount(input.account)
+          : await wallet.getSelectedAccount()
         if (!walletAccount) {
           throw new AccountError({
             code: "NOT_FOUND",
diff --git a/packages/extension/src/background/__new/procedures/argentAccount/getPreferences.ts b/packages/extension/src/background/__new/procedures/argentAccount/getPreferences.ts
index ff8102594..ce107355e 100644
--- a/packages/extension/src/background/__new/procedures/argentAccount/getPreferences.ts
+++ b/packages/extension/src/background/__new/procedures/argentAccount/getPreferences.ts
@@ -1,6 +1,6 @@
 import { openSessionMiddleware } from "../../middleware/session"
 import { extensionOnlyProcedure } from "../permissions"
-import { preferencesEndpointPayload } from "./updatePreferences.model"
+import { preferencesEndpointPayload } from "../../../../shared/argentAccount/schema"
 
 export const getPreferencesProcedure = extensionOnlyProcedure
   .use(openSessionMiddleware)
diff --git a/packages/extension/src/background/__new/procedures/argentAccount/updatePreferences.ts b/packages/extension/src/background/__new/procedures/argentAccount/updatePreferences.ts
index 51d961106..54bee7c62 100644
--- a/packages/extension/src/background/__new/procedures/argentAccount/updatePreferences.ts
+++ b/packages/extension/src/background/__new/procedures/argentAccount/updatePreferences.ts
@@ -1,6 +1,6 @@
 import { openSessionMiddleware } from "../../middleware/session"
 import { extensionOnlyProcedure } from "../permissions"
-import { preferencesEndpointPayload } from "./updatePreferences.model"
+import { preferencesEndpointPayload } from "../../../../shared/argentAccount/schema"
 
 export const updatePreferencesProcedure = extensionOnlyProcedure
   .use(openSessionMiddleware)
diff --git a/packages/extension/src/background/__new/procedures/permissions.ts b/packages/extension/src/background/__new/procedures/permissions.ts
index 20f8668e8..aed4dec9e 100644
--- a/packages/extension/src/background/__new/procedures/permissions.ts
+++ b/packages/extension/src/background/__new/procedures/permissions.ts
@@ -1,6 +1,7 @@
 import { TRPCError } from "@trpc/server"
 
 import { procedure } from "../trpc"
+import { preAuthorizationService } from "../../../shared/preAuthorization/service"
 
 // TODO: ⬇ should be service
 function getOrigin(url: string) {
@@ -23,6 +24,39 @@ function matchOrigin(urlToMatch: string, url?: string) {
 
 export const publicProcedure = procedure
 
+export const connectedDappsProcedure = publicProcedure.use(
+  async ({ ctx, next }) => {
+    const sender = ctx.sender
+    const senderUrl = sender?.url ?? sender?.origin
+    const origin = senderUrl && getOrigin(senderUrl)
+    const account = await ctx.services.wallet.getSelectedAccount()
+
+    const isPreauthorized = await preAuthorizationService.isPreAuthorized({
+      account,
+      host: origin,
+    })
+
+    const extensionUrl = chrome.runtime.getURL("")
+    const fromExtension = matchOrigin(extensionUrl, senderUrl)
+
+    const isFromPreauthorizedDappOrExtension = isPreauthorized || fromExtension
+
+    if (!sender || !isFromPreauthorizedDappOrExtension) {
+      throw new TRPCError({
+        code: "FORBIDDEN",
+        message: "Reserved for preauthorized calls or extension",
+      })
+    }
+
+    return next({
+      ctx: {
+        ...ctx,
+        sender, // by passing it after checking, every method after this middleware will have a mandatory sender
+      },
+    })
+  },
+)
+
 export const extensionOnlyProcedure = publicProcedure.use(
   async ({ ctx, next }) => {
     const extensionUrl = chrome.runtime.getURL("")
diff --git a/packages/extension/src/background/__new/procedures/swap/getSwapOrderFromTrade.ts b/packages/extension/src/background/__new/procedures/swap/getSwapOrderFromTrade.ts
new file mode 100644
index 000000000..a954e7a8a
--- /dev/null
+++ b/packages/extension/src/background/__new/procedures/swap/getSwapOrderFromTrade.ts
@@ -0,0 +1,29 @@
+import { z } from "zod"
+import { extensionOnlyProcedure } from "../permissions"
+import { SwapOrderResponseSchema } from "../../../../shared/swap/model/order.model"
+import { TradeSchema } from "../../../../shared/swap/model/trade.model"
+import { addressSchema } from "@argent/shared"
+
+const SwapOrderFromTradeSchema = z.object({
+  trade: TradeSchema,
+  accountAddress: addressSchema,
+  userSlippageTolerance: z.number(),
+})
+
+export const getSwapOrderFromTradeProcedure = extensionOnlyProcedure
+  .input(SwapOrderFromTradeSchema)
+  .output(SwapOrderResponseSchema)
+  .mutation(
+    ({
+      input: { trade, accountAddress, userSlippageTolerance },
+      ctx: {
+        services: { swapService },
+      },
+    }) => {
+      return swapService.getSwapOrderFromTrade(
+        accountAddress,
+        trade,
+        userSlippageTolerance,
+      )
+    },
+  )
diff --git a/packages/extension/src/background/__new/procedures/swap/getSwapQuoteForPay.ts b/packages/extension/src/background/__new/procedures/swap/getSwapQuoteForPay.ts
new file mode 100644
index 000000000..59834014e
--- /dev/null
+++ b/packages/extension/src/background/__new/procedures/swap/getSwapQuoteForPay.ts
@@ -0,0 +1,34 @@
+import { z } from "zod"
+import { extensionOnlyProcedure } from "../permissions"
+import { SwapQuoteResponseSchema } from "../../../../shared/swap/model/quote.model"
+
+const SwapQuoteForPaySchema = z.object({
+  payTokenAddress: z.string(),
+  receiveTokenAddress: z.string(),
+  payAmount: z.string(),
+  accountAddress: z.string(),
+})
+
+export const getSwapQuoteForPayProcedure = extensionOnlyProcedure
+  .input(SwapQuoteForPaySchema)
+  .output(SwapQuoteResponseSchema)
+  .query(
+    ({
+      input: {
+        payTokenAddress,
+        receiveTokenAddress,
+        payAmount,
+        accountAddress,
+      },
+      ctx: {
+        services: { swapService },
+      },
+    }) => {
+      return swapService.getSwapQuoteForPay(
+        payTokenAddress,
+        receiveTokenAddress,
+        payAmount,
+        accountAddress,
+      )
+    },
+  )
diff --git a/packages/extension/src/background/__new/procedures/swap/getSwapTradeFromQuote.ts b/packages/extension/src/background/__new/procedures/swap/getSwapTradeFromQuote.ts
new file mode 100644
index 000000000..714fa523a
--- /dev/null
+++ b/packages/extension/src/background/__new/procedures/swap/getSwapTradeFromQuote.ts
@@ -0,0 +1,23 @@
+import { z } from "zod"
+import { extensionOnlyProcedure } from "../permissions"
+import { TradeSchema } from "../../../../shared/swap/model/trade.model"
+import { SwapQuoteResponseSchema } from "../../../../shared/swap/model/quote.model"
+
+const SwapQuoteResponseWithNetworkSchema = z.object({
+  quote: SwapQuoteResponseSchema,
+  networkId: z.string(),
+})
+
+export const getSwapTradeFromQuoteProcedure = extensionOnlyProcedure
+  .input(SwapQuoteResponseWithNetworkSchema)
+  .output(TradeSchema)
+  .query(
+    async ({
+      input: { quote, networkId },
+      ctx: {
+        services: { swapService },
+      },
+    }) => {
+      return await swapService.getSwapTradeFromQuote(quote, networkId)
+    },
+  )
diff --git a/packages/extension/src/background/__new/procedures/swap/index.ts b/packages/extension/src/background/__new/procedures/swap/index.ts
new file mode 100644
index 000000000..ebf05f82b
--- /dev/null
+++ b/packages/extension/src/background/__new/procedures/swap/index.ts
@@ -0,0 +1,12 @@
+import { router } from "../../trpc"
+import { getSwapQuoteForPayProcedure } from "./getSwapQuoteForPay"
+import { getSwapTradeFromQuoteProcedure } from "./getSwapTradeFromQuote"
+import { getSwapOrderFromTradeProcedure } from "./getSwapOrderFromTrade"
+import { makeSwapProcedure } from "./makeSwap"
+
+export const swapRouter = router({
+  getSwapQuoteForPay: getSwapQuoteForPayProcedure,
+  getSwapTradeFromQuote: getSwapTradeFromQuoteProcedure,
+  getSwapOrderFromTrade: getSwapOrderFromTradeProcedure,
+  makeSwap: makeSwapProcedure,
+})
diff --git a/packages/extension/src/background/__new/procedures/tokens/swap.ts b/packages/extension/src/background/__new/procedures/swap/makeSwap.ts
similarity index 92%
rename from packages/extension/src/background/__new/procedures/tokens/swap.ts
rename to packages/extension/src/background/__new/procedures/swap/makeSwap.ts
index 482c02700..91f2fd44c 100644
--- a/packages/extension/src/background/__new/procedures/tokens/swap.ts
+++ b/packages/extension/src/background/__new/procedures/swap/makeSwap.ts
@@ -8,7 +8,7 @@ export const swapSchema = z.object({
   title: z.string(),
 })
 
-export const swapProcedure = extensionOnlyProcedure
+export const makeSwapProcedure = extensionOnlyProcedure
   .input(swapSchema)
   .output(z.string())
   .mutation(
diff --git a/packages/extension/src/background/__new/procedures/tokens/addToken.ts b/packages/extension/src/background/__new/procedures/tokens/addToken.ts
index c8e397ff7..e89c02ef7 100644
--- a/packages/extension/src/background/__new/procedures/tokens/addToken.ts
+++ b/packages/extension/src/background/__new/procedures/tokens/addToken.ts
@@ -5,6 +5,6 @@ import { tokenService } from "../../../../shared/token/__new/service"
 export const addTokenProcedure = extensionOnlyProcedure
   .input(TokenSchema)
   .mutation(async ({ input: token }) => {
-    // tokens that are added from the UI should always be shown with custom flag, even if the balance is 0
+    // tokens that are added from the UI should never be shown with custom flag, even if the balance is 0
     return await tokenService.addToken({ ...token, custom: true })
   })
diff --git a/packages/extension/src/background/__new/procedures/tokens/index.ts b/packages/extension/src/background/__new/procedures/tokens/index.ts
index 7a232b412..a031eb8cf 100644
--- a/packages/extension/src/background/__new/procedures/tokens/index.ts
+++ b/packages/extension/src/background/__new/procedures/tokens/index.ts
@@ -6,7 +6,6 @@ import { getAccountBalanceProcedure } from "./getAccountBalance"
 import { getAllTokenBalancesProcedure } from "./getAllTokenBalances"
 import { getCurrencyValueForTokensProcedure } from "./getCurrencyValueForTokens"
 import { removeTokenProcedure } from "./removeToken"
-import { swapProcedure } from "./swap"
 
 export const tokensRouter = router({
   addToken: addTokenProcedure,
@@ -16,5 +15,4 @@ export const tokensRouter = router({
   getAccountBalance: getAccountBalanceProcedure,
   getAllTokenBalances: getAllTokenBalancesProcedure,
   getCurrencyValueForTokens: getCurrencyValueForTokensProcedure,
-  swap: swapProcedure,
 })
diff --git a/packages/extension/src/background/__new/procedures/transactionEstimate/accountDeploy.ts b/packages/extension/src/background/__new/procedures/transactionEstimate/accountDeploy.ts
new file mode 100644
index 000000000..07ea0f4c2
--- /dev/null
+++ b/packages/extension/src/background/__new/procedures/transactionEstimate/accountDeploy.ts
@@ -0,0 +1,45 @@
+import { z } from "zod"
+
+import { openSessionMiddleware } from "../../middleware/session"
+import { extensionOnlyProcedure } from "../permissions"
+import { baseWalletAccountSchema } from "../../../../shared/wallet.model"
+import { addressSchema } from "@argent/shared"
+import { estimatedFeeSchema } from "../../../../shared/transactionSimulation/fees/fees.model"
+import { AccountError } from "../../../../shared/errors/account"
+import { getErrorObject } from "../../../../shared/utils/error"
+
+const estimateRequestSchema = z.object({
+  account: baseWalletAccountSchema.optional(),
+  feeTokenAddress: addressSchema,
+})
+
+export const estimateAccountDeployProcedure = extensionOnlyProcedure
+  .use(openSessionMiddleware)
+  .input(estimateRequestSchema)
+  .output(estimatedFeeSchema)
+  .query(
+    async ({
+      input: { account: providedAccount, feeTokenAddress },
+      ctx: {
+        services: { wallet },
+      },
+    }) => {
+      const account = providedAccount
+        ? await wallet.getAccount(providedAccount)
+        : await wallet.getSelectedAccount()
+
+      if (!account) {
+        throw Error("no accounts")
+      }
+
+      try {
+        return await wallet.getAccountDeploymentFee(account, feeTokenAddress)
+      } catch (error) {
+        console.error("estimateAccountDeployProcedure", error)
+        throw new AccountError({
+          code: "CANNOT_ESTIMATE_DEPLOY_ACCOUNT",
+          options: { error: getErrorObject(error) },
+        })
+      }
+    },
+  )
diff --git a/packages/extension/src/background/__new/procedures/transactionEstimate/estimate.ts b/packages/extension/src/background/__new/procedures/transactionEstimate/estimate.ts
new file mode 100644
index 000000000..dc3e2ab8a
--- /dev/null
+++ b/packages/extension/src/background/__new/procedures/transactionEstimate/estimate.ts
@@ -0,0 +1,76 @@
+import { z } from "zod"
+
+import { openSessionMiddleware } from "../../middleware/session"
+import { extensionOnlyProcedure } from "../permissions"
+import { baseWalletAccountSchema } from "../../../../shared/wallet.model"
+import { addressSchema, callSchema, ensureArray } from "@argent/shared"
+import {
+  callsToInvocation,
+  extendInvocationsByAccountDeploy,
+  estimatedFeesToResponse,
+} from "./helpers"
+import { estimatedFeesSchema } from "../../../../shared/transactionSimulation/fees/fees.model"
+import { AccountError } from "../../../../shared/errors/account"
+
+const estimateRequestSchema = z.object({
+  account: baseWalletAccountSchema,
+  feeTokenAddress: addressSchema,
+  transactions: z.array(callSchema).or(callSchema),
+})
+
+export const estimateTransactionProcedure = extensionOnlyProcedure
+  .use(openSessionMiddleware)
+  .input(estimateRequestSchema)
+  .output(estimatedFeesSchema)
+  .query(
+    async ({
+      input: { account, feeTokenAddress, transactions },
+      ctx: {
+        services: { wallet },
+      },
+    }) => {
+      const walletAccount = await wallet.getAccount(account)
+      if (!walletAccount) {
+        throw new AccountError({ code: "NOT_FOUND" })
+      }
+
+      const snAccount = await wallet.getStarknetAccount(account)
+
+      if (!("estimateFeeBulk" in snAccount)) {
+        throw new AccountError({ code: "MISSING_METHOD" })
+      }
+
+      const transactionsInvocation = callsToInvocation(
+        ensureArray(transactions),
+      )
+
+      const allInvocations = await extendInvocationsByAccountDeploy(
+        [transactionsInvocation],
+        walletAccount,
+        snAccount,
+        wallet,
+      )
+
+      // TODO: consider selected fee token
+      const estimatedFees = await snAccount.estimateFeeBulk(allInvocations, {
+        skipValidate: true,
+      })
+
+      try {
+        const aggregatedResponse = estimatedFeesToResponse(
+          estimatedFees,
+          allInvocations,
+        )
+
+        return {
+          ...aggregatedResponse,
+          feeTokenAddress,
+        }
+      } catch (e) {
+        throw new AccountError({
+          code: "CANNOT_ESTIMATE_TRANSACTIONS",
+          options: { error: e },
+        })
+      }
+    },
+  )
diff --git a/packages/extension/src/background/__new/procedures/transactionEstimate/helpers.ts b/packages/extension/src/background/__new/procedures/transactionEstimate/helpers.ts
new file mode 100644
index 000000000..c0cd6df08
--- /dev/null
+++ b/packages/extension/src/background/__new/procedures/transactionEstimate/helpers.ts
@@ -0,0 +1,106 @@
+import {
+  Call,
+  EstimateFeeBulk,
+  Invocations,
+  ProviderInterface,
+  TransactionType,
+} from "starknet"
+import { isAccountDeployed } from "../../../accountDeploy"
+import type { EstimatedFees } from "../../../../shared/transactionSimulation/fees/fees.model"
+import type { WalletAccount } from "../../../../shared/wallet.model"
+import type { Wallet } from "../../../wallet"
+import { ETH_TOKEN_ADDRESS } from "../../../../shared/network/constants"
+
+type Invocation = Invocations[number]
+
+export function callsToInvocation(calls: Call[]): Invocation {
+  return {
+    type: TransactionType.INVOKE,
+    payload: calls,
+  }
+}
+
+export function estimatedFeesToResponse(
+  estimatedFees: EstimateFeeBulk,
+  invocations: Invocations,
+): EstimatedFees {
+  // check length is same
+  if (estimatedFees.length !== invocations.length) {
+    throw new Error("estimatedFeesToResponse: length mismatch")
+  }
+
+  if (estimatedFees.length !== 1 && estimatedFees.length !== 2) {
+    throw new Error("estimatedFeesToResponse: length must be 1 or 2")
+  }
+
+  const fees: EstimatedFees = {
+    transactions: {
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+      amount: 0n,
+      pricePerUnit: 0n,
+    },
+  }
+
+  if (estimatedFees.length === 2) {
+    const { gas_consumed, gas_price } = estimatedFees[0]
+    if (!gas_consumed || !gas_price) {
+      throw new Error(
+        "estimatedFeesToResponse: missing gas_consumed or gas_price",
+      )
+    }
+
+    fees.deployment = {
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+      amount: gas_consumed,
+      pricePerUnit: gas_price,
+    }
+  }
+
+  const { gas_consumed, gas_price } =
+    estimatedFees.length === 2 ? estimatedFees[1] : estimatedFees[0]
+
+  if (!gas_consumed || !gas_price) {
+    throw new Error(
+      "estimatedFeesToResponse: missing gas_consumed or gas_price",
+    )
+  }
+
+  fees.transactions = {
+    feeTokenAddress: ETH_TOKEN_ADDRESS,
+    amount: gas_consumed,
+    pricePerUnit: gas_price,
+  }
+
+  return fees
+}
+
+export async function extendInvocationsByAccountDeploy(
+  invocations: Invocations,
+  walletAccount: WalletAccount,
+  starknetProvider: ProviderInterface,
+  wallet: Pick<Wallet, "getAccountDeploymentPayload">,
+): Promise<Invocations> {
+  // if there's already a deploy account invocation, return
+  const deployAccountInvocationIndex = invocations.findIndex(
+    (invocation) => invocation.type === TransactionType.DEPLOY_ACCOUNT,
+  )
+  if (deployAccountInvocationIndex !== -1) {
+    return invocations
+  }
+
+  // otherwise, check if account is already deployed
+  const isDeployed = await isAccountDeployed(
+    walletAccount,
+    starknetProvider.getClassAt.bind(starknetProvider),
+  )
+  if (isDeployed) {
+    return invocations
+  }
+
+  const deployAccountInvocation: Invocations[number] = {
+    type: TransactionType.DEPLOY_ACCOUNT,
+    payload: await wallet.getAccountDeploymentPayload(walletAccount),
+  }
+
+  return [deployAccountInvocation, ...invocations]
+}
diff --git a/packages/extension/src/background/__new/procedures/transactionEstimate/index.ts b/packages/extension/src/background/__new/procedures/transactionEstimate/index.ts
new file mode 100644
index 000000000..36aba59f3
--- /dev/null
+++ b/packages/extension/src/background/__new/procedures/transactionEstimate/index.ts
@@ -0,0 +1,8 @@
+import { router } from "../../trpc"
+import { estimateAccountDeployProcedure } from "./accountDeploy"
+import { estimateTransactionProcedure } from "./estimate"
+
+export const transactionEstimateRouter = router({
+  estimateTransaction: estimateTransactionProcedure,
+  estimateAccountDeploy: estimateAccountDeployProcedure,
+})
diff --git a/packages/extension/src/background/__new/procedures/transactionReview/simulateAndReview.ts b/packages/extension/src/background/__new/procedures/transactionReview/simulateAndReview.ts
index beb12e616..7758e921d 100644
--- a/packages/extension/src/background/__new/procedures/transactionReview/simulateAndReview.ts
+++ b/packages/extension/src/background/__new/procedures/transactionReview/simulateAndReview.ts
@@ -5,13 +5,15 @@ import { extensionOnlyProcedure } from "../permissions"
 import { transactionReviewTransactionsSchema } from "../../../../shared/transactionReview/interface"
 import { enrichedSimulateAndReviewSchema } from "../../../../shared/transactionReview/schema"
 
-const approveActionSchema = z.array(transactionReviewTransactionsSchema)
+const simulateAndReviewSchema = z.array(transactionReviewTransactionsSchema)
 
 export const simulateAndReviewProcedure = extensionOnlyProcedure
   .use(openSessionMiddleware)
-  .input(approveActionSchema)
+  .input(simulateAndReviewSchema)
   .output(enrichedSimulateAndReviewSchema)
   .query(async ({ input, ctx: { services } }) => {
     const { transactionReviewService } = services
-    return transactionReviewService.simulateAndReview({ transactions: input })
+    return transactionReviewService.simulateAndReview({
+      transactions: input,
+    })
   })
diff --git a/packages/extension/src/background/__new/procedures/udc/declareContractProcedure.ts b/packages/extension/src/background/__new/procedures/udc/declareContractProcedure.ts
index e03c7c4e8..75d7707d5 100644
--- a/packages/extension/src/background/__new/procedures/udc/declareContractProcedure.ts
+++ b/packages/extension/src/background/__new/procedures/udc/declareContractProcedure.ts
@@ -2,8 +2,7 @@ import { z } from "zod"
 
 import { extensionOnlyProcedure } from "../permissions"
 import { UdcError } from "../../../../shared/errors/udc"
-
-import { declareContractSchema } from "../../../../shared/udc/type"
+import { declareContractSchema } from "../../../../shared/udc/schema"
 
 export const declareContractProcedure = extensionOnlyProcedure
   .input(declareContractSchema)
diff --git a/packages/extension/src/background/__new/procedures/udc/deployContractProcedure.ts b/packages/extension/src/background/__new/procedures/udc/deployContractProcedure.ts
index 2bebffa1c..d6667ccbf 100644
--- a/packages/extension/src/background/__new/procedures/udc/deployContractProcedure.ts
+++ b/packages/extension/src/background/__new/procedures/udc/deployContractProcedure.ts
@@ -1,16 +1,6 @@
-import { z } from "zod"
-
 import { extensionOnlyProcedure } from "../permissions"
 import { UdcError } from "../../../../shared/errors/udc"
-
-const deployContractSchema = z.object({
-  address: z.string(),
-  networkId: z.string(),
-  classHash: z.string(),
-  constructorCalldata: z.array(z.string()),
-  salt: z.string().optional(),
-  unique: z.boolean().optional(),
-})
+import { deployContractSchema } from "../../../../shared/udc/schema"
 
 export const deployContractProcedure = extensionOnlyProcedure
   .input(deployContractSchema)
diff --git a/packages/extension/src/background/__new/procedures/udc/getConstructorParams.ts b/packages/extension/src/background/__new/procedures/udc/getConstructorParams.ts
index 45d425b40..dbb0fa7a4 100644
--- a/packages/extension/src/background/__new/procedures/udc/getConstructorParams.ts
+++ b/packages/extension/src/background/__new/procedures/udc/getConstructorParams.ts
@@ -4,20 +4,11 @@ import { getProvider } from "../../../../shared/network"
 import { networkService } from "../../../../shared/network/service"
 import { extensionOnlyProcedure } from "../permissions"
 import { UdcError } from "../../../../shared/errors/udc"
-
-const getConstructorParamsSchema = z.object({
-  networkId: z.string(),
-  classHash: z.string(),
-})
-
-const basicContractClassSchema = z.object({
-  abi: z.array(z.any()),
-  contract_class_version: z.string(),
-  entry_points_by_type: z.any().optional(),
-  sierra_program: z.array(z.string()).optional(),
-})
-
-export type BasicContractClass = z.infer<typeof basicContractClassSchema>
+import {
+  getConstructorParamsSchema,
+  basicContractClassSchema,
+  BasicContractClass,
+} from "../../../../shared/udc/schema"
 
 export const getConstructorParamsProcedure = extensionOnlyProcedure
   .input(getConstructorParamsSchema)
diff --git a/packages/extension/src/background/__new/router.ts b/packages/extension/src/background/__new/router.ts
index 597dfeb40..19dfec54f 100644
--- a/packages/extension/src/background/__new/router.ts
+++ b/packages/extension/src/background/__new/router.ts
@@ -19,10 +19,13 @@ import { backgroundArgentAccountService } from "./services/argentAccount"
 import { backgroundMultisigService } from "./services/multisig"
 import { backgroundTransactionReviewService } from "./services/transactionReview"
 import { router } from "./trpc"
+import { swapRouter } from "./procedures/swap"
 import { backgroundRecoveryService } from "./services/recovery"
 import { addressRouter } from "./procedures/address"
 import { backgroundStarknetAddressService } from "./services/address"
 import { networkService } from "../../shared/network/service"
+import { sharedSwapService } from "../../shared/swap/service"
+import { transactionEstimateRouter } from "./procedures/transactionEstimate"
 
 const appRouter = router({
   account: accountRouter,
@@ -34,7 +37,9 @@ const appRouter = router({
   multisig: multisigRouter,
   recovery: recoveryRouter,
   session: sessionRouter,
+  swap: swapRouter,
   tokens: tokensRouter,
+  transactionEstimate: transactionEstimateRouter,
   transactionReview: transactionReviewRouter,
   transfer: transferRouter,
   udc: udcRouter,
@@ -55,6 +60,7 @@ createChromeHandler({
       multisigService: backgroundMultisigService,
       recoveryService: backgroundRecoveryService,
       transactionReviewService: backgroundTransactionReviewService,
+      swapService: sharedSwapService,
       starknetAddressService: backgroundStarknetAddressService,
       networkService,
     },
diff --git a/packages/extension/src/shared/account/worker/implementation.test.ts b/packages/extension/src/background/__new/services/account/worker/implementation.test.ts
similarity index 55%
rename from packages/extension/src/shared/account/worker/implementation.test.ts
rename to packages/extension/src/background/__new/services/account/worker/implementation.test.ts
index fca28246f..2be14d9d8 100644
--- a/packages/extension/src/shared/account/worker/implementation.test.ts
+++ b/packages/extension/src/background/__new/services/account/worker/implementation.test.ts
@@ -1,40 +1,72 @@
-import { AccountUpdaterTaskId, AccountWorker } from "./implementation"
-import { IAccountService } from "../../account/service/interface"
-import { IScheduleService } from "../../schedule/interface"
-import { getMockWalletAccount } from "../../../../test/walletAccount.mock"
+import { Mocked, describe, expect, it, vi } from "vitest"
 import { addressSchema } from "@argent/shared"
-import { STANDARD_ACCOUNT_CLASS_HASH } from "../../network/constants"
 import { noop } from "lodash-es"
 
-vi.mock("../details/getAccountCairoVersionFromChain")
+import { getMockWalletAccount } from "../../../../../../test/walletAccount.mock"
+import { IAccountService } from "../../../../../shared/account/service/interface"
+import { IDebounceService } from "../../../../../shared/debounce"
+import { STANDARD_ACCOUNT_CLASS_HASH } from "../../../../../shared/network/constants"
+import { IScheduleService } from "../../../../../shared/schedule/interface"
+import { IActivityService } from "../../activity/interface"
+import { IBackgroundUIService } from "../../ui/interface"
+import { AccountWorker } from "./implementation"
 
-describe("AccountWorker", () => {
-  let accountServiceMock: IAccountService
-  let scheduleService: IScheduleService<AccountUpdaterTaskId.UPDATE_DEPLOYED>
+vi.mock("../../../../../shared/account/details/getAccountCairoVersionFromChain")
 
+describe("AccountWorker", () => {
   beforeEach(() => {
     vi.resetAllMocks()
-    accountServiceMock = vi.mocked<IAccountService>({
+  })
+
+  const makeService = () => {
+    const accountService = {
       get: () => Promise.resolve([getMockWalletAccount({})]),
       getDeployed: () => Promise.resolve(true),
       upsert: vi.fn(),
       remove: vi.fn(),
       setHide: vi.fn(),
       setName: vi.fn(),
-    })
+    } as unknown as Mocked<IAccountService>
 
-    scheduleService = {
+    const scheduleService = {
       registerImplementation: vi.fn(),
       in: vi.fn(),
       every: vi.fn(),
       delete: vi.fn(),
       onInstallAndUpgrade: vi.fn(),
       onStartup: vi.fn(),
+    } as unknown as Mocked<IScheduleService>
+
+    const activityService = {
+      emitter: {
+        on: vi.fn(),
+      },
+    } as unknown as Mocked<IActivityService>
+
+    const backgroundUIService = {} as unknown as Mocked<IBackgroundUIService>
+
+    const debounceService = {} as unknown as Mocked<IDebounceService>
+
+    const accountWorker = new AccountWorker(
+      accountService,
+      activityService,
+      scheduleService,
+      backgroundUIService,
+      debounceService,
+    )
+
+    return {
+      accountWorker,
+      accountService,
+      activityService,
+      scheduleService,
+      backgroundUIService,
+      debounceService,
     }
-  })
+  }
 
   it("should update all accounts", async () => {
-    const worker = new AccountWorker(accountServiceMock, scheduleService)
+    const { accountWorker: worker } = makeService()
 
     const spyUpdateDeployed = vi.spyOn(worker, "updateDeployed")
     const spyUpdateAccountClassHash = vi.spyOn(worker, "updateAccountClassHash")
@@ -51,7 +83,7 @@ describe("AccountWorker", () => {
   })
 
   it("should update account class hash", async () => {
-    const worker = new AccountWorker(accountServiceMock, scheduleService)
+    const { accountWorker: worker } = makeService()
 
     const spyGetAccountClassHashFromChain = vi.spyOn(
       worker,
@@ -64,7 +96,7 @@ describe("AccountWorker", () => {
   })
 
   it("should update account cairo version", async () => {
-    const worker = new AccountWorker(accountServiceMock, scheduleService)
+    const { accountWorker: worker } = makeService()
 
     const spyGetAccountCairoVersionFromChain = vi.spyOn(
       worker,
@@ -77,21 +109,16 @@ describe("AccountWorker", () => {
   })
 
   it("should call upsert with correct parameters on updateDeployed", async () => {
-    const mockAccount = getMockWalletAccount({ needsDeploy: true })
-
-    const mockAccountService = vi.mocked<IAccountService>({
-      ...accountServiceMock,
-      get: vi.fn().mockResolvedValue([mockAccount]),
-      getDeployed: vi.fn().mockResolvedValue(true),
-    })
+    const { accountWorker: worker, accountService } = makeService()
 
-    const worker = new AccountWorker(mockAccountService, scheduleService)
+    const mockAccount = getMockWalletAccount({ needsDeploy: true })
 
-    const spyAccountServiceUpsert = vi.spyOn(mockAccountService, "upsert")
+    accountService.get = vi.fn().mockResolvedValueOnce([mockAccount])
+    accountService.getDeployed = vi.fn().mockResolvedValueOnce(true)
 
     await worker.updateDeployed()
 
-    expect(spyAccountServiceUpsert).toHaveBeenCalledWith([
+    expect(accountService.upsert).toHaveBeenCalledWith([
       {
         ...mockAccount,
         needsDeploy: false,
@@ -100,24 +127,19 @@ describe("AccountWorker", () => {
   })
 
   it("should call upsert with correct parameters on updateAccountClassHash", async () => {
-    const mockAccount = getMockWalletAccount({ classHash: undefined })
+    const { accountWorker: worker, accountService } = makeService()
 
-    const mockAccountService = vi.mocked<IAccountService>({
-      ...accountServiceMock,
-      get: vi.fn().mockResolvedValue([mockAccount]),
-    })
+    const mockAccount = getMockWalletAccount({ classHash: undefined })
 
-    const worker = new AccountWorker(mockAccountService, scheduleService)
+    accountService.get = vi.fn().mockResolvedValueOnce([mockAccount])
 
     worker.updateAccountClassHashImmediately = vi
       .fn()
       .mockImplementationOnce(noop)
 
-    const spyAccountServiceUpsert = vi.spyOn(mockAccountService, "upsert")
-
     await worker.updateAccountClassHash()
 
-    expect(spyAccountServiceUpsert).toHaveBeenCalledWith([
+    expect(accountService.upsert).toHaveBeenCalledWith([
       {
         ...mockAccount,
         classHash: addressSchema.parse(STANDARD_ACCOUNT_CLASS_HASH),
@@ -126,11 +148,17 @@ describe("AccountWorker", () => {
   })
 
   it("should call upsert with correct parameters on updateAccountCairoVersion", async () => {
+    const { accountWorker: worker, accountService } = makeService()
+
     const mockAccount = getMockWalletAccount({ cairoVersion: undefined })
 
+    accountService.get = vi.fn().mockResolvedValueOnce([mockAccount])
+
     // don't know why this works, but it does
     // https://stackoverflow.com/a/74490815
-    const module = await import("../details/getAccountCairoVersionFromChain")
+    const module = await import(
+      "../../../../../shared/account/details/getAccountCairoVersionFromChain"
+    )
     module.getAccountCairoVersionFromChain = vi.fn().mockResolvedValue([
       {
         ...mockAccount,
@@ -138,22 +166,13 @@ describe("AccountWorker", () => {
       },
     ])
 
-    const mockAccountService = vi.mocked<IAccountService>({
-      ...accountServiceMock,
-      get: vi.fn().mockResolvedValue([mockAccount]),
-    })
-
-    const worker = new AccountWorker(mockAccountService, scheduleService)
-
     worker.updateAccountClassHashImmediately = vi
       .fn()
       .mockImplementationOnce(noop)
 
-    const spyAccountServiceUpsert = vi.spyOn(mockAccountService, "upsert")
-
     await worker.updateAccountCairoVersion()
 
-    expect(spyAccountServiceUpsert).toHaveBeenCalledWith([
+    expect(accountService.upsert).toHaveBeenCalledWith([
       {
         ...mockAccount,
         cairoVersion: "1",
diff --git a/packages/extension/src/shared/account/worker/implementation.ts b/packages/extension/src/background/__new/services/account/worker/implementation.ts
similarity index 72%
rename from packages/extension/src/shared/account/worker/implementation.ts
rename to packages/extension/src/background/__new/services/account/worker/implementation.ts
index cfe5d4f1a..ecfb84ad6 100644
--- a/packages/extension/src/shared/account/worker/implementation.ts
+++ b/packages/extension/src/background/__new/services/account/worker/implementation.ts
@@ -1,18 +1,25 @@
 import { getAccountIdentifier } from "@argent/shared"
-import { IScheduleService } from "../../schedule/interface"
-import { WalletAccount } from "../../wallet.model"
-import { getAccountClassHashFromChain } from "../details/getAccountClassHashFromChain"
-import { getAccountCairoVersionFromChain } from "../details/getAccountCairoVersionFromChain"
-import { IAccountService } from "../service/interface"
+import { IScheduleService } from "../../../../../shared/schedule/interface"
+import { WalletAccount } from "../../../../../shared/wallet.model"
+import { getAccountClassHashFromChain } from "../../../../../shared/account/details/getAccountClassHashFromChain"
+import { getAccountCairoVersionFromChain } from "../../../../../shared/account/details/getAccountCairoVersionFromChain"
+import { IAccountService } from "../../../../../shared/account/service/interface"
 import { isUndefined, keyBy } from "lodash-es"
 import {
   onInstallAndUpgrade,
   onStartup,
-} from "../../../background/__new/services/worker/schedule/decorators"
-// This is a worker, and workers should be in the background, not shared
-// TODO: move this file
-import { AllowArray } from "../../storage/__new/interface"
-import { pipe } from "../../../background/__new/services/worker/schedule/pipe"
+} from "../../worker/schedule/decorators"
+
+import { AllowArray } from "../../../../../shared/storage/__new/interface"
+import { pipe } from "../../worker/schedule/pipe"
+import { IBackgroundUIService } from "../../ui/interface"
+import { IDebounceService } from "../../../../../shared/debounce"
+import { getOwnerForAccount } from "../../../../../shared/account/details/getOwner"
+import {
+  IActivityService,
+  SecurityActivityPayload,
+  SignerChangedActivity,
+} from "../../activity/interface"
 
 export enum AccountUpdaterTaskId {
   UPDATE_DEPLOYED = "accountUpdateDeployed",
@@ -29,11 +36,18 @@ enum AccountUpdaterTask {
 export class AccountWorker {
   constructor(
     private readonly accountService: IAccountService,
+    private readonly activityService: IActivityService,
     private readonly scheduleService: IScheduleService<AccountUpdaterTaskId>,
-  ) {}
+    private readonly backgroundUIService: IBackgroundUIService,
+    private readonly debounceService: IDebounceService,
+  ) {
+    this.activityService.emitter.on(
+      SignerChangedActivity,
+      this.onSignerChanged.bind(this),
+    )
+  }
 
   runUpdaterForAllTasks = pipe(
-    onStartup(this.scheduleService), // This will run the function on startup
     onInstallAndUpgrade(this.scheduleService), // This will run the function on install and upgrade
   )(async (): Promise<void> => {
     await this.runUpdaterTask([
@@ -161,4 +175,24 @@ export class AccountWorker {
       console.log("Account cairo version up to date")
     }
   }
+
+  async onSignerChanged(payload: SecurityActivityPayload) {
+    const accounts = await this.accountService.getFromBaseWalletAccounts(
+      payload,
+    )
+    const results = await Promise.allSettled(
+      accounts.map((account) => {
+        return getOwnerForAccount(account)
+      }),
+    )
+    const updated = accounts.map((account, index) => {
+      const result = results[index]
+      const owner = result.status === "fulfilled" ? result.value : undefined
+      return {
+        ...account,
+        owner,
+      }
+    })
+    await this.accountService.upsert(updated)
+  }
 }
diff --git a/packages/extension/src/background/__new/services/account/worker/index.ts b/packages/extension/src/background/__new/services/account/worker/index.ts
new file mode 100644
index 000000000..3c05dd309
--- /dev/null
+++ b/packages/extension/src/background/__new/services/account/worker/index.ts
@@ -0,0 +1,14 @@
+import { chromeScheduleService } from "../../../../../shared/schedule"
+import { accountService } from "../../../../../shared/account/service"
+import { AccountWorker } from "./implementation"
+import { backgroundUIService } from "../../ui"
+import { debounceService } from "../../../../../shared/debounce"
+import { activityService } from "../../activity"
+
+export const accountWorker = new AccountWorker(
+  accountService,
+  activityService,
+  chromeScheduleService,
+  backgroundUIService,
+  debounceService,
+)
diff --git a/packages/extension/src/background/__new/services/activity/__fixtures__/activities-many-escapes.json b/packages/extension/src/background/__new/services/activity/__fixtures__/activities-many-escapes.json
new file mode 100644
index 000000000..004e9b115
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/__fixtures__/activities-many-escapes.json
@@ -0,0 +1,858 @@
+[
+  {
+    "compositeId": "6c5d77eb1e5c0367a3cc72c99977139760d064cd20b13c03b838794c52a84e1c",
+    "id": "9f163c42-0e4d-4b93-8553-f7a94f70d20b",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701994809000,
+    "lastModified": 1702015480397,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x0251f7f603797ac068ae86b6d96d2c9b1e62cd0ec58703bf2b619ad2b6235e8f",
+      "status": "success",
+      "blockNumber": 459195,
+      "transactionIndex": 9
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "203976316365024",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.48 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "203976316365024",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.48 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": { "action": "cancelEscape", "type": "security" },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "e361119ad80b83975270c1ec413ad68ebe278b0e0ac94545d64e4e8fcc2ae03f",
+    "id": "f3e753d6-e793-4bf7-85a2-c571ce6122f8",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701994809000,
+    "lastModified": 1702015480300,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x03f6f7d8bb91bc5b4543f724faa71e6d7f094b5bea92253dafab6d2e7848486a",
+      "status": "success",
+      "blockNumber": 459195,
+      "transactionIndex": 0
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "270483245302368",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.64 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "270483245302368",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.64 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": { "action": "cancelEscape", "type": "security" },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "d123291182f79be17f81b4267e158c45c1d493c4a83c13ac100e33542aea7ad5",
+    "id": "85004632-ca1d-43b3-93d5-4b3e5a461a61",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701994809000,
+    "lastModified": 1702015479992,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x0662395761a701b3c477ed32594b9c2335fd2972a376e8b52e7dd2f22d6517d6",
+      "status": "success",
+      "blockNumber": 459195,
+      "transactionIndex": 1
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "203976316365024",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.48 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "203976316365024",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.48 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": { "action": "cancelEscape", "type": "security" },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "191027b22fc0f94409fb9e7909402679d7233363eabc337fbdba778abb2181d1",
+    "id": "bf1cdd8c-f558-40fd-936a-5f52f181ebe8",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701994809000,
+    "lastModified": 1702015479992,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x05968569e4bd44e661f06354be92b4b10903b9734422563cd4d9ccb27915d006",
+      "status": "success",
+      "blockNumber": 459195,
+      "transactionIndex": 5
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "203976316365024",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.48 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "203976316365024",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.48 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": { "action": "cancelEscape", "type": "security" },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "517d544a8e9a4dec3c528ea8451b5cc8b5defc4777335b5b87a842bd87a61f6d",
+    "id": "1b4b28ac-b2ce-467c-a8f2-ae2d4aa6a990",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701994628000,
+    "lastModified": 1702015459974,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x01b246de2c1cd310b8626a453bcce66e51c55d3f895c2e44d0b4341784c4755c",
+      "status": "success",
+      "blockNumber": 459194,
+      "transactionIndex": 251
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "343610092843956",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.81 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "343610092843956",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.81 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "action": "triggerEscapeGuardian",
+      "context": { "activeAt": "1702599428" },
+      "type": "security"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "4ee030555f478c66074072b08e923072540b806355557cbe8c087da3c58c41c4",
+    "id": "04329202-21e7-49aa-b757-4afaca921257",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701865635000,
+    "lastModified": 1701884062360,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x0740aa3c28eb5af126bef3a4150d56ccf1ef4b61afdfca8ca10253f4d64cc988",
+      "status": "success",
+      "blockNumber": 457626,
+      "transactionIndex": 111
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "195750059802808",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.44 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "195750059802808",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.44 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "action": "guardianChanged",
+      "context": {
+        "newGuardian": "0x6e58eb5ebbe551e9cb611655f983ad2438936f7b48292cf8f258d5105a78e5a"
+      },
+      "type": "security"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "1fbb8c5f38a909ce46095ed4aa507c4facd9f7b876abee76a1a7da7440a4dede",
+    "id": "0ecbd199-e724-40fc-a650-ae69fa71a478",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701863239000,
+    "lastModified": 1701883965183,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x0459b3daf093c2b64f1c89a6ebba468d0c65a433229ef7d24365994837aba537",
+      "status": "success",
+      "blockNumber": 457594,
+      "transactionIndex": 14
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "199972939312518",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.45 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "199972939312518",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.45 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "action": "guardianChanged",
+      "context": { "newGuardian": "0x0" },
+      "type": "security"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "c5f50dfb5e11a1ad011f5b4385bf8d1db5009d7e6d9db389f80f03992ba20241",
+    "id": "ea53210f-6d64-44d8-b031-254a0e29f5fb",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701863138000,
+    "lastModified": 1701883964705,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x06a324ed62b84dfb90cb8224de382245027b43ad17afaa9c39cf8171a4b20131",
+      "status": "success",
+      "blockNumber": 457592,
+      "transactionIndex": 99
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "199762423873376",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.45 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "199762423873376",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.45 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "action": "guardianChanged",
+      "context": {
+        "newGuardian": "0x60ee8f2f7eaca07301b583fffda9f5208a863c672b1ef29a1deb39192933e01"
+      },
+      "type": "security"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "05cd7f4c223619e7694915d52268c433f511d9bf6d4fae2caad22de8bd564f3c",
+    "id": "7006ab66-bcca-4ab8-adb4-941e4b017f24",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701859650000,
+    "lastModified": 1701875006776,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x0262c243aa43132e996e2cf3f4ec5650eed5017a9ecbb42aca20403c77483364",
+      "status": "success",
+      "blockNumber": 457535,
+      "transactionIndex": 108
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "372297019398920",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.85 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "372297019398920",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.85 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "action": "guardianChanged",
+      "context": { "newGuardian": "0x0" },
+      "type": "security"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "52c938b516db79cc426afd46360058eca122cff86719621638ca469ab41db128",
+    "id": "72c73e43-3bd0-4e17-938e-42b2d78e28cd",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x03a20d4f7b4229e7c4863dab158b4d076d7f454b893d90a62011882dc4caca2a",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1701859288000,
+    "lastModified": 1701874991572,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x03efe66a0377dcf5b3875e7c6c453538599c63e58d8b07989f47193d982243fe",
+      "status": "success",
+      "blockNumber": 457529,
+      "transactionIndex": 68
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "credit",
+        "counterparty": "0x3a20d4f7b4229e7c4863dab158b4d076d7f454b893d90a62011882dc4caca2a",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "9900000000000000",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 22.55 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x03a20d4f7b4229e7c4863dab158b4d076d7f454b893d90a62011882dc4caca2a",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "counterparty": "0x3a20d4f7b4229e7c4863dab158b4d076d7f454b893d90a62011882dc4caca2a",
+      "leg": "credit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "9900000000000000",
+        "fiatAmount": { "currency": "USD", "currencyAmount": 22.55 }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "6460dcba684915607e85cfaac8c9d493ca0d3c672241ac15f516c26d038541c2",
+    "id": "2ff2bbde-45d1-4018-bf40-e3be65f0713f",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701685500000,
+    "lastModified": 1701701290414,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x05bbc23f060601a62722cf1daebe453e4ba415e0d41ccb48fd7e947105a58083",
+      "status": "success",
+      "blockNumber": 456088,
+      "transactionIndex": 80
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "238188266119188",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.54 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "238188266119188",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.54 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "action": "triggerEscapeGuardian",
+      "context": { "activeAt": "1702290300" },
+      "type": "security"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "747676aec7e2b7d2152071be45a7e6cce1c65a24eede67d5937ffeeb2e3810d7",
+    "id": "daa41e1a-5d02-4a2d-9fd3-d80239278cb3",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x03a20d4f7b4229e7c4863dab158b4d076d7f454b893d90a62011882dc4caca2a",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1701685341000,
+    "lastModified": 1701701282395,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x00f045c737c3c1067bb65a66ad12c6878463f51c1f002bcdf4506d2ece776dc3",
+      "status": "success",
+      "blockNumber": 456084,
+      "transactionIndex": 197
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "credit",
+        "counterparty": "0x3a20d4f7b4229e7c4863dab158b4d076d7f454b893d90a62011882dc4caca2a",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "380000000000000",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.86 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [],
+    "relatedAddresses": [
+      {
+        "address": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x03a20d4f7b4229e7c4863dab158b4d076d7f454b893d90a62011882dc4caca2a",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "counterparty": "0x3a20d4f7b4229e7c4863dab158b4d076d7f454b893d90a62011882dc4caca2a",
+      "leg": "credit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "380000000000000",
+        "fiatAmount": { "currency": "USD", "currencyAmount": 0.86 }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "6292d69084e570f8b66fc26e8a4ef89458c893b45bb306b47f67103cd44f4b8b",
+    "id": "10e6d1af-1dd2-45ef-bda7-a2f46c90680b",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1701532052000,
+    "lastModified": 1701552413323,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x033bb46f128e1bb3ed0a4eb6100e40e785c3fa790f2d0f14eae93c52c8e0f6bd",
+      "status": "success",
+      "blockNumber": 452579,
+      "transactionIndex": 77
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "debit",
+        "counterparty": "0x4400c77860c2b3e638713d3c834a8f712ce82c2f501a87606f9e33d6ec13e81",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "346753443490888",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.73 }
+        },
+        "counterpartyNetwork": "starknet"
+      },
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "161064848798764",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.34 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "161064848798764",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.34 }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x04400c77860c2b3e638713d3c834a8f712ce82c2f501a87606f9e33d6ec13e81",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "counterparty": "0x4400c77860c2b3e638713d3c834a8f712ce82c2f501a87606f9e33d6ec13e81",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "346753443490888",
+        "fiatAmount": { "currency": "USD", "currencyAmount": 0.73 }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "07402617c9db631e68e859fe1f11337896ba1a864ecab1f42716b4d1627893c6",
+    "id": "b4d34310-0655-45e9-b989-42576c4f1dac",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701531369000,
+    "lastModified": 1701547148101,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x069787ff9b29050fcf723468971042b91f7dc56fab38151be11b3be75f548876",
+      "status": "success",
+      "blockNumber": 452567,
+      "transactionIndex": 138
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "151331253800888",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.32 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "151331253800888",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.32 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "action": "guardianChanged",
+      "context": {
+        "newGuardian": "0x4e2df8b685c7e59b565da2969b7b9aaf4ddbc267432e91ac4658eb502d10cbf"
+      },
+      "type": "security"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "a63e29428c1bddfcf62f50ea3143d30af6803c2ac63d1fd7d98a5b32a1989fc0",
+    "id": "bd764dfa-c587-403c-9f3e-998ae361378f",
+    "status": "success",
+    "wallet": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+    "txSender": "0x0492beba7f5d2be300526ddc78029a5490ba36079a2944fed8835ac3e9e0f247",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1701531202000,
+    "lastModified": 1701547144727,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x0672e6849cbeb27be9f9e91abb5f1a3398004944bd54bb5733a66e863d628616",
+      "status": "success",
+      "blockNumber": 452565,
+      "transactionIndex": 57
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "credit",
+        "counterparty": "0x492beba7f5d2be300526ddc78029a5490ba36079a2944fed8835ac3e9e0f247",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "766473958643818",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 1.61 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x0492beba7f5d2be300526ddc78029a5490ba36079a2944fed8835ac3e9e0f247",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "counterparty": "0x492beba7f5d2be300526ddc78029a5490ba36079a2944fed8835ac3e9e0f247",
+      "leg": "credit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "766473958643818",
+        "fiatAmount": { "currency": "USD", "currencyAmount": 1.61 }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  }
+]
diff --git a/packages/extension/src/background/__new/services/activity/__fixtures__/activities-signer-changed.json b/packages/extension/src/background/__new/services/activity/__fixtures__/activities-signer-changed.json
new file mode 100644
index 000000000..6a317447b
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/__fixtures__/activities-signer-changed.json
@@ -0,0 +1,278 @@
+[
+  {
+    "compositeId": "55f87a2d4b0aad2c95be24aee5bae3dc00b479251164614593a6c19714a4b07c",
+    "id": "52b1b4eb-6c12-49a2-9e21-355cf77b1013",
+    "status": "success",
+    "wallet": "0x02470ea294aa4b28ee4a473aaa8a1edc6c810c11684d1f29f1f3edd336fd0f34",
+    "txSender": "0x02470ea294aa4b28ee4a473aaa8a1edc6c810c11684d1f29f1f3edd336fd0f34",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701335960000,
+    "lastModified": 1701354480369,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x04105e1c0211f6aaa1eace05409d13382598e15ef1513253ca5d38a0b3da2d51",
+      "status": "success",
+      "blockNumber": 447014,
+      "transactionIndex": 109
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "116968147317665",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.24 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "116968147317665",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.24 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "action": "signerChanged",
+      "context": {
+        "newSigner": "0x5e9a97d3e09a2fb00a159696c3ad8a6692c647aab857d9e1b9120a334163803"
+      },
+      "type": "security"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "522d9c7352861f189b404f7628b2b1ffc6c755d52f6c2d6bd012e35bea10bc5d",
+    "id": "09226fac-ac37-4634-ba04-9c40c042f11b",
+    "status": "success",
+    "wallet": "0x02470ea294aa4b28ee4a473aaa8a1edc6c810c11684d1f29f1f3edd336fd0f34",
+    "txSender": "0x04bafcfd72cb8f1dfe2051e0b486d1b4a544faf6d8c4fc119fae3b17237ea616",
+    "source": "transaction-monitor",
+    "type": "dappInteraction",
+    "group": "finance",
+    "submitted": 1701335907000,
+    "lastModified": 1701354463791,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x046881b6a97613e7a2efdc5f1ede6b859908f7e39c202d43bb435d5d5b42a9f1",
+      "status": "success",
+      "blockNumber": 447010,
+      "transactionIndex": 0
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "credit",
+        "counterparty": "0x4bafcfd72cb8f1dfe2051e0b486d1b4a544faf6d8c4fc119fae3b17237ea616",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "1500000000000",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.0 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x02470ea294aa4b28ee4a473aaa8a1edc6c810c11684d1f29f1f3edd336fd0f34",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x04bafcfd72cb8f1dfe2051e0b486d1b4a544faf6d8c4fc119fae3b17237ea616",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "dappAddress": "0x4b1b3fdf34d00288a7956e6342fb366a1510a9387d321c87f3301d990ac19d4",
+      "function": {
+        "name": "matchAskWithTakerBid",
+        "parameters": [
+          {
+            "type": "TakerOrder",
+            "name": "takerBid",
+            "value": "xyz.argent.txmonitor.starknet.enrich.dto.decoder.ParameterList@cc0d51d"
+          },
+          {
+            "type": "MakerOrder",
+            "name": "makerAsk",
+            "value": "xyz.argent.txmonitor.starknet.enrich.dto.decoder.ParameterList@6d773dda"
+          },
+          { "type": "felt", "name": "makerAskSignature_len", "value": "0x2" },
+          {
+            "type": "felt*",
+            "name": "makerAskSignature",
+            "value": "[0x49d69fc967ef3b00137c15ba61f8daf26d6a9b2ec29f92b1d12f6f08904101d, 0x6157384ba0fd716d1c747eb3626a45a58ec40303c46548daa4fef8287d001de]"
+          },
+          {
+            "type": "felt",
+            "name": "customNonFungibleTokenRecipient",
+            "value": "0x0"
+          }
+        ]
+      },
+      "type": "dappInteraction"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "a0741c5bad3e83342e12f02bdfcccb9fc1db4d4b03f9cf966db849cec39c54f1",
+    "id": "3b24ce31-2c8c-4033-b770-6512ca0a2a59",
+    "status": "success",
+    "wallet": "0x02470ea294aa4b28ee4a473aaa8a1edc6c810c11684d1f29f1f3edd336fd0f34",
+    "txSender": "0x0395eed6c5db691be0edb1882ad03ebae23ba987ff7d6070ba0044867b603a63",
+    "source": "transaction-monitor",
+    "type": "dappInteraction",
+    "group": "finance",
+    "submitted": 1701335694000,
+    "lastModified": 1701354433995,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x052acfa73046edc4ca32592473d95ba78c78766d1dae62a5ae8a1a4bff22344a",
+      "status": "success",
+      "blockNumber": 446998,
+      "transactionIndex": 38
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "credit",
+        "counterparty": "0x395eed6c5db691be0edb1882ad03ebae23ba987ff7d6070ba0044867b603a63",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "14851500000000",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.03 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [],
+    "relatedAddresses": [
+      {
+        "address": "0x02470ea294aa4b28ee4a473aaa8a1edc6c810c11684d1f29f1f3edd336fd0f34",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x0395eed6c5db691be0edb1882ad03ebae23ba987ff7d6070ba0044867b603a63",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      }
+    ],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "dappAddress": "0x4b1b3fdf34d00288a7956e6342fb366a1510a9387d321c87f3301d990ac19d4",
+      "function": {
+        "name": "matchAskWithTakerBid",
+        "parameters": [
+          {
+            "type": "TakerOrder",
+            "name": "takerBid",
+            "value": "xyz.argent.txmonitor.starknet.enrich.dto.decoder.ParameterList@708b062b"
+          },
+          {
+            "type": "MakerOrder",
+            "name": "makerAsk",
+            "value": "xyz.argent.txmonitor.starknet.enrich.dto.decoder.ParameterList@12ac8eb7"
+          },
+          { "type": "felt", "name": "makerAskSignature_len", "value": "0x2" },
+          {
+            "type": "felt*",
+            "name": "makerAskSignature",
+            "value": "[0x31e556622d682d705566f6d85c6b9645a0d906898eac030ad5fb8cd0266488f, 0x1d7588325349fd1baeae10d3dc015bfcbbb14563d0daa19abb1fc9395966acf]"
+          },
+          {
+            "type": "felt",
+            "name": "customNonFungibleTokenRecipient",
+            "value": "0x0"
+          }
+        ]
+      },
+      "type": "dappInteraction"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "81649bacecdfc76b4ea44bb5b90a0ea15a9c6a24b0f4e599a1072699fbd70c4d",
+    "id": "147fd9f8-ade8-439b-9ec9-8493354f32a1",
+    "status": "success",
+    "wallet": "0x02470ea294aa4b28ee4a473aaa8a1edc6c810c11684d1f29f1f3edd336fd0f34",
+    "txSender": "0x02470ea294aa4b28ee4a473aaa8a1edc6c810c11684d1f29f1f3edd336fd0f34",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1701335694000,
+    "lastModified": 1701354433570,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x01b869c26fef71a4999f9ebd101cd352ff2573090f916ab29ae5d127505819e2",
+      "status": "success",
+      "blockNumber": 446998,
+      "transactionIndex": 83
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "116640022312357",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.24 }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "116640022312357",
+          "fiatAmount": { "currency": "USD", "currencyAmount": 0.24 }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": { "ethereumNetwork": "mainnet", "chainId": "MAINNET" },
+    "details": {
+      "action": "signerChanged",
+      "context": {
+        "newSigner": "0x695717c044fec3777fbcf04ea254dc6f0faaf6215336033196e376863b47cc2"
+      },
+      "type": "security"
+    },
+    "network": "starknet"
+  }
+]
diff --git a/packages/extension/src/background/__new/services/activity/__fixtures__/activities.json b/packages/extension/src/background/__new/services/activity/__fixtures__/activities.json
new file mode 100644
index 000000000..a63d24a1e
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/__fixtures__/activities.json
@@ -0,0 +1,2148 @@
+[
+  {
+    "compositeId": "d257fa8ee26fd90062573fd37c0dd22bd3ddc8436487cd7fc9e35de13de4a825",
+    "id": "ccd8d9c0-dbed-493f-b796-f3c36410d4f8",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1701947828000,
+    "lastModified": 1701964096841,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x047e71b2f1e595efc3ef754a141dbbbedab556fc2a51f15c0f991ba08abd2e0b",
+      "status": "success",
+      "blockNumber": 914561,
+      "transactionIndex": 11
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "debit",
+        "counterparty": "0x25a2751133d109a5c876c87d9fd29d04c9d1f28de6790831c068f4c2fbc565e",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "100000000000000",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.22
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      },
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3771333487118",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3771333487118",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x025a2751133d109a5c876c87d9fd29d04c9d1f28de6790831c068f4c2fbc565e",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x25a2751133d109a5c876c87d9fd29d04c9d1f28de6790831c068f4c2fbc565e",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.22
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "444f8ce1f72061c8f51125464a146742226478f7ca9e52bad5584f91a2a56fa0",
+    "id": "e757f6c8-d89f-4abf-9e33-86ebedf5daa4",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1701868429000,
+    "lastModified": 1701885843056,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x06e5d6e6cd73c1129e07f94601639da05ecd01151d080f9c165d62a5f835a9ad",
+      "status": "success",
+      "blockNumber": 914059,
+      "transactionIndex": 3
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "2539000035546",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "2539000035546",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x5f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "10283988337752476",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 23.25
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "aa4d322615da31e23e4d76ad60c5780204cdb52c1382ec2303a87c95e759340d",
+    "id": "055a2ecd-db8d-48b6-b2d1-4d546d03a3e6",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1700564497000,
+    "lastModified": 1700584362613,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x023f593dc1d10e313f9b800f1c08150555b39fb3e383e67670ad191211d61447",
+      "status": "success",
+      "blockNumber": 906675,
+      "transactionIndex": 40
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "2539000025390",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "2539000025390",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x5f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.2
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "c934a0a11e9d0b5f425a459e85f51e5df37c72be5351bc5714f42a33142d21cc",
+    "id": "32d81c94-9bd3-4449-89f3-1e0aa988d972",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05423191fc5efcf4059a84acfae794cab61d49936d5dace7a3737a842bb65e67",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1700250732000,
+    "lastModified": 1700268135759,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x07a6c8297e10fdfe61a0228fe384cf41b969a5fef2d0ca43d16a4861ed02911f",
+      "status": "success",
+      "blockNumber": 904739,
+      "transactionIndex": 9
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "credit",
+        "counterparty": "0x5423191fc5efcf4059a84acfae794cab61d49936d5dace7a3737a842bb65e67",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "83470058948591",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.16
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x05423191fc5efcf4059a84acfae794cab61d49936d5dace7a3737a842bb65e67",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x5423191fc5efcf4059a84acfae794cab61d49936d5dace7a3737a842bb65e67",
+      "leg": "credit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "83470058948591",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.16
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "d1b263313accb2c79e5fc512e3e9210c141d7d0e205fc46897c1c3740a596cd1",
+    "id": "e0332caf-b48d-4375-b2ba-1177e456839c",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1700238496000,
+    "lastModified": 1700253857254,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x06bbc4ccb21a12b8277db0f587cd95a1919383363fa62754f3117bec8d4e9e20",
+      "status": "success",
+      "blockNumber": 904664,
+      "transactionIndex": 6
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "debit",
+        "counterparty": "0x5423191fc5efcf4059a84acfae794cab61d49936d5dace7a3737a842bb65e67",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "100000000000000",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.19
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      },
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000041393",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000041393",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x05423191fc5efcf4059a84acfae794cab61d49936d5dace7a3737a842bb65e67",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x5423191fc5efcf4059a84acfae794cab61d49936d5dace7a3737a842bb65e67",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.19
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "eda0b4d9c7033893714d5b7def8e65f24c37899a95d608642863e57db29d7a7c",
+    "id": "64087afe-2727-44cd-95e4-7c0389809ff4",
+    "status": "failure",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699957134000,
+    "lastModified": 1699969998380,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x015b3557ce857d59750c78bdba3b75dba1d474ee5e214763aa9cdb3a4c8b9942",
+      "status": "failure",
+      "blockNumber": 902813,
+      "transactionIndex": 6
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "2520000022680",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "2520000022680",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x5f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.2
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "f0f2d4e9d342ec46a95e3d894f07d5faba300a46e75ce3087b0c444957907f7e",
+    "id": "1eeecdef-f727-40e3-83ca-8c0b1a53f00d",
+    "status": "failure",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699613442000,
+    "lastModified": 1699627086865,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x0468061d0a7aadb58d3b29fd5ebd4d05b059bdd782b2f9ee489e1759831709f0",
+      "status": "failure",
+      "blockNumber": 900698,
+      "transactionIndex": 9
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "2520000027720",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "2520000027720",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x5f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.21
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "1919d61d69a4d29c4c9aafc4b78fbf4a007d406fff97aff1bc51c1677ef74fe7",
+    "id": "354ff579-2e34-4b5a-b87f-7e61d00f8ae2",
+    "status": "failure",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699610621000,
+    "lastModified": 1699627037326,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x0721d43a37097ba4c6ee35239a09968e66c5f73f2ef4a7c0e342fcef764d3a3c",
+      "status": "failure",
+      "blockNumber": 900683,
+      "transactionIndex": 5
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000037440",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000037440",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x03d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x3d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.21
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "5d380c4c0d80c1232764c8f5fa2840504538f4ad2d763fc77bdf96349c356438",
+    "id": "d49a8bdc-e698-422f-8634-293868d3243e",
+    "status": "failure",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699610621000,
+    "lastModified": 1699627037326,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x036b728f18c496b96d7abd5d994e50d1808c38cd599a1e736d2e1a9e3be953e9",
+      "status": "failure",
+      "blockNumber": 900683,
+      "transactionIndex": 1
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000037440",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000037440",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x03d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x3d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.21
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "af04edd447d7e706d38079543430f9de276f1d64976ba9db42a61aa14883a412",
+    "id": "36c2a331-ddca-4a20-8924-da8cdc0c3ce4",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699530030000,
+    "lastModified": 1699548126958,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x06c6ce1b0cace53d8620df056b3cd1671382b53494bb09a1c0545df76b3f6c0b",
+      "status": "success",
+      "blockNumber": 900203,
+      "transactionIndex": 15
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "debit",
+        "counterparty": "0x39b90d5c8fbf32641bd117664952b10905f421792cf04b584517c2c430f7b5e",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "100000000000000",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.19
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      },
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000037630",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000037630",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x039b90d5c8fbf32641bd117664952b10905f421792cf04b584517c2c430f7b5e",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x39b90d5c8fbf32641bd117664952b10905f421792cf04b584517c2c430f7b5e",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.19
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "f9461599915d5d6ffac7316b398f77c73a97783318e48a45980177c1dcfc31cb",
+    "id": "c54f5221-7a29-4e9a-833d-64f2410ca05a",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699530030000,
+    "lastModified": 1699548126864,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x0750814e784adec407073be4f96e9a5c5449e23047f4d65690f954152459a7bd",
+      "status": "success",
+      "blockNumber": 900203,
+      "transactionIndex": 9
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "debit",
+        "counterparty": "0x84eb567d4248c184dcf6ba57032ac9e15cbea151b76c5d535b2abda5a6a21d",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "100000000000000",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.19
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      },
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000037630",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000037630",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x0084eb567d4248c184dcf6ba57032ac9e15cbea151b76c5d535b2abda5a6a21d",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x84eb567d4248c184dcf6ba57032ac9e15cbea151b76c5d535b2abda5a6a21d",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.19
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "c282178ad183a2a723ee08508b8b36d2c3e21fe6907265ae68f989106d6f7065",
+    "id": "6cde791a-3e0a-4b3c-b071-96159a6770bc",
+    "status": "failure",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699529848000,
+    "lastModified": 1699548126746,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x0689a52526acc1b4579cc4f6bef83e73b5efe5c3c629666bfc8b1145a71d9289",
+      "status": "failure",
+      "blockNumber": 900202,
+      "transactionIndex": 10
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000041184",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000041184",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x0084eb567d4248c184dcf6ba57032ac9e15cbea151b76c5d535b2abda5a6a21d",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x84eb567d4248c184dcf6ba57032ac9e15cbea151b76c5d535b2abda5a6a21d",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.19
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "e8ece55cdc0dcd1615d2e9651bbc000273671495cce2870de3375b8a38a51b94",
+    "id": "d232436b-8395-4903-bafc-1ed7e0cb0984",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699461905000,
+    "lastModified": 1699481419775,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x0603c9caa9ed25d46815d467eeef6d4a7b8247b27737be1bd9b4d161f7bfd52f",
+      "status": "success",
+      "blockNumber": 899717,
+      "transactionIndex": 3
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "debit",
+        "counterparty": "0x1cf2a3112c54821398a8544736108b8491a72dfd9d0687759037bc0792097ec",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "100000000000000",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.19
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      },
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000041393",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000041393",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x01cf2a3112c54821398a8544736108b8491a72dfd9d0687759037bc0792097ec",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x1cf2a3112c54821398a8544736108b8491a72dfd9d0687759037bc0792097ec",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.19
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "86083434b85e7774a40693d51bca6b86c4b20e2ce7c3570fc710db404e1a82d0",
+    "id": "0d51f7ad-eac9-4f55-90dc-b658ee6be2af",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699451519000,
+    "lastModified": 1699472358357,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x00f58e861afffd3b7ac11156f80b58312d4e4df6aa7c4ee7d33a01458b324b57",
+      "status": "success",
+      "blockNumber": 899639,
+      "transactionIndex": 7
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "debit",
+        "counterparty": "0x3d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "100000000000000",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.19
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      },
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000048919",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000048919",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x03d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x3d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.19
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "5cddeda2dfacefff97560accb4b35cc840c35fa9ffc640eb1bcb2f762040bb46",
+    "id": "7a5e5a6d-d46e-4038-a9fa-fb788b3e090e",
+    "status": "failure",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699450942000,
+    "lastModified": 1699472309743,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x061bda619732292ea9f147e06f9df315d81c578426e812a945a43ab006caa749",
+      "status": "failure",
+      "blockNumber": 899628,
+      "transactionIndex": 7
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000048672",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000048672",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x05eabc4165024d9e3da1be66688bfe70f1d8d8b234844ff9463172505df2dae8",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x5eabc4165024d9e3da1be66688bfe70f1d8d8b234844ff9463172505df2dae8",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.19
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "0a927d3fd65c6963bd2f0b001ef45e48c6c564f0b90cf0de124a398ed9fcad96",
+    "id": "7b375f79-b6ee-4245-96e9-f06620a0eaa3",
+    "status": "failure",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699450433000,
+    "lastModified": 1699472298516,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x04a4795d3df0b925993f12fa79bf336ef3a82b86ebbcaf95646437c990c2c09e",
+      "status": "failure",
+      "blockNumber": 899623,
+      "transactionIndex": 1
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000052416",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000052416",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x03d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x3d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.19
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "3f095c636c85c1677cdb3852bb73ca00d07ad5b8e3538167306fa17fe540e0a7",
+    "id": "4ba575e8-8e2e-4a45-9742-22bf03fc23ff",
+    "status": "failure",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699450079000,
+    "lastModified": 1699472272589,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x05288371893343243d9b8ecd53b341157b0b4fba1ac92d76a745ab041b30739d",
+      "status": "failure",
+      "blockNumber": 899619,
+      "transactionIndex": 3
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000052416",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3744000052416",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x03d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x3d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "100000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 0.19
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "d30af894450b8a1effce9008bbdb43e775c664e7801066f5058360e6ec8280ac",
+    "id": "3b970744-c1f4-462c-a2d0-81f5177da3c8",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x00a00018122f54123d4003db254cd2054679d92eeefaa7c2d94c27abb9143b35",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699365853000,
+    "lastModified": 1699382319139,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x05735a29c5b5cf39f9f47f7255cc29cc8311b662036da842c6cb6989e1d47af5",
+      "status": "success",
+      "blockNumber": 898895,
+      "transactionIndex": 5
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "credit",
+        "counterparty": "0xa00018122f54123d4003db254cd2054679d92eeefaa7c2d94c27abb9143b35",
+        "asset": {
+          "type": "nft",
+          "tokenAddress": "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266",
+          "tokenId": 59,
+          "collectionName": "Xplorer",
+          "nftName": "Box #4AD373",
+          "nftPreviewImage": "https://static.hydrogen.argent47.net/moments/images/07c22dad-5e2d-4b76-8f52-974e373772cb.png"
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [],
+    "relatedAddresses": [
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x00a00018122f54123d4003db254cd2054679d92eeefaa7c2d94c27abb9143b35",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0xa00018122f54123d4003db254cd2054679d92eeefaa7c2d94c27abb9143b35",
+      "leg": "credit",
+      "asset": {
+        "type": "nft",
+        "tokenAddress": "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266",
+        "tokenId": "59",
+        "collectionName": "Xplorer",
+        "collectionPreviewImage": null,
+        "nftName": "Box #4AD373",
+        "nftPreviewImage": "https://static.hydrogen.argent47.net/moments/images/07c22dad-5e2d-4b76-8f52-974e373772cb.png"
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "cfb424ebc07f47c070c8654bca4af349b9a30d2cf41b391db8d1fb1317886be6",
+    "id": "ea1e2a21-fe09-46bb-ba9e-a5e70d99ced6",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1699365753000,
+    "lastModified": 1699382319032,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x03e70772c6c277685e5322eaa2e82004ee3d4035fe8f5c852626a20e64fe6cb7",
+      "status": "success",
+      "blockNumber": 898894,
+      "transactionIndex": 19
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "debit",
+        "counterparty": "0xa00018122f54123d4003db254cd2054679d92eeefaa7c2d94c27abb9143b35",
+        "asset": {
+          "type": "nft",
+          "tokenAddress": "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266",
+          "tokenId": 59,
+          "collectionName": "Xplorer",
+          "nftName": "Box #4AD373",
+          "nftPreviewImage": "https://static.hydrogen.argent47.net/moments/images/07c22dad-5e2d-4b76-8f52-974e373772cb.png"
+        },
+        "counterpartyNetwork": "starknet"
+      },
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "7445000074450",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "7445000074450",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x00a00018122f54123d4003db254cd2054679d92eeefaa7c2d94c27abb9143b35",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266",
+        "network": "starknet",
+        "type": "token"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0xa00018122f54123d4003db254cd2054679d92eeefaa7c2d94c27abb9143b35",
+      "leg": "debit",
+      "asset": {
+        "type": "nft",
+        "tokenAddress": "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266",
+        "tokenId": "59",
+        "collectionName": "Xplorer",
+        "collectionPreviewImage": null,
+        "nftName": "Box #4AD373",
+        "nftPreviewImage": "https://static.hydrogen.argent47.net/moments/images/07c22dad-5e2d-4b76-8f52-974e373772cb.png"
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "50a46e6806c0d800f269d4f8f0090b9635683e6fce11ca88fbe42f895e5b450c",
+    "id": "c343bbe8-b5f2-4a2b-81b8-581480b1f2dc",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1698332676000,
+    "lastModified": 1698350216501,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x04df353d391993f37797889809305bc70025bf2355f8ee0d54c4f1ffbd070b53",
+      "status": "success",
+      "blockNumber": 890649,
+      "transactionIndex": 3
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3754000060064",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3754000060064",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "action": "guardianChanged",
+      "context": {
+        "newGuardian": "0x0"
+      },
+      "type": "security"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "f3c2fbc576c2fd9db4344174862fb1e00b68ee3710078454b81821325f1be0d9",
+    "id": "5fbbbbf5-4fdf-4c9f-ade9-d4b223437e9b",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "security",
+    "group": "security",
+    "submitted": 1698331888000,
+    "lastModified": 1698349381611,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x03493edc5a2ac8e99c5abc12e5289bd81d2aff44521679a8b68988a25b252283",
+      "status": "success",
+      "blockNumber": 890638,
+      "transactionIndex": 26
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3752000060032",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3752000060032",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "action": "guardianChanged",
+      "context": {
+        "newGuardian": "0x456b5d3566f20a09d4de73f2dc315a07ce7d0b28c61828a690a567971b58286"
+      },
+      "type": "security"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "de54e4e65475c071d86b24ef23c420ba7edb4c7114163cdab0d735f5985ebe3c",
+    "id": "5ee91c1b-e694-4139-b394-2f3ba0f51021",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1698226081000,
+    "lastModified": 1698242447946,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x04420cd3ff8d9a44d9c4704ba3670340483e32666d847f18c331520313ea9e41",
+      "status": "success",
+      "blockNumber": 889471,
+      "transactionIndex": 8
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "credit",
+        "counterparty": "0x0",
+        "asset": {
+          "type": "nft",
+          "tokenAddress": "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266",
+          "tokenId": 59,
+          "collectionName": "Xplorer",
+          "nftName": "Box #4AD373",
+          "nftPreviewImage": "https://static.hydrogen.argent47.net/moments/images/07c22dad-5e2d-4b76-8f52-974e373772cb.png"
+        },
+        "counterpartyNetwork": "starknet"
+      },
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "7442002083760",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "7442002083760",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266",
+        "network": "starknet",
+        "type": "token"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "leg": "credit",
+      "asset": {
+        "type": "nft",
+        "tokenAddress": "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266",
+        "tokenId": "59",
+        "collectionName": "Xplorer",
+        "collectionPreviewImage": null,
+        "nftName": "Box #4AD373",
+        "nftPreviewImage": "https://static.hydrogen.argent47.net/moments/images/07c22dad-5e2d-4b76-8f52-974e373772cb.png"
+      },
+      "context": {
+        "isMint": true
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "e025a68566cbba3946f293589e9b6cc2d9fb6317ab21f9311bc7eaf073320280",
+    "id": "06910688-52c4-4ab3-a99b-4a6f67aee865",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1697464096000,
+    "lastModified": 1697487786473,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x00452bf7a66d1730988410efaa7dca542aac586ace25edbe9c2fd80c678054a3",
+      "status": "success",
+      "blockNumber": 883986,
+      "transactionIndex": 7
+    },
+    "transfers": [
+      {
+        "type": "payment",
+        "leg": "debit",
+        "counterparty": "0x216fd9638a25f6d1acbafb470d5161e64221d903b3e51268239b495250fc6ed",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "1000000000000000",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 1.59
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      },
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000048919",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "3763000048919",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0.01
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      },
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x0216fd9638a25f6d1acbafb470d5161e64221d903b3e51268239b495250fc6ed",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x216fd9638a25f6d1acbafb470d5161e64221d903b3e51268239b495250fc6ed",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "1000000000000000",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 1.59
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  },
+  {
+    "compositeId": "86138392277f15d6fe9130066f2c6442d1efb5fb2c7f6998bd2fd6706e13c22f",
+    "id": "9496ad98-b22e-4aeb-9f48-59414324af44",
+    "status": "success",
+    "wallet": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "txSender": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "source": "transaction-monitor",
+    "type": "payment",
+    "group": "finance",
+    "submitted": 1697103943000,
+    "lastModified": 1697123360105,
+    "transaction": {
+      "network": "starknet",
+      "hash": "0x043c52b46fe52d2281d12d72496c47217b2c1d1c9de5d5f3344122ae4b51a9ea",
+      "status": "success",
+      "blockNumber": 881834,
+      "transactionIndex": 12
+    },
+    "transfers": [
+      {
+        "type": "gasFee",
+        "leg": "debit",
+        "counterparty": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "asset": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "2539000035546",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0
+          }
+        },
+        "counterpartyNetwork": "starknet"
+      }
+    ],
+    "fees": [
+      {
+        "type": "gas",
+        "to": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+        "actualFee": {
+          "type": "token",
+          "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+          "amount": "2539000035546",
+          "fiatAmount": {
+            "currency": "USD",
+            "currencyAmount": 0
+          }
+        }
+      }
+    ],
+    "relatedAddresses": [
+      {
+        "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "network": "starknet",
+        "type": "token"
+      },
+      {
+        "address": "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        "network": "starknet",
+        "type": "wallet"
+      }
+    ],
+    "networkDetails": {
+      "ethereumNetwork": "goerli",
+      "chainId": "TESTNET"
+    },
+    "details": {
+      "counterparty": "0x5f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+      "leg": "debit",
+      "asset": {
+        "type": "token",
+        "tokenAddress": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "amount": "11778071281732457",
+        "fiatAmount": {
+          "currency": "USD",
+          "currencyAmount": 18.31
+        }
+      },
+      "type": "payment",
+      "counterpartyNetwork": "starknet"
+    },
+    "network": "starknet"
+  }
+]
diff --git a/packages/extension/src/background/__new/services/activity/__fixtures__/state.json b/packages/extension/src/background/__new/services/activity/__fixtures__/state.json
new file mode 100644
index 000000000..e73423e06
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/__fixtures__/state.json
@@ -0,0 +1,22 @@
+{
+  "accountAddressesOnNetwork": [
+    "0x01cf2a3112c54821398a8544736108b8491a72dfd9d0687759037bc0792097ec",
+    "0x5f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+    "0x3d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+    "0x5eabc4165024d9e3da1be66688bfe70f1d8d8b234844ff9463172505df2dae8",
+    "0x11721892cb8d65d4bc81ca25f46a99eecf8622b421eaa201e0ef717a813c8c2",
+    "0xa00018122f54123d4003db254cd2054679d92eeefaa7c2d94c27abb9143b35",
+    "0x39b90d5c8fbf32641bd117664952b10905f421792cf04b584517c2c430f7b5e",
+    "0x25a2751133d109a5c876c87d9fd29d04c9d1f28de6790831c068f4c2fbc565e"
+  ],
+  "tokenAddressesOnNetwork": [
+    "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+    "0x03e85bfbb8e2a42b7bead9e88e9a1b19dbccf661471061807292120462396ec9",
+    "0x012d537dc323c439dc65c976fad242d5610d27cfb5f31689a0a319b8be7f3d56",
+    "0x005a643907b9a4bc6a55e9069c4fd5fd1f5c79a22470690f75556c4736e34426",
+    "0x0386e8d061177f19b3b485c20e31137e6f6bc497cc635ccdfcab96fadf5add6a"
+  ],
+  "nftAddressesOnNetwork": [
+    "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266"
+  ]
+}
diff --git a/packages/extension/src/background/__new/services/activity/implementation.test.ts b/packages/extension/src/background/__new/services/activity/implementation.test.ts
index a573aafc7..e9db33e41 100644
--- a/packages/extension/src/background/__new/services/activity/implementation.test.ts
+++ b/packages/extension/src/background/__new/services/activity/implementation.test.ts
@@ -1,329 +1,205 @@
-import { setupServer } from "msw/node"
-import { IActivityStorage } from "../../../../shared/activity/types"
+import { Mocked, describe, expect, test, vi } from "vitest"
+
+import { IHttpService, Token } from "@argent/shared"
+import Emittery from "emittery"
+
+import type { IAccountService } from "../../../../shared/account/service/interface"
+import type { IActivityStorage } from "../../../../shared/activity/types"
+import type { IDebounceService } from "../../../../shared/debounce"
+import { createScheduleServiceMock } from "../../../../shared/schedule/mock"
+import { InMemoryObjectStore } from "../../../../shared/storage/__new/__test__/inmemoryImplementations"
+import type {
+  ContractAddress,
+  INftsContractsRepository,
+} from "../../../../shared/storage/__new/repositories/nft"
+import type { ITokenService } from "../../../../shared/token/__new/service/interface"
+import type { WalletAccount } from "../../../../shared/wallet.model"
+import type { Wallet } from "../../../wallet"
+import type { IBackgroundUIService } from "../ui/interface"
 import { ActivityService } from "./implementation"
-import { Activity } from "./model"
-import { rest } from "msw"
-import { KeyValueStorage } from "../../../../shared/storage"
+import { GuardianChangedActivity, NftActivity, type Events } from "./interface"
 
-describe("findLatestBalanceChangingTransaction", () => {
+import activities from "./__fixtures__/activities.json"
+import state from "./__fixtures__/state.json"
+
+describe("ActivityService", () => {
   const makeService = () => {
-    const activityStore = {
-      set: vi.fn(),
-    } as unknown as KeyValueStorage<IActivityStorage>
+    const emitter = {
+      emit: vi.fn(),
+    } as unknown as Emittery<Events>
+
+    const activityStore = new InMemoryObjectStore<IActivityStorage>({
+      namespace: "service:activity",
+      defaults: {
+        modifiedAfter: {},
+      },
+    })
+
+    const walletSingleton = {
+      getSelectedAccount: vi.fn(),
+    } as unknown as Mocked<Wallet>
+
+    const accountService = {
+      get: vi.fn(),
+    } as unknown as Mocked<IAccountService>
+
+    const tokenService = {
+      getTokens: vi.fn(),
+    } as unknown as Mocked<ITokenService>
+
+    const nftsContractsRepository = {
+      get: vi.fn(),
+    } as unknown as Mocked<INftsContractsRepository>
+
+    const httpService = {
+      get: vi.fn(),
+    } as unknown as Mocked<IHttpService>
+
+    const [, scheduleService] = createScheduleServiceMock()
+
+    const backgroundUIService = {
+      emitter: {
+        on: vi.fn(),
+      },
+    } as unknown as IBackgroundUIService
+
+    const debounceService = {} as unknown as IDebounceService
 
     const activityService = new ActivityService(
-      "apiBase",
+      emitter,
       activityStore,
-      undefined,
+      walletSingleton,
+      accountService,
+      tokenService,
+      nftsContractsRepository,
+      httpService,
+      scheduleService,
+      backgroundUIService,
+      debounceService,
     )
     return {
-      activityService,
+      emitter,
       activityStore,
+      walletSingleton,
+      accountService,
+      tokenService,
+      nftsContractsRepository,
+      httpService,
+      scheduleService,
+      backgroundUIService,
+      debounceService,
+      activityService,
     }
   }
-  it("returns null for empty array", () => {
-    const { activityService } = makeService()
-    expect(activityService.findLatestBalanceChangingTransaction([])).toBeNull()
-  })
+  test("fetches activities and emits expected events", async () => {
+    const {
+      emitter,
+      activityStore,
+      walletSingleton,
+      accountService,
+      tokenService,
+      nftsContractsRepository,
+      httpService,
+      activityService,
+    } = makeService()
 
-  it("returns null when all activities have empty transfers", () => {
-    const { activityService } = makeService()
+    const activityStoreSetSpy = vi.spyOn(activityStore, "set")
 
-    const activities = [
-      { transaction: { blockNumber: 1, transactionIndex: 1 }, transfers: [] },
-      { transaction: { blockNumber: 2, transactionIndex: 2 }, transfers: [] },
-    ]
-    expect(
-      activityService.findLatestBalanceChangingTransaction(
-        activities as unknown as Activity[],
-      ),
-    ).toBeNull()
-  })
+    const networkId = "goerli-alpha"
 
-  it("returns the latest activity with non-empty transfers", () => {
-    const { activityService } = makeService()
+    walletSingleton.getSelectedAccount.mockResolvedValue({
+      address:
+        "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+      networkId,
+    } as WalletAccount)
 
-    const activities = [
-      {
-        transaction: { blockNumber: 1, transactionIndex: 1 },
-        transfers: ["transfer1"],
-      },
-      {
-        transaction: { blockNumber: 2, transactionIndex: 2 },
-        transfers: ["transfer2"],
-      },
-    ] as unknown as Activity[]
-    expect(
-      activityService.findLatestBalanceChangingTransaction(activities),
-    ).toEqual(activities[1])
-  })
-
-  it("handles a single activity with non-empty transfers", () => {
-    const { activityService } = makeService()
-
-    const activity = {
-      transaction: { blockNumber: 1, transactionIndex: 1 },
-      transfers: ["transfer"],
-    }
-    expect(
-      activityService.findLatestBalanceChangingTransaction([
-        activity,
-      ] as unknown as Activity[]),
-    ).toEqual(activity)
-  })
+    accountService.get.mockResolvedValue(
+      state.accountAddressesOnNetwork.map(
+        (address) =>
+          ({
+            address,
+            networkId,
+          } as WalletAccount),
+      ),
+    )
 
-  it("returns the activity with highest transactionIndex for same blockNumber", () => {
-    const { activityService } = makeService()
+    tokenService.getTokens.mockResolvedValue(
+      state.tokenAddressesOnNetwork.map(
+        (address) =>
+          ({
+            address,
+            networkId,
+          } as Token),
+      ),
+    )
 
-    const activities = [
-      {
-        transaction: { blockNumber: 1, transactionIndex: 2 },
-        transfers: ["transfer2"],
-      },
-      {
-        transaction: { blockNumber: 1, transactionIndex: 1 },
-        transfers: ["transfer1"],
-      },
-    ]
-    expect(
-      activityService.findLatestBalanceChangingTransaction(
-        activities as unknown as Activity[],
+    nftsContractsRepository.get.mockResolvedValue(
+      state.nftAddressesOnNetwork.map(
+        (contractAddress) =>
+          ({
+            contractAddress,
+            networkId,
+          } as ContractAddress),
       ),
-    ).toEqual(activities[0])
-  })
+    )
 
-  it("prioritizes pending transactions over ongoing ones", () => {
-    const { activityService } = makeService()
+    httpService.get.mockResolvedValueOnce({ activities })
 
-    const activities = [
-      {
-        transaction: { transactionIndex: 2, status: "pending" },
-        transfers: ["transfer2"],
-      },
-      {
-        transaction: { blockNumber: 1, transactionIndex: 2 },
-        transfers: ["transfer2"],
-      },
-      {
-        transaction: { blockNumber: 1, transactionIndex: 1 },
-        transfers: ["transfer1"],
-      },
-    ]
-    expect(
-      activityService.findLatestBalanceChangingTransaction(
-        activities as unknown as Activity[],
+    await activityService.updateSelectedAccountActivities()
+
+    expect(walletSingleton.getSelectedAccount).toHaveBeenCalled()
+    expect(httpService.get).toHaveBeenCalledWith(
+      expect.stringMatching(
+        /0x5f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25\/activities\?modifiedAfter=0$/,
       ),
-    ).toEqual(activities[0])
-  })
-})
+    )
 
-const ADDRESS_WITHOUT_NEW_ACTIVITY = "0x1"
-const ADDRESS_WITH_NEW_ACTIVITY = "0x2"
-const ADDRESS_WITH_INVALID_DATA = "0x3"
-const OLD_TRANSACTION_HASH = "0x12345"
-const NEW_TRANSACTION_HASH = "0x123456"
-const OLD_ID = "4b3286e5-b122-45e5-8097-30b44926f553"
-/**
- * @vitest-environment jsdom
- */
-const OLD_ACTIVITIES = [
-  {
-    compositeId: "id",
-    id: OLD_ID,
-    status: "success",
-    wallet:
-      "0x06179cD342F04f69726D4D8B974c449dAC7002a58437Aef0E6eD23db40D31862",
-    txSender:
-      "0x06179cD342F04f69726D4D8B974c449dAC7002a58437Aef0E6eD23db40D31862",
-    source: "source",
-    type: "payment",
-    group: "finance",
-    submitted: 1234,
-    lastModified: 1234,
-    transaction: {
-      network: "goerli",
-      hash: OLD_TRANSACTION_HASH,
-      status: "success",
-      blockNumber: 1,
-      transactionIndex: 2,
-    },
-    transfers: [
-      {
-        type: "payment",
-        leg: "credit",
-        asset: {
-          type: "token",
-          tokenAddress:
-            "0x06179cD342F04f69726D4D8B974c449dAC7002a58437Aef0E6eD23db40D31862",
-          amount: "100",
-          fiatAmount: {
-            currency: "USD",
-            currencyAmount: 100,
-          },
+    expect(emitter.emit).toHaveBeenCalledWith(NftActivity, {
+      accounts: [
+        {
+          address:
+            "0x5f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+          networkId: "goerli-alpha",
         },
-      },
-    ],
-    fees: [],
-    relatedAddresses: [],
-    network: "goerli",
-  },
-]
-const NEW_ACTIVITIES = [
-  {
-    compositeId: "id",
-    id: "4b3286e5-b122-45e5-8097-30b44926f555",
-    status: "success",
-    wallet:
-      "0x06179cD342F04f69726D4D8B974c449dAC7002a58437Aef0E6eD23db40D31862",
-    txSender:
-      "0x06179cD342F04f69726D4D8B974c449dAC7002a58437Aef0E6eD23db40D31862",
-    source: "source",
-    type: "payment",
-    group: "finance",
-    submitted: 1234,
-    lastModified: 1235,
-    transaction: {
-      network: "goerli",
-      hash: NEW_TRANSACTION_HASH,
-      status: "success",
-      blockNumber: 1,
-      transactionIndex: 3,
-    },
-    transfers: [
-      {
-        type: "payment",
-        leg: "credit",
-        asset: {
-          type: "token",
-          tokenAddress:
-            "0x06179cD342F04f69726D4D8B974c449dAC7002a58437Aef0E6eD23db40D31862",
-          amount: "100",
-          fiatAmount: {
-            currency: "USD",
-            currencyAmount: 100,
-          },
+        {
+          address:
+            "0xa00018122f54123d4003db254cd2054679d92eeefaa7c2d94c27abb9143b35",
+          networkId: "goerli-alpha",
         },
-      },
-    ],
-    fees: [],
-    relatedAddresses: [],
-    network: "goerli",
-  },
-]
-const server = setupServer(
-  rest.get("/apiBase/goerli/account/:address/activities", (req, res, ctx) => {
-    if (req.params.address === ADDRESS_WITHOUT_NEW_ACTIVITY) {
-      return res(
-        ctx.json({
-          activities: OLD_ACTIVITIES,
-        }),
-      )
-    }
-    if (req.params.address === ADDRESS_WITH_NEW_ACTIVITY) {
-      return res(
-        ctx.json({
-          activities: NEW_ACTIVITIES,
-        }),
-      )
-    }
-    if (req.params.address === ADDRESS_WITH_INVALID_DATA) {
-      return res(
-        ctx.json({
-          activities: [{ invalid: "data" }],
-        }),
-      )
-    }
-  }),
-)
-
-describe("shouldUpdateBalance", () => {
-  beforeAll(() => {
-    server.listen()
-  })
-  afterAll(() => server.close())
-  const makeService = () => {
-    const activityStore = {
-      set: vi.fn(),
-      get: vi.fn().mockResolvedValue({
-        [ADDRESS_WITHOUT_NEW_ACTIVITY]: {
-          id: OLD_ID,
-          lastModified: 1234,
+      ],
+      nfts: [
+        {
+          contractAddress:
+            "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266",
+          networkId: "goerli-alpha",
         },
-      }),
-    } as unknown as KeyValueStorage<IActivityStorage>
+      ],
+    })
 
-    const activityService = new ActivityService(
-      "/apiBase",
-      activityStore,
-      undefined,
-    )
-    return {
-      activityService,
-      activityStore,
-    }
-  }
-  it("returns false when there's no new activity", async () => {
-    const { activityService, activityStore } = makeService()
-    const spyGet = vi.spyOn(activityStore, "get")
+    expect(emitter.emit).toHaveBeenCalledWith(GuardianChangedActivity, [
+      {
+        address:
+          "0x5f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+        networkId: "goerli-alpha",
+      },
+    ])
 
-    const res = await activityService.shouldUpdateBalance({
-      address: ADDRESS_WITHOUT_NEW_ACTIVITY,
-      networkId: "goerli-alpha",
+    expect(activityStoreSetSpy).toHaveBeenLastCalledWith({
+      modifiedAfter: {
+        "goerli-alpha::0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25": 1701964096841,
+      },
     })
-    expect(spyGet).toHaveBeenCalled()
-    expect(res).toEqual({ shouldUpdate: false })
-  })
-  it("returns true when there's new activity and updates the storage", async () => {
-    const { activityService, activityStore } = makeService()
-    const spyGet = vi.spyOn(activityStore, "get")
 
-    const res = await activityService.shouldUpdateBalance({
-      address: ADDRESS_WITH_NEW_ACTIVITY,
-      networkId: "goerli-alpha",
-    })
-    expect(spyGet).toHaveBeenCalled()
-    expect(res).toEqual({
-      id: "4b3286e5-b122-45e5-8097-30b44926f555",
-      lastModified: 1235,
-      shouldUpdate: true,
-    })
-  })
+    // next fetch with modifiedAfter
 
-  describe("fetchActivities", () => {
-    beforeAll(() => {
-      server.listen()
-    })
-    afterAll(() => server.close())
-    test.each([
-      [ADDRESS_WITHOUT_NEW_ACTIVITY, OLD_ACTIVITIES],
-      [ADDRESS_WITH_NEW_ACTIVITY, NEW_ACTIVITIES],
-    ])(
-      "return the correctly parsed activities when fetching from the API",
-      async (address, payload) => {
-        const { activityService } = makeService()
-        const response = await activityService.fetchActivities({
-          address,
-          networkId: "goerli-alpha",
-          lastModified: 1234,
-        })
+    httpService.get.mockResolvedValueOnce({ activities: [] })
 
-        expect(response).toEqual(payload)
-      },
+    await activityService.updateSelectedAccountActivities()
+
+    expect(httpService.get).toHaveBeenLastCalledWith(
+      expect.stringMatching(
+        /0x5f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25\/activities\?modifiedAfter=1701964096841$/,
+      ),
     )
-    // TODO uncomment when we have final version of the API
-    // it("should throw when given an invalid output from the API", async () => {
-    //   const { activityService } = makeService()
-    //   try {
-    //     await activityService.fetchActivities({
-    //       address: ADDRESS_WITH_INVALID_DATA,
-    //       networkId: "goerli-alpha",
-    //       lastModified: 1234,
-    //     })
-    //   } catch (e) {
-    //     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    //     //@ts-expect-error
-    //     expect(e.message).toEqual("Failed to parse backend response")
-    //   }
-    // })
   })
 })
diff --git a/packages/extension/src/background/__new/services/activity/implementation.ts b/packages/extension/src/background/__new/services/activity/implementation.ts
index 616ca73c6..0474419b0 100644
--- a/packages/extension/src/background/__new/services/activity/implementation.ts
+++ b/packages/extension/src/background/__new/services/activity/implementation.ts
@@ -1,145 +1,283 @@
-import { HTTPService, IHttpService } from "@argent/shared"
+import {
+  getAccountIdentifier,
+  includesAddress,
+  stripAddressZeroPadding,
+  type Address,
+  type IHttpService,
+} from "@argent/shared"
+import type Emittery from "emittery"
 
-import { Activity, ActivityResponse } from "./model"
-import { IActivityService } from "./interface"
-import { IActivity, IActivityStorage } from "../../../../shared/activity/types"
-import { argentApiNetworkForNetwork } from "../../../../shared/api/fetcher"
+import type { IAccountService } from "../../../../shared/account/service/interface"
+import type { IActivityStorage } from "../../../../shared/activity/types"
+import { ARGENT_API_BASE_URL } from "../../../../shared/api/constants"
+import { argentApiNetworkForNetwork } from "../../../../shared/api/headers"
+import { RefreshInterval } from "../../../../shared/config"
+import type { IDebounceService } from "../../../../shared/debounce"
 import { ActivityError } from "../../../../shared/errors/activity"
-import { KeyValueStorage } from "../../../../shared/storage"
+import type { IScheduleService } from "../../../../shared/schedule/interface"
+import type { IObjectStore } from "../../../../shared/storage/__new/interface"
+import type { INftsContractsRepository } from "../../../../shared/storage/__new/repositories/nft"
+import type { ITokenService } from "../../../../shared/token/__new/service/interface"
+import { urlWithQuery } from "../../../../shared/utils/url"
+import type { BaseWalletAccount } from "../../../../shared/wallet.model"
+import type { Wallet } from "../../../wallet"
+import type { IBackgroundUIService } from "../ui/interface"
+import { everyWhenOpen } from "../worker/schedule/decorators"
+import { pipe } from "../worker/schedule/pipe"
+import {
+  AccountUpgradedActivity,
+  Activities,
+  CancelEscapeActivity,
+  EscapeGuardianActivity,
+  EscapeSignerActivity,
+  GuardianBackupChangedActivity,
+  GuardianChangedActivity,
+  MultisigConfigurationUpdatedActivity,
+  NftActivity,
+  SignerChangedActivity,
+  TokenActivity,
+  TriggerEscapeGuardianActivity,
+  TriggerEscapeSignerActivity,
+  type ActivitiesPayload,
+  type Events,
+  type IActivityService,
+} from "./interface"
+import {
+  isActivityDetailsAction,
+  type ActivityDetailsAction,
+  type ActivityResponse,
+} from "./schema"
+import { getOverallLastModified } from "./utils/getOverallLastModified"
+import { parseFinanceActivities } from "./utils/parseFinanceActivities"
+import { parseSecurityActivities } from "./utils/parseSecurityActivities"
 
-export class ActivityService implements IActivityService {
-  private readonly httpService: IHttpService
+/** maps activity details action to an equivalent Event to emit */
+
+const eventByActivityDetailsAction: Record<
+  ActivityDetailsAction,
+  keyof Events
+> = {
+  triggerEscapeGuardian: TriggerEscapeGuardianActivity,
+  triggerEscapeSigner: TriggerEscapeSignerActivity,
+  escapeGuardian: EscapeGuardianActivity,
+  escapeSigner: EscapeSignerActivity,
+  guardianChanged: GuardianChangedActivity,
+  guardianBackupChanged: GuardianBackupChangedActivity,
+  signerChanged: SignerChangedActivity,
+  cancelEscape: CancelEscapeActivity,
+  accountUpgraded: AccountUpgradedActivity,
+  multisigConfigurationUpdated: MultisigConfigurationUpdatedActivity,
+} as const
 
+export class ActivityService implements IActivityService {
   constructor(
-    protected readonly apiBase: string,
-    private readonly activityStore: KeyValueStorage<IActivityStorage>,
-    private readonly headers: HeadersInit | undefined,
-  ) {
-    this.httpService = new HTTPService({ headers: this.headers }, "json")
+    readonly emitter: Emittery<Events>,
+    private readonly activityStore: IObjectStore<IActivityStorage>,
+    private readonly walletSingleton: Wallet,
+    private readonly accountService: IAccountService,
+    private readonly tokenService: ITokenService,
+    private readonly nftsContractsRepository: INftsContractsRepository,
+    private readonly httpService: IHttpService,
+    private readonly scheduleService: IScheduleService,
+    private readonly backgroundUIService: IBackgroundUIService,
+    private readonly debounceService: IDebounceService,
+  ) {}
+
+  runUpdateSelectedAccountActivities = pipe(
+    everyWhenOpen(
+      this.backgroundUIService,
+      this.scheduleService,
+      this.debounceService,
+      RefreshInterval.FAST,
+      "ActivityService.updateSelectedAccountActivities",
+    ),
+  )(async () => {
+    await this.updateSelectedAccountActivities()
+  })
+
+  async updateSelectedAccountActivities() {
+    const result = await this.fetchSelectedAccountActivities()
+    if (!result?.activities?.length) {
+      return
+    }
+    await this.processAndEmitActivities(result)
   }
 
-  async fetchActivities({
-    address,
-    networkId,
-    lastModified,
-  }: {
-    address: string
-    networkId: string
-    lastModified?: number
-  }) {
-    const endpoint = `${this.apiBase}/${argentApiNetworkForNetwork(
-      networkId,
-    )}/account/${address}/activities${
-      lastModified ? `?modifiedAfter=${lastModified}` : ""
-    }`
-
-    const response = await this.httpService.get<ActivityResponse>(endpoint)
+  async fetchSelectedAccountActivities(): Promise<
+    ActivitiesPayload | undefined
+  > {
+    const account = await this.walletSingleton.getSelectedAccount()
+    if (!account) {
+      return
+    }
+    const activities = await this.fetchAccountActivities(account)
+    if (!activities) {
+      return
+    }
+    return {
+      account,
+      activities,
+    }
+  }
+
+  async fetchAccountActivities(
+    account?: BaseWalletAccount,
+    updateModifiedAfter = true,
+  ) {
+    const apiBaseUrl = ARGENT_API_BASE_URL
+    if (!account || !apiBaseUrl) {
+      return
+    }
+    const argentApiNetwork = argentApiNetworkForNetwork(account.networkId)
+    if (!argentApiNetwork) {
+      return
+    }
+    const modifiedAfter = (await this.getModifiedAfter(account)) ?? 0
+    const url = urlWithQuery(
+      [
+        apiBaseUrl,
+        "activity",
+        "starknet",
+        argentApiNetwork,
+        "account",
+        stripAddressZeroPadding(account.address),
+        "activities",
+      ],
+      {
+        modifiedAfter,
+      },
+    )
+    const response = await this.httpService.get<ActivityResponse>(url)
     if (!response) {
       throw new ActivityError({ code: "FETCH_FAILED" })
     }
-    return response.activities
-    // TODO uncomment this once we have the final API
-    // const parsedActivities = activityResponseSchema.safeParse(response)
-
-    // if (!parsedActivities.success) {
-    //   throw new ActivityError({
-    //     code: "PARSING_FAILED",
-    //   })
-    // }
-    // return parsedActivities.data.activities
-  }
 
-  findLatestBalanceChangingTransaction(
-    activities: Activity[],
-  ): Activity | null {
-    if (!activities || activities.length === 0) {
-      return null
+    const { activities } = response
+    if (updateModifiedAfter) {
+      const overallLastModified = getOverallLastModified(activities)
+      if (overallLastModified) {
+        await this.setModifiedAfter(account, overallLastModified)
+      }
     }
+    return activities
+  }
+
+  async processAndEmitActivities({
+    account: activityAccount,
+    activities,
+  }: ActivitiesPayload) {
+    /** emit raw activities first */
+    void this.emitter.emit(Activities, {
+      account: activityAccount,
+      activities,
+    })
+
+    const accountsOnNetwork = await this.accountService.get(
+      (a) => a.networkId === activityAccount.networkId,
+    )
+    const tokensOnNetwork = await this.tokenService.getTokens(
+      (a) => a.networkId === activityAccount.networkId,
+    )
+    const nftsOnNetwork = await this.nftsContractsRepository.get(
+      (contract) => contract.networkId === activityAccount.networkId,
+    )
+
+    /**
+     * activities payload is always for a single network,
+     * so we use only addresses for simplicity
+     * then rehydrate back to instances before emitting
+     */
 
-    // All balance changing transactions have transfers
-    const balanceChangingActivities = activities.filter(
-      (activity) => activity.transfers && activity.transfers.length > 0,
+    const accountAddressesOnNetwork = accountsOnNetwork.map(
+      (account) => account.address as Address,
+    )
+    const tokenAddressesOnNetwork = tokensOnNetwork.map(
+      (token) => token.address,
+    )
+    const nftAddressesOnNetwork = nftsOnNetwork.map(
+      (nft) => nft.contractAddress as Address,
     )
 
-    if (balanceChangingActivities.length === 0) {
-      return null
+    /** ignore any "failure" */
+
+    const filteredActivities = activities.filter(
+      (activity) => activity.status !== "failure",
+    )
+    if (!filteredActivities.length) {
+      return
     }
 
-    const [latestBalanceChangingTransaction] = balanceChangingActivities.sort(
-      (a, b) => {
-        // Check if any of the transactions are pending
-        const aIsPending = a.transaction.status === "pending"
-        const bIsPending = b.transaction.status === "pending"
-
-        // Prioritize pending transactions
-        if (aIsPending && !bIsPending) {
-          return -1
-        } else if (!aIsPending && bIsPending) {
-          return 1
-        } else if (aIsPending && bIsPending) {
-          // If both are pending, sort by transactionIndex
-          return b.transaction.transactionIndex - a.transaction.transactionIndex
-        } else {
-          // If neither is pending, sort by blockNumber then transactionIndex
-          if (
-            a.transaction.blockNumber &&
-            b.transaction.blockNumber &&
-            a.transaction.blockNumber !== b.transaction.blockNumber
-          ) {
-            return b.transaction.blockNumber - a.transaction.blockNumber
-          } else {
-            return (
-              b.transaction.transactionIndex - a.transaction.transactionIndex
-            )
-          }
-        }
-      },
+    /** finance events */
+
+    const { nftActivity, tokenActivity } = parseFinanceActivities({
+      activities: filteredActivities,
+      accountAddressesOnNetwork,
+      tokenAddressesOnNetwork,
+      nftAddressesOnNetwork,
+    })
+
+    /** rehydrate the assets and accounts - these are already filtered to same network */
+
+    const tokenAccounts = accountsOnNetwork.filter((account) =>
+      includesAddress(account.address, tokenActivity.accountAddresses),
+    )
+    const tokens = tokensOnNetwork.filter((token) =>
+      includesAddress(token.address, tokenActivity.tokenAddresses),
     )
-    return latestBalanceChangingTransaction
-  }
 
-  async shouldUpdateBalance({
-    address,
-    networkId,
-  }: {
-    address: string
-    networkId: string
-  }) {
-    const latestBalanceChangingActivity = (
-      await this.activityStore.get("latestBalanceChangingActivity")
-    )?.[address]
-    const activities = await this.fetchActivities({
-      address,
-      networkId,
-      lastModified: latestBalanceChangingActivity?.lastModified,
+    const nftAccounts = accountsOnNetwork.filter((account) =>
+      includesAddress(account.address, nftActivity.accountAddresses),
+    )
+    const nfts = nftsOnNetwork.filter((token) =>
+      includesAddress(token.contractAddress, nftActivity.tokenAddresses),
+    )
+
+    if (tokenAccounts.length && tokens.length) {
+      void this.emitter.emit(TokenActivity, {
+        accounts: tokenAccounts,
+        tokens,
+      })
+    }
+
+    if (nftAccounts.length && nfts.length) {
+      void this.emitter.emit(NftActivity, {
+        accounts: nftAccounts,
+        nfts,
+      })
+    }
+
+    /** security */
+
+    const accountAddressesByAction = parseSecurityActivities({
+      activities: filteredActivities,
+      accountAddressesOnNetwork,
     })
-    const latestActivity = this.findLatestBalanceChangingTransaction(activities)
-    const shouldUpdate =
-      !latestBalanceChangingActivity?.id ||
-      latestActivity?.id !== latestBalanceChangingActivity?.id
-
-    if (shouldUpdate && latestActivity) {
-      return {
-        shouldUpdate,
-        lastModified: latestActivity.lastModified,
-        id: latestActivity.id,
+    Object.entries(accountAddressesByAction).forEach(([action, addresses]) => {
+      if (isActivityDetailsAction(action)) {
+        const event = eventByActivityDetailsAction[action]
+        /** rehydrate accounts */
+        const accounts = accountsOnNetwork.filter((account) =>
+          includesAddress(account.address, addresses),
+        )
+        if (accounts.length) {
+          void this.emitter.emit(event, accounts)
+        }
       }
-    }
-    return { shouldUpdate: false }
+    })
   }
 
-  async addActivityToStore({
-    address,
-    lastModified,
-    id,
-  }: IActivity & {
-    address: string
-  }) {
-    await this.activityStore.set("latestBalanceChangingActivity", {
-      [address]: {
-        id: id,
-        lastModified: lastModified,
-      },
-    })
+  async getModifiedAfter(
+    account: BaseWalletAccount,
+  ): Promise<number | undefined> {
+    const { modifiedAfter } = await this.activityStore.get()
+    const key = getAccountIdentifier(account)
+    return modifiedAfter[key]
+  }
+
+  async setModifiedAfter(account: BaseWalletAccount, value: number) {
+    const { modifiedAfter } = await this.activityStore.get()
+    const key = getAccountIdentifier(account)
+    modifiedAfter[key] = value
+    await this.activityStore.set({ modifiedAfter })
   }
 }
diff --git a/packages/extension/src/background/__new/services/activity/index.ts b/packages/extension/src/background/__new/services/activity/index.ts
index e35eb1e77..57bc6891f 100644
--- a/packages/extension/src/background/__new/services/activity/index.ts
+++ b/packages/extension/src/background/__new/services/activity/index.ts
@@ -1,15 +1,30 @@
-import urlJoin from "url-join"
-import { ARGENT_API_BASE_URL } from "../../../../shared/api/constants"
+import Emittery from "emittery"
+
 import { ActivityService } from "./implementation"
 import { activityStore } from "../../../../shared/activity/storage"
+import { httpService } from "../../../../shared/http/singleton"
+import { walletSingleton } from "../../../walletSingleton"
+import { chromeScheduleService } from "../../../../shared/schedule"
+import { backgroundUIService } from "../ui"
+import { debounceService } from "../../../../shared/debounce"
+import type { Events } from "./interface"
+import { accountService } from "../../../../shared/account/service"
+import { tokenService } from "../../../../shared/token/__new/service"
+import { nftsContractsRepository } from "../../../../shared/storage/__new/repositories/nft"
+
+export { Activities as Activities } from "./interface"
 
-const activityBaseUrl = urlJoin(ARGENT_API_BASE_URL || "", "/activity/starknet")
+const emitter = new Emittery<Events>()
 
 export const activityService = new ActivityService(
-  activityBaseUrl,
+  emitter,
   activityStore,
-  {
-    "argent-version": process.env.VERSION ?? "Unknown version",
-    "argent-client": "argent-x",
-  },
+  walletSingleton,
+  accountService,
+  tokenService,
+  nftsContractsRepository,
+  httpService,
+  chromeScheduleService,
+  backgroundUIService,
+  debounceService,
 )
diff --git a/packages/extension/src/background/__new/services/activity/interface.ts b/packages/extension/src/background/__new/services/activity/interface.ts
index c5dd9ee44..380e8b06b 100644
--- a/packages/extension/src/background/__new/services/activity/interface.ts
+++ b/packages/extension/src/background/__new/services/activity/interface.ts
@@ -1,22 +1,78 @@
-import { IActivity } from "../../../../shared/activity/types"
-import { BaseWalletAccount } from "../../../../shared/wallet.model"
-import { Activity } from "./model"
+import type { Token } from "@argent/shared"
+import type Emittery from "emittery"
+
+import type { ContractAddress } from "../../../../shared/storage/__new/repositories/nft"
+import type { BaseWalletAccount } from "../../../../shared/wallet.model"
+import type { Activity } from "./schema"
+
+/** raw */
+export const Activities = Symbol("Activities")
+
+/** finance */
+export const TokenActivity = Symbol("TokenActivity")
+export const NftActivity = Symbol("NftActivity")
+
+/** security */
+export const TriggerEscapeGuardianActivity = Symbol(
+  "TriggerEscapeGuardianActivity",
+)
+export const TriggerEscapeSignerActivity = Symbol("TriggerEscapeSignerActivity")
+export const EscapeGuardianActivity = Symbol("EscapeGuardianActivity")
+export const EscapeSignerActivity = Symbol("EscapeSignerActivity")
+export const GuardianChangedActivity = Symbol("GuardianChangedActivity")
+export const GuardianBackupChangedActivity = Symbol(
+  "GuardianBackupChangedActivity",
+)
+export const SignerChangedActivity = Symbol("SignerChangedActivity")
+export const CancelEscapeActivity = Symbol("CancelEscapeActivity")
+export const AccountUpgradedActivity = Symbol("AccountUpgradedActivity")
+export const MultisigConfigurationUpdatedActivity = Symbol(
+  "MultisigConfigurationUpdatedActivity",
+)
+
+export type ActivitiesPayload = {
+  account: BaseWalletAccount
+  activities: Activity[]
+}
+
+export type TokenActivityPayload = {
+  accounts: BaseWalletAccount[]
+  tokens: Token[]
+}
+
+export type NftActivityPayload = {
+  accounts: BaseWalletAccount[]
+  nfts: ContractAddress[]
+}
+
+export type SecurityActivityPayload = BaseWalletAccount[]
+
+/**
+ * Fired when new activities are discovered on an individual account
+ */
+
+export type Events = {
+  [Activities]: ActivitiesPayload
+  [TokenActivity]: TokenActivityPayload
+  [NftActivity]: NftActivityPayload
+  [TriggerEscapeGuardianActivity]: SecurityActivityPayload
+  [TriggerEscapeSignerActivity]: SecurityActivityPayload
+  [EscapeGuardianActivity]: SecurityActivityPayload
+  [EscapeSignerActivity]: SecurityActivityPayload
+  [GuardianChangedActivity]: SecurityActivityPayload
+  [GuardianBackupChangedActivity]: SecurityActivityPayload
+  [SignerChangedActivity]: SecurityActivityPayload
+  [CancelEscapeActivity]: SecurityActivityPayload
+  [AccountUpgradedActivity]: SecurityActivityPayload
+  [MultisigConfigurationUpdatedActivity]: SecurityActivityPayload
+}
 
 export interface IActivityService {
-  fetchActivities({
-    address,
-    networkId,
-  }: BaseWalletAccount): Promise<Activity[]>
-  shouldUpdateBalance({ address, networkId }: BaseWalletAccount): Promise<{
-    shouldUpdate: boolean
-    lastModified?: number
-    id?: string
-  }>
-  addActivityToStore({
-    address,
-    lastModified,
-    id,
-  }: IActivity & {
-    address: string
-  }): Promise<void>
+  readonly emitter: Emittery<Events>
+  fetchAccountActivities(
+    account?: BaseWalletAccount,
+    updateModifiedAfter?: boolean,
+  ): Promise<Activity[] | undefined>
+  updateSelectedAccountActivities(): Promise<void>
+  fetchSelectedAccountActivities(): Promise<ActivitiesPayload | undefined>
 }
diff --git a/packages/extension/src/background/__new/services/activity/model.ts b/packages/extension/src/background/__new/services/activity/model.ts
deleted file mode 100644
index 55534938d..000000000
--- a/packages/extension/src/background/__new/services/activity/model.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { addressSchema } from "@argent/shared"
-import { z } from "zod"
-
-const transactionSchema = z.object({
-  network: z.string(),
-  hash: z.string(),
-  status: z.string(),
-  blockNumber: z.number().optional(),
-  transactionIndex: z.number(),
-})
-
-const assetSchema = z.object({
-  // probably an enum
-  type: z.string(),
-  tokenAddress: addressSchema,
-  amount: z.string().optional(),
-  fiatAmount: z
-    .object({
-      currency: z.string(),
-      currencyAmount: z.number(),
-    })
-    .optional(),
-})
-
-const transferSchema = z.object({
-  // seems to be the same as activity type
-  type: z.string(),
-  // is probably enum (credit)
-  leg: z.string(),
-  counterParty: addressSchema.optional(),
-  asset: assetSchema,
-  counterPartyNetwork: z.string().optional(),
-})
-
-const relatedAddressSchema = z.object({
-  address: addressSchema,
-  network: z.string(),
-  type: z.string(),
-})
-
-export const activitySchema = z.object({
-  compositeId: z.string(),
-  id: z.string().uuid(),
-  // todo can be refined
-  status: z.string(),
-  wallet: addressSchema,
-  txSender: addressSchema,
-  source: z.string(),
-  // can be refined ('payment')
-  type: z.string(),
-  // can be refined ('finance')
-  group: z.string(),
-  submitted: z.number(),
-  lastModified: z.number(),
-  transaction: transactionSchema,
-  transfers: z.array(transferSchema),
-  // to be clarified
-  fees: z.any(),
-  relatedAddresses: z.array(relatedAddressSchema),
-  network: z.string(),
-})
-
-export const activityResponseSchema = z.object({
-  activities: z.array(activitySchema),
-})
-
-export type ActivityResponse = z.infer<typeof activityResponseSchema>
-export type Activity = z.infer<typeof activitySchema>
diff --git a/packages/extension/src/background/__new/services/activity/schema.test.ts b/packages/extension/src/background/__new/services/activity/schema.test.ts
new file mode 100644
index 000000000..0a30c854b
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/schema.test.ts
@@ -0,0 +1,27 @@
+import { describe, expect, test } from "vitest"
+
+import activities from "./__fixtures__/activities.json"
+import activitiesManyEscapes from "./__fixtures__/activities-many-escapes.json"
+import activitiesSignerChanged from "./__fixtures__/activities-signer-changed.json"
+import { activitiesSchema } from "./schema"
+
+describe("background/services/activity", () => {
+  describe("schema", () => {
+    describe("when valid", () => {
+      test("success should be true", () => {
+        expect(activitiesSchema.safeParse(activities).success).toBeTruthy()
+        expect(
+          activitiesSchema.safeParse(activitiesManyEscapes).success,
+        ).toBeTruthy()
+        expect(
+          activitiesSchema.safeParse(activitiesSignerChanged).success,
+        ).toBeTruthy()
+      })
+    })
+    describe("when invalid", () => {
+      test("success should be false", () => {
+        expect(activitiesSchema.safeParse([{}]).success).toBeFalsy()
+      })
+    })
+  })
+})
diff --git a/packages/extension/src/background/__new/services/activity/schema.ts b/packages/extension/src/background/__new/services/activity/schema.ts
new file mode 100644
index 000000000..f56877deb
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/schema.ts
@@ -0,0 +1,120 @@
+import { addressSchema } from "@argent/shared"
+import { z } from "zod"
+
+const transactionSchema = z.object({
+  network: z.string(),
+  hash: z.string(),
+  status: z.string(),
+  blockNumber: z.number().optional(),
+  transactionIndex: z.number(),
+})
+
+const assetSchema = z.object({
+  type: z.enum(["token", "nft"]),
+  tokenAddress: addressSchema,
+  amount: z.string().optional(),
+  fiatAmount: z
+    .object({
+      currency: z.string(),
+      currencyAmount: z.number(),
+    })
+    .optional(),
+})
+
+const transferSchema = z.object({
+  // seems to be the same as activity type
+  type: z.string(),
+  // is probably enum (credit)
+  leg: z.string(),
+  counterParty: addressSchema.optional(),
+  asset: assetSchema,
+  counterPartyNetwork: z.string().optional(),
+})
+
+const relatedAddressSchema = z.object({
+  address: addressSchema,
+  network: z.enum(["starknet", "zksync", "zksync2"]),
+  type: z.enum(["wallet", "token"]),
+})
+
+const networkDetailsSchema = z.object({
+  chainId: z.enum(["TESTNET", "MAINNET"]),
+  ethereumNetwork: z.enum(["goerli", "mainnet"]),
+})
+
+const typeSchema = z.enum([
+  "approval",
+  "changePubKey",
+  "dappInteraction",
+  "deploy",
+  "gift",
+  "multicall",
+  "payment",
+  "security",
+  "trade",
+])
+
+const detailsActionSchema = z.enum([
+  "triggerEscapeGuardian",
+  "triggerEscapeSigner",
+  "escapeGuardian",
+  "escapeSigner",
+  "guardianChanged",
+  "guardianBackupChanged",
+  "signerChanged",
+  "cancelEscape",
+  "accountUpgraded",
+  "multisigConfigurationUpdated",
+])
+
+export const activityDetailsSchema = z.object({
+  type: typeSchema,
+  action: detailsActionSchema.optional(),
+  context: z
+    .object({
+      activeAt: z.string().optional(),
+      newGuardian: z.string().optional(),
+      newImplementation: z.string().optional(),
+      newVersion: z.string().optional(),
+    })
+    .optional(),
+  srcAsset: assetSchema.optional(),
+  destAsset: assetSchema.optional(),
+})
+
+export const activitySchema = z.object({
+  compositeId: z.string(),
+  id: z.string().uuid(),
+  status: z.enum(["pending", "success", "failure"]),
+  wallet: addressSchema,
+  txSender: addressSchema,
+  source: z.string(),
+  type: typeSchema,
+  group: z.enum(["finance", "security"]),
+  submitted: z.number(),
+  lastModified: z.number(),
+  transaction: transactionSchema,
+  transfers: z.array(transferSchema),
+  // to be clarified
+  fees: z.any(),
+  relatedAddresses: z.array(relatedAddressSchema).nullable(),
+  network: z.string(),
+  networkDetails: networkDetailsSchema.optional(),
+  details: activityDetailsSchema,
+})
+
+export const activitiesSchema = z.array(activitySchema)
+
+export const activityResponseSchema = z.object({
+  activities: activitiesSchema,
+})
+
+export type ActivityResponse = z.infer<typeof activityResponseSchema>
+export type Activity = z.infer<typeof activitySchema>
+export type ActivityDetailsAction = z.infer<typeof detailsActionSchema>
+
+export function isActivityDetailsAction(
+  value: unknown,
+): value is ActivityDetailsAction {
+  return detailsActionSchema.safeParse(value).success
+}
diff --git a/packages/extension/src/background/__new/services/activity/utils/getOverallLastModified.test.ts b/packages/extension/src/background/__new/services/activity/utils/getOverallLastModified.test.ts
new file mode 100644
index 000000000..73579f7dc
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/utils/getOverallLastModified.test.ts
@@ -0,0 +1,17 @@
+import { describe, expect, test } from "vitest"
+
+import activities from "../__fixtures__/activities.json"
+import type { Activity } from "../schema"
+import { getOverallLastModified } from "./getOverallLastModified"
+
+describe("background/services/activity/utils", () => {
+  describe("getOverallLastModified", () => {
+    describe("when valid", () => {
+      test("returns the most recent lastModified", () => {
+        expect(
+          getOverallLastModified(activities as Activity[]),
+        ).toMatchInlineSnapshot(`1701964096841`)
+      })
+    })
+  })
+})
diff --git a/packages/extension/src/background/__new/services/activity/utils/getOverallLastModified.ts b/packages/extension/src/background/__new/services/activity/utils/getOverallLastModified.ts
new file mode 100644
index 000000000..abc150fa9
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/utils/getOverallLastModified.ts
@@ -0,0 +1,13 @@
+import { Activity } from "../schema"
+
+/**
+ * Retrieves the overall last modified date across all provided activities.
+ *
+ * @param activities: Array of activities
+ * @returns The overall last modified date, representing the latest modification among all activities.
+ */
+export function getOverallLastModified(activities: Activity[]) {
+  const all = activities.map((activity) => activity.lastModified)
+  const overallLastModified = all.sort().pop()
+  return overallLastModified
+}
diff --git a/packages/extension/src/background/__new/services/activity/utils/parseFinanceActivities.test.ts b/packages/extension/src/background/__new/services/activity/utils/parseFinanceActivities.test.ts
new file mode 100644
index 000000000..772fa25eb
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/utils/parseFinanceActivities.test.ts
@@ -0,0 +1,51 @@
+import type { Address } from "@argent/shared"
+import { describe, expect, test } from "vitest"
+
+import activities from "../__fixtures__/activities.json"
+import state from "../__fixtures__/state.json"
+import type { Activity } from "../schema"
+import { parseFinanceActivities } from "./parseFinanceActivities"
+
+describe("background/services/activity/utils", () => {
+  describe("parseSecurityActivities", () => {
+    describe("when valid", () => {
+      test("returns a map of actions to account addresses", () => {
+        expect(
+          parseFinanceActivities({
+            activities: activities as Activity[],
+            accountAddressesOnNetwork:
+              state.accountAddressesOnNetwork as Address[],
+            tokenAddressesOnNetwork: state.tokenAddressesOnNetwork as Address[],
+            nftAddressesOnNetwork: state.nftAddressesOnNetwork as Address[],
+          }),
+        ).toMatchInlineSnapshot(`
+          {
+            "nftActivity": {
+              "accountAddresses": [
+                "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+                "0x00a00018122f54123d4003db254cd2054679d92eeefaa7c2d94c27abb9143b35",
+              ],
+              "tokenAddresses": [
+                "0x031f9085c75917a4860da8628ffc3b4d4587da88dc2ee664516a9271a94cf266",
+              ],
+            },
+            "tokenActivity": {
+              "accountAddresses": [
+                "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+                "0x025a2751133d109a5c876c87d9fd29d04c9d1f28de6790831c068f4c2fbc565e",
+                "0x03d98fe1fecdd2020fce7869b5451f6395fb942789459752a8a4ea55a578345d",
+                "0x039b90d5c8fbf32641bd117664952b10905f421792cf04b584517c2c430f7b5e",
+                "0x01cf2a3112c54821398a8544736108b8491a72dfd9d0687759037bc0792097ec",
+                "0x05eabc4165024d9e3da1be66688bfe70f1d8d8b234844ff9463172505df2dae8",
+                "0x00a00018122f54123d4003db254cd2054679d92eeefaa7c2d94c27abb9143b35",
+              ],
+              "tokenAddresses": [
+                "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+              ],
+            },
+          }
+        `)
+      })
+    })
+  })
+})
diff --git a/packages/extension/src/background/__new/services/activity/utils/parseFinanceActivities.ts b/packages/extension/src/background/__new/services/activity/utils/parseFinanceActivities.ts
new file mode 100644
index 000000000..2ac7fedbd
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/utils/parseFinanceActivities.ts
@@ -0,0 +1,93 @@
+import { type Address, includesAddress } from "@argent/shared"
+
+import type { Activity } from "../schema"
+
+interface ParseFinanceActivitiesProps {
+  activities: Activity[]
+  accountAddressesOnNetwork: Address[]
+  tokenAddressesOnNetwork: Address[]
+  nftAddressesOnNetwork: Address[]
+}
+
+interface ParseFinanceActivitiesResult {
+  tokenActivity: {
+    accountAddresses: Address[]
+    tokenAddresses: Address[]
+  }
+  nftActivity: {
+    accountAddresses: Address[]
+    tokenAddresses: Address[]
+  }
+}
+
+/**
+ * Parses finance-related activities from the provided list of activities, grouping addresses
+ * into tokens and NFTs,
+ *
+ * @param activities: Array of activities to be analyzed.
+ * @param accountAddressesOnNetwork: Array of account addresses known to be active on the network.
+ * @param tokenAddressesOnNetwork: Array of token addresses known to exist on the network.
+ * @param nftAddressesOnNetwork: Array of NFT addresses known to exist on the network.
+ * @returns {ParseFinanceActivitiesResult} An object containing two nested objects, one for tokens and one for NFTs,
+ * each with corresponding arrays for account addresses and token addresses.
+ */
+
+export function parseFinanceActivities({
+  activities,
+  accountAddressesOnNetwork,
+  tokenAddressesOnNetwork,
+  nftAddressesOnNetwork,
+}: ParseFinanceActivitiesProps) {
+  const result: ParseFinanceActivitiesResult = {
+    tokenActivity: {
+      accountAddresses: [],
+      tokenAddresses: [],
+    },
+    nftActivity: {
+      accountAddresses: [],
+      tokenAddresses: [],
+    },
+  }
+
+  activities.forEach((activity) => {
+    if (activity.group === "finance" && activity.relatedAddresses) {
+      const isTokenTransfer = activity.transfers.some(
+        (transfer) => transfer.asset.type === "token",
+      )
+      activity.relatedAddresses.forEach(({ type, address }) => {
+        if (type === "token") {
+          if (includesAddress(address, tokenAddressesOnNetwork)) {
+            if (
+              !includesAddress(address, result.tokenActivity.tokenAddresses)
+            ) {
+              result.tokenActivity.tokenAddresses.push(address)
+            }
+          }
+          if (includesAddress(address, nftAddressesOnNetwork)) {
+            if (!includesAddress(address, result.nftActivity.tokenAddresses)) {
+              result.nftActivity.tokenAddresses.push(address)
+            }
+          }
+        } else if (type === "wallet") {
+          if (includesAddress(address, accountAddressesOnNetwork)) {
+            if (isTokenTransfer) {
+              if (
+                !includesAddress(address, result.tokenActivity.accountAddresses)
+              ) {
+                result.tokenActivity.accountAddresses.push(address)
+              }
+            } else {
+              if (
+                !includesAddress(address, result.nftActivity.accountAddresses)
+              ) {
+                result.nftActivity.accountAddresses.push(address)
+              }
+            }
+          }
+        }
+      })
+    }
+  })
+
+  return result
+}
diff --git a/packages/extension/src/background/__new/services/activity/utils/parseSecurityActivities.test.ts b/packages/extension/src/background/__new/services/activity/utils/parseSecurityActivities.test.ts
new file mode 100644
index 000000000..311704c85
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/utils/parseSecurityActivities.test.ts
@@ -0,0 +1,65 @@
+import type { Address } from "@argent/shared"
+import { describe, expect, test } from "vitest"
+
+import activities from "../__fixtures__/activities.json"
+import activitiesManyEscapes from "../__fixtures__/activities-many-escapes.json"
+import activitiesSignerChanged from "../__fixtures__/activities-signer-changed.json"
+import state from "../__fixtures__/state.json"
+import type { Activity } from "../schema"
+import { parseSecurityActivities } from "./parseSecurityActivities"
+
+describe("background/services/activity/utils", () => {
+  describe("parseSecurityActivities", () => {
+    describe("when valid", () => {
+      test("returns a map of actions to account addresses", () => {
+        expect(
+          parseSecurityActivities({
+            activities: activities as Activity[],
+            accountAddressesOnNetwork:
+              state.accountAddressesOnNetwork as Address[],
+          }),
+        ).toMatchInlineSnapshot(`
+          {
+            "guardianChanged": [
+              "0x05f1f0a38429dcab9ffd8a786c0d827e84c1cbd8f60243e6d25d066a13af4a25",
+            ],
+          }
+        `)
+        expect(
+          parseSecurityActivities({
+            activities: activitiesManyEscapes as Activity[],
+            accountAddressesOnNetwork: [
+              "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+            ] as Address[],
+          }),
+        ).toMatchInlineSnapshot(`
+          {
+            "cancelEscape": [
+              "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+            ],
+            "guardianChanged": [
+              "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+            ],
+            "triggerEscapeGuardian": [
+              "0x00c90c89d339d1611f971e9211bc6a8efafc82541a61703a702c17d291afe9bb",
+            ],
+          }
+        `)
+        expect(
+          parseSecurityActivities({
+            activities: activitiesSignerChanged as Activity[],
+            accountAddressesOnNetwork: [
+              "0x02470ea294aa4b28ee4a473aaa8a1edc6c810c11684d1f29f1f3edd336fd0f34",
+            ] as Address[],
+          }),
+        ).toMatchInlineSnapshot(`
+          {
+            "signerChanged": [
+              "0x02470ea294aa4b28ee4a473aaa8a1edc6c810c11684d1f29f1f3edd336fd0f34",
+            ],
+          }
+        `)
+      })
+    })
+  })
+})
diff --git a/packages/extension/src/background/__new/services/activity/utils/parseSecurityActivities.ts b/packages/extension/src/background/__new/services/activity/utils/parseSecurityActivities.ts
new file mode 100644
index 000000000..3d56a7b24
--- /dev/null
+++ b/packages/extension/src/background/__new/services/activity/utils/parseSecurityActivities.ts
@@ -0,0 +1,47 @@
+import { type Address, includesAddress } from "@argent/shared"
+
+import type { Activity, ActivityDetailsAction } from "../schema"
+
+interface ParseFinanceActivitiesProps {
+  activities: Activity[]
+  accountAddressesOnNetwork: Address[]
+}
+
+/**
+ * Parses security-related activities from the provided list of activities, grouping them by action
+ * and returning a map of addresses associated with each action.
+ *
+ * @param activities: Array of activities to parse.
+ * @param accountAddressesOnNetwork: Array of account addresses that are known to be active on the
+ * network.
+ * @returns A map of actions to their associated addresses, where the addresses represent the
+ * accounts involved in the respective actions.
+ */
+
+export function parseSecurityActivities({
+  activities,
+  accountAddressesOnNetwork,
+}: ParseFinanceActivitiesProps) {
+  const accountAddressesByAction: Partial<
+    Record<ActivityDetailsAction, Address[]>
+  > = {}
+
+  activities.forEach((activity) => {
+    if (activity.group === "security") {
+      const address = activity.wallet
+      if (includesAddress(address, accountAddressesOnNetwork)) {
+        const action = activity.details.action
+        if (action) {
+          if (!accountAddressesByAction[action]) {
+            accountAddressesByAction[action] = []
+          }
+          if (!includesAddress(address, accountAddressesByAction[action])) {
+            accountAddressesByAction[action]?.push(address)
+          }
+        }
+      }
+    }
+  })
+
+  return accountAddressesByAction
+}
diff --git a/packages/extension/src/background/__new/services/address/index.ts b/packages/extension/src/background/__new/services/address/index.ts
index acf24074e..fb4a796e8 100644
--- a/packages/extension/src/background/__new/services/address/index.ts
+++ b/packages/extension/src/background/__new/services/address/index.ts
@@ -1,6 +1,6 @@
 import { StarknetAddressService } from "@argent/shared"
 import { ARGENT_API_BASE_URL } from "../../../../shared/api/constants"
-import { httpService } from "../http/singleton"
+import { httpService } from "../../../../shared/http/singleton"
 import { getDefaultNetworkId } from "../../../../shared/network/utils"
 
 const allowedArgentNameNetworkId = getDefaultNetworkId()
diff --git a/packages/extension/src/background/__new/services/argentAccount/implementation.ts b/packages/extension/src/background/__new/services/argentAccount/implementation.ts
index 3f06c064b..3ba06541f 100644
--- a/packages/extension/src/background/__new/services/argentAccount/implementation.ts
+++ b/packages/extension/src/background/__new/services/argentAccount/implementation.ts
@@ -1,4 +1,4 @@
-import { IArgentAccountServiceBackground } from "../../../../shared/argentAccount/service/interface"
+import { IArgentAccountServiceBackground } from "../../../../shared/argentAccount/interface"
 import { ARGENT_SHIELD_NETWORK_ID } from "../../../../shared/shield/constants"
 import {
   addBackendAccount,
@@ -22,7 +22,7 @@ import { validateEmailForAccounts } from "../../../../shared/shield/validation/v
 import {
   PreferencesPayload,
   preferencesEndpointPayload,
-} from "../../procedures/argentAccount/updatePreferences.model"
+} from "../../../../shared/argentAccount/schema"
 import { IHttpService } from "@argent/shared"
 import urlJoin from "url-join"
 import { ARGENT_ACCOUNT_URL } from "../../../../shared/api/constants"
diff --git a/packages/extension/src/background/__new/services/argentAccount/index.ts b/packages/extension/src/background/__new/services/argentAccount/index.ts
index 7b9771313..24d8612a4 100644
--- a/packages/extension/src/background/__new/services/argentAccount/index.ts
+++ b/packages/extension/src/background/__new/services/argentAccount/index.ts
@@ -1,6 +1,6 @@
 import BackgroundArgentAccountService from "./implementation"
 import { walletSingleton } from "../../../walletSingleton"
-import { httpService } from "../http/singleton"
+import { httpService } from "../../../../shared/http/singleton"
 
 export const backgroundArgentAccountService =
   new BackgroundArgentAccountService(walletSingleton, httpService)
diff --git a/packages/extension/src/background/__new/services/http/singleton.ts b/packages/extension/src/background/__new/services/http/singleton.ts
deleted file mode 100644
index d1167cc15..000000000
--- a/packages/extension/src/background/__new/services/http/singleton.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HTTPService } from "@argent/shared"
-
-export const httpService = new HTTPService({
-  headers: {
-    "argent-version": process.env.VERSION ?? "Unknown version",
-    "argent-client": "argent-x",
-  },
-})
diff --git a/packages/extension/src/background/__new/services/knownDapps/implementation.ts b/packages/extension/src/background/__new/services/knownDapps/implementation.ts
new file mode 100644
index 000000000..eacaec958
--- /dev/null
+++ b/packages/extension/src/background/__new/services/knownDapps/implementation.ts
@@ -0,0 +1,45 @@
+import { KnownDapp, KnownDapps, KnownDappsBackendService } from "@argent/shared"
+import type { IKnownDappService } from "../../../../shared/knownDapps/interface"
+import type { IKnownDappsRepository } from "../../../../shared/storage/__new/repositories/knownDapp"
+
+export class KnownDappService implements IKnownDappService {
+  constructor(
+    private readonly knownDappsRepository: IKnownDappsRepository,
+    private readonly argentKnownDappsService: KnownDappsBackendService,
+  ) {}
+
+  async getDapps(): Promise<KnownDapps> {
+    return await this.argentKnownDappsService.getAll()
+  }
+
+  async getDappByHost(host: string): Promise<KnownDapp | null> {
+    const knownDapps = await this.knownDappsRepository.get()
+
+    const dapp = knownDapps?.find(
+      (knownDapp) =>
+        knownDapp.dappUrl &&
+        new URL(knownDapp.dappUrl).host === new URL(host).host,
+    )
+
+    return dapp ?? null
+  }
+
+  async getDappByContractAddress(
+    contractAddress: string,
+  ): Promise<KnownDapp | null> {
+    const knownDapps = await this.knownDappsRepository.get()
+
+    const dapp = knownDapps?.find((knownDapp) =>
+      knownDapp.contracts?.some(
+        (contract) =>
+          contract.address === contractAddress && contract.chain === "starknet",
+      ),
+    )
+
+    return dapp ?? null
+  }
+
+  async upsert(dapps: KnownDapps) {
+    await this.knownDappsRepository.upsert(dapps)
+  }
+}
diff --git a/packages/extension/src/background/__new/services/knownDapps/index.ts b/packages/extension/src/background/__new/services/knownDapps/index.ts
new file mode 100644
index 000000000..034455aab
--- /dev/null
+++ b/packages/extension/src/background/__new/services/knownDapps/index.ts
@@ -0,0 +1,14 @@
+import { ArgentKnownDappsBackendService } from "@argent/shared"
+
+import { KnownDappService } from "./implementation"
+import { ARGENT_API_BASE_URL } from "../../../../shared/api/constants"
+import { knownDappsRepository } from "../../../../shared/storage/__new/repositories/knownDapp"
+
+export const argentKnownDappsService = new ArgentKnownDappsBackendService(
+  ARGENT_API_BASE_URL,
+)
+
+export const knownDappsService = new KnownDappService(
+  knownDappsRepository,
+  argentKnownDappsService,
+)
diff --git a/packages/extension/src/shared/knownDapps/worker/implementation.ts b/packages/extension/src/background/__new/services/knownDapps/worker/implementation.ts
similarity index 57%
rename from packages/extension/src/shared/knownDapps/worker/implementation.ts
rename to packages/extension/src/background/__new/services/knownDapps/worker/implementation.ts
index bdd846b4e..4240aab3e 100644
--- a/packages/extension/src/shared/knownDapps/worker/implementation.ts
+++ b/packages/extension/src/background/__new/services/knownDapps/worker/implementation.ts
@@ -1,12 +1,10 @@
-import { IScheduleService } from "../../schedule/interface"
-import { KnownDappService } from "../implementation"
-import { RefreshInterval } from "../../config"
-import { everyWhenOpen } from "../../../background/__new/services/worker/schedule/decorators"
-import { pipe } from "../../../background/__new/services/worker/schedule/pipe"
-import { IBackgroundUIService } from "../../../background/__new/services/ui/interface"
-import { IDebounceService } from "../../debounce"
-// Worker should be in background, not shared, as they are only used in the background
-// TODO: move this file
+import { IScheduleService } from "../../../../../shared/schedule/interface"
+import { KnownDappService } from "../../../../../shared/knownDapps/implementation"
+import { RefreshInterval } from "../../../../../shared/config"
+import { pipe } from "../../worker/schedule/pipe"
+import { IBackgroundUIService } from "../../ui/interface"
+import { IDebounceService } from "../../../../../shared/debounce"
+import { everyWhenOpen } from "../../worker/schedule/decorators"
 
 const id = "knownDappsUpdate"
 
diff --git a/packages/extension/src/background/__new/services/knownDapps/worker/index.ts b/packages/extension/src/background/__new/services/knownDapps/worker/index.ts
new file mode 100644
index 000000000..d3b5f65a8
--- /dev/null
+++ b/packages/extension/src/background/__new/services/knownDapps/worker/index.ts
@@ -0,0 +1,12 @@
+import { debounceService } from "../../../../../shared/debounce"
+import { knownDappsService } from "../../../../../shared/knownDapps/index"
+import { chromeScheduleService } from "../../../../../shared/schedule"
+import { backgroundUIService } from "../../ui"
+import { KnownDappsWorker } from "./implementation"
+
+export const knownDappsWorker = new KnownDappsWorker(
+  chromeScheduleService,
+  knownDappsService,
+  backgroundUIService,
+  debounceService,
+)
diff --git a/packages/extension/src/background/__new/services/multisig/implementation.ts b/packages/extension/src/background/__new/services/multisig/implementation.ts
index 449d1525d..6a0e0a46a 100644
--- a/packages/extension/src/background/__new/services/multisig/implementation.ts
+++ b/packages/extension/src/background/__new/services/multisig/implementation.ts
@@ -13,7 +13,7 @@ import {
   UpdateMultisigThresholdPayload,
 } from "../../../../shared/multisig/multisig.model"
 import { Wallet } from "../../../wallet"
-import { CallData, DeployAccountContractPayload } from "starknet"
+import { CallData } from "starknet"
 import { IBackgroundActionService } from "../action/interface"
 import { BaseWalletAccount } from "../../../../shared/wallet.model"
 import {
@@ -128,7 +128,7 @@ export default class BackgroundMultisigService implements IMultisigService {
     }
     const title = `Remove owner${
       signersToRemove.length > 1 ? "s" : ""
-    } and set confirmations to ${newThreshold}}`
+    } and set confirmations to ${newThreshold}`
     await this.actionService.add(
       {
         type: "TRANSACTION",
diff --git a/packages/extension/src/background/__new/services/network/worker.ts b/packages/extension/src/background/__new/services/network/worker.ts
index a361d3711..3dc3a9f4d 100644
--- a/packages/extension/src/background/__new/services/network/worker.ts
+++ b/packages/extension/src/background/__new/services/network/worker.ts
@@ -1,7 +1,7 @@
 import { IScheduleService } from "../../../../shared/schedule/interface"
 import { IBackgroundNetworkService } from "./interface"
-import { RefreshInterval } from "../../../../shared/config"
-import { everyWhenOpen } from "../worker/schedule/decorators"
+// import { RefreshInterval } from "../../../../shared/config"
+// import { everyWhenOpen } from "../worker/schedule/decorators"
 import { IBackgroundUIService } from "../ui/interface"
 import { IDebounceService } from "../../../../shared/debounce"
 
diff --git a/packages/extension/src/background/__new/services/nft/worker/implementation.ts b/packages/extension/src/background/__new/services/nft/worker/implementation.ts
index bf0ec0357..283af4ba6 100644
--- a/packages/extension/src/background/__new/services/nft/worker/implementation.ts
+++ b/packages/extension/src/background/__new/services/nft/worker/implementation.ts
@@ -10,7 +10,7 @@ import { IScheduleService } from "../../../../../shared/schedule/interface"
 import { WalletStorageProps } from "../../../../../shared/wallet/walletStore"
 import { ArrayStorage, KeyValueStorage } from "../../../../../shared/storage"
 import { Transaction } from "../../../../../shared/transactions"
-import { transactionSucceeded } from "../../../../../shared/utils/transactionSucceeded"
+import { hasSuccessfulTransaction } from "../../../../../shared/utils/transactionSucceeded"
 import { everyWhenOpen } from "../../worker/schedule/decorators"
 import { pipe } from "../../worker/schedule/pipe"
 import { IDebounceService } from "../../../../../shared/debounce"
@@ -43,7 +43,7 @@ export class NftsWorker {
       if (!changeSet?.newValue) {
         return
       }
-      const hasSuccessTx = transactionSucceeded(
+      const hasSuccessTx = hasSuccessfulTransaction(
         changeSet.newValue,
         changeSet?.oldValue,
       )
diff --git a/packages/extension/src/background/__new/services/nft/worker/index.ts b/packages/extension/src/background/__new/services/nft/worker/index.ts
index 6f21a65aa..de0630cf6 100644
--- a/packages/extension/src/background/__new/services/nft/worker/index.ts
+++ b/packages/extension/src/background/__new/services/nft/worker/index.ts
@@ -2,7 +2,7 @@ import { nftService } from "../../../../../shared/nft"
 import { debounceService } from "../../../../../shared/debounce"
 import { chromeScheduleService } from "../../../../../shared/schedule"
 import { old_walletStore } from "../../../../../shared/wallet/walletStore"
-import { transactionsStore } from "../../../../transactions/store"
+import { transactionsStore } from "../../../../../shared/transactions/store"
 import {
   recoverySharedService,
   sessionService,
diff --git a/packages/extension/src/background/__new/services/preAuthorization/worker/index.ts b/packages/extension/src/background/__new/services/preAuthorization/worker/index.ts
new file mode 100644
index 000000000..279b06a66
--- /dev/null
+++ b/packages/extension/src/background/__new/services/preAuthorization/worker/index.ts
@@ -0,0 +1,6 @@
+import { preAuthorizationRepo } from "../../../../../shared/preAuthorization/store"
+import { PreAuthorisationWorker } from "./worker"
+
+export const preAuthorisationWorker = new PreAuthorisationWorker(
+  preAuthorizationRepo,
+)
diff --git a/packages/extension/src/background/__new/services/preAuthorization/worker/worker.test.ts b/packages/extension/src/background/__new/services/preAuthorization/worker/worker.test.ts
new file mode 100644
index 000000000..1e19168da
--- /dev/null
+++ b/packages/extension/src/background/__new/services/preAuthorization/worker/worker.test.ts
@@ -0,0 +1,70 @@
+import { describe, expect, test, vi } from "vitest"
+
+import {
+  type PreAuthorization,
+  isEqualPreAuthorization,
+} from "../../../../../shared/preAuthorization/schema"
+import { InMemoryRepository } from "../../../../../shared/storage/__new/__test__/inmemoryImplementations"
+import { PreAuthorisationWorker } from "./worker"
+
+describe("PreAuthorisationWorker", () => {
+  const preAuthorizations: PreAuthorization[] = [
+    {
+      account: {
+        address: "0x123",
+        networkId: "foo",
+      },
+      host: "http://foo",
+    },
+    {
+      account: {
+        address: "0x123",
+        networkId: "bar",
+      },
+      host: "http://bar",
+    },
+  ]
+  const makeService = () => {
+    const preAuthorizationRepo = new InMemoryRepository<PreAuthorization>({
+      namespace: `core:whitelist`,
+      compare: isEqualPreAuthorization,
+    })
+    const sendMessageToHost = vi.fn()
+    const preAuthorisationWorker = new PreAuthorisationWorker(
+      preAuthorizationRepo,
+      sendMessageToHost,
+    )
+    return {
+      preAuthorisationWorker,
+      preAuthorizationRepo,
+      sendMessageToHost,
+    }
+  }
+  test("Disconnect dapp", async () => {
+    const { preAuthorizationRepo, sendMessageToHost } = makeService()
+
+    /** populate store and validate */
+    await preAuthorizationRepo.upsert(preAuthorizations)
+    expect(await preAuthorizationRepo.get()).toEqual(preAuthorizations)
+
+    /** remove to invoke disconnection */
+    await preAuthorizationRepo.remove(preAuthorizations[0])
+    expect(sendMessageToHost).toHaveBeenCalledOnce()
+    expect(sendMessageToHost).toHaveBeenCalledWith(
+      {
+        type: "DISCONNECT_ACCOUNT",
+      },
+      preAuthorizations[0].host,
+    )
+    sendMessageToHost.mockReset()
+
+    await preAuthorizationRepo.remove(preAuthorizations[1])
+    expect(sendMessageToHost).toHaveBeenCalledOnce()
+    expect(sendMessageToHost).toHaveBeenCalledWith(
+      {
+        type: "DISCONNECT_ACCOUNT",
+      },
+      preAuthorizations[1].host,
+    )
+  })
+})
diff --git a/packages/extension/src/background/__new/services/preAuthorization/worker/worker.ts b/packages/extension/src/background/__new/services/preAuthorization/worker/worker.ts
new file mode 100644
index 000000000..ed83a20f2
--- /dev/null
+++ b/packages/extension/src/background/__new/services/preAuthorization/worker/worker.ts
@@ -0,0 +1,34 @@
+import { difference } from "lodash-es"
+
+import type { PreAuthorization } from "../../../../../shared/preAuthorization/schema"
+import type { IPreAuthorizationRepo } from "../../../../../shared/preAuthorization/store"
+import type { StorageChange } from "../../../../../shared/storage/__new/interface"
+import { sendMessageToHost } from "../../../../activeTabs"
+
+export class PreAuthorisationWorker {
+  constructor(
+    private readonly preAuthorizationRepo: IPreAuthorizationRepo,
+    private readonly sendMessageToHostImpl: typeof sendMessageToHost = sendMessageToHost,
+  ) {
+    this.preAuthorizationRepo.subscribe(
+      this.preAuthorizationRepoChanged.bind(this),
+    )
+  }
+
+  async preAuthorizationRepoChanged(
+    changeSet: StorageChange<PreAuthorization[]>,
+  ) {
+    const removed = difference(
+      changeSet.oldValue ?? [],
+      changeSet.newValue ?? [],
+    )
+    for (const preAuthorization of removed) {
+      await this.sendMessageToHostImpl(
+        {
+          type: "DISCONNECT_ACCOUNT",
+        },
+        preAuthorization.host,
+      )
+    }
+  }
+}
diff --git a/packages/extension/src/shared/token/__new/worker/implementation.test.ts b/packages/extension/src/background/__new/services/token/worker/implementation.test.ts
similarity index 60%
rename from packages/extension/src/shared/token/__new/worker/implementation.test.ts
rename to packages/extension/src/background/__new/services/token/worker/implementation.test.ts
index bba27824c..1e8098e73 100644
--- a/packages/extension/src/shared/token/__new/worker/implementation.test.ts
+++ b/packages/extension/src/background/__new/services/token/worker/implementation.test.ts
@@ -1,37 +1,35 @@
-import { IRepository } from "./../../../storage/__new/interface"
+import { IRepository } from "../../../../../shared/storage/__new/interface"
 import { Mocked } from "vitest"
-import { INetworkService } from "../../../network/service/interface"
-import { ITokenService } from "../service/interface"
+import { INetworkService } from "../../../../../shared/network/service/interface"
+import { ITokenService } from "../../../../../shared/token/__new/service/interface"
 import { TokenWorker } from "./implementation"
-import { MockFnRepository } from "../../../storage/__new/__test__/mockFunctionImplementation"
-import { WalletStorageProps } from "../../../wallet/walletStore"
-import { KeyValueStorage } from "../../../storage"
-import { Transaction } from "../../../transactions"
-import { Token } from "../types/token.model"
-import { IAccountService } from "../../../account/service/interface"
-import { IScheduleService } from "../../../schedule/interface"
+import { MockFnRepository } from "../../../../../shared/storage/__new/__test__/mockFunctionImplementation"
+import { WalletStorageProps } from "../../../../../shared/wallet/walletStore"
+import { KeyValueStorage } from "../../../../../shared/storage"
+import { Transaction } from "../../../../../shared/transactions"
+import { Token } from "../../../../../shared/token/__new/types/token.model"
+import { IScheduleService } from "../../../../../shared/schedule/interface"
 import {
   emitterMock,
   recoverySharedServiceMock,
-} from "../../../../background/wallet/test.utils"
-import { IBackgroundUIService } from "../../../../background/__new/services/ui/interface"
-import { getMockNetwork } from "../../../../../test/network.mock"
+} from "../../../../wallet/test.utils"
+import { IBackgroundUIService } from "../../ui/interface"
+import { getMockNetwork } from "../../../../../../test/network.mock"
 import {
   getMockBaseToken,
   getMockToken,
   getMockTokenPriceDetails,
-} from "../../../../../test/token.mock"
+} from "../../../../../../test/token.mock"
 import { addressSchema } from "@argent/shared"
 import { stark } from "starknet"
-import { BaseWalletAccount } from "../../../wallet.model"
-import { BaseTokenWithBalance } from "../types/tokenBalance.model"
-import { TokenPriceDetails } from "../types/tokenPrice.model"
-import { defaultNetwork } from "../../../network"
-import { IDebounceService } from "../../../debounce"
-import { getMockDebounceService } from "../../../debounce/mock"
-import { createScheduleServiceMock } from "../../../schedule/mock"
-import { IActivityService } from "../../../../background/__new/services/activity/interface"
-import { IActivityStorage } from "../../../activity/types"
+import { BaseWalletAccount } from "../../../../../shared/wallet.model"
+import { BaseTokenWithBalance } from "../../../../../shared/token/__new/types/tokenBalance.model"
+import { TokenPriceDetails } from "../../../../../shared/token/__new/types/tokenPrice.model"
+import { defaultNetwork } from "../../../../../shared/network"
+import { IDebounceService } from "../../../../../shared/debounce"
+import { getMockDebounceService } from "../../../../../shared/debounce/mock"
+import { createScheduleServiceMock } from "../../../../../shared/schedule/mock"
+import { IActivityService } from "../../activity/interface"
 
 const accountAddress1 = addressSchema.parse(stark.randomAddress())
 const tokenAddress1 = addressSchema.parse(stark.randomAddress())
@@ -44,7 +42,6 @@ describe("TokenWorker", () => {
   let mockWalletStore: KeyValueStorage<WalletStorageProps>
   let mockTransactionsRepo: IRepository<Transaction>
   let mockTokenRepo: IRepository<Token>
-  let mockAccountService: IAccountService
   let mockScheduleService: IScheduleService
   let mockBackgroundUIService: IBackgroundUIService
   let mockDebounceService: IDebounceService
@@ -66,7 +63,9 @@ describe("TokenWorker", () => {
       getTotalCurrencyBalanceForAccounts: vi.fn(),
       updateTokenBalances: vi.fn(),
       updateTokenPrices: vi.fn(),
-    }
+      getFeeTokens: vi.fn(),
+      getBestFeeToken: vi.fn(),
+    } as Mocked<ITokenService>
 
     mockNetworkService = {
       get: vi.fn(),
@@ -79,17 +78,11 @@ describe("TokenWorker", () => {
       subscribe: vi.fn(),
     } as unknown as KeyValueStorage<WalletStorageProps>
 
-    mockAccountService = {
-      get: vi.fn(),
-    } as unknown as IAccountService
-
     mockActivityService = {
-      shouldUpdateBalance: vi.fn().mockResolvedValue({
-        shouldUpdate: true,
-        lastModified: 1234,
-        id: "1234",
-      }),
-      addActivityToStore: vi.fn(),
+      emitter: {
+        on: vi.fn(),
+      },
+      updateSelectedAccountActivities: vi.fn(),
     } as unknown as IActivityService
 
     mockTransactionsRepo = new MockFnRepository()
@@ -111,7 +104,6 @@ describe("TokenWorker", () => {
       mockTransactionsRepo,
       mockTokenRepo,
       mockTokenService,
-      mockAccountService,
       mockNetworkService,
       recoverySharedServiceMock,
       mockBackgroundUIService,
@@ -137,7 +129,7 @@ describe("TokenWorker", () => {
         .mockResolvedValueOnce(mockTokens[0])
         .mockResolvedValueOnce(mockTokens[1])
 
-      await tokenWorker.updateTokens()
+      await tokenWorker.fetchAndUpdateTokensFromBackend()
 
       expect(mockNetworkService.get).toHaveBeenCalled()
       expect(mockTokenService.fetchTokensFromBackend).toHaveBeenCalledTimes(2)
@@ -177,15 +169,12 @@ describe("TokenWorker", () => {
       )
 
       // Act
-      await tokenWorker.updateTokenBalancesForAccount(mockAccount)
+      await tokenWorker.updateTokenBalancesFromOnChain(mockAccount)
 
       // Assert
-      expect(mockTokenService.getTokens).toHaveBeenCalledWith(
-        expect.any(Function),
-      )
       expect(
         mockTokenService.fetchTokenBalancesFromOnChain,
-      ).toHaveBeenCalledWith([mockAccount], mockTokens)
+      ).toHaveBeenCalledWith(mockAccount)
       expect(mockTokenService.updateTokenBalances).toHaveBeenCalledWith(
         mockTokensWithBalance,
       )
@@ -196,7 +185,6 @@ describe("TokenWorker", () => {
         address: accountAddress1,
         networkId: "goerli-alpha",
       }
-      const mockAccounts: BaseWalletAccount[] = [mockSelectedAccount]
       const mockBaseToken = getMockBaseToken({ networkId: "goerli-alpha" })
       const mockTokens: Token[] = [getMockToken({ networkId: "goerli-alpha" })]
       const mockTokensWithBalances: BaseTokenWithBalance[] = [
@@ -207,79 +195,22 @@ describe("TokenWorker", () => {
         },
       ]
       mockWalletStore.get = vi.fn().mockReturnValue(mockSelectedAccount)
-      mockAccountService.get = vi.fn().mockResolvedValue(mockAccounts)
       mockTokenService.getTokens = vi.fn().mockResolvedValue(mockTokens)
       mockTokenService.fetchTokenBalancesFromOnChain = vi
         .fn()
         .mockResolvedValue(mockTokensWithBalances)
 
-      await tokenWorker.updateTokenBalances()
+      await tokenWorker.updateTokenBalancesFromOnChain()
 
       expect(mockWalletStore.get).toHaveBeenCalledWith("selected")
-      expect(mockAccountService.get).toHaveBeenCalledWith(expect.any(Function))
-      expect(mockTokenService.getTokens).toHaveBeenCalledWith(
-        expect.any(Function),
-      )
-      expect(
-        mockTokenService.fetchTokenBalancesFromOnChain,
-      ).toHaveBeenCalledWith(mockAccounts, mockTokens)
-      expect(mockTokenService.updateTokenBalances).toHaveBeenCalledWith(
-        mockTokensWithBalances,
-      )
-      expect(mockActivityService.addActivityToStore).toHaveBeenCalledWith({
-        address: mockSelectedAccount.address,
-        lastModified: 1234,
-        id: "1234",
-      })
     })
   })
 
-  it("should not fetch token balances for all accounts on the current network and not update the token service if activity service returns false", async () => {
-    const mockSelectedAccount: BaseWalletAccount = {
-      address: accountAddress1,
-      networkId: "goerli-alpha",
-    }
-    const mockAccounts: BaseWalletAccount[] = [mockSelectedAccount]
-    const mockBaseToken = getMockBaseToken({ networkId: "1" })
-    const mockTokens: Token[] = [getMockToken({ networkId: "1" })]
-    const mockTokensWithBalances: BaseTokenWithBalance[] = [
-      {
-        ...mockBaseToken,
-        account: mockSelectedAccount,
-        balance: "100",
-      },
-    ]
-    mockActivityService.shouldUpdateBalance = vi
-      .fn()
-      .mockResolvedValue({ shouldUpdate: false })
-    mockWalletStore.get = vi.fn().mockReturnValue(mockSelectedAccount)
-    mockAccountService.get = vi.fn().mockResolvedValue(mockAccounts)
-    mockTokenService.getTokens = vi.fn().mockResolvedValue(mockTokens)
-    mockTokenService.fetchTokenBalancesFromOnChain = vi
-      .fn()
-      .mockResolvedValue(mockTokensWithBalances)
-
-    await tokenWorker.updateTokenBalances()
-
-    expect(mockWalletStore.get).toHaveBeenCalledWith("selected")
-    expect(mockAccountService.get).toHaveBeenCalledWith(expect.any(Function))
-    expect(mockTokenService.getTokens).toHaveBeenCalledWith(
-      expect.any(Function),
-    )
-    expect(
-      mockTokenService.fetchTokenBalancesFromOnChain,
-    ).not.toHaveBeenCalled()
-    expect(mockTokenService.updateTokenBalances).not.toHaveBeenCalledWith(
-      mockTokensWithBalances,
-    )
-  })
-
   it("should not fetch token balances from the backend if the selected network isnt support by backend", async () => {
     const mockSelectedAccount: BaseWalletAccount = {
       address: accountAddress1,
       networkId: "insupportable",
     }
-    const mockAccounts: BaseWalletAccount[] = [mockSelectedAccount]
     const mockBaseToken = getMockBaseToken({ networkId: "1" })
     const mockTokens: Token[] = [getMockToken({ networkId: "1" })]
     const mockTokensWithBalances: BaseTokenWithBalance[] = [
@@ -289,20 +220,16 @@ describe("TokenWorker", () => {
         balance: "100",
       },
     ]
-    mockActivityService.shouldUpdateBalance = vi.fn().mockResolvedValue(false)
+
     mockWalletStore.get = vi.fn().mockReturnValue(mockSelectedAccount)
-    mockAccountService.get = vi.fn().mockResolvedValue(mockAccounts)
     mockTokenService.getTokens = vi.fn().mockResolvedValue(mockTokens)
     mockTokenService.fetchTokenBalancesFromOnChain = vi
       .fn()
       .mockResolvedValue(mockTokensWithBalances)
 
-    await tokenWorker.updateTokenBalances()
+    await tokenWorker.updateTokenBalancesFromOnChain()
 
     expect(mockWalletStore.get).toHaveBeenCalledWith("selected")
-    expect(mockAccountService.get).not.toHaveBeenCalledWith(
-      expect.any(Function),
-    )
   })
 
   describe("updateTokenPrices", () => {
@@ -317,7 +244,7 @@ describe("TokenWorker", () => {
         mockTokenPrices,
       )
 
-      await tokenWorker.updateTokenPrices()
+      await tokenWorker.runFetchAndUpdateTokenPricesFromBackend()
 
       // Assert
       expect(mockTokenService.getTokens).toHaveBeenCalledWith(
diff --git a/packages/extension/src/background/__new/services/token/worker/implementation.ts b/packages/extension/src/background/__new/services/token/worker/implementation.ts
new file mode 100644
index 000000000..1d53f8210
--- /dev/null
+++ b/packages/extension/src/background/__new/services/token/worker/implementation.ts
@@ -0,0 +1,270 @@
+import { RefreshInterval } from "../../../../../shared/config"
+import type { IDebounceService } from "../../../../../shared/debounce"
+import { defaultNetwork } from "../../../../../shared/network"
+import type { INetworkService } from "../../../../../shared/network/service/interface"
+import type { IScheduleService } from "../../../../../shared/schedule/interface"
+import type { KeyValueStorage } from "../../../../../shared/storage"
+import type {
+  AllowArray,
+  IRepository,
+  StorageChange,
+} from "../../../../../shared/storage/__new/interface"
+import type { ITokenService } from "../../../../../shared/token/__new/service/interface"
+import type { Token } from "../../../../../shared/token/__new/types/token.model"
+import type { Transaction } from "../../../../../shared/transactions"
+import { accountsEqual } from "../../../../../shared/utils/accountsEqual"
+import { getSuccessfulTransactions } from "../../../../../shared/utils/transactionSucceeded"
+import { BaseWalletAccount } from "../../../../../shared/wallet.model"
+import type { WalletStorageProps } from "../../../../../shared/wallet/walletStore"
+import { Recovered } from "../../../../wallet/recovery/interface"
+import { WalletRecoverySharedService } from "../../../../wallet/recovery/shared.service"
+import {
+  TokenActivity,
+  type IActivityService,
+  type TokenActivityPayload,
+} from "../../activity/interface"
+import type { IBackgroundUIService } from "../../ui/interface"
+import {
+  every,
+  everyWhenOpen,
+  onInstallAndUpgrade,
+  onStartup,
+} from "../../worker/schedule/decorators"
+import { pipe } from "../../worker/schedule/pipe"
+
+const NETWORKS_WITH_BACKEND_SUPPORT = ["goerli-alpha", "mainnet-alpha"]
+
+/**
+ * This class is responsible for managing token updates, including token balances and prices.
+ */
+export class TokenWorker {
+  constructor(
+    private readonly walletStore: KeyValueStorage<WalletStorageProps>,
+    private readonly transactionsRepo: IRepository<Transaction>,
+    private readonly tokenRepo: IRepository<Token>,
+    private readonly tokenService: ITokenService,
+    private readonly networkService: INetworkService,
+    private readonly recoverySharedService: WalletRecoverySharedService,
+    private readonly backgroundUIService: IBackgroundUIService,
+    private readonly scheduleService: IScheduleService,
+    private readonly debounceService: IDebounceService,
+    private readonly activityService: IActivityService,
+  ) {
+    // Listen for account changes
+    this.walletStore.subscribe(
+      "selected",
+      this.onSelectedAccountChange.bind(this),
+    )
+
+    // Listen for transaction success
+    this.transactionsRepo.subscribe(this.onTransactionRepoChange.bind(this))
+
+    // Listen for token add / remove
+    this.tokenRepo.subscribe(this.onTokenRepoChange.bind(this))
+
+    // Listen for recovery event
+    this.recoverySharedService.emitter.on(
+      Recovered,
+      this.onRecovered.bind(this),
+    )
+
+    // Listen for token activities
+    this.activityService.emitter.on(
+      TokenActivity,
+      this.onTokenActivity.bind(this),
+    )
+  }
+
+  async getSelectedAccount() {
+    const selectedAccount = await this.walletStore.get("selected")
+    return selectedAccount
+  }
+
+  /**
+   * Update tokens
+   * Fetches tokens for all networks and updates the token service
+   */
+  runFetchAndUpdateTokensFromBackend = pipe(
+    onInstallAndUpgrade(this.scheduleService), // This will run the function on update
+    every(
+      this.scheduleService,
+      RefreshInterval.VERY_SLOW,
+      "TokenWorker.updateTokens",
+    ), // This will run the function every 24 hours
+  )(async (): Promise<void> => {
+    await this.fetchAndUpdateTokensFromBackend()
+  })
+
+  /**
+   * Update token balances for custom networks
+   */
+  runUpdateTokenBalancesForCustomNetworks = pipe(
+    everyWhenOpen(
+      this.backgroundUIService,
+      this.scheduleService,
+      this.debounceService,
+      RefreshInterval.MEDIUM,
+      "TokenWorker.updateCustomNetworksTokenBalances",
+    ), // This will run the function every 60 seconds when the UI is open
+  )(async () => {
+    await this.updateTokenBalancesForCustomNetworks()
+  })
+
+  /**
+   * Update token prices
+   * Fetches token prices for the default network and updates the token service
+   */
+  runFetchAndUpdateTokenPricesFromBackend = pipe(
+    everyWhenOpen(
+      this.backgroundUIService,
+      this.scheduleService,
+      this.debounceService,
+      RefreshInterval.MEDIUM,
+      "TokenWorker.fetchAndUpdateTokenPricesFromBackend",
+    ), // This will run the function every minute when the UI is open
+  )(async (): Promise<void> => {
+    await this.fetchAndUpdateTokenPricesFromBackend()
+  })
+
+  async onSelectedAccountChange(account?: BaseWalletAccount | null) {
+    if (!account) {
+      return
+    }
+    void this.maybeUpdateTokensFromBackendForAccount(account)
+    void this.updateTokenBalancesFromOnChain(account)
+  }
+
+  async onTransactionRepoChange(changeSet: StorageChange<Transaction[]>) {
+    if (!changeSet?.newValue) {
+      return
+    }
+    const selectedAccount = await this.getSelectedAccount()
+    if (!selectedAccount) {
+      return
+    }
+    const successfulTransactions = getSuccessfulTransactions(
+      changeSet.newValue,
+      changeSet?.oldValue,
+    )
+    if (!successfulTransactions) {
+      return
+    }
+    const successfulTransactionAccounts: BaseWalletAccount[] = []
+    successfulTransactions.forEach((successfulTransaction) => {
+      if (
+        !successfulTransactionAccounts.some((account) =>
+          accountsEqual(account, successfulTransaction.account),
+        )
+      ) {
+        successfulTransactionAccounts.push(successfulTransaction.account)
+      }
+    })
+    void this.updateTokenBalancesFromOnChain(successfulTransactionAccounts)
+  }
+
+  async onTokenRepoChange(_changeSet: StorageChange<Token[]>) {
+    const selectedAccount = await this.getSelectedAccount()
+    if (!selectedAccount) {
+      return
+    }
+    await this.fetchAndUpdateTokenBalancesFromOnChain(selectedAccount)
+    void this.fetchAndUpdateTokenPricesFromBackend()
+  }
+
+  async fetchAndUpdateTokensFromBackend() {
+    const networks = await this.networkService.get()
+    // Fetch tokens for all networks in parallel
+    const tokensFromAllNetworks = await Promise.allSettled(
+      networks.map((network) =>
+        this.tokenService.fetchTokensFromBackend(network.id),
+      ),
+    )
+    const tokens = tokensFromAllNetworks
+      .map((result) => result.status === "fulfilled" && result.value)
+      .filter((t): t is Token[] => Boolean(t))
+      .flat()
+
+    await this.tokenService.updateTokens(tokens)
+  }
+
+  async updateTokenBalancesFromOnChain(
+    accounts?: AllowArray<BaseWalletAccount>,
+  ) {
+    if (!accounts) {
+      const selectedAccount = await this.getSelectedAccount()
+      if (!selectedAccount) {
+        return
+      }
+      accounts = selectedAccount
+    }
+
+    const tokensWithBalance =
+      await this.tokenService.fetchTokenBalancesFromOnChain(accounts)
+
+    return await this.tokenService.updateTokenBalances(tokensWithBalance)
+  }
+
+  async maybeUpdateTokensFromBackendForAccount(account: BaseWalletAccount) {
+    const tokens = await this.tokenService.getTokens(
+      (t) => t.networkId === account.networkId && t.pricingId !== undefined,
+    )
+
+    if (!tokens.length) {
+      await this.fetchAndUpdateTokensFromBackend()
+    }
+  }
+
+  async fetchAndUpdateTokenBalancesFromOnChain(
+    accounts: AllowArray<BaseWalletAccount>,
+    tokens?: AllowArray<Token>,
+  ) {
+    const tokensWithBalances =
+      await this.tokenService.fetchTokenBalancesFromOnChain(accounts, tokens)
+    await this.tokenService.updateTokenBalances(tokensWithBalances)
+  }
+
+  async updateTokenBalancesForCustomNetworks() {
+    const selectedAccount = await this.getSelectedAccount()
+    if (!selectedAccount) {
+      return
+    }
+    if (NETWORKS_WITH_BACKEND_SUPPORT.includes(selectedAccount.networkId)) {
+      return
+    }
+    await this.fetchAndUpdateTokenBalancesFromOnChain(selectedAccount)
+  }
+
+  async fetchAndUpdateTokenPricesFromBackend() {
+    // Token prices are only available for the default network
+    const defaultNetworkId = defaultNetwork.id
+    const tokens = await this.tokenService.getTokens(
+      (t) => t.networkId === defaultNetworkId,
+    )
+    const tokenPrices = await this.tokenService.fetchTokenPricesFromBackend(
+      tokens,
+      defaultNetworkId,
+    )
+    await this.tokenService.updateTokenPrices(tokenPrices)
+  }
+
+  /**
+   * Handle Recovery
+   * Updates everything on recovery
+   * @param recoveredAccounts -BaseWalletAccount[]
+   */
+  async onRecovered(recoveredAccounts: BaseWalletAccount[]) {
+    if (recoveredAccounts.length > 0) {
+      await this.fetchAndUpdateTokensFromBackend()
+      await this.fetchAndUpdateTokenPricesFromBackend()
+      await this.fetchAndUpdateTokenBalancesFromOnChain(recoveredAccounts)
+    }
+  }
+
+  /**
+   * Handle Token Activity
+   * Updates balance for accounts and tokens with activity
+   */
+  async onTokenActivity({ accounts, tokens }: TokenActivityPayload) {
+    await this.fetchAndUpdateTokenBalancesFromOnChain(accounts, tokens)
+  }
+}
diff --git a/packages/extension/src/background/__new/services/token/worker/index.ts b/packages/extension/src/background/__new/services/token/worker/index.ts
new file mode 100644
index 000000000..7c065d3d2
--- /dev/null
+++ b/packages/extension/src/background/__new/services/token/worker/index.ts
@@ -0,0 +1,25 @@
+import { activityService } from "../../activity"
+import { backgroundUIService } from "../../ui"
+import { transactionsRepo } from "../../../../../shared/transactions/store"
+import { recoverySharedService } from "../../../../walletSingleton"
+import { debounceService } from "../../../../../shared/debounce"
+import { networkService } from "../../../../../shared/network/service"
+import { chromeScheduleService } from "../../../../../shared/schedule"
+import { old_walletStore } from "../../../../../shared/wallet/walletStore"
+import { tokenRepo } from "../../../../../shared/token/__new/repository/token"
+
+import { tokenService } from "../../../../../shared/token/__new/service"
+import { TokenWorker } from "./implementation"
+
+export const tokenWorker = new TokenWorker(
+  old_walletStore, // TODO: remove old_walletStore. Make walletStore work properly
+  transactionsRepo,
+  tokenRepo,
+  tokenService,
+  networkService,
+  recoverySharedService,
+  backgroundUIService,
+  chromeScheduleService,
+  debounceService,
+  activityService,
+)
diff --git a/packages/extension/src/background/__new/services/transactionReview/background.ts b/packages/extension/src/background/__new/services/transactionReview/background.ts
index 75845157e..4f45459e8 100644
--- a/packages/extension/src/background/__new/services/transactionReview/background.ts
+++ b/packages/extension/src/background/__new/services/transactionReview/background.ts
@@ -21,17 +21,18 @@ import type { StarknetTransactionTypes } from "../../../../shared/transactions"
 import { Wallet } from "../../../wallet"
 import {
   SimulateAndReview,
+  isTransactionSimulationError,
   simulateAndReviewSchema,
 } from "../../../../shared/transactionReview/schema"
 import { ReviewError } from "../../../../shared/errors/review"
-import { addEstimatedFees } from "../../../../shared/transactionSimulation/fees/estimatedFeesRepository"
-import { argentMaxFee } from "../../../../shared/utils/argentMaxFee"
+import { addEstimatedFee } from "../../../../shared/transactionSimulation/fees/estimatedFeesRepository"
 import { AccountError } from "../../../../shared/errors/account"
-import { transactionCallsAdapter } from "../../../transactions/transactionAdapter"
 import { EstimatedFees } from "../../../../shared/transactionSimulation/fees/fees.model"
 import { KeyValueStorage } from "../../../../shared/storage"
 import { ITransactionReviewWorker } from "./worker/interface"
 import { ARGENT_TRANSACTION_REVIEW_API_BASE_URL } from "../../../../shared/api/constants"
+import { ETH_TOKEN_ADDRESS } from "../../../../shared/network/constants"
+import { getEstimatedFeeFromSimulationAndRespectWatermarkFee } from "../../../../shared/transactionSimulation/utils"
 
 interface ApiTransactionReviewV2RequestBody {
   transactions: Array<{
@@ -72,15 +73,18 @@ export default class BackgroundTransactionReviewService
   }) {
     try {
       const selectedAccount = await this.wallet.getSelectedAccount()
-      const oldAccountTransactions = transactionCallsAdapter(calls)
 
       if (!selectedAccount) {
         throw new AccountError({ code: "NOT_FOUND" })
       }
-      let txFee = "0",
-        maxTxFee = "0",
-        accountDeploymentFee: string | undefined,
-        maxADFee: string | undefined
+
+      const fees: EstimatedFees = {
+        transactions: {
+          feeTokenAddress: ETH_TOKEN_ADDRESS,
+          amount: 0n,
+          pricePerUnit: 0n,
+        },
+      }
 
       if (!isDeployed) {
         if ("estimateFeeBulk" in starknetAccount) {
@@ -96,48 +100,59 @@ export default class BackgroundTransactionReviewService
               payload: calls,
             },
           ]
-          const estimateFeeBulk = await starknetAccount.estimateFeeBulk(
-            bulkTransactions,
-            { skipValidate: true },
-          )
+          const [deployEstimate, txEstimate] =
+            await starknetAccount.estimateFeeBulk(bulkTransactions, {
+              skipValidate: true,
+            })
 
-          accountDeploymentFee = num.toHex(estimateFeeBulk[0].overall_fee)
-          txFee = num.toHex(estimateFeeBulk[1].overall_fee)
+          if (
+            !deployEstimate.gas_consumed ||
+            !deployEstimate.gas_price ||
+            !txEstimate.gas_consumed ||
+            !txEstimate.gas_price
+          ) {
+            throw new ReviewError({
+              code: "ONCHAIN_FEE_ESTIMATION_FAILED",
+              message: "Missing gas_consumed or gas_price",
+            })
+          }
 
-          maxADFee = argentMaxFee({
-            suggestedMaxFee: estimateFeeBulk[0].suggestedMaxFee,
-          })
-          maxTxFee = argentMaxFee({
-            suggestedMaxFee: estimateFeeBulk[1].suggestedMaxFee,
-          })
+          fees.deployment = {
+            feeTokenAddress: ETH_TOKEN_ADDRESS,
+            amount: deployEstimate.gas_consumed,
+            pricePerUnit: deployEstimate.gas_price,
+          }
+          fees.transactions = {
+            feeTokenAddress: ETH_TOKEN_ADDRESS,
+            amount: txEstimate.gas_consumed,
+            pricePerUnit: txEstimate.gas_price,
+          }
         }
       } else {
-        const { overall_fee, suggestedMaxFee } =
-          await starknetAccount.estimateFee(calls, {
+        const { gas_consumed, gas_price } = await starknetAccount.estimateFee(
+          calls,
+          {
             skipValidate: true,
+          },
+        )
+
+        if (!gas_consumed || !gas_price) {
+          throw new ReviewError({
+            code: "ONCHAIN_FEE_ESTIMATION_FAILED",
+            message: "Missing gas_consumed or gas_price",
           })
+        }
 
-        txFee = num.toHex(overall_fee)
-        maxTxFee = num.toHex(suggestedMaxFee) // Here, maxFee = estimatedFee * 1.5x
+        fees.transactions = {
+          feeTokenAddress: ETH_TOKEN_ADDRESS,
+          amount: gas_consumed,
+          pricePerUnit: gas_price,
+        }
       }
 
-      const suggestedMaxFee = argentMaxFee({ suggestedMaxFee: maxTxFee })
+      await addEstimatedFee(fees, calls)
 
-      await addEstimatedFees(
-        {
-          amount: txFee,
-          suggestedMaxFee,
-          accountDeploymentFee,
-          maxADFee,
-        },
-        calls,
-      )
-      return {
-        amount: txFee,
-        suggestedMaxFee,
-        accountDeploymentFee,
-        maxADFee,
-      }
+      return fees
     } catch (error) {
       throw new ReviewError({
         code: "ONCHAIN_FEE_ESTIMATION_FAILED",
@@ -197,39 +212,16 @@ export default class BackgroundTransactionReviewService
     simulateAndReviewResult: SimulateAndReview,
     isDeploymentTransaction: boolean,
   ): Promise<EstimatedFees> {
-    const { transactions } = simulateAndReviewResult
-
-    let invokeTransaction, accountDeploymentFee, maxADFee
-
-    if (isDeploymentTransaction) {
-      invokeTransaction = transactions[1]
-      accountDeploymentFee =
-        transactions[0].simulation?.feeEstimation.maxFee.toString()
-      maxADFee = accountDeploymentFee || "0"
-    } else {
-      invokeTransaction = transactions[0]
-    }
-
-    const amount =
-      invokeTransaction.simulation?.feeEstimation.overallFee.toString() ?? "0"
-    const suggestedMaxFee =
-      invokeTransaction.simulation?.feeEstimation.maxFee ?? "0"
+    const fee = getEstimatedFeeFromSimulationAndRespectWatermarkFee(
+      simulateAndReviewResult,
+    )
 
-    await addEstimatedFees(
-      {
-        amount,
-        suggestedMaxFee,
-        accountDeploymentFee,
-        maxADFee,
-      },
+    await addEstimatedFee(
+      fee,
       initialTransactions[isDeploymentTransaction ? 1 : 0].calls ?? [],
     )
-    return {
-      amount,
-      suggestedMaxFee,
-      accountDeploymentFee,
-      maxADFee,
-    }
+
+    return fee
   }
 
   async simulateAndReview({
@@ -283,6 +275,17 @@ export default class BackgroundTransactionReviewService
         },
         simulateAndReviewSchema,
       )
+
+      // if there is a simulation error then there is also no actual simulation
+      // or fee information, and no way to proceed with fee estimation
+      // returning the result will surface the error to the user in the ui
+      const hasSimulationError = result.transactions.some((transaction) =>
+        isTransactionSimulationError(transaction),
+      )
+      if (hasSimulationError) {
+        return result
+      }
+
       const enrichedFeeEstimation = await this.getEnrichedFeeEstimation(
         transactions,
         result,
@@ -293,7 +296,7 @@ export default class BackgroundTransactionReviewService
         enrichedFeeEstimation,
       }
     } catch (e) {
-      console.log(e)
+      console.error(e)
       try {
         const invokeCalls = isDeploymentTransaction
           ? this.getCallsFromTx(transactions[1])
diff --git a/packages/extension/src/background/__new/services/transactionReview/index.ts b/packages/extension/src/background/__new/services/transactionReview/index.ts
index 4c14d7bb6..9ba32c206 100644
--- a/packages/extension/src/background/__new/services/transactionReview/index.ts
+++ b/packages/extension/src/background/__new/services/transactionReview/index.ts
@@ -1,6 +1,6 @@
 import BackgroundTransactionReviewService from "./background"
 import { walletSingleton } from "../../../walletSingleton"
-import { httpService } from "../http/singleton"
+import { httpService } from "../../../../shared/http/singleton"
 import { transactionReviewLabelsStore } from "../../../../shared/transactionReview/store"
 import { transactionReviewWorker } from "./worker"
 
diff --git a/packages/extension/src/background/__new/services/transactionReview/worker/index.ts b/packages/extension/src/background/__new/services/transactionReview/worker/index.ts
index 229e80167..b2feacbbf 100644
--- a/packages/extension/src/background/__new/services/transactionReview/worker/index.ts
+++ b/packages/extension/src/background/__new/services/transactionReview/worker/index.ts
@@ -1,5 +1,5 @@
 import { transactionReviewLabelsStore } from "../../../../../shared/transactionReview/store"
-import { httpService } from "../../http/singleton"
+import { httpService } from "../../../../../shared/http/singleton"
 import { backgroundUIService } from "../../ui"
 import { TransactionReviewWorker } from "./implementation"
 
diff --git a/packages/extension/src/background/__new/services/transactions/worker/implementation.ts b/packages/extension/src/background/__new/services/transactions/worker/implementation.ts
new file mode 100644
index 000000000..d4eb97c61
--- /dev/null
+++ b/packages/extension/src/background/__new/services/transactions/worker/implementation.ts
@@ -0,0 +1,67 @@
+import { differenceWith } from "lodash-es"
+
+import type { ArrayStorage } from "../../../../../shared/storage"
+import type { Transaction } from "../../../../../shared/transactions"
+import {
+  runAddedOrUpdatedHandlers,
+  runChangedStatusHandlers,
+} from "../../../../transactions/onupdate"
+import { equalTransactionWithStatus } from "../../../../../shared/transactions/store"
+import { getTransactionStatus } from "../../../../../shared/transactions/utils"
+
+export class TransactionsWorker {
+  constructor(private readonly transactionsStore: ArrayStorage<Transaction>) {
+    this.transactionsStore.subscribe((_, changeSet) => {
+      /** note this includes where all transactions are initially loaded in the store */
+      const addedOrUpdatedTransactions = differenceWith(
+        changeSet.newValue ?? [],
+        changeSet.oldValue ?? [],
+        equalTransactionWithStatus,
+      )
+
+      /** transactions which already existed in the store, and have now changed status */
+      const changedStatusTransactions = changeSet.newValue?.flatMap(
+        (newTransaction) => {
+          const {
+            finality_status: newFinalityStatus,
+            execution_status: newExecutionStatus,
+          } = getTransactionStatus(newTransaction)
+          const oldTransaction = changeSet.oldValue
+            ?.map((oldTx) => {
+              const {
+                finality_status: oldFinalityStatus,
+                execution_status: oldExecutionStatus,
+              } = getTransactionStatus(oldTx)
+
+              return {
+                ...oldTx,
+                status: {
+                  finality_status: oldFinalityStatus,
+                  execution_status: oldExecutionStatus,
+                },
+              }
+            })
+            .find(
+              (oldTransaction) => oldTransaction.hash === newTransaction.hash,
+            )
+          if (
+            oldTransaction &&
+            (oldTransaction.status.finality_status !== newFinalityStatus ||
+              oldTransaction.status.execution_status !== newExecutionStatus)
+          ) {
+            return newTransaction
+          }
+          return []
+        },
+      )
+
+      if (addedOrUpdatedTransactions.length > 0) {
+        runAddedOrUpdatedHandlers(addedOrUpdatedTransactions)
+      }
+
+      if (changedStatusTransactions && changedStatusTransactions.length > 0) {
+        runChangedStatusHandlers(changedStatusTransactions)
+      }
+    })
+  }
+}
diff --git a/packages/extension/src/background/__new/services/transactions/worker/index.ts b/packages/extension/src/background/__new/services/transactions/worker/index.ts
new file mode 100644
index 000000000..aa164c3bf
--- /dev/null
+++ b/packages/extension/src/background/__new/services/transactions/worker/index.ts
@@ -0,0 +1,4 @@
+import { transactionsStore } from "../../../../../shared/transactions/store"
+import { TransactionsWorker } from "./implementation"
+
+export const transactionsWorker = new TransactionsWorker(transactionsStore)
diff --git a/packages/extension/src/background/__new/trpc.ts b/packages/extension/src/background/__new/trpc.ts
index 20390e295..339fd092b 100644
--- a/packages/extension/src/background/__new/trpc.ts
+++ b/packages/extension/src/background/__new/trpc.ts
@@ -1,6 +1,6 @@
 import { initTRPC } from "@trpc/server"
 
-import type { IArgentAccountServiceBackground } from "../../shared/argentAccount/service/interface"
+import type { IArgentAccountServiceBackground } from "../../shared/argentAccount/interface"
 import { BaseError } from "../../shared/errors/baseError"
 import { BaseError as SharedBaseError } from "@argent/shared"
 import type { IMultisigService } from "../../shared/multisig/service/messaging/interface"
@@ -11,6 +11,8 @@ import type { ITransactionReviewService } from "../../shared/transactionReview/i
 import type { IRecoveryService } from "../../shared/recovery/service/interface"
 import type { IStarknetAddressService } from "@argent/shared"
 import type { INetworkService } from "../../shared/network/service/interface"
+import { ISharedSwapService } from "../../shared/swap/service/interface"
+import superjson from "superjson"
 
 interface Context {
   sender?: chrome.runtime.MessageSender
@@ -23,12 +25,14 @@ interface Context {
     transactionReviewService: ITransactionReviewService
     recoveryService: IRecoveryService
     starknetAddressService: IStarknetAddressService
+    swapService: ISharedSwapService
     networkService: INetworkService
   }
 }
 
 const t = initTRPC.context<Context>().create({
   isServer: false,
+  transformer: superjson,
   allowOutsideOfServer: true,
   errorFormatter: (opts) => {
     const { shape, error } = opts
diff --git a/packages/extension/src/background/accountDeployAction.ts b/packages/extension/src/background/accountDeployAction.ts
index 89f5bfc0a..09a8a243f 100644
--- a/packages/extension/src/background/accountDeployAction.ts
+++ b/packages/extension/src/background/accountDeployAction.ts
@@ -1,6 +1,6 @@
 import { ExtensionActionItemOfType } from "../shared/actionQueue/types"
-import { addTransaction } from "./transactions/store"
-import { checkTransactionHash } from "./transactions/transactionExecution"
+import { addTransaction } from "../shared/transactions/store"
+import { checkTransactionHash } from "../shared/transactions/utils"
 import { Wallet } from "./wallet"
 
 export const accountDeployAction = async (
diff --git a/packages/extension/src/background/actionHandlers.ts b/packages/extension/src/background/actionHandlers.ts
index 51d9ea804..56310c346 100644
--- a/packages/extension/src/background/actionHandlers.ts
+++ b/packages/extension/src/background/actionHandlers.ts
@@ -4,9 +4,8 @@ import { accountService } from "../shared/account/service"
 import { ExtensionActionItem } from "../shared/actionQueue/types"
 import { MessageType } from "../shared/messages"
 import { networkService } from "../shared/network/service"
-import { preAuthorize } from "../shared/preAuthorizations"
 import { isEqualWalletAddress } from "../shared/wallet.service"
-import { assertNever } from "../ui/services/assertNever"
+import { assertNever } from "../shared/utils/assertNever"
 import { accountDeployAction } from "./accountDeployAction"
 import { analytics } from "./analytics"
 import { addMultisigDeployAction } from "./multisig/multisigDeployAction"
@@ -17,6 +16,7 @@ import {
 } from "./transactions/transactionExecution"
 import { udcDeclareContract, udcDeployContract } from "./udcAction"
 import { Wallet } from "./wallet"
+import { preAuthorizationService } from "../shared/preAuthorization/service"
 import { networkSchema } from "../shared/network"
 import { encodeChainId } from "../shared/utils/encodeChainId"
 
@@ -33,10 +33,10 @@ const handleTransactionAction = async ({
   const actionHash = action.meta.hash
 
   try {
-    void analytics.track("signedTransaction", {
-      networkId,
-      host,
-    })
+    // void analytics.track("signedTransaction", {
+    //   networkId,
+    //   host,
+    // }) // TODO: temporary disabled
 
     const response = await executeTransactionAction(action, wallet)
 
@@ -85,7 +85,10 @@ export const handleActionApproval = async (
         networkId,
       })
 
-      await preAuthorize(selectedAccount, host)
+      await preAuthorizationService.add({
+        account: selectedAccount,
+        host,
+      })
 
       return { type: "CONNECT_DAPP_RES", data: selectedAccount }
     }
@@ -96,9 +99,9 @@ export const handleActionApproval = async (
 
     case "DEPLOY_ACCOUNT": {
       try {
-        void analytics.track("signedTransaction", {
-          networkId,
-        })
+        // void analytics.track("signedTransaction", {
+        //   networkId,
+        // }) // TODO: temporary disabled
 
         const txHash = await accountDeployAction(action, wallet)
 
@@ -143,11 +146,11 @@ export const handleActionApproval = async (
 
     case "DEPLOY_MULTISIG": {
       try {
-        void analytics.track("signedTransaction", {
-          networkId,
-        })
+        // void analytics.track("signedTransaction", {
+        //   networkId,
+        // }) // TODO: temporary disabled
 
-        const txHash = await addMultisigDeployAction(action, wallet)
+        await addMultisigDeployAction(action, wallet)
 
         void analytics.track("deployMultisig", {
           status: "success",
@@ -182,10 +185,7 @@ export const handleActionApproval = async (
     }
 
     case "SIGN": {
-      const {
-        typedData,
-        options: { skipDeploy = false },
-      } = action.payload
+      const { typedData } = action.payload
       if (!(await wallet.isSessionOpen())) {
         throw new Error("you need an open session")
       }
diff --git a/packages/extension/src/background/messageHandling/handle.ts b/packages/extension/src/background/messageHandling/handle.ts
index 5ca253219..fc535ca29 100644
--- a/packages/extension/src/background/messageHandling/handle.ts
+++ b/packages/extension/src/background/messageHandling/handle.ts
@@ -1,9 +1,6 @@
 import { MessageType } from "../../shared/messages"
-import {
-  migratePreAuthorizations,
-  isPreAuthorized,
-} from "../../shared/preAuthorizations"
-import { migrateWallet } from "../../shared/wallet/storeMigration"
+import { preAuthorizationService } from "../../shared/preAuthorization/service"
+import { migrateWallet } from "../migrations/wallet/storeMigration"
 import { backgroundActionService } from "../__new/services/action"
 import { handleAccountMessage } from "../accountMessaging"
 import { handleActionMessage } from "../actionMessaging"
@@ -44,7 +41,7 @@ export const handleMessage = async (
   [msg, sender]: [MessageType, browser.runtime.MessageSender],
   port?: browser.runtime.Port,
 ) => {
-  await Promise.all([migrateWallet(), migratePreAuthorizations()]) // do migrations before handling messages
+  await Promise.all([migrateWallet()]) // do migrations before handling messages
 
   const messagingKeys = await getMessagingKeys()
 
@@ -62,7 +59,11 @@ export const handleMessage = async (
 
   const currentAccount = await walletSingleton.getSelectedAccount()
   const senderIsPreauthorized =
-    !!currentAccount && (await isPreAuthorized(currentAccount, origin))
+    !!currentAccount &&
+    (await preAuthorizationService.isPreAuthorized({
+      account: currentAccount,
+      host: origin,
+    }))
 
   if (
     !isSafeOrigin && // allow all messages from the extension itself
diff --git a/packages/extension/src/background/migrations/activity/latestBalanceChangingActivityMigration.ts b/packages/extension/src/background/migrations/activity/latestBalanceChangingActivityMigration.ts
new file mode 100644
index 000000000..a1e031079
--- /dev/null
+++ b/packages/extension/src/background/migrations/activity/latestBalanceChangingActivityMigration.ts
@@ -0,0 +1,9 @@
+import browser from "webextension-polyfill"
+
+/** migrate the original activity storage which was coupled only to balance change activity */
+
+export async function runLatestBalanceChangingActivityMigration() {
+  await browser.storage.local.remove(
+    "service:activity:latestBalanceChangingActivity",
+  )
+}
diff --git a/packages/extension/src/background/migrations/index.ts b/packages/extension/src/background/migrations/index.ts
index 80815da87..60474a231 100644
--- a/packages/extension/src/background/migrations/index.ts
+++ b/packages/extension/src/background/migrations/index.ts
@@ -1,10 +1,16 @@
-import { walletSessionServiceEmitter } from "../walletSingleton"
-import { Locked } from "../wallet/session/interface"
+import browser from "webextension-polyfill"
+
 import { restoreDefaultNetworks } from "./network/restoreDefaultNetworksMigration"
 import { KeyValueStorage } from "../../shared/storage"
 import { runRemoveTestnet2Accounts, runV581Migration } from "./wallet"
 import { runV59TokenMigration } from "./token/v5.9"
-import { runV510TokenMigration } from "./token/v5.10"
+import { runDefaultTokenMigration } from "./token/v5.10"
+import { runPreAuthorizationMigrationOld } from "./preAuthorizations/old"
+import { runLatestBalanceChangingActivityMigration } from "./activity/latestBalanceChangingActivityMigration"
+import {
+  migrateTxStatus,
+  needsTxStatusMigration,
+} from "./transactions/migrateStatus"
 
 enum WalletMigrations {
   v581 = "wallet:v581",
@@ -17,7 +23,15 @@ enum NetworkMigrations {
 
 enum TokenMigrations {
   v59 = "token:v59",
-  v510 = "token:v510",
+  v510 = "token:v510:r2",
+}
+
+enum PreAuthorizationMigrations {
+  old = "preAuthorization:old",
+}
+
+enum ActivityMigrations {
+  latestBalanceChangingActivity = "activityMigrations:latestBalanceChangingActivity",
 }
 
 const migrationsStore = new KeyValueStorage(
@@ -27,46 +41,80 @@ const migrationsStore = new KeyValueStorage(
     [NetworkMigrations.rpcEverywhere]: false,
     [TokenMigrations.v59]: false,
     [TokenMigrations.v510]: false,
+    [PreAuthorizationMigrations.old]: false,
+    [ActivityMigrations.latestBalanceChangingActivity]: false,
   },
   "core:migrations",
 )
 
-export const migrationListener = walletSessionServiceEmitter.on(
-  Locked,
-  async (locked) => {
-    if (!locked) {
-      // TODO: come up with a better, generic mechanism for this
-      const v581Migration = await migrationsStore.get(WalletMigrations.v581)
-      const rpcEverywhereMigration = await migrationsStore.get(
-        NetworkMigrations.rpcEverywhere,
-      )
-      const removeTestnet2Accounts = await migrationsStore.get(
-        WalletMigrations.removeTestnet2Accounts,
-      )
-      const v59Migration = await migrationsStore.get(TokenMigrations.v59)
-      const v510Migration = await migrationsStore.get(TokenMigrations.v510)
-      if (!v581Migration) {
-        await runV581Migration()
-        await migrationsStore.set(WalletMigrations.v581, true)
-      }
-      if (!removeTestnet2Accounts) {
-        await runRemoveTestnet2Accounts()
-        await migrationsStore.set(WalletMigrations.removeTestnet2Accounts, true)
-      }
-      if (!rpcEverywhereMigration) {
-        await restoreDefaultNetworks()
-        await migrationsStore.set(NetworkMigrations.rpcEverywhere, true)
-      }
-
-      if (!v59Migration) {
-        await runV59TokenMigration()
-        await migrationsStore.set(TokenMigrations.v59, true)
-      }
-
-      if (!v510Migration) {
-        await runV510TokenMigration()
-        await migrationsStore.set(TokenMigrations.v510, true)
-      }
+async function runInstallMigrations() {
+  const preAuthorizationMigrationOld = await migrationsStore.get(
+    PreAuthorizationMigrations.old,
+  )
+  const activityMigrationLatestBalanceChangingActivity =
+    await migrationsStore.get(ActivityMigrations.latestBalanceChangingActivity)
+
+  if (!preAuthorizationMigrationOld) {
+    await runPreAuthorizationMigrationOld()
+    await migrationsStore.set(PreAuthorizationMigrations.old, true)
+  }
+
+  if (!activityMigrationLatestBalanceChangingActivity) {
+    await runLatestBalanceChangingActivityMigration()
+    await migrationsStore.set(
+      ActivityMigrations.latestBalanceChangingActivity,
+      true,
+    )
+  }
+}
+
+async function runUpdateMigrations() {
+  // TODO: come up with a better, generic mechanism for this
+  const v581Migration = await migrationsStore.get(WalletMigrations.v581)
+  const rpcEverywhereMigration = await migrationsStore.get(
+    NetworkMigrations.rpcEverywhere,
+  )
+  const removeTestnet2Accounts = await migrationsStore.get(
+    WalletMigrations.removeTestnet2Accounts,
+  )
+  const v59Migration = await migrationsStore.get(TokenMigrations.v59)
+  const v510Migration = await migrationsStore.get(TokenMigrations.v510)
+
+  if (!v581Migration) {
+    await runV581Migration()
+    await migrationsStore.set(WalletMigrations.v581, true)
+  }
+  if (!removeTestnet2Accounts) {
+    await runRemoveTestnet2Accounts()
+    await migrationsStore.set(WalletMigrations.removeTestnet2Accounts, true)
+  }
+  if (!rpcEverywhereMigration) {
+    await restoreDefaultNetworks()
+    await migrationsStore.set(NetworkMigrations.rpcEverywhere, true)
+  }
+
+  if (!v59Migration) {
+    await runV59TokenMigration()
+    await migrationsStore.set(TokenMigrations.v59, true)
+  }
+
+  if (!v510Migration) {
+    await runDefaultTokenMigration()
+    await migrationsStore.set(TokenMigrations.v510, true)
+  }
+
+  if (await needsTxStatusMigration()) {
+    await migrateTxStatus()
+  }
+}
+
+export const installMigrationListener = browser.runtime.onInstalled.addListener(
+  async (details) => {
+    if (details.reason === chrome.runtime.OnInstalledReason.INSTALL) {
+      await runInstallMigrations()
+    }
+    if (details.reason === chrome.runtime.OnInstalledReason.UPDATE) {
+      await runUpdateMigrations()
     }
   },
 )
diff --git a/packages/extension/src/background/migrations/preAuthorizations/old.ts b/packages/extension/src/background/migrations/preAuthorizations/old.ts
new file mode 100644
index 000000000..2cf1611ae
--- /dev/null
+++ b/packages/extension/src/background/migrations/preAuthorizations/old.ts
@@ -0,0 +1,38 @@
+import { isArray, pick } from "lodash-es"
+import browser from "webextension-polyfill"
+
+import { withHiddenSelector } from "../../../shared/account/selectors"
+import { accountService } from "../../../shared/account/service"
+import { preAuthorizationStore } from "../../../shared/preAuthorization/store"
+import type { PreAuthorization } from "../../../shared/preAuthorization/schema"
+
+async function getFromStorage<T, K extends string = string>(
+  key: K,
+): Promise<T | null> {
+  try {
+    return JSON.parse((await browser.storage.local.get(key))[key]) ?? null
+  } catch {
+    return null
+  }
+}
+
+export async function runPreAuthorizationMigrationOld() {
+  try {
+    const old = await getFromStorage<string[]>("PREAUTHORIZATION:APPROVED")
+    if (isArray(old) && old.length > 0) {
+      await browser.storage.local.remove("PREAUTHORIZATION:APPROVED")
+      const allAccounts = await accountService.get(withHiddenSelector)
+
+      const accountHostCombinations: PreAuthorization[] = old.flatMap((h) =>
+        allAccounts.map((a) => ({
+          account: pick(a, "address", "networkId"),
+          host: h,
+        })),
+      )
+
+      return preAuthorizationStore.push(accountHostCombinations)
+    }
+  } catch {
+    console.error("Failed to migrate preauthorizations")
+  }
+}
diff --git a/packages/extension/src/background/migrations/token/v5.10.ts b/packages/extension/src/background/migrations/token/v5.10.ts
index 155b48cb8..27ae948c0 100644
--- a/packages/extension/src/background/migrations/token/v5.10.ts
+++ b/packages/extension/src/background/migrations/token/v5.10.ts
@@ -1,7 +1,7 @@
 import { tokenService } from "../../../shared/token/__new/service"
 import { parsedDefaultTokens } from "../../../shared/token/__new/utils"
 
-export async function runV510TokenMigration() {
+export async function runDefaultTokenMigration() {
   // This will add the updated default tokens (with id) to the token service
   await tokenService.addToken(parsedDefaultTokens)
 }
diff --git a/packages/extension/src/background/migrations/transactions/migrateStatus.ts b/packages/extension/src/background/migrations/transactions/migrateStatus.ts
new file mode 100644
index 000000000..aa1574888
--- /dev/null
+++ b/packages/extension/src/background/migrations/transactions/migrateStatus.ts
@@ -0,0 +1,43 @@
+import { transactionsRepo } from "../../../shared/transactions/store"
+
+export const needsTxStatusMigration = async () => {
+  const oldTransactions = await transactionsRepo.get()
+
+  return oldTransactions.some(
+    (transaction) =>
+      // if old status is present
+      "finalityStatus" in transaction ||
+      "executionStatus" in transaction ||
+      // OR if no status at all
+      !transaction.status ||
+      !("finality_status" in transaction.status),
+  )
+}
+
+export const migrateTxStatus = async () => {
+  const oldTransactions = await transactionsRepo.get()
+
+  const updatedTransactions = oldTransactions.map((transaction) => {
+    const tx = transaction
+    if (!tx.status) {
+      ;(tx.status as any) = {}
+    }
+
+    if ("finalityStatus" in transaction) {
+      tx.status.finality_status = transaction.finalityStatus as any
+      delete (tx as any).finalityStatus
+    }
+    if ("executionStatus" in transaction) {
+      tx.status.execution_status = transaction.executionStatus as any
+      delete (tx as any).executionStatus
+    }
+
+    if (!("finality_status" in transaction.status)) {
+      tx.status.finality_status = "RECEIVED" // no status found on old tx, so we assume it was received. This will auto update to the correct status on next tx status update
+    }
+
+    return tx
+  })
+
+  await transactionsRepo.upsert(updatedTransactions)
+}
diff --git a/packages/extension/src/shared/wallet/storeMigration.ts b/packages/extension/src/background/migrations/wallet/storeMigration.ts
similarity index 86%
rename from packages/extension/src/shared/wallet/storeMigration.ts
rename to packages/extension/src/background/migrations/wallet/storeMigration.ts
index cd9325ded..18b32dbca 100644
--- a/packages/extension/src/shared/wallet/storeMigration.ts
+++ b/packages/extension/src/background/migrations/wallet/storeMigration.ts
@@ -1,11 +1,11 @@
 import { isBoolean, isPlainObject } from "lodash-es"
 import browser from "webextension-polyfill"
 
-import { WalletBackupService } from "../../background/wallet/backup/backup.service"
-import { old_walletStore } from "../../shared/wallet/walletStore"
-import { migrateWalletAccounts } from "../account/storeMigration"
+import { WalletBackupService } from "../../wallet/backup/backup.service"
+import { old_walletStore } from "../../../shared/wallet/walletStore"
+import { migrateWalletAccounts } from "../../../shared/account/storeMigration"
 
-/** TODO: refactor and check - This method is called for every message at the beginning of `handleMessage` */
+/** TODO: refactor and check - This method is called for every message at the beginning of `handleMessage` as it needs an unlocked wallet */
 
 export async function migrateWallet() {
   await Promise.allSettled([
diff --git a/packages/extension/src/background/multisig/multisigDeployAction.ts b/packages/extension/src/background/multisig/multisigDeployAction.ts
index d42fc2cae..e2d91880a 100644
--- a/packages/extension/src/background/multisig/multisigDeployAction.ts
+++ b/packages/extension/src/background/multisig/multisigDeployAction.ts
@@ -1,10 +1,10 @@
 import { num } from "starknet"
 
 import { ExtensionActionItemOfType } from "../../shared/actionQueue/types"
-import { addTransaction } from "../transactions/store"
-import { checkTransactionHash } from "../transactions/transactionExecution"
-import { argentMaxFee } from "../../shared/utils/argentMaxFee"
+import { addTransaction } from "../../shared/transactions/store"
 import { Wallet } from "../wallet"
+import { estimatedFeeToMaxFeeTotal } from "../../shared/transactionSimulation/utils"
+import { checkTransactionHash } from "../../shared/transactions/utils"
 
 export const addMultisigDeployAction = async (
   action: ExtensionActionItemOfType<"DEPLOY_MULTISIG">,
@@ -22,18 +22,10 @@ export const addMultisigDeployAction = async (
     throw Error("Account already deployed")
   }
 
-  let maxFee: string
-
-  try {
-    const { suggestedMaxFee } = await wallet.getAccountDeploymentFee(
-      selectedMultisig,
-    )
-
-    maxFee = argentMaxFee({ suggestedMaxFee: suggestedMaxFee })
-  } catch (error) {
-    const fallbackPrice = num.toBigInt(10e14)
-    maxFee = argentMaxFee({ suggestedMaxFee: fallbackPrice })
-  }
+  const maxFee = await wallet
+    .getAccountDeploymentFee(selectedMultisig)
+    .then(estimatedFeeToMaxFeeTotal)
+    .catch(() => num.toBigInt(20e14))
 
   const { account, txHash } = await wallet.deployAccount(selectedMultisig, {
     maxFee,
diff --git a/packages/extension/src/background/preAuthorizationMessaging.ts b/packages/extension/src/background/preAuthorizationMessaging.ts
index 9d8afeee6..107125591 100644
--- a/packages/extension/src/background/preAuthorizationMessaging.ts
+++ b/packages/extension/src/background/preAuthorizationMessaging.ts
@@ -1,13 +1,11 @@
-import { difference } from "lodash-es"
 import browser from "webextension-polyfill"
 
 import { uiService } from "../shared/__new/services/ui"
 import { PreAuthorisationMessage } from "../shared/messages/PreAuthorisationMessage"
-import { isPreAuthorized, preAuthorizeStore } from "../shared/preAuthorizations"
 import { Opened, backgroundUIService } from "./__new/services/ui"
-import { sendMessageToHost } from "./activeTabs"
 import { UnhandledMessage } from "./background"
 import { HandleMessage } from "./background"
+import { preAuthorizationService } from "../shared/preAuthorization/service"
 
 export function getOriginFromSender(
   sender: browser.runtime.MessageSender,
@@ -20,16 +18,6 @@ export function getOriginFromSender(
   return origin
 }
 
-preAuthorizeStore.subscribe(async (_, changeSet) => {
-  const removed = difference(changeSet.oldValue ?? [], changeSet.newValue ?? [])
-  for (const preAuthorization of removed) {
-    await sendMessageToHost(
-      { type: "DISCONNECT_ACCOUNT" },
-      preAuthorization.host,
-    )
-  }
-})
-
 export const handlePreAuthorizationMessage: HandleMessage<
   PreAuthorisationMessage
 > = async ({ msg, origin, background: { wallet, actionService }, respond }) => {
@@ -49,7 +37,10 @@ export const handlePreAuthorizationMessage: HandleMessage<
         }
       }
 
-      const isAuthorized = await isPreAuthorized(selectedAccount, origin)
+      const isAuthorized = await preAuthorizationService.isPreAuthorized({
+        account: selectedAccount,
+        host: origin,
+      })
 
       if (!isAuthorized) {
         /** Prompt user to connect to dapp */
@@ -103,7 +94,10 @@ export const handlePreAuthorizationMessage: HandleMessage<
         return respond({ type: "IS_PREAUTHORIZED_RES", data: false })
       }
 
-      const valid = await isPreAuthorized(selectedAccount, origin)
+      const valid = await preAuthorizationService.isPreAuthorized({
+        account: selectedAccount,
+        host: origin,
+      })
 
       return respond({ type: "IS_PREAUTHORIZED_RES", data: valid })
     }
diff --git a/packages/extension/src/background/transactions/badgeText.ts b/packages/extension/src/background/transactions/badgeText.ts
index f88ef1607..0116a2c20 100644
--- a/packages/extension/src/background/transactions/badgeText.ts
+++ b/packages/extension/src/background/transactions/badgeText.ts
@@ -16,17 +16,19 @@ import {
 } from "../../shared/wallet.model"
 import { accountsEqual } from "../../shared/utils/accountsEqual"
 import { old_walletStore } from "../../shared/wallet/walletStore"
-import { transactionsStore } from "./store"
-import { TransactionExecutionStatus, TransactionFinalityStatus } from "starknet"
+import { getTransactionStatus } from "../../shared/transactions/utils"
 
 // selects transactions that are pending and match the provided account
 
 export const pendingAccountTransactionsSelector = memoize(
-  (account: BaseWalletAccount) => (transaction: Transaction) =>
-    transaction.finalityStatus === TransactionFinalityStatus.RECEIVED &&
-    transaction.executionStatus !== TransactionExecutionStatus.REJECTED && // Rejected transactions have finality status RECEIVED
-    !transaction.meta?.isDeployAccount &&
-    accountsEqual(account, transaction.account),
+  (account: BaseWalletAccount) => (transaction: Transaction) => {
+    const { finality_status } = getTransactionStatus(transaction)
+    return (
+      finality_status === "RECEIVED" &&
+      !transaction.meta?.isDeployAccount &&
+      accountsEqual(account, transaction.account)
+    )
+  },
 )
 
 export const multisigPendingTransactionSelector = memoize(
@@ -48,26 +50,20 @@ export const updateBadgeText = async () => {
 
   const multisig = await getMultisigAccountFromBaseWallet(selectedWalletAccount)
 
-  const transactionSelector = pendingAccountTransactionsSelector(
-    selectedWalletAccount,
-  )
-  const pendingAccountTransactions = await transactionsStore.get(
-    transactionSelector,
-  )
+  if (!multisig) {
+    hideNotificationBadge()
+    return
+  }
 
   let multisigTransactionsLength = 0
+  const multisigTransactionSelector =
+    multisigPendingTransactionSelector(multisig)
 
-  if (multisig) {
-    const multisigTransactionSelector =
-      multisigPendingTransactionSelector(multisig)
-
-    multisigTransactionsLength = (
-      await multisigPendingTransactionsStore.get(multisigTransactionSelector)
-    ).length
-  }
+  multisigTransactionsLength = (
+    await multisigPendingTransactionsStore.get(multisigTransactionSelector)
+  ).length
 
-  const badgeSize =
-    pendingAccountTransactions.length + multisigTransactionsLength
+  const badgeSize = multisigTransactionsLength
 
   if (badgeSize) {
     showNotificationBadge(badgeSize)
@@ -81,10 +77,6 @@ export const initBadgeText = () => {
     updateBadgeText()
   })
 
-  transactionsStore.subscribe(() => {
-    updateBadgeText()
-  })
-
   multisigPendingTransactionsStore.subscribe(() => {
     updateBadgeText()
   })
diff --git a/packages/extension/src/background/transactions/checkTransactionHash.ts b/packages/extension/src/background/transactions/checkTransactionHash.ts
deleted file mode 100644
index 3403570e6..000000000
--- a/packages/extension/src/background/transactions/checkTransactionHash.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { constants, num } from "starknet"
-import { WalletAccount } from "../../shared/wallet.model"
-import { TransactionError } from "../../shared/errors/transaction"
-
-export const checkTransactionHash = (
-  transactionHash?: num.BigNumberish,
-  account?: WalletAccount,
-): boolean => {
-  try {
-    if (!transactionHash) {
-      throw new TransactionError({
-        code: "NO_TRANSACTION_HASH",
-      })
-    }
-    const bn = num.toBigInt(transactionHash)
-    if (bn <= constants.ZERO && account?.type !== "multisig") {
-      throw new TransactionError({
-        code: "INVALID_TRANSACTION_HASH_RANGE",
-      })
-    }
-    return true
-  } catch {
-    return false
-  }
-}
diff --git a/packages/extension/src/background/transactions/determineUpdates.ts b/packages/extension/src/background/transactions/determineUpdates.ts
index 4a5a72293..493d056bd 100644
--- a/packages/extension/src/background/transactions/determineUpdates.ts
+++ b/packages/extension/src/background/transactions/determineUpdates.ts
@@ -1,13 +1,28 @@
 import { Transaction, compareTransactions } from "../../shared/transactions"
+import { getTransactionStatus } from "../../shared/transactions/utils"
 
 export function getTransactionsStatusUpdate(
   oldTransactions: Transaction[],
   newTransactions: Transaction[],
 ): Transaction[] {
-  return newTransactions.filter(
-    (newTransaction) =>
-      oldTransactions.find((oldTransaction) =>
-        compareTransactions(oldTransaction, newTransaction),
-      )?.finalityStatus !== newTransaction.finalityStatus,
-  )
+  return newTransactions.filter((newTransaction) => {
+    const oldTransaction = oldTransactions.find((oldTransaction) =>
+      compareTransactions(oldTransaction, newTransaction),
+    )
+
+    const {
+      finality_status: oldFinalityStatus,
+      execution_status: oldExecutionStatus,
+    } = getTransactionStatus(oldTransaction)
+    const {
+      finality_status: newFinalityStatus,
+      execution_status: newExecutionStatus,
+    } = getTransactionStatus(newTransaction)
+
+    return (
+      !oldTransaction ||
+      oldFinalityStatus !== newFinalityStatus ||
+      oldExecutionStatus !== newExecutionStatus
+    )
+  })
 }
diff --git a/packages/extension/src/background/transactions/onupdate/declareContract.ts b/packages/extension/src/background/transactions/onupdate/declareContract.ts
index c70dc2335..2f5e7ad16 100644
--- a/packages/extension/src/background/transactions/onupdate/declareContract.ts
+++ b/packages/extension/src/background/transactions/onupdate/declareContract.ts
@@ -1,12 +1,14 @@
 import { declaredTransactionsStore } from "../../../shared/udc/store"
 import { UdcTransactionType } from "../../udcAction"
 import { TransactionUpdateListener } from "./type"
+import { getTransactionStatus } from "../../../shared/transactions/utils"
 
 export const handleDeclareContractTransaction: TransactionUpdateListener =
   async (transactions) => {
     for (const transaction of transactions) {
       if (transaction.meta?.type === UdcTransactionType.DECLARE_CONTRACT) {
-        if (transaction.executionStatus !== "REJECTED") {
+        const { finality_status } = getTransactionStatus(transaction)
+        if (finality_status !== "REJECTED") {
           await declaredTransactionsStore.push(transaction)
         } else {
           await declaredTransactionsStore.remove(transaction)
diff --git a/packages/extension/src/background/transactions/onupdate/deployAccount.ts b/packages/extension/src/background/transactions/onupdate/deployAccount.ts
index 89a186df3..9058bc482 100644
--- a/packages/extension/src/background/transactions/onupdate/deployAccount.ts
+++ b/packages/extension/src/background/transactions/onupdate/deployAccount.ts
@@ -1,15 +1,19 @@
 import { updateAccountDetails } from "../../../shared/account/update"
 import { SUCCESS_STATUSES } from "../../../shared/transactions"
 import { TransactionUpdateListener } from "./type"
+import { getTransactionStatus } from "../../../shared/transactions/utils"
 
 export const handleDeployAccountTransaction: TransactionUpdateListener = async (
   transactions,
 ) => {
-  const deployAccountTxns = transactions.filter(
-    (transaction) =>
+  const deployAccountTxns = transactions.filter((transaction) => {
+    const { finality_status } = getTransactionStatus(transaction)
+    return (
       transaction.meta?.isDeployAccount &&
-      SUCCESS_STATUSES.includes(transaction.finalityStatus),
-  )
+      finality_status &&
+      SUCCESS_STATUSES.includes(finality_status)
+    )
+  })
   if (deployAccountTxns.length > 0) {
     await updateAccountDetails(
       "deploy",
diff --git a/packages/extension/src/background/transactions/onupdate/nonce.ts b/packages/extension/src/background/transactions/onupdate/nonce.ts
index b38438735..47fae79c0 100644
--- a/packages/extension/src/background/transactions/onupdate/nonce.ts
+++ b/packages/extension/src/background/transactions/onupdate/nonce.ts
@@ -1,12 +1,14 @@
 import { resetStoredNonce } from "../../nonce"
 import { TransactionUpdateListener } from "./type"
+import { getTransactionStatus } from "../../../shared/transactions/utils"
 
 export const checkResetStoredNonce: TransactionUpdateListener = async (
   transactions,
 ) => {
   for (const transaction of transactions) {
     // on error remove stored (increased) nonce
-    if (transaction.account && transaction.executionStatus === "REJECTED") {
+    const { finality_status } = getTransactionStatus(transaction)
+    if (transaction.account && finality_status === "REJECTED") {
       await resetStoredNonce(transaction.account)
     }
   }
diff --git a/packages/extension/src/background/transactions/onupdate/notifications.ts b/packages/extension/src/background/transactions/onupdate/notifications.ts
index 706891e02..b629bae29 100644
--- a/packages/extension/src/background/transactions/onupdate/notifications.ts
+++ b/packages/extension/src/background/transactions/onupdate/notifications.ts
@@ -6,23 +6,29 @@ import {
   sendTransactionNotification,
 } from "../../../shared/notification"
 import { TransactionUpdateListener } from "./type"
+import { getTransactionStatus } from "../../../shared/transactions/utils"
 
 export const notifyAboutCompletedTransactions: TransactionUpdateListener =
   async (transactions) => {
     for (const transaction of transactions) {
-      const { hash, finalityStatus, executionStatus, meta, account } =
-        transaction
+      const { hash, meta, account } = transaction
+      const { finality_status, execution_status } =
+        getTransactionStatus(transaction)
       if (
-        (SUCCESS_STATUSES.includes(finalityStatus) ||
-          (executionStatus && FAILED_STATUS.includes(executionStatus))) &&
+        ((finality_status && SUCCESS_STATUSES.includes(finality_status)) ||
+          (execution_status && FAILED_STATUS.includes(execution_status))) &&
         !(await hasShownNotification(hash))
       ) {
         void addToAlreadyShown(hash)
 
         if (!account.hidden && !meta?.isDeployAccount) {
           await decrementTransactionsBeforeReview()
-          finalityStatus &&
-            sendTransactionNotification(hash, finalityStatus, meta)
+          finality_status &&
+            sendTransactionNotification(
+              hash,
+              { execution_status, finality_status },
+              meta,
+            )
         }
       }
     }
diff --git a/packages/extension/src/background/transactions/service/starknet.service.ts b/packages/extension/src/background/transactions/service/starknet.service.ts
index 756ae3afb..ec1c0f5bc 100644
--- a/packages/extension/src/background/transactions/service/starknet.service.ts
+++ b/packages/extension/src/background/transactions/service/starknet.service.ts
@@ -11,6 +11,7 @@ import {
 } from "../../../shared/transactions/interface"
 import {
   getTransactionIdentifier,
+  getTransactionStatus,
   identifierToBaseTransaction,
 } from "../../../shared/transactions/utils"
 import { IRepository } from "../../../shared/storage/__new/interface"
@@ -22,89 +23,90 @@ import uniqWith from "lodash-es/uniqWith"
 import { accountsEqual } from "../../../shared/utils/accountsEqual"
 import { getTransactionHistory } from "../sources/voyager"
 import { getTransactionsUpdate } from "../sources/onchain"
-import { transactionsStore } from "../store"
+import { transactionsStore } from "../../../shared/transactions/store"
 import { accountService } from "../../../shared/account/service"
-import { delay } from "../../../shared/utils/delay"
-import { TransactionFinalityStatus } from "starknet"
 import { RefreshInterval } from "../../../shared/config"
+import { pipe } from "../../__new/services/worker/schedule/pipe"
+import { everyWhenOpen } from "../../__new/services/worker/schedule/decorators"
+import { IBackgroundUIService } from "../../__new/services/ui/interface"
+import { IDebounceService } from "../../../shared/debounce"
 
 function isFinalStatus(status: TransactionStatus): boolean {
   return status.status === "confirmed" || status.status === "failed"
 }
 
-const DEFAULT_POLLING_INTERVAL = 15
-const LOCAL_POLLING_INTERVAL = 5
-
 export class TransactionTrackerWorker
   extends BaseTransactionTrackingService<BaseTransaction, TransactionStatus>
   implements TransactionTrackingService<BaseTransaction, TransactionStatus>
 {
   constructor(
     private readonly schedulingService: IScheduleService<
-      "starknetTransactionTracker" | "loadHistory" | "trackTransactionsUpdates"
+      | "starknetTransactionTracker"
+      | "loadHistory"
+      | "trackTransactionsUpdates"
+      | "cleanupStaleTransactions"
     >,
     private readonly chainService: IChainService,
     private readonly transactionsRepo: IRepository<Transaction>,
+    private readonly backgroundUIService: IBackgroundUIService,
+    private readonly debounceService: IDebounceService,
   ) {
     super({ status: "pending" }, getTransactionIdentifier)
 
-    void this.schedulingService.registerImplementation({
-      id: "starknetTransactionTracker",
-      callback: this.update.bind(this),
-    })
-
     void this.schedulingService.registerImplementation({
       id: "loadHistory",
       callback: this.loadHistory.bind(this),
     })
 
-    void this.schedulingService.registerImplementation({
-      id: "trackTransactionsUpdates",
-      callback: this.trackTransactionsUpdates.bind(this),
-    })
-
-    void this.schedulingService.every(RefreshInterval.FAST, {
-      id: "starknetTransactionTracker",
-    })
     void this.schedulingService.every(RefreshInterval.SLOW, {
       id: "loadHistory",
     })
-    void this.schedulingService.every(RefreshInterval.MEDIUM, {
-      id: "trackTransactionsUpdates",
-    })
+
     this.subscribeToRepoChange()
   }
 
+  async cleanupStaleTransactions() {
+    const now = Math.floor(Date.now() / 1000)
+
+    const staleTransactions = await this.transactionsRepo.get((transaction) => {
+      const { finality_status, execution_status } =
+        getTransactionStatus(transaction)
+      const isFailed =
+        execution_status === "REVERTED" || finality_status === "REJECTED"
+      const isSuccessful =
+        finality_status === "ACCEPTED_ON_L2" ||
+        finality_status === "ACCEPTED_ON_L1"
+
+      const isPending = !isFailed && !isSuccessful
+      const isStale = now - transaction.timestamp > 3600 // older than 1 hour
+      return isStale && isPending
+    })
+    await this.transactionsRepo.remove(staleTransactions)
+  }
+
   async trackTransactionsUpdates() {
-    // the config below will run transaction updates 4x per minute, if there are in-flight transactions
-    // By default it will update on second 0, 15, 30 and 45 but by updating WAIT_TIME we can change the number of executions
-    const maxExecutionTimeInMs = 60000 // 1 minute max execution time
-    let transactionPollingIntervalInS = DEFAULT_POLLING_INTERVAL
-    const startTime = Date.now()
-    let inFlightTransactions = await this.syncTransactionRepo()
-    while (
-      inFlightTransactions.length > 0 &&
-      Date.now() - startTime < maxExecutionTimeInMs
-    ) {
-      const localTransaction = inFlightTransactions.find(
-        (tx) => tx.account.networkId === "localhost",
-      )
-      if (localTransaction) {
-        transactionPollingIntervalInS = LOCAL_POLLING_INTERVAL
-      } else {
-        transactionPollingIntervalInS = DEFAULT_POLLING_INTERVAL
-      }
-      console.info(
-        `~> waiting ${transactionPollingIntervalInS}s for transaction updates`,
-      )
-      await delay(transactionPollingIntervalInS * 1000)
-      console.info(
-        "~> fetching transaction updates as pending transactions were detected",
-      )
-      inFlightTransactions = await this.syncTransactionRepo()
-    }
+    await this.syncTransactionRepo()
   }
 
+  runTrackTransactionUpdates = pipe(
+    everyWhenOpen(
+      this.backgroundUIService,
+      this.schedulingService,
+      this.debounceService,
+      RefreshInterval.FAST,
+      "TransactionTrackerWorker.trackTransactionsUpdates",
+    ),
+  )(async () => {
+    try {
+      await this.trackTransactionsUpdates()
+      await this.update()
+    } catch (error) {
+      console.warn("Failed to update transactions", error)
+    } finally {
+      await this.cleanupStaleTransactions()
+    }
+  })
+
   protected async update() {
     const oldTransactionStatuses = Object.fromEntries(
       this.identifierToStatuses.entries(),
@@ -163,10 +165,10 @@ export class TransactionTrackerWorker
       const newAddedTransactions =
         changeset.newValue
           ?.filter(({ hash }) => !oldTransactions.includes(hash))
-          .filter(
-            ({ finalityStatus }) =>
-              finalityStatus === TransactionFinalityStatus.RECEIVED,
-          ) ?? []
+          .filter((transaction) => {
+            const { finality_status } = getTransactionStatus(transaction)
+            return finality_status === "RECEIVED"
+          }) ?? []
 
       if (newAddedTransactions.length > 0) {
         setTimeout(() => {
diff --git a/packages/extension/src/background/transactions/service/worker.ts b/packages/extension/src/background/transactions/service/worker.ts
index 886b6f42f..7f21eed01 100644
--- a/packages/extension/src/background/transactions/service/worker.ts
+++ b/packages/extension/src/background/transactions/service/worker.ts
@@ -1,10 +1,14 @@
 import { starknetChainService } from "../../../shared/chain/service"
 import { chromeScheduleService } from "../../../shared/schedule"
-import { transactionsRepo } from "../store"
+import { transactionsRepo } from "../../../shared/transactions/store"
 import { TransactionTrackerWorker } from "./starknet.service"
+import { debounceService } from "../../../shared/debounce"
+import { backgroundUIService } from "../../__new/services/ui"
 
 export const transactionTrackerWorker = new TransactionTrackerWorker(
   chromeScheduleService,
   starknetChainService,
   transactionsRepo,
+  backgroundUIService,
+  debounceService,
 )
diff --git a/packages/extension/src/background/transactions/sources/onchain.spec.ts b/packages/extension/src/background/transactions/sources/onchain.spec.ts
new file mode 100644
index 000000000..344cd28d0
--- /dev/null
+++ b/packages/extension/src/background/transactions/sources/onchain.spec.ts
@@ -0,0 +1,138 @@
+import { describe, expect, test, vi } from "vitest"
+
+import { Hex } from "@argent/shared"
+import { getTransactionsUpdate } from "./onchain"
+import { WalletAccount } from "../../../shared/wallet.model"
+import { ExtendedFinalityStatus } from "../../../shared/transactions"
+
+const mocks = vi.hoisted(() => {
+  return {
+    getProvider: vi.fn(),
+  }
+})
+
+vi.mock("../../../shared/network", () => {
+  return {
+    getProvider: mocks.getProvider,
+  }
+})
+
+describe("getTransactionsUpdate", () => {
+  test.each(["ACCEPTED_ON_L2", "ACCEPTED_ON_L1"])(
+    "should return correct status, given %s successful tx",
+    async (status) => {
+      const mockTransaction = {
+        hash: "0x123" as Hex,
+        networkId: "goerli-alpha",
+        status: { finality_status: "RECEIVED" as ExtendedFinalityStatus },
+        timestamp: 123,
+        account: { address: "0x1", networkId: "goerli-alpha" } as WalletAccount,
+      }
+
+      const getTransactionReceipt = vi.fn()
+
+      vi.mocked(mocks).getProvider.mockReturnValue({
+        getTransactionStatus: () => ({
+          finality_status: status,
+        }),
+        getTransactionReceipt,
+      })
+
+      const test = await getTransactionsUpdate([mockTransaction])
+
+      expect(test.length).toBe(1)
+      expect(test[0].hash).toBe(mockTransaction.hash)
+      expect(test[0].status.finality_status).toBe(status)
+      expect(getTransactionReceipt).not.toHaveBeenCalled()
+    },
+  )
+
+  test("should return correct status, given rejected tx", async () => {
+    const mockTransaction = {
+      hash: "0x123" as Hex,
+      networkId: "goerli-alpha",
+      status: {
+        finality_status: "RECEIVED" as ExtendedFinalityStatus,
+      },
+      timestamp: 123,
+      account: { address: "0x1", networkId: "goerli-alpha" } as WalletAccount,
+    }
+
+    const getTransactionReceipt = vi.fn()
+
+    vi.mocked(mocks).getProvider.mockReturnValue({
+      getTransactionStatus: () => ({
+        finality_status: "REJECTED",
+      }),
+      getTransactionReceipt,
+    })
+
+    const test = await getTransactionsUpdate([mockTransaction])
+
+    expect(test.length).toBe(1)
+    expect(test[0].hash).toBe(mockTransaction.hash)
+    expect(test[0].status.finality_status).toBe("REJECTED")
+    expect(getTransactionReceipt).not.toHaveBeenCalled()
+  })
+
+  test("should return correct status, given reverted tx", async () => {
+    const mockTransaction = {
+      hash: "0x123" as Hex,
+      networkId: "goerli-alpha",
+      status: {
+        finality_status: "RECEIVED" as ExtendedFinalityStatus,
+      },
+      timestamp: 123,
+      account: { address: "0x1", networkId: "goerli-alpha" } as WalletAccount,
+    }
+
+    const getTransactionReceipt = vi
+      .fn()
+      .mockResolvedValue({ revert_reason: "foo" })
+
+    vi.mocked(mocks).getProvider.mockReturnValue({
+      getTransactionStatus: () => ({
+        execution_status: "REVERTED",
+        finality_status: "RECEIVED",
+      }),
+      getTransactionReceipt,
+    })
+
+    const test = await getTransactionsUpdate([mockTransaction])
+
+    expect(test.length).toBe(1)
+    expect(test[0].hash).toBe(mockTransaction.hash)
+    expect(test[0].status.execution_status).toBe("REVERTED")
+    expect(test[0].revertReason).toBe("foo")
+    expect(getTransactionReceipt).toHaveBeenCalledWith(mockTransaction.hash)
+  })
+
+  test("should return correct status, given failing receipt call", async () => {
+    const mockTransaction = {
+      hash: "0x123" as Hex,
+      networkId: "goerli-alpha",
+      status: {
+        finality_status: "RECEIVED" as ExtendedFinalityStatus,
+      },
+      timestamp: 123,
+      account: { address: "0x1", networkId: "goerli-alpha" } as WalletAccount,
+    }
+
+    const getTransactionReceipt = vi.fn().mockRejectedValue({ error: "foo" })
+
+    vi.mocked(mocks).getProvider.mockReturnValue({
+      getTransactionStatus: () => ({
+        execution_status: "REVERTED",
+        finality_status: "RECEIVED",
+      }),
+      getTransactionReceipt,
+    })
+
+    const test = await getTransactionsUpdate([mockTransaction])
+
+    expect(test.length).toBe(1)
+    expect(test[0].hash).toBe(mockTransaction.hash)
+    expect(test[0].status.execution_status).toBe("REVERTED")
+    expect(getTransactionReceipt).toHaveBeenCalledWith(mockTransaction.hash)
+  })
+})
diff --git a/packages/extension/src/background/transactions/sources/onchain.ts b/packages/extension/src/background/transactions/sources/onchain.ts
index ed5121a9d..03dfe5814 100644
--- a/packages/extension/src/background/transactions/sources/onchain.ts
+++ b/packages/extension/src/background/transactions/sources/onchain.ts
@@ -1,10 +1,11 @@
-import { TransactionExecutionStatus, TransactionFinalityStatus } from "starknet"
 import { getProvider } from "../../../shared/network"
 import {
+  ExtendedFinalityStatus,
   Transaction,
   getInFlightTransactions,
 } from "../../../shared/transactions"
 import { getTransactionsStatusUpdate } from "../determineUpdates"
+import { getTransactionStatus } from "../../../shared/transactions/utils"
 
 export async function getTransactionsUpdate(transactions: Transaction[]) {
   const transactionsToCheck = getInFlightTransactions(transactions)
@@ -17,55 +18,50 @@ export async function getTransactionsUpdate(transactions: Transaction[]) {
       const { finality_status, execution_status } =
         await provider.getTransactionStatus(transaction.hash)
 
-      const isFailed =
-        execution_status === "REVERTED" || finality_status === "REJECTED"
-      if (!isFailed) {
-        return {
-          ...transaction,
-          finalityStatus: finality_status as TransactionFinalityStatus,
-          executionStatus: execution_status as TransactionExecutionStatus,
-        }
-      }
-
-      const tx = await provider.getTransactionReceipt(transaction.hash)
-
-      // Handle Reverted transaction
-      if ("revert_reason" in tx) {
-        const finalityStatus =
-          (tx.finality_status as TransactionFinalityStatus) ||
-          "status" in tx ||
-          TransactionFinalityStatus.NOT_RECEIVED // For backward compatibility on mainnet
+      try {
+        if (execution_status === "REVERTED") {
+          const tx = await provider.getTransactionReceipt(transaction.hash)
 
-        return {
-          ...transaction,
-          finalityStatus,
-          revertReason: tx.revert_reason,
-        }
-
-        // Handle Rejected transaction
-      } else if ("transaction_failure_reason" in tx) {
-        const anyTx = tx as any
-        return {
-          ...transaction,
-          finalityStatus: anyTx.status ?? TransactionFinalityStatus.RECEIVED,
-          executionStatus: TransactionExecutionStatus.REJECTED,
-          failureReason: anyTx.transaction_failure_reason,
+          if ("revert_reason" in tx) {
+            return {
+              ...transaction,
+              revertReason: tx.revert_reason,
+              status: {
+                finality_status,
+                execution_status,
+              },
+            }
+          }
         }
+      } catch (e) {
+        console.warn(
+          `Failed to fetch transaction receipt for ${transaction.hash}`,
+          e,
+        )
       }
 
-      return transaction
+      return {
+        ...transaction,
+        status: {
+          finality_status,
+          execution_status,
+        },
+      }
     }),
   )
 
   const updatedTransactions = fetchedTransactions.reduce<Transaction[]>(
     (acc, transaction) => {
       if (transaction.status === "fulfilled") {
+        const { finality_status, execution_status } = getTransactionStatus(
+          transaction.value,
+        )
         acc.push({
           ...transaction.value,
-          finalityStatus:
-            transaction.value.finalityStatus ??
-            TransactionFinalityStatus.RECEIVED,
-          executionStatus: transaction.value.executionStatus,
+          status: {
+            finality_status: finality_status ?? "RECEIVED",
+            execution_status,
+          },
         })
       }
       return acc
diff --git a/packages/extension/src/background/transactions/sources/voyager.ts b/packages/extension/src/background/transactions/sources/voyager.ts
index 956475ab8..36668dbc3 100644
--- a/packages/extension/src/background/transactions/sources/voyager.ts
+++ b/packages/extension/src/background/transactions/sources/voyager.ts
@@ -1,10 +1,10 @@
 import { ARGENT_EXPLORER_BASE_URL } from "../../../shared/api/constants"
-import { argentApiNetworkForNetwork } from "../../../shared/api/fetcher"
+import { argentApiNetworkForNetwork } from "../../../shared/api/headers"
 import { Network } from "../../../shared/network"
 import { Transaction, compareTransactions } from "../../../shared/transactions"
 import { urlWithQuery } from "../../../shared/utils/url"
 import { WalletAccount } from "../../../shared/wallet.model"
-import { stripAddressZeroPadding } from "../../../ui/features/accounts/accounts.service"
+import { stripAddressZeroPadding } from "@argent/shared"
 import { fetchWithTimeout } from "../../utils/fetchWithTimeout"
 import { mapVoyagerTransactionToTransaction } from "../transformers"
 import { VoyagerTransaction } from "./voyager.model"
diff --git a/packages/extension/src/background/transactions/store.ts b/packages/extension/src/background/transactions/store.ts
deleted file mode 100644
index 353968c69..000000000
--- a/packages/extension/src/background/transactions/store.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { differenceWith } from "lodash-es"
-
-import { ArrayStorage } from "../../shared/storage"
-import { StorageChange } from "../../shared/storage/types"
-import {
-  ExtendedTransactionStatus,
-  Transaction,
-  TransactionRequest,
-  compareTransactions,
-} from "../../shared/transactions"
-import { runAddedOrUpdatedHandlers, runChangedStatusHandlers } from "./onupdate"
-import { checkTransactionHash } from "./checkTransactionHash"
-import { adaptArrayStorage } from "../../shared/storage/__new/repository"
-import { TransactionExecutionStatus, TransactionFinalityStatus } from "starknet"
-import { IRepository } from "../../shared/storage/__new/interface"
-
-/**
- * @deprecated use `transactionsRepo` instead
- */
-export const transactionsStore = new ArrayStorage<Transaction>([], {
-  namespace: "core:transactions",
-  areaName: "local",
-  compare: compareTransactions,
-})
-
-export const transactionsRepo: IRepository<Transaction> =
-  adaptArrayStorage(transactionsStore)
-
-const timestampInSeconds = (): number => Math.floor(Date.now() / 1000)
-
-export const addTransaction = (
-  transaction: TransactionRequest,
-  finalityStatus?: ExtendedTransactionStatus,
-  executionStatus?: TransactionExecutionStatus,
-) => {
-  // sanity checks
-  if (!checkTransactionHash(transaction.hash)) {
-    return // dont throw
-  }
-
-  const defaultStatus: ExtendedTransactionStatus =
-    TransactionFinalityStatus.RECEIVED
-
-  const newTransaction: Transaction = {
-    finalityStatus: finalityStatus ?? defaultStatus,
-    executionStatus,
-    timestamp: timestampInSeconds(),
-    ...transaction,
-  }
-
-  return transactionsStore.push(newTransaction)
-}
-
-export const getUpdatedTransactionsForChangeSet = (
-  changeSet: StorageChange<Transaction[]>,
-) => {
-  const updatedTransactions = differenceWith(
-    changeSet.oldValue ?? [],
-    changeSet.newValue ?? [],
-    equalTransactionWithStatus,
-  )
-  return updatedTransactions
-}
-
-const equalTransactionWithStatus = (
-  a: Transaction,
-  b: Transaction,
-): boolean => {
-  return (
-    compareTransactions(a, b) &&
-    a.finalityStatus === b.finalityStatus &&
-    a.executionStatus === b.executionStatus
-  )
-}
-
-transactionsStore.subscribe((_, changeSet) => {
-  /** note this includes where all transactions are initially loaded in the store */
-  const addedOrUpdatedTransactions = differenceWith(
-    changeSet.newValue ?? [],
-    changeSet.oldValue ?? [],
-    equalTransactionWithStatus,
-  )
-
-  /** transactions which already existed in the store, and have now changed status */
-  const changedStatusTransactions = changeSet.newValue?.flatMap(
-    (newTransaction) => {
-      const oldTransaction = changeSet.oldValue?.find(
-        (oldTransaction) => oldTransaction.hash === newTransaction.hash,
-      )
-      if (
-        oldTransaction &&
-        (oldTransaction.finalityStatus !== newTransaction.finalityStatus ||
-          oldTransaction.executionStatus !== newTransaction.executionStatus)
-      ) {
-        return newTransaction
-      }
-      return []
-    },
-  )
-
-  if (addedOrUpdatedTransactions.length > 0) {
-    runAddedOrUpdatedHandlers(addedOrUpdatedTransactions)
-  }
-
-  if (changedStatusTransactions && changedStatusTransactions.length > 0) {
-    runChangedStatusHandlers(changedStatusTransactions)
-  }
-})
diff --git a/packages/extension/src/background/transactions/transactionExecution.ts b/packages/extension/src/background/transactions/transactionExecution.ts
index 3297a58d9..d6dbcc383 100644
--- a/packages/extension/src/background/transactions/transactionExecution.ts
+++ b/packages/extension/src/background/transactions/transactionExecution.ts
@@ -1,46 +1,30 @@
-import {
-  constants,
-  num,
-  TransactionFinalityStatus,
-  TransactionExecutionStatus,
-} from "starknet"
+import { num } from "starknet"
 import {
   ExtQueueItem,
   TransactionActionPayload,
 } from "../../shared/actionQueue/types"
 import {
-  ExtendedTransactionStatus,
+  ExtendedFinalityStatus,
   TransactionRequest,
   nameTransaction,
 } from "../../shared/transactions"
-import { WalletAccount } from "../../shared/wallet.model"
 import { accountsEqual } from "../../shared/utils/accountsEqual"
 import { isAccountDeployed } from "../accountDeploy"
 import { analytics } from "../analytics"
 import { getNonce, increaseStoredNonce, resetStoredNonce } from "../nonce"
 import { Wallet } from "../wallet"
 import { getEstimatedFees } from "../../shared/transactionSimulation/fees/estimatedFeesRepository"
-import { addTransaction, transactionsStore } from "./store"
+import {
+  addTransaction,
+  transactionsStore,
+} from "../../shared/transactions/store"
 import { getMultisigAccountFromBaseWallet } from "../../shared/multisig/utils/baseMultisig"
+import {
+  checkTransactionHash,
+  getTransactionStatus,
+} from "../../shared/transactions/utils"
 import { isAccountV5 } from "@argent/shared"
-
-export const checkTransactionHash = (
-  transactionHash?: num.BigNumberish,
-  account?: WalletAccount,
-): boolean => {
-  try {
-    if (!transactionHash) {
-      throw Error("transactionHash not defined")
-    }
-    const bn = num.toBigInt(transactionHash)
-    if (bn <= constants.ZERO && account?.type !== "multisig") {
-      throw Error("transactionHash needs to be >0")
-    }
-    return true
-  } catch {
-    return false
-  }
-}
+import { estimatedFeeToMaxFeeTotal } from "../../shared/transactionSimulation/utils"
 
 export type TransactionAction = ExtQueueItem<{
   type: "TRANSACTION"
@@ -60,15 +44,18 @@ export const executeTransactionAction = async (
   }
 
   const suggestedMaxFee =
-    transactionsDetail?.maxFee ?? preComputedFees.suggestedMaxFee
-  const suggestedMaxADFee = preComputedFees.maxADFee ?? "0"
+    transactionsDetail?.maxFee ??
+    estimatedFeeToMaxFeeTotal(preComputedFees.transactions)
+  const suggestedMaxADFee = preComputedFees.deployment
+    ? estimatedFeeToMaxFeeTotal(preComputedFees.deployment)
+    : 0n
 
   const maxFee = suggestedMaxFee
   const maxADFee = suggestedMaxADFee
 
-  void analytics.track("executeTransaction", {
-    usesCachedFees: Boolean(preComputedFees),
-  })
+  // void analytics.track("executeTransaction", {
+  //   usesCachedFees: Boolean(preComputedFees),
+  // }) // TODO: temporary disabled
 
   if (!(await wallet.isSessionOpen())) {
     throw Error("you need an open session")
@@ -84,12 +71,13 @@ export const executeTransactionAction = async (
       ? await getMultisigAccountFromBaseWallet(selectedAccount)
       : undefined
 
-  const pendingAccountTransactions = allTransactions.filter(
-    (tx) =>
-      tx.finalityStatus === TransactionFinalityStatus.RECEIVED &&
-      tx.executionStatus !== TransactionExecutionStatus.REJECTED && // Rejected transactions have finality status RECEIVED
-      accountsEqual(tx.account, selectedAccount),
-  )
+  const pendingAccountTransactions = allTransactions.filter((tx) => {
+    const { finality_status } = getTransactionStatus(tx)
+    return (
+      finality_status === "RECEIVED" &&
+      accountsEqual(tx.account, selectedAccount)
+    )
+  })
 
   const hasUpgradePending = pendingAccountTransactions.some(
     (tx) => tx.meta?.isUpgrade,
@@ -162,10 +150,8 @@ export const executeTransactionAction = async (
 
   const title = nameTransaction(transactions)
 
-  const finalityStatus: ExtendedTransactionStatus =
-    multisig && multisig.threshold > 1
-      ? TransactionFinalityStatus.NOT_RECEIVED
-      : TransactionFinalityStatus.RECEIVED
+  const finalityStatus: ExtendedFinalityStatus =
+    multisig && multisig.threshold > 1 ? "NOT_RECEIVED" : "RECEIVED"
 
   const tx: TransactionRequest = {
     hash: transaction.transaction_hash,
@@ -179,12 +165,9 @@ export const executeTransactionAction = async (
   }
 
   // Add transaction with finality status NOT_RECEIVED for multisig transactions with threshold > 1
-  await addTransaction(tx, finalityStatus)
+  await addTransaction(tx, { finality_status: finalityStatus })
 
-  if (
-    !nonceWasProvidedByUI &&
-    finalityStatus === TransactionFinalityStatus.RECEIVED
-  ) {
+  if (!nonceWasProvidedByUI && finalityStatus === "RECEIVED") {
     await increaseStoredNonce(selectedAccount)
   }
 
diff --git a/packages/extension/src/background/transactions/transactionMessaging.ts b/packages/extension/src/background/transactions/transactionMessaging.ts
index ade7ce572..12fee92d0 100644
--- a/packages/extension/src/background/transactions/transactionMessaging.ts
+++ b/packages/extension/src/background/transactions/transactionMessaging.ts
@@ -12,17 +12,16 @@ import {
   SimulateDeployAccountRequest,
   SimulateInvokeRequest,
 } from "../../shared/transactionSimulation/types"
-import { getErrorObject } from "../../shared/utils/error"
 import { isAccountDeployed } from "../accountDeploy"
 import { HandleMessage, UnhandledMessage } from "../background"
-import { argentMaxFee } from "../../shared/utils/argentMaxFee"
-import { addEstimatedFees } from "../../shared/transactionSimulation/fees/estimatedFeesRepository"
-import { transactionCallsAdapter } from "./transactionAdapter"
 import { AccountError } from "../../shared/errors/account"
 import { fetchTransactionBulkSimulation } from "../../shared/transactionSimulation/transactionSimulation.service"
 import { TransactionError } from "../../shared/errors/transaction"
-import { getEstimatedFeeFromSimulation } from "../../shared/transactionSimulation/utils"
+import { getEstimatedFeeFromBulkSimulation } from "../../shared/transactionSimulation/utils"
 import { isAccountV4, isAccountV5 } from "@argent/shared"
+import { EstimatedFees } from "../../shared/transactionSimulation/fees/fees.model"
+import { ETH_TOKEN_ADDRESS } from "../../shared/network/constants"
+import { addEstimatedFee } from "../../shared/transactionSimulation/fees/estimatedFeesRepository"
 
 export const handleTransactionMessage: HandleMessage<
   TransactionMessage
@@ -46,146 +45,6 @@ export const handleTransactionMessage: HandleMessage<
       })
     }
 
-    case "ESTIMATE_TRANSACTION_FEE": {
-      const selectedAccount = await wallet.getSelectedAccount()
-      const transactions = msg.data
-
-      if (!selectedAccount) {
-        throw new AccountError({ code: "NOT_FOUND" })
-      }
-
-      const starknetAccount = await wallet.getSelectedStarknetAccount()
-
-      try {
-        let txFee = "0",
-          maxTxFee = "0",
-          accountDeploymentFee: string | undefined,
-          maxADFee: string | undefined
-
-        const isDeployed = await isAccountDeployed(
-          selectedAccount,
-          starknetAccount.getClassAt.bind(starknetAccount),
-        )
-
-        if (!isDeployed) {
-          if ("estimateFeeBulk" in starknetAccount) {
-            const bulkTransactions: Invocations = [
-              {
-                type: TransactionType.DEPLOY_ACCOUNT,
-                payload: await wallet.getAccountDeploymentPayload(
-                  selectedAccount,
-                ),
-              },
-              {
-                type: TransactionType.INVOKE,
-                payload: transactions,
-              },
-            ]
-
-            const estimateFeeBulk = await starknetAccount.estimateFeeBulk(
-              bulkTransactions,
-              { skipValidate: true },
-            )
-
-            accountDeploymentFee = num.toHex(estimateFeeBulk[0].overall_fee)
-            txFee = num.toHex(estimateFeeBulk[1].overall_fee)
-
-            maxADFee = argentMaxFee({
-              suggestedMaxFee: estimateFeeBulk[0].suggestedMaxFee,
-            })
-            maxTxFee = argentMaxFee({
-              suggestedMaxFee: estimateFeeBulk[1].suggestedMaxFee,
-            })
-          }
-        } else {
-          const { overall_fee, suggestedMaxFee } =
-            await starknetAccount.estimateFee(transactions, {
-              skipValidate: true,
-            })
-
-          txFee = num.toHex(overall_fee)
-          maxTxFee = num.toHex(suggestedMaxFee) // Here, maxFee = estimatedFee * 1.5x
-        }
-
-        const suggestedMaxFee = argentMaxFee({ suggestedMaxFee: maxTxFee })
-
-        await addEstimatedFees(
-          {
-            amount: txFee,
-            suggestedMaxFee,
-            accountDeploymentFee,
-            maxADFee,
-          },
-          transactions,
-        )
-        return respond({
-          type: "ESTIMATE_TRANSACTION_FEE_RES",
-          data: {
-            amount: txFee,
-            suggestedMaxFee,
-            accountDeploymentFee,
-            maxADFee,
-          },
-        })
-      } catch (error) {
-        const errorObject = getErrorObject(error, false)
-        console.error("ESTIMATE_TRANSACTION_FEE_REJ", error, errorObject)
-        return respond({
-          type: "ESTIMATE_TRANSACTION_FEE_REJ",
-          data: {
-            error: errorObject,
-          },
-        })
-      }
-    }
-
-    case "ESTIMATE_ACCOUNT_DEPLOYMENT_FEE": {
-      const providedAccount = msg.data
-      const account = providedAccount
-        ? await wallet.getAccount(providedAccount)
-        : await wallet.getSelectedAccount()
-
-      if (!account) {
-        throw Error("no accounts")
-      }
-
-      try {
-        const { overall_fee, suggestedMaxFee } =
-          await wallet.getAccountDeploymentFee(account)
-
-        const maxADFee = argentMaxFee({ suggestedMaxFee })
-        return respond({
-          type: "ESTIMATE_ACCOUNT_DEPLOYMENT_FEE_RES",
-          data: {
-            amount: num.toHex(overall_fee),
-            maxADFee,
-          },
-        })
-      } catch (error) {
-        // FIXME: This is a temporary fix for the case where the user has a multisig account.
-        // Once starknet 0.11 is released, we can remove this.
-        if (account.type === "multisig") {
-          const fallbackPrice = num.toBigInt(10e14)
-          return respond({
-            type: "ESTIMATE_ACCOUNT_DEPLOYMENT_FEE_RES",
-            data: {
-              amount: num.toHex(fallbackPrice),
-              maxADFee: argentMaxFee({ suggestedMaxFee: fallbackPrice }),
-            },
-          })
-        }
-
-        const errorObject = getErrorObject(error, false)
-        console.error("ESTIMATE_ACCOUNT_DEPLOYMENT_FEE_REJ", error, errorObject)
-        return respond({
-          type: "ESTIMATE_ACCOUNT_DEPLOYMENT_FEE_REJ",
-          data: {
-            error: errorObject,
-          },
-        })
-      }
-    }
-
     case "ESTIMATE_DECLARE_CONTRACT_FEE": {
       const { address, networkId, ...rest } = msg.data
 
@@ -199,10 +58,13 @@ export const handleTransactionMessage: HandleMessage<
         throw Error("no accounts")
       }
 
-      let txFee = "0",
-        maxTxFee = "0",
-        accountDeploymentFee: string | undefined,
-        maxADFee: string | undefined
+      const fees: EstimatedFees = {
+        transactions: {
+          feeTokenAddress: ETH_TOKEN_ADDRESS,
+          amount: 0n,
+          pricePerUnit: 0n,
+        },
+      }
 
       try {
         if (
@@ -235,37 +97,58 @@ export const handleTransactionMessage: HandleMessage<
                 skipValidate: true,
               })
 
-            accountDeploymentFee = num.toHex(estimateFeeBulk[0].overall_fee)
-            txFee = num.toHex(estimateFeeBulk[1].overall_fee)
-
-            maxADFee = argentMaxFee({
-              suggestedMaxFee: estimateFeeBulk[0].suggestedMaxFee,
-            })
-            maxTxFee = estimateFeeBulk[1].suggestedMaxFee.toString()
+            if (
+              !estimateFeeBulk[0].gas_consumed ||
+              !estimateFeeBulk[0].gas_price
+            ) {
+              throw Error(
+                "estimateFeeBulk[0].gas_consumed or estimateFeeBulk[0].gas_price is undefined",
+              )
+            }
+
+            fees.deployment = {
+              feeTokenAddress: ETH_TOKEN_ADDRESS,
+              amount: num.toBigInt(estimateFeeBulk[0].gas_consumed),
+              pricePerUnit: num.toBigInt(estimateFeeBulk[0].gas_price),
+            }
+
+            if (
+              !estimateFeeBulk[1].gas_consumed ||
+              !estimateFeeBulk[1].gas_price
+            ) {
+              throw Error(
+                "estimateFeeBulk[1].gas_consumed or estimateFeeBulk[1].gas_price is undefined",
+              )
+            }
+
+            fees.transactions.amount = num.toBigInt(
+              estimateFeeBulk[1].gas_consumed,
+            )
+            fees.transactions.pricePerUnit = num.toBigInt(
+              estimateFeeBulk[1].gas_price,
+            )
           }
         } else {
           if ("estimateDeclareFee" in selectedStarknetAccount) {
-            const { overall_fee, suggestedMaxFee } =
+            const { gas_consumed, gas_price } =
               await selectedStarknetAccount.estimateDeclareFee({
                 ...rest,
               })
-            txFee = num.toHex(overall_fee)
-            maxTxFee = num.toHex(suggestedMaxFee)
+
+            if (!gas_consumed || !gas_price) {
+              throw Error("gas_consumed or gas_price is undefined")
+            }
+
+            fees.transactions.amount = num.toBigInt(gas_consumed)
+            fees.transactions.pricePerUnit = num.toBigInt(gas_price)
           } else {
             throw Error("estimateDeclareFee not supported")
           }
         }
 
-        const suggestedMaxFee = argentMaxFee({ suggestedMaxFee: maxTxFee }) // This add the 1.5x overhead. i.e: suggestedMaxFee = maxFee * 2x =  estimatedFee * 1.5x
-
         return respond({
           type: "ESTIMATE_DECLARE_CONTRACT_FEE_RES",
-          data: {
-            amount: txFee,
-            suggestedMaxFee,
-            accountDeploymentFee,
-            maxADFee,
-          },
+          data: fees,
         })
       } catch (error) {
         console.error(error)
@@ -291,10 +174,13 @@ export const handleTransactionMessage: HandleMessage<
         throw Error("no accounts")
       }
 
-      let txFee = "0",
-        maxTxFee = "0",
-        accountDeploymentFee: string | undefined,
-        maxADFee: string | undefined
+      const fees: EstimatedFees = {
+        transactions: {
+          feeTokenAddress: ETH_TOKEN_ADDRESS,
+          amount: 0n,
+          pricePerUnit: 0n,
+        },
+      }
 
       try {
         if (
@@ -326,40 +212,61 @@ export const handleTransactionMessage: HandleMessage<
             const estimateFeeBulk =
               await selectedStarknetAccount.estimateFeeBulk(bulkTransactions)
 
-            accountDeploymentFee = num.toHex(estimateFeeBulk[0].overall_fee)
-            txFee = num.toHex(estimateFeeBulk[1].overall_fee)
-
-            maxADFee = argentMaxFee({
-              suggestedMaxFee: estimateFeeBulk[0].suggestedMaxFee,
-            })
-            maxTxFee = estimateFeeBulk[1].suggestedMaxFee.toString()
+            if (
+              !estimateFeeBulk[0].gas_consumed ||
+              !estimateFeeBulk[0].gas_price
+            ) {
+              throw Error(
+                "estimateFeeBulk[0].gas_consumed or estimateFeeBulk[0].gas_price is undefined",
+              )
+            }
+
+            fees.deployment = {
+              feeTokenAddress: ETH_TOKEN_ADDRESS,
+              amount: num.toBigInt(estimateFeeBulk[0].gas_consumed),
+              pricePerUnit: num.toBigInt(estimateFeeBulk[0].gas_price),
+            }
+
+            if (
+              !estimateFeeBulk[1].gas_consumed ||
+              !estimateFeeBulk[1].gas_price
+            ) {
+              throw Error(
+                "estimateFeeBulk[1].gas_consumed or estimateFeeBulk[1].gas_price is undefined",
+              )
+            }
+
+            fees.transactions.amount = num.toBigInt(
+              estimateFeeBulk[1].gas_consumed,
+            )
+            fees.transactions.pricePerUnit = num.toBigInt(
+              estimateFeeBulk[1].gas_price,
+            )
           }
         } else {
           if ("estimateDeployFee" in selectedStarknetAccount) {
-            const { overall_fee, suggestedMaxFee } =
+            const { gas_consumed, gas_price } =
               await selectedStarknetAccount.estimateDeployFee({
                 classHash,
                 salt,
                 unique,
                 constructorCalldata,
               })
-            txFee = num.toHex(overall_fee)
-            maxTxFee = num.toHex(suggestedMaxFee)
+
+            if (!gas_consumed || !gas_price) {
+              throw Error("gas_consumed or gas_price is undefined")
+            }
+
+            fees.transactions.amount = num.toBigInt(gas_consumed)
+            fees.transactions.pricePerUnit = num.toBigInt(gas_price)
           } else {
             throw Error("estimateDeployFee not supported")
           }
         }
 
-        const suggestedMaxFee = argentMaxFee({ suggestedMaxFee: maxTxFee }) // This adds the 1.5x overhead. i.e: suggestedMaxFee = maxFee * 2x =  estimatedFee * 1.5x
-
         return respond({
           type: "ESTIMATE_DEPLOY_CONTRACT_FEE_RES",
-          data: {
-            amount: txFee,
-            suggestedMaxFee,
-            accountDeploymentFee,
-            maxADFee,
-          },
+          data: fees,
         })
       } catch (error) {
         console.log(error)
@@ -549,12 +456,12 @@ export const handleTransactionMessage: HandleMessage<
           chainId,
         })
 
-        const estimatedFee = getEstimatedFeeFromSimulation(result)
+        const estimatedFee = getEstimatedFeeFromBulkSimulation(result)
 
         let simulationWithFees = null
 
         if (result) {
-          await addEstimatedFees(estimatedFee, transactions)
+          await addEstimatedFee(estimatedFee, transactions)
           simulationWithFees = {
             simulation: result,
             feeEstimation: estimatedFee,
diff --git a/packages/extension/src/background/transactions/transformers.ts b/packages/extension/src/background/transactions/transformers.ts
index 3ab1dfb02..1d76f6074 100644
--- a/packages/extension/src/background/transactions/transformers.ts
+++ b/packages/extension/src/background/transactions/transformers.ts
@@ -10,6 +10,8 @@ export const mapVoyagerTransactionToTransaction = (
   hash: transaction.hash,
   account,
   meta,
-  finalityStatus: transaction.status as any,
+  status: {
+    finality_status: transaction.status as any,
+  },
   timestamp: transaction.timestamp,
 })
diff --git a/packages/extension/src/background/udcAction.ts b/packages/extension/src/background/udcAction.ts
index 97cba8a24..c1967b8ed 100644
--- a/packages/extension/src/background/udcAction.ts
+++ b/packages/extension/src/background/udcAction.ts
@@ -12,13 +12,13 @@ import { ExtQueueItem } from "../shared/actionQueue/types"
 import { isAccountDeployed } from "./accountDeploy"
 import { analytics } from "./analytics"
 import { getNonce, increaseStoredNonce } from "./nonce"
-import { addTransaction } from "./transactions/store"
-import { checkTransactionHash } from "./transactions/transactionExecution"
-import { argentMaxFee } from "../shared/utils/argentMaxFee"
+import { addTransaction } from "../shared/transactions/store"
+import { modifySnjsFeeOverhead } from "../shared/utils/argentMaxFee"
 import { Wallet } from "./wallet"
 import { AccountError } from "../shared/errors/account"
 import { WalletError } from "../shared/errors/wallet"
 import { UdcError } from "../shared/errors/udc"
+import { checkTransactionHash } from "../shared/transactions/utils"
 
 const { UDC } = constants
 
@@ -84,10 +84,10 @@ export const udcDeclareContract = async (
         { skipValidate: true },
       )
 
-      maxADFee = argentMaxFee({
+      maxADFee = modifySnjsFeeOverhead({
         suggestedMaxFee: estimateFeeBulk[0].suggestedMaxFee,
       })
-      maxDeclareFee = argentMaxFee({
+      maxDeclareFee = modifySnjsFeeOverhead({
         suggestedMaxFee: estimateFeeBulk[1].suggestedMaxFee,
       })
     }
@@ -128,7 +128,7 @@ export const udcDeclareContract = async (
           nonce: declareNonce,
         },
       )
-      maxDeclareFee = argentMaxFee({ suggestedMaxFee })
+      maxDeclareFee = modifySnjsFeeOverhead({ suggestedMaxFee })
     } else {
       throw new UdcError({ code: "NO_STARKNET_DECLARE_FEE" })
     }
@@ -219,10 +219,10 @@ export const udcDeployContract = async (
         { skipValidate: true },
       )
 
-      maxADFee = argentMaxFee({
+      maxADFee = modifySnjsFeeOverhead({
         suggestedMaxFee: estimateFeeBulk[0].suggestedMaxFee,
       })
-      maxDeployFee = argentMaxFee({
+      maxDeployFee = modifySnjsFeeOverhead({
         suggestedMaxFee: estimateFeeBulk[1].suggestedMaxFee,
       })
     }
@@ -268,7 +268,7 @@ export const udcDeployContract = async (
           nonce: deployNonce,
         },
       )
-      maxDeployFee = argentMaxFee({ suggestedMaxFee })
+      maxDeployFee = modifySnjsFeeOverhead({ suggestedMaxFee })
     } else {
       throw new UdcError({ code: "NO_STARKNET_DECLARE_FEE" })
     }
diff --git a/packages/extension/src/background/wallet/account/shared.service.ts b/packages/extension/src/background/wallet/account/shared.service.ts
index c9f70c819..de5df252b 100644
--- a/packages/extension/src/background/wallet/account/shared.service.ts
+++ b/packages/extension/src/background/wallet/account/shared.service.ts
@@ -18,7 +18,7 @@ import {
   IRepository,
 } from "../../../shared/storage/__new/interface"
 import { accountsEqual } from "./../../../shared/utils/accountsEqual"
-import { getPathForIndex } from "../../keys/keyDerivation"
+import { getPathForIndex } from "../../../shared/utils/derivationPath"
 import { AccountError } from "../../../shared/errors/account"
 import { MULTISIG_ACCOUNT_CLASS_HASH } from "../../../shared/network/constants"
 import type { WalletStorageProps } from "../../../shared/wallet/walletStore"
diff --git a/packages/extension/src/background/wallet/crypto/starknet.service.ts b/packages/extension/src/background/wallet/crypto/starknet.service.ts
index 2fe176a3f..353590254 100644
--- a/packages/extension/src/background/wallet/crypto/starknet.service.ts
+++ b/packages/extension/src/background/wallet/crypto/starknet.service.ts
@@ -1,4 +1,4 @@
-import { calldataSchema, isEqualAddress } from "@argent/shared"
+import { isEqualAddress } from "@argent/shared"
 import { CairoVersion, CallData, hash } from "starknet"
 import { withHiddenSelector } from "../../../shared/account/selectors"
 import { MultisigSigner } from "../../../shared/multisig/signer"
@@ -12,12 +12,11 @@ import {
   BaseMultisigWalletAccount,
   ArgentAccountType,
 } from "../../../shared/wallet.model"
+import { getStarkPair, generatePublicKeys } from "../../keys/keyDerivation"
 import {
-  getStarkPair,
   getNextPathIndex,
   getPathForIndex,
-  generatePublicKeys,
-} from "../../keys/keyDerivation"
+} from "../../../shared/utils/derivationPath"
 
 import { WalletAccountSharedService } from "../account/shared.service"
 import { getMultisigAccountFromBaseWallet } from "../../../shared/multisig/utils/baseMultisig"
diff --git a/packages/extension/src/background/wallet/deployment/interface.ts b/packages/extension/src/background/wallet/deployment/interface.ts
index 05cf6300c..283bb1bf5 100644
--- a/packages/extension/src/background/wallet/deployment/interface.ts
+++ b/packages/extension/src/background/wallet/deployment/interface.ts
@@ -1,6 +1,5 @@
 import {
   DeployAccountContractPayload as StarknetDeployAccountContractPayload,
-  EstimateFee as StarknetEstimateFee,
   InvocationsDetails as StarknetInvocationDetails,
 } from "starknet"
 import {
@@ -9,10 +8,11 @@ import {
   MultisigData,
   WalletAccount,
 } from "../../../shared/wallet.model"
+import { EstimatedFee } from "../../../shared/transactionSimulation/fees/fees.model"
+import { Address } from "@argent/shared"
 
 // Extend to support multichain
 type InvocationsDetails = StarknetInvocationDetails
-type EstimateFee = StarknetEstimateFee
 type DeployAccountContractPayload = StarknetDeployAccountContractPayload
 
 export interface IWalletDeploymentService {
@@ -20,7 +20,10 @@ export interface IWalletDeploymentService {
     walletAccount: WalletAccount,
     transactionDetails?: InvocationsDetails | undefined,
   ): Promise<{ account: WalletAccount; txHash: string }>
-  getAccountDeploymentFee(walletAccount: WalletAccount): Promise<EstimateFee>
+  getAccountDeploymentFee(
+    walletAccount: WalletAccount,
+    feeTokenAddress?: Address,
+  ): Promise<EstimatedFee>
   redeployAccount(
     account: WalletAccount,
   ): Promise<{ account: WalletAccount; txHash: string }>
diff --git a/packages/extension/src/background/wallet/deployment/starknet.service.ts b/packages/extension/src/background/wallet/deployment/starknet.service.ts
index 584aed0c1..5402924ed 100644
--- a/packages/extension/src/background/wallet/deployment/starknet.service.ts
+++ b/packages/extension/src/background/wallet/deployment/starknet.service.ts
@@ -1,4 +1,5 @@
 import {
+  Address,
   addressSchema,
   isAccountV5,
   isContractDeployed,
@@ -8,7 +9,6 @@ import {
   CallData,
   DeployAccountContractPayload,
   DeployAccountContractTransaction,
-  EstimateFee,
   InvocationsDetails,
   hash,
 } from "starknet"
@@ -36,11 +36,11 @@ import {
   MULTISIG_DERIVATION_PATH,
   STANDARD_DERIVATION_PATH,
 } from "../../../shared/wallet.service"
+import { getStarkPair } from "../../keys/keyDerivation"
 import {
   getNextPathIndex,
   getPathForIndex,
-  getStarkPair,
-} from "../../keys/keyDerivation"
+} from "../../../shared/utils/derivationPath"
 import { getNonce, increaseStoredNonce } from "../../nonce"
 import { WalletAccountStarknetService } from "../account/starknet.service"
 import { WalletBackupService } from "../backup/backup.service"
@@ -51,9 +51,14 @@ import { PROXY_CONTRACT_CLASS_HASHES } from "../starknet.constants"
 import { IWalletDeploymentService } from "./interface"
 import { SessionError } from "../../../shared/errors/session"
 import { WalletError } from "../../../shared/errors/wallet"
-import { STANDARD_CAIRO_0_ACCOUNT_CLASS_HASH } from "../../../shared/network/constants"
+import {
+  ETH_TOKEN_ADDRESS,
+  STANDARD_CAIRO_0_ACCOUNT_CLASS_HASH,
+} from "../../../shared/network/constants"
 import { AccountError } from "../../../shared/errors/account"
-import { argentMaxFee } from "../../../shared/utils/argentMaxFee"
+import { modifySnjsFeeOverhead } from "../../../shared/utils/argentMaxFee"
+import { EstimatedFee } from "../../../shared/transactionSimulation/fees/fees.model"
+import { estimatedFeeToMaxFeeTotal } from "../../../shared/transactionSimulation/utils"
 
 const { getSelectorFromName, calculateContractAddressFromHash } = hash
 
@@ -91,11 +96,12 @@ export class WalletDeploymentStarknetService
       throw new AccountError({ code: "CANNOT_DEPLOY_OLD_ACCOUNTS" })
     }
     const maxFee = transactionDetails?.maxFee
-      ? argentMaxFee({ suggestedMaxFee: transactionDetails?.maxFee })
-      : argentMaxFee({
-          suggestedMaxFee: (await this.getAccountDeploymentFee(walletAccount))
-            .suggestedMaxFee,
+      ? modifySnjsFeeOverhead({
+          suggestedMaxFee: transactionDetails.maxFee,
         })
+      : estimatedFeeToMaxFeeTotal(
+          await this.getAccountDeploymentFee(walletAccount),
+        )
     const { transaction_hash } = await starknetAccount.deployAccount(
       deployAccountPayload,
       {
@@ -120,7 +126,8 @@ export class WalletDeploymentStarknetService
 
   public async getAccountDeploymentFee(
     walletAccount: WalletAccount,
-  ): Promise<EstimateFee> {
+    feeTokenAddress: Address = ETH_TOKEN_ADDRESS,
+  ): Promise<EstimatedFee> {
     const starknetAccount =
       await this.accountStarknetService.getStarknetAccount(walletAccount)
 
@@ -136,7 +143,22 @@ export class WalletDeploymentStarknetService
         code: "CANNOT_ESTIMATE_FEE_OLD_ACCOUNTS_DEPLOYMENT",
       })
     }
-    return starknetAccount.estimateAccountDeployFee(deployAccountPayload)
+    const { gas_consumed, gas_price } =
+      await starknetAccount.estimateAccountDeployFee(deployAccountPayload, {
+        skipValidate: true,
+      })
+
+    if (!gas_consumed || !gas_price) {
+      throw new AccountError({
+        code: "CANNOT_ESTIMATE_TRANSACTIONS",
+      })
+    }
+
+    return {
+      feeTokenAddress,
+      amount: gas_consumed,
+      pricePerUnit: gas_price,
+    }
   }
 
   public async redeployAccount(account: WalletAccount) {
diff --git a/packages/extension/src/background/wallet/index.ts b/packages/extension/src/background/wallet/index.ts
index 6504237a2..0acd90511 100644
--- a/packages/extension/src/background/wallet/index.ts
+++ b/packages/extension/src/background/wallet/index.ts
@@ -19,6 +19,7 @@ import { WalletRecoverySharedService } from "./recovery/shared.service"
 import { WalletSessionService } from "./session/session.service"
 import { WalletRecoveryStarknetService } from "./recovery/starknet.service"
 import { ProgressCallback } from "ethers"
+import { Address } from "@argent/shared"
 
 export class Wallet {
   constructor(
@@ -166,9 +167,13 @@ export class Wallet {
       transactionDetails,
     )
   }
-  public async getAccountDeploymentFee(walletAccount: WalletAccount) {
+  public async getAccountDeploymentFee(
+    walletAccount: WalletAccount,
+    feeTokenAddress?: Address,
+  ) {
     return this.walletDeploymentStarknetService.getAccountDeploymentFee(
       walletAccount,
+      feeTokenAddress,
     )
   }
   public async redeployAccount(account: WalletAccount) {
diff --git a/packages/extension/src/background/wallet/session/session.service.ts b/packages/extension/src/background/wallet/session/session.service.ts
index 944e3cfc3..ab2a5311d 100644
--- a/packages/extension/src/background/wallet/session/session.service.ts
+++ b/packages/extension/src/background/wallet/session/session.service.ts
@@ -8,7 +8,6 @@ import {
 import { noop, throttle } from "lodash-es"
 
 import { SessionError } from "../../../shared/errors/session"
-import { IScheduleService } from "../../../shared/schedule/interface"
 import { ObjectStorage } from "../../../shared/storage"
 import { IObjectStore } from "../../../shared/storage/__new/interface"
 import { adaptObjectStorage } from "../../../shared/storage/__new/object"
@@ -17,10 +16,8 @@ import {
   WalletStorageProps,
 } from "../backup/backup.service"
 import { WalletRecoverySharedService } from "../recovery/shared.service"
-import { Events, Locked } from "./interface"
 import { walletToKeystore } from "../utils"
-
-type TaskId = "sessionTimeout"
+import { Events, Locked } from "./interface"
 
 /**
  * @deprecated use `sessionRepo` instead
@@ -47,8 +44,6 @@ export class WalletSessionService {
     readonly sessionStore: IObjectStore<WalletSession | null>,
     private readonly backupService: WalletBackupService,
     private readonly recoverySharedService: WalletRecoverySharedService,
-    private readonly scheduleService: IScheduleService<TaskId>,
-    private SESSION_DURATION: number,
     private SCRYPT_N: number,
   ) {
     void (async () => {
@@ -143,16 +138,6 @@ export class WalletSessionService {
 
   async setSession(secret: string, password: string) {
     await this.sessionStore.set({ secret, password })
-
-    void this.scheduleService.registerImplementation({
-      id: "sessionTimeout",
-      callback: this.lock.bind(this),
-    })
-
-    void this.scheduleService.in(this.SESSION_DURATION * 6e3, {
-      id: "sessionTimeout",
-    })
-
     this.locked = false
   }
 
diff --git a/packages/extension/src/background/wallet/session/worker/implementation.ts b/packages/extension/src/background/wallet/session/worker/implementation.ts
new file mode 100644
index 000000000..402d2d614
--- /dev/null
+++ b/packages/extension/src/background/wallet/session/worker/implementation.ts
@@ -0,0 +1,49 @@
+import type { IScheduleService } from "../../../../shared/schedule/interface"
+import type { ISettingsStorage } from "../../../../shared/settings/types"
+import type { KeyValueStorage } from "../../../../shared/storage"
+import type { IBackgroundUIService } from "../../../__new/services/ui/interface"
+import {
+  onClose,
+  onOpen,
+} from "../../../__new/services/worker/schedule/decorators"
+import { pipe } from "../../../__new/services/worker/schedule/pipe"
+import type { WalletSessionService } from "../session.service"
+
+const autoLockTaskId = "WalletSessionWorker::autoLock"
+
+export class WalletSessionWorker {
+  constructor(
+    private readonly walletSessionService: WalletSessionService,
+    private readonly scheduleService: IScheduleService<typeof autoLockTaskId>,
+    private readonly backgroundUIService: IBackgroundUIService,
+    private readonly settingsStore: KeyValueStorage<ISettingsStorage>,
+  ) {
+    void this.scheduleService.registerImplementation({
+      id: autoLockTaskId,
+      callback: this.lock.bind(this),
+    })
+  }
+
+  async lock() {
+    void this.walletSessionService.lock()
+  }
+
+  onClose = pipe(onClose(this.backgroundUIService))(async () => {
+    const autoLockTimeMinutes = await this.settingsStore.get(
+      "autoLockTimeMinutes",
+    )
+    if (autoLockTimeMinutes === 0) {
+      return this.lock()
+    }
+    const autoLockTimeSeconds = autoLockTimeMinutes * 60
+    void this.scheduleService.in(autoLockTimeSeconds, {
+      id: autoLockTaskId,
+    })
+  })
+
+  onOpen = pipe(onOpen(this.backgroundUIService))(async () => {
+    void this.scheduleService.delete({
+      id: autoLockTaskId,
+    })
+  })
+}
diff --git a/packages/extension/src/background/wallet/session/worker/index.ts b/packages/extension/src/background/wallet/session/worker/index.ts
new file mode 100644
index 000000000..d16def97f
--- /dev/null
+++ b/packages/extension/src/background/wallet/session/worker/index.ts
@@ -0,0 +1,12 @@
+import { chromeScheduleService } from "../../../../shared/schedule"
+import { settingsStore } from "../../../../shared/settings"
+import { backgroundUIService } from "../../../__new/services/ui"
+import { sessionService } from "../../../walletSingleton"
+import { WalletSessionWorker } from "./implementation"
+
+export const walletSessionWorker = new WalletSessionWorker(
+  sessionService,
+  chromeScheduleService,
+  backgroundUIService,
+  settingsStore,
+)
diff --git a/packages/extension/src/background/wallet/test.utils.ts b/packages/extension/src/background/wallet/test.utils.ts
index fc957ae11..28bab549c 100644
--- a/packages/extension/src/background/wallet/test.utils.ts
+++ b/packages/extension/src/background/wallet/test.utils.ts
@@ -22,14 +22,12 @@ import { WalletRecoveryStarknetService } from "./recovery/starknet.service"
 import { WalletSessionService } from "./session/session.service"
 import { Wallet } from "."
 import { MultisigBackendService } from "../../shared/multisig/service/backend/implementation"
-import { IScheduleService } from "../../shared/schedule/interface"
 import { WalletStorageProps } from "../../shared/wallet/walletStore"
 
 const isDev = true
 const isTest = true
 const isDevOrTest = isDev || isTest
 const SCRYPT_N = isDevOrTest ? 64 : 262144
-const SESSION_DURATION = isDev ? 24 * 60 * 60 : 30 * 60
 const defaultKeyValueStorage = {
   get: vi.fn(),
   set: vi.fn(),
@@ -102,15 +100,6 @@ export const backupServiceMock = new WalletBackupService(
   networkServiceMock,
 )
 
-const schedulingServiceMock: IScheduleService = {
-  in: vi.fn(),
-  every: vi.fn(),
-  delete: vi.fn(),
-  registerImplementation: vi.fn(),
-  onInstallAndUpgrade: vi.fn(),
-  onStartup: vi.fn(),
-}
-
 export const emitterMock = {
   anyEvent: vi.fn(),
   bindMethods: vi.fn(),
@@ -171,8 +160,6 @@ export const sessionServiceMock = new WalletSessionService(
   getSessionStoreMock(),
   backupServiceMock,
   recoverySharedServiceMock,
-  schedulingServiceMock,
-  SESSION_DURATION,
   SCRYPT_N,
 )
 
diff --git a/packages/extension/src/background/walletSingleton.ts b/packages/extension/src/background/walletSingleton.ts
index 3b02cd4c3..9b68daf79 100644
--- a/packages/extension/src/background/walletSingleton.ts
+++ b/packages/extension/src/background/walletSingleton.ts
@@ -6,7 +6,6 @@ import {
   pendingMultisigRepo,
 } from "../shared/multisig/repository"
 import { networkService } from "../shared/network/service"
-import { chromeScheduleService } from "../shared/schedule"
 import { walletStore } from "../shared/wallet/walletStore"
 import { Wallet } from "./wallet"
 import { WalletAccountSharedService } from "./wallet/account/shared.service"
@@ -31,7 +30,6 @@ const isDev = process.env.NODE_ENV === "development"
 const isTest = process.env.NODE_ENV === "test"
 const isDevOrTest = isDev || isTest
 const SCRYPT_N = isDevOrTest ? 64 : 262144
-const SESSION_DURATION = isDev ? 24 * 60 * 60 : 30 * 60 // 30 mins in prod, 24 hours in dev
 
 export const walletSessionServiceEmitter = new Emittery<SessionEvents>()
 export const walletRecoverySharedServiceEmitter =
@@ -81,8 +79,6 @@ export const sessionService = new WalletSessionService(
   sessionRepo,
   backupService,
   recoverySharedService,
-  chromeScheduleService,
-  SESSION_DURATION,
   SCRYPT_N,
 )
 
diff --git a/packages/extension/src/background/workers.ts b/packages/extension/src/background/workers.ts
index b7ff04b2f..f00aeb35e 100644
--- a/packages/extension/src/background/workers.ts
+++ b/packages/extension/src/background/workers.ts
@@ -3,10 +3,13 @@ import { nftsWorker } from "./__new/services/nft/worker"
 import { analyticsWorker } from "./__new/services/analytics"
 import { networkWorker } from "./__new/services/network"
 import { onboardingWorker } from "./__new/services/onboarding"
-import { tokenWorker } from "../shared/token/__new/worker"
-import { accountWorker } from "../shared/account/worker"
-import { knownDappsWorker } from "./../shared/knownDapps/worker"
+import { tokenWorker } from "./__new/services/token/worker"
+import { accountWorker } from "./__new/services/account/worker"
+import { knownDappsWorker } from "./__new/services/knownDapps/worker"
 import { transactionReviewWorker } from "./__new/services/transactionReview/worker"
+import { walletSessionWorker } from "./wallet/session/worker"
+import { preAuthorisationWorker } from "./__new/services/preAuthorization/worker"
+import { transactionsWorker } from "./__new/services/transactions/worker"
 
 /** TODO: refactor: remove this facade */
 export function initWorkers() {
@@ -20,5 +23,8 @@ export function initWorkers() {
     knownDappsWorker,
     analyticsWorker,
     transactionReviewWorker,
+    walletSessionWorker,
+    preAuthorisationWorker,
+    transactionsWorker,
   }
 }
diff --git a/packages/extension/src/inpage/index.ts b/packages/extension/src/inpage/index.ts
index 161c87280..4c8dfd1a0 100644
--- a/packages/extension/src/inpage/index.ts
+++ b/packages/extension/src/inpage/index.ts
@@ -1,4 +1,4 @@
-import { assertNever } from "./../ui/services/assertNever"
+import { assertNever } from "../shared/utils/assertNever"
 import type { WindowMessageType } from "../shared/messages"
 import { getProvider } from "../shared/network/provider"
 import { disconnectAccount } from "./account"
diff --git a/packages/extension/src/inpage/requestMessageHandlers.ts b/packages/extension/src/inpage/requestMessageHandlers.ts
index 7045b9ed0..125dc9462 100644
--- a/packages/extension/src/inpage/requestMessageHandlers.ts
+++ b/packages/extension/src/inpage/requestMessageHandlers.ts
@@ -6,6 +6,8 @@ import type {
 
 import type { Network } from "../shared/network/type"
 import { sendMessage, waitForMessage } from "./messageActions"
+import { ETH_TOKEN_ADDRESS } from "../shared/network/constants"
+import { inpageMessageClient } from "./trpcClient"
 
 export async function handleAddTokenRequest(
   callParams: WatchAssetParameters,
@@ -70,6 +72,9 @@ export async function handleAddNetworkRequest(
       rpcUrl: callParams.rpcUrls?.[0] ?? "",
       explorerUrl: callParams.blockExplorerUrls?.[0],
       accountClassHash: (callParams as any).accountImplementation,
+      possibleFeeTokenAddresses: [
+        (callParams.nativeCurrency?.address as Address) ?? ETH_TOKEN_ADDRESS,
+      ],
     },
   })
 
@@ -168,3 +173,41 @@ export async function handleSwitchNetworkRequest(callParams: {
 
   return true
 }
+
+interface GetDeploymentDataResult {
+  address: string // Represented as 'felt252'
+  class_hash: string // Represented as 'felt252'
+  salt: string // Represented as 'felt252'
+  calldata: string[] // Array of 'felt252', length := calldata_len
+}
+
+const toHex = (x: bigint) => `0x${x.toString(16)}`
+
+const isStringArray = (x: any): x is string[] =>
+  x.every((y: any) => typeof y === "string")
+
+export async function handleDeploymentData(): Promise<GetDeploymentDataResult> {
+  const deploymentData =
+    await inpageMessageClient.accountMessaging.getAccountDeploymentPayload.query()
+
+  const { classHash, constructorCalldata, addressSalt, contractAddress } =
+    deploymentData
+
+  if (!classHash || !constructorCalldata || !addressSalt || !contractAddress) {
+    throw new Error("Deployment data not found")
+  }
+
+  if (!isStringArray(constructorCalldata)) {
+    throw new Error("Constructor calldata is not an array of hex strings")
+  }
+
+  const _addressSalt = toHex(BigInt(addressSalt))
+  const _callData = constructorCalldata.map((x) => toHex(BigInt(x)))
+
+  return {
+    address: contractAddress,
+    class_hash: classHash,
+    salt: _addressSalt,
+    calldata: _callData,
+  }
+}
diff --git a/packages/extension/src/inpage/starknetWindowObject.ts b/packages/extension/src/inpage/starknetWindowObject.ts
index 4e18e9864..377770e3b 100644
--- a/packages/extension/src/inpage/starknetWindowObject.ts
+++ b/packages/extension/src/inpage/starknetWindowObject.ts
@@ -5,13 +5,14 @@ import type {
   WalletEvents,
 } from "@argent/x-window"
 
-import { assertNever } from "./../ui/services/assertNever"
+import { assertNever } from "../shared/utils/assertNever"
 import { ArgentXAccount } from "./ArgentXAccount"
 import { sendMessage, waitForMessage } from "./messageActions"
 import { getIsPreauthorized } from "./messaging"
 import {
   handleAddNetworkRequest,
   handleAddTokenRequest,
+  handleDeploymentData,
   handleSwitchNetworkRequest,
 } from "./requestMessageHandlers"
 import { ArgentXAccount4 } from "./ArgentXAccount4"
@@ -47,6 +48,14 @@ export const starknetWindowObject: StarknetWindowObject = {
       "chainId" in call.params
     ) {
       return await handleSwitchNetworkRequest(call.params)
+    } else if (
+      // Currently not part of the spec
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
+      call.type === "wallet_deploymentData"
+    ) {
+      console.warn("Using non-standard wallet_deploymentData")
+      return (await handleDeploymentData()) as any
     }
     throw Error("Not implemented")
   },
diff --git a/packages/extension/src/inpage/trpcClient.ts b/packages/extension/src/inpage/trpcClient.ts
index c36b7f985..edce41150 100644
--- a/packages/extension/src/inpage/trpcClient.ts
+++ b/packages/extension/src/inpage/trpcClient.ts
@@ -2,7 +2,9 @@ import { createTRPCProxyClient } from "@trpc/client"
 import { windowLink } from "trpc-browser/link"
 
 import { AppRouter } from "../background/__new/router"
+import superjson from "superjson"
 
 export const inpageMessageClient = createTRPCProxyClient<AppRouter>({
+  transformer: superjson,
   links: [windowLink({ window })],
 })
diff --git a/packages/extension/src/shared/account/details/getAccountClassHashFromChain.test.ts b/packages/extension/src/shared/account/details/getAccountClassHashFromChain.test.ts
index 3445c8848..c87a7e4f0 100644
--- a/packages/extension/src/shared/account/details/getAccountClassHashFromChain.test.ts
+++ b/packages/extension/src/shared/account/details/getAccountClassHashFromChain.test.ts
@@ -1,6 +1,6 @@
+import { Mocked, MockedFunction } from "vitest"
 import { getAccountClassHashFromChain } from "./getAccountClassHashFromChain"
-import { tryGetClassHash } from "./tryGetClassHashFromMulticall"
-import { tryGetClassHashFromProvider } from "./tryGetClassHashFromProvider"
+import { tryGetClassHash } from "./tryGetClassHash"
 import { networkService } from "../../network/service"
 import { getProvider } from "../../network"
 import { getMulticallForNetwork } from "../../multicall"
@@ -18,20 +18,16 @@ import {
 vi.mock("../../network/service")
 vi.mock("../../multicall")
 vi.mock("../../network")
-vi.mock("./tryGetClassHashFromMulticall")
-vi.mock("./tryGetClassHashFromProvider")
-
-const mockNetworkService = networkService as jest.Mocked<typeof networkService>
-const mockGetMulticallForNetwork =
-  getMulticallForNetwork as jest.MockedFunction<typeof getMulticallForNetwork>
-const mockGetProvider = getProvider as jest.MockedFunction<typeof getProvider>
-const mockTryGetClassHashFromMulticall = tryGetClassHash as jest.MockedFunction<
+vi.mock("./tryGetClassHash")
+
+const mockNetworkService = networkService as Mocked<typeof networkService>
+const mockGetMulticallForNetwork = getMulticallForNetwork as MockedFunction<
+  typeof getMulticallForNetwork
+>
+const mockGetProvider = getProvider as MockedFunction<typeof getProvider>
+const mockTryGetClassHash = tryGetClassHash as MockedFunction<
   typeof tryGetClassHash
 >
-const mockTryGetClassHashFromProvider =
-  tryGetClassHashFromProvider as jest.MockedFunction<
-    typeof tryGetClassHashFromProvider
-  >
 
 describe("getAccountClassHashFromChain", () => {
   beforeEach(() => {
@@ -56,9 +52,7 @@ describe("getAccountClassHashFromChain", () => {
       }),
     ]
 
-    mockTryGetClassHashFromMulticall.mockResolvedValueOnce(
-      STANDARD_ACCOUNT_CLASS_HASH,
-    )
+    mockTryGetClassHash.mockResolvedValueOnce(STANDARD_ACCOUNT_CLASS_HASH)
 
     const call = {
       contractAddress: accounts[0].address,
@@ -84,13 +78,13 @@ describe("getAccountClassHashFromChain", () => {
       addressSchema.parse(STANDARD_ACCOUNT_CLASS_HASH),
     )
 
-    expect(mockTryGetClassHashFromMulticall).toHaveBeenCalledWith(
+    expect(mockTryGetClassHash).toHaveBeenCalledWith(
       call,
       expect.objectContaining({
         callContract: expect.any(Function),
         getClassHashAt: expect.any(Function),
       }),
-      STANDARD_ACCOUNT_CLASS_HASH,
+      "standard",
     )
 
     expect(results[0]).toEqual({
@@ -128,7 +122,7 @@ describe("getAccountClassHashFromChain", () => {
       }),
     ]
 
-    mockTryGetClassHashFromMulticall
+    mockTryGetClassHash
       .mockResolvedValueOnce(STANDARD_ACCOUNT_CLASS_HASH)
       .mockResolvedValueOnce(MULTISIG_ACCOUNT_CLASS_HASH)
 
@@ -166,7 +160,7 @@ describe("getAccountClassHashFromChain", () => {
       addressSchema.parse(MULTISIG_ACCOUNT_CLASS_HASH),
     )
 
-    expect(mockTryGetClassHashFromMulticall).toHaveBeenNthCalledWith(
+    expect(mockTryGetClassHash).toHaveBeenNthCalledWith(
       1,
       first_call,
       expect.objectContaining({
@@ -176,7 +170,7 @@ describe("getAccountClassHashFromChain", () => {
       STANDARD_ACCOUNT_CLASS_HASH,
     )
 
-    expect(mockTryGetClassHashFromMulticall).toHaveBeenNthCalledWith(
+    expect(mockTryGetClassHash).toHaveBeenNthCalledWith(
       2,
       second_call,
       expect.objectContaining({
@@ -219,15 +213,6 @@ describe("getAccountClassHashFromChain", () => {
       }),
     ]
 
-    const call = {
-      contractAddress: accounts[0].address,
-      entrypoint: "get_implementation",
-    }
-
-    mockTryGetClassHashFromProvider.mockResolvedValueOnce(
-      STANDARD_ACCOUNT_CLASS_HASH,
-    )
-
     mockGetProvider.mockReturnValueOnce({
       callContract: vi
         .fn()
@@ -236,18 +221,15 @@ describe("getAccountClassHashFromChain", () => {
         .fn()
         .mockResolvedValueOnce(STANDARD_ACCOUNT_CLASS_HASH),
     } as any)
+    mockTryGetClassHash.mockResolvedValueOnce(STANDARD_ACCOUNT_CLASS_HASH)
 
     const results = await getAccountClassHashFromChain(accounts)
 
-    expect(mockTryGetClassHashFromProvider).toBeCalledWith(
-      call,
-      mockGetProvider.mock.results[0].value,
-    )
     expect(results[0].classHash).not.toBeUndefined()
     expect(results[0].classHash).toEqual(
       addressSchema.parse(STANDARD_ACCOUNT_CLASS_HASH),
     )
-    expect(mockTryGetClassHashFromMulticall).not.toHaveBeenCalled()
+    expect(mockTryGetClassHash).toHaveBeenCalledTimes(1)
     expect(results[0]).toEqual({
       address: accounts[0].address,
       networkId: accounts[0].networkId,
diff --git a/packages/extension/src/shared/account/details/getAccountClassHashFromChain.ts b/packages/extension/src/shared/account/details/getAccountClassHashFromChain.ts
index 6a8040a8a..fe8905ff9 100644
--- a/packages/extension/src/shared/account/details/getAccountClassHashFromChain.ts
+++ b/packages/extension/src/shared/account/details/getAccountClassHashFromChain.ts
@@ -8,8 +8,7 @@ import { mapImplementationToArgentAccountType } from "../../network/utils"
 import { ArgentAccountType, WalletAccount } from "../../wallet.model"
 import { accountsEqual } from "../../utils/accountsEqual"
 import { addressSchema } from "@argent/shared"
-import { tryGetClassHash } from "./tryGetClassHashFromMulticall"
-import { tryGetClassHashFromProvider } from "./tryGetClassHashFromProvider"
+import { tryGetClassHash } from "./tryGetClassHash"
 import {
   MULTISIG_ACCOUNT_CLASS_HASH,
   STANDARD_ACCOUNT_CLASS_HASH,
@@ -21,6 +20,9 @@ export type AccountClassHashFromChain = Pick<
 >
 
 const getDefaultClassHash = (account: WalletAccount) => {
+  if (account.network.accountClassHash?.standard) {
+    return account.network.accountClassHash?.standard
+  }
   if (account.type === "multisig") {
     return MULTISIG_ACCOUNT_CLASS_HASH
   }
@@ -99,8 +101,8 @@ export async function getAccountClassHashFromChain(
           }
           /** fallback to single calls */
           const responses = await Promise.all(
-            classHashWithCalls.map(({ call }) =>
-              tryGetClassHashFromProvider(call, provider),
+            classHashWithCalls.map(({ classHash, call }) =>
+              tryGetClassHash(call, provider, classHash),
             ),
           )
           const results: string[] = responses.map((res) => num.toHex(res))
diff --git a/packages/extension/src/shared/account/details/getGuardian.ts b/packages/extension/src/shared/account/details/getGuardian.ts
index 80f786da0..75624fd9e 100644
--- a/packages/extension/src/shared/account/details/getGuardian.ts
+++ b/packages/extension/src/shared/account/details/getGuardian.ts
@@ -12,7 +12,7 @@ export const getGuardianForAccount = async (
   account: BaseWalletAccount,
 ): Promise<string | undefined> => {
   const network = await networkService.getById(account.networkId)
-  // Prioritize Cairo 1 get_guardian over cairo 0 get_guardian
+  // Prioritize Cairo 1 get_guardian over cairo 0 getGuardian
   const call: Call = {
     contractAddress: account.address,
     entrypoint: "get_guardian",
diff --git a/packages/extension/src/shared/account/details/getOwner.ts b/packages/extension/src/shared/account/details/getOwner.ts
new file mode 100644
index 000000000..923aa7baa
--- /dev/null
+++ b/packages/extension/src/shared/account/details/getOwner.ts
@@ -0,0 +1,30 @@
+import { Call } from "starknet"
+
+import { getMulticallForNetwork } from "../../multicall"
+import { networkService } from "../../network/service"
+import { BaseWalletAccount } from "../../wallet.model"
+
+/**
+ * Get owner public key of account
+ */
+
+export const getOwnerForAccount = async (
+  account: BaseWalletAccount,
+): Promise<string | undefined> => {
+  const network = await networkService.getById(account.networkId)
+  // Prioritize Cairo 1 get_owner over cairo 0 getOwner
+  const call: Call = {
+    contractAddress: account.address,
+    entrypoint: "get_owner",
+  }
+  const multicall = getMulticallForNetwork(network)
+  let response: { result: string[] } = { result: [] }
+
+  try {
+    response = await multicall.callContract(call)
+  } catch {
+    call.entrypoint = "getOwner"
+    response = await multicall.callContract(call)
+  }
+  return response.result[0]
+}
diff --git a/packages/extension/src/shared/account/details/tryGetClassHashFromMulticall.ts b/packages/extension/src/shared/account/details/tryGetClassHash.ts
similarity index 100%
rename from packages/extension/src/shared/account/details/tryGetClassHashFromMulticall.ts
rename to packages/extension/src/shared/account/details/tryGetClassHash.ts
diff --git a/packages/extension/src/shared/account/details/tryGetClassHashFromProvider.ts b/packages/extension/src/shared/account/details/tryGetClassHashFromProvider.ts
deleted file mode 100644
index c4d4f1f3e..000000000
--- a/packages/extension/src/shared/account/details/tryGetClassHashFromProvider.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Call, ProviderInterface } from "starknet"
-import { STANDARD_ACCOUNT_CLASS_HASH } from "../../network/constants"
-
-export async function tryGetClassHashFromProvider(
-  call: Call,
-  provider: ProviderInterface,
-): Promise<string> {
-  return provider
-    .callContract(call)
-    .then((res) => res.result[0])
-    .catch(() => provider.getClassHashAt(call.contractAddress))
-    .catch(() => STANDARD_ACCOUNT_CLASS_HASH)
-}
diff --git a/packages/extension/src/shared/account/service/implementation.ts b/packages/extension/src/shared/account/service/implementation.ts
index 8b49f3bd3..b2548d6b6 100644
--- a/packages/extension/src/shared/account/service/implementation.ts
+++ b/packages/extension/src/shared/account/service/implementation.ts
@@ -18,6 +18,15 @@ export class AccountService implements IAccountService {
     return this.accountRepo.get(selector)
   }
 
+  async getFromBaseWalletAccounts(baseWalletAccounts: BaseWalletAccount[]) {
+    const accounts = await this.get((account) => {
+      return baseWalletAccounts.some((baseWalletAccount) =>
+        accountsEqual(account, baseWalletAccount),
+      )
+    })
+    return accounts
+  }
+
   async upsert(account: AllowArray<WalletAccount>): Promise<void> {
     await this.accountRepo.upsert(account)
   }
diff --git a/packages/extension/src/shared/account/service/interface.ts b/packages/extension/src/shared/account/service/interface.ts
index 880921167..6f18506ba 100644
--- a/packages/extension/src/shared/account/service/interface.ts
+++ b/packages/extension/src/shared/account/service/interface.ts
@@ -4,6 +4,9 @@ import { BaseWalletAccount, WalletAccount } from "../../wallet.model"
 export interface IAccountService {
   // Repo methods
   get(selector?: SelectorFn<WalletAccount>): Promise<WalletAccount[]>
+  getFromBaseWalletAccounts(
+    baseWalletAccounts: BaseWalletAccount[],
+  ): Promise<WalletAccount[]>
   upsert(account: AllowArray<WalletAccount>): Promise<void>
   remove(baseAccount: BaseWalletAccount): Promise<void>
 
diff --git a/packages/extension/src/shared/account/worker/index.ts b/packages/extension/src/shared/account/worker/index.ts
deleted file mode 100644
index 828dd9abd..000000000
--- a/packages/extension/src/shared/account/worker/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { chromeScheduleService } from "../../schedule"
-import { accountService } from "../service"
-import { AccountWorker } from "./implementation"
-
-export const accountWorker = new AccountWorker(
-  accountService,
-  chromeScheduleService,
-)
diff --git a/packages/extension/src/shared/actionQueue/queue/queue.ts b/packages/extension/src/shared/actionQueue/queue/queue.ts
index a9298850d..15489c238 100644
--- a/packages/extension/src/shared/actionQueue/queue/queue.ts
+++ b/packages/extension/src/shared/actionQueue/queue/queue.ts
@@ -1,14 +1,10 @@
 import { partition } from "lodash-es"
-import oHash from "object-hash"
 
 import type { IRepository } from "../../storage/__new/interface"
 import type { ActionQueueItemMeta } from "../schema"
 import { isTransactionActionItem, type ExtQueueItem } from "../types"
 import type { IActionQueue } from "./interface"
-
-function objectHash(obj: object | null) {
-  return oHash(obj, { unorderedArrays: true })
-}
+import { objectHash } from "../../objectHash"
 
 type AllObjects = Record<string | number | symbol, unknown>
 
diff --git a/packages/extension/src/shared/activity/storage.ts b/packages/extension/src/shared/activity/storage.ts
index 2c1674e3b..d6bd20ad6 100644
--- a/packages/extension/src/shared/activity/storage.ts
+++ b/packages/extension/src/shared/activity/storage.ts
@@ -1,11 +1,14 @@
 import { KeyValueStorage } from "../storage"
-import { IActivityStorage } from "./types"
+import { adaptKeyValue } from "../storage/__new/keyvalue"
+import type { IActivityStorage } from "./types"
 
-export const activityStore = new KeyValueStorage<IActivityStorage>(
+const keyValueStorage = new KeyValueStorage<IActivityStorage>(
   {
-    latestBalanceChangingActivity: null,
+    modifiedAfter: {},
   },
   {
     namespace: "service:activity",
   },
 )
+
+export const activityStore = adaptKeyValue(keyValueStorage)
diff --git a/packages/extension/src/shared/activity/types.ts b/packages/extension/src/shared/activity/types.ts
index d159d524b..188aab1f9 100644
--- a/packages/extension/src/shared/activity/types.ts
+++ b/packages/extension/src/shared/activity/types.ts
@@ -1,9 +1,3 @@
-export interface IActivity {
-  id: string
-  lastModified: number
-}
 export interface IActivityStorage {
-  latestBalanceChangingActivity: {
-    [address: string]: IActivity
-  } | null
+  modifiedAfter: Record<string, number>
 }
diff --git a/packages/extension/src/shared/api/constants.ts b/packages/extension/src/shared/api/constants.ts
index 89ede8eea..09ff6a82b 100644
--- a/packages/extension/src/shared/api/constants.ts
+++ b/packages/extension/src/shared/api/constants.ts
@@ -79,3 +79,7 @@ export const ARGENT_ACCOUNT_DISCOVERY_URL = ARGENT_API_ENABLED
 export const ARGENT_MULTISIG_DISCOVERY_URL = ARGENT_MULTISIG_URL
   ? urlJoin(ARGENT_MULTISIG_URL)
   : undefined
+
+export const ARGENT_SWAP_BASE_URL = ARGENT_API_ENABLED
+  ? urlJoin(ARGENT_API_BASE_URL, "tokens/swap")
+  : undefined
diff --git a/packages/extension/src/shared/api/fetcher.ts b/packages/extension/src/shared/api/fetcher.ts
index a1c554bfc..8b3a171cf 100644
--- a/packages/extension/src/shared/api/fetcher.ts
+++ b/packages/extension/src/shared/api/fetcher.ts
@@ -2,6 +2,7 @@
 
 import { defaultNetwork } from "../network"
 import { walletStore } from "../wallet/walletStore"
+import { argentApiHeadersForNetwork } from "./headers"
 
 export type Fetcher = <T>(
   input: RequestInfo | URL,
@@ -94,22 +95,3 @@ export const fetcherWithArgentApiHeaders = async (
   const fetcher = fetcherWithArgentApiHeadersForNetwork(networkId, fetcherImpl)
   return fetcher
 }
-
-/** convert KnownNetworksType to 'goerli' or 'mainnet' expected by API */
-
-export const argentApiNetworkForNetwork = (network: string) => {
-  return network === "goerli-alpha"
-    ? "goerli"
-    : network === "mainnet-alpha"
-    ? "mainnet"
-    : null
-}
-
-export const argentApiHeadersForNetwork = (network: string) => {
-  const argentNetwork = argentApiNetworkForNetwork(network)
-  return {
-    "argent-version": process.env.VERSION || "Unknown version",
-    "argent-client": "argent-x",
-    ...(argentNetwork && { "argent-network": argentNetwork }),
-  }
-}
diff --git a/packages/extension/src/shared/api/headers.ts b/packages/extension/src/shared/api/headers.ts
new file mode 100644
index 000000000..10ebd13b9
--- /dev/null
+++ b/packages/extension/src/shared/api/headers.ts
@@ -0,0 +1,28 @@
+const makeArgentXHeaders = () => ({
+  "argent-version": process.env.VERSION || "Unknown version",
+  "argent-client": "argent-x",
+})
+
+export const argentXHeaders = makeArgentXHeaders()
+
+/** convert KnownNetworksType to 'goerli' or 'mainnet' expected by API */
+
+export const argentApiNetworkForNetwork = (network: string) => {
+  return network === "goerli-alpha"
+    ? "goerli"
+    : network === "mainnet-alpha"
+    ? "mainnet"
+    : null
+}
+
+export const argentApiHeadersForNetwork = (network: string) => {
+  const argentNetwork = argentApiNetworkForNetwork(network)
+  const defaultHeaders = makeArgentXHeaders()
+  if (!argentNetwork) {
+    return defaultHeaders
+  }
+  return {
+    ...defaultHeaders,
+    "argent-network": argentNetwork,
+  }
+}
diff --git a/packages/extension/src/shared/argentAccount/service/interface.ts b/packages/extension/src/shared/argentAccount/interface.ts
similarity index 77%
rename from packages/extension/src/shared/argentAccount/service/interface.ts
rename to packages/extension/src/shared/argentAccount/interface.ts
index ae6f95eb9..ee1835ea7 100644
--- a/packages/extension/src/shared/argentAccount/service/interface.ts
+++ b/packages/extension/src/shared/argentAccount/interface.ts
@@ -1,5 +1,4 @@
-import { PreferencesPayload } from "../../../background/__new/procedures/argentAccount/updatePreferences.model"
-import { EmailPreferences } from "../../../ui/services/argentAccount/utils"
+import type { PreferencesPayload, EmailPreferences } from "./schema"
 
 interface IArgentAccountService {
   addAccount(): Promise<string>
diff --git a/packages/extension/src/background/__new/procedures/argentAccount/updatePreferences.model.ts b/packages/extension/src/shared/argentAccount/schema.ts
similarity index 66%
rename from packages/extension/src/background/__new/procedures/argentAccount/updatePreferences.model.ts
rename to packages/extension/src/shared/argentAccount/schema.ts
index be639cae1..639e93ed8 100644
--- a/packages/extension/src/background/__new/procedures/argentAccount/updatePreferences.model.ts
+++ b/packages/extension/src/shared/argentAccount/schema.ts
@@ -12,3 +12,10 @@ export const preferencesEndpointPayload = z.object({
 })
 
 export type PreferencesPayload = z.infer<typeof preferencesEndpointPayload>
+
+export const emailPreferencesSchema = z.object({
+  isNewsletterEnabled: z.boolean(),
+  isAnnouncementsEnabled: z.boolean(),
+})
+
+export type EmailPreferences = z.infer<typeof emailPreferencesSchema>
diff --git a/packages/extension/src/shared/browser/host.ts b/packages/extension/src/shared/browser/host.ts
index c78235624..2f39f392e 100644
--- a/packages/extension/src/shared/browser/host.ts
+++ b/packages/extension/src/shared/browser/host.ts
@@ -1,11 +1,6 @@
 import browser from "webextension-polyfill"
 
-/**
- * @returns the equivalent of `window.location.host` for the active tab
- * @note this will return the extension URL when inside a popup
- */
-
-export const getWindowLocationHost = async () => {
+export const getWindowURL = async () => {
   const tabs = await browser.tabs.query({
     active: true,
     currentWindow: true,
@@ -14,7 +9,20 @@ export const getWindowLocationHost = async () => {
     const tab = tabs[0]
     if (tab.url) {
       const url = new URL(tab.url)
-      return url.host
+      return url
     }
   }
 }
+
+/**
+ * @returns the equivalent of `window.location.host` for the active tab
+ * @note this will return the extension URL when inside a popup
+ */
+
+export const getWindowLocationHost = async () => {
+  const url = await getWindowURL()
+  if (!url) {
+    return
+  }
+  return url.host
+}
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/change-guardian-add.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/change-guardian-add.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/change-guardian-add.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/change-guardian-add.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/change-guardian-remove.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/change-guardian-remove.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/change-guardian-remove.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/change-guardian-remove.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc1155-transfer.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc1155-transfer.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc1155-transfer.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc1155-transfer.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-mint-test-token.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-mint-test-token.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-mint-test-token.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-mint-test-token.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-alpha-road.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-alpha-road.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-alpha-road.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-alpha-road.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-jediswap.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-jediswap.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-jediswap.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-jediswap.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-my-swap.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-my-swap.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-my-swap.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-swap-my-swap.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-transfer.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-transfer.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-transfer.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc20-transfer.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc721-mint-aspect.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc721-mint-aspect.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc721-mint-aspect.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc721-mint-aspect.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc721-transfer.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc721-transfer.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/erc721-transfer.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/erc721-transfer.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/index.ts b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/index.ts
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/index.ts
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/index.ts
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-add-owner.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-add-owner.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-add-owner.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-add-owner.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-remove-owner.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-remove-owner.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-remove-owner.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-remove-owner.json
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-replace-owner.json b/packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-replace-owner.json
similarity index 100%
rename from packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-replace-owner.json
rename to packages/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha/multisig-replace-owner.json
diff --git a/packages/extension/src/shared/call/__test__/nftTransferCall.test.ts b/packages/extension/src/shared/call/__test__/nftTransferCall.test.ts
index 8cdf1cd76..ac00257d0 100644
--- a/packages/extension/src/shared/call/__test__/nftTransferCall.test.ts
+++ b/packages/extension/src/shared/call/__test__/nftTransferCall.test.ts
@@ -3,7 +3,7 @@ import { describe, expect, test } from "vitest"
 import {
   erc1155Transfer,
   erc721Transfer,
-} from "../../../ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha"
+} from "./__fixtures__/transaction-calls/goerli-alpha"
 import { NftTransferCall, parseNftTransferCall } from "../nftTransferCall"
 
 describe("nftTransferCall", () => {
diff --git a/packages/extension/src/shared/call/erc20Call.ts b/packages/extension/src/shared/call/erc20Call.ts
index 6a2f7e8e1..7c7f6ab1d 100644
--- a/packages/extension/src/shared/call/erc20Call.ts
+++ b/packages/extension/src/shared/call/erc20Call.ts
@@ -1,9 +1,7 @@
+import { normalizeAddress } from "@argent/shared"
 import { Call, constants, validateAndParseAddress } from "starknet"
 import { num, uint256 } from "starknet"
 
-import { normalizeAddress } from "../../ui/services/addresses"
-
-const { toBigInt } = num
 const { isUint256, uint256ToBN } = uint256
 
 export interface Erc20Call extends Call {
diff --git a/packages/extension/src/shared/call/nftTransferCall.ts b/packages/extension/src/shared/call/nftTransferCall.ts
index 91050d58c..42b475a19 100644
--- a/packages/extension/src/shared/call/nftTransferCall.ts
+++ b/packages/extension/src/shared/call/nftTransferCall.ts
@@ -1,7 +1,6 @@
+import { normalizeAddress } from "@argent/shared"
 import { Call, CallData, num, uint256, validateAndParseAddress } from "starknet"
 
-import { normalizeAddress } from "../../ui/services/addresses"
-
 const { uint256ToBN } = uint256
 
 export interface NftTransferCall extends Call {
diff --git a/packages/extension/src/shared/call/udcDeclareCall.ts b/packages/extension/src/shared/call/udcDeclareCall.ts
index 2f031afc2..478c59246 100644
--- a/packages/extension/src/shared/call/udcDeclareCall.ts
+++ b/packages/extension/src/shared/call/udcDeclareCall.ts
@@ -1,7 +1,6 @@
+import { isEqualAddress } from "@argent/shared"
 import { Call, constants, validateAndParseAddress } from "starknet"
 
-import { isEqualAddress } from "../../ui/services/addresses"
-
 const { UDC } = constants
 
 export interface UdcDeclareCall extends Call {
diff --git a/packages/extension/src/shared/call/udcDeployCall.ts b/packages/extension/src/shared/call/udcDeployCall.ts
index b07d524c0..d5170de0b 100644
--- a/packages/extension/src/shared/call/udcDeployCall.ts
+++ b/packages/extension/src/shared/call/udcDeployCall.ts
@@ -1,7 +1,6 @@
+import { isEqualAddress } from "@argent/shared"
 import { Call, constants, validateAndParseAddress } from "starknet"
 
-import { isEqualAddress } from "../../ui/services/addresses"
-
 const { UDC } = constants
 
 export interface UdcDeployCall extends Call {
diff --git a/packages/extension/src/shared/chain/service/__test__/mock.ts b/packages/extension/src/shared/chain/service/__test__/mock.ts
index 9e806c4b1..2c6292b36 100644
--- a/packages/extension/src/shared/chain/service/__test__/mock.ts
+++ b/packages/extension/src/shared/chain/service/__test__/mock.ts
@@ -16,7 +16,7 @@ export class MockChainService implements IChainService {
   }
 
   getTransactionStatus(
-    transaction: BaseTransaction,
+    _transaction: BaseTransaction,
   ): Promise<TransactionWithStatus> {
     throw new Error("Method not implemented.")
   }
diff --git a/packages/extension/src/shared/chain/service/implementation.test.ts b/packages/extension/src/shared/chain/service/implementation.test.ts
new file mode 100644
index 000000000..395b62287
--- /dev/null
+++ b/packages/extension/src/shared/chain/service/implementation.test.ts
@@ -0,0 +1,152 @@
+import { describe, expect, test, vi } from "vitest"
+
+import { INetworkService } from "../../network/service/interface"
+import { Network } from "../../network"
+import { StarknetChainService } from "./implementation"
+import { Hex } from "@argent/shared"
+
+const mocks = vi.hoisted(() => {
+  return {
+    getProvider: vi.fn(),
+  }
+})
+
+vi.mock("../../network", () => {
+  return {
+    getProvider: mocks.getProvider,
+  }
+})
+
+describe("StarknetChainService", () => {
+  const makeService = () => {
+    const networkService: Pick<INetworkService, "getById"> = {
+      // return a falsy value if network is not known. This is normally not allowed, but will skip the account discovery on the known networks (goerli and mainnet)
+      getById: async () => {
+        return {
+          id: "goerli-alpha",
+          chainId: "SN_GOERLI",
+          rpcUrl: "http://127.0.0.1:5050/",
+          name: "Test Network",
+        } as Network
+      },
+    }
+
+    return new StarknetChainService(networkService)
+  }
+  test.each(["ACCEPTED_ON_L2", "ACCEPTED_ON_L1"])(
+    "should return correct status, given %s successful tx",
+    async (status) => {
+      const starknetChainService = makeService()
+
+      const mockTransaction = {
+        hash: "0x123" as Hex,
+        networkId: "goerli-alpha",
+        status: {
+          finality_status: "RECEIVED",
+        },
+      }
+
+      const getTransactionReceipt = vi.fn()
+
+      vi.mocked(mocks).getProvider.mockReturnValue({
+        getTransactionStatus: () => ({
+          finality_status: status,
+        }),
+        getTransactionReceipt,
+      })
+
+      const txWithStatus = await starknetChainService.getTransactionStatus(
+        mockTransaction,
+      )
+
+      expect(txWithStatus.status.status).toEqual("confirmed")
+      expect(getTransactionReceipt).not.toHaveBeenCalled()
+    },
+  )
+
+  test("should return correct status, given rejected tx", async () => {
+    const starknetChainService = makeService()
+
+    const mockTransaction = {
+      hash: "0x123" as Hex,
+      networkId: "goerli-alpha",
+      status: {
+        finality_status: "RECEIVED",
+      },
+    }
+
+    const getTransactionReceipt = vi.fn()
+
+    vi.mocked(mocks).getProvider.mockReturnValue({
+      getTransactionStatus: () => ({
+        finality_status: "REJECTED",
+      }),
+      getTransactionReceipt,
+    })
+
+    const txWithStatus = await starknetChainService.getTransactionStatus(
+      mockTransaction,
+    )
+
+    expect(txWithStatus.status.status).toEqual("failed")
+    expect(getTransactionReceipt).not.toHaveBeenCalled()
+  })
+
+  test("should return correct status and reason, given reverted tx", async () => {
+    const starknetChainService = makeService()
+
+    const mockTransaction = {
+      hash: "0x123" as Hex,
+      networkId: "goerli-alpha",
+      status: {
+        finality_status: "RECEIVED",
+      },
+    }
+
+    const getTransactionReceipt = vi.fn().mockResolvedValue({
+      revert_reason: "foo",
+    })
+
+    vi.mocked(mocks).getProvider.mockReturnValue({
+      getTransactionStatus: () => ({
+        execution_status: "REVERTED",
+      }),
+      getTransactionReceipt,
+    })
+
+    const txWithStatus = await starknetChainService.getTransactionStatus(
+      mockTransaction,
+    )
+
+    expect(txWithStatus.status.status).toEqual("failed")
+    expect(getTransactionReceipt).toHaveBeenCalledWith(mockTransaction.hash)
+  })
+
+  test("should return correct status and reason, given failed receipt call", async () => {
+    const starknetChainService = makeService()
+
+    const mockTransaction = {
+      hash: "0x123" as Hex,
+      networkId: "goerli-alpha",
+      status: {
+        finality_status: "RECEIVED",
+      },
+    }
+
+    const getTransactionReceipt = vi.fn().mockRejectedValue({})
+
+    vi.mocked(mocks).getProvider.mockReturnValue({
+      getTransactionStatus: () => ({
+        execution_status: "REVERTED",
+      }),
+      getTransactionReceipt,
+    })
+
+    const txWithStatus = await starknetChainService.getTransactionStatus(
+      mockTransaction,
+    )
+
+    expect(txWithStatus.status.status).toEqual("failed")
+    expect(getTransactionReceipt).toHaveBeenCalledWith(mockTransaction.hash)
+  })
+})
diff --git a/packages/extension/src/shared/chain/service/implementation.ts b/packages/extension/src/shared/chain/service/implementation.ts
index 6321d0026..d4d289357 100644
--- a/packages/extension/src/shared/chain/service/implementation.ts
+++ b/packages/extension/src/shared/chain/service/implementation.ts
@@ -54,13 +54,17 @@ export class StarknetChainService implements IChainService {
       finality_status === "ACCEPTED_ON_L2" ||
       finality_status === "ACCEPTED_ON_L1"
 
-    if (isFailed) {
-      // Only get the receipt if the transaction failed
-      const receipt = await provider.getTransactionReceipt(transaction.hash)
-      error_reason =
-        receipt.revert_reason ||
-        ("transaction_failure_reason" in receipt &&
-          (receipt.transaction_failure_reason as any)?.error_message)
+    try {
+      if (execution_status === "REVERTED") {
+        // Only get the receipt if the transaction reverted
+        const receipt = await provider.getTransactionReceipt(transaction.hash)
+        error_reason = receipt.revert_reason
+      }
+    } catch (e) {
+      console.warn(
+        `Failed to fetch transaction receipt for ${transaction.hash}`,
+        e,
+      )
     }
 
     error_reason =
diff --git a/packages/extension/src/shared/errors/account.ts b/packages/extension/src/shared/errors/account.ts
index 23bdc13cb..9518433a2 100644
--- a/packages/extension/src/shared/errors/account.ts
+++ b/packages/extension/src/shared/errors/account.ts
@@ -9,6 +9,8 @@ export enum ACCOUNT_ERROR_MESSAGES {
   CALCULATED_ADDRESS_NO_MATCH = "Calculated address does not match account address",
   ACCOUNT_ALREADY_DEPLOYED = "Account already deployed",
   CANNOT_DEPLOY_OLD_ACCOUNTS = "Cannot deploy old accounts",
+  CANNOT_ESTIMATE_TRANSACTIONS = "Cannot estimate fee for transactions",
+  CANNOT_ESTIMATE_DEPLOY_ACCOUNT = "Cannot estimate fee to deploy account",
   CANNOT_ESTIMATE_DEPLOY_OLD_ACCOUNTS = "Cannot estimate fee to deploy old accounts",
   CANNOT_ESTIMATE_FEE_OLD_ACCOUNTS_DEPLOYMENT = "Cannot estimate fee for old account deployment",
   UPGRADE_NOT_SUPPORTED = "Old Account upgrades are no longer supporte",
diff --git a/packages/extension/src/shared/errors/swap.ts b/packages/extension/src/shared/errors/swap.ts
new file mode 100644
index 000000000..99a7f0181
--- /dev/null
+++ b/packages/extension/src/shared/errors/swap.ts
@@ -0,0 +1,18 @@
+import { BaseError, BaseErrorPayload } from "./baseError"
+
+export enum SWAP_ERROR_MESSAGE {
+  NO_SWAP_URL = "Swap base url not provided",
+  INVALID_QUOTE_RESPONSE = "Invalid quote response",
+  NO_NETWORK_FOR_SWAP = "Network for swap not found",
+  INVALID_SWAP_TOKENS = "Invalid swap tokens",
+  INVALID_SWAP_ORDER_RESPONSE = "Invalid swap order response",
+}
+
+export type SwapErrorMessage = keyof typeof SWAP_ERROR_MESSAGE
+
+export class SwapError extends BaseError<SwapErrorMessage> {
+  constructor(payload: BaseErrorPayload<SwapErrorMessage>) {
+    super(payload, SWAP_ERROR_MESSAGE)
+    this.name = "SwapError"
+  }
+}
diff --git a/packages/extension/src/shared/explorer/type.ts b/packages/extension/src/shared/explorer/type.ts
index 3629d9c01..495c0b5ae 100644
--- a/packages/extension/src/shared/explorer/type.ts
+++ b/packages/extension/src/shared/explorer/type.ts
@@ -1,6 +1,5 @@
-import { TransactionExecutionStatus } from "starknet"
-
-import { ExtendedTransactionStatus } from "../transactions"
+import { ExecutionStatus, ExtendedFinalityStatus } from "../transactions"
+import { z } from "zod"
 
 export interface IExplorerTransactionParameters {
   /** @example tokenId @example response_len */
@@ -22,6 +21,17 @@ export interface IExplorerTransactionCall {
   parameters: IExplorerTransactionParameters[]
 }
 
+export const explorerTransactionActualFeeSchema = z.object({
+  /** @example 0x490b183da37 */
+  amount: z.string(),
+  /** @example WEI */
+  unit: z.string(),
+})
+
+export type ExplorerTransactionActualFee = z.infer<
+  typeof explorerTransactionActualFeeSchema
+>
+
 export interface IExplorerTransaction {
   /** @example 0x1e122f27e74c51082bc19377a76002889fa6b4b00508398f23f9dedc9f56b5c */
   id: string
@@ -38,11 +48,12 @@ export interface IExplorerTransaction {
   /** @example 0x6d90a45c752 */
   maxFee?: string
   /** @example 0x490b183da37 */
-  actualFee: string
+  actualFee: string | ExplorerTransactionActualFee
   /** TODO: remove legacy status field */
-  status?: ExtendedTransactionStatus
-  finalityStatus: ExtendedTransactionStatus
-  executionStatus?: TransactionExecutionStatus
+  status?: ExtendedFinalityStatus
+  finalityStatus: ExtendedFinalityStatus
+  executionStatus?: ExecutionStatus
+  failureReason?: "REJECTED" | "REVERTED" | "CANCELLED"
   statusData: string
   events: IExplorerTransactionEvent[]
   calls?: IExplorerTransactionCall[]
diff --git a/packages/extension/src/shared/http/singleton.ts b/packages/extension/src/shared/http/singleton.ts
new file mode 100644
index 000000000..c121f874f
--- /dev/null
+++ b/packages/extension/src/shared/http/singleton.ts
@@ -0,0 +1,7 @@
+import { HTTPService } from "@argent/shared"
+
+import { argentXHeaders } from "../api/headers"
+
+export const httpService = new HTTPService({
+  headers: argentXHeaders,
+})
diff --git a/packages/extension/src/shared/json.ts b/packages/extension/src/shared/json.ts
index a74164d19..255db5055 100644
--- a/packages/extension/src/shared/json.ts
+++ b/packages/extension/src/shared/json.ts
@@ -1,8 +1,23 @@
 import { BigNumber } from "@ethersproject/bignumber"
 
-export const reviveJsonBigNumber = (_: string, value: any) => {
-  if (value?.type === "BigNumber" && "hex" in value) {
-    return BigNumber.from(value.hex)
+export const reviveJsonBigNumber = (_: string, value: unknown) => {
+  if (typeof value === "object" && value !== null) {
+    if (
+      "type" in value &&
+      value.type === "BigNumber" &&
+      "hex" in value &&
+      typeof value.hex === "string"
+    ) {
+      return BigNumber.from(value.hex)
+    }
+    if (
+      "__type" in value &&
+      value?.__type === "bigint" &&
+      "value" in value &&
+      typeof value.value === "string"
+    ) {
+      return BigInt(value.value)
+    }
   }
   return value
 }
diff --git a/packages/extension/src/shared/knownDapps.ts b/packages/extension/src/shared/knownDapps.ts
index c5c13c4b7..49303e9ee 100644
--- a/packages/extension/src/shared/knownDapps.ts
+++ b/packages/extension/src/shared/knownDapps.ts
@@ -1,5 +1,6 @@
+import { includesAddress } from "@argent/shared"
+
 import untypedKnownDapps from "../assets/known-dapps.json"
-import { isEqualAddress } from "../ui/services/addresses"
 
 export interface KnownDapp {
   /** a unique internal id for this dapp e.g. mydapp-example-xyz */
@@ -22,10 +23,6 @@ const knownDapps: KnownDapp[] = untypedKnownDapps
 
 export { knownDapps }
 
-export const includesAddress = (needle: string, haystack: string[]) => {
-  return !!haystack.find((value) => isEqualAddress(value, needle))
-}
-
 export const isKnownDappForContractAddress = (
   address: string,
   network?: string,
diff --git a/packages/extension/src/shared/knownDapps/worker/index.ts b/packages/extension/src/shared/knownDapps/worker/index.ts
deleted file mode 100644
index 48e6e7e00..000000000
--- a/packages/extension/src/shared/knownDapps/worker/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { knownDappsService } from "../index"
-import { chromeScheduleService } from "../../schedule"
-import { KnownDappsWorker } from "./implementation"
-import { backgroundUIService } from "../../../background/__new/services/ui"
-import { debounceService } from "../../debounce"
-
-export const knownDappsWorker = new KnownDappsWorker(
-  chromeScheduleService,
-  knownDappsService,
-  backgroundUIService,
-  debounceService,
-)
diff --git a/packages/extension/src/shared/messages/TransactionMessage.ts b/packages/extension/src/shared/messages/TransactionMessage.ts
index 947ad82c1..64a83b683 100644
--- a/packages/extension/src/shared/messages/TransactionMessage.ts
+++ b/packages/extension/src/shared/messages/TransactionMessage.ts
@@ -11,20 +11,10 @@ import {
   SimulateTransactionsRequest,
   TransactionSimulationWithFees,
 } from "../transactionSimulation/types"
-import { DeclareContract } from "../udc/type"
-import { ErrorObject } from "../utils/error"
-import { BaseWalletAccount } from "../wallet.model"
+import { DeclareContract } from "../udc/schema"
 import { TransactionError } from "../errors/transaction"
 import { EstimatedFees } from "../transactionSimulation/fees/fees.model"
 
-export interface DeployAccountEstimateFeeResponse
-  extends Omit<
-    EstimatedFees,
-    "suggestedMaxFee" | "accountDeploymentFee" | "theme"
-  > {
-  maxADFee: string
-}
-
 export interface ExecuteTransactionRequest {
   transactions: Call | Call[]
   abis?: Abi[]
@@ -46,24 +36,6 @@ export type TransactionMessage =
       type: "TRANSACTION_FAILED"
       data: { actionHash: string; error?: string }
     }
-  | { type: "ESTIMATE_TRANSACTION_FEE"; data: Call | Call[] }
-  | {
-      type: "ESTIMATE_TRANSACTION_FEE_REJ"
-      data: { error: ErrorObject | undefined }
-    }
-  | {
-      type: "ESTIMATE_TRANSACTION_FEE_RES"
-      data: EstimatedFees
-    }
-  | { type: "ESTIMATE_ACCOUNT_DEPLOYMENT_FEE"; data?: BaseWalletAccount }
-  | {
-      type: "ESTIMATE_ACCOUNT_DEPLOYMENT_FEE_REJ"
-      data: { error: ErrorObject | undefined }
-    }
-  | {
-      type: "ESTIMATE_ACCOUNT_DEPLOYMENT_FEE_RES"
-      data: DeployAccountEstimateFeeResponse
-    }
   | { type: "ESTIMATE_DECLARE_CONTRACT_FEE"; data: DeclareContract }
   | { type: "ESTIMATE_DECLARE_CONTRACT_FEE_REJ"; data: { error: string } }
   | {
diff --git a/packages/extension/src/shared/messages/UdcMessage.ts b/packages/extension/src/shared/messages/UdcMessage.ts
index 7b9408621..0cae45ce6 100644
--- a/packages/extension/src/shared/messages/UdcMessage.ts
+++ b/packages/extension/src/shared/messages/UdcMessage.ts
@@ -1,4 +1,4 @@
-import { DeclareContract } from "../udc/type"
+import { DeclareContract } from "../udc/schema"
 
 export type UdcMessage =
   | { type: "REQUEST_DECLARE_CONTRACT"; data: DeclareContract }
diff --git a/packages/extension/src/shared/messages/index.ts b/packages/extension/src/shared/messages/index.ts
index eff9c556c..f5adc09f8 100644
--- a/packages/extension/src/shared/messages/index.ts
+++ b/packages/extension/src/shared/messages/index.ts
@@ -1,7 +1,6 @@
 import { getMessage } from "@extend-chrome/messages"
 import type { SendOptions } from "@extend-chrome/messages/types/types"
 
-import { IS_DEV } from "../utils/dev"
 import { AccountMessage } from "./AccountMessage"
 import { ActionMessage } from "./ActionMessage"
 import { MiscenalleousMessage } from "./MiscellaneousMessage"
@@ -11,6 +10,7 @@ import { SessionMessage } from "./SessionMessage"
 import { TokenMessage } from "./TokenMessage"
 import { TransactionMessage } from "./TransactionMessage"
 import { UdcMessage } from "./UdcMessage"
+import { map } from "rxjs/operators"
 
 export type MessageType =
   | AccountMessage
@@ -28,7 +28,7 @@ export type WindowMessageType = MessageType & {
   extensionId: string
 }
 
-export const [_sendMessage, messageStream, _waitForMessage] =
+export const [_sendMessage, _messageStream, _waitForMessage] =
   getMessage<MessageType>("ARGENTX")
 
 export function sendMessage(
@@ -38,14 +38,49 @@ export function sendMessage(
   // remove all functions from the message object
   // as they cannot be sent over the message bus (and make firefox crash)
   const cleanMessage = JSON.parse(
-    JSON.stringify(data, (_, value) =>
-      typeof value === "function" ? undefined : value,
-    ),
+    JSON.stringify(data, (_, value) => {
+      if (typeof value === "function") return undefined
+      if (typeof value === "bigint")
+        return { __type: "bigint", value: value.toString() }
+      return value
+    }),
   )
 
   return _sendMessage(cleanMessage, options)
 }
 
+function parseMessage(
+  msg: [MessageType, chrome.runtime.MessageSender],
+): [MessageType, chrome.runtime.MessageSender] {
+  const payload: unknown = msg?.[0]
+  if (typeof payload === "object" && payload !== null) {
+    const parsedMsg: MessageType = JSON.parse(
+      JSON.stringify(payload),
+      (_, v: unknown) => {
+        if (
+          typeof v === "object" &&
+          v !== null &&
+          "__type" in v &&
+          "value" in v
+        ) {
+          if (v.__type === "bigint" && typeof v.value === "string") {
+            return BigInt(v.value)
+          }
+        }
+        return v
+      },
+    )
+    return [parsedMsg, ...msg.slice(1)] as [
+      MessageType,
+      chrome.runtime.MessageSender,
+    ]
+  }
+  return msg
+}
+
+// reexpose messageStream to allow message parsing for bigint, parse the above message
+export const messageStream = _messageStream.pipe(map(parseMessage))
+
 export type SendMessage = typeof sendMessage
 
 export async function waitForMessage<
@@ -55,9 +90,14 @@ export async function waitForMessage<
   type: K,
   predicate: (x: T) => boolean = () => true,
 ): Promise<T extends { data: infer S } ? S : undefined> {
-  return _waitForMessage(
-    ([msg]: any) => msg.type === type && predicate(msg),
-  ).then(([msg]: any) => msg.data)
+  return _waitForMessage(([msg]: any) => msg.type === type && predicate(msg))
+    .then((m: any) => parseMessage(m))
+    .then(
+      ([msg]) =>
+        ("data" in msg ? msg.data : undefined) as T extends { data: infer S }
+          ? S
+          : undefined,
+    )
 }
 
 export type WaitForMessage = typeof waitForMessage
diff --git a/packages/extension/src/shared/multisig/pendingTransactionsStore.ts b/packages/extension/src/shared/multisig/pendingTransactionsStore.ts
index 7c0e984a2..f9473b960 100644
--- a/packages/extension/src/shared/multisig/pendingTransactionsStore.ts
+++ b/packages/extension/src/shared/multisig/pendingTransactionsStore.ts
@@ -1,7 +1,7 @@
 import { memoize } from "lodash-es"
-import { AllowArray, TransactionFinalityStatus } from "starknet"
+import { AllowArray } from "starknet"
 
-import { addTransaction } from "../../background/transactions/store"
+import { addTransaction } from "../transactions/store"
 import { ArrayStorage } from "../storage"
 import { SelectorFn } from "../storage/types"
 import { ExtendedTransactionType } from "../transactions"
@@ -93,6 +93,8 @@ export async function multisigPendingTransactionToTransaction(
     throw new Error("Transaction is still awaiting signatures")
   }
 
+  const finalityStatus = state === "CANCELLED" ? "CANCELLED" : "RECEIVED"
+
   await addTransaction(
     {
       hash: transactionHash,
@@ -102,7 +104,7 @@ export async function multisigPendingTransactionToTransaction(
         transactions: transaction.calls,
       },
     },
-    state === "CANCELLED" ? "CANCELLED" : TransactionFinalityStatus.RECEIVED,
+    { finality_status: finalityStatus },
   )
 
   await removeFromMultisigPendingTransactions(pendingTxn)
diff --git a/packages/extension/src/shared/multisig/service/backend/implementation.test.ts b/packages/extension/src/shared/multisig/service/backend/implementation.test.ts
index fe5c763dd..cad394b9a 100644
--- a/packages/extension/src/shared/multisig/service/backend/implementation.test.ts
+++ b/packages/extension/src/shared/multisig/service/backend/implementation.test.ts
@@ -1,4 +1,5 @@
 import { constants } from "starknet"
+import { MockedFunction } from "vitest"
 import { getMockNetwork } from "../../../../../test/network.mock"
 import {
   ApiMultisigAccountData,
@@ -18,7 +19,7 @@ const cancelMultisigPendingTransactionsSpy = vi.fn()
 const convertToTransactionSpy = vi.fn()
 
 const mockGetMultisigAccountFromBaseWallet =
-  getMultisigAccountFromBaseWallet as jest.MockedFunction<
+  getMultisigAccountFromBaseWallet as MockedFunction<
     typeof getMultisigAccountFromBaseWallet
   >
 
diff --git a/packages/extension/src/shared/multisig/view/index.ts b/packages/extension/src/shared/multisig/view/index.ts
deleted file mode 100644
index 404d55b1e..000000000
--- a/packages/extension/src/shared/multisig/view/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { atomFromRepo } from "../../../ui/views/implementation/atomFromRepo"
-import { multisigBaseWalletRepo, pendingMultisigRepo } from "../repository"
-
-export const pendingMultisigsView = atomFromRepo(pendingMultisigRepo)
-
-export const multisigBaseWalletView = atomFromRepo(multisigBaseWalletRepo)
diff --git a/packages/extension/src/shared/network/constants.ts b/packages/extension/src/shared/network/constants.ts
index 18689d123..2765b9e9f 100644
--- a/packages/extension/src/shared/network/constants.ts
+++ b/packages/extension/src/shared/network/constants.ts
@@ -1,12 +1,17 @@
 import { PublicRpcNode } from "./type"
 
-export const FEE_TOKEN_ADDRESS_ETH =
+export const ETH_TOKEN_ADDRESS =
   "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"
+export const STRK_TOKEN_ADDRESS =
+  "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"
 
 // This should always be the latest. If you need to use the old or custom one, don't use this constant.
 export const STANDARD_ACCOUNT_CLASS_HASH =
   "0x1a736d6ed154502257f02b1ccdf4d9d1089f80811cd6acad48e6b6a9d1f2003"
 
+export const TXV3_ACCOUNT_CLASS_HASH =
+  "0x028463df0e5e765507ae51f9e67d6ae36c7e5af793424eccc9bc22ad705fc09d"
+
 export const STANDARD_CAIRO_0_ACCOUNT_CLASS_HASH =
   "0x033434ad846cdd5f23eb73ff09fe6fddd568284a0fb7d1be20ee482f044dabe2"
 
diff --git a/packages/extension/src/shared/network/defaults.ts b/packages/extension/src/shared/network/defaults.ts
index 856e208b4..8c3b24961 100644
--- a/packages/extension/src/shared/network/defaults.ts
+++ b/packages/extension/src/shared/network/defaults.ts
@@ -1,12 +1,14 @@
 import {
   ARGENT_5_MINUTE_ESCAPE_TESTING_ACCOUNT_CLASS_HASH,
   BETTER_MULTICAL_ACCOUNT_CLASS_HASH,
-  FEE_TOKEN_ADDRESS_ETH,
+  ETH_TOKEN_ADDRESS,
+  STRK_TOKEN_ADDRESS,
   MULTICALL_CONTRACT_ADDRESS,
   MULTISIG_ACCOUNT_CLASS_HASH,
   PLUGIN_ACCOUNT_CLASS_HASH,
   STANDARD_ACCOUNT_CLASS_HASH,
   STANDARD_CAIRO_0_ACCOUNT_CLASS_HASH,
+  TXV3_ACCOUNT_CLASS_HASH,
 } from "./constants"
 import type { Network, NetworkWithStatus } from "./type"
 import { getDefaultNetwork } from "./utils"
@@ -18,10 +20,12 @@ const DEV_ONLY_NETWORKS: Network[] = [
     chainId: "SN_GOERLI",
     rpcUrl: "https://cloud-dev.argent-api.com/v1/starknet/goerli/rpc/v0.6",
     accountClassHash: {
-      standard: STANDARD_ACCOUNT_CLASS_HASH,
+      standard: TXV3_ACCOUNT_CLASS_HASH,
     },
-    multicallAddress: MULTICALL_CONTRACT_ADDRESS,
-    feeTokenAddress: FEE_TOKEN_ADDRESS_ETH,
+    // multicallAddress: MULTICALL_CONTRACT_ADDRESS, // not defined on integration
+    possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS, STRK_TOKEN_ADDRESS],
+    explorerUrl: "https://integration.voyager.online",
+    readonly: true,
   },
 ]
 
@@ -53,7 +57,7 @@ export const defaultNetworks: Network[] = [
       multisig: MULTISIG_ACCOUNT_CLASS_HASH,
     },
     multicallAddress: MULTICALL_CONTRACT_ADDRESS,
-    feeTokenAddress: FEE_TOKEN_ADDRESS_ETH,
+    possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS],
     readonly: true,
   },
   {
@@ -73,7 +77,7 @@ export const defaultNetworks: Network[] = [
       multisig: MULTISIG_ACCOUNT_CLASS_HASH,
     },
     multicallAddress: MULTICALL_CONTRACT_ADDRESS,
-    feeTokenAddress: FEE_TOKEN_ADDRESS_ETH,
+    possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS],
     readonly: true,
   },
   ...(process.env.NODE_ENV === "development" ? DEV_ONLY_NETWORKS : []),
@@ -83,7 +87,7 @@ export const defaultNetworks: Network[] = [
     rpcUrl: "http://localhost:5050/rpc",
     explorerUrl: "https://devnet.starkscan.co",
     name: "Localhost 5050",
-    feeTokenAddress: FEE_TOKEN_ADDRESS_ETH,
+    possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS],
     accountClassHash: {
       standard: STANDARD_CAIRO_0_ACCOUNT_CLASS_HASH,
     },
diff --git a/packages/extension/src/shared/network/provider.ts b/packages/extension/src/shared/network/provider.ts
index 606e36d35..b0da1aa1c 100644
--- a/packages/extension/src/shared/network/provider.ts
+++ b/packages/extension/src/shared/network/provider.ts
@@ -3,10 +3,15 @@ import { RpcProvider, constants, shortString } from "starknet"
 import { RpcProvider as RpcProviderV4 } from "starknet4"
 
 import { Network } from "./type"
+import { argentXHeaders } from "../api/headers"
 
 export const getProviderForRpcUrlAndChainId = memoize(
   (rpcUrl: string, chainId: constants.StarknetChainId): RpcProvider => {
-    return new RpcProvider({ nodeUrl: rpcUrl, chainId })
+    return new RpcProvider({
+      nodeUrl: rpcUrl,
+      chainId,
+      headers: argentXHeaders,
+    })
   },
   (a: string, b: string) => `${a}::${b}`,
 )
@@ -27,7 +32,10 @@ export function getProvider(network: Network): RpcProvider {
 /** ======================================================================== */
 
 export function getProviderv4(network: Network): RpcProviderV4 {
-  return new RpcProviderV4({ nodeUrl: network.rpcUrl })
+  return new RpcProviderV4({
+    nodeUrl: network.rpcUrl,
+    headers: argentXHeaders,
+  })
 }
 
 /** ======================================================================== */
diff --git a/packages/extension/src/shared/network/schema.ts b/packages/extension/src/shared/network/schema.ts
index 430e2b1eb..86f9a170d 100644
--- a/packages/extension/src/shared/network/schema.ts
+++ b/packages/extension/src/shared/network/schema.ts
@@ -1,4 +1,4 @@
-import { addressOrEmptyUndefinedSchema } from "@argent/shared"
+import { addressOrEmptyUndefinedSchema, addressSchema } from "@argent/shared"
 import { z } from "zod"
 
 const REGEX_HEXSTRING = /^0x[a-f0-9]+$/i
@@ -24,7 +24,7 @@ export const networkSchema = baseNetworkSchema.extend({
         "chain id must be hexadecimal string, uppercase alphanumeric or underscore, like 'SN_GOERLI'",
     }),
   rpcUrl: z.string().url("RPC url must be a valid URL"),
-  feeTokenAddress: addressOrEmptyUndefinedSchema,
+  possibleFeeTokenAddresses: z.array(addressSchema).nonempty(), // z.array(addressSchema).min(1) but with better type
   accountImplementation: z.optional(
     z.string().regex(REGEX_HEXSTRING, {
       message: `Account class hash must match the following: /^0x[a-f0-9]+$/i`,
diff --git a/packages/extension/src/shared/network/txv3.ts b/packages/extension/src/shared/network/txv3.ts
new file mode 100644
index 000000000..ccfb94749
--- /dev/null
+++ b/packages/extension/src/shared/network/txv3.ts
@@ -0,0 +1,21 @@
+import { isEqualAddress } from "@argent/shared"
+import { STRK_TOKEN_ADDRESS, TXV3_ACCOUNT_CLASS_HASH } from "./constants"
+import { BaseToken } from "../token/__new/types/token.model"
+
+const tokensRequireTxV3Support = [STRK_TOKEN_ADDRESS]
+
+export function feeTokenNeedsTxV3Support(token: BaseToken) {
+  return tokensRequireTxV3Support.some((address) =>
+    isEqualAddress(address, token.address),
+  )
+}
+
+const classHashesWithTxV3Support = [TXV3_ACCOUNT_CLASS_HASH]
+
+export function classHashSupportsTxV3(classHash: string | undefined) {
+  if (!classHash) return false
+
+  return classHashesWithTxV3Support.some((hash) =>
+    isEqualAddress(hash, classHash),
+  )
+}
diff --git a/packages/extension/src/shared/network/utils.ts b/packages/extension/src/shared/network/utils.ts
index 3301fa28e..30f437e0a 100644
--- a/packages/extension/src/shared/network/utils.ts
+++ b/packages/extension/src/shared/network/utils.ts
@@ -2,7 +2,7 @@ import { constants } from "starknet"
 import { isEqualAddress } from "@argent/shared"
 
 import type { ArgentAccountType } from "../wallet.model"
-import type { DefaultNetworkId, Network, PublicRpcNode } from "./type"
+import type { Network, PublicRpcNode } from "./type"
 import { PUBLIC_RPC_NODES } from "./constants"
 
 // LEGACY ⬇️
@@ -44,28 +44,27 @@ export function getNetworkIdFromChainId(
 
 export function getDefaultNetworkId() {
   const argentXEnv = process.env.ARGENT_X_ENVIRONMENT
-  let defaultNetworkId: DefaultNetworkId
 
   if (!argentXEnv) {
     throw new Error("ARGENT_X_ENVIRONMENT not set")
   }
 
   switch (argentXEnv.toLowerCase()) {
+    case "dev":
+    case "integration":
+      return "integration"
+
     case "prod":
     case "staging":
-      defaultNetworkId = "mainnet-alpha"
-      break
+      return "mainnet-alpha"
 
     case "hydrogen":
     case "test":
-      defaultNetworkId = "goerli-alpha"
-      break
+      return "goerli-alpha"
 
     default:
       throw new Error(`Unknown ARGENTX_ENVIRONMENT: ${argentXEnv}`)
   }
-
-  return defaultNetworkId
 }
 
 export function getDefaultNetwork(defaultNetworks: Network[]): Network {
diff --git a/packages/extension/src/shared/nft/implementation.ts b/packages/extension/src/shared/nft/implementation.ts
index f42a0625f..91067bbf6 100644
--- a/packages/extension/src/shared/nft/implementation.ts
+++ b/packages/extension/src/shared/nft/implementation.ts
@@ -8,8 +8,8 @@ import {
 } from "@argent/shared"
 import { differenceWith, groupBy, isEqual } from "lodash-es"
 import { AllowArray, constants, num, shortString } from "starknet"
-import { INFTService } from "./interface"
-import {
+import type { INFTService } from "./interface"
+import type {
   ContractAddress,
   INftsCollectionsRepository,
   INftsContractsRepository,
@@ -17,6 +17,14 @@ import {
 } from "../storage/__new/repositories/nft"
 import { Network } from "../network"
 import { NetworkService } from "../network/service/implementation"
+import type { KeyValueStorage } from "../storage"
+import type { ISettingsStorage } from "../settings/types"
+import {
+  defaultNftMarketplaces,
+  ekuboMarketplace,
+  isEkuboNft,
+  type NftMarketplace,
+} from "./marketplaces"
 
 const chainIdToPandoraNetwork = (chainId: string): "mainnet" | "goerli" => {
   const encodedChainId = num.isHex(chainId)
@@ -39,6 +47,7 @@ export class NFTService implements INFTService {
     private readonly nftsCollectionsRepository: INftsCollectionsRepository,
     private readonly nftsContractsRepository: INftsContractsRepository,
     private readonly argentNftService: ArgentBackendNftService,
+    private readonly settingsStore: KeyValueStorage<ISettingsStorage>,
   ) {}
 
   isSupported(network: Network) {
@@ -198,4 +207,24 @@ export class NFTService implements INFTService {
 
     await this.nftsRepository.upsert(nfts)
   }
+
+  async getNftMarketplaceUrl(nft: NftItem, networkId: string) {
+    let nftMarketplace: NftMarketplace
+    if (isEkuboNft(nft)) {
+      nftMarketplace = ekuboMarketplace
+    } else {
+      const nftMarketplaceKey = await this.settingsStore.get(
+        "nftMarketplaceKey",
+      )
+      nftMarketplace = defaultNftMarketplaces[nftMarketplaceKey]
+    }
+    if (!nftMarketplace.url[networkId]) {
+      throw new Error(
+        `${nftMarketplace.title} is not available on ${networkId}`,
+      )
+    }
+    const urlFn = nftMarketplace.url[networkId]
+    const url = urlFn(nft.contract_address, nft.token_id)
+    return url
+  }
 }
diff --git a/packages/extension/src/shared/nft/index.ts b/packages/extension/src/shared/nft/index.ts
index 7eb1504be..4c5c38a2b 100644
--- a/packages/extension/src/shared/nft/index.ts
+++ b/packages/extension/src/shared/nft/index.ts
@@ -7,6 +7,7 @@ import {
 } from "../storage/__new/repositories/nft"
 import { NFTService } from "./implementation"
 import { ARGENT_API_BASE_URL } from "../api/constants"
+import { settingsStore } from "../settings/store"
 
 export const argentNftService = new ArgentBackendNftService(
   ARGENT_API_BASE_URL,
@@ -24,4 +25,5 @@ export const nftService = new NFTService(
   nftsCollectionsRepository,
   nftsContractsRepository,
   argentNftService,
+  settingsStore,
 )
diff --git a/packages/extension/src/shared/nft/interface.ts b/packages/extension/src/shared/nft/interface.ts
index 36360baf6..06fabd3bb 100644
--- a/packages/extension/src/shared/nft/interface.ts
+++ b/packages/extension/src/shared/nft/interface.ts
@@ -31,4 +31,5 @@ export interface INFTService {
     owner: Address,
     networkId: string,
   ) => Promise<void>
+  getNftMarketplaceUrl(nft: NftItem, networkId: string): Promise<string>
 }
diff --git a/packages/extension/src/shared/nft/marketplaces/defaultNftMarketplaces.ts b/packages/extension/src/shared/nft/marketplaces/defaultNftMarketplaces.ts
new file mode 100644
index 000000000..56e0d2c0f
--- /dev/null
+++ b/packages/extension/src/shared/nft/marketplaces/defaultNftMarketplaces.ts
@@ -0,0 +1,37 @@
+import type { Address } from "@argent/shared"
+import type { NftMarketplaces } from "./types"
+
+export const defaultNftMarketplaces: NftMarketplaces = {
+  unframed: {
+    title: "Unframed",
+    logo: "UnframedLogo",
+    url: {
+      "mainnet-alpha": (contractAddress: Address, tokenId: string) =>
+        `https://unframed.co/item/${contractAddress}/${tokenId}`,
+    },
+  },
+  flex: {
+    title: "Flex",
+    logo: "FlexLogo",
+    url: {
+      "mainnet-alpha": (contractAddress: Address, tokenId: string) =>
+        `https://flexing.gg/starknet/asset/${contractAddress}/${tokenId}`,
+    },
+  },
+  pyramid: {
+    title: "Pyramid",
+    logo: "PyramidLogo",
+    url: {
+      "mainnet-alpha": (contractAddress: Address, tokenId: string) =>
+        `https://pyramid.market/asset/${contractAddress}/${tokenId}`,
+    },
+  },
+  element: {
+    title: "Element",
+    logo: "ElementLogo",
+    url: {
+      "mainnet-alpha": (contractAddress: Address, tokenId: string) =>
+        `https://element.market/assets/starknet/${contractAddress}/${tokenId}`,
+    },
+  },
+} as const
diff --git a/packages/extension/src/shared/nft/marketplaces/ekuboMarketplace.test.ts b/packages/extension/src/shared/nft/marketplaces/ekuboMarketplace.test.ts
new file mode 100644
index 000000000..36e150923
--- /dev/null
+++ b/packages/extension/src/shared/nft/marketplaces/ekuboMarketplace.test.ts
@@ -0,0 +1,70 @@
+import { describe, expect, test } from "vitest"
+import { isEkuboNft } from "./ekuboMarketplace"
+import { NftItem } from "@argent/shared"
+
+const mockEkuboNft: Partial<NftItem> = {
+  token_id: "231988",
+  contract_address:
+    "0x07b696af58c967c1b14c9dde0ace001720635a660a8e90c565ea459345318b30",
+  name: "USDC / ETH : 2.94133e-27 <> 3.39982e+50 : 0.05% / 0.1%",
+  spec: "ERC721",
+  description: "",
+  best_bid_order: {},
+  properties: [
+    {
+      key: "tick_upper",
+      value: "88722000",
+    },
+    {
+      key: "tick_spacing",
+      value: "1000",
+    },
+    {
+      key: "fee",
+      value: "170141183460469235273462165868118016",
+    },
+    {
+      key: "minted_timestamp",
+      value: "1700752523000",
+    },
+    {
+      key: "token0",
+      value:
+        "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+    },
+    {
+      key: "extension",
+      value: "0x0",
+    },
+    {
+      key: "token1",
+      value:
+        "0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8",
+    },
+    {
+      key: "minted_tx_hash",
+      value:
+        "0x2ec59356e2cbe50ea9024d7fd2c7f9295c715091b3fa50b275adfd1c0edffc1",
+    },
+    {
+      key: "tick_lower",
+      value: "-88722000",
+    },
+  ],
+}
+
+describe("shared/nft/marketplaces/ekubo", () => {
+  describe("isEkuboNft", () => {
+    describe("when valid", () => {
+      test("returns true", () => {
+        expect(isEkuboNft(mockEkuboNft)).toBeTruthy()
+      })
+    })
+    describe("when invalid", () => {
+      test("returns false", () => {
+        expect(isEkuboNft({ contract_address: "0x123" })).toBeFalsy()
+        expect(isEkuboNft({})).toBeFalsy()
+      })
+    })
+  })
+})
diff --git a/packages/extension/src/shared/nft/marketplaces/ekuboMarketplace.ts b/packages/extension/src/shared/nft/marketplaces/ekuboMarketplace.ts
new file mode 100644
index 000000000..a5faa1def
--- /dev/null
+++ b/packages/extension/src/shared/nft/marketplaces/ekuboMarketplace.ts
@@ -0,0 +1,27 @@
+import { Address, NftItem, isEqualAddress } from "@argent/shared"
+import { constants } from "starknet"
+import { z } from "zod"
+
+import { NftMarketplace } from "./types"
+
+export const ekuboNftContract: Address = `0x07b696af58c967c1b14c9dde0ace001720635a660a8e90c565ea459345318b30`
+export const ekuboPositionsContract: Address = `0x02e0af29598b407c8716b17f6d2795eca1b471413fa03fb145a5e33722184067`
+
+export const ekuboMarketplace: NftMarketplace = {
+  title: "Ekubo",
+  url: {
+    /** TODO: looks like should always use ekuboPositionsContract instead of the nft _contractAddress */
+    "mainnet-alpha": (_contractAddress: Address, tokenId: string) =>
+      `https://app.ekubo.org/positions/${constants.StarknetChainId.SN_MAIN}/${ekuboPositionsContract}/${tokenId}`,
+  },
+} as const
+
+const ekuboNftSchema = z.object({
+  contract_address: z.string().refine((value) => {
+    return isEqualAddress(value, ekuboNftContract)
+  }),
+})
+
+export function isEkuboNft(nft?: Partial<NftItem> | null) {
+  return ekuboNftSchema.safeParse(nft).success
+}
diff --git a/packages/extension/src/shared/nft/marketplaces/index.ts b/packages/extension/src/shared/nft/marketplaces/index.ts
new file mode 100644
index 000000000..04e3e6931
--- /dev/null
+++ b/packages/extension/src/shared/nft/marketplaces/index.ts
@@ -0,0 +1,3 @@
+export * from "./defaultNftMarketplaces"
+export * from "./ekuboMarketplace"
+export * from "./types"
diff --git a/packages/extension/src/shared/nft/marketplaces/types.ts b/packages/extension/src/shared/nft/marketplaces/types.ts
new file mode 100644
index 000000000..33d9eab75
--- /dev/null
+++ b/packages/extension/src/shared/nft/marketplaces/types.ts
@@ -0,0 +1,13 @@
+import type { Address } from "@argent/shared"
+import { logos } from "@argent/ui"
+import { defaultNftMarketplaces } from "./defaultNftMarketplaces"
+
+export type NftMarketplaceKey = keyof typeof defaultNftMarketplaces
+
+export interface NftMarketplace {
+  title: string
+  logo?: keyof typeof logos
+  url: Record<string, (contractAddress: Address, tokenId: string) => string>
+}
+
+export type NftMarketplaces = Record<string, NftMarketplace>
diff --git a/packages/extension/src/shared/nft/test/index.test.ts b/packages/extension/src/shared/nft/test/index.test.ts
index c8ffd66d1..9816bab47 100644
--- a/packages/extension/src/shared/nft/test/index.test.ts
+++ b/packages/extension/src/shared/nft/test/index.test.ts
@@ -1,7 +1,7 @@
 import { ArgentBackendNftService } from "@argent/shared"
 import { rest } from "msw"
 import { setupServer } from "msw/node"
-import { beforeEach, describe, expect, vi } from "vitest"
+import { beforeEach, describe, expect, vi, Mocked } from "vitest"
 import { NFTService } from "../implementation"
 import {
   emptyJson,
@@ -17,16 +17,14 @@ import {
   nftsRepository,
 } from "../../storage/__new/repositories/nft"
 import { networkService } from "../../network/service"
+import type { KeyValueStorage } from "../../storage"
+import type { ISettingsStorage } from "../../settings/types"
 
 const BASE_URL_ENDPOINT = "https://api.hydrogen.argent47.net/v1"
 const INVALID_URL_ENDPOINT = BASE_URL_ENDPOINT + "INVALID"
 const EMPTY_URL_ENDPOINT = BASE_URL_ENDPOINT + "EMPTY"
 const BASE_URL_WITH_WILDCARD = BASE_URL_ENDPOINT + "*"
 
-/**
- * @vitest-environment jsdom
- */
-
 const server = setupServer(
   rest.get(INVALID_URL_ENDPOINT, (req, res, ctx) => {
     return res(ctx.json(invalidJson))
@@ -46,21 +44,21 @@ const repositorytMock = {
   get: vi.fn().mockResolvedValue(expectedValidRes),
   upsert: vi.fn().mockResolvedValue(undefined),
   remove: vi.fn().mockResolvedValue(undefined),
-} as unknown as jest.Mocked<typeof nftsRepository>
+} as unknown as Mocked<typeof nftsRepository>
 
 const repositoryCollectionsRepositoryMock = {
   get: vi.fn().mockResolvedValue(expectedValidRes),
   upsert: vi.fn().mockResolvedValue(undefined),
-} as unknown as jest.Mocked<typeof nftsCollectionsRepository>
+} as unknown as Mocked<typeof nftsCollectionsRepository>
 
 const repositorytContractsMock = {
   get: vi.fn().mockResolvedValue(expectedValidRes),
   upsert: vi.fn().mockResolvedValue(undefined),
-} as unknown as jest.Mocked<typeof nftsContractsRepository>
+} as unknown as Mocked<typeof nftsContractsRepository>
 
 const argentNftServiceMock = {
   getNfts: vi.fn().mockResolvedValue(validJson),
-} as unknown as jest.Mocked<ArgentBackendNftService>
+} as unknown as Mocked<ArgentBackendNftService>
 
 const networkServiceMock = {
   getById: vi.fn().mockResolvedValue({
@@ -69,7 +67,11 @@ const networkServiceMock = {
     chainId: constants.StarknetChainId.SN_GOERLI,
     sequencerUrl: "https://alpha4.starknet.io",
   }),
-} as unknown as jest.Mocked<typeof networkService>
+} as unknown as Mocked<typeof networkService>
+
+const settingsStoreMock = {
+  get: vi.fn(),
+} as unknown as KeyValueStorage<ISettingsStorage>
 
 describe("NFTService", () => {
   let testClass: NFTService
@@ -81,6 +83,7 @@ describe("NFTService", () => {
       repositoryCollectionsRepositoryMock,
       repositorytContractsMock,
       argentNftServiceMock,
+      settingsStoreMock,
     )
   })
 
@@ -128,7 +131,11 @@ describe("NFTService", () => {
         get: vi.fn().mockResolvedValue(expectedValidRes2Accounts),
         upsert: vi.fn().mockResolvedValue(undefined),
         remove: vi.fn(),
-      } as unknown as jest.Mocked<typeof nftsRepository>
+      } as unknown as Mocked<typeof nftsRepository>
+
+      const settingsStoreMock = {
+        get: vi.fn(),
+      } as unknown as KeyValueStorage<ISettingsStorage>
 
       const nftService = new NFTService(
         networkServiceMock,
@@ -136,6 +143,7 @@ describe("NFTService", () => {
         repositoryCollectionsRepositoryMock,
         repositorytContractsMock,
         argentNftServiceMock,
+        settingsStoreMock,
       )
 
       const result = await nftService.getAssets(
diff --git a/packages/extension/src/ui/features/settings/WithArgentServicesEnabled.tsx b/packages/extension/src/shared/nft/utils.ts
similarity index 100%
rename from packages/extension/src/ui/features/settings/WithArgentServicesEnabled.tsx
rename to packages/extension/src/shared/nft/utils.ts
diff --git a/packages/extension/src/shared/notification.ts b/packages/extension/src/shared/notification.ts
index 40b969816..636f2e90b 100644
--- a/packages/extension/src/shared/notification.ts
+++ b/packages/extension/src/shared/notification.ts
@@ -30,14 +30,14 @@ export function sendTransactionNotification(
 ) {
   const id = `TX:${hash}`
   const title = `${meta?.title || "Transaction"} ${
-    ["ACCEPTED_ON_L1", "ACCEPTED_ON_L2"].includes(status)
+    ["ACCEPTED_ON_L1", "ACCEPTED_ON_L2"].includes(status?.finality_status ?? "")
       ? "succeeded"
       : "rejected"
   }`
   return browser.notifications.create(id, {
     type: "basic",
     title,
-    message: `${hash}\nStatus: ${status}`,
+    message: `${hash}\nStatus: ${status?.finality_status}`,
     iconUrl: "./assets/logo.png",
     eventTime: Date.now(),
   })
diff --git a/packages/extension/src/shared/objectHash.ts b/packages/extension/src/shared/objectHash.ts
new file mode 100644
index 000000000..d32bc36bb
--- /dev/null
+++ b/packages/extension/src/shared/objectHash.ts
@@ -0,0 +1,5 @@
+import oHash from "object-hash"
+
+export function objectHash(obj: object | null) {
+  return oHash(obj, { unorderedArrays: true })
+}
diff --git a/packages/extension/src/shared/preAuthorization/schema.ts b/packages/extension/src/shared/preAuthorization/schema.ts
new file mode 100644
index 000000000..ba7530e77
--- /dev/null
+++ b/packages/extension/src/shared/preAuthorization/schema.ts
@@ -0,0 +1,25 @@
+import { accountsEqual } from "../utils/accountsEqual"
+import { baseWalletAccountSchema } from "../wallet.model"
+import { z } from "zod"
+
+export const preAuthorizationSchema = z.object({
+  account: baseWalletAccountSchema,
+  host: z.string().url(),
+})
+
+export type PreAuthorization = z.infer<typeof preAuthorizationSchema>
+
+export function isEqualPreAuthorization(
+  a: Partial<PreAuthorization>,
+  b?: Partial<PreAuthorization>,
+) {
+  try {
+    if (!b) {
+      return false
+    }
+    return accountsEqual(a.account, b.account) && a.host === b.host
+  } catch {
+    // ignore parsing error
+  }
+  return false
+}
diff --git a/packages/extension/src/shared/preAuthorization/service/implementation.test.ts b/packages/extension/src/shared/preAuthorization/service/implementation.test.ts
new file mode 100644
index 000000000..4e31152ea
--- /dev/null
+++ b/packages/extension/src/shared/preAuthorization/service/implementation.test.ts
@@ -0,0 +1,75 @@
+import { describe, expect, test } from "vitest"
+
+import { InMemoryRepository } from "../../storage/__new/__test__/inmemoryImplementations"
+import { isEqualPreAuthorization, type PreAuthorization } from "../schema"
+import { PreAuthorizationService } from "./implementation"
+
+describe("PreAuthorisationService", () => {
+  const preAuthorizations: PreAuthorization[] = [
+    {
+      account: {
+        address: "0x123",
+        networkId: "foo",
+      },
+      host: "http://foo",
+    },
+    {
+      account: {
+        address: "0x123",
+        networkId: "bar",
+      },
+      host: "http://bar",
+    },
+  ]
+  const makeService = () => {
+    const preAuthorizationRepo = new InMemoryRepository<PreAuthorization>({
+      namespace: `core:whitelist`,
+      compare: isEqualPreAuthorization,
+    })
+    const preAuthorisationService = new PreAuthorizationService(
+      preAuthorizationRepo,
+    )
+    return {
+      preAuthorisationService,
+      preAuthorizationRepo,
+    }
+  }
+  describe("add", () => {
+    describe("when valid", () => {
+      test("preAuthorisation lifecycle works as expected", async () => {
+        const { preAuthorisationService, preAuthorizationRepo } = makeService()
+
+        await preAuthorisationService.add(preAuthorizations[0])
+        expect(await preAuthorizationRepo.get()).toEqual([preAuthorizations[0]])
+
+        expect(
+          await preAuthorisationService.isPreAuthorized(preAuthorizations[0]),
+        ).toBeTruthy()
+
+        expect(
+          await preAuthorisationService.isPreAuthorized(preAuthorizations[1]),
+        ).toBeFalsy()
+
+        await preAuthorisationService.remove(preAuthorizations[0])
+
+        expect(
+          await preAuthorisationService.isPreAuthorized(preAuthorizations[0]),
+        ).toBeFalsy()
+      })
+    })
+    describe("when invalid host", () => {
+      test("invalid preAutorization host throws an error", async () => {
+        const { preAuthorisationService } = makeService()
+        await expect(
+          preAuthorisationService.add({
+            account: {
+              address: "0x123",
+              networkId: "foo",
+            },
+            host: "foo",
+          }),
+        ).rejects.toThrowError("Invalid url")
+      })
+    })
+  })
+})
diff --git a/packages/extension/src/shared/preAuthorization/service/implementation.ts b/packages/extension/src/shared/preAuthorization/service/implementation.ts
new file mode 100644
index 000000000..4e4f4c11a
--- /dev/null
+++ b/packages/extension/src/shared/preAuthorization/service/implementation.ts
@@ -0,0 +1,44 @@
+import { accountsEqual } from "../../utils/accountsEqual"
+import {
+  baseWalletAccountSchema,
+  type BaseWalletAccount,
+} from "../../wallet.model"
+import {
+  isEqualPreAuthorization,
+  preAuthorizationSchema,
+  type PreAuthorization,
+} from "../schema"
+import type { IPreAuthorizationRepo } from "../store"
+import type { IPreAuthorizationService } from "./interface"
+
+export class PreAuthorizationService implements IPreAuthorizationService {
+  constructor(private readonly preAuthorizationRepo: IPreAuthorizationRepo) {}
+
+  async isPreAuthorized(maybePreAuthorization: Partial<PreAuthorization>) {
+    const hits = await this.preAuthorizationRepo.get((preAuthorization) =>
+      isEqualPreAuthorization(preAuthorization, maybePreAuthorization),
+    )
+    return Boolean(hits.length)
+  }
+
+  async getAll() {
+    return this.preAuthorizationRepo.get()
+  }
+
+  async add(preAuthorization: PreAuthorization) {
+    preAuthorizationSchema.parse(preAuthorization)
+    await this.preAuthorizationRepo.upsert(preAuthorization)
+  }
+
+  async remove(preAuthorization: PreAuthorization) {
+    preAuthorizationSchema.parse(preAuthorization)
+    await this.preAuthorizationRepo.remove(preAuthorization)
+  }
+
+  async removeAll(account: BaseWalletAccount) {
+    baseWalletAccountSchema.parse(account)
+    await this.preAuthorizationRepo.remove((preAuthorization) =>
+      accountsEqual(preAuthorization.account, account),
+    )
+  }
+}
diff --git a/packages/extension/src/shared/preAuthorization/service/index.ts b/packages/extension/src/shared/preAuthorization/service/index.ts
new file mode 100644
index 000000000..c34eb4d3d
--- /dev/null
+++ b/packages/extension/src/shared/preAuthorization/service/index.ts
@@ -0,0 +1,6 @@
+import { PreAuthorizationService } from "./implementation"
+import { preAuthorizationRepo } from "../store"
+
+export const preAuthorizationService = new PreAuthorizationService(
+  preAuthorizationRepo,
+)
diff --git a/packages/extension/src/shared/preAuthorization/service/interface.ts b/packages/extension/src/shared/preAuthorization/service/interface.ts
new file mode 100644
index 000000000..0ca6330ab
--- /dev/null
+++ b/packages/extension/src/shared/preAuthorization/service/interface.ts
@@ -0,0 +1,12 @@
+import type { BaseWalletAccount } from "../../wallet.model"
+import type { PreAuthorization } from "../schema"
+
+export interface IPreAuthorizationService {
+  isPreAuthorized(
+    maybePreAuthorization: Partial<PreAuthorization>,
+  ): Promise<boolean>
+  getAll(): Promise<PreAuthorization[]>
+  add(preAuthorization: PreAuthorization): Promise<void>
+  remove(preAuthorization: PreAuthorization): Promise<void>
+  removeAll(account: BaseWalletAccount): Promise<void>
+}
diff --git a/packages/extension/src/shared/preAuthorization/store/index.ts b/packages/extension/src/shared/preAuthorization/store/index.ts
new file mode 100644
index 000000000..850bbd41c
--- /dev/null
+++ b/packages/extension/src/shared/preAuthorization/store/index.ts
@@ -0,0 +1,19 @@
+import { ArrayStorage } from "../../storage"
+import type { IRepository } from "../../storage/__new/interface"
+import { adaptArrayStorage } from "../../storage/__new/repository"
+import { isEqualPreAuthorization, type PreAuthorization } from "../schema"
+
+export type IPreAuthorizationRepo = IRepository<PreAuthorization>
+
+/**
+ * @deprecated use `preAuthorizationRepo` instead
+ */
+
+export const preAuthorizationStore = new ArrayStorage<PreAuthorization>([], {
+  namespace: `core:whitelist`,
+  compare: isEqualPreAuthorization,
+})
+
+export const preAuthorizationRepo: IPreAuthorizationRepo = adaptArrayStorage(
+  preAuthorizationStore,
+)
diff --git a/packages/extension/src/shared/preAuthorizations.ts b/packages/extension/src/shared/preAuthorizations.ts
deleted file mode 100644
index c150099d7..000000000
--- a/packages/extension/src/shared/preAuthorizations.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { isArray, pick } from "lodash-es"
-import browser from "webextension-polyfill"
-
-import { withHiddenSelector } from "./account/selectors"
-import { accountService } from "./account/service"
-import { ArrayStorage } from "./storage"
-import { useArrayStorage } from "./storage/hooks"
-import { BaseWalletAccount } from "./wallet.model"
-import { accountsEqual } from "./utils/accountsEqual"
-
-interface PreAuthorization {
-  account: BaseWalletAccount
-  host: string
-}
-export const equalPreAuthorization = (
-  a: PreAuthorization,
-  b: PreAuthorization,
-) => accountsEqual(a.account, b.account) && a.host === b.host
-
-export const preAuthorizeStore = new ArrayStorage<PreAuthorization>([], {
-  namespace: `core:whitelist`,
-  compare: equalPreAuthorization,
-})
-
-async function getFromStorage<T, K extends string = string>(
-  key: K,
-): Promise<T | null> {
-  try {
-    return JSON.parse((await browser.storage.local.get(key))[key]) ?? null
-  } catch {
-    return null
-  }
-}
-export const migratePreAuthorizations = async () => {
-  try {
-    const old = await getFromStorage<string[]>("PREAUTHORIZATION:APPROVED")
-    if (isArray(old) && old.length > 0) {
-      await browser.storage.local.remove("PREAUTHORIZATION:APPROVED")
-      const allAccounts = await accountService.get(withHiddenSelector)
-
-      const accountHostCombinations = old.flatMap((h) =>
-        allAccounts.map((a) => ({
-          account: pick(a, "address", "networkId"),
-          host: h,
-        })),
-      )
-
-      return preAuthorizeStore.push(accountHostCombinations)
-    }
-  } catch {
-    console.error("Failed to migrate preauthorizations")
-  }
-}
-
-export const preAuthorize = async (
-  account: BaseWalletAccount,
-  host: string,
-) => {
-  await preAuthorizeStore.push({
-    account,
-    host,
-  })
-}
-
-export const removePreAuthorization = async (
-  host: string,
-  account?: BaseWalletAccount,
-) => {
-  await preAuthorizeStore.remove((x) => {
-    if (account) {
-      return equalPreAuthorization(x, { account, host })
-    }
-    return x.host === host
-  })
-}
-
-export const getPreAuthorizations = () => {
-  return preAuthorizeStore.get()
-}
-
-export const isPreAuthorized = async (
-  account: BaseWalletAccount,
-  host: string,
-) => {
-  const hits = await preAuthorizeStore.get((x) =>
-    equalPreAuthorization(x, { account, host }),
-  )
-  return Boolean(hits.length)
-}
-
-export async function resetPreAuthorizations() {
-  await preAuthorizeStore.remove(() => true)
-}
-
-// Hooks
-
-export const usePreAuthorizations = () => useArrayStorage(preAuthorizeStore)
-export const useIsPreauthorized = (
-  host: string,
-  account?: BaseWalletAccount,
-) => {
-  const all = useArrayStorage(preAuthorizeStore)
-  return all.some((x) => account && equalPreAuthorization(x, { account, host }))
-}
diff --git a/packages/extension/src/shared/schedule/chromeService.test.ts b/packages/extension/src/shared/schedule/chromeService.test.ts
index 0bdd8a4e3..b2c27330c 100644
--- a/packages/extension/src/shared/schedule/chromeService.test.ts
+++ b/packages/extension/src/shared/schedule/chromeService.test.ts
@@ -116,10 +116,16 @@ describe("ChromeScheduleService", () => {
     await service.registerImplementation(task)
     expect(mockBrowser.alarms.onAlarm.addListener).toBeCalled()
     expect(cb).toBeDefined()
+
+    const mockBrowserAlarmFired = vi.fn()
     mockBrowser.alarms.create.mockImplementationOnce((name, options) => {
       expect(name).toBe("test::run5")
       expect(options).toEqual({ periodInMinutes: 1 })
-      cb?.({ name })
+      // simulate the 1-minute delay in browser alarms
+      setTimeout(() => {
+        mockBrowserAlarmFired()
+        cb?.({ name })
+      }, 2)
     })
     await service.every(10, task)
     expect(mockBrowser.alarms.create).toBeCalledTimes(1)
@@ -127,8 +133,18 @@ describe("ChromeScheduleService", () => {
     // wait for next tick
     await new Promise((resolve) => setTimeout(resolve, 0))
 
+    // sub-minute runs before alarm fires
+    expect(mockBrowserAlarmFired).toBeCalledTimes(0)
     expect(waitFn).toBeCalledTimes(4)
     expect(task.callback).toBeCalledTimes(5)
+
+    // wait for next tick
+    await new Promise((resolve) => setTimeout(resolve, 0))
+
+    // alarm-based runs after 1 minute
+    expect(mockBrowserAlarmFired).toBeCalledTimes(1)
+    expect(waitFn).toBeCalledTimes(8)
+    expect(task.callback).toBeCalledTimes(10)
   })
 
   // add tests for service.onStartup and service.onInstallAndUpgrade
diff --git a/packages/extension/src/shared/schedule/chromeService.ts b/packages/extension/src/shared/schedule/chromeService.ts
index df541667f..b9ef9a85b 100644
--- a/packages/extension/src/shared/schedule/chromeService.ts
+++ b/packages/extension/src/shared/schedule/chromeService.ts
@@ -48,6 +48,8 @@ async function runXTimesPerMinute(
 }
 
 export class ChromeScheduleService implements IScheduleService {
+  private taskImplementationById: Record<string, ImplementedScheduledTask> = {}
+
   constructor(
     private readonly browser: MinimalBrowser,
     private readonly waitFn: (ms: number) => Promise<void> = wait,
@@ -55,13 +57,17 @@ export class ChromeScheduleService implements IScheduleService {
 
   async every(seconds: number, task: BaseScheduledTask): Promise<void> {
     const isSubMinute = seconds < 60
-    const runXTimesPerMinute = isSubMinute
+    const timesPerMinute = isSubMinute
       ? Math.max(Math.floor(60 / seconds - 1), 1)
       : 1
     const periodInMinutes = Math.max(Math.round(seconds / 60), 1)
-    await this.browser.alarms.create(`${task.id}::run${runXTimesPerMinute}`, {
+    await this.browser.alarms.create(`${task.id}::run${timesPerMinute}`, {
       periodInMinutes,
     })
+    if (isSubMinute) {
+      const taskImpl = this.taskImplementationById[task.id]
+      void runXTimesPerMinute(timesPerMinute, taskImpl.callback, this.waitFn)
+    }
   }
 
   async in(seconds: number, task: BaseScheduledTask): Promise<void> {
@@ -72,6 +78,7 @@ export class ChromeScheduleService implements IScheduleService {
   }
 
   async delete(task: BaseScheduledTask): Promise<void> {
+    delete this.taskImplementationById[task.id]
     const allAlarms = await this.browser.alarms.getAll()
     const alarmsToDelete = allAlarms
       .filter((alarm) => isEqualAlarmId(alarm.name, task.id))
@@ -83,6 +90,7 @@ export class ChromeScheduleService implements IScheduleService {
   }
 
   async registerImplementation(task: ImplementedScheduledTask): Promise<void> {
+    this.taskImplementationById[task.id] = task
     this.browser.alarms.onAlarm.addListener((alarm) => {
       if (isEqualAlarmId(alarm.name, task.id)) {
         const frequency = getFrequency(alarm.name)
diff --git a/packages/extension/src/shared/settings/defaultAutoLockTimes.ts b/packages/extension/src/shared/settings/defaultAutoLockTimes.ts
new file mode 100644
index 000000000..b1eabf0ac
--- /dev/null
+++ b/packages/extension/src/shared/settings/defaultAutoLockTimes.ts
@@ -0,0 +1,33 @@
+import { IS_DEV } from "../utils/dev"
+
+export const defaultAutoLockTimesMinutes = [
+  0,
+  1,
+  5,
+  10,
+  15,
+  30,
+  1 * 60,
+  4 * 60,
+  8 * 60,
+  24 * 60,
+] as const
+
+export const defaultAutoLockTimeMinutes = IS_DEV ? 24 * 60 : 30
+
+export const getTitleForAutoLockTimeMinutes = (minutes: number) => {
+  if (minutes === 0) {
+    return "Immediately"
+  }
+  if (minutes === 1) {
+    return "1 minute"
+  }
+  if (minutes === 60) {
+    return "1 hour"
+  }
+  if (minutes < 60) {
+    return `${minutes} minutes`
+  }
+  const hours = Math.round(minutes / 60)
+  return `${hours} hours`
+}
diff --git a/packages/extension/src/shared/settings/defaultBlockExplorers.ts b/packages/extension/src/shared/settings/defaultBlockExplorers.ts
index a87b76a35..efb205957 100644
--- a/packages/extension/src/shared/settings/defaultBlockExplorers.ts
+++ b/packages/extension/src/shared/settings/defaultBlockExplorers.ts
@@ -1,6 +1,17 @@
-export const defaultBlockExplorers = {
+import { logos } from "@argent/ui"
+
+export interface BlockExplorer {
+  title: string
+  logo: keyof typeof logos
+  url: Record<string, string>
+}
+
+export type BlockExplorers = Record<string, BlockExplorer>
+
+export const defaultBlockExplorers: BlockExplorers = {
   starkScan: {
     title: "StarkScan",
+    logo: "StarknetLogo",
     url: {
       "mainnet-alpha": "https://starkscan.co",
       "goerli-alpha": "https://testnet.starkscan.co",
@@ -9,13 +20,14 @@ export const defaultBlockExplorers = {
   },
   voyager: {
     title: "Voyager",
+    logo: "VoyagerLogo",
     url: {
       "mainnet-alpha": "https://voyager.online",
       "goerli-alpha": "https://goerli.voyager.online",
       localhost: "https://goerli.voyager.online/local-version",
     },
   },
-}
+} as const
 
 export type BlockExplorerKey = keyof typeof defaultBlockExplorers
 
diff --git a/packages/extension/src/shared/settings/store.ts b/packages/extension/src/shared/settings/store.ts
index d4bae119b..8bd0c66bd 100644
--- a/packages/extension/src/shared/settings/store.ts
+++ b/packages/extension/src/shared/settings/store.ts
@@ -1,6 +1,7 @@
 import { KeyValueStorage } from "../storage"
+import { defaultAutoLockTimeMinutes } from "./defaultAutoLockTimes"
 import { defaultBlockExplorerKey } from "./defaultBlockExplorers"
-import { ISettingsStorage } from "./types"
+import type { ISettingsStorage } from "./types"
 
 export const settingsStore = new KeyValueStorage<ISettingsStorage>(
   {
@@ -10,6 +11,9 @@ export const settingsStore = new KeyValueStorage<ISettingsStorage>(
     privacyAutomaticErrorReporting: false,
     experimentalAllowChooseAccount: false,
     blockExplorerKey: defaultBlockExplorerKey,
+    nftMarketplaceKey: "unframed",
+    hideTokensWithNoBalance: true,
+    autoLockTimeMinutes: defaultAutoLockTimeMinutes,
   },
   "core:settings",
 )
diff --git a/packages/extension/src/shared/settings/types.ts b/packages/extension/src/shared/settings/types.ts
index a53b6df1f..fd7d79f24 100644
--- a/packages/extension/src/shared/settings/types.ts
+++ b/packages/extension/src/shared/settings/types.ts
@@ -1,4 +1,5 @@
-import { BlockExplorerKey } from "./defaultBlockExplorers"
+import type { BlockExplorerKey } from "./defaultBlockExplorers"
+import type { NftMarketplaceKey } from "../nft/marketplaces"
 
 export interface ISettingsStorage {
   privacyUseArgentServices: boolean
@@ -7,6 +8,9 @@ export interface ISettingsStorage {
   privacyAutomaticErrorReporting: boolean
   experimentalAllowChooseAccount: boolean
   blockExplorerKey: BlockExplorerKey
+  nftMarketplaceKey: NftMarketplaceKey
+  hideTokensWithNoBalance: boolean
+  autoLockTimeMinutes: number
 }
 
 export type SettingsStorageKey = keyof ISettingsStorage
diff --git a/packages/extension/src/shared/storage/__new/prune.test.ts b/packages/extension/src/shared/storage/__new/prune.test.ts
index 7cfb79d2b..5f9f66335 100644
--- a/packages/extension/src/shared/storage/__new/prune.test.ts
+++ b/packages/extension/src/shared/storage/__new/prune.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test, vi } from "vitest"
+import { describe, expect, vi } from "vitest"
 
 import {
   IMinimalStorage,
diff --git a/packages/extension/src/shared/storage/__new/prune.ts b/packages/extension/src/shared/storage/__new/prune.ts
index 8e55aabde..74152f61c 100644
--- a/packages/extension/src/shared/storage/__new/prune.ts
+++ b/packages/extension/src/shared/storage/__new/prune.ts
@@ -19,7 +19,7 @@ const localStoragePatterns: Pattern[] = [
   new RegExp(`${ARGENT_EXPLORER_BASE_URL}`, "i"),
   /"useTransactionReviewV2"/,
   /"simulateAndReview"/,
-  /"maxEthTransferEstimate"/,
+  /"maxFeeEstimateForTransfer"/,
   /"accountDeploymentFeeEstimation"/,
   /"nonce"/,
   /"fee"/,
diff --git a/packages/extension/src/shared/storage/__test__/keyvalue.test.ts b/packages/extension/src/shared/storage/__test__/keyvalue.test.ts
index 5a9fda17b..23f618c97 100644
--- a/packages/extension/src/shared/storage/__test__/keyvalue.test.ts
+++ b/packages/extension/src/shared/storage/__test__/keyvalue.test.ts
@@ -153,6 +153,8 @@ describe("when invalid", () => {
         { foo: "bar" },
         { namespace: "test", areaName: "invalid" as any },
       )
-    }).toThrowErrorMatchingInlineSnapshot('"Unknown storage area: invalid"')
+    }).toThrowErrorMatchingInlineSnapshot(
+      `[Error: Unknown storage area: invalid]`,
+    )
   })
 })
diff --git a/packages/extension/src/shared/swap/model/order.model.ts b/packages/extension/src/shared/swap/model/order.model.ts
new file mode 100644
index 000000000..b28e67bb3
--- /dev/null
+++ b/packages/extension/src/shared/swap/model/order.model.ts
@@ -0,0 +1,23 @@
+import { addressSchema } from "@argent/shared"
+import { z } from "zod"
+import { SwapDataSchema } from "./quote.model"
+import { CallSchema } from "@argent/x-window"
+
+export const SwapOrderRequestSchema = z.object({
+  chain: z.literal("starknet"),
+  sellToken: addressSchema,
+  buyToken: addressSchema,
+  sellAmount: z.string(),
+  buyAmount: z.string(),
+  accountAddress: addressSchema,
+  slippage: z.number().transform((v) => v.toString()),
+  data: SwapDataSchema,
+})
+
+export type SwapOrderRequest = z.infer<typeof SwapOrderRequestSchema>
+
+export const SwapOrderResponseSchema = z.object({
+  calls: z.array(CallSchema),
+})
+
+export type SwapOrderResponse = z.infer<typeof SwapOrderResponseSchema>
diff --git a/packages/extension/src/shared/swap/model/quote.model.ts b/packages/extension/src/shared/swap/model/quote.model.ts
new file mode 100644
index 000000000..96506916b
--- /dev/null
+++ b/packages/extension/src/shared/swap/model/quote.model.ts
@@ -0,0 +1,42 @@
+import { addressSchema } from "@argent/shared"
+import { z } from "zod"
+
+export const SwapDataSchema = z.object({
+  quoteId: z.string(),
+})
+
+export const SwapQuoteRouteSchema: z.ZodSchema<any> = z.lazy(() =>
+  z.object({
+    name: z.string(),
+    percent: z.number(),
+    sellToken: addressSchema,
+    buyToken: addressSchema,
+    routes: z.array(SwapQuoteRouteSchema),
+  }),
+)
+
+export type SwapQuoteRoute = z.infer<typeof SwapQuoteRouteSchema>
+
+export const SwapQuoteResponseSchema = z.object({
+  sellToken: addressSchema,
+  sellAmount: z.string(),
+  sellAmountInCurrency: z.string(),
+  buyToken: addressSchema,
+  buyAmount: z.string(),
+  buyAmountInCurrency: z.string(),
+  expiresAt: z.number(),
+  expiresIn: z.number(),
+  dexCount: z.number(),
+  routes: z.array(SwapQuoteRouteSchema),
+  providerName: z.string(),
+  providerFee: z.string(),
+  providerFeeInCurrency: z.string(),
+  providerFeePercentage: z.number(),
+  argentFee: z.string(),
+  argentFeeInCurrency: z.string(),
+  argentFeePercentage: z.number(),
+  feeToken: addressSchema,
+  data: SwapDataSchema,
+})
+
+export type SwapQuoteResponse = z.infer<typeof SwapQuoteResponseSchema>
diff --git a/packages/extension/src/shared/swap/model/trade.model.ts b/packages/extension/src/shared/swap/model/trade.model.ts
new file mode 100644
index 000000000..b13688020
--- /dev/null
+++ b/packages/extension/src/shared/swap/model/trade.model.ts
@@ -0,0 +1,31 @@
+import { z } from "zod"
+import { SwapQuoteRouteSchema, SwapDataSchema } from "./quote.model"
+import { TokenSchema } from "../../token/__new/types/token.model"
+
+export enum TradeType {
+  EXACT_PAY = "EXACT_PAY",
+  EXACT_RECEIVE = "EXACT_RECEIVE",
+}
+
+export const TradeTypeSchema = z.nativeEnum(TradeType)
+
+export const TradeSchema = z.object({
+  payToken: TokenSchema,
+  receiveToken: TokenSchema,
+  tradeType: TradeTypeSchema.default(TradeType.EXACT_PAY),
+  payAmount: z.string(),
+  receiveAmount: z.string(),
+  payAmountInCurrency: z.string(),
+  receiveAmountInCurrency: z.string(),
+  totalFee: z.string(),
+  totalFeeInCurrency: z.string().optional(),
+  totalFeePercentage: z.number(),
+  expiresAt: z.number(),
+  expiresIn: z.number(),
+  route: SwapQuoteRouteSchema,
+  data: SwapDataSchema,
+})
+
+export type Trade = z.infer<typeof TradeSchema>
+
+export type TradeAmounts = Pick<Trade, "payAmount" | "receiveAmount">
diff --git a/packages/extension/src/shared/swap/service/implementation.test.ts b/packages/extension/src/shared/swap/service/implementation.test.ts
new file mode 100644
index 000000000..ad2747f37
--- /dev/null
+++ b/packages/extension/src/shared/swap/service/implementation.test.ts
@@ -0,0 +1,176 @@
+import { SwapOrderResponseSchema } from "./../model/order.model"
+import { sampleQuoteJson } from "./quote.mock"
+import { rest } from "msw"
+import { setupServer } from "msw/node"
+import { SharedSwapService } from "./implementation"
+import { ISharedSwapService } from "./interface"
+import { getMockTrade } from "../../../../test/trade.mock"
+import { getMockToken } from "../../../../test/token.mock"
+import { SwapError } from "../../errors/swap"
+import { SwapQuoteResponseSchema } from "../model/quote.model"
+import { stark } from "starknet"
+import { addressSchema } from "@argent/shared"
+import { sampleOrderResponse } from "./order.mock"
+import { httpService } from "../../http/singleton"
+import { TradeType } from "../model/trade.model"
+import { calculateTotalFee } from "../utils"
+
+const mockPayTokenAddress = addressSchema.parse(stark.randomAddress())
+const mockReceiveTokenAddress = addressSchema.parse(stark.randomAddress())
+const mockAccountAddress = addressSchema.parse(stark.randomAddress())
+
+/**
+ * @vitest-environment happy-dom
+ */
+
+const server = setupServer(
+  rest.get("*/quote", (req, res, ctx) => {
+    return res(ctx.json(sampleQuoteJson))
+  }),
+  rest.post("*/order", (req, res, ctx) => {
+    return res(ctx.json(sampleOrderResponse))
+  }),
+)
+
+beforeAll(() => server.listen())
+afterEach(() => server.resetHandlers())
+afterAll(() => server.close())
+
+describe("SharedSwapService", () => {
+  const tokenServiceMock = {
+    getTokens: vi.fn(),
+  } as any
+
+  const networkServiceMock = {
+    getById: vi.fn(),
+  } as any
+
+  const swapBaseUrl = "https://www.mock-api.com"
+  let sharedSwapService: ISharedSwapService
+
+  beforeEach(() => {
+    sharedSwapService = new SharedSwapService(
+      tokenServiceMock,
+      networkServiceMock,
+      httpService,
+      swapBaseUrl,
+    )
+  })
+
+  describe("getSwapQuoteForPay", () => {
+    it("fetches and returns a swap quote", async () => {
+      const quote = await sharedSwapService.getSwapQuoteForPay(
+        "0xpayTokenAddress",
+        "0xreceiveTokenAddress",
+        "1000",
+        "0xaccountAddress",
+      )
+      expect(quote).toEqual(SwapQuoteResponseSchema.parse(sampleQuoteJson))
+    })
+
+    it("throws an error if the quote response is invalid", async () => {
+      server.use(
+        rest.get("*/quote", (req, res, ctx) => {
+          return res(ctx.json({}))
+        }),
+      )
+
+      await expect(
+        sharedSwapService.getSwapQuoteForPay(
+          "payTokenAddress",
+          "receiveTokenAddress",
+          "payAmount",
+          "accountAddress",
+        ),
+      ).rejects.toThrowError(new SwapError({ code: "INVALID_QUOTE_RESPONSE" }))
+    })
+  })
+
+  describe("getSwapTradeFromQuote", () => {
+    // Mock successful network and token service responses
+    beforeEach(() => {
+      networkServiceMock.getById = vi
+        .fn()
+        .mockResolvedValue({ id: "networkId" })
+      tokenServiceMock.getTokens = vi
+        .fn()
+        .mockResolvedValueOnce([getMockToken({ address: mockPayTokenAddress })])
+        .mockResolvedValueOnce([
+          getMockToken({ address: mockReceiveTokenAddress }),
+        ])
+    })
+
+    it("returns a trade from a quote", async () => {
+      const quote = SwapQuoteResponseSchema.parse(sampleQuoteJson)
+      const trade = await sharedSwapService.getSwapTradeFromQuote(
+        quote,
+        "networkId",
+      )
+
+      tokenServiceMock.getTokens = vi
+        .fn()
+        .mockResolvedValueOnce([getMockToken({ address: mockPayTokenAddress })])
+        .mockResolvedValueOnce([
+          getMockToken({ address: mockReceiveTokenAddress }),
+        ])
+
+      const { totalFee, totalFeeInCurrency, totalFeePercentage } =
+        calculateTotalFee(quote)
+
+      expect(trade).toEqual({
+        payToken: getMockToken({ address: mockPayTokenAddress }),
+        receiveToken: getMockToken({ address: mockReceiveTokenAddress }),
+        tradeType: TradeType.EXACT_PAY,
+        payAmount: quote.sellAmount,
+        receiveAmount: quote.buyAmount,
+        payAmountInCurrency: quote.sellAmountInCurrency,
+        receiveAmountInCurrency: quote.buyAmountInCurrency,
+        totalFee,
+        totalFeeInCurrency,
+        totalFeePercentage,
+        expiresAt: quote.expiresAt,
+        expiresIn: quote.expiresIn,
+        route: quote.routes[0],
+        data: quote.data,
+      })
+    })
+
+    it("throws an error if no network is found for the swap", async () => {
+      networkServiceMock.getById = vi.fn().mockResolvedValue(null)
+      const quote = SwapQuoteResponseSchema.parse(sampleQuoteJson)
+
+      await expect(
+        sharedSwapService.getSwapTradeFromQuote(quote, "networkId"),
+      ).rejects.toThrow(new SwapError({ code: "NO_NETWORK_FOR_SWAP" }))
+    })
+  })
+
+  describe("getSwapOrderFromTrade", () => {
+    it("submits a swap order and returns the response", async () => {
+      const trade = getMockTrade()
+
+      const orderResponse = await sharedSwapService.getSwapOrderFromTrade(
+        mockAccountAddress,
+        trade,
+        100,
+      )
+      expect(orderResponse).toEqual(
+        SwapOrderResponseSchema.parse(sampleOrderResponse),
+      )
+    })
+
+    it("throws an error if the order response is invalid", async () => {
+      server.use(
+        rest.post("*/order", (req, res, ctx) => {
+          return res(ctx.json({}))
+        }),
+      )
+
+      const trade = getMockTrade()
+
+      await expect(
+        sharedSwapService.getSwapOrderFromTrade(mockAccountAddress, trade, 100),
+      ).rejects.toThrow(new SwapError({ code: "INVALID_SWAP_ORDER_RESPONSE" }))
+    })
+  })
+})
diff --git a/packages/extension/src/shared/swap/service/implementation.ts b/packages/extension/src/shared/swap/service/implementation.ts
new file mode 100644
index 000000000..5c176106c
--- /dev/null
+++ b/packages/extension/src/shared/swap/service/implementation.ts
@@ -0,0 +1,137 @@
+import urlJoin from "url-join"
+import { IHttpService } from "@argent/shared"
+import { INetworkService } from "../../network/service/interface"
+import { ITokenService } from "../../token/__new/service/interface"
+import { urlWithQuery } from "../../utils/url"
+import {
+  SwapOrderRequestSchema,
+  SwapOrderResponse,
+  SwapOrderResponseSchema,
+} from "../model/order.model"
+import {
+  SwapQuoteResponse,
+  SwapQuoteResponseSchema,
+} from "../model/quote.model"
+import { Trade, TradeSchema } from "../model/trade.model"
+import { ISharedSwapService } from "./interface"
+import { SwapError } from "../../errors/swap"
+import { calculateTotalFee } from "../utils"
+export class SharedSwapService implements ISharedSwapService {
+  swapQuoteUrl: string
+  swapOrderUrl: string
+
+  constructor(
+    private readonly tokenService: ITokenService,
+    private readonly networkService: INetworkService,
+    private readonly httpService: IHttpService,
+    swapBaseUrl?: string,
+  ) {
+    if (!swapBaseUrl) {
+      throw new SwapError({ code: "NO_SWAP_URL" })
+    }
+
+    this.swapQuoteUrl = urlJoin(swapBaseUrl, "/quote")
+    this.swapOrderUrl = urlJoin(swapBaseUrl, "/order")
+  }
+
+  async getSwapQuoteForPay(
+    payTokenAddress: string,
+    receiveTokenAddress: string,
+    payAmount: string,
+    accountAddress: string,
+  ): Promise<SwapQuoteResponse> {
+    const quoteUrl = urlWithQuery(this.swapQuoteUrl, {
+      chain: "starknet",
+      currency: "USD",
+      sellToken: payTokenAddress,
+      buyToken: receiveTokenAddress,
+      sellAmount: payAmount,
+      accountAddress,
+    })
+
+    try {
+      const response = await this.httpService.get(quoteUrl)
+      const quoteResult = await SwapQuoteResponseSchema.parseAsync(response)
+      return quoteResult
+    } catch (error) {
+      console.error(error)
+      throw new SwapError({ code: "INVALID_QUOTE_RESPONSE" })
+    }
+  }
+
+  async getSwapTradeFromQuote(
+    quote: SwapQuoteResponse,
+    networkId: string,
+  ): Promise<Trade> {
+    const currentNetwork = await this.networkService.getById(networkId)
+
+    if (!currentNetwork) {
+      throw new SwapError({ code: "NO_NETWORK_FOR_SWAP" })
+    }
+
+    const [payToken] = await this.tokenService.getTokens(
+      (t) => t.address === quote.sellToken && t.networkId === currentNetwork.id,
+    )
+
+    const [receiveToken] = await this.tokenService.getTokens(
+      (t) => t.address === quote.buyToken && t.networkId === currentNetwork.id,
+    )
+
+    if (!payToken || !receiveToken) {
+      throw new SwapError({ code: "INVALID_SWAP_TOKENS" })
+    }
+
+    const { totalFee, totalFeeInCurrency, totalFeePercentage } =
+      calculateTotalFee(quote)
+
+    const trade = TradeSchema.parse({
+      payToken,
+      receiveToken,
+      payAmount: quote.sellAmount,
+      receiveAmount: quote.buyAmount,
+      payAmountInCurrency: quote.sellAmountInCurrency,
+      receiveAmountInCurrency: quote.buyAmountInCurrency,
+      totalFee,
+      totalFeeInCurrency,
+      totalFeePercentage,
+      expiresAt: quote.expiresAt,
+      expiresIn: quote.expiresIn,
+      route: quote.routes[0],
+      data: quote.data,
+    })
+
+    return trade
+  }
+
+  async getSwapOrderFromTrade(
+    accountAddress: string,
+    trade: Trade,
+    userSlippageTolerance: number,
+  ): Promise<SwapOrderResponse> {
+    const body = SwapOrderRequestSchema.parse({
+      chain: "starknet",
+      sellToken: trade.payToken.address,
+      buyToken: trade.receiveToken.address,
+      sellAmount: trade.payAmount,
+      buyAmount: trade.receiveAmount,
+      accountAddress,
+      slippage: userSlippageTolerance / 10000,
+      data: trade.data,
+    })
+
+    try {
+      const response = await this.httpService.post(this.swapOrderUrl, {
+        body: JSON.stringify(body),
+        headers: {
+          "Content-Type": "application/json",
+        },
+      })
+
+      const parsedResponse = await SwapOrderResponseSchema.parseAsync(response)
+      return parsedResponse
+    } catch (error) {
+      console.error(error)
+      throw new SwapError({ code: "INVALID_SWAP_ORDER_RESPONSE" })
+    }
+  }
+}
diff --git a/packages/extension/src/shared/swap/service/index.ts b/packages/extension/src/shared/swap/service/index.ts
new file mode 100644
index 000000000..1125044d6
--- /dev/null
+++ b/packages/extension/src/shared/swap/service/index.ts
@@ -0,0 +1,12 @@
+import { ARGENT_SWAP_BASE_URL } from "../../api/constants"
+import { networkService } from "../../network/service"
+import { tokenService } from "../../token/__new/service"
+import { SharedSwapService } from "./implementation"
+import { httpService } from "../../http/singleton"
+
+export const sharedSwapService = new SharedSwapService(
+  tokenService,
+  networkService,
+  httpService,
+  ARGENT_SWAP_BASE_URL,
+)
diff --git a/packages/extension/src/shared/swap/service/interface.ts b/packages/extension/src/shared/swap/service/interface.ts
new file mode 100644
index 000000000..415c2a3a7
--- /dev/null
+++ b/packages/extension/src/shared/swap/service/interface.ts
@@ -0,0 +1,21 @@
+import { SwapOrderResponse } from "../model/order.model"
+import { SwapQuoteResponse } from "../model/quote.model"
+import { Trade } from "../model/trade.model"
+
+export interface ISharedSwapService {
+  getSwapQuoteForPay: (
+    payTokenAddress: string,
+    receiveTokenAddress: string,
+    payAmount: string,
+    accountAddress: string,
+  ) => Promise<SwapQuoteResponse>
+  getSwapTradeFromQuote: (
+    quote: SwapQuoteResponse,
+    networkId: string,
+  ) => Promise<Trade>
+  getSwapOrderFromTrade: (
+    accountAddress: string,
+    trade: Trade,
+    userSlippage: number,
+  ) => Promise<SwapOrderResponse>
+}
diff --git a/packages/extension/src/shared/swap/service/order.mock.ts b/packages/extension/src/shared/swap/service/order.mock.ts
new file mode 100644
index 000000000..62c09624f
--- /dev/null
+++ b/packages/extension/src/shared/swap/service/order.mock.ts
@@ -0,0 +1,40 @@
+export const sampleOrderResponse = {
+  calls: [
+    {
+      contractAddress:
+        "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+      entrypoint: "approve",
+      calldata: [
+        "0x4270219d365d6b017231b52e92b3fb5d7c8378b05e9abc97724537a80e93b0f",
+        "0x2aa1efb94e0000",
+        "0x0",
+      ],
+    },
+    {
+      contractAddress:
+        "0x4270219d365d6b017231b52e92b3fb5d7c8378b05e9abc97724537a80e93b0f",
+      entrypoint: "multi_route_swap",
+      calldata: [
+        "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "0x2aa1efb94e0000",
+        "0x0",
+        "0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8",
+        "0x179a930",
+        "0x0",
+        "0x1721b90",
+        "0x0",
+        "0x2ba76c537f6cfd944bad5e6dda9b112578f5803050e693e2ad8d6bd6e6e7ac9",
+        "0x0",
+        "0x3e90652c3fe1f5f42578ffefca7fb00c88d4d18b5fb2bbeeee1a0d0d7d7d82d",
+        "0x1",
+        "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+        "0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8",
+        "0x1114c7103e12c2b2ecbd3a2472ba9c48ddcbf702b1c242dd570057e26212111",
+        "0x64",
+        "0x2",
+        "0x71273c5c5780b4be42d9e6567b1b1a6934f43ab8abaf975c0c3da219fc4d040",
+        "0x4774ff08dcdfb1573c142",
+      ],
+    },
+  ],
+}
diff --git a/packages/extension/src/shared/swap/service/quote.mock.ts b/packages/extension/src/shared/swap/service/quote.mock.ts
new file mode 100644
index 000000000..82fa59280
--- /dev/null
+++ b/packages/extension/src/shared/swap/service/quote.mock.ts
@@ -0,0 +1,34 @@
+export const sampleQuoteJson = {
+  sellToken:
+    "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+  sellAmount: "1200000000000000",
+  sellAmountInCurrency: "2.477736",
+  buyToken: "0xda114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3",
+  buyAmount: "2480805239052254504",
+  buyAmountInCurrency: "2.4753275",
+  expiresAt: 1700717256144,
+  expiresIn: 120000,
+  dexCount: 6,
+  routes: [
+    {
+      name: "10kSwap",
+      percent: 1.0,
+      sellToken:
+        "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+      buyToken:
+        "0xda114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3",
+      routes: [],
+    },
+  ],
+  providerName: "AVNU",
+  providerFee: "496260299870424",
+  providerFeeInCurrency: "0.0004951",
+  providerFeePercentage: 0.0002,
+  argentFee: "0",
+  argentFeeInCurrency: "0.0",
+  argentFeePercentage: 0.0,
+  feeToken: "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+  data: {
+    quoteId: "691cae98-4aad-486d-a135-6ebcad8a42ac",
+  },
+}
diff --git a/packages/extension/src/shared/swap/utils/index.ts b/packages/extension/src/shared/swap/utils/index.ts
new file mode 100644
index 000000000..202430c7f
--- /dev/null
+++ b/packages/extension/src/shared/swap/utils/index.ts
@@ -0,0 +1 @@
+export * from "./totalFee"
diff --git a/packages/extension/src/shared/swap/utils/totalFee.ts b/packages/extension/src/shared/swap/utils/totalFee.ts
new file mode 100644
index 000000000..87b94c216
--- /dev/null
+++ b/packages/extension/src/shared/swap/utils/totalFee.ts
@@ -0,0 +1,40 @@
+import { bigDecimal } from "@argent/shared"
+import { SwapQuoteResponse } from "../model/quote.model"
+import { Trade } from "../model/trade.model"
+
+type TotalTradeFee = Pick<
+  Trade,
+  "totalFee" | "totalFeeInCurrency" | "totalFeePercentage"
+>
+
+type QuoteFee = Pick<
+  SwapQuoteResponse,
+  | "providerFee"
+  | "argentFee"
+  | "argentFeeInCurrency"
+  | "providerFeeInCurrency"
+  | "argentFeePercentage"
+  | "providerFeePercentage"
+>
+
+export function calculateTotalFee(quote: QuoteFee): TotalTradeFee {
+  // This can be done because backend returns a token formatted amount
+  const totalFee = BigInt(quote.providerFee) + BigInt(quote.argentFee)
+
+  // const totalFeeInCurrencyBig = bigDecimal.add(
+  //   bigDecimal.parseCurrency(quote.argentFeeInCurrency),
+  //   bigDecimal.parseCurrency(quote.providerFeeInCurrency),
+  // )
+
+  // const totalFeeInCurrency = bigDecimal.formatCurrency(
+  //   totalFeeInCurrencyBig.value,
+  // )
+  const totalFeePercentage =
+    quote.argentFeePercentage + quote.providerFeePercentage
+
+  return {
+    totalFee: totalFee.toString(),
+    totalFeePercentage,
+    // totalFeeInCurrency, Use once backend fixes "3.0E-17" issue
+  }
+}
diff --git a/packages/extension/src/shared/token/__deprecated/utils.ts b/packages/extension/src/shared/token/__deprecated/utils.ts
index 487edbe76..06aca6ab7 100644
--- a/packages/extension/src/shared/token/__deprecated/utils.ts
+++ b/packages/extension/src/shared/token/__deprecated/utils.ts
@@ -13,14 +13,3 @@ export const parsedDeprecatedTokens: Token[] = defaultTokens.map((token) => ({
   decimals: parseInt(token.decimals, 10),
   image: token.iconUrl,
 }))
-
-export const testDappToken = (networkId: string) =>
-  defaultTokens.find(
-    ({ name, network }) => name === "Test Token" && network === networkId,
-  )
-
-export const getFeeToken = (networkId: string) =>
-  parsedDeprecatedTokens.find(
-    ({ symbol, networkId: network }) =>
-      symbol === "ETH" && network === networkId,
-  )
diff --git a/packages/extension/src/shared/token/__new/constants.ts b/packages/extension/src/shared/token/__new/constants.ts
new file mode 100644
index 000000000..5909cfd49
--- /dev/null
+++ b/packages/extension/src/shared/token/__new/constants.ts
@@ -0,0 +1,28 @@
+import { constants } from "starknet"
+import { BaseToken } from "./types/token.model"
+
+export const ETH: Record<string, BaseToken> = {
+  [constants.StarknetChainId.SN_MAIN]: {
+    address:
+      "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+    networkId: "mainnet-alpha",
+  },
+  [constants.StarknetChainId.SN_GOERLI]: {
+    address:
+      "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+    networkId: "goerli-alpha",
+  },
+}
+
+export const USDC: Record<string, BaseToken> = {
+  [constants.StarknetChainId.SN_MAIN]: {
+    address:
+      "0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8",
+    networkId: "mainnet-alpha",
+  },
+  [constants.StarknetChainId.SN_GOERLI]: {
+    address:
+      "0x005a643907b9a4bc6a55e9069c4fd5fd1f5c79a22470690f75556c4736e34426",
+    networkId: "goerli-alpha",
+  },
+}
diff --git a/packages/extension/src/shared/token/__new/service/implementation.test.ts b/packages/extension/src/shared/token/__new/service/implementation.test.ts
index 3db2e6d97..45c3243ed 100644
--- a/packages/extension/src/shared/token/__new/service/implementation.test.ts
+++ b/packages/extension/src/shared/token/__new/service/implementation.test.ts
@@ -22,8 +22,13 @@ import { INetworkRepo } from "../../../network/store"
 import { rest } from "msw"
 import { setupServer } from "msw/node"
 import { GatewayError, shortString, stark } from "starknet"
-import { addressSchema } from "@argent/shared"
+import { Address, addressSchema } from "@argent/shared"
 import { TokenError } from "../../../errors/token"
+import {
+  ETH_TOKEN_ADDRESS,
+  STRK_TOKEN_ADDRESS,
+  TXV3_ACCOUNT_CLASS_HASH,
+} from "../../../network/constants"
 
 const BASE_INFO_ENDPOINT = "https://token.info.argent47.net/v1"
 const BASE_INFO_ENDPOINT_INVALID = "https://token.info.argent47.net/v2"
@@ -34,9 +39,6 @@ const BASE_PRICES_ENDPOINT = "https://token.prices.argent47.net/v1"
 const randomAddress1 = addressSchema.parse(stark.randomAddress())
 const randomAddress2 = addressSchema.parse(stark.randomAddress())
 
-/**
- * @vitest-environment jsdom
- */
 const server = setupServer(
   rest.get(BASE_INFO_ENDPOINT, (req, res, ctx) => {
     return res(
@@ -163,6 +165,7 @@ describe("TokenService", () => {
         custom: undefined,
         popular: defaultMockApiTokeDetails.popular,
         pricingId: defaultMockApiTokeDetails.pricingId,
+        tradable: true,
       })
       const mockToken2 = getMockToken({
         id: 2,
@@ -173,6 +176,7 @@ describe("TokenService", () => {
         custom: undefined,
         popular: defaultMockApiTokeDetails.popular,
         pricingId: 2,
+        tradable: true,
       })
       const mockTokens = [mockToken1, mockToken2]
       mockTokenRepo.get.mockResolvedValueOnce(mockTokens)
@@ -722,4 +726,155 @@ describe("TokenService", () => {
       [`${mockAccount.address}:${mockAccount.networkId}`]: "2200",
     })
   })
+
+  test("getFeeTokens returns the correct fee tokens and respects order preference", async () => {
+    const mockAccount = {
+      classHash: TXV3_ACCOUNT_CLASS_HASH as Address,
+      address: randomAddress1,
+      networkId: defaultNetwork.id,
+    }
+    const mockNetwork = getMockNetwork()
+    const mockBaseTokens = [
+      getMockBaseToken({ networkId: mockNetwork.id }),
+      getMockBaseToken({ address: "0x456", networkId: mockNetwork.id }),
+    ]
+
+    const mockTokens = [
+      getMockTokenWithBalance({
+        ...mockBaseTokens[0],
+        symbol: "ETH",
+        balance: BigInt(10e17).toString(),
+        account: mockAccount,
+        address: ETH_TOKEN_ADDRESS,
+      }),
+      getMockTokenWithBalance({
+        ...mockBaseTokens[1],
+        balance: BigInt(10e16).toString(),
+        account: mockAccount,
+      }),
+
+      getMockTokenWithBalance({
+        ...mockBaseTokens[1],
+        balance: BigInt(20e18).toString(),
+        symbol: "STRK",
+        account: mockAccount,
+        address: STRK_TOKEN_ADDRESS,
+      }),
+    ]
+
+    mockNetworkService.getById = vi.fn().mockResolvedValueOnce(mockNetwork)
+    mockTokenBalanceRepo.get.mockResolvedValueOnce(mockTokens)
+    mockTokenRepo.get.mockResolvedValueOnce(mockTokens)
+
+    const result = await tokenService.getFeeTokens(mockAccount)
+    expect(result).toEqual([mockTokens[2], mockTokens[0]])
+  })
+
+  test("should return the correct fee tokens given a mock account", async () => {
+    const mockAccount = {
+      classHash: TXV3_ACCOUNT_CLASS_HASH as Address,
+      address: randomAddress1,
+      networkId: defaultNetwork.id,
+    }
+    const mockNetwork = getMockNetwork()
+    const mockBaseTokens = [
+      getMockBaseToken({ networkId: mockNetwork.id }),
+      getMockBaseToken({ address: "0x456", networkId: mockNetwork.id }),
+    ]
+
+    const mockTokens = [
+      getMockTokenWithBalance({
+        ...mockBaseTokens[1],
+        balance: BigInt(20e18).toString(),
+        symbol: "STRK",
+        account: mockAccount,
+        address: STRK_TOKEN_ADDRESS,
+      }),
+      getMockTokenWithBalance({
+        ...mockBaseTokens[0],
+        balance: BigInt(10e17).toString(),
+        account: mockAccount,
+        symbol: "ETH",
+        address: ETH_TOKEN_ADDRESS,
+      }),
+    ]
+
+    mockNetworkService.getById = vi.fn().mockResolvedValueOnce(mockNetwork)
+    mockTokenBalanceRepo.get.mockResolvedValueOnce(mockTokens)
+    mockTokenRepo.get.mockResolvedValueOnce(mockTokens)
+
+    const result = await tokenService.getFeeTokens(mockAccount)
+    expect(result).toEqual(mockTokens)
+  })
+
+  test("getBestFeeToken returns the correct fee token", async () => {
+    const mockAccount = {
+      classHash: "0x123" as Address,
+      address: randomAddress1,
+      networkId: defaultNetwork.id,
+    }
+    const mockNetwork = getMockNetwork()
+    const mockBaseTokens = [
+      getMockBaseToken({ networkId: mockNetwork.id }),
+      getMockBaseToken({ address: "0x456", networkId: mockNetwork.id }),
+    ]
+
+    const mockTokens = [
+      getMockTokenWithBalance({
+        ...mockBaseTokens[0],
+        balance: BigInt(10e17).toString(),
+        account: mockAccount,
+        address: ETH_TOKEN_ADDRESS,
+      }),
+      getMockTokenWithBalance({
+        ...mockBaseTokens[1],
+        balance: BigInt(10e16).toString(),
+        account: mockAccount,
+      }),
+    ]
+
+    mockNetworkService.getById = vi.fn().mockResolvedValueOnce(mockNetwork)
+    mockTokenBalanceRepo.get.mockResolvedValueOnce(mockTokens)
+    mockTokenRepo.get.mockResolvedValueOnce(mockTokens)
+
+    const result = await tokenService.getBestFeeToken(mockAccount)
+    expect(result).toEqual(mockTokens[0])
+  })
+
+  test("getBestFeeToken returns the token with the highest balance", async () => {
+    const mockAccount = {
+      classHash: TXV3_ACCOUNT_CLASS_HASH as Address,
+      address: randomAddress1,
+      networkId: defaultNetwork.id,
+    }
+    const mockNetwork = getMockNetwork()
+    const mockBaseTokens = [
+      getMockBaseToken({ networkId: mockNetwork.id }),
+      getMockBaseToken({ address: "0x456", networkId: mockNetwork.id }),
+    ]
+
+    const mockTokens = [
+      getMockTokenWithBalance({
+        ...mockBaseTokens[0],
+        balance: BigInt(10e17).toString(),
+        account: mockAccount,
+        symbol: "ETH",
+        address: ETH_TOKEN_ADDRESS,
+      }),
+      getMockTokenWithBalance({
+        ...mockBaseTokens[1],
+        balance: BigInt(10e18).toString(),
+        symbol: "STRK",
+        account: mockAccount,
+        address: STRK_TOKEN_ADDRESS,
+      }),
+    ]
+
+    mockNetworkService.getById = vi.fn().mockResolvedValueOnce(mockNetwork)
+    mockTokenBalanceRepo.get.mockResolvedValueOnce(mockTokens)
+    mockTokenRepo.get.mockResolvedValueOnce(mockTokens)
+
+    const result = await tokenService.getBestFeeToken(mockAccount)
+    expect(result).toEqual(mockTokens[1])
+  })
 })
diff --git a/packages/extension/src/shared/token/__new/service/implementation.ts b/packages/extension/src/shared/token/__new/service/implementation.ts
index 141ac8b09..1f577f1d8 100644
--- a/packages/extension/src/shared/token/__new/service/implementation.ts
+++ b/packages/extension/src/shared/token/__new/service/implementation.ts
@@ -10,17 +10,20 @@ import {
   Token,
 } from "../types/token.model"
 import { convertTokenAmountToCurrencyValue, equalToken } from "../utils"
-import { BaseTokenWithBalance } from "../types/tokenBalance.model"
-import { BaseWalletAccount } from "../../../wallet.model"
+import {
+  BaseTokenWithBalance,
+  TokenWithBalance,
+} from "../types/tokenBalance.model"
+import { BaseWalletAccount, WalletAccount } from "../../../wallet.model"
 import {
   ApiPriceDataResponseSchema,
   TokenPriceDetails,
   TokenWithBalanceAndPrice,
 } from "../types/tokenPrice.model"
 import { accountsEqual } from "../../../utils/accountsEqual"
-import { groupBy } from "lodash-es"
+import { groupBy, uniq } from "lodash-es"
 import { SelectorFn } from "../../../storage/__new/interface"
-import { bigDecimal } from "@argent/shared"
+import { bigDecimal, ensureArray, isEqualAddress } from "@argent/shared"
 import { INetworkService } from "../../../network/service/interface"
 import { getMulticallForNetwork } from "../../../multicall"
 import { getProvider } from "../../../network/provider"
@@ -28,6 +31,12 @@ import { Network, defaultNetwork } from "../../../network"
 import { fetcherWithArgentApiHeadersForNetwork } from "../../../api/fetcher"
 import { getAccountIdentifier } from "../../../wallet.service"
 import { TokenError } from "../../../errors/token"
+import {
+  classHashSupportsTxV3,
+  feeTokenNeedsTxV3Support,
+} from "../../../network/txv3"
+
+const FEE_TOKEN_PREFERENCE_BY_SYMBOL = ["STRK", "ETH"]
 
 /**
  * TokenService class implements ITokenService interface.
@@ -160,6 +169,7 @@ export class TokenService implements ITokenService {
           networkId,
           custom: cached?.custom,
           popular: token.popular || cached?.popular,
+          tradable: token.tradable || cached?.tradable,
         }
       })
 
@@ -169,16 +179,24 @@ export class TokenService implements ITokenService {
   /**
    * Fetches token balances from the blockchain.
    * @param {BaseWalletAccount[]} accounts - The accounts for which to fetch token balances.
-   * @param {Token[]} tokens - The tokens for which to fetch balances. If not provided, fetches for all tokens.
+   * @param {Token[]} tokens - The tokens for which to fetch balances. If not provided, finds all relevant tokens for the accounts
    * @returns {Promise<BaseTokenWithBalance[]>} - The fetched token balances.
    */
   async fetchTokenBalancesFromOnChain(
     accounts: AllowArray<BaseWalletAccount>,
     tokens?: AllowArray<Token>,
   ): Promise<BaseTokenWithBalance[]> {
-    const accountsArray = Array.isArray(accounts) ? accounts : [accounts]
-    tokens = tokens || (await this.getTokens())
-    const tokensArray = Array.isArray(tokens) ? tokens : [tokens]
+    const accountsArray = ensureArray(accounts)
+    // by default, find all the relevant tokens for all the accounts
+    if (!tokens) {
+      // create an array of all networks covered by accounts
+      const networkIds = uniq(accountsArray.map((account) => account.networkId))
+      // create an array of all tokens covered by the networks
+      tokens = await this.getTokens((token) =>
+        networkIds.includes(token.networkId),
+      )
+    }
+    const tokensArray = ensureArray(tokens)
 
     const accountsGroupedByNetwork = groupBy(accountsArray, "networkId")
     const tokensGroupedByNetwork = groupBy(tokensArray, "networkId")
@@ -529,4 +547,66 @@ export class TokenService implements ITokenService {
 
     return totalCurrencyBalanceForAccounts
   }
+
+  async getFeeTokens(
+    account: BaseWalletAccount & Required<Pick<WalletAccount, "classHash">>,
+  ): Promise<TokenWithBalance[]> {
+    const tokens = await this.getTokens()
+    const network = await this.networkService.getById(account.networkId)
+    const networkFeeTokens = tokens.filter((token) =>
+      network.possibleFeeTokenAddresses.some((ft) =>
+        isEqualAddress(ft, token.address),
+      ),
+    )
+    const accountFeeTokens = networkFeeTokens.filter((token) => {
+      if (feeTokenNeedsTxV3Support(token)) {
+        return classHashSupportsTxV3(account.classHash)
+      }
+      return true
+    })
+    const feeTokenBalances = await this.getTokenBalancesForAccount(
+      account,
+      accountFeeTokens,
+    )
+    const feeTokensWithBalances: TokenWithBalance[] = accountFeeTokens.map(
+      (token) => {
+        const tokenBalance = feeTokenBalances.find((tb) =>
+          equalToken(tb, token),
+        ) ?? {
+          balance: "0",
+          account: { address: account.address, networkId: account.networkId },
+        }
+        return {
+          ...token,
+          ...tokenBalance,
+        }
+      },
+    )
+    // sort by fee token preference defined in FEE_TOKEN_PREFERENCE_BY_SYMBOL
+    return feeTokensWithBalances.sort((a, b) => {
+      const [aIndex, bIndex] = [a, b].map((token) =>
+        FEE_TOKEN_PREFERENCE_BY_SYMBOL.indexOf(token.symbol),
+      )
+      return aIndex === -1 ? 1 : bIndex === -1 ? -1 : aIndex - bIndex
+    })
+  }
+
+  async getBestFeeToken(
+    account: BaseWalletAccount & Required<Pick<WalletAccount, "classHash">>,
+  ): Promise<TokenWithBalance> {
+    const possibleFeeTokenWithBalances = await this.getFeeTokens(account)
+
+    if (possibleFeeTokenWithBalances.length === 1) {
+      return possibleFeeTokenWithBalances[0]
+    }
+
+    // we expect the fee tokens to be sorted by preference
+    // so we return the first one that has a balance
+    // if none have a balance, we return the first one (prefered one)
+    return (
+      possibleFeeTokenWithBalances.find(
+        (token) => bigDecimal.parseCurrency(token.balance).value > 0n,
+      ) ?? possibleFeeTokenWithBalances[0]
+    )
+  }
 }
diff --git a/packages/extension/src/shared/token/__new/service/interface.ts b/packages/extension/src/shared/token/__new/service/interface.ts
index f8d52d263..b2d69430a 100644
--- a/packages/extension/src/shared/token/__new/service/interface.ts
+++ b/packages/extension/src/shared/token/__new/service/interface.ts
@@ -1,5 +1,5 @@
 import { AllowArray, SelectorFn } from "../../../storage/__new/interface"
-import { BaseWalletAccount } from "../../../wallet.model"
+import { BaseWalletAccount, WalletAccount } from "../../../wallet.model"
 import { BaseToken, Token } from "../types/token.model"
 import { BaseTokenWithBalance } from "../types/tokenBalance.model"
 import {
@@ -66,4 +66,11 @@ export interface ITokenService {
   getTotalCurrencyBalanceForAccounts: (
     accounts: BaseWalletAccount[],
   ) => Promise<{ [key: string]: string }>
+
+  getFeeTokens: (
+    account: BaseWalletAccount & Required<Pick<WalletAccount, "classHash">>,
+  ) => Promise<Token[]>
+  getBestFeeToken: (
+    account: BaseWalletAccount & Required<Pick<WalletAccount, "classHash">>,
+  ) => Promise<Token>
 }
diff --git a/packages/extension/src/shared/token/__new/types/token.model.ts b/packages/extension/src/shared/token/__new/types/token.model.ts
index 7528f5c74..8408e2c78 100644
--- a/packages/extension/src/shared/token/__new/types/token.model.ts
+++ b/packages/extension/src/shared/token/__new/types/token.model.ts
@@ -28,6 +28,7 @@ export const TokenSchema = RequestTokenSchema.required().extend({
   popular: z.boolean().optional(),
   custom: z.boolean().optional(),
   pricingId: z.number().optional(),
+  tradable: z.boolean().optional(),
 })
 
 export type Token = z.infer<typeof TokenSchema>
diff --git a/packages/extension/src/shared/token/__new/types/tokenAmount.model.ts b/packages/extension/src/shared/token/__new/types/tokenAmount.model.ts
new file mode 100644
index 000000000..0ddff1671
--- /dev/null
+++ b/packages/extension/src/shared/token/__new/types/tokenAmount.model.ts
@@ -0,0 +1,25 @@
+/**
+ * This file is similar to tokenBalance.model.ts
+ * but it uses the field amount instead of balance
+ * for proper notation of the field in the application
+ *
+ * Balance can be thought of as the balance of the user using the wallet
+ * However, amount can be any amount of tokens regardless of the user's balance
+ *
+ * Please use TokenAmount and TokenBalance accordingly
+ * */
+
+import { z } from "zod"
+
+import { BaseTokenSchema, TokenSchema } from "./token.model"
+
+export const BaseTokenAmountSchema = BaseTokenSchema.extend({
+  amount: z.bigint(),
+})
+
+export const TokenAmountSchema = TokenSchema.extend({
+  amount: z.bigint(),
+})
+
+export type BaseTokenAmount = z.infer<typeof BaseTokenAmountSchema>
+export type TokenAmount = z.infer<typeof TokenAmountSchema>
diff --git a/packages/extension/src/shared/token/__new/types/tokenBalance.model.ts b/packages/extension/src/shared/token/__new/types/tokenBalance.model.ts
index 9877191c1..c26a12697 100644
--- a/packages/extension/src/shared/token/__new/types/tokenBalance.model.ts
+++ b/packages/extension/src/shared/token/__new/types/tokenBalance.model.ts
@@ -23,3 +23,11 @@ export const TokenWithOptionalBigIntBalanceSchema = TokenSchema.extend({
 export type TokenWithOptionalBigIntBalance = z.infer<
   typeof TokenWithOptionalBigIntBalanceSchema
 >
+
+export const TokenWithBigIntBalanceSchema = TokenSchema.extend({
+  balance: z.bigint(),
+})
+
+export type TokenWithBigIntBalance = z.infer<
+  typeof TokenWithBigIntBalanceSchema
+>
diff --git a/packages/extension/src/shared/token/__new/utils/index.ts b/packages/extension/src/shared/token/__new/utils/index.ts
index 5f45c8434..b1cf781e0 100644
--- a/packages/extension/src/shared/token/__new/utils/index.ts
+++ b/packages/extension/src/shared/token/__new/utils/index.ts
@@ -58,14 +58,3 @@ export const parsedDefaultTokens: Token[] = defaultTokens.map((token) => ({
   networkId: token.network,
   decimals: parseInt(token.decimals, 10),
 }))
-
-export const getFeeToken = (networkId: string) =>
-  parsedDefaultTokens.find(
-    ({ symbol, networkId: network }) =>
-      symbol === "ETH" && network === networkId,
-  )
-
-export const testDappToken = (networkId: string) =>
-  defaultTokens.find(
-    ({ name, network }) => name === "Test Token" && network === networkId,
-  )
diff --git a/packages/extension/src/shared/token/__new/worker/implementation.ts b/packages/extension/src/shared/token/__new/worker/implementation.ts
deleted file mode 100644
index f56c8864a..000000000
--- a/packages/extension/src/shared/token/__new/worker/implementation.ts
+++ /dev/null
@@ -1,323 +0,0 @@
-import { IScheduleService } from "../../../schedule/interface"
-import { ITokenService } from "../service/interface"
-import { ITokenWorker } from "./interface"
-import { INetworkService } from "../../../network/service/interface"
-import { WalletStorageProps } from "../../../wallet/walletStore"
-import { BaseWalletAccount, WalletAccount } from "../../../wallet.model"
-import { defaultNetwork } from "../../../network"
-import { IAccountService } from "../../../account/service/interface"
-import { Token } from "../types/token.model"
-import { IBackgroundUIService } from "../../../../background/__new/services/ui/interface"
-import { Transaction } from "../../../transactions"
-import { transactionSucceeded } from "../../../utils/transactionSucceeded"
-import { IRepository } from "../../../storage/__new/interface"
-import { WalletRecoverySharedService } from "../../../../background/wallet/recovery/shared.service"
-import { Recovered } from "../../../../background/wallet/recovery/interface"
-import { KeyValueStorage } from "../../../storage"
-import { RefreshInterval } from "../../../config"
-import {
-  every,
-  everyWhenOpen,
-  onInstallAndUpgrade,
-  onStartup,
-} from "../../../../background/__new/services/worker/schedule/decorators"
-import { pipe } from "../../../../background/__new/services/worker/schedule/pipe"
-import { IDebounceService } from "../../../debounce"
-import { IActivityService } from "../../../../background/__new/services/activity/interface"
-import { IActivityStorage } from "../../../activity/types"
-
-const NETWORKS_WITH_BACKEND_SUPPORT = ["goerli-alpha", "mainnet-alpha"]
-/**
- * Refresh periods for updates
- */
-// const THIRTY_SECOND_REFRESH = 30 // thirty seconds in seconds
-// const ONE_MINUTE_REFRESH = 60 // one minute in seconds
-// const TWO_MINUTE_REFRESH = 2 * 60 // two minutes in seconds
-// const ONE_DAY_REFRESH = 24 * 60 * 60 // one day in seconds
-/**
- * TokenWorker class implementing ITokenWorker interface
- * This class is responsible for managing token updates, including token balances and prices.
- */
-export class TokenWorker implements ITokenWorker {
-  /**
-   * Constructor for TokenWorker class
-   * @param {IWalletStore} walletStore - The wallet store
-   * @param {IRepository<Transaction>} transactionsRepo - The transactions store
-   * @param {IRepository<Token>} tokenRepo - The token repository
-   * @param {ITokenService} tokenService - The token service
-   * @param {IAccountService} accountService - The account service
-   * @param {INetworkService} networkService - The network service
-   * @param {WalletRecoverySharedService} recoverySharedService - The wallet recovery service
-   * @param {IBackgroundUIService} backgroundUIService - The background UI service
-   * @param {IScheduleService} scheduleService - The schedule service
-   * @param {IDebounceService} debounceService - The debounce service
-   * @param {IActivityService} activityService - The activity service
-   * @param {KeyValueStorage<IActivityStorage>} activityStore - The activity store
-   */
-  constructor(
-    private readonly walletStore: KeyValueStorage<WalletStorageProps>,
-    private readonly transactionsRepo: IRepository<Transaction>, // Transactions store
-    private readonly tokenRepo: IRepository<Token>, // Tokens store
-    private readonly tokenService: ITokenService, // Token service
-    private readonly accountService: IAccountService, // Account service
-    private readonly networkService: INetworkService, // Network service
-    private readonly recoverySharedService: WalletRecoverySharedService, // Recovery shared service
-    private readonly backgroundUIService: IBackgroundUIService, // Background UI service
-    private readonly scheduleService: IScheduleService, // Schedule service
-    private readonly debounceService: IDebounceService, // Debounce service
-    private readonly activityService: IActivityService, // Activity service
-  ) {
-    // Run once on startup
-    void this.initialize()
-  }
-
-  /**
-   * Initialize the TokenWorker
-   * Registers the schedules and event listeners
-   */
-  initialize(): void {
-    // Listen for account changes
-    this.walletStore.subscribe("selected", async (account) => {
-      if (account) {
-        await this.checkAndUpdateTokens(account) // Check if tokens have priceId and update if needed
-        await this.updateTokenBalancesForAccount(account) // Update token balances on account changenge
-      }
-    })
-
-    // Listen for recovery event
-    this.recoverySharedService.emitter.on(
-      Recovered,
-      this.onRecovered.bind(this),
-    )
-
-    // Listen for transaction success
-    this.transactionsRepo.subscribe((changeSet) => {
-      if (!changeSet?.newValue) {
-        return
-      }
-      const hasSuccessTx = transactionSucceeded(
-        changeSet.newValue,
-        changeSet?.oldValue,
-      )
-      if (hasSuccessTx) {
-        const isOnBackendSupportedNetwork = changeSet.newValue.every((tx) =>
-          NETWORKS_WITH_BACKEND_SUPPORT.includes(tx.account.networkId),
-        )
-        void this.updateTokenBalancesCallback({
-          hasBackendSupport: isOnBackendSupportedNetwork,
-        }) // Update token balances on transaction success
-      }
-    })
-
-    this.tokenRepo.subscribe((changeSet) => {
-      const isOnBackendSupportedNetwork = changeSet?.newValue?.every((token) =>
-        NETWORKS_WITH_BACKEND_SUPPORT.includes(token.networkId),
-      )
-      void this.updateTokenBalancesCallback({
-        hasBackendSupport: Boolean(isOnBackendSupportedNetwork),
-      }) // Update token balances on token change
-      void this.updateTokenPricesCallback() // Update token prices on token change
-    })
-  }
-
-  updateTokensCallback = async (): Promise<void> => {
-    const networks = await this.networkService.get() // Get all networks
-
-    // // Fetch tokens for all networks in parallel
-    const tokensFromAllNetworks = await Promise.allSettled(
-      networks.map((network) =>
-        this.tokenService.fetchTokensFromBackend(network.id),
-      ),
-    )
-    const tokens = tokensFromAllNetworks
-      .map((result) => result.status === "fulfilled" && result.value)
-      .filter((t): t is Token[] => Boolean(t))
-      .flat()
-
-    await this.tokenService.updateTokens(tokens) // Update tokens in the token service
-  }
-
-  async updateTokenBalancesForAccount(
-    baseWalletAccount: BaseWalletAccount,
-  ): Promise<void> {
-    const tokens = await this.tokenService.getTokens(
-      (t) => t.networkId === baseWalletAccount.networkId,
-    )
-    const tokensWithBalance =
-      await this.tokenService.fetchTokenBalancesFromOnChain(
-        [baseWalletAccount],
-        tokens,
-      )
-
-    return await this.tokenService.updateTokenBalances(tokensWithBalance) // Update token balances in the token service
-  }
-
-  async checkAndUpdateTokens(
-    baseWalletAccount: BaseWalletAccount,
-  ): Promise<void> {
-    const tokens = await this.tokenService.getTokens(
-      (t) =>
-        t.networkId === baseWalletAccount.networkId &&
-        t.pricingId !== undefined,
-    )
-
-    if (!tokens.length) {
-      await this.updateTokensCallback()
-    }
-  }
-
-  /**
-   * Update tokens
-   * Fetches tokens for all networks and updates the token service
-   */
-  updateTokens = pipe(
-    onStartup(this.scheduleService), // This will run the function on startup
-    onInstallAndUpgrade(this.scheduleService), // This will run the function on update
-    every(this.scheduleService, RefreshInterval.VERY_SLOW, "updateTokens"), // This will run the function every 24 hours
-  )(async (): Promise<void> => {
-    await this.updateTokensCallback()
-  })
-
-  private async updateBalance({
-    tokens,
-    accounts,
-  }: {
-    tokens: Token[]
-    accounts: WalletAccount[]
-  }) {
-    const tokensWithBalances =
-      await this.tokenService.fetchTokenBalancesFromOnChain(accounts, tokens)
-
-    await this.tokenService.updateTokenBalances(tokensWithBalances) // Update token balances in the token service
-  }
-
-  updateTokenBalancesCallback = async ({
-    hasBackendSupport,
-  }: {
-    hasBackendSupport: boolean
-  }): Promise<void> => {
-    const selectedAccount = await this.walletStore.get("selected")
-    if (!selectedAccount) {
-      return
-    }
-    const accounts = await this.accountService.get(
-      (a) => a.networkId === selectedAccount.networkId,
-    )
-    const tokens = await this.tokenService.getTokens(
-      (t) => t.networkId === selectedAccount.networkId,
-    )
-    if (!hasBackendSupport) {
-      await this.updateBalance({ tokens, accounts })
-    } else {
-      const shouldUpdateBalance =
-        await this.activityService.shouldUpdateBalance(selectedAccount)
-      if (
-        shouldUpdateBalance.shouldUpdate &&
-        shouldUpdateBalance.id &&
-        shouldUpdateBalance.lastModified
-      ) {
-        await this.updateBalance({ tokens, accounts })
-
-        await this.activityService.addActivityToStore({
-          address: selectedAccount.address,
-          id: shouldUpdateBalance.id,
-          lastModified: shouldUpdateBalance.lastModified,
-        })
-      }
-    }
-  }
-
-  /**
-   * Update token balances
-   * Fetches token balances for the provided account or all accounts on the current network
-   * @param baseWalletAccount - Base Wallet Account
-   */
-  updateTokenBalances = pipe(
-    everyWhenOpen(
-      this.backgroundUIService,
-      this.scheduleService,
-      this.debounceService,
-      RefreshInterval.FAST,
-      "updateTokenBalances",
-    ), // This will run the function every 20 seconds when the UI is open
-  )(async (): Promise<void> => {
-    const selectedAccount = await this.walletStore.get("selected")
-    if (
-      selectedAccount?.networkId &&
-      NETWORKS_WITH_BACKEND_SUPPORT.includes(selectedAccount.networkId)
-    ) {
-      await this.updateTokenBalancesCallback({ hasBackendSupport: true })
-    }
-  })
-
-  /**
-   * Update token balances for custom networks
-   * Fetches token balances for the provided account or all accounts on the current network
-   * @param baseWalletAccount - Base Wallet Account
-   */
-  updateCustomNetworksTokenBalances = pipe(
-    everyWhenOpen(
-      this.backgroundUIService,
-      this.scheduleService,
-      this.debounceService,
-      RefreshInterval.MEDIUM,
-      "updateCustomNetworksTokenBalances",
-    ), // This will run the function every 60 seconds when the UI is open
-  )(async (): Promise<void> => {
-    const selectedAccount = await this.walletStore.get("selected")
-
-    if (
-      !selectedAccount?.networkId ||
-      !NETWORKS_WITH_BACKEND_SUPPORT.includes(selectedAccount.networkId)
-    ) {
-      await this.updateTokenBalancesCallback({ hasBackendSupport: false })
-    }
-  })
-
-  updateTokenPricesCallback = async (): Promise<void> => {
-    // Token prices are only available for the default network
-    const defaultNetworkId = defaultNetwork.id
-    const tokens = await this.tokenService.getTokens(
-      (t) => t.networkId === defaultNetworkId,
-    )
-    const tokenPrices = await this.tokenService.fetchTokenPricesFromBackend(
-      tokens,
-      defaultNetworkId,
-    )
-    await this.tokenService.updateTokenPrices(tokenPrices) // Update token prices in the token service
-  }
-
-  /**
-   * Update token prices
-   * Fetches token prices for the default network and updates the token service
-   */
-  updateTokenPrices = pipe(
-    everyWhenOpen(
-      this.backgroundUIService,
-      this.scheduleService,
-      this.debounceService,
-      RefreshInterval.MEDIUM,
-      "updateTokenPrices",
-    ), // This will run the function every 2 minutes when the UI is open
-  )(async (): Promise<void> => {
-    await this.updateTokenPricesCallback()
-  })
-
-  /**
-   * Handle Recovery
-   * Updates everything on recovery
-   * @param recoveredAccounts -BaseWalletAccount[]
-   */
-  async onRecovered(recoveredAccounts: BaseWalletAccount[]) {
-    if (recoveredAccounts.length > 0) {
-      await this.updateTokensCallback() // Update tokens when wallet is recovered
-      await this.updateTokenPricesCallback() // Update token prices when wallet is recovered
-
-      // On Recovery, we need to fetch the token balances for the recovered accounts
-      const tokensWithBalances =
-        await this.tokenService.fetchTokenBalancesFromOnChain(recoveredAccounts)
-
-      await this.tokenService.updateTokenBalances(tokensWithBalances)
-    }
-  }
-}
diff --git a/packages/extension/src/shared/token/__new/worker/index.ts b/packages/extension/src/shared/token/__new/worker/index.ts
deleted file mode 100644
index 6aa65cc7b..000000000
--- a/packages/extension/src/shared/token/__new/worker/index.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { activityService } from "../../../../background/__new/services/activity"
-import { backgroundUIService } from "../../../../background/__new/services/ui"
-import { transactionsRepo } from "../../../../background/transactions/store"
-import { recoverySharedService } from "../../../../background/walletSingleton"
-import { accountService } from "../../../account/service"
-import { debounceService } from "../../../debounce"
-import { networkService } from "../../../network/service"
-import { chromeScheduleService } from "../../../schedule"
-import { old_walletStore } from "../../../wallet/walletStore"
-import { tokenRepo } from "../repository/token"
-
-import { tokenService } from "../service"
-import { TokenWorker } from "./implementation"
-
-export const tokenWorker = new TokenWorker(
-  old_walletStore, // TODO: remove old_walletStore. Make walletStore work properly
-  transactionsRepo,
-  tokenRepo,
-  tokenService,
-  accountService,
-  networkService,
-  recoverySharedService,
-  backgroundUIService,
-  chromeScheduleService,
-  debounceService,
-  activityService,
-)
diff --git a/packages/extension/src/shared/token/__new/worker/interface.ts b/packages/extension/src/shared/token/__new/worker/interface.ts
deleted file mode 100644
index 66046f5c0..000000000
--- a/packages/extension/src/shared/token/__new/worker/interface.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Interface for the Token Worker.
- */
-export interface ITokenWorker {
-  /**
-   * Initialize the token worker.
-   */
-  initialize(): void
-
-  /**
-   * Update the tokens.
-   * @returns A promise that resolves when the tokens have been updated.
-   */
-  updateTokens(): Promise<void>
-
-  /**
-   * Update the token balances.
-   * @returns A promise that resolves when the token balances have been updated.
-   */
-  updateTokenBalances(): Promise<void>
-
-  /**
-   * Update the token prices.
-   * @returns A promise that resolves when the token prices have been updated.
-   */
-  updateTokenPrices(): Promise<void>
-}
diff --git a/packages/extension/src/shared/token/price.ts b/packages/extension/src/shared/token/price.ts
index 0ae2269db..9e1d6f456 100644
--- a/packages/extension/src/shared/token/price.ts
+++ b/packages/extension/src/shared/token/price.ts
@@ -1,6 +1,7 @@
 import { uint256, BigNumberish } from "starknet"
 
 import {
+  IPrettifyNumberConfig,
   isNumeric,
   prettifyCurrencyNumber,
   prettifyTokenNumber,
@@ -216,6 +217,7 @@ export interface IPrettifyTokenAmount {
   showPlusSign?: boolean
   withSymbol?: boolean
   unlimitedText?: string
+  prettyConfigOverrides?: Partial<IPrettifyNumberConfig>
 }
 
 export const prettifyTokenAmount = ({
@@ -225,6 +227,7 @@ export const prettifyTokenAmount = ({
   showPlusSign = false,
   withSymbol = true,
   unlimitedText = PRETTY_UNLIMITED,
+  prettyConfigOverrides,
 }: IPrettifyTokenAmount) => {
   if (!isNumeric(amount)) {
     return null
@@ -243,7 +246,7 @@ export const prettifyTokenAmount = ({
         : balance.toString()
     prettyValue =
       decimalsNumber > 0
-        ? prettifyTokenNumber(balanceFullString)
+        ? prettifyTokenNumber(balanceFullString, prettyConfigOverrides)
         : balanceFullString
   }
 
diff --git a/packages/extension/src/shared/transactionReview/schema.ts b/packages/extension/src/shared/transactionReview/schema.ts
index 6f1f74341..61ee55678 100644
--- a/packages/extension/src/shared/transactionReview/schema.ts
+++ b/packages/extension/src/shared/transactionReview/schema.ts
@@ -103,7 +103,7 @@ export const severitySchema = z.union([
   z.literal("info"),
 ])
 
-const warningSchema = z.object({
+export const warningSchema = z.object({
   reason: reasonsSchema,
   details: z.record(z.string().or(z.number())).optional(),
   severity: severitySchema,
@@ -307,3 +307,5 @@ export function getMessageFromSimulationError(
   }
   return "Unknown error"
 }
+
+export type Warning = z.infer<typeof warningSchema>
diff --git a/packages/extension/src/shared/transactionSimulation/fees/estimatedFeesRepository.ts b/packages/extension/src/shared/transactionSimulation/fees/estimatedFeesRepository.ts
index 50108a4f3..ea67dae29 100644
--- a/packages/extension/src/shared/transactionSimulation/fees/estimatedFeesRepository.ts
+++ b/packages/extension/src/shared/transactionSimulation/fees/estimatedFeesRepository.ts
@@ -1,7 +1,7 @@
 import browser from "webextension-polyfill"
-import { isEqual } from "lodash-es"
-
-import { AllowArray, Call } from "starknet"
+import { ensureArray } from "@argent/shared"
+import { deserialize, serialize } from "superjson"
+import type { AllowArray, Call } from "starknet"
 
 import { ChromeRepository } from "../../storage/__new/chrome"
 import {
@@ -9,59 +9,56 @@ import {
   EstimatedFeesEnriched,
   IEstimatedFeesRepository,
 } from "./fees.model"
-
-export function isEqualTransactions(
-  transactionA: Call | Call[],
-  transactionB: Call | Call[],
-): boolean {
-  const transactionAArray = Array.isArray(transactionA)
-    ? transactionA
-    : [transactionA]
-  const transactionBArray = Array.isArray(transactionB)
-    ? transactionB
-    : [transactionB]
-  return isEqual(transactionAArray, transactionBArray)
-}
+import { objectHash } from "../../objectHash"
 
 export const estimatedFeesRepo: IEstimatedFeesRepository =
   new ChromeRepository<EstimatedFeesEnriched>(browser, {
-    namespace: "core:estimatedFees2",
+    namespace: "core:estimatedFees4",
     areaName: "local",
-    compare: (a, b) => isEqualTransactions(a.transactions, b.transactions),
+    compare: (a, b) => a.id === b.id,
+    // we need to serialize/deserialize as we store bigints
+    serialize,
+    deserialize,
   })
 
-export const addEstimatedFees = async (
-  estimatedFees: EstimatedFees,
+// always use array as it is easier to compare
+export function getIdForTransactions(transactions: AllowArray<Call>) {
+  const transactionsArray = ensureArray(transactions)
+  const id = objectHash(transactionsArray)
+  return id
+}
+
+export const addEstimatedFee = async (
+  estimatedFee: EstimatedFees,
   transactions: AllowArray<Call>,
 ) => {
-  // always use array as it is easier to compare
-  const transactionsArray = Array.isArray(transactions)
-    ? transactions
-    : [transactions]
+  const id = getIdForTransactions(transactions)
 
   // If a transaction is already in the store, we update it with the new fees and timestamp
   // Otherwise, we add it to the store
-  const newEstimatedFees = {
-    ...estimatedFees,
-    transactions: transactionsArray,
+  const newEstimatedFees: EstimatedFeesEnriched = {
+    ...estimatedFee,
+    id,
     timestamp: Date.now(),
   }
 
   await estimatedFeesRepo.upsert(newEstimatedFees)
+
   return newEstimatedFees
 }
 
 export const getEstimatedFees = async (
   transactions: AllowArray<Call>,
 ): Promise<EstimatedFeesEnriched | null> => {
-  const [fees] = await estimatedFeesRepo.get(
-    (fees) => isEqualTransactions(fees.transactions, transactions), // No need to explicitly make an array as isEqualTransactions does it for us
+  const id = getIdForTransactions(transactions)
+  const [fee] = await estimatedFeesRepo.get(
+    (estimatedFee) => estimatedFee.id === id,
   )
 
-  if (!fees) {
+  if (!fee) {
     console.error(`No fees found for transactions: `, transactions)
     return null
   }
 
-  return fees
+  return fee
 }
diff --git a/packages/extension/src/shared/transactionSimulation/fees/fees.model.ts b/packages/extension/src/shared/transactionSimulation/fees/fees.model.ts
index d280866d6..1e1eedf47 100644
--- a/packages/extension/src/shared/transactionSimulation/fees/fees.model.ts
+++ b/packages/extension/src/shared/transactionSimulation/fees/fees.model.ts
@@ -1,22 +1,25 @@
 import { z } from "zod"
 import { ChromeRepository } from "../../storage/__new/chrome"
-import { Call } from "starknet"
+import { addressSchema } from "@argent/shared"
 
-export const estimatedFeesSchema = z.object({
-  amount: z.string(),
-  suggestedMaxFee: z.string(),
-  accountDeploymentFee: z.string().optional(),
-  maxADFee: z.string().optional(),
+export const estimatedFeeSchema = z.object({
+  feeTokenAddress: addressSchema,
+  amount: z.bigint(),
+  pricePerUnit: z.bigint(),
+  watermarkedMaxFee: z.bigint().optional(), // TODO: Remove this once we have the watermark fee in the amount*pricePerUnit product
 })
 
-// export const EstimatedFeesEnrichedSchema = EstimatedFeesWithTxSchema.extend({
-//   timestamp: z.number(),
-// })
+export type EstimatedFee = z.infer<typeof estimatedFeeSchema>
+
+export const estimatedFeesSchema = z.object({
+  deployment: estimatedFeeSchema.optional(),
+  transactions: estimatedFeeSchema,
+})
 
 export type EstimatedFees = z.infer<typeof estimatedFeesSchema>
 
 export interface EstimatedFeesEnriched extends EstimatedFees {
-  transactions: Call[] // only use array as it is easier to compare
+  id: string
   timestamp: number
 }
 
diff --git a/packages/extension/src/shared/transactionSimulation/types.ts b/packages/extension/src/shared/transactionSimulation/types.ts
index 929168482..c923d2675 100644
--- a/packages/extension/src/shared/transactionSimulation/types.ts
+++ b/packages/extension/src/shared/transactionSimulation/types.ts
@@ -79,6 +79,7 @@ export type TransactionSimulationFeesEstimation = {
   gasUsage: number
   overallFee: number
   unit: string
+  maxFee: number
 }
 
 export type ApiTransactionSimulationResponse = {
diff --git a/packages/extension/src/shared/transactionSimulation/utils.ts b/packages/extension/src/shared/transactionSimulation/utils.ts
index c5bf4eed8..90e711cce 100644
--- a/packages/extension/src/shared/transactionSimulation/utils.ts
+++ b/packages/extension/src/shared/transactionSimulation/utils.ts
@@ -1,14 +1,85 @@
-import { stark } from "starknet"
-import { EstimatedFees } from "./fees/fees.model"
-import { ApiTransactionBulkSimulationResponse } from "./types"
+import { num } from "starknet"
+import { EstimatedFee, EstimatedFees } from "./fees/fees.model"
+import { ApiTransactionSimulationResponse } from "./types"
+import { ETH_TOKEN_ADDRESS } from "../network/constants"
+import { isEqualAddress } from "@argent/shared"
+import { SimulateAndReview } from "../transactionReview/schema"
+import { ReviewError } from "../errors/review"
+import { argentMaxFee } from "../utils/argentMaxFee"
 
-export const getEstimatedFeeFromSimulation = (
-  simulation: ApiTransactionBulkSimulationResponse | undefined,
+// TODO: Remove this once we have the watermark fee in the amount*pricePerUnit product
+export const getEstimatedFeeFromSimulationAndRespectWatermarkFee = (
+  simulateAndReviewResult: Pick<SimulateAndReview, "transactions">,
+): EstimatedFees & {
+  transactions: EstimatedFee & { watermarkedMaxFee: bigint }
+  deployment?: EstimatedFee & { watermarkedMaxFee: bigint }
+} => {
+  const { transactions: _transactions } = simulateAndReviewResult
+
+  const transactions = _transactions.map((tx) => {
+    if (!tx.simulation) {
+      throw new ReviewError({
+        code: "SIMULATE_AND_REVIEW_FAILED",
+        message: "Missing simulation",
+      })
+    }
+    return tx
+  })
+
+  const sims = transactions.map(
+    (tx): Pick<ApiTransactionSimulationResponse, "feeEstimation"> => {
+      return {
+        ...tx.simulation,
+        feeEstimation: {
+          ...tx.simulation.feeEstimation,
+          gasPrice: Number(tx.simulation.feeEstimation.gasPrice),
+          gasUsage: Number(tx.simulation.feeEstimation.gasUsage),
+          overallFee: Number(tx.simulation.feeEstimation.overallFee),
+          maxFee: Number(tx.simulation.feeEstimation.maxFee),
+        },
+      }
+    },
+  )
+
+  const estimatedFee = getEstimatedFeeFromBulkSimulation(sims)
+
+  const [invokeTransaction, deployTransactionOrUndefined] =
+    transactions.length === 1
+      ? [transactions[0], undefined]
+      : [transactions[1], transactions[0]]
+
+  return {
+    ...estimatedFee,
+    transactions: {
+      ...estimatedFee.transactions,
+      watermarkedMaxFee: num.toBigInt(
+        invokeTransaction.simulation.feeEstimation.maxFee,
+      ),
+    },
+    deployment:
+      estimatedFee.deployment && deployTransactionOrUndefined
+        ? {
+            ...estimatedFee.deployment,
+            watermarkedMaxFee: num.toBigInt(
+              deployTransactionOrUndefined.simulation.feeEstimation.maxFee,
+            ),
+          }
+        : undefined,
+  }
+}
+
+export const getEstimatedFeeFromBulkSimulation = (
+  simulation:
+    | Pick<ApiTransactionSimulationResponse, "feeEstimation">[]
+    | undefined,
 ): EstimatedFees => {
   if (!simulation) {
     return {
-      amount: "0",
-      suggestedMaxFee: "0",
+      transactions: {
+        feeTokenAddress: ETH_TOKEN_ADDRESS,
+        amount: 0n,
+        pricePerUnit: 0n,
+      },
     }
   }
 
@@ -22,26 +93,119 @@ export const getEstimatedFeeFromSimulation = (
   if (simulation.length === 1) {
     // No account deployment
     return {
-      amount: simulation[0].feeEstimation.overallFee.toString(),
-      suggestedMaxFee: stark
-        .estimatedFeeToMaxFee(simulation[0].feeEstimation.overallFee)
-        .toString(),
+      transactions: {
+        feeTokenAddress: ETH_TOKEN_ADDRESS,
+        amount: num.toBigInt(simulation[0].feeEstimation.gasUsage),
+        pricePerUnit: num.toBigInt(simulation[0].feeEstimation.gasPrice),
+        watermarkedMaxFee: num.toBigInt(simulation[0].feeEstimation.maxFee),
+      },
     }
   }
 
   if (simulation.length === 2) {
     // Simulation includes account deployment
     return {
-      accountDeploymentFee: simulation[0].feeEstimation.overallFee.toString(),
-      maxADFee: stark
-        .estimatedFeeToMaxFee(simulation[0].feeEstimation.overallFee)
-        .toString(),
-      amount: simulation[1].feeEstimation.overallFee.toString(),
-      suggestedMaxFee: stark
-        .estimatedFeeToMaxFee(simulation[1].feeEstimation.overallFee)
-        .toString(),
+      deployment: {
+        feeTokenAddress: ETH_TOKEN_ADDRESS,
+        amount: num.toBigInt(simulation[0].feeEstimation.gasUsage),
+        pricePerUnit: num.toBigInt(simulation[0].feeEstimation.gasPrice),
+        watermarkedMaxFee: num.toBigInt(simulation[0].feeEstimation.maxFee),
+      },
+      transactions: {
+        feeTokenAddress: ETH_TOKEN_ADDRESS,
+        amount: num.toBigInt(simulation[1].feeEstimation.gasUsage),
+        pricePerUnit: num.toBigInt(simulation[1].feeEstimation.gasPrice),
+        watermarkedMaxFee: num.toBigInt(simulation[1].feeEstimation.maxFee),
+      },
     }
   }
 
   throw Error("Unexpected simulation response length")
 }
+
+export const estimatedFeeToTotal = (estimatedFee: EstimatedFee): bigint => {
+  return estimatedFee.amount * estimatedFee.pricePerUnit
+}
+
+export const estimatedFeesToTotal = (estimatedFees: EstimatedFees): bigint => {
+  if (
+    estimatedFees.deployment &&
+    !isEqualAddress(
+      estimatedFees.deployment.feeTokenAddress,
+      estimatedFees.transactions.feeTokenAddress,
+    )
+  ) {
+    throw Error("Cannot calculate estimated fees for different tokens")
+  }
+
+  return (
+    estimatedFeeToTotal(estimatedFees.transactions) +
+    (estimatedFees.deployment
+      ? estimatedFeeToTotal(estimatedFees.deployment)
+      : 0n)
+  )
+}
+
+const estimatedFeeToMaxFee = (estimatedFee: EstimatedFee): EstimatedFee => {
+  return {
+    ...estimatedFee,
+    amount: num.toBigInt(argentMaxFee({ estimatedFee: estimatedFee.amount })),
+    pricePerUnit: num.toBigInt(
+      argentMaxFee({ estimatedFee: estimatedFee.pricePerUnit }),
+    ),
+  }
+}
+
+export const estimatedFeeToMaxFeeTotal = (
+  estimatedFee: EstimatedFee,
+): bigint => {
+  const maxFee = estimatedFeeToMaxFee(estimatedFee)
+  return maxFee.watermarkedMaxFee ?? estimatedFeeToTotal(maxFee)
+}
+
+export const estimatedFeesToMaxFeeTotal = (
+  estimatedFees: EstimatedFees,
+): bigint => {
+  if (
+    estimatedFees.deployment &&
+    !isEqualAddress(
+      estimatedFees.deployment.feeTokenAddress,
+      estimatedFees.transactions.feeTokenAddress,
+    )
+  ) {
+    throw Error("Cannot calculate estimated fees for different tokens")
+  }
+
+  const deployment = !estimatedFees.deployment
+    ? 0n
+    : estimatedFees.deployment.watermarkedMaxFee ??
+      estimatedFeeToMaxFeeTotal(estimatedFees.deployment)
+
+  const transactions =
+    estimatedFees.transactions.watermarkedMaxFee ??
+    estimatedFeeToMaxFeeTotal(estimatedFees.transactions)
+
+  return deployment + transactions
+}
+
+export const estimatedFeeToResourceBounds = (estimatedFee: EstimatedFee) => {
+  return {
+    // for v1 transactions
+    maxFee: {
+      suggestedMaxFee: estimatedFeeToTotal(estimatedFee),
+    },
+    // for v3 transactions
+    l1_gas: {
+      max_amount: {
+        suggestedMaxFee: estimatedFee.amount,
+      },
+      max_price_per_unit: {
+        suggestedMaxFee: estimatedFee.pricePerUnit,
+      },
+    },
+    l2_gas: {
+      max_amount: "0x0",
+      max_price_per_unit: "0x0",
+    },
+  }
+}
diff --git a/packages/extension/src/shared/transactions.ts b/packages/extension/src/shared/transactions.ts
index fd563cf6e..a10f9067a 100644
--- a/packages/extension/src/shared/transactions.ts
+++ b/packages/extension/src/shared/transactions.ts
@@ -1,43 +1,43 @@
 import { lowerCase, uniq, upperFirst } from "lodash-es"
-import {
-  Call,
-  TransactionExecutionStatus,
-  TransactionFinalityStatus,
-  TransactionType,
-  num,
-} from "starknet"
+import { Call, TransactionType, num, RPC } from "starknet"
 
 import { WalletAccount } from "./wallet.model"
 import {
   MultisigEntryPointType,
   MultisigTransactionType,
 } from "./multisig/types"
+import { getTransactionStatus } from "./transactions/utils"
+
+export type FinaliyStatus = RPC.SPEC.TXN_STATUS
+export type ExecutionStatus = RPC.SPEC.TXN_EXECUTION_STATUS
 
-export type ExtendedTransactionStatus =
-  | TransactionFinalityStatus
+export type ExtendedFinalityStatus =
+  | FinaliyStatus
   | "PENDING" // For backward compatibility on mainnet
-  | "REJECTED" // For backward compatibility on mainnet
-  | "CANCELLED"
+  | "CANCELLED" // Required for multisig
+  | "NOT_RECEIVED" // Required for multisig
+
+// Extends RPC.TransactionStatus from starknet.js
+export type ExtendedTransactionStatus = {
+  finality_status?: ExtendedFinalityStatus
+  execution_status?: ExecutionStatus
+}
 
 // Global Constants for Transactions
-export const SUCCESS_STATUSES: ExtendedTransactionStatus[] = [
+export const SUCCESS_STATUSES: ExtendedFinalityStatus[] = [
   "PENDING", // For backward compatibility on mainnet
-  TransactionFinalityStatus.ACCEPTED_ON_L2,
-  TransactionFinalityStatus.ACCEPTED_ON_L1,
+  "ACCEPTED_ON_L2",
+  "ACCEPTED_ON_L1",
 ]
 
-export const FAILED_STATUS: (
-  | TransactionExecutionStatus
-  | ExtendedTransactionStatus
-)[] = [
-  TransactionExecutionStatus.REJECTED,
-  TransactionExecutionStatus.REVERTED,
+export const FAILED_STATUS: (ExtendedFinalityStatus | ExecutionStatus)[] = [
+  "REJECTED",
+  "REVERTED",
   "CANCELLED",
 ]
 
-export const TRANSACTION_STATUSES_TO_TRACK: ExtendedTransactionStatus[] = [
-  TransactionFinalityStatus.RECEIVED,
-  TransactionFinalityStatus.NOT_RECEIVED,
+export const TRANSACTION_STATUSES_TO_TRACK: ExtendedFinalityStatus[] = [
+  "RECEIVED",
 ]
 
 export type StarknetTransactionTypes = keyof typeof TransactionType
@@ -72,8 +72,7 @@ export interface TransactionRequest extends TransactionBase {
 }
 
 export interface Transaction extends TransactionRequest {
-  finalityStatus: ExtendedTransactionStatus
-  executionStatus?: TransactionExecutionStatus
+  status: ExtendedTransactionStatus
   failureReason?: { code: string; error_message: string }
   revertReason?: string
   timestamp: number
@@ -95,13 +94,12 @@ export function entryPointToHumanReadable(entryPoint: string): string {
 export const getInFlightTransactions = (
   transactions: Transaction[],
 ): Transaction[] =>
-  transactions.filter(
-    ({ finalityStatus, meta }) =>
-      finalityStatus &&
-      (TRANSACTION_STATUSES_TO_TRACK.includes(finalityStatus) ||
-        (meta?.isDeployAccount &&
-          finalityStatus === TransactionFinalityStatus.ACCEPTED_ON_L2)),
-  )
+  transactions.filter((transaction) => {
+    const { finality_status } = getTransactionStatus(transaction)
+    return (
+      finality_status && TRANSACTION_STATUSES_TO_TRACK.includes(finality_status)
+    )
+  })
 
 export function nameTransaction(calls: Call | Call[]) {
   const callsArray = Array.isArray(calls) ? calls : [calls]
diff --git a/packages/extension/src/shared/transactions/store.ts b/packages/extension/src/shared/transactions/store.ts
new file mode 100644
index 000000000..6fec8e02e
--- /dev/null
+++ b/packages/extension/src/shared/transactions/store.ts
@@ -0,0 +1,80 @@
+import { differenceWith } from "lodash-es"
+
+import { ArrayStorage } from "../storage"
+import { StorageChange } from "../storage/types"
+import {
+  Transaction,
+  TransactionRequest,
+  ExtendedTransactionStatus,
+  compareTransactions,
+} from "../transactions"
+import { adaptArrayStorage } from "../storage/__new/repository"
+import { IRepository } from "../storage/__new/interface"
+import { checkTransactionHash, getTransactionStatus } from "./utils"
+
+/**
+ * @deprecated use `transactionsRepo` instead
+ */
+export const transactionsStore = new ArrayStorage<Transaction>([], {
+  namespace: "core:transactions",
+  areaName: "local",
+  compare: compareTransactions,
+})
+
+export const transactionsRepo: IRepository<Transaction> =
+  adaptArrayStorage(transactionsStore)
+
+const timestampInSeconds = (): number => Math.floor(Date.now() / 1000)
+
+export const addTransaction = (
+  transaction: TransactionRequest,
+  status?: ExtendedTransactionStatus,
+) => {
+  // sanity checks
+  if (!checkTransactionHash(transaction.hash)) {
+    return // dont throw
+  }
+
+  const defaultStatus: ExtendedTransactionStatus = {
+    finality_status: "RECEIVED",
+  }
+
+  const newTransaction: Transaction = {
+    status: status ?? defaultStatus,
+    timestamp: timestampInSeconds(),
+    ...transaction,
+  }
+
+  return transactionsStore.push(newTransaction)
+}
+
+export const getUpdatedTransactionsForChangeSet = (
+  changeSet: StorageChange<Transaction[]>,
+) => {
+  const updatedTransactions = differenceWith(
+    changeSet.oldValue ?? [],
+    changeSet.newValue ?? [],
+    equalTransactionWithStatus,
+  )
+  return updatedTransactions
+}
+
+export const equalTransactionWithStatus = (
+  a: Transaction,
+  b: Transaction,
+): boolean => {
+  const {
+    finality_status: aFinalityStatus,
+    execution_status: aExecutionStatus,
+  } = getTransactionStatus(a)
+  const {
+    finality_status: bFinalityStatus,
+    execution_status: bExecutionStatus,
+  } = getTransactionStatus(b)
+
+  return (
+    compareTransactions(a, b) &&
+    aFinalityStatus === bFinalityStatus &&
+    aExecutionStatus === bExecutionStatus
+  )
+}
diff --git a/packages/extension/src/shared/transactions/utils.test.ts b/packages/extension/src/shared/transactions/utils.test.ts
index f15ff2b05..13bbaaf33 100644
--- a/packages/extension/src/shared/transactions/utils.test.ts
+++ b/packages/extension/src/shared/transactions/utils.test.ts
@@ -1,4 +1,10 @@
-import { getTransactionIdentifier, identifierToBaseTransaction } from "./utils"
+import {
+  getTransactionIdentifier,
+  getTransactionStatus,
+  identifierToBaseTransaction,
+} from "./utils"
+import { ExecutionStatus, ExtendedFinalityStatus } from "../transactions"
+import { WalletAccount } from "../wallet.model"
 
 describe("Make sure encode and decode to identifier return to the same value", () => {
   test("encode and decode", () => {
@@ -26,3 +32,105 @@ describe("Make sure encode and decode to identifier return to the same value", (
     expect(decoded).toEqual(parsedTransaction)
   })
 })
+
+describe("getTransactionStatus", () => {
+  test("should return correct finality_status, given new transaction schema", () => {
+    const transaction = {
+      hash: "0x01" as const,
+      networkId: "net1",
+      timestamp: 0,
+      status: {
+        finality_status: "ACCEPTED_ON_L2" as ExtendedFinalityStatus,
+      },
+      account: {
+        networkId: "net1",
+        address: "0x1",
+      } as WalletAccount,
+    }
+
+    const { finality_status, execution_status } =
+      getTransactionStatus(transaction)
+    expect(finality_status).toEqual("ACCEPTED_ON_L2")
+    expect(execution_status).toEqual(undefined)
+  })
+  test("should return correct finality_status, given old transaction schema", () => {
+    const transaction = {
+      hash: "0x01" as const,
+      networkId: "net1",
+      timestamp: 0,
+      finalityStatus: "ACCEPTED_ON_L2",
+      account: {
+        networkId: "net1",
+        address: "0x1",
+      } as WalletAccount,
+    }
+
+    const { finality_status, execution_status } = getTransactionStatus(
+      transaction as any,
+    )
+    expect(finality_status).toEqual("ACCEPTED_ON_L2")
+    expect(execution_status).toEqual(undefined)
+  })
+  test("should return correct execution_status, given new transaction schema", () => {
+    const transaction = {
+      hash: "0x01" as const,
+      networkId: "net1",
+      timestamp: 0,
+      status: {
+        finality_status: "RECEIVED" as ExtendedFinalityStatus,
+        execution_status: "REVERTED" as ExecutionStatus,
+      },
+      account: {
+        networkId: "net1",
+        address: "0x1",
+      } as WalletAccount,
+    }
+
+    const { finality_status, execution_status } =
+      getTransactionStatus(transaction)
+    expect(finality_status).toEqual("RECEIVED")
+    expect(execution_status).toEqual("REVERTED")
+  })
+  test("should return correct execution_status, given old transaction schema", () => {
+    const transaction = {
+      hash: "0x01" as const,
+      networkId: "net1",
+      timestamp: 0,
+      finalityStatus: "RECEIVED",
+      executionStatus: "REVERTED",
+      account: {
+        networkId: "net1",
+        address: "0x1",
+      } as WalletAccount,
+    }
+
+    const { finality_status, execution_status } = getTransactionStatus(
+      transaction as any,
+    )
+    expect(finality_status).toEqual("RECEIVED")
+    expect(execution_status).toEqual("REVERTED")
+  })
+  test("should return correct undefined, given no status info", () => {
+    const transaction = {
+      hash: "0x01" as const,
+      networkId: "net1",
+      timestamp: 0,
+      account: {
+        networkId: "net1",
+        address: "0x1",
+      } as WalletAccount,
+    }
+
+    const { finality_status, execution_status } = getTransactionStatus(
+      transaction as any,
+    )
+    expect(finality_status).toEqual(undefined)
+    expect(execution_status).toEqual(undefined)
+  })
+  test("should return undefined, given undefined", () => {
+    const { finality_status, execution_status } =
+      getTransactionStatus(undefined)
+    expect(finality_status).toEqual(undefined)
+    expect(execution_status).toEqual(undefined)
+  })
+})
diff --git a/packages/extension/src/shared/transactions/utils.ts b/packages/extension/src/shared/transactions/utils.ts
index 1ffe293a2..a4c8d8e7b 100644
--- a/packages/extension/src/shared/transactions/utils.ts
+++ b/packages/extension/src/shared/transactions/utils.ts
@@ -1,5 +1,16 @@
 import { hexSchema } from "@argent/shared"
-import { BaseTransaction } from "./interface"
+import { constants, num } from "starknet"
+
+import { TransactionError } from "../errors/transaction"
+import type { WalletAccount } from "../wallet.model"
+import type { BaseTransaction } from "./interface"
+import {
+  ExtendedFinalityStatus,
+  ExtendedTransactionStatus,
+  Transaction,
+  ExecutionStatus,
+} from "../transactions"
+import { z } from "zod"
 
 export function getTransactionIdentifier(transaction: BaseTransaction): string {
   return `${transaction.networkId}::${hexSchema.parse(transaction.hash)}`
@@ -12,3 +23,75 @@ export function identifierToBaseTransaction(
   const hash = hexSchema.parse(hashString)
   return { networkId, hash }
 }
+
+export const checkTransactionHash = (
+  transactionHash?: num.BigNumberish,
+  account?: WalletAccount,
+): boolean => {
+  try {
+    if (!transactionHash) {
+      throw new TransactionError({
+        code: "NO_TRANSACTION_HASH",
+      })
+    }
+    const bn = num.toBigInt(transactionHash)
+    if (bn <= constants.ZERO && account?.type !== "multisig") {
+      throw new TransactionError({
+        code: "INVALID_TRANSACTION_HASH_RANGE",
+      })
+    }
+    return true
+  } catch {
+    return false
+  }
+}
+
+const finalityStatusSchema = z.union([
+  z.literal("RECEIVED"),
+  z.literal("REJECTED"),
+  z.literal("ACCEPTED_ON_L2"),
+  z.literal("ACCEPTED_ON_L1"),
+  z.literal("PENDING"),
+  z.literal("CANCELLED"),
+  z.literal("NOT_RECEIVED"),
+])
+const executionStatusSchema = z.union([
+  z.literal("SUCCEEDED"),
+  z.literal("REVERTED"),
+])
+const newTransactionSchema = z
+  .object({
+    status: z.object({
+      finality_status: finalityStatusSchema,
+      execution_status: executionStatusSchema.optional(),
+    }),
+  })
+  .passthrough()
+
+const oldTransactionSchema = z
+  .object({
+    finalityStatus: finalityStatusSchema,
+    executionStatus: executionStatusSchema.optional(),
+  })
+  .passthrough()
+
+export function getTransactionStatus(
+  transaction: Transaction | undefined,
+): ExtendedTransactionStatus {
+  let finality_status: ExtendedFinalityStatus | undefined
+  let execution_status: ExecutionStatus | undefined
+
+  const oldTx = oldTransactionSchema.safeParse(transaction)
+  if (oldTx.success) {
+    finality_status = oldTx.data.finalityStatus
+    execution_status = oldTx.data.executionStatus
+  } else {
+    const newTx = newTransactionSchema.safeParse(transaction)
+    if (newTx.success) {
+      finality_status = newTx.data.status.finality_status
+      execution_status = newTx.data.status.execution_status
+    }
+  }
+
+  return { finality_status, execution_status }
+}
diff --git a/packages/extension/src/shared/udc/schema.ts b/packages/extension/src/shared/udc/schema.ts
new file mode 100644
index 000000000..b16e6b808
--- /dev/null
+++ b/packages/extension/src/shared/udc/schema.ts
@@ -0,0 +1,78 @@
+import {
+  cairoAssemblySchema,
+  compiledContractClassSchema,
+} from "@argent/shared"
+import {
+  CairoVersion,
+  DeclareContractPayload,
+  UniversalDeployerContractPayload,
+} from "starknet"
+import { z } from "zod"
+
+export const getConstructorParamsSchema = z.object({
+  networkId: z.string(),
+  classHash: z.string(),
+})
+
+export const basicContractClassSchema = z.object({
+  abi: z.array(z.any()),
+  contract_class_version: z.string(),
+  entry_points_by_type: z.any().optional(),
+  sierra_program: z.array(z.string()).optional(),
+})
+
+export type BasicContractClass = z.infer<typeof basicContractClassSchema>
+
+export type DeclareContract = {
+  address?: string
+  networkId?: string
+} & DeclareContractPayload
+
+export type DeployContract = {
+  address: string
+  networkId: string
+} & UniversalDeployerContractPayload
+
+export const declareContractSchema = z.object({
+  address: z.string().optional(),
+  networkId: z.string().optional(),
+  contract: compiledContractClassSchema.or(z.string()),
+  classHash: z.string().optional(),
+  casm: cairoAssemblySchema.optional(),
+  compiledClassHash: z.string().optional(),
+})
+
+export type DeclareContractBackgroundPayload = z.infer<
+  typeof declareContractSchema
+>
+
+export const deployContractSchema = z.object({
+  address: z.string(),
+  networkId: z.string(),
+  classHash: z.string(),
+  constructorCalldata: z.array(z.string()),
+  salt: z.string().optional(),
+  unique: z.boolean().optional(),
+})
+
+export type ParameterField =
+  | {
+      name: string
+      type: `felt` | `Uint256`
+      value: string
+    }
+  | {
+      name: string
+      type: `felt*`
+      value: string[]
+    }
+
+export interface FieldValues {
+  account: string
+  classHash: string
+  network: string
+  parameters: ParameterField[]
+  salt: string
+  unique: boolean
+  cairoVersion: CairoVersion
+}
diff --git a/packages/extension/src/shared/udc/service/interface.ts b/packages/extension/src/shared/udc/service/interface.ts
index 8084ac9b4..f7b6919f1 100644
--- a/packages/extension/src/shared/udc/service/interface.ts
+++ b/packages/extension/src/shared/udc/service/interface.ts
@@ -1,6 +1,8 @@
-import { BasicContractClass } from "../../../background/__new/procedures/udc/getConstructorParams"
-import { ParameterField } from "../../../ui/features/settings/DeveloperSettings/deploySmartContractForm.model"
-import { DeclareContractBackgroundPayload } from "../type"
+import type {
+  BasicContractClass,
+  DeclareContractBackgroundPayload,
+  ParameterField,
+} from "../schema"
 
 export type DeployContractPayload = {
   address: string
@@ -15,6 +17,6 @@ export interface IUdcService {
     networkId: string,
     classHash: string,
   ): Promise<BasicContractClass>
-  deployContract(data: DeployContractPayload): Promise<string>
+  deployContract(data: DeployContractPayload): Promise<void>
   declareContract(data: DeclareContractBackgroundPayload): Promise<string>
 }
diff --git a/packages/extension/src/shared/udc/type.ts b/packages/extension/src/shared/udc/type.ts
deleted file mode 100644
index e71642776..000000000
--- a/packages/extension/src/shared/udc/type.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import {
-  compiledContractClassSchema,
-  cairoAssemblySchema,
-} from "@argent/shared"
-import type {
-  DeclareContractPayload,
-  UniversalDeployerContractPayload,
-} from "starknet"
-import { z } from "zod"
-
-export type DeclareContract = {
-  address?: string
-  networkId?: string
-} & DeclareContractPayload
-
-export type DeployContract = {
-  address: string
-  networkId: string
-} & UniversalDeployerContractPayload
-
-export const declareContractSchema = z.object({
-  address: z.string().optional(),
-  networkId: z.string().optional(),
-  contract: compiledContractClassSchema.or(z.string()),
-  classHash: z.string().optional(),
-  casm: cairoAssemblySchema.optional(),
-  compiledClassHash: z.string().optional(),
-})
-
-export type DeclareContractBackgroundPayload = z.infer<
-  typeof declareContractSchema
->
diff --git a/packages/extension/src/shared/utils/accountsEqual.ts b/packages/extension/src/shared/utils/accountsEqual.ts
index 3e2c349c5..11bf5bd90 100644
--- a/packages/extension/src/shared/utils/accountsEqual.ts
+++ b/packages/extension/src/shared/utils/accountsEqual.ts
@@ -1,9 +1,9 @@
 import { isEqualAddress } from "@argent/shared"
 import type { BaseWalletAccount, WalletAccount } from "../wallet.model"
 
-export const accountsEqual = (a: BaseWalletAccount, b?: BaseWalletAccount) => {
+export const accountsEqual = (a?: BaseWalletAccount, b?: BaseWalletAccount) => {
   try {
-    if (!b) {
+    if (!a || !b) {
       return false
     }
     return isEqualAddress(a.address, b.address) && a.networkId === b.networkId
diff --git a/packages/extension/src/shared/utils/accountsMultisigSort.ts b/packages/extension/src/shared/utils/accountsMultisigSort.ts
index 50c05bda2..4f95c4f2c 100644
--- a/packages/extension/src/shared/utils/accountsMultisigSort.ts
+++ b/packages/extension/src/shared/utils/accountsMultisigSort.ts
@@ -1,15 +1,19 @@
-import { getIndexForPath } from "../../background/keys/keyDerivation"
-import { Account } from "../../ui/features/accounts/Account"
+import { getIndexForPath } from "./derivationPath"
 import { PendingMultisig } from "../multisig/types"
-import { WalletAccount } from "../wallet.model"
 import {
   STANDARD_DERIVATION_PATH,
   MULTISIG_DERIVATION_PATH,
 } from "../wallet.service"
 
+interface SortableAccount {
+  signer: {
+    derivationPath: string
+  }
+}
+
 export const sortAccountsByDerivationPath = (
-  a: WalletAccount | Account,
-  b: WalletAccount | Account,
+  a: SortableAccount,
+  b: SortableAccount,
 ) => {
   const aIndex = getIndexForPath(
     a.signer.derivationPath,
@@ -23,8 +27,8 @@ export const sortAccountsByDerivationPath = (
 }
 
 export const sortMultisigByDerivationPath = (
-  a: PendingMultisig | WalletAccount | Account,
-  b: PendingMultisig | WalletAccount | Account,
+  a: SortableAccount,
+  b: SortableAccount,
 ) => {
   const aIndex = getIndexForPath(
     a.signer.derivationPath,
@@ -37,15 +41,13 @@ export const sortMultisigByDerivationPath = (
   return aIndex - bIndex
 }
 
-type AccountType = Account | WalletAccount
-
-export const accountSort = <T extends AccountType>(accounts: T[]): T[] => {
+export const accountSort = <T extends SortableAccount>(accounts: T[]): T[] => {
   const sorted = [...accounts]
   sorted.sort(sortAccountsByDerivationPath)
   return sorted
 }
 
-export const multisigAndPendingMultisigSort = <T extends AccountType>(
+export const multisigAndPendingMultisigSort = <T extends SortableAccount>(
   pending: PendingMultisig[],
   full: T[],
 ): (PendingMultisig | T)[] => {
diff --git a/packages/extension/src/shared/utils/argentMaxFee.test.ts b/packages/extension/src/shared/utils/argentMaxFee.test.ts
index 682c98001..c042b48f0 100644
--- a/packages/extension/src/shared/utils/argentMaxFee.test.ts
+++ b/packages/extension/src/shared/utils/argentMaxFee.test.ts
@@ -1,4 +1,4 @@
-import { argentMaxFee } from "./argentMaxFee"
+import { modifySnjsFeeOverhead } from "./argentMaxFee"
 import { num } from "starknet"
 
 describe("argentMaxFee function tests", () => {
@@ -20,7 +20,7 @@ describe("argentMaxFee function tests", () => {
         BigInt(SCALE)
       const expectedFee = num.toHex(suggestedMaxFeeBigInt)
       expect(
-        argentMaxFee({
+        modifySnjsFeeOverhead({
           suggestedMaxFee: num.toBigInt(suggestedFee),
           overheadMultiplier: overheadMultiplier,
         }),
@@ -38,7 +38,7 @@ describe("argentMaxFee function tests", () => {
     "given suggestedFee %s overheadMultiplier %f and default multiplier %f should return %s",
     (suggestedFee, overheadMultiplier, snjsMultiplier, expectedHex) => {
       expect(
-        argentMaxFee({
+        modifySnjsFeeOverhead({
           suggestedMaxFee: num.toBigInt(suggestedFee),
           overheadMultiplier,
           starknetJsOverheadMultiplier: snjsMultiplier,
diff --git a/packages/extension/src/shared/utils/argentMaxFee.ts b/packages/extension/src/shared/utils/argentMaxFee.ts
index 463d75d24..4f06bad01 100644
--- a/packages/extension/src/shared/utils/argentMaxFee.ts
+++ b/packages/extension/src/shared/utils/argentMaxFee.ts
@@ -9,6 +9,24 @@ export const FEE_OVERHEAD = process.env.FEE_OVERHEAD
 const SN_JS_DEFAULT_MULTIPLIER = 1.5
 const scale = 10
 
+export const argentMaxFee = ({
+  estimatedFee,
+  overheadMultiplier = FEE_OVERHEAD,
+}: {
+  estimatedFee: num.BigNumberish
+  overheadMultiplier?: number
+}) => {
+  // Convert suggestedMaxFee to BigInt for calculation
+  const estimatedFeeBigInt = num.toBigInt(estimatedFee)
+
+  // Apply the overhead multiplier
+  const maxFeeWithOverhead =
+    (estimatedFeeBigInt * BigInt(overheadMultiplier * scale)) / BigInt(scale)
+
+  // Convert the result back to hex
+  return num.toHex(maxFeeWithOverhead)
+}
+
 /**
  * Calculate the max fee with an overhead multiplier.
  *
@@ -16,7 +34,7 @@ const scale = 10
  * @param overheadMultiplier: the multiplier to apply as overhead (default to 1.5)
  * @returns: the maximum fee considering the overhead
  */
-export const argentMaxFee = ({
+export const modifySnjsFeeOverhead = ({
   suggestedMaxFee,
   overheadMultiplier = FEE_OVERHEAD,
   starknetJsOverheadMultiplier = SN_JS_DEFAULT_MULTIPLIER,
@@ -33,9 +51,5 @@ export const argentMaxFee = ({
     BigInt(starknetJsOverheadMultiplier * scale)
 
   // Apply the overhead multiplier
-  const maxFeeWithOverhead =
-    (estimatedFee * BigInt(overheadMultiplier * scale)) / BigInt(scale)
-
-  // Convert the result back to hex
-  return num.toHex(maxFeeWithOverhead)
+  return argentMaxFee({ estimatedFee, overheadMultiplier })
 }
diff --git a/packages/extension/src/ui/services/assertNever.ts b/packages/extension/src/shared/utils/assertNever.ts
similarity index 100%
rename from packages/extension/src/ui/services/assertNever.ts
rename to packages/extension/src/shared/utils/assertNever.ts
diff --git a/packages/extension/src/shared/utils/derivationPath.test.ts b/packages/extension/src/shared/utils/derivationPath.test.ts
new file mode 100644
index 000000000..0e7df26e8
--- /dev/null
+++ b/packages/extension/src/shared/utils/derivationPath.test.ts
@@ -0,0 +1,73 @@
+import { describe, expect, test } from "vitest"
+
+import { getNextPathIndex } from "./derivationPath"
+import { STANDARD_DERIVATION_PATH } from "../wallet.service"
+
+describe("getNextPathIndex", () => {
+  test("incrementing", () => {
+    expect(
+      getNextPathIndex(
+        ["m/44'/9004'/0'/0/0", "m/44'/9004'/0'/0/1", "m/44'/9004'/0'/0/2"],
+        STANDARD_DERIVATION_PATH,
+      ),
+    ).toBe(3)
+  })
+
+  test("fill incrementing gap", () => {
+    expect(
+      getNextPathIndex(
+        ["m/44'/9004'/0'/0/0", "m/44'/9004'/0'/0/1", "m/44'/9004'/0'/0/3"],
+        STANDARD_DERIVATION_PATH,
+      ),
+    ).toBe(2)
+  })
+
+  test("fill big gap", () => {
+    expect(
+      getNextPathIndex(
+        ["m/44'/9004'/0'/0/0", "m/44'/9004'/0'/0/4", "m/44'/9004'/0'/0/11"],
+        STANDARD_DERIVATION_PATH,
+      ),
+    ).toBe(1)
+  })
+
+  test("fill 0 gap", () => {
+    expect(
+      getNextPathIndex(
+        ["m/44'/9004'/0'/0/3", "m/44'/9004'/0'/0/1"],
+        STANDARD_DERIVATION_PATH,
+      ),
+    ).toBe(0)
+  })
+
+  test("legacy gets ignored", () => {
+    expect(
+      getNextPathIndex(
+        [
+          "m/2645'/1195502025'/1148870696'/0'/0'/0",
+          "m/2645'/1195502025'/1148870696'/0'/0'/1",
+        ],
+        STANDARD_DERIVATION_PATH,
+      ),
+    ).toBe(0)
+  })
+
+  test("can still add legacy paths to mixed array", () => {
+    expect(
+      getNextPathIndex(
+        [
+          "m/2645'/1195502025'/1148870696'/0'/0'/0",
+          "m/2645'/1195502025'/1148870696'/0'/0'/1",
+          "m/44'/9004'/0'/0/0",
+          "m/44'/9004'/0'/0/1",
+          "m/44'/9004'/0'/0/2",
+        ],
+        "m/2645'/1195502025'/1148870696'/0'/0'",
+      ),
+    ).toBe(2)
+  })
+
+  test("empty array", () => {
+    expect(getNextPathIndex([], STANDARD_DERIVATION_PATH)).toBe(0)
+  })
+})
diff --git a/packages/extension/src/shared/utils/derivationPath.ts b/packages/extension/src/shared/utils/derivationPath.ts
new file mode 100644
index 000000000..1118ff6ef
--- /dev/null
+++ b/packages/extension/src/shared/utils/derivationPath.ts
@@ -0,0 +1,26 @@
+export function getPathForIndex(
+  index: number,
+  baseDerivationPath: string,
+): string {
+  return `${baseDerivationPath}/${index}`
+}
+
+export function getIndexForPath(path: string, baseDerivationPath: string) {
+  if (!path.startsWith(baseDerivationPath)) {
+    throw "path should begin with baseDerivationPath"
+  }
+  const index = path.substring(path.lastIndexOf("/") + 1)
+  return parseInt(index)
+}
+
+export function getNextPathIndex(
+  paths: string[],
+  baseDerivationPath: string,
+): number {
+  for (let index = 0; index < paths.length; index++) {
+    if (!paths.includes(getPathForIndex(index, baseDerivationPath))) {
+      return index
+    }
+  }
+  return paths.length
+}
diff --git a/packages/extension/src/shared/utils/number.ts b/packages/extension/src/shared/utils/number.ts
index 1f8bc925e..26f000a7c 100644
--- a/packages/extension/src/shared/utils/number.ts
+++ b/packages/extension/src/shared/utils/number.ts
@@ -36,12 +36,24 @@ export const prettifyNumberConfig: Record<string, IPrettifyNumberConfig> = {
   },
 }
 
-export const prettifyCurrencyNumber = (number: BigNumberish) => {
-  return prettifyNumber(number, prettifyNumberConfig.CURRENCY)
+export const prettifyCurrencyNumber = (
+  number: BigNumberish,
+  overrides?: Partial<IPrettifyNumberConfig>,
+) => {
+  return prettifyNumber(number, {
+    ...prettifyNumberConfig.CURRENCY,
+    ...(overrides || {}),
+  })
 }
 
-export const prettifyTokenNumber = (number: BigNumberish) => {
-  return prettifyNumber(number, prettifyNumberConfig.TOKEN)
+export const prettifyTokenNumber = (
+  number: BigNumberish,
+  overrides?: Partial<IPrettifyNumberConfig>,
+) => {
+  return prettifyNumber(number, {
+    ...prettifyNumberConfig.TOKEN,
+    ...(overrides || {}),
+  })
 }
 
 /**
diff --git a/packages/extension/src/shared/utils/transactionSucceeded.ts b/packages/extension/src/shared/utils/transactionSucceeded.ts
index 456ab28c0..b6b343fff 100644
--- a/packages/extension/src/shared/utils/transactionSucceeded.ts
+++ b/packages/extension/src/shared/utils/transactionSucceeded.ts
@@ -1,24 +1,44 @@
-import { TransactionFinalityStatus } from "starknet"
 import { Transaction } from "../transactions"
+import { getTransactionStatus } from "../transactions/utils"
 
-export const transactionSucceeded = (
+export const hasSuccessfulTransaction = (
   newTxs: Transaction[],
   oldTxs?: Transaction[],
-): boolean => {
+) => {
+  const successfulTransactions = getSuccessfulTransactions(newTxs, oldTxs)
+  return Boolean(successfulTransactions.length)
+}
+
+export const getSuccessfulTransactions = (
+  newTxs: Transaction[],
+  oldTxs?: Transaction[],
+) => {
+  const successfulTransactions = []
   for (const newTransaction of newTxs) {
     const oldTransaction = oldTxs?.find(
       (oldTransaction) => oldTransaction.hash === newTransaction.hash,
     )
+
+    if (!oldTransaction) {
+      return successfulTransactions
+    }
+
+    const { finality_status: oldFinalityStatus } =
+      getTransactionStatus(oldTransaction)
+    const { finality_status: newFinalityStatus } =
+      getTransactionStatus(newTransaction)
+
+    const oldTransactionStatus =
+      oldFinalityStatus || (oldTransaction as any).finalityStatus // backwards compatible
+
     if (
-      oldTransaction &&
-      oldTransaction.finalityStatus === TransactionFinalityStatus.RECEIVED &&
-      ["ACCEPTED_ON_L1", "ACCEPTED_ON_L2"].includes(
-        newTransaction.finalityStatus,
-      )
+      oldTransactionStatus === "RECEIVED" &&
+      newFinalityStatus &&
+      ["ACCEPTED_ON_L1", "ACCEPTED_ON_L2"].includes(newFinalityStatus)
     ) {
-      return true
+      successfulTransactions.push(newTransaction)
     }
   }
 
-  return false
+  return successfulTransactions
 }
diff --git a/packages/extension/src/shared/wallet.model.ts b/packages/extension/src/shared/wallet.model.ts
index 6a3f2682f..a905afd26 100644
--- a/packages/extension/src/shared/wallet.model.ts
+++ b/packages/extension/src/shared/wallet.model.ts
@@ -41,6 +41,7 @@ export const walletAccountSchema = z
     showBlockingDeprecated: z.boolean().optional(),
     guardian: z.string().optional(),
     escape: escapeSchema.optional(),
+    owner: z.string().optional(),
   })
   .merge(withSignerSchema)
   .merge(baseWalletAccountSchema)
diff --git a/packages/extension/src/shared/wallet.service.ts b/packages/extension/src/shared/wallet.service.ts
index fd57c104c..a5e910923 100644
--- a/packages/extension/src/shared/wallet.service.ts
+++ b/packages/extension/src/shared/wallet.service.ts
@@ -1,4 +1,4 @@
-import { isEqualAddress } from "../ui/services/addresses"
+import { isEqualAddress } from "@argent/shared"
 import { BaseWalletAccount, WalletAccount } from "./wallet.model"
 
 // from https://community.starknet.io/t/account-keys-and-addresses-derivation-standard/1230
diff --git a/packages/extension/src/ui/AppBackgroundError.tsx b/packages/extension/src/ui/AppBackgroundError.tsx
index 298e5cdde..95ab4d8ce 100644
--- a/packages/extension/src/ui/AppBackgroundError.tsx
+++ b/packages/extension/src/ui/AppBackgroundError.tsx
@@ -2,7 +2,7 @@ import { Center, Flex } from "@chakra-ui/react"
 import { FC } from "react"
 
 import { H4, P3 } from "@argent/ui"
-import { SupportFooter } from "./features/settings/SupportFooter"
+import { SupportFooter } from "./features/settings/ui/SupportFooter"
 
 export const AppBackgroundError: FC = () => {
   return (
diff --git a/packages/extension/src/ui/AppErrorBoundaryFallback.tsx b/packages/extension/src/ui/AppErrorBoundaryFallback.tsx
index 445d15967..8c3dcaa77 100644
--- a/packages/extension/src/ui/AppErrorBoundaryFallback.tsx
+++ b/packages/extension/src/ui/AppErrorBoundaryFallback.tsx
@@ -3,7 +3,7 @@ import { FC } from "react"
 
 import { ErrorBoundaryState } from "./components/ErrorBoundary"
 import ErrorBoundaryFallbackWithCopyError from "./components/ErrorBoundaryFallbackWithCopyError"
-import { SupportFooter } from "./features/settings/SupportFooter"
+import { SupportFooter } from "./features/settings/ui/SupportFooter"
 
 const AppErrorBoundaryFallback: FC<ErrorBoundaryState> = ({
   error,
diff --git a/packages/extension/src/ui/AppRoutes.tsx b/packages/extension/src/ui/AppRoutes.tsx
index ca88679e9..f2c3ed56e 100644
--- a/packages/extension/src/ui/AppRoutes.tsx
+++ b/packages/extension/src/ui/AppRoutes.tsx
@@ -11,7 +11,7 @@ import { AccountEditScreen } from "./features/accountEdit/AccountEditScreen"
 import { CollectionNftsContainer } from "./features/accountNfts/CollectionNftsContainer"
 import { NftScreenContainer } from "./features/accountNfts/NftScreenContainer"
 import { AddPluginScreen } from "./features/accountPlugins.tsx/AddPluginScreen"
-import { AccountDeprecatedModal } from "./features/accounts/AccountDeprecatedModal"
+import { AccountDeprecatedModal } from "./features/accountTokens/warning/AccountDeprecatedModal"
 import { AccountListHiddenScreenContainer } from "./features/accounts/AccountListHiddenScreenContainer"
 import { AccountListScreenContainer } from "./features/accounts/AccountListScreenContainer"
 import { AccountScreen } from "./features/accounts/AccountScreen"
@@ -54,24 +54,18 @@ import { SendAmountAndAssetScreenContainer } from "./features/send/SendAmountAnd
 import { SendAssetScreen } from "./features/send/SendAssetScreen"
 import { SendCollectionNftsScreenContainer } from "./features/send/SendCollectionNftsScreenContainer"
 import { SendRecipientScreenContainer } from "./features/send/SendRecipientScreenContainer"
-import { AddressBookAddOrEditScreenContainer } from "./features/settings/AddressBookAddOrEditScreenContainer"
-import { AddressBookSettingsScreenContainer } from "./features/settings/AddressBookSettingsScreenContainer"
-import { BeforeYouContinueScreen } from "./features/settings/BeforeYouContinueScreen"
-import { BlockExplorerSettingsScreen } from "./features/settings/BlockExplorerSettingsScreen"
-import { DappConnectionsSettingsScreen } from "./features/settings/DappConnectionsSettingsScreen"
-import { DeveloperSettings } from "./features/settings/DeveloperSettings"
-import { DeclareOrDeployContractSuccessScreenContainer } from "./features/settings/DeveloperSettings/DeclareOrDeployContractSuccessScreenContainer"
-import { DeclareSmartContractScreen } from "./features/settings/DeveloperSettings/DeclareSmartContractScreen"
-import { DeploySmartContractScreen } from "./features/settings/DeveloperSettings/DeploySmartContractScreen"
-import { PrivacyExperimentalSettings } from "./features/settings/ExperimentalSettings"
-import { NetworkSettingsEditScreen } from "./features/settings/NetworkSettingsEditScreen"
-import { NetworkSettingsFormScreenContainer } from "./features/settings/NetworkSettingsFormScreenContainer"
-import { NetworkSettingsScreen } from "./features/settings/NetworkSettingsScreen"
-import { PrivacySettingsScreen } from "./features/settings/PrivacySettingsScreen"
-import { SeedSettingsScreen } from "./features/settings/SeedSettingsScreen"
+import { AddressBookAddOrEditScreenContainer } from "./features/settings/addressBook/AddressBookAddOrEditScreenContainer"
+import { AddressBookSettingsScreenContainer } from "./features/settings/addressBook/AddressBookSettingsScreenContainer"
+import { BeforeYouContinueScreen } from "./features/settings/securityAndPrivacy/BeforeYouContinueScreen"
+import { DappConnectionsAccountScreenContainer } from "./features/settings/connectedDapps/DappConnectionsAccountScreenContainer"
+import { DeclareOrDeployContractSuccessScreenContainer } from "./features/settings/developerSettings/smartContractDevelopment/DeclareOrDeployContractSuccessScreenContainer"
+import { DeclareSmartContractScreen } from "./features/settings/developerSettings/smartContractDevelopment/DeclareSmartContractScreen"
+import { DeploySmartContractScreen } from "./features/settings/developerSettings/smartContractDevelopment/DeploySmartContractScreen"
+import { NetworkSettingsEditScreen } from "./features/settings/developerSettings/manageNetworks/NetworkSettingsEditScreen"
+import { NetworkSettingsFormScreenContainer } from "./features/settings/developerSettings/manageNetworks/NetworkSettingsFormScreenContainer"
+import { SeedSettingsScreenContainer } from "./features/settings/securityAndPrivacy/SeedSettingsScreenContainer"
 import { SettingsPrivacyStatementScreen } from "./features/settings/SettingsPrivacyStatementScreen"
-import { SettingsScreen } from "./features/settings/SettingsScreen"
-import { SmartContractDevelopmentScreen } from "./features/settings/SmartContractDevelopmentScreen"
+import { SmartContractDevelopmentScreen } from "./features/settings/developerSettings/smartContractDevelopment/SmartContractDevelopmentScreen"
 import { EscapeWarningScreen } from "./features/shield/escape/EscapeWarningScreen"
 import { ShieldAccountActionScreen } from "./features/shield/ShieldAccountActionScreen"
 import { ShieldAccountFinishScreen } from "./features/shield/ShieldAccountFinishScreen"
@@ -87,16 +81,26 @@ import { hasActionsView } from "./views/actions"
 import { useView } from "./views/implementation/react"
 import { ArgentAccountEmailScreen } from "./features/argentAccount/ArgentAccountEmailScreen"
 import { ArgentAccountLoggedInScreenContainer } from "./features/argentAccount/ArgentAccountLoggedInScreenContainer"
-import { ArgentAccountEmailNotificationsScreenContainer } from "./features/argentAccount/ArgentAccountEmailNotificationsScreenContainer"
+import { EmailNotificationsSettingsScreenContainer } from "./features/settings/preferences/EmailNotificationsSettingsScreenContainer"
 import { MultisigPendingTransactionDetailsScreen } from "./features/multisig/MultisigPendingTransactionDetailsScreen"
 import { SuspenseScreen } from "./components/SuspenseScreen"
-// import { BetaFeaturesSettings } from "./features/settings/BetaFeatureSettings"
+import { BetaFeaturesSettingsScreenContainer } from "./features/settings/developerSettings/betaFeatures/BetaFeaturesSettingsScreenContainer"
 import { ChangeAccountImplementationScreen } from "./features/accountEdit/ChangeAccountImplementationScreen"
 import { MultisigReplaceOwnerScreen } from "./features/multisig/MultisigReplaceOwnerScreen"
 import { FundingQrCodeScreenContainer } from "./features/funding/FundingQrCodeScreenContainer"
 import { AppBackgroundError } from "./AppBackgroundError"
 import { isRecoveringView } from "./views/recovery"
-import { BetaFeaturesSettings } from "./features/settings/BetaFeatureSettings"
+import { SettingsScreenContainer } from "./features/settings/SettingsScreenContainer"
+import { PreferencesSettingsContainer } from "./features/settings/preferences/PreferencesSettingsContainer"
+import { BlockExplorerSettingsScreenContainer } from "./features/settings/preferences/BlockExplorerSettingsScreenContainer"
+import { NftMarketplaceSettingsScreenContainer } from "./features/settings/preferences/NftMarketplaceSettingsScreenContainer"
+import { SecurityAndPrivacySettingsScreenContainer } from "./features/settings/securityAndPrivacy/SecurityAndPrivacySettingsScreenContainer"
+import { AutoLockTimerSettingsScreenContainer } from "./features/settings/securityAndPrivacy/AutoLockTimerSettingsScreenContainer"
+import { DappConnectionsAccountListScreenContainer } from "./features/settings/connectedDapps/DappConnectionsAccountListScreenContainer"
+import { DeveloperSettingsScreenContainer } from "./features/settings/developerSettings/DeveloperSettingsScreenContainer"
+import { ExperimentalSettingsScreenContainer } from "./features/settings/developerSettings/experimental/ExperimentalSettingsScreenContainer"
+import { NetworkSettingsScreenContainer } from "./features/settings/developerSettings/manageNetworks/NetworkSettingsScreenContainer"
+import { AccountOwnerWarningScreen } from "./features/accountTokens/warning/AccountOwnerWarningScreen"
 
 interface LocationWithState extends Location {
   state: {
@@ -238,12 +242,8 @@ const walletRoutes = (
     />
     <Route
       presentation="push"
-      path={routes.argentAccountEmailPreferences.path}
-      element={
-        <SuspenseScreen>
-          <ArgentAccountEmailNotificationsScreenContainer />
-        </SuspenseScreen>
-      }
+      path={routes.settingsEmailNotifications.path}
+      element={<EmailNotificationsSettingsScreenContainer />}
     />
     <Route
       presentation="push"
@@ -269,14 +269,19 @@ const walletRoutes = (
       path={routes.settings.path}
       element={
         <SuspenseScreen>
-          <SettingsScreen />
+          <SettingsScreenContainer />
         </SuspenseScreen>
       }
     />
+    <Route
+      presentation="push"
+      path={routes.settingsPreferences.path}
+      element={<PreferencesSettingsContainer />}
+    />
     <Route
       presentation="push"
       path={routes.settingsPrivacy.path}
-      element={<PrivacySettingsScreen />}
+      element={<SecurityAndPrivacySettingsScreenContainer />}
     />
     <Route
       presentation="push"
@@ -291,13 +296,40 @@ const walletRoutes = (
     <Route
       presentation="push"
       path={routes.settingsBlockExplorer.path}
-      element={<BlockExplorerSettingsScreen />}
+      element={<BlockExplorerSettingsScreenContainer />}
+    />
+    <Route
+      presentation="push"
+      path={routes.settingsNftMarketplace.path}
+      element={<NftMarketplaceSettingsScreenContainer />}
+    />
+    <Route
+      presentation="push"
+      path={routes.settingsSeed.path}
+      element={<SeedSettingsScreenContainer />}
+    />
+    <Route
+      presentation="push"
+      path={routes.settingsAutoLockTimer.path}
+      element={<AutoLockTimerSettingsScreenContainer />}
+    />
+    <Route
+      presentation="push"
+      path={routes.settingsDappConnectionsAccountList.path}
+      element={
+        <SuspenseScreen list>
+          <DappConnectionsAccountListScreenContainer />
+        </SuspenseScreen>
+      }
     />
-    <Route path={routes.settingsSeed.path} element={<SeedSettingsScreen />} />
     <Route
       presentation="push"
-      path={routes.settingsDappConnections.path}
-      element={<DappConnectionsSettingsScreen />}
+      path={routes.settingsDappConnectionsAccount.path}
+      element={
+        <SuspenseScreen list>
+          <DappConnectionsAccountScreenContainer />
+        </SuspenseScreen>
+      }
     />
     <Route
       presentation="push"
@@ -322,7 +354,7 @@ const walletRoutes = (
     <Route
       presentation="push"
       path={routes.settingsDeveloper.path}
-      element={<DeveloperSettings />}
+      element={<DeveloperSettingsScreenContainer />}
     />
     <Route
       presentation="push"
@@ -347,17 +379,17 @@ const walletRoutes = (
     <Route
       presentation="push"
       path={routes.settingsExperimental.path}
-      element={<PrivacyExperimentalSettings />}
+      element={<ExperimentalSettingsScreenContainer />}
     />
     <Route
       presentation="push"
       path={routes.settingsBetaFeatures.path}
-      element={<BetaFeaturesSettings />}
+      element={<BetaFeaturesSettingsScreenContainer />}
     />
     <Route
       presentation="push"
       path={routes.settingsNetworks.path}
-      element={<NetworkSettingsScreen />}
+      element={<NetworkSettingsScreenContainer />}
     />
     <Route
       presentation="push"
@@ -427,10 +459,19 @@ const walletRoutes = (
       path={routes.accountDeprecated.path}
       element={<AccountDeprecatedModal />}
     />
+    <Route
+      presentation="modal"
+      path={routes.accountOwnerWarning.path}
+      element={<AccountOwnerWarningScreen />}
+    />
     <Route
       presentation="push"
       path={routes.accountsHidden.path}
-      element={<AccountListHiddenScreenContainer />}
+      element={
+        <SuspenseScreen>
+          <AccountListHiddenScreenContainer />
+        </SuspenseScreen>
+      }
     />
     <Route
       presentation={"modal"}
diff --git a/packages/extension/src/ui/components/AddressCopyButton.tsx b/packages/extension/src/ui/components/AddressCopyButton.tsx
index e37a9a463..178e031f4 100644
--- a/packages/extension/src/ui/components/AddressCopyButton.tsx
+++ b/packages/extension/src/ui/components/AddressCopyButton.tsx
@@ -1,11 +1,11 @@
 import { Button, CopyTooltip } from "@argent/ui"
 import { FC } from "react"
 
-import { formatTruncatedAddress, normalizeAddress } from "../services/addresses"
 import { useNavigate } from "react-router-dom"
 import { routes } from "../routes"
 import { useView } from "../views/implementation/react"
 import { hasSavedRecoverySeedPhraseView } from "../views/account"
+import { normalizeAddress, formatTruncatedAddress } from "@argent/shared"
 
 export interface AddressCopyButtonProps {
   address: string
diff --git a/packages/extension/src/ui/components/Alert.tsx b/packages/extension/src/ui/components/Alert.tsx
deleted file mode 100644
index 85c64760c..000000000
--- a/packages/extension/src/ui/components/Alert.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import styled from "styled-components"
-
-export const Alert = styled.div`
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-  padding: 16px;
-  background: rgba(255, 255, 255, 0.15);
-  border-radius: 8px;
-  margin: 40px 20px;
-  color: ${({ theme }) => theme.text1}; ;
-`
diff --git a/packages/extension/src/ui/components/AlertDialog.tsx b/packages/extension/src/ui/components/AlertDialog.tsx
deleted file mode 100644
index cac62c3cc..000000000
--- a/packages/extension/src/ui/components/AlertDialog.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { FC } from "react"
-import styled from "styled-components"
-
-import { DialogMessageText, H3 } from "../theme/Typography"
-import { Button } from "./Button"
-import { ColumnCenter } from "./Column"
-import { CustomDialog, CustomDialogProps } from "./CustomDialog"
-import Row from "./Row"
-
-export interface IAlertDialog extends CustomDialogProps {
-  cancelTitle?: string
-  onDestroy?: () => void
-  destroyTitle?: string
-  onConfirm?: () => void
-  confirmTitle?: string
-  title: string
-  message?: string
-}
-
-const ContentContainer = styled(ColumnCenter)`
-  gap: 16px;
-`
-
-const ButtonGroup = styled(Row)`
-  margin-top: 8px;
-  gap: 16px;
-`
-
-const AlertButton = styled(Button)`
-  white-space: nowrap;
-`
-
-export const AlertDialog: FC<IAlertDialog> = ({
-  title,
-  onDestroy,
-  destroyTitle = "Delete",
-  onCancel,
-  cancelTitle = "Cancel",
-  onConfirm,
-  confirmTitle = "OK",
-  message,
-  children,
-  ...rest
-}) => {
-  return (
-    <CustomDialog onCancel={onCancel} {...rest}>
-      <ContentContainer>
-        <H3>{title}</H3>
-        {message && <DialogMessageText>{message}</DialogMessageText>}
-        {children}
-        <ButtonGroup>
-          <AlertButton onClick={onCancel}>{cancelTitle}</AlertButton>
-          {!!onDestroy && (
-            <AlertButton variant="danger" onClick={onDestroy}>
-              {destroyTitle}
-            </AlertButton>
-          )}
-          {!!onConfirm && (
-            <AlertButton variant="primary" onClick={onConfirm}>
-              {confirmTitle}
-            </AlertButton>
-          )}
-        </ButtonGroup>
-      </ContentContainer>
-    </CustomDialog>
-  )
-}
diff --git a/packages/extension/src/ui/components/BackButton.tsx b/packages/extension/src/ui/components/BackButton.tsx
deleted file mode 100644
index b40174bca..000000000
--- a/packages/extension/src/ui/components/BackButton.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { FC } from "react"
-import { useNavigate } from "react-router-dom"
-
-import { makeClickable } from "../services/a11y"
-import { IconButton } from "./IconButton"
-import { ArrowBackIosNewIcon } from "./Icons/MuiIcons"
-
-interface BackButtonProps {
-  to?: string
-}
-
-export const BackButton: FC<BackButtonProps> = (props) => {
-  const navigate = useNavigate()
-  const onClick = () => (props.to ? navigate(props.to) : navigate(-1))
-
-  return (
-    <IconButton
-      {...makeClickable(onClick, { label: "Back", tabIndex: 99 })}
-      size={36}
-      {...props}
-    >
-      <ArrowBackIosNewIcon />
-    </IconButton>
-  )
-}
diff --git a/packages/extension/src/ui/components/CustomDialog.tsx b/packages/extension/src/ui/components/CustomDialog.tsx
deleted file mode 100644
index ab1f2fd60..000000000
--- a/packages/extension/src/ui/components/CustomDialog.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import Dialog from "@mui/material/Dialog"
-import { FC } from "react"
-import styled from "styled-components"
-
-export interface CustomDialogProps {
-  isOpen: boolean
-  onCancel: () => void
-  children?: React.ReactNode
-}
-
-export const StyledDialog = styled(Dialog)`
-  .MuiDialog-paper {
-    border-radius: 8px;
-    max-width: 250px;
-    padding: 18px;
-    background: ${({ theme }) => theme.bg6};
-  }
-`
-
-export const CustomDialog: FC<CustomDialogProps> = ({
-  isOpen,
-  onCancel,
-  children,
-  ...props
-}) => {
-  return (
-    <StyledDialog
-      open={isOpen}
-      onClose={onCancel}
-      aria-labelledby="custom-dialog-title"
-      aria-describedby="custom-dialog-description"
-      {...props}
-    >
-      {children}
-    </StyledDialog>
-  )
-}
diff --git a/packages/extension/src/ui/components/ErrorBoundaryFallbackWithCopyError.tsx b/packages/extension/src/ui/components/ErrorBoundaryFallbackWithCopyError.tsx
index 05ef9bf40..afa82e1d3 100644
--- a/packages/extension/src/ui/components/ErrorBoundaryFallbackWithCopyError.tsx
+++ b/packages/extension/src/ui/components/ErrorBoundaryFallbackWithCopyError.tsx
@@ -5,9 +5,8 @@ import { FC, useCallback, useEffect, useMemo, useState } from "react"
 import styled from "styled-components"
 
 import { settingsStore } from "../../shared/settings"
-import { useKeyValueStorage } from "../../shared/storage/hooks"
+import { useKeyValueStorage } from "../hooks/useStorage"
 import { coerceErrorToString } from "../../shared/utils/error"
-import { SettingsItem, Title } from "../features/settings/SettingsScreen"
 import { makeClickable } from "../services/a11y"
 import { useHardResetAndReload } from "../services/resetAndReload"
 import { P } from "../theme/Typography"
@@ -23,6 +22,26 @@ import {
 import { WarningIcon } from "./Icons/WarningIcon"
 import IOSSwitch from "./IOSSwitch"
 
+const Title = styled.h3`
+  font-weight: 600;
+  font-size: 17px;
+  line-height: 22px;
+  color: ${({ theme }) => theme.text1};
+
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  svg {
+    color: ${({ theme }) => theme.text2};
+    font-size: 12px;
+  }
+`
+
+const SettingsItem = styled.div`
+  padding: 24px 32px;
+`
+
 const MessageContainer = styled.div`
   display: flex;
   flex-direction: column;
diff --git a/packages/extension/src/ui/components/ShortAddressBadge.tsx b/packages/extension/src/ui/components/ShortAddressBadge.tsx
index 400101ffb..cdde5521d 100644
--- a/packages/extension/src/ui/components/ShortAddressBadge.tsx
+++ b/packages/extension/src/ui/components/ShortAddressBadge.tsx
@@ -1,9 +1,9 @@
 import { FC } from "react"
 import styled from "styled-components"
 
-import { formatTruncatedAddress, normalizeAddress } from "../services/addresses"
 import { CopyTooltip } from "./CopyTooltip"
 import { ContentCopyIcon } from "./Icons/MuiIcons"
+import { normalizeAddress, formatTruncatedAddress } from "@argent/shared"
 
 export const AccountAddressWrapper = styled.span`
   display: flex;
diff --git a/packages/extension/src/ui/components/StatusIndicator.tsx b/packages/extension/src/ui/components/StatusIndicator.tsx
index 809230aa0..1050a88b0 100644
--- a/packages/extension/src/ui/components/StatusIndicator.tsx
+++ b/packages/extension/src/ui/components/StatusIndicator.tsx
@@ -3,7 +3,7 @@ import { FC } from "react"
 import styled, { css, keyframes } from "styled-components"
 
 import { NetworkStatus } from "../../shared/network"
-import { assertNever } from "../services/assertNever"
+import { assertNever } from "../../shared/utils/assertNever"
 import { NetworkWarningIcon } from "./Icons/NetworkWarningIcon"
 
 export type StatusIndicatorColor = "green" | "orange" | "red" | "neutral"
diff --git a/packages/extension/src/ui/components/TokenOption.tsx b/packages/extension/src/ui/components/TokenOption.tsx
new file mode 100644
index 000000000..bbd56ecb5
--- /dev/null
+++ b/packages/extension/src/ui/components/TokenOption.tsx
@@ -0,0 +1,62 @@
+import { FC, ReactNode } from "react"
+
+import { H6, P4 } from "@argent/ui"
+import { Flex, Img } from "@chakra-ui/react"
+
+interface TokenOptionProps {
+  name: string
+  symbol: string
+  imageSrc: string
+  balance: ReactNode
+  ccyBalance: ReactNode
+
+  onClick?: () => void
+  disabled?: boolean
+}
+
+export const TokenOption: FC<TokenOptionProps> = ({
+  balance,
+  ccyBalance,
+  imageSrc,
+  name,
+  symbol,
+  onClick,
+  disabled,
+}) => {
+  return (
+    <Flex
+      gap={3}
+      alignItems="center"
+      p={4}
+      borderRadius={8}
+      onClick={onClick}
+      cursor={disabled ? "auto" : "pointer"}
+      pointerEvents={disabled ? "none" : "auto"}
+      bg="neutrals.800"
+      opacity={disabled ? 0.4 : 1}
+      boxShadow="menu"
+      _hover={{ bg: "neutrals.700" }}
+    >
+      <Img
+        borderRadius="50%"
+        bg="neutrals.700"
+        src={imageSrc}
+        alt={name}
+        height="32px"
+        width="32px"
+      />
+      <Flex grow={1} direction="column" justifySelf="flex-start">
+        <H6>{name}</H6>
+        <P4 fontWeight="bold" color="neutrals.300">
+          {symbol}
+        </P4>
+      </Flex>
+      <Flex direction="column" justifySelf="flex-end" textAlign="right">
+        <H6>{balance}</H6>
+        <P4 fontWeight="bold" color="neutrals.300">
+          {ccyBalance}
+        </P4>
+      </Flex>
+    </Flex>
+  )
+}
diff --git a/packages/extension/src/ui/features/accountActivity/AccountActivity.tsx b/packages/extension/src/ui/features/accountActivity/AccountActivity.tsx
index f1c4a140d..9bd484a6d 100644
--- a/packages/extension/src/ui/features/accountActivity/AccountActivity.tsx
+++ b/packages/extension/src/ui/features/accountActivity/AccountActivity.tsx
@@ -67,7 +67,7 @@ const AccountActivityItem: FC<AccountActivityItemProps> = ({
 }) => {
   const navigate = useNavigate()
   if (isActivityTransaction(transaction)) {
-    const { hash, isRejected, isCancelled } = transaction
+    const { hash, failureReason } = transaction
     const transactionTransformed = transformTransaction({
       transaction,
       accountAddress: account.address,
@@ -81,9 +81,9 @@ const AccountActivityItem: FC<AccountActivityItemProps> = ({
           transactionTransformed={transactionTransformed}
           network={account.network}
           onClick={() => navigate(routes.transactionDetail(hash))}
-          isCancelled={isCancelled}
+          failureReason={failureReason}
         >
-          {isRejected ? (
+          {failureReason ? (
             <div style={{ display: "flex" }}>
               <TransactionStatusIndicator color={"red"} />
             </div>
@@ -110,6 +110,7 @@ const AccountActivityItem: FC<AccountActivityItemProps> = ({
             transactionTransformed={explorerTransactionTransformed}
             network={account.network}
             onClick={() => navigate(routes.transactionDetail(transactionHash))}
+            failureReason={transaction.failureReason}
           />
           {loadMore && <LoadMoreTrigger onLoadMore={onLoadMore} mt={-2} />}
         </>
diff --git a/packages/extension/src/ui/features/accountActivity/AccountActivityContainer.tsx b/packages/extension/src/ui/features/accountActivity/AccountActivityContainer.tsx
index 1368a1031..78a497d43 100644
--- a/packages/extension/src/ui/features/accountActivity/AccountActivityContainer.tsx
+++ b/packages/extension/src/ui/features/accountActivity/AccountActivityContainer.tsx
@@ -1,6 +1,5 @@
 import { FC, useCallback, useMemo } from "react"
-import { get } from "lodash-es"
-import { TransactionExecutionStatus, TransactionFinalityStatus } from "starknet"
+import { get, uniqBy } from "lodash-es"
 import { CellStack, Empty, H4, SpacerCell, icons } from "@argent/ui"
 import { Center, Skeleton } from "@chakra-ui/react"
 
@@ -22,7 +21,9 @@ import { PendingTransactions } from "./PendingTransactions"
 import { isVoyagerTransaction } from "./transform/is"
 import { ActivityTransaction } from "./useActivity"
 import { useArgentExplorerAccountTransactionsInfinite } from "./useArgentExplorer"
-import { isEqualAddress } from "@argent/shared"
+import { isEqualAddress, normalizeAddress } from "@argent/shared"
+import { getTransactionFailureReason } from "./getTransactionFailureReason"
+import { getTransactionStatus } from "../../../shared/transactions/utils"
 
 const { ActivityIcon } = icons
 
@@ -90,12 +91,14 @@ export const AccountActivityLoader: FC<AccountActivityContainerProps> = ({
   const { transactions } = useAccountTransactions(account)
   const voyagerTransactions = useMemo(() => {
     // RECEIVED transactions are already shown as pending
-    return transactions.filter(
-      (transaction) =>
-        (transaction.finalityStatus !== TransactionFinalityStatus.RECEIVED ||
-          transaction.executionStatus ===
-            TransactionExecutionStatus.REJECTED) &&
-        !transaction.meta?.isDeployAccount,
+    return uniqBy(
+      transactions.filter((transaction) => {
+        const { finality_status } = getTransactionStatus(transaction)
+        return (
+          finality_status !== "RECEIVED" && !transaction.meta?.isDeployAccount
+        )
+      }),
+      (tx) => normalizeAddress(tx.hash),
     )
   }, [transactions])
   const mergedTransactions = useMemo(() => {
@@ -169,7 +172,7 @@ export const AccountActivityLoader: FC<AccountActivityContainerProps> = ({
     const { transactions, transactionsWithoutTimestamp } = mergedTransactions
     let lastExplorerTransactionHash
     const submittedTransactions = transactions.filter(
-      (transaction) => transaction.finalityStatus !== "NOT_RECEIVED",
+      (transaction) => transaction.status !== "NOT_RECEIVED",
     )
 
     for (const transaction of submittedTransactions) {
@@ -179,20 +182,27 @@ export const AccountActivityLoader: FC<AccountActivityContainerProps> = ({
         mergedActivity[dateLabel] = []
       }
       if (isVoyagerTransaction(transaction)) {
-        const { hash, meta, finalityStatus, executionStatus } = transaction
-        const isRejected =
-          executionStatus === "REJECTED" || executionStatus === "REVERTED"
-        const isCancelled = finalityStatus === "CANCELLED"
+        const { hash, meta } = transaction
+        const failureReason = getTransactionFailureReason(transaction.status)
+
         const activityTransaction: ActivityTransaction = {
           hash,
           date,
           meta,
-          isRejected,
-          isCancelled,
+          failureReason,
         }
         mergedActivity[dateLabel].push(activityTransaction)
       } else {
-        mergedActivity[dateLabel].push(transaction)
+        const failureReason = getTransactionFailureReason({
+          finality_status: transaction.finalityStatus,
+          execution_status: transaction.executionStatus,
+        })
+
+        mergedActivity[dateLabel].push({
+          ...transaction,
+          failureReason,
+        })
+
         if (transaction.transactionHash) {
           lastExplorerTransactionHash = transaction.transactionHash
         }
diff --git a/packages/extension/src/ui/features/accountActivity/TransactionDetail.tsx b/packages/extension/src/ui/features/accountActivity/TransactionDetail.tsx
index 169641b2c..eec7f5547 100644
--- a/packages/extension/src/ui/features/accountActivity/TransactionDetail.tsx
+++ b/packages/extension/src/ui/features/accountActivity/TransactionDetail.tsx
@@ -21,7 +21,6 @@ import {
   SectionHeader,
 } from "../../components/Fields"
 import { ContentCopyIcon } from "../../components/Icons/MuiIcons"
-import { formatTruncatedAddress } from "../../services/addresses"
 import {
   openBlockExplorerAddress,
   openBlockExplorerTransaction,
@@ -53,6 +52,9 @@ import { TransferTitle } from "./ui/TransferTitle"
 import { useTransactionFees } from "./useTransactionFees"
 import { useTransactionNonce } from "./useTransactionNonce"
 import { Token } from "../../../shared/token/__new/types/token.model"
+import { formatTruncatedAddress } from "@argent/shared"
+import { ETH_TOKEN_ADDRESS } from "../../../shared/network/constants"
+import { getTransactionStatus } from "../../../shared/transactions/utils"
 
 const { ActivityIcon } = icons
 
@@ -169,12 +171,17 @@ export const TransactionDetail: FC<TransactionDetailProps> = ({
   const txNonce = useTransactionNonce({ hash, network })
   const [bottomSheetOpen, setBottomSheetOpen] = useState(false)
   const { action, date, displayName, dapp } = transactionTransformed
+
+  const { finality_status, execution_status } =
+    getTransactionStatus(transaction)
+
   const isReverted =
     upperCase(explorerTransaction?.executionStatus) === "REVERTED" ||
-    transaction?.executionStatus === "REVERTED"
+    execution_status === "REVERTED"
   const isRejected =
     upperCase(explorerTransaction?.executionStatus) === "REJECTED" ||
-    transaction?.executionStatus === "REJECTED"
+    finality_status === "REJECTED"
+
   const isTransfer = isTokenTransferTransaction(transactionTransformed)
   const isNFT = isNFTTransaction(transactionTransformed)
   const isNFTTransfer = isNFTTransferTransaction(transactionTransformed)
@@ -419,7 +426,13 @@ export const TransactionDetail: FC<TransactionDetailProps> = ({
         )}
         {dapp && <DappContractField knownContract={dapp} />}
         {additionalFields}
-        {txFee && <FeeField fee={txFee} networkId={network.id} />}
+        {txFee && (
+          <FeeField
+            feeTokenAddress={ETH_TOKEN_ADDRESS}
+            fee={txFee}
+            networkId={network.id}
+          />
+        )}
         {txNonce && (
           <Field>
             <FieldKey>Nonce</FieldKey>
diff --git a/packages/extension/src/ui/features/accountActivity/TransactionListItem.tsx b/packages/extension/src/ui/features/accountActivity/TransactionListItem.tsx
index 1b5f4464e..3fbc805e4 100644
--- a/packages/extension/src/ui/features/accountActivity/TransactionListItem.tsx
+++ b/packages/extension/src/ui/features/accountActivity/TransactionListItem.tsx
@@ -24,6 +24,8 @@ import { SwapTransactionIcon } from "./ui/SwapTransactionIcon"
 import { TransactionIcon } from "./ui/TransactionIcon"
 import { TransferAccessory } from "./ui/TransferAccessory"
 import { PrettyAccountAddressArgentX } from "../accounts/PrettyAccountAddressArgentX"
+import { ActivityTransactionFailureReason } from "./getTransactionFailureReason"
+import { lowerCase, upperFirst } from "lodash-es"
 
 export interface TransactionListItemProps extends CustomButtonCellProps {
   transactionTransformed: TransformedTransaction
@@ -31,7 +33,7 @@ export interface TransactionListItemProps extends CustomButtonCellProps {
   highlighted?: boolean
   children?: ReactNode | ReactNode[]
   txHash: string
-  isCancelled?: boolean
+  failureReason?: ActivityTransactionFailureReason
 }
 
 export const TransactionListItem: FC<TransactionListItemProps> = ({
@@ -39,7 +41,7 @@ export const TransactionListItem: FC<TransactionListItemProps> = ({
   network,
   highlighted,
   txHash,
-  isCancelled,
+  failureReason,
   onClick,
   _active,
   children,
@@ -75,30 +77,45 @@ export const TransactionListItem: FC<TransactionListItemProps> = ({
               networkId={network.id}
               icon={false}
             />
-            {isCancelled && <> ∙ </>}
           </P4>
-
-          {isCancelled && (
-            <P4
-              color="error.500"
-              fontWeight="semibold"
-              overflow="hidden"
-              textOverflow="ellipsis"
-            >
-              Cancelled
-            </P4>
-          )}
         </Flex>
       )
     }
     if (dapp) {
-      return <>{dapp.title}</>
+      return (
+        <P4
+          color="neutrals.300"
+          fontWeight="semibold"
+          overflow="hidden"
+          textOverflow="ellipsis"
+        >
+          {dapp.title}
+        </P4>
+      )
     }
     if (isDeclareContract) {
-      return <>{transactionTransformed.classHash}</>
+      return (
+        <P4
+          color="neutrals.300"
+          fontWeight="semibold"
+          overflow="hidden"
+          textOverflow="ellipsis"
+        >
+          {transactionTransformed.classHash}
+        </P4>
+      )
     }
     if (isDeployContract) {
-      return <>{transactionTransformed.contractAddress}</>
+      return (
+        <P4
+          color="neutrals.300"
+          fontWeight="semibold"
+          overflow="hidden"
+          textOverflow="ellipsis"
+        >
+          {transactionTransformed.contractAddress}
+        </P4>
+      )
     }
     return null
   }, [
@@ -110,9 +127,29 @@ export const TransactionListItem: FC<TransactionListItemProps> = ({
     action,
     transactionTransformed,
     network.id,
-    isCancelled,
   ])
 
+  const subtitleWithFailureReason = useMemo(() => {
+    if (!failureReason) {
+      return subtitle
+    }
+
+    return (
+      <Flex alignItems="center">
+        {subtitle}
+        {<> ∙ </>}
+        <P4
+          color="error.500"
+          fontWeight="semibold"
+          overflow="hidden"
+          textOverflow="ellipsis"
+        >
+          {upperFirst(lowerCase(failureReason))}
+        </P4>
+      </Flex>
+    )
+  }, [failureReason, subtitle])
+
   const icon = useMemo(() => {
     if (isNFT) {
       const { contractAddress, tokenId } = transactionTransformed
@@ -131,33 +168,56 @@ export const TransactionListItem: FC<TransactionListItemProps> = ({
     }
     if (isSwap) {
       return (
-        <SwapTransactionIcon transaction={transactionTransformed} size={9} />
+        <SwapTransactionIcon
+          transaction={transactionTransformed}
+          size={9}
+          failureReason={failureReason}
+        />
       )
     }
     return (
       <TransactionIcon
         transaction={transactionTransformed}
         size={9}
-        isCancelled={isCancelled}
+        failureReason={failureReason}
       />
     )
-  }, [isNFT, isSwap, transactionTransformed, isCancelled, network.id])
+  }, [isNFT, isSwap, transactionTransformed, failureReason, network.id])
 
   const accessory = useMemo(() => {
     if (isTransfer || isTokenMint || isTokenApprove) {
-      return <TransferAccessory transaction={transactionTransformed} />
+      return (
+        <TransferAccessory
+          transaction={transactionTransformed}
+          failed={Boolean(failureReason)}
+        />
+      )
     }
     if (isSwap) {
-      return <SwapAccessory transaction={transactionTransformed} />
+      return (
+        <SwapAccessory
+          transaction={transactionTransformed}
+          failed={Boolean(failureReason)}
+        />
+      )
     }
     return null
-  }, [isTransfer, isTokenMint, isTokenApprove, isSwap, transactionTransformed])
+  }, [
+    isTransfer,
+    isTokenMint,
+    isTokenApprove,
+    isSwap,
+    transactionTransformed,
+    failureReason,
+  ])
+
+  const isCancelled = failureReason === "CANCELLED"
 
   return (
     <CustomButtonCell
       data-tx-hash={txHash}
       highlighted={highlighted}
-      onClick={(e) => !isCancelled && onClick?.(e)}
+      onClick={(e) => !isCancelled && onClick?.(e)} // disable navigation to transaction detail if cancelled
       _hover={{ cursor: isCancelled ? "default" : "pointer" }}
       _active={!isCancelled ? _active : {}}
       {...props}
@@ -174,7 +234,7 @@ export const TransactionListItem: FC<TransactionListItemProps> = ({
           <H6 overflow="hidden" textOverflow={"ellipsis"}>
             {displayName}
           </H6>
-          {subtitle}
+          {subtitleWithFailureReason}
         </Flex>
       </Flex>
       {accessory}
diff --git a/packages/extension/src/ui/features/accountActivity/getTransactionFailureReason.ts b/packages/extension/src/ui/features/accountActivity/getTransactionFailureReason.ts
new file mode 100644
index 000000000..04c8877e2
--- /dev/null
+++ b/packages/extension/src/ui/features/accountActivity/getTransactionFailureReason.ts
@@ -0,0 +1,25 @@
+import { ExtendedTransactionStatus } from "../../../shared/transactions"
+
+export type ActivityTransactionFailureReason =
+  | "REVERTED"
+  | "REJECTED"
+  | "CANCELLED"
+
+export function getTransactionFailureReason({
+  finality_status,
+  execution_status,
+}: ExtendedTransactionStatus): ActivityTransactionFailureReason | undefined {
+  // Cancellation happens before submitting by backend
+  // Rejection happens when validation fails onchain
+  // Reversion happens when transaction execution fails onchain
+  switch (finality_status) {
+    case "CANCELLED":
+    case "REJECTED":
+      return finality_status
+    default:
+      if (execution_status === "REVERTED") {
+        return execution_status
+      }
+      return undefined
+  }
+}
diff --git a/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/getActualFee.test.ts b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/getActualFee.test.ts
new file mode 100644
index 000000000..62e291a20
--- /dev/null
+++ b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/getActualFee.test.ts
@@ -0,0 +1,38 @@
+import { getActualFee } from "./getActualFee"
+import { describe, it, expect } from "vitest"
+import { IExplorerTransaction } from "../../../../../shared/explorer/type"
+
+describe("getActualFee", () => {
+  it("should return correct fee, given actualFee as a string", () => {
+    const mockTransaction: IExplorerTransaction = {
+      id: "0x1",
+      blockNumber: 1,
+      timestamp: 1,
+      transactionHash: "0x1",
+      actualFee: "0x5",
+      finalityStatus: "ACCEPTED_ON_L2",
+      statusData: "",
+      events: [],
+    }
+    const result = getActualFee(mockTransaction)
+    expect(result).toBe("0x5")
+  })
+
+  it("should return correct fee, given actualFee as a 2 dimensional schema", () => {
+    const mockTransaction: IExplorerTransaction = {
+      id: "0x1",
+      blockNumber: 1,
+      timestamp: 1,
+      transactionHash: "0x1",
+      actualFee: {
+        amount: "0x6",
+        unit: "WEI",
+      },
+      finalityStatus: "ACCEPTED_ON_L2",
+      statusData: "",
+      events: [],
+    }
+    const result = getActualFee(mockTransaction)
+    expect(result).toBe("0x6")
+  })
+})
diff --git a/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/getActualFee.ts b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/getActualFee.ts
new file mode 100644
index 000000000..74a692270
--- /dev/null
+++ b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/getActualFee.ts
@@ -0,0 +1,17 @@
+import {
+  explorerTransactionActualFeeSchema,
+  IExplorerTransaction,
+} from "../../../../../shared/explorer/type"
+
+export function getActualFee({ actualFee }: IExplorerTransaction) {
+  let actualFeeAmount = "0x0"
+
+  const parsedActualFee =
+    explorerTransactionActualFeeSchema.safeParse(actualFee)
+  if (parsedActualFee.success) {
+    actualFeeAmount = parsedActualFee.data.amount
+  } else {
+    actualFeeAmount = actualFee as string
+  }
+  return actualFeeAmount
+}
diff --git a/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/accountCreateTransformer.ts b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/accountCreateTransformer.ts
index b8ce64922..4cf3a6887 100644
--- a/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/accountCreateTransformer.ts
+++ b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/accountCreateTransformer.ts
@@ -1,4 +1,5 @@
 import { IExplorerTransactionTransformer } from "./type"
+import { getActualFee } from "../getActualFee"
 
 export default function ({
   explorerTransaction,
@@ -6,7 +7,9 @@ export default function ({
   fingerprint,
 }: IExplorerTransactionTransformer) {
   if (fingerprint === "events[Upgraded]" || fingerprint === "events[]") {
-    const { maxFee, actualFee } = explorerTransaction
+    const { maxFee } = explorerTransaction
+    const actualFee = getActualFee(explorerTransaction)
+
     if (!maxFee && actualFee === "0x0") {
       const entity = "ACCOUNT"
       const action = "CREATE"
diff --git a/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/feesTransformer.ts b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/feesTransformer.ts
index d0344d32b..ffac1a452 100644
--- a/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/feesTransformer.ts
+++ b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/feesTransformer.ts
@@ -1,6 +1,7 @@
 import { number } from "starknet"
 
 import { IExplorerTransactionTransformer } from "./type"
+import { getActualFee } from "../getActualFee"
 
 /** fees */
 
@@ -8,7 +9,9 @@ export default function ({
   explorerTransaction,
   result,
 }: IExplorerTransactionTransformer) {
-  const { maxFee, actualFee } = explorerTransaction
+  const { maxFee } = explorerTransaction
+  const actualFee = getActualFee(explorerTransaction)
+
   if (maxFee && actualFee) {
     result = {
       ...result,
diff --git a/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/knownNftTransformer.ts b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/knownNftTransformer.ts
index ed816bfd9..c8eef2804 100644
--- a/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/knownNftTransformer.ts
+++ b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/knownNftTransformer.ts
@@ -1,5 +1,5 @@
-import { includesAddress } from "../../../../../../shared/knownDapps"
-import { isEqualAddress } from "../../../../../services/addresses"
+import { isEqualAddress, includesAddress } from "@argent/shared"
+
 import { NFTTransferTransaction } from "../../type"
 import { IExplorerTransactionTransformer } from "./type"
 
diff --git a/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/tokenTransferTransformer.ts b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/tokenTransferTransformer.ts
index 5813e1cce..50f040d3f 100644
--- a/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/tokenTransferTransformer.ts
+++ b/packages/extension/src/ui/features/accountActivity/transform/explorerTransaction/transformers/tokenTransferTransformer.ts
@@ -1,4 +1,4 @@
-import { isEqualAddress } from "../../../../../services/addresses"
+import { isEqualAddress } from "@argent/shared"
 import { TokenTransferTransaction } from "../../type"
 import { getParameter } from "../getParameter"
 import { IExplorerTransactionTransformer } from "./type"
diff --git a/packages/extension/src/ui/features/accountActivity/transform/getTokenForContractAddress.ts b/packages/extension/src/ui/features/accountActivity/transform/getTokenForContractAddress.ts
index 57a98a557..48b85a360 100644
--- a/packages/extension/src/ui/features/accountActivity/transform/getTokenForContractAddress.ts
+++ b/packages/extension/src/ui/features/accountActivity/transform/getTokenForContractAddress.ts
@@ -1,6 +1,6 @@
+import { isEqualAddress } from "@argent/shared"
 import { Token } from "../../../../shared/token/__new/types/token.model"
 import { parsedDefaultTokens } from "../../../../shared/token/__new/utils"
-import { isEqualAddress } from "../../../services/addresses"
 
 export const getTokenForContractAddress = (
   contractAddress: string,
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/transformTransaction.test.ts b/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/transformTransaction.test.ts
index 935ec7fb4..94fc6a920 100644
--- a/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/transformTransaction.test.ts
+++ b/packages/extension/src/ui/features/accountActivity/transform/transaction/__test__/transformTransaction.test.ts
@@ -1,4 +1,4 @@
-import { Call, TransactionFinalityStatus } from "starknet"
+import { Call } from "starknet"
 import { describe, expect, test } from "vitest"
 
 import { Transaction } from "../../../../../../shared/transactions"
@@ -18,7 +18,8 @@ import {
   multisigAddOwner,
   multisigRemoveOwner,
   multisigReplaceOwner,
-} from "./__fixtures__/transaction-calls/goerli-alpha"
+} from "../../../../../../shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha"
+import { ETH_TOKEN_ADDRESS } from "../../../../../../shared/network/constants"
 
 const accountAddress =
   "0x7e00d496e324876bbc8531f2d9a82bf154d1a04a50218ee74cdd372f75a551a"
@@ -41,6 +42,7 @@ const makeTransaction = (transactions: Call | Call[]): Transaction => {
         multicallAddress:
           "0x042a12c5a641619a6c58e623d5735273cdfb0e13df72c4bacb4e188892034bd6",
         name: "Goerli Testnet",
+        possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS],
         readonly: true,
       },
       networkId: "goerli-alpha",
@@ -53,7 +55,9 @@ const makeTransaction = (transactions: Call | Call[]): Transaction => {
     meta: {
       transactions,
     },
-    finalityStatus: TransactionFinalityStatus.ACCEPTED_ON_L2,
+    status: {
+      finality_status: "RECEIVED",
+    },
     timestamp: 1662047260,
   }
 }
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/transformers/defaultDisplayNameTransformer.ts b/packages/extension/src/ui/features/accountActivity/transform/transaction/transformers/defaultDisplayNameTransformer.ts
index 91a33c1b0..2f1bb51e9 100644
--- a/packages/extension/src/ui/features/accountActivity/transform/transaction/transformers/defaultDisplayNameTransformer.ts
+++ b/packages/extension/src/ui/features/accountActivity/transform/transaction/transformers/defaultDisplayNameTransformer.ts
@@ -1,5 +1,5 @@
+import { formatTruncatedAddress } from "@argent/shared"
 import { transactionNamesToTitle } from "../../../../../../shared/transactions"
-import { formatTruncatedAddress } from "../../../../../services/addresses"
 import { getCallsFromTransaction } from "../getCallsFromTransaction"
 import { ITransactionTransformer } from "./type"
 
diff --git a/packages/extension/src/ui/features/accountActivity/transform/transaction/transformers/pendingMultisigTransactionAdapter.ts b/packages/extension/src/ui/features/accountActivity/transform/transaction/transformers/pendingMultisigTransactionAdapter.ts
index fb14f330f..157b7ec72 100644
--- a/packages/extension/src/ui/features/accountActivity/transform/transaction/transformers/pendingMultisigTransactionAdapter.ts
+++ b/packages/extension/src/ui/features/accountActivity/transform/transaction/transformers/pendingMultisigTransactionAdapter.ts
@@ -1,4 +1,3 @@
-import { TransactionExecutionStatus, TransactionFinalityStatus } from "starknet"
 import { MultisigPendingTransaction } from "../../../../../../shared/multisig/pendingTransactionsStore"
 import { Transaction } from "../../../../../../shared/transactions"
 import { WalletAccount } from "../../../../../../shared/wallet.model"
@@ -14,7 +13,9 @@ export const getTransactionFromPendingMultisigTransaction = (
       transactions: transaction.calls,
     },
     timestamp,
-    finalityStatus: TransactionFinalityStatus.NOT_RECEIVED,
+    status: {
+      finality_status: "NOT_RECEIVED",
+    },
     hash: pendingMultisigTransaction.transactionHash,
   }
 }
diff --git a/packages/extension/src/ui/features/accountActivity/ui/SwapAccessory.tsx b/packages/extension/src/ui/features/accountActivity/ui/SwapAccessory.tsx
index 14a2b615d..162c6504a 100644
--- a/packages/extension/src/ui/features/accountActivity/ui/SwapAccessory.tsx
+++ b/packages/extension/src/ui/features/accountActivity/ui/SwapAccessory.tsx
@@ -7,9 +7,13 @@ import { SwapTransaction } from "../transform/type"
 
 export interface SwapAccessoryProps {
   transaction: SwapTransaction
+  failed?: boolean
 }
 
-export const SwapAccessory: FC<SwapAccessoryProps> = ({ transaction }) => {
+export const SwapAccessory: FC<SwapAccessoryProps> = ({
+  transaction,
+  failed,
+}) => {
   const { fromAmount, fromToken, toAmount, toToken } = transaction
   return (
     <Flex direction={"column"} overflow="hidden">
@@ -19,6 +23,7 @@ export const SwapAccessory: FC<SwapAccessoryProps> = ({ transaction }) => {
           textOverflow={"ellipsis"}
           textAlign={"right"}
           color={"secondary.500"}
+          textDecoration={failed ? "line-through" : undefined}
         >
           <>+</>
           {toToken ? (
@@ -39,6 +44,7 @@ export const SwapAccessory: FC<SwapAccessoryProps> = ({ transaction }) => {
           overflow="hidden"
           textOverflow={"ellipsis"}
           textAlign={"right"}
+          textDecoration={failed ? "line-through" : undefined}
         >
           &minus;
           {fromToken ? (
diff --git a/packages/extension/src/ui/features/accountActivity/ui/SwapTransactionIcon.tsx b/packages/extension/src/ui/features/accountActivity/ui/SwapTransactionIcon.tsx
index 55a9fb595..822c496c1 100644
--- a/packages/extension/src/ui/features/accountActivity/ui/SwapTransactionIcon.tsx
+++ b/packages/extension/src/ui/features/accountActivity/ui/SwapTransactionIcon.tsx
@@ -1,18 +1,24 @@
-import { Square, SquareProps } from "@chakra-ui/react"
+import { Circle, Square, SquareProps } from "@chakra-ui/react"
 import { FC } from "react"
+import { icons } from "@argent/ui"
 
 import { TokenIcon } from "../../accountTokens/TokenIcon"
 import { isSwapTransaction } from "../transform/is"
 import { TransformedTransaction } from "../transform/type"
+import { ActivityTransactionFailureReason } from "../getTransactionFailureReason"
+
+const { FailIcon } = icons
 
 export interface SwapTransactionIconProps extends Omit<SquareProps, "size"> {
   transaction: TransformedTransaction
   size: string | number
+  failureReason?: ActivityTransactionFailureReason
 }
 
 export const SwapTransactionIcon: FC<SwapTransactionIconProps> = ({
   transaction,
   size = 18,
+  failureReason,
   ...rest
 }) => {
   if (!isSwapTransaction(transaction)) {
@@ -22,6 +28,22 @@ export const SwapTransactionIcon: FC<SwapTransactionIconProps> = ({
   const fromIconSize = Math.round((Number(size) * 24) / 36)
   const toIconSize = Math.round((Number(size) * 28) / 36)
   const { fromToken, toToken } = transaction
+
+  if (failureReason) {
+    const iconSize = Math.round((4 * (Number(size) * 16)) / 36)
+    return (
+      <Circle
+        size={size}
+        position={"relative"}
+        bg={"neutrals.600"}
+        fontSize={iconSize}
+        {...rest}
+      >
+        <FailIcon />
+      </Circle>
+    )
+  }
+
   return (
     <Square
       size={size}
diff --git a/packages/extension/src/ui/features/accountActivity/ui/TransactionIcon.tsx b/packages/extension/src/ui/features/accountActivity/ui/TransactionIcon.tsx
index b4913bdbd..bc4c6173e 100644
--- a/packages/extension/src/ui/features/accountActivity/ui/TransactionIcon.tsx
+++ b/packages/extension/src/ui/features/accountActivity/ui/TransactionIcon.tsx
@@ -11,6 +11,7 @@ import {
 } from "../transform/is"
 import { TransformedTransaction } from "../transform/type"
 import { DappIconContainer } from "../../actions/connectDapp/DappIconContainer"
+import { ActivityTransactionFailureReason } from "../getTransactionFailureReason"
 
 const {
   DocumentIcon,
@@ -32,7 +33,7 @@ const {
 export interface TransactionIconProps extends Omit<SquareProps, "outline"> {
   transaction: TransformedTransaction
   outline?: boolean
-  isCancelled?: boolean
+  failureReason?: ActivityTransactionFailureReason
   size?: number
 }
 
@@ -40,7 +41,7 @@ export const TransactionIcon: FC<TransactionIconProps> = ({
   transaction,
   size = 18,
   outline = false,
-  isCancelled = false,
+  failureReason,
   ...rest
 }) => {
   const badgeSize = Math.min(32, Math.round((size * 16) / 36))
@@ -131,7 +132,7 @@ export const TransactionIcon: FC<TransactionIconProps> = ({
       fontSize={iconSize}
       {...rest}
     >
-      {isCancelled ? <FailIcon /> : iconComponent}
+      {failureReason ? <FailIcon /> : iconComponent}
       {badgeComponent && (
         <Circle
           overflow={"hidden"}
diff --git a/packages/extension/src/ui/features/accountActivity/ui/TransferAccessory.tsx b/packages/extension/src/ui/features/accountActivity/ui/TransferAccessory.tsx
index 7d913ac7a..575f616f8 100644
--- a/packages/extension/src/ui/features/accountActivity/ui/TransferAccessory.tsx
+++ b/packages/extension/src/ui/features/accountActivity/ui/TransferAccessory.tsx
@@ -14,10 +14,12 @@ export interface TransferAccessoryProps {
     | TokenTransferTransaction
     | TokenMintTransaction
     | TokenApproveTransaction
+  failed?: boolean
 }
 
 export const TransferAccessory: FC<TransferAccessoryProps> = ({
   transaction,
+  failed,
 }) => {
   const { action, amount, tokenAddress } = transaction
   const { displayAmount, displayValue } = useDisplayTokenAmountAndCurrencyValue(
@@ -36,6 +38,7 @@ export const TransferAccessory: FC<TransferAccessoryProps> = ({
           textOverflow={"ellipsis"}
           textAlign={"right"}
           color={action === "RECEIVE" ? "secondary.500" : undefined}
+          textDecoration={failed ? "line-through" : undefined}
         >
           {prefix}
           {displayAmount}
@@ -48,6 +51,7 @@ export const TransferAccessory: FC<TransferAccessoryProps> = ({
           overflow="hidden"
           textOverflow={"ellipsis"}
           textAlign={"right"}
+          textDecoration={failed ? "line-through" : undefined}
         >
           {prefix}
           {displayValue}
diff --git a/packages/extension/src/ui/features/accountActivity/useActivity.ts b/packages/extension/src/ui/features/accountActivity/useActivity.ts
index 197445b45..89e463634 100644
--- a/packages/extension/src/ui/features/accountActivity/useActivity.ts
+++ b/packages/extension/src/ui/features/accountActivity/useActivity.ts
@@ -1,15 +1,18 @@
-import { TransactionExecutionStatus, TransactionFinalityStatus } from "starknet"
 import { TransactionMeta } from "../../../shared/transactions"
 import { BaseWalletAccount } from "../../../shared/wallet.model"
 import { formatDate } from "../../services/dates"
 import { useAccountTransactions } from "../accounts/accountTransactions.state"
+import {
+  ActivityTransactionFailureReason,
+  getTransactionFailureReason,
+} from "./getTransactionFailureReason"
+import { getTransactionStatus } from "../../../shared/transactions/utils"
 
 export interface ActivityTransaction {
   hash: string
   date: string
   meta?: TransactionMeta
-  isRejected?: boolean
-  isCancelled?: boolean
+  failureReason?: ActivityTransactionFailureReason
   timestamp?: number
 }
 
@@ -18,29 +21,26 @@ export type DailyActivity = Record<string, ActivityTransaction[]>
 export function useActivity(account: BaseWalletAccount): DailyActivity {
   const { transactions } = useAccountTransactions(account)
   const activity: DailyActivity = {}
-  for (const {
-    hash,
-    timestamp,
-    meta,
-    finalityStatus,
-    executionStatus,
-  } of transactions) {
+  for (const transaction of transactions) {
     // RECEIVED transactions are already shown as pending
-    if (
-      finalityStatus !== TransactionFinalityStatus.RECEIVED ||
-      executionStatus === TransactionExecutionStatus.REJECTED
-    ) {
+    const { timestamp, hash, meta } = transaction
+    const { finality_status, execution_status } =
+      getTransactionStatus(transaction)
+
+    if (finality_status !== "RECEIVED") {
       const date = new Date(timestamp * 1000).toISOString()
       const dateLabel = formatDate(date)
-      const isRejected = executionStatus === "REJECTED"
-      const isCancelled = finalityStatus === "CANCELLED"
+      const failureReason = getTransactionFailureReason({
+        finality_status,
+        execution_status,
+      })
+
       activity[dateLabel] ||= []
       activity[dateLabel].push({
         hash,
         date,
         meta,
-        isRejected,
-        isCancelled,
+        failureReason,
       })
     }
   }
diff --git a/packages/extension/src/ui/features/accountActivity/useArgentExplorer.ts b/packages/extension/src/ui/features/accountActivity/useArgentExplorer.ts
index 233b2daaf..9407347f0 100644
--- a/packages/extension/src/ui/features/accountActivity/useArgentExplorer.ts
+++ b/packages/extension/src/ui/features/accountActivity/useArgentExplorer.ts
@@ -7,7 +7,7 @@ import {
   ARGENT_EXPLORER_BASE_URL,
   ARGENT_EXPLORER_ENABLED,
 } from "../../../shared/api/constants"
-import { argentApiNetworkForNetwork } from "../../../shared/api/fetcher"
+import { argentApiNetworkForNetwork } from "../../../shared/api/headers"
 import { IExplorerTransaction } from "../../../shared/explorer/type"
 import { urlWithQuery } from "../../../shared/utils/url"
 import { argentApiFetcher } from "../../services/argentApiFetcher"
@@ -15,7 +15,7 @@ import {
   useConditionallyEnabledSWR,
   withPolling,
 } from "../../services/swr.service"
-import { stripAddressZeroPadding } from "../accounts/accounts.service"
+import { stripAddressZeroPadding } from "@argent/shared"
 import { RefreshInterval } from "../../../shared/config"
 
 export const useArgentExplorerEnabled = () => {
diff --git a/packages/extension/src/ui/features/accountEdit/AccountEditButtons.tsx b/packages/extension/src/ui/features/accountEdit/AccountEditButtons.tsx
index 6af6eec53..ccaca37b9 100644
--- a/packages/extension/src/ui/features/accountEdit/AccountEditButtons.tsx
+++ b/packages/extension/src/ui/features/accountEdit/AccountEditButtons.tsx
@@ -3,8 +3,8 @@ import { Spinner } from "@chakra-ui/react"
 import { useMemo } from "react"
 import { Link, useNavigate } from "react-router-dom"
 
-import { settingsStore } from "../../../shared/settings"
-import { useKeyValueStorage } from "../../../shared/storage/hooks"
+// import { settingsStore } from "../../../shared/settings"
+// import { useKeyValueStorage } from "../../../shared/storage/hooks"
 import { isDeprecated } from "../../../shared/wallet.service"
 import { routes } from "../../routes"
 import {
@@ -12,7 +12,7 @@ import {
   useBlockExplorerTitle,
 } from "../../services/blockExplorer.service"
 import { Account } from "../accounts/Account"
-import { useFeeTokenBalance } from "../accountTokens/useFeeTokenBalance"
+import { useHasFeeTokenBalance } from "../accountTokens/useFeeTokenBalance"
 import { useCurrentNetwork } from "../networks/hooks/useCurrentNetwork"
 import {
   ChangeGuardian,
@@ -31,17 +31,17 @@ export const AccountEditButtons = () => {
   const blockExplorerTitle = useBlockExplorerTitle()
   const liveAccountGuardianState = useLiveAccountGuardianState(account)
 
-  const { feeTokenBalance } = useFeeTokenBalance(account)
+  const hasFeeTokenBalance = useHasFeeTokenBalance(account)
 
   const canDeployAccount = useMemo(
-    () => account?.needsDeploy && feeTokenBalance && feeTokenBalance > 0n,
-    [account?.needsDeploy, feeTokenBalance],
+    () => account?.needsDeploy && hasFeeTokenBalance,
+    [account?.needsDeploy, hasFeeTokenBalance],
   )
 
-  const experimentalAllowChooseAccount = useKeyValueStorage(
-    settingsStore,
-    "experimentalAllowChooseAccount",
-  )
+  // const experimentalAllowChooseAccount = useKeyValueStorage(
+  //   settingsStore,
+  //   "experimentalAllowChooseAccount",
+  // )
 
   const showDelete =
     account && (isDeprecated(account) || account.networkId === "localhost")
@@ -135,6 +135,13 @@ export const AccountEditButtons = () => {
       {canDeployAccount && (
         <ButtonCell onClick={handleDeploy}>Deploy account</ButtonCell>
       )}
+      <ButtonCell
+        onClick={() =>
+          navigate(routes.settingsDappConnectionsAccount(account?.address))
+        }
+      >
+        Connected dapps
+      </ButtonCell>
       <ButtonCell
         color={"error.500"}
         onClick={() => navigate(routes.exportPrivateKey(accountAddress))}
diff --git a/packages/extension/src/ui/features/accountNfts/EmptyCollections.tsx b/packages/extension/src/ui/features/accountNfts/EmptyCollections.tsx
index b5794c2dc..de3eecdbd 100644
--- a/packages/extension/src/ui/features/accountNfts/EmptyCollections.tsx
+++ b/packages/extension/src/ui/features/accountNfts/EmptyCollections.tsx
@@ -26,7 +26,7 @@ const ButtonLink: FC<{ href: string; icon: ReactNode; title: string }> = ({
   </Box>
 )
 
-const EmptyCollections: FC<{ networkId: string }> = ({ networkId }) => (
+const EmptyCollections: FC<{ networkId: string }> = () => (
   <Flex
     direction="column"
     flex={1}
diff --git a/packages/extension/src/ui/features/accountNfts/NftScreen.tsx b/packages/extension/src/ui/features/accountNfts/NftScreen.tsx
index acd827a8c..59598a541 100644
--- a/packages/extension/src/ui/features/accountNfts/NftScreen.tsx
+++ b/packages/extension/src/ui/features/accountNfts/NftScreen.tsx
@@ -1,6 +1,5 @@
-import { Address, NftItem, bigDecimal, getNftPicture } from "@argent/shared"
+import { NftItem, getNftPicture } from "@argent/shared"
 import {
-  B3,
   BarCloseButton,
   Button,
   CellStack,
@@ -18,38 +17,26 @@ import {
   Box,
   SimpleGrid,
 } from "@chakra-ui/react"
-import { FC, useCallback } from "react"
-import { useNavigate } from "react-router-dom"
+import { FC } from "react"
 
-import { routes } from "../../routes"
 import { TokenMenu } from "../accountTokens/TokenMenu"
 import { NftImage } from "./NftImage"
-import { ViewOnMenu } from "./ViewOnMenu"
 
-const { SendIcon } = icons
+const { SendIcon, ViewIcon } = icons
 
 interface NftScreenProps {
-  contractAddress: Address
-  networkId: string
-  tokenId: string
   nft: NftItem
+  onViewNft: () => void | Promise<void>
+  onSendNft: () => void | Promise<void>
 }
 
 export const NftScreen: FC<NftScreenProps> = ({
-  contractAddress,
-  networkId,
-  tokenId,
   nft,
+  onViewNft,
+  onSendNft,
 }) => {
-  const navigate = useNavigate()
-  const onClick = useCallback(() => {
-    navigate(
-      routes.sendRecipientScreen({
-        tokenAddress: contractAddress,
-        tokenId,
-      }),
-    )
-  }, [contractAddress, navigate, tokenId])
+  const description = nft.description ?? nft.collection?.description
+  const hasDescription = description?.length > 0
   return (
     <>
       <NavigationContainer
@@ -87,20 +74,23 @@ export const NftScreen: FC<NftScreenProps> = ({
           </H5>
         </>
 
-        <CellStack pb="18">
-          <Accordion allowToggle>
-            <AccordionItem>
-              <AccordionButton justifyContent="space-between">
-                <P4 color="neutrals.300">Description</P4> <AccordionIcon />
-              </AccordionButton>
-              <AccordionPanel>
-                {nft.description.length > 0
-                  ? nft.description
-                  : nft.collection?.description}
-              </AccordionPanel>
-            </AccordionItem>
-          </Accordion>
-        </CellStack>
+        {hasDescription && (
+          <CellStack pb="18">
+            <Accordion allowToggle>
+              <AccordionItem>
+                <AccordionButton justifyContent="space-between">
+                  <P4 color="neutrals.300">Description</P4> <AccordionIcon />
+                </AccordionButton>
+                <AccordionPanel>
+                  {nft.description.length > 0
+                    ? nft.description
+                    : nft.collection?.description}
+                </AccordionPanel>
+              </AccordionItem>
+            </Accordion>
+          </CellStack>
+        )}
+
         <SimpleGrid
           bg="neutrals.900"
           position="fixed"
@@ -114,20 +104,21 @@ export const NftScreen: FC<NftScreenProps> = ({
           borderTop="solid 1px"
           borderColor="neutrals.800"
         >
-          <ViewOnMenu
-            contractAddress={contractAddress}
-            tokenId={tokenId}
-            networkId={networkId}
-          />
           <Button
             w="100%"
-            type="button"
-            onClick={onClick}
+            size="sm"
+            onClick={onViewNft}
+            leftIcon={<ViewIcon />}
+          >
+            View
+          </Button>
+          <Button
+            w="100%"
+            size="sm"
+            onClick={onSendNft}
             leftIcon={<SendIcon />}
-            bg="neutrals.700"
-            _hover={{ bg: "neutrals.600" }}
           >
-            <B3>Send</B3>
+            Send
           </Button>
         </SimpleGrid>
       </NavigationContainer>
diff --git a/packages/extension/src/ui/features/accountNfts/NftScreenContainer.tsx b/packages/extension/src/ui/features/accountNfts/NftScreenContainer.tsx
index a7af6e2fe..d9bd197a4 100644
--- a/packages/extension/src/ui/features/accountNfts/NftScreenContainer.tsx
+++ b/packages/extension/src/ui/features/accountNfts/NftScreenContainer.tsx
@@ -1,22 +1,57 @@
-import { addressSchema } from "@argent/shared"
-import { BarBackButton, NavigationContainer } from "@argent/ui"
-import { FC } from "react"
+import { isAddress } from "@argent/shared"
+import { AlertDialog, BarBackButton, NavigationContainer } from "@argent/ui"
+import { FC, useState } from "react"
 import { Navigate, useNavigate, useParams } from "react-router-dom"
 
+import { nftService } from "../../../shared/nft"
 import { routes } from "../../routes"
 import { selectedAccountView } from "../../views/account"
 import { useView } from "../../views/implementation/react"
+import { useCurrentNetwork } from "../networks/hooks/useCurrentNetwork"
 import { NftScreen } from "./NftScreen"
 import { useRemoteNft } from "./useRemoteNft"
-import { useCurrentNetwork } from "../networks/hooks/useCurrentNetwork"
+import { useDisclosure } from "@chakra-ui/react"
+import { genericErrorSchema } from "../actions/feeEstimation/feeError"
 
 export const NftScreenContainer: FC = () => {
+  const { isOpen, onOpen, onClose } = useDisclosure()
+  const [message, setMessage] = useState("")
   const navigate = useNavigate()
   const { contractAddress, tokenId } = useParams()
   const account = useView(selectedAccountView)
   const network = useCurrentNetwork()
   const { data: nft } = useRemoteNft(contractAddress, tokenId, network.id)
 
+  const onViewNft = async () => {
+    if (!nft) {
+      return
+    }
+    try {
+      const url = await nftService.getNftMarketplaceUrl(nft, network.id)
+      window.open(url, "_blank")?.focus()
+    } catch (e) {
+      const genericError = genericErrorSchema.safeParse(e)
+      if (genericError.success) {
+        setMessage(genericError.data.message)
+      } else {
+        setMessage("Unable to view NFT")
+      }
+      onOpen()
+    }
+  }
+
+  const onSendNft = () => {
+    if (!isAddress(contractAddress)) {
+      return
+    }
+    navigate(
+      routes.sendRecipientScreen({
+        tokenAddress: contractAddress,
+        tokenId,
+      }),
+    )
+  }
+
   if (!account || !contractAddress || !tokenId) {
     return <Navigate to={routes.accounts()} />
   }
@@ -35,11 +70,14 @@ export const NftScreenContainer: FC = () => {
   }
 
   return (
-    <NftScreen
-      contractAddress={addressSchema.parse(contractAddress)}
-      networkId={account.networkId}
-      tokenId={tokenId}
-      nft={nft}
-    />
+    <>
+      <AlertDialog
+        isOpen={isOpen}
+        title={"Error"}
+        message={message}
+        onCancel={onClose}
+      />
+      <NftScreen nft={nft} onViewNft={onViewNft} onSendNft={onSendNft} />
+    </>
   )
 }
diff --git a/packages/extension/src/ui/features/accountNfts/ViewOnMenu.tsx b/packages/extension/src/ui/features/accountNfts/ViewOnMenu.tsx
deleted file mode 100644
index 481ac555c..000000000
--- a/packages/extension/src/ui/features/accountNfts/ViewOnMenu.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { B3, icons, logos } from "@argent/ui"
-import {
-  Button,
-  Flex,
-  Menu,
-  MenuButton,
-  MenuList,
-  useDisclosure,
-} from "@chakra-ui/react"
-import { FC, useRef } from "react"
-
-import { useOnClickOutside } from "../../services/useOnClickOutside"
-import { openNftOnFlex, openNftOnUnframed } from "@argent/shared"
-import { useIsMainnet } from "../networks/hooks/useIsMainnet"
-
-const { ViewIcon } = icons
-const { UnframedLogo, FlexLogo } = logos
-
-export interface TokenMenuProps {
-  contractAddress: string
-  networkId: string
-  tokenId: string
-}
-
-const ViewOnMenu: FC<TokenMenuProps> = ({
-  contractAddress,
-  networkId,
-  tokenId,
-}) => {
-  const { isOpen, onOpen, onClose } = useDisclosure()
-  const ref = useRef<HTMLDivElement>(null)
-  const isMainnet = useIsMainnet()
-
-  useOnClickOutside(ref, () => onClose())
-  return (
-    <>
-      <Menu isOpen={isOpen} onClose={onClose} matchWidth gutter={2} size="3xs">
-        <MenuButton
-          onMouseOver={onOpen}
-          aria-label="NFT actions"
-          padding="1.5"
-          fontSize="xl"
-          size="auto"
-          rounded="full"
-          w="100%"
-          as={Button}
-          bg="neutrals.700"
-          _hover={{ bg: "neutrals.600" }}
-          isDisabled={!isMainnet}
-        >
-          <Flex justifyContent="center" alignItems="center" gap="2">
-            <ViewIcon />
-            <B3>View on</B3>
-          </Flex>
-        </MenuButton>
-        <MenuList
-          bg="transparent"
-          boxShadow="none"
-          ref={ref}
-          onMouseLeave={onClose}
-          minW="0"
-        >
-          <Button
-            gap="2"
-            my="1"
-            w="100%"
-            onClick={() =>
-              openNftOnUnframed(contractAddress, tokenId, networkId)
-            }
-            bg="neutrals.700"
-            _hover={{ bg: "neutrals.600" }}
-          >
-            <UnframedLogo />
-            <B3>Unframed</B3>
-          </Button>
-          <Button
-            gap="2"
-            my="1"
-            w="100%"
-            onClick={() => openNftOnFlex(contractAddress, tokenId, networkId)}
-            bg="neutrals.700"
-            _hover={{ bg: "neutrals.600" }}
-          >
-            <FlexLogo />
-            <B3>Flex</B3>
-          </Button>
-        </MenuList>
-      </Menu>
-    </>
-  )
-}
-
-export { ViewOnMenu }
diff --git a/packages/extension/src/ui/features/accountTokens/AccountTokens.test.tsx b/packages/extension/src/ui/features/accountTokens/AccountTokens.test.tsx
index 664b6b4ca..074ab8df2 100644
--- a/packages/extension/src/ui/features/accountTokens/AccountTokens.test.tsx
+++ b/packages/extension/src/ui/features/accountTokens/AccountTokens.test.tsx
@@ -10,7 +10,10 @@ const mockProps = {
   account: getMockAccount({}),
   status: { text: "active", code: "CONNECTED" },
   onRedeploy: vi.fn(),
-  showDapplandBanner: true,
+  showAvnuBanner: false,
+  showEkuboBanner: true,
+  setAvnuBannerSeen: vi.fn(),
+  setEkuboBannerSeen: vi.fn(),
   showTokensAndBanners: true,
   setDappLandBannerSeen: vi.fn(),
   hasEscape: true,
@@ -40,7 +43,7 @@ describe("AccountTokens", () => {
       await screen.findByText("You can no longer use this account"),
     ).toBeInTheDocument()
   })
-  it("calls the setDappLandBannerSeen function when the DappLand banner is closed", async () => {
+  it("calls the setEkuboBannerSeen function when the ekubo banner is closed", async () => {
     const props = {
       ...mockProps,
       showTokensAndBanners: true,
@@ -52,10 +55,10 @@ describe("AccountTokens", () => {
       </BrowserRouter>,
     )
 
-    const closeButton = await screen.findByTestId("close-dappland-banner")
+    const closeButton = await screen.findByTestId("close-banner")
     await userEvent.click(closeButton)
 
-    expect(props.setDappLandBannerSeen).toHaveBeenCalled()
+    expect(props.setEkuboBannerSeen).toHaveBeenCalled()
   })
   it("renders the component with the account deprecated banner, when isDeprecated is true", async () => {
     const props = {
diff --git a/packages/extension/src/ui/features/accountTokens/AccountTokens.tsx b/packages/extension/src/ui/features/accountTokens/AccountTokens.tsx
index 36c40e609..06daf0f9d 100644
--- a/packages/extension/src/ui/features/accountTokens/AccountTokens.tsx
+++ b/packages/extension/src/ui/features/accountTokens/AccountTokens.tsx
@@ -1,5 +1,6 @@
-import { CellStack, DapplandBanner, Empty, icons } from "@argent/ui"
-import dapplandBanner from "@argent/ui/assets/dapplandBannerBackground.png"
+import { CellStack, Banner, Empty, icons } from "@argent/ui"
+import avnuBanner from "@argent/ui/assets/avnuBannerBackground.png"
+import ekuboBanner from "@argent/ui/assets/ekuboBannerBackground.png"
 import { Center, Flex, VStack } from "@chakra-ui/react"
 import { FC } from "react"
 
@@ -15,17 +16,20 @@ import { SaveRecoverySeedphraseBanner } from "./SaveRecoverySeedphraseBanner"
 import { TokenList } from "./TokenList"
 import { TokenListItemVariant } from "./TokenListItem"
 import { UpgradeBanner } from "./UpgradeBanner"
-import { AccountDeprecatedBanner } from "./AccountDeprecatedBanner"
+import { AccountDeprecatedBanner } from "./warning/AccountDeprecatedBanner"
+import { classHashSupportsTxV3 } from "../../../shared/network/txv3"
+import { AccountOwnerBanner } from "./warning/AccountOwnerBanner"
 
 const { MultisigIcon, WalletIcon } = icons
 
 export interface AccountTokensProps {
   account: Account
   showTokensAndBanners: boolean
-  showDapplandBanner: boolean
-  setDappLandBannerSeen: () => void
+  showEkuboBanner: boolean
+  showAvnuBanner: boolean
   hasEscape: boolean
   accountGuardianIsSelf: boolean | null
+  accountOwnerIsSelf?: boolean
   showUpgradeBanner: boolean
   showNoBalanceForUpgrade: boolean
   onUpgradeBannerClick?: () => void
@@ -33,18 +37,23 @@ export interface AccountTokensProps {
   multisig?: Multisig
   showAddFundsBackdrop?: boolean
   tokenListVariant?: TokenListItemVariant
-  feeTokenBalance?: bigint
+  hasFeeTokenBalance?: boolean
   showSaveRecoverySeedphraseBanner: boolean
   isDeprecated?: boolean
+  setEkuboBannerSeen: () => void
+  setAvnuBannerSeen: () => void
+  onAvnuClick?: () => void
+  returnTo?: string
 }
 
 export const AccountTokens: FC<AccountTokensProps> = ({
   account,
-  showDapplandBanner,
+  showEkuboBanner,
+  showAvnuBanner,
   showTokensAndBanners,
-  setDappLandBannerSeen,
   hasEscape,
   accountGuardianIsSelf,
+  accountOwnerIsSelf,
   showUpgradeBanner,
   showNoBalanceForUpgrade,
   onUpgradeBannerClick,
@@ -52,10 +61,16 @@ export const AccountTokens: FC<AccountTokensProps> = ({
   multisig,
   showAddFundsBackdrop,
   tokenListVariant,
-  feeTokenBalance,
+  hasFeeTokenBalance,
   showSaveRecoverySeedphraseBanner,
   isDeprecated = false,
+  setEkuboBannerSeen,
+  setAvnuBannerSeen,
+  onAvnuClick,
+  returnTo,
 }) => {
+  const supportsStrkAsFeeToken = classHashSupportsTxV3(account.classHash)
+  const feeTokenCurrency = supportsStrkAsFeeToken ? "ETH or STRK" : "ETH"
   return (
     <Flex direction={"column"} data-testid="account-tokens">
       <VStack spacing={6} mt={4} mb={6}>
@@ -67,11 +82,23 @@ export const AccountTokens: FC<AccountTokensProps> = ({
       </VStack>
       {showTokensAndBanners ? (
         <CellStack pt={0}>
-          {showDapplandBanner && (
-            <DapplandBanner
-              backgroundImageUrl={dapplandBanner}
-              href="https://www.dappland.com?utm_source=argent&utm_medium=extension&utm_content=banner"
-              onClose={setDappLandBannerSeen}
+          {showEkuboBanner && (
+            <Banner
+              backgroundImageUrl={ekuboBanner}
+              href="https://ekubo.org/"
+              onClose={setEkuboBannerSeen}
+              title="Provide liquidity on Ekubo"
+              subTitle="Starknet's most powerful AMM"
+              dark
+            />
+          )}
+          {showAvnuBanner && (
+            <Banner
+              backgroundImageUrl={avnuBanner}
+              title="Swap with AVNU"
+              subTitle="Get the best rate on Argent X"
+              onClose={setAvnuBannerSeen}
+              onClick={onAvnuClick}
             />
           )}
           {showSaveRecoverySeedphraseBanner && <SaveRecoverySeedphraseBanner />}
@@ -87,10 +114,13 @@ export const AccountTokens: FC<AccountTokensProps> = ({
           )}
           {isDeprecated && (
             <AccountDeprecatedBanner
-              to={routes.accountDeprecated()}
+              to={routes.accountDeprecated(returnTo)}
               state={{ from: location.pathname }}
             />
           )}
+          {!accountOwnerIsSelf && (
+            <AccountOwnerBanner to={routes.accountOwnerWarning(returnTo)} />
+          )}
           {showNoBalanceForUpgrade && !isDeprecated && (
             <UpgradeBanner
               canNotPay
@@ -101,7 +131,7 @@ export const AccountTokens: FC<AccountTokensProps> = ({
           {multisig && (
             <MultisigBanner
               multisig={multisig}
-              feeTokenBalance={feeTokenBalance}
+              hasFeeTokenBalance={hasFeeTokenBalance}
             />
           )}
           {showAddFundsBackdrop && (
@@ -111,8 +141,8 @@ export const AccountTokens: FC<AccountTokensProps> = ({
             >
               <Center textAlign={"center"}>
                 {multisig
-                  ? "You will need some ETH to activate the multisig account"
-                  : "You will need some ETH to use the account"}
+                  ? `You will need some ${feeTokenCurrency} to activate the multisig account`
+                  : `You will need some ${feeTokenCurrency} to use the account`}
               </Center>
             </Empty>
           )}
diff --git a/packages/extension/src/ui/features/accountTokens/AccountTokensButtonsContainer.tsx b/packages/extension/src/ui/features/accountTokens/AccountTokensButtonsContainer.tsx
index 45fb53e01..59c7b416c 100644
--- a/packages/extension/src/ui/features/accountTokens/AccountTokensButtonsContainer.tsx
+++ b/packages/extension/src/ui/features/accountTokens/AccountTokensButtonsContainer.tsx
@@ -13,8 +13,9 @@ import { useIsSignerInMultisig } from "../multisig/hooks/useIsSignerInMultisig"
 import { useMultisig } from "../multisig/multisig.state"
 import { useIsMainnet } from "../networks/hooks/useIsMainnet"
 import { AccountTokensButtons } from "./AccountTokensButtons"
-import { useNetworkFeeToken } from "./tokens.state"
 import { useAddFundsDialogSend } from "./useAddFundsDialog"
+import { useToken } from "./tokens.state"
+import { ETH_TOKEN_ADDRESS } from "../../../shared/network/constants"
 
 interface AccountTokensButtonsContainerProps {
   account: Account
@@ -29,7 +30,10 @@ export const AccountTokensButtonsContainer: FC<
   const multisig = useMultisig(account)
   const signerIsInMultisig = useIsSignerInMultisig(multisig)
   const isMainnet = useIsMainnet()
-  const sendToken = useNetworkFeeToken(switcherNetworkId)
+  const sendToken = useToken({
+    address: ETH_TOKEN_ADDRESS,
+    networkId: switcherNetworkId,
+  })
 
   const hasSavedRecoverySeedPhrase = useView(hasSavedRecoverySeedPhraseView)
 
diff --git a/packages/extension/src/ui/features/accountTokens/AccountTokensContainer.tsx b/packages/extension/src/ui/features/accountTokens/AccountTokensContainer.tsx
index 3a327185c..0deccd602 100644
--- a/packages/extension/src/ui/features/accountTokens/AccountTokensContainer.tsx
+++ b/packages/extension/src/ui/features/accountTokens/AccountTokensContainer.tsx
@@ -1,9 +1,9 @@
 import { FC, useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { useNavigate } from "react-router-dom"
 
-import { useKeyValueStorage } from "../../../shared/storage/hooks"
+import { useKeyValueStorage } from "../../hooks/useStorage"
 import { userReviewStore } from "../../../shared/userReview"
-import { routes } from "../../routes"
+import { routes, useCurrentPathnameWithQuery } from "../../routes"
 import { hasSavedRecoverySeedPhraseView } from "../../views/account"
 import { useView } from "../../views/implementation/react"
 import { Account } from "../accounts/Account"
@@ -19,11 +19,13 @@ import { useIsMainnet } from "../networks/hooks/useIsMainnet"
 import { accountHasEscape } from "../shield/escape/accountHasEscape"
 import { useAccountGuardianIsSelf } from "../shield/useAccountGuardian"
 import { AccountTokens } from "./AccountTokens"
-import { useDapplandBanner } from "./dappland/banner.state"
+import { hasSeenAvnuAtom, hasSeenEkuboAtom } from "./banner/banner.state"
 import { useCurrencyDisplayEnabled } from "./tokenPriceHooks"
 import { AddFundsDialogProvider } from "./useAddFundsDialog"
-import { useFeeTokenBalance } from "./useFeeTokenBalance"
+import { useHasFeeTokenBalance } from "./useFeeTokenBalance"
 import { clientAccountService } from "../../services/account"
+import { useAtom } from "jotai"
+import { useAccountOwnerIsSelf } from "../accounts/useAccountOwner"
 
 interface AccountTokensContainerProps {
   account: Account
@@ -33,8 +35,10 @@ export const AccountTokensContainer: FC<AccountTokensContainerProps> = ({
   account,
 }) => {
   const navigate = useNavigate()
+  const returnTo = useCurrentPathnameWithQuery()
   const { pendingTransactions } = useAccountTransactions(account)
-  const { hasSeenBanner } = useDapplandBanner()
+  const [hasSeenEkuboBanner, setHasSeenEkuboBanner] = useAtom(hasSeenEkuboAtom)
+  const [hasSeenAvnuBanner, setHasSeenAvnuBanner] = useAtom(hasSeenAvnuAtom)
   const currencyDisplayEnabled = useCurrencyDisplayEnabled()
   const transactionsBeforeReview = useKeyValueStorage(
     userReviewStore,
@@ -49,13 +53,17 @@ export const AccountTokensContainer: FC<AccountTokensContainerProps> = ({
 
   useEffect(() => {
     let timeoutId: ReturnType<typeof setTimeout>
-    if (!userHasReviewed && transactionsBeforeReview === 0) {
+    if (
+      !userHasReviewed &&
+      transactionsBeforeReview === 0 &&
+      !(window as any).PLAYWRIGHT
+    ) {
       timeoutId = setTimeout(() => navigate(routes.userReview()), 1000)
     }
     return () => timeoutId && clearTimeout(timeoutId)
   }, [navigate, transactionsBeforeReview, userHasReviewed])
 
-  const { feeTokenBalance } = useFeeTokenBalance(account)
+  const hasFeeTokenBalance = useHasFeeTokenBalance(account)
 
   const needsUpgrade = useCheckUpgradeAvailable(account)
   const multisig = useMultisig(account)
@@ -71,13 +79,13 @@ export const AccountTokensContainer: FC<AccountTokensContainerProps> = ({
   const showNoBalanceForUpgrade = Boolean(
     needsUpgrade &&
       !hasPendingTransactions &&
-      feeTokenBalance &&
-      !account.needsDeploy &&
-      feeTokenBalance <= 0n,
+      !hasFeeTokenBalance &&
+      !account.needsDeploy,
   )
 
   const hasEscape = accountHasEscape(account)
   const accountGuardianIsSelf = useAccountGuardianIsSelf(account)
+  const accountOwnerIsSelf = useAccountOwnerIsSelf(account)
 
   const signerIsInMultisig = useIsSignerInMultisig(multisig)
 
@@ -96,15 +104,10 @@ export const AccountTokensContainer: FC<AccountTokensContainerProps> = ({
   }, [hasSavedRecoverySeedPhrase, isMainnet])
 
   const showAddFundsBackdrop = useMemo(() => {
-    return (
-      !showSaveRecoverySeedphraseBanner &&
-      feeTokenBalance !== undefined &&
-      feeTokenBalance <= 0n
-    )
-  }, [feeTokenBalance, showSaveRecoverySeedphraseBanner])
-
-  const showDapplandBanner =
-    !hasSeenBanner &&
+    return !showSaveRecoverySeedphraseBanner && !hasFeeTokenBalance
+  }, [hasFeeTokenBalance, showSaveRecoverySeedphraseBanner])
+
+  const shouldShowDappBanner =
     !showAddFundsBackdrop &&
     !showSaveRecoverySeedphraseBanner &&
     !needsUpgrade &&
@@ -112,13 +115,18 @@ export const AccountTokensContainer: FC<AccountTokensContainerProps> = ({
     !hasEscape &&
     !multisig?.needsDeploy
 
-  const hadPendingTransactions = useRef(false)
+  const showAvnuBanner = !hasSeenAvnuBanner && shouldShowDappBanner
+  // Show Ekubo banner only after Avnu banner has been dismissed
+  const showEkuboBanner =
+    !hasSeenEkuboBanner && shouldShowDappBanner && hasSeenAvnuBanner
+  const setAvnuBannerSeen = useCallback(() => {
+    setHasSeenAvnuBanner(true)
+  }, [setHasSeenAvnuBanner])
+  const setEkuboBannerSeen = useCallback(() => {
+    setHasSeenEkuboBanner(true)
+  }, [setHasSeenEkuboBanner])
 
-  const setDappLandBannerSeen = useCallback(() => {
-    useDapplandBanner.setState({
-      hasSeenBanner: true,
-    })
-  }, [])
+  const hadPendingTransactions = useRef(false)
 
   useEffect(() => {
     if (hasPendingTransactions) {
@@ -141,15 +149,16 @@ export const AccountTokensContainer: FC<AccountTokensContainerProps> = ({
     setUpgradeLoading(false)
   }, [account, navigate, showNoBalanceForUpgrade])
 
+  const onAvnuClick = () => navigate(routes.swap())
+
   return (
     <AddFundsDialogProvider account={account}>
       <AccountTokens
         account={account}
         showTokensAndBanners={showTokensAndBanners}
-        showDapplandBanner={showDapplandBanner}
-        setDappLandBannerSeen={setDappLandBannerSeen}
         hasEscape={hasEscape}
         accountGuardianIsSelf={accountGuardianIsSelf}
+        accountOwnerIsSelf={accountOwnerIsSelf}
         showUpgradeBanner={showUpgradeBanner}
         showNoBalanceForUpgrade={showNoBalanceForUpgrade}
         onUpgradeBannerClick={() => void onUpgradeBannerClick()}
@@ -157,9 +166,15 @@ export const AccountTokensContainer: FC<AccountTokensContainerProps> = ({
         multisig={multisig}
         showAddFundsBackdrop={showAddFundsBackdrop}
         tokenListVariant={tokenListVariant}
-        feeTokenBalance={feeTokenBalance}
+        hasFeeTokenBalance={hasFeeTokenBalance}
         showSaveRecoverySeedphraseBanner={showSaveRecoverySeedphraseBanner}
         isDeprecated={isDeprecated}
+        showEkuboBanner={showEkuboBanner}
+        showAvnuBanner={showAvnuBanner}
+        setAvnuBannerSeen={setAvnuBannerSeen}
+        setEkuboBannerSeen={setEkuboBannerSeen}
+        onAvnuClick={onAvnuClick}
+        returnTo={returnTo}
       />
     </AddFundsDialogProvider>
   )
diff --git a/packages/extension/src/ui/features/accountTokens/AccountTokensHeader.tsx b/packages/extension/src/ui/features/accountTokens/AccountTokensHeader.tsx
index 8ae4e18d9..ce18c06e4 100644
--- a/packages/extension/src/ui/features/accountTokens/AccountTokensHeader.tsx
+++ b/packages/extension/src/ui/features/accountTokens/AccountTokensHeader.tsx
@@ -35,7 +35,7 @@ export const AccountTokensHeader: FC<AccountSubheaderProps> = ({
           borderRadius="base"
           mb="1.5"
         >
-          <B3 color="neutrals.200">
+          <B3 data-testid="confirmations" color="neutrals.200">
             {multisig.threshold}/{multisig.signers.length} multisig
           </B3>
         </Center>
diff --git a/packages/extension/src/ui/features/accountTokens/StarknetIdCopyButton.tsx b/packages/extension/src/ui/features/accountTokens/StarknetIdCopyButton.tsx
index 32e3686c4..867c2828d 100644
--- a/packages/extension/src/ui/features/accountTokens/StarknetIdCopyButton.tsx
+++ b/packages/extension/src/ui/features/accountTokens/StarknetIdCopyButton.tsx
@@ -1,12 +1,8 @@
+import { normalizeAddress, formatTruncatedAddress } from "@argent/shared"
 import { Button, CopyTooltip } from "@argent/ui"
 import { ButtonProps } from "@chakra-ui/react"
 import { FC } from "react"
 
-import {
-  formatTruncatedAddress,
-  normalizeAddress,
-} from "../../services/addresses"
-
 export interface StarknetIdCopyButtonProps extends ButtonProps {
   starknetId: string
   address: string
diff --git a/packages/extension/src/ui/features/accountTokens/TokenListItemContainer.tsx b/packages/extension/src/ui/features/accountTokens/TokenListItemContainer.tsx
index 00e854813..ebee6fc07 100644
--- a/packages/extension/src/ui/features/accountTokens/TokenListItemContainer.tsx
+++ b/packages/extension/src/ui/features/accountTokens/TokenListItemContainer.tsx
@@ -5,6 +5,8 @@ import { TokenListItem, TokenListItemProps } from "./TokenListItem"
 import { useTokenBalanceToCurrencyValue } from "./tokenPriceHooks"
 import { useTokenBalanceForAccount } from "./useTokenBalanceForAccount"
 import { Token } from "../../../shared/token/__new/types/token.model"
+import { hideTokensWithNoBalanceView } from "../../views/settings"
+import { useView } from "../../views/implementation/react"
 
 export interface TokenListItemContainerProps
   extends Omit<TokenListItemProps, "currencyValue"> {
@@ -26,9 +28,10 @@ export const TokenListItemContainer: FC<TokenListItemContainerProps> = ({
     account,
   })
   const currencyValue = useTokenBalanceToCurrencyValue(tokenWithBalance)
+  const hideTokensWithNoBalance = useView(hideTokensWithNoBalanceView)
   const shouldShow =
     token.showAlways ||
-    token.custom ||
+    !hideTokensWithNoBalance ||
     (tokenWithBalance?.balance && tokenWithBalance.balance > 0n)
   if (!shouldShow || tokenWithBalance === undefined) {
     return null
diff --git a/packages/extension/src/ui/features/accountTokens/TokenMenu.tsx b/packages/extension/src/ui/features/accountTokens/TokenMenu.tsx
index 991baf2e4..caf0bc742 100644
--- a/packages/extension/src/ui/features/accountTokens/TokenMenu.tsx
+++ b/packages/extension/src/ui/features/accountTokens/TokenMenu.tsx
@@ -6,12 +6,12 @@ import { useNavigate } from "react-router-dom"
 
 import { VisibilityOff } from "../../components/Icons/MuiIcons"
 import { routes } from "../../routes"
-import { normalizeAddress } from "../../services/addresses"
 import {
   openBlockExplorerAddress,
   useBlockExplorerTitle,
 } from "../../services/blockExplorer.service"
 import { useCurrentNetwork } from "../networks/hooks/useCurrentNetwork"
+import { normalizeAddress } from "@argent/shared"
 
 const { MoreIcon } = icons
 
diff --git a/packages/extension/src/ui/features/accountTokens/WarningRecoverySeedphraseBanner.tsx b/packages/extension/src/ui/features/accountTokens/WarningRecoverySeedphraseBanner.tsx
index 0723db41a..c8c898eb0 100644
--- a/packages/extension/src/ui/features/accountTokens/WarningRecoverySeedphraseBanner.tsx
+++ b/packages/extension/src/ui/features/accountTokens/WarningRecoverySeedphraseBanner.tsx
@@ -7,9 +7,7 @@ const { AlertFillIcon } = icons
 export const WarningRecoverySeedphraseBanner: FC = () => {
   return (
     <Flex
-      py={4}
-      mt={4}
-      px={4}
+      p={4}
       mb={2}
       direction={"column"}
       backgroundColor="error.900"
diff --git a/packages/extension/src/ui/features/accountTokens/banner/banner.state.ts b/packages/extension/src/ui/features/accountTokens/banner/banner.state.ts
new file mode 100644
index 000000000..5d8ab7c36
--- /dev/null
+++ b/packages/extension/src/ui/features/accountTokens/banner/banner.state.ts
@@ -0,0 +1,5 @@
+import { atomWithStorage } from "jotai/utils"
+
+export const hasSeenEkuboAtom = atomWithStorage("hasSeenEkubo", false)
+
+export const hasSeenAvnuAtom = atomWithStorage("hasSeenAvnu", false)
diff --git a/packages/extension/src/ui/features/accountTokens/dappland/banner.state.ts b/packages/extension/src/ui/features/accountTokens/dappland/banner.state.ts
deleted file mode 100644
index f1f13e0a2..000000000
--- a/packages/extension/src/ui/features/accountTokens/dappland/banner.state.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { create } from "zustand"
-import { persist } from "zustand/middleware"
-
-export interface DapplandBannerState {
-  hasSeenBanner: boolean
-}
-
-export const useDapplandBanner = create<DapplandBannerState>()(
-  persist(
-    (_set, _get) => ({
-      hasSeenBanner: false,
-    }),
-    { name: "hasSeenDapplandBanner" },
-  ),
-)
diff --git a/packages/extension/src/ui/features/accountTokens/tokenPriceHooks.ts b/packages/extension/src/ui/features/accountTokens/tokenPriceHooks.ts
index 858fcf677..bc5121d08 100644
--- a/packages/extension/src/ui/features/accountTokens/tokenPriceHooks.ts
+++ b/packages/extension/src/ui/features/accountTokens/tokenPriceHooks.ts
@@ -1,5 +1,4 @@
 import { isAddress } from "@argent/shared"
-import { Token as SwapToken } from "@argent/x-swap"
 import { useMemo } from "react"
 
 import {
@@ -95,7 +94,7 @@ export const usePriceAndTokenData = ARGENT_API_ENABLED
 /** @returns individual price details for the token */
 
 export const useTokenPriceDetails = (
-  token?: Token | TokenWithOptionalBigIntBalance | SwapToken,
+  token?: Token | TokenWithOptionalBigIntBalance,
   usePriceAndTokenDataImpl = usePriceAndTokenData,
 ) => {
   const { pricesData, tokenData } = usePriceAndTokenDataImpl()
@@ -121,7 +120,7 @@ export const useTokenPriceDetails = (
  */
 
 export const useTokenUnitAmountToCurrencyValue = (
-  token?: Token | TokenWithOptionalBigIntBalance | SwapToken,
+  token?: Token | TokenWithOptionalBigIntBalance,
   unitAmount?: BigNumberish,
   usePriceAndTokenDataImpl = usePriceAndTokenData,
 ) => {
@@ -143,7 +142,7 @@ export const useTokenUnitAmountToCurrencyValue = (
  */
 
 export const useTokenAmountToCurrencyValue = (
-  token?: Token | TokenWithOptionalBigIntBalance | SwapToken,
+  token?: Token | TokenWithOptionalBigIntBalance,
   amount?: BigNumberish,
   usePriceAndTokenDataImpl = usePriceAndTokenData,
 ) => {
diff --git a/packages/extension/src/ui/features/accountTokens/tokens.state.ts b/packages/extension/src/ui/features/accountTokens/tokens.state.ts
index ad9469fb3..b441b3aaa 100644
--- a/packages/extension/src/ui/features/accountTokens/tokens.state.ts
+++ b/packages/extension/src/ui/features/accountTokens/tokens.state.ts
@@ -6,45 +6,47 @@ import { useView } from "../../views/implementation/react"
 import {
   allTokensOnNetworkFamily,
   allTokensView,
-  networkFeeTokenOnNetworkFamily,
+  networkFeeTokensOnNetworkFamily,
   tokenFindFamily,
 } from "../../views/token"
 import { useAccount } from "../accounts/accounts.state"
 import { BaseToken, Token } from "../../../shared/token/__new/types/token.model"
 import { tokenBalanceForAccountView } from "../../views/tokenBalances"
-import { tokenRepo } from "../../../shared/token/__new/repository/token"
-import { networkRepo } from "../../../shared/network/store"
-import { isEqualAddress } from "@argent/shared"
+import { Address, isEqualAddress } from "@argent/shared"
+import { useCurrentNetwork } from "../networks/hooks/useCurrentNetwork"
+import { useAppState } from "../../app.state"
 import { accountsEqual } from "../../../shared/utils/accountsEqual"
 
-export async function getNetworkFeeToken(networkId?: string) {
-  if (!networkId) {
-    return null
-  }
-  const [network] = await networkRepo.get((n) => n.id === networkId)
-  if (!network) {
-    return null
-  }
-  const [feeToken] = await tokenRepo.get(
-    (token) =>
-      token.address === network.feeTokenAddress &&
-      token.networkId === network.id,
-  )
-  return feeToken ?? null
-}
-
-export const useNetworkFeeToken = (networkId?: string) => {
-  const feeToken = useView(networkFeeTokenOnNetworkFamily(networkId))
-  return feeToken
+export const useNetworkFeeTokens = (networkId?: string) => {
+  const feeTokens = useView(networkFeeTokensOnNetworkFamily(networkId))
+  return feeTokens
 }
 
 export const useTokensInNetwork = (networkId: string) =>
   useView(allTokensOnNetworkFamily(networkId))
 
+export const useTokensInCurrentNetwork = () => {
+  const currentNetwork = useCurrentNetwork()
+  return useTokensInNetwork(currentNetwork?.id ?? "")
+}
+
+export const useTradableTokensInCurrentNetwork = () => {
+  const tokens = useTokensInCurrentNetwork()
+  return useMemo(() => tokens.filter((token) => token.tradable), [tokens])
+}
+
 export const useToken = (baseToken?: BaseToken): Token | undefined => {
   return useView(tokenFindFamily(baseToken))
 }
 
+export const useTokenOnCurrentNetworkByAddress = (address?: Address) => {
+  const { switcherNetworkId } = useAppState()
+  const baseToken = address
+    ? { address, networkId: switcherNetworkId }
+    : undefined
+  return useView(tokenFindFamily(baseToken))
+}
+
 export type TokensRecord = Record<string, Token>
 
 export const useTokensRecord = ({ cleanHex = false }) => {
@@ -96,3 +98,16 @@ export const useTokensWithBalance = (account?: BaseWalletAccount) => {
       )
   }, [tokensInNetwork, accountBalances])
 }
+
+export const useTokenBalance = (
+  tokenAddress?: Address,
+  account?: BaseWalletAccount,
+) => {
+  const balances = useTokensWithBalance(account)
+
+  return useMemo(() => {
+    return balances.find((balance) =>
+      isEqualAddress(balance.address, tokenAddress),
+    )
+  }, [balances, tokenAddress])
+}
diff --git a/packages/extension/src/ui/features/accountTokens/useAddFundsDialog.tsx b/packages/extension/src/ui/features/accountTokens/useAddFundsDialog.tsx
index 193a103df..6e95f291b 100644
--- a/packages/extension/src/ui/features/accountTokens/useAddFundsDialog.tsx
+++ b/packages/extension/src/ui/features/accountTokens/useAddFundsDialog.tsx
@@ -16,6 +16,7 @@ import { Account } from "../accounts/Account"
 import { SendQuery, isSendQuery } from "../send/schema"
 import { useTokensWithBalance } from "./tokens.state"
 import { useAccountIsDeployed } from "./useAccountStatus"
+import { ETH_TOKEN_ADDRESS } from "../../../shared/network/constants"
 
 interface AddFundsDialogContextProps {
   onSend: (queryOrTo?: SendQuery | To) => void
@@ -68,6 +69,7 @@ export const AddFundsDialogProvider: FC<AddFundsDialogProviderProps> = ({
           navigate(
             routes.sendRecipientScreen({
               returnTo,
+              tokenAddress: ETH_TOKEN_ADDRESS,
             }),
           )
         }
diff --git a/packages/extension/src/ui/features/accountTokens/useDisplayTokenAmountAndCurrencyValue.tsx b/packages/extension/src/ui/features/accountTokens/useDisplayTokenAmountAndCurrencyValue.tsx
index f4fb85244..cdb81e86b 100644
--- a/packages/extension/src/ui/features/accountTokens/useDisplayTokenAmountAndCurrencyValue.tsx
+++ b/packages/extension/src/ui/features/accountTokens/useDisplayTokenAmountAndCurrencyValue.tsx
@@ -6,9 +6,9 @@ import {
   prettifyTokenAmount,
 } from "../../../shared/token/price"
 import { useAppState } from "../../app.state"
-import { isEqualAddress } from "../../services/addresses"
 import { useTokenAmountToCurrencyValue } from "./tokenPriceHooks"
 import { useTokensInNetwork } from "./tokens.state"
+import { isEqualAddress } from "@argent/shared"
 
 export interface IUseDisplayTokenAmountAndCurrencyValue {
   amount: BigNumberish
diff --git a/packages/extension/src/ui/features/accountTokens/useFeeTokenBalance.test.ts b/packages/extension/src/ui/features/accountTokens/useFeeTokenBalance.test.ts
new file mode 100644
index 000000000..aecaf914e
--- /dev/null
+++ b/packages/extension/src/ui/features/accountTokens/useFeeTokenBalance.test.ts
@@ -0,0 +1,72 @@
+import { describe, it, expect } from "vitest"
+import { pickBestFeeToken } from "./useFeeTokenBalance" // Adjust the import as necessary
+import { BaseTokenWithBalance } from "../../../shared/token/__new/types/tokenBalance.model"
+import { Address } from "@argent/shared"
+
+function getMockToken(options: {
+  address: Address
+  balance: string
+}): BaseTokenWithBalance {
+  return {
+    account: { address: "0x0", networkId: "localhost" },
+    address: options.address,
+    balance: options.balance,
+    networkId: "localhost",
+  }
+}
+const mockTokens: BaseTokenWithBalance[] = [
+  getMockToken({ address: "0x1", balance: "0" }),
+  getMockToken({ address: "0x2", balance: "10" }),
+  getMockToken({ address: "0x3", balance: "0" }),
+  getMockToken({ address: "0x4", balance: "0" }),
+  getMockToken({ address: "0x5", balance: "0" }),
+  getMockToken({ address: "0x6", balance: "12" }),
+  getMockToken({ address: "0x7", balance: "10" }),
+  getMockToken({ address: "0x8", balance: "0" }),
+]
+
+describe("pickBestFeeToken", () => {
+  it("should return the token with the highest balance", () => {
+    const result = pickBestFeeToken(mockTokens)
+    expect(result).toEqual(mockTokens[5])
+  })
+
+  it("should return the first token if all balances are 0", () => {
+    const zeroBalanceTokens = mockTokens.map((token) => ({
+      ...token,
+      balance: "0",
+    }))
+    const result = pickBestFeeToken(zeroBalanceTokens)
+    expect(result).toEqual(zeroBalanceTokens[0])
+  })
+
+  it("should prefer tokens in the 'prefer' list", () => {
+    const result = pickBestFeeToken(mockTokens, { prefer: ["0x2", "0x7"] })
+    expect(result).toEqual(mockTokens[1])
+  })
+
+  it("should avoid tokens in the 'avoid' list", () => {
+    const result = pickBestFeeToken(mockTokens, { avoid: ["0x6"] })
+    expect(result).toEqual(mockTokens[1])
+  })
+
+  it("should prefer tokens in the 'prefer' list even if they have a lower balance", () => {
+    const result = pickBestFeeToken(mockTokens, { prefer: ["0x2", "0x7"] })
+    expect(result).toEqual(mockTokens[1])
+  })
+
+  it("should return a token even if no token has a balance", () => {
+    const result = pickBestFeeToken(
+      mockTokens.filter((token) => token.balance === "0"),
+    )
+    expect(result).toEqual(mockTokens[0])
+  })
+
+  it("should return a token even if no token has a balance and there are tokens in the 'prefer' list", () => {
+    const result = pickBestFeeToken(
+      mockTokens.filter((token) => token.balance === "0"),
+      { prefer: ["0x2", "0x7"] },
+    )
+    expect(result).toEqual(mockTokens[0])
+  })
+})
diff --git a/packages/extension/src/ui/features/accountTokens/useFeeTokenBalance.ts b/packages/extension/src/ui/features/accountTokens/useFeeTokenBalance.ts
index c38718098..df46050a4 100644
--- a/packages/extension/src/ui/features/accountTokens/useFeeTokenBalance.ts
+++ b/packages/extension/src/ui/features/accountTokens/useFeeTokenBalance.ts
@@ -1,16 +1,79 @@
-import { feeTokenBalanceView } from "./../../views/tokenBalances"
+import { feeTokenBalancesView } from "./../../views/tokenBalances"
 import { Account } from "../accounts/Account"
 import { useView } from "../../views/implementation/react"
+import { Address } from "@argent/shared"
+import { BaseTokenWithBalance } from "../../../shared/token/__new/types/tokenBalance.model"
+import { num } from "starknet"
 
-export const useFeeTokenBalance = (
+export const useFeeTokenBalances = (
   account?: Pick<Account, "address" | "networkId">,
 ) => {
-  const feeTokenBalance = useView(feeTokenBalanceView(account))
-  return {
-    feeTokenBalance: feeTokenBalance?.balance
-      ? BigInt(feeTokenBalance.balance)
-      : undefined,
-    feeTokenBalanceError: undefined,
-    feeTokenBalanceValidating: false,
-  }
+  const feeTokenBalances = useView(feeTokenBalancesView(account))
+  const numberFeeTokenBalances = feeTokenBalances?.map((balance) => ({
+    ...balance,
+    amount: BigInt(balance.balance),
+  }))
+  return numberFeeTokenBalances ?? []
+}
+
+export const useHasFeeTokenBalance = (
+  account?: Pick<Account, "address" | "networkId">,
+) => {
+  const feeTokenBalances = useFeeTokenBalances(account)
+  return feeTokenBalances.some((balance) => balance.amount > 0n)
+}
+
+interface PickBestFeeTokenOptions {
+  avoid?: Address[]
+  prefer?: Address[]
+}
+
+export const pickBestFeeToken = (
+  balances: BaseTokenWithBalance[],
+  { avoid = [], prefer = [] }: PickBestFeeTokenOptions = {},
+) => {
+  // sort by prefered tokens, neutral tokens, then avoid tokens
+  // sort each group by the provided array order and secondarily by balance
+  const sortedBalances = balances
+    .map(
+      (balance) =>
+        [
+          balance,
+          {
+            balance: num.toBigInt(balance.balance),
+            prefer: prefer.includes(balance.address),
+            avoid: avoid.includes(balance.address),
+          },
+        ] as const,
+    )
+    .sort(([aa, a], [bb, b]) => {
+      if (a.prefer && !b.prefer) {
+        return -1
+      }
+      if (!a.prefer && b.prefer) {
+        return 1
+      }
+      if (a.prefer && b.prefer) {
+        return Number(prefer.indexOf(aa.address) - prefer.indexOf(bb.address))
+      }
+      if (a.avoid && !b.avoid) {
+        return 1
+      }
+      if (!a.avoid && b.avoid) {
+        return -1
+      }
+      if (a.avoid && b.avoid) {
+        return Number(avoid.indexOf(bb.address) - avoid.indexOf(aa.address))
+      }
+      return Number(b.balance - a.balance)
+    })
+    .map(([balance]) => balance)
+
+  // filter tokens with 0 balance out
+  const filteredBalances = sortedBalances.filter(
+    (balance) => num.toBigInt(balance.balance) > 0n,
+  )
+
+  // return the first token with a balance or the first token if all balances are 0
+  return filteredBalances[0] ?? sortedBalances[0]
 }
diff --git a/packages/extension/src/ui/features/accountTokens/useLiveTokenBalanceForAccount.ts b/packages/extension/src/ui/features/accountTokens/useLiveTokenBalanceForAccount.ts
index 57714bb31..4534cbd93 100644
--- a/packages/extension/src/ui/features/accountTokens/useLiveTokenBalanceForAccount.ts
+++ b/packages/extension/src/ui/features/accountTokens/useLiveTokenBalanceForAccount.ts
@@ -1,4 +1,4 @@
-import { addressSchema } from "@argent/shared"
+import { addressSchema, isEqualAddress } from "@argent/shared"
 import { get } from "lodash-es"
 import { useEffect, useMemo, useRef } from "react"
 import useSWR, { SWRConfiguration } from "swr"
@@ -7,7 +7,7 @@ import { IS_DEV } from "../../../shared/utils/dev"
 import { coerceErrorToString } from "../../../shared/utils/error"
 import { isNumeric } from "../../../shared/utils/number"
 import { getAccountIdentifier } from "../../../shared/wallet.service"
-import { isEqualAddress } from "../../services/addresses"
+
 import { tokenService } from "../../services/tokens"
 import { Account } from "../accounts/Account"
 import { useAccountTransactions } from "../accounts/accountTransactions.state"
diff --git a/packages/extension/src/ui/features/accountTokens/useMaxFeeForTransfer.ts b/packages/extension/src/ui/features/accountTokens/useMaxFeeForTransfer.ts
index 660d55f03..f832fc787 100644
--- a/packages/extension/src/ui/features/accountTokens/useMaxFeeForTransfer.ts
+++ b/packages/extension/src/ui/features/accountTokens/useMaxFeeForTransfer.ts
@@ -1,52 +1,44 @@
-import { Call, CallData, num, stark, uint256 } from "starknet"
+import { Call, CallData, num, uint256 } from "starknet"
 import useSWR from "swr"
 
 import { getAccountIdentifier } from "../../../shared/wallet.service"
 import {
-  getEstimatedFeeFromSequencer,
+  getEstimatedFee,
   getSimulationEstimatedFee,
 } from "../../services/backgroundTransactions"
 import { Account } from "../accounts/Account"
-import { useNetworkFeeToken } from "./tokens.state"
 import {
+  Hex,
+  isEqualAddress,
   swrRefetchDisabledConfig,
   transferCalldataSchema,
 } from "@argent/shared"
-
-const { estimatedFeeToMaxFee: addOverheadToFee } = stark
+import { estimatedFeesToMaxFeeTotal } from "../../../shared/transactionSimulation/utils"
 
 export const useMaxFeeEstimateForTransfer = (
+  feeTokenAddress?: string,
   tokenAddress?: string,
   balance?: bigint,
   account?: Pick<Account, "address" | "networkId" | "needsDeploy">,
-): {
-  maxFee?: string
-  error?: any
-  loading: boolean
-} => {
+) => {
   const key =
-    account && balance && tokenAddress
-      ? [getAccountIdentifier(account), "maxEthTransferEstimate"]
+    account && balance !== undefined && tokenAddress
+      ? [getAccountIdentifier(account), "maxFeeEstimateForTransfer"]
       : null
 
-  const feeToken = useNetworkFeeToken(account?.networkId)
-
-  const {
-    data: estimatedFee,
-    error,
-    isValidating,
-  } = useSWR(
+  return useSWR<Hex | undefined>(
     key,
     async () => {
-      if (!account || !balance || !tokenAddress) {
+      if (
+        !account ||
+        balance === undefined ||
+        !tokenAddress ||
+        !feeTokenAddress
+      ) {
         return
       }
-
-      if (feeToken?.address !== tokenAddress) {
-        return {
-          amount: "0",
-          suggestedMaxFee: "0",
-        }
+      if (!isEqualAddress(tokenAddress, feeTokenAddress)) {
+        return "0x0" as Hex
       }
 
       const call: Call = {
@@ -55,48 +47,20 @@ export const useMaxFeeEstimateForTransfer = (
         calldata: CallData.compile(
           transferCalldataSchema.parse({
             // We are using a dummy address (ETH here) as recipient to estimate the fee given we don't have a receipient yet
-            recipient: feeToken.address,
+            recipient: feeTokenAddress,
             // We are using the smallest possible amount to make sure this doesn't throw an error
             amount: uint256.bnToUint256(BigInt(1)),
           }),
         ),
       }
 
-      const estimatedFeeFromSimulation = await getSimulationEstimatedFee(call)
-      if (!estimatedFeeFromSimulation) {
-        const estimatedFeeFromSequencer = await getEstimatedFeeFromSequencer(
-          call,
-        )
+      const estimatedFee =
+        (await getSimulationEstimatedFee(call)) ??
+        (await getEstimatedFee(call, account, feeTokenAddress))
 
-        return estimatedFeeFromSequencer
-      }
-
-      return estimatedFeeFromSimulation
+      const maxFeeTotal = estimatedFeesToMaxFeeTotal(estimatedFee)
+      return num.toHex(maxFeeTotal) as Hex
     },
     swrRefetchDisabledConfig,
   )
-
-  if (error) {
-    return { maxFee: undefined, error, loading: isValidating }
-  }
-
-  // Add Overhead to estimatedFee
-  if (estimatedFee && account) {
-    const { suggestedMaxFee, maxADFee } = estimatedFee
-
-    const totalMaxFee =
-      account.needsDeploy && maxADFee
-        ? num.toHex(num.toBigInt(maxADFee) + num.toBigInt(suggestedMaxFee))
-        : suggestedMaxFee
-
-    const maxFee = addOverheadToFee(totalMaxFee, 0.2)
-
-    return {
-      maxFee: num.toHex(maxFee),
-      error: undefined,
-      loading: isValidating,
-    }
-  }
-
-  return { maxFee: undefined, error: undefined, loading: isValidating }
 }
diff --git a/packages/extension/src/ui/features/accountTokens/useTransactionStatus.ts b/packages/extension/src/ui/features/accountTokens/useTransactionStatus.ts
index 37f16d6be..d48a32e44 100644
--- a/packages/extension/src/ui/features/accountTokens/useTransactionStatus.ts
+++ b/packages/extension/src/ui/features/accountTokens/useTransactionStatus.ts
@@ -1,14 +1,15 @@
 import { memoize } from "lodash-es"
 import { useMemo } from "react"
 
-import { transactionsStore } from "../../../background/transactions/store"
-import { useArrayStorage } from "../../../shared/storage/hooks"
+import { transactionsStore } from "../../../shared/transactions/store"
+import { useArrayStorage } from "../../hooks/useStorage"
 import {
-  ExtendedTransactionStatus,
+  ExtendedFinalityStatus,
   Transaction,
 } from "../../../shared/transactions"
+import { getTransactionStatus } from "../../../shared/transactions/utils"
 
-function transformStatus(status: ExtendedTransactionStatus): Status {
+function transformStatus(status: ExtendedFinalityStatus): Status {
   return ["ACCEPTED_ON_L1", "ACCEPTED_ON_L2", "PENDING"].includes(status)
     ? "SUCCESS"
     : ["REJECTED", "REVERTED"].includes(status)
@@ -36,9 +37,11 @@ export const useTransactionStatus = (
   )
 
   return useMemo(() => {
-    if (!transaction?.finalityStatus) {
+    const { finality_status } = getTransactionStatus(transaction)
+
+    if (!finality_status) {
       return "UNKNOWN"
     }
-    return transformStatus(transaction.finalityStatus)
+    return transformStatus(finality_status)
   }, [transaction])
 }
diff --git a/packages/extension/src/ui/features/accountTokens/AccountDeprecatedBanner.tsx b/packages/extension/src/ui/features/accountTokens/warning/AccountDeprecatedBanner.tsx
similarity index 92%
rename from packages/extension/src/ui/features/accountTokens/AccountDeprecatedBanner.tsx
rename to packages/extension/src/ui/features/accountTokens/warning/AccountDeprecatedBanner.tsx
index 9925fe450..d52f8f56f 100644
--- a/packages/extension/src/ui/features/accountTokens/AccountDeprecatedBanner.tsx
+++ b/packages/extension/src/ui/features/accountTokens/warning/AccountDeprecatedBanner.tsx
@@ -1,7 +1,7 @@
 import { AlertButton, icons } from "@argent/ui"
 import { FC } from "react"
 import { To, useNavigate } from "react-router-dom"
-import { BannerRouteState } from "./UpgradeBanner"
+import { BannerRouteState } from "../UpgradeBanner"
 
 const { AlertIcon } = icons
 
diff --git a/packages/extension/src/ui/features/accountTokens/warning/AccountDeprecatedModal.tsx b/packages/extension/src/ui/features/accountTokens/warning/AccountDeprecatedModal.tsx
new file mode 100644
index 000000000..671306c76
--- /dev/null
+++ b/packages/extension/src/ui/features/accountTokens/warning/AccountDeprecatedModal.tsx
@@ -0,0 +1,52 @@
+import {
+  icons,
+  Button,
+  NavigationContainer,
+  BarCloseButton,
+  Warning,
+} from "@argent/ui"
+import { Flex } from "@chakra-ui/react"
+import { useNavigate } from "react-router-dom"
+import { routes, useCurrentPathnameWithQuery } from "../../../routes"
+import { useAppState } from "../../../app.state"
+import { useNavigateReturnToOrBack } from "../../../hooks/useNavigateReturnTo"
+
+const { ExpandIcon } = icons
+
+export const AccountDeprecatedModal = () => {
+  const onBack = useNavigateReturnToOrBack()
+  const returnTo = useCurrentPathnameWithQuery()
+  const { switcherNetworkId } = useAppState()
+  const navigate = useNavigate()
+  const navigateToHiddenAccounts = () => {
+    navigate(routes.accountsHidden(switcherNetworkId, returnTo))
+  }
+  return (
+    <NavigationContainer
+      isAbsolute
+      rightButton={<BarCloseButton onClick={onBack} />}
+    >
+      <Flex py={4} px={5} direction="column" flex={1}>
+        <Warning
+          title="Account deprecated"
+          subtitle="This is a deprecated account that can’t be upgraded or used any longer. Please contact StarkNet for more information"
+        >
+          <Button
+            as={"a"}
+            size={"sm"}
+            colorScheme={"transparent"}
+            color="text.secondary"
+            rightIcon={<ExpandIcon />}
+            href="https://starknet.io/discord/"
+            target="_blank"
+          >
+            StarkNet discord
+          </Button>
+        </Warning>
+        <Button onClick={navigateToHiddenAccounts} colorScheme="primary">
+          Hide account
+        </Button>
+      </Flex>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/accountTokens/warning/AccountOwnerBanner.tsx b/packages/extension/src/ui/features/accountTokens/warning/AccountOwnerBanner.tsx
new file mode 100644
index 000000000..d51b2a92b
--- /dev/null
+++ b/packages/extension/src/ui/features/accountTokens/warning/AccountOwnerBanner.tsx
@@ -0,0 +1,22 @@
+import { AlertButton, icons } from "@argent/ui"
+import { FC } from "react"
+import { LinkProps, useNavigate } from "react-router-dom"
+
+const { AlertIcon } = icons
+
+export interface AccountOwnerBannerProps extends LinkProps {}
+
+export const AccountOwnerBanner: FC<AccountOwnerBannerProps> = ({ to }) => {
+  const navigate = useNavigate()
+  return (
+    <AlertButton
+      colorScheme="warn-high"
+      title="Can’t access account"
+      description="Click to learn more"
+      size="lg"
+      icon={<AlertIcon />}
+      bg="primaryExtraDark.500"
+      onClick={() => navigate(to)}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/accountTokens/warning/AccountOwnerWarningScreen.tsx b/packages/extension/src/ui/features/accountTokens/warning/AccountOwnerWarningScreen.tsx
new file mode 100644
index 000000000..64ea95ddb
--- /dev/null
+++ b/packages/extension/src/ui/features/accountTokens/warning/AccountOwnerWarningScreen.tsx
@@ -0,0 +1,52 @@
+import {
+  icons,
+  Button,
+  NavigationContainer,
+  BarCloseButton,
+  Warning,
+} from "@argent/ui"
+import { Flex } from "@chakra-ui/react"
+import { useNavigate } from "react-router-dom"
+import { routes, useCurrentPathnameWithQuery } from "../../../routes"
+import { useAppState } from "../../../app.state"
+import { useNavigateReturnToOrBack } from "../../../hooks/useNavigateReturnTo"
+
+const { ExpandIcon } = icons
+
+export const AccountOwnerWarningScreen = () => {
+  const onBack = useNavigateReturnToOrBack()
+  const returnTo = useCurrentPathnameWithQuery()
+  const { switcherNetworkId } = useAppState()
+  const navigate = useNavigate()
+  const navigateToHiddenAccounts = () => {
+    navigate(routes.accountsHidden(switcherNetworkId, returnTo))
+  }
+  return (
+    <NavigationContainer
+      isAbsolute
+      rightButton={<BarCloseButton onClick={onBack} />}
+    >
+      <Flex py={4} px={5} direction="column" flex={1}>
+        <Warning
+          title="Can’t access account"
+          subtitle="You can not access this account. It can not be used any longer. Please contact Argent Support for further help."
+        >
+          <Button
+            as={"a"}
+            size={"sm"}
+            colorScheme={"transparent"}
+            color="text.secondary"
+            rightIcon={<ExpandIcon />}
+            href="https://support.argent.xyz/hc/en-us/categories/5767453283473-Argent-X"
+            target="_blank"
+          >
+            Contact Argent
+          </Button>
+        </Warning>
+        <Button onClick={navigateToHiddenAccounts} colorScheme="primary">
+          Hide account
+        </Button>
+      </Flex>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/accounts/AccountDeprecatedModal.tsx b/packages/extension/src/ui/features/accounts/AccountDeprecatedModal.tsx
deleted file mode 100644
index 0cf78284c..000000000
--- a/packages/extension/src/ui/features/accounts/AccountDeprecatedModal.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import {
-  icons,
-  Button,
-  NavigationContainer,
-  H3,
-  BarCloseButton,
-  P3,
-  B3,
-} from "@argent/ui"
-import { Box, Circle, Flex, Text } from "@chakra-ui/react"
-import { useNavigate } from "react-router-dom"
-import { routes } from "../../routes"
-import { useAppState } from "../../app.state"
-
-const { AlertIcon, ExpandIcon } = icons
-
-export const AccountDeprecatedModal = () => {
-  const { switcherNetworkId } = useAppState()
-  const navigate = useNavigate()
-  const navigateToHiddenAccounts = () => {
-    navigate(routes.accountsHidden(switcherNetworkId))
-  }
-
-  return (
-    <NavigationContainer rightButton={<BarCloseButton />}>
-      <Flex
-        py={4}
-        px={5}
-        direction="column"
-        justifyContent="space-between"
-        alignContent="center"
-        borderRadius="2xl"
-        width="full"
-        height="full"
-      >
-        <Box>
-          <Circle
-            size={24}
-            bg="primaryExtraDark.500"
-            color="primary.500"
-            my={2}
-            mx="auto"
-          >
-            <AlertIcon fontSize={40} />
-          </Circle>
-          <Flex my={2} alignItems="center" mb={8} direction="column">
-            <H3 color={"white"} mb={3}>
-              Account deprecated
-            </H3>
-
-            <P3 color="neutrals.200" textAlign="center">
-              This is a deprecated account that can’t be upgraded or used any
-              longer. Please contact StarkNet for more information
-            </P3>
-          </Flex>
-          <B3
-            display="flex"
-            color="neutrals.400"
-            alignItems="center"
-            justifyContent="center"
-            as="a"
-            href="https://starknet.io/discord/"
-            title="StarkNet discord"
-            target="_blank"
-            _hover={{
-              textDecoration: "underline",
-            }}
-          >
-            Contact StarkNet
-            <Text ml="1">
-              <ExpandIcon />
-            </Text>
-          </B3>
-        </Box>
-        <Button onClick={navigateToHiddenAccounts} colorScheme="primary" px={2}>
-          Hide account
-        </Button>
-      </Flex>
-    </NavigationContainer>
-  )
-}
diff --git a/packages/extension/src/ui/features/accounts/AccountListItem.tsx b/packages/extension/src/ui/features/accounts/AccountListItem.tsx
index 28e230454..50dc1667b 100644
--- a/packages/extension/src/ui/features/accounts/AccountListItem.tsx
+++ b/packages/extension/src/ui/features/accounts/AccountListItem.tsx
@@ -1,4 +1,8 @@
-import { addressSchema, isStarknetDomainName } from "@argent/shared"
+import {
+  addressSchema,
+  formatTruncatedAddress,
+  isStarknetDomainName,
+} from "@argent/shared"
 import { H6, L2, P4, icons, typographyStyles } from "@argent/ui"
 import { Box, Circle, Flex, Switch, Tooltip, chakra } from "@chakra-ui/react"
 import { FC, useMemo } from "react"
@@ -8,10 +12,9 @@ import {
   CustomButtonCellProps,
 } from "../../components/CustomButtonCell"
 import { TransactionStatusIndicator } from "../../components/StatusIndicator"
-import { formatTruncatedAddress } from "../../services/addresses"
 import { AccountAvatar } from "./AccountAvatar"
 import { AccountLabel } from "./AccountLabel"
-import { AccountListItemDeprecatedBadge } from "./AccountListItemDeprecatedBadge"
+import { AccountListItemWarningBadge } from "./AccountListItemDeprecatedBadge"
 import { AccountListItemShieldBadgeContainer } from "./AccountListItemShieldBadgeContainer"
 import { AccountListItemUpgradeBadge } from "./AccountListItemUpgradeBadge"
 import { AccountListItemProps } from "./accountListItem.model"
@@ -50,6 +53,7 @@ export const AccountListItem: FC<AccountListItemProps> = ({
   accountType,
   isClickable = true,
   isShield,
+  isOwner,
   deploying,
   upgrade,
   connectedHost,
@@ -66,8 +70,8 @@ export const AccountListItem: FC<AccountListItemProps> = ({
   ...rest
 }) => {
   const getAvatarBadge = () => {
-    if (isDeprecated) {
-      return <AccountListItemDeprecatedBadge />
+    if (isDeprecated || isOwner === false) {
+      return <AccountListItemWarningBadge />
     }
     if (upgrade) {
       return <AccountListItemUpgradeBadge />
@@ -165,11 +169,17 @@ export const AccountListItem: FC<AccountListItemProps> = ({
         overflow={"hidden"}
         alignItems={"center"}
         justifyContent={"space-between"}
+        data-testid={accountName}
       >
         <Flex direction={"column"} overflow={"hidden"}>
           <Flex gap={2} alignItems={"center"}>
             {accountName && (
-              <H6 overflow={"hidden"} textOverflow={"ellipsis"}>
+              <H6
+                data-testid="account-name"
+                overflow={"hidden"}
+                textOverflow={"ellipsis"}
+                pointerEvents="auto"
+              >
                 {accountName}
               </H6>
             )}
@@ -182,6 +192,7 @@ export const AccountListItem: FC<AccountListItemProps> = ({
                 borderWidth={1}
                 p="3px 5px"
                 borderRadius={4}
+                data-testid="confirmations"
               >
                 <L2 fontWeight={700} color="neutrals.300">
                   {accountExtraInfo}
@@ -192,7 +203,12 @@ export const AccountListItem: FC<AccountListItemProps> = ({
           </Flex>
           {description && (
             <Flex gap={2} color={"neutrals.300"}>
-              <P4 fontWeight={"semibold"} w="full" sx={{ textWrap: "wrap" }}>
+              <P4
+                data-testid="description"
+                fontWeight={"semibold"}
+                w="full"
+                sx={{ textWrap: "wrap" }}
+              >
                 {description}
               </P4>
             </Flex>
diff --git a/packages/extension/src/ui/features/accounts/AccountListItemDeprecatedBadge.tsx b/packages/extension/src/ui/features/accounts/AccountListItemDeprecatedBadge.tsx
index 895ccf5a8..f5faf20d0 100644
--- a/packages/extension/src/ui/features/accounts/AccountListItemDeprecatedBadge.tsx
+++ b/packages/extension/src/ui/features/accounts/AccountListItemDeprecatedBadge.tsx
@@ -4,7 +4,7 @@ import { FC } from "react"
 
 const { AlertIcon } = icons
 
-export const AccountListItemDeprecatedBadge: FC = () => (
+export const AccountListItemWarningBadge: FC = () => (
   <Tooltip label="This account can no longer be used">
     <Circle
       position="absolute"
diff --git a/packages/extension/src/ui/features/accounts/AccountListScreenContainer.tsx b/packages/extension/src/ui/features/accounts/AccountListScreenContainer.tsx
index c61d78ad7..997526dba 100644
--- a/packages/extension/src/ui/features/accounts/AccountListScreenContainer.tsx
+++ b/packages/extension/src/ui/features/accounts/AccountListScreenContainer.tsx
@@ -5,7 +5,6 @@ import { useNavigate } from "react-router-dom"
 import { isAccountHidden } from "../../../shared/wallet.service"
 import { useAppState } from "../../app.state"
 import { routes, useReturnTo } from "../../routes"
-import { isEqualAddress } from "../../services/addresses"
 import {
   selectedAccountView,
   allAccountsOnNetworkFamily,
@@ -24,6 +23,7 @@ import {
   sortMultisigByDerivationPath,
 } from "../../../shared/utils/accountsMultisigSort"
 import { usePartitionDeprecatedAccounts } from "./accountUpgradeCheck"
+import { isEqualAddress } from "@argent/shared"
 
 /** TODO: we should be able to retreive all these account collections using queries from storage */
 export const AccountListScreenContainer: FC = () => {
diff --git a/packages/extension/src/ui/features/accounts/AccountListScreenItem.test.tsx b/packages/extension/src/ui/features/accounts/AccountListScreenItem.test.tsx
index 83a3cd68f..7c9b81eb4 100644
--- a/packages/extension/src/ui/features/accounts/AccountListScreenItem.test.tsx
+++ b/packages/extension/src/ui/features/accounts/AccountListScreenItem.test.tsx
@@ -5,9 +5,6 @@ import { describe, expect, it } from "vitest"
 import { AccountListScreenItem } from "./AccountListScreenItem"
 import { renderWithLegacyProviders } from "../../test/utils"
 
-/**
- * @vitest-environment jsdom
- */
 describe("AccountListScreenItem", async () => {
   const account = {
     accountName: "Account 1",
diff --git a/packages/extension/src/ui/features/accounts/AccountListScreenItem.tsx b/packages/extension/src/ui/features/accounts/AccountListScreenItem.tsx
index 66a5a8e19..00b5b4684 100644
--- a/packages/extension/src/ui/features/accounts/AccountListScreenItem.tsx
+++ b/packages/extension/src/ui/features/accounts/AccountListScreenItem.tsx
@@ -3,7 +3,6 @@ import { FC, ReactEventHandler } from "react"
 
 import { AccountListItem } from "./AccountListItem"
 import type { AccountListItemProps } from "./accountListItem.model"
-import { AccountListScreenItemAccessory } from "./AccountListScreenItemAccessory"
 
 const { ChevronRightIcon } = icons
 
@@ -15,48 +14,23 @@ interface AccountListScreenItemProps extends AccountListItemProps {
 
 export const AccountListScreenItem: FC<AccountListScreenItemProps> = ({
   accountName,
-  accountDescription,
-  onClick,
-  accountAddress,
-  networkId,
-  accountType,
-  isShield,
-  avatarOutlined,
-  deploying,
-  upgrade,
-  connectedHost,
   clickNavigateSettings,
-  borderBottomRadius,
-  isDeprecated,
-  prettyAccountBalance,
-  accountExtraInfo,
+  ...rest
 }) => {
   return (
     <AccountListItem
       aria-label={`Select ${accountName}`}
-      onClick={onClick}
       accountName={accountName}
-      accountAddress={accountAddress}
-      accountDescription={accountDescription}
-      networkId={networkId}
-      accountType={accountType}
-      isShield={isShield}
-      avatarOutlined={avatarOutlined}
-      deploying={deploying}
-      upgrade={upgrade}
-      connectedHost={connectedHost}
-      isDeprecated={isDeprecated}
       pr={5}
       w="full"
-      borderBottomRadius={borderBottomRadius}
-      prettyAccountBalance={prettyAccountBalance}
-      accountExtraInfo={accountExtraInfo}
+      rightElementFlexProps={{
+        flexDirection: "row",
+        gap: 2,
+        alignItems: "center",
+      }}
+      {...rest}
     >
-      {clickNavigateSettings && (
-        <AccountListScreenItemAccessory>
-          <ChevronRightIcon opacity={0.6} />
-        </AccountListScreenItemAccessory>
-      )}
+      {clickNavigateSettings && <ChevronRightIcon opacity={0.6} />}
     </AccountListItem>
   )
 }
diff --git a/packages/extension/src/ui/features/accounts/AccountListScreenItemContainer.tsx b/packages/extension/src/ui/features/accounts/AccountListScreenItemContainer.tsx
index 1bc31c52f..18e9b1e7f 100644
--- a/packages/extension/src/ui/features/accounts/AccountListScreenItemContainer.tsx
+++ b/packages/extension/src/ui/features/accounts/AccountListScreenItemContainer.tsx
@@ -1,12 +1,14 @@
 import { FC, useCallback, useMemo } from "react"
 import { useNavigate } from "react-router-dom"
 
-import { useIsPreauthorized } from "../../../shared/preAuthorizations"
+import {
+  useIsPreauthorized,
+  useOriginatingPreAuthorizationHost,
+} from "../preAuthorizations/hooks"
 import { BaseWalletAccount } from "../../../shared/wallet.model"
 import { routes } from "../../routes"
 import { useAccountStatus } from "../accountTokens/useAccountStatus"
 import { usePrettyAccountBalance } from "../accountTokens/usePrettyAccountBalance"
-import { useOriginatingHost } from "../browser/useOriginatingHost"
 import { useIsSignerInMultisig } from "../multisig/hooks/useIsSignerInMultisig"
 import { useMultisig } from "../multisig/multisig.state"
 import { Account } from "./Account"
@@ -14,6 +16,7 @@ import { AccountListScreenItem } from "./AccountListScreenItem"
 import { BoxProps } from "@chakra-ui/react"
 import { useIsDeprecatedTxV0 } from "./accountUpgradeCheck"
 import { clientAccountService } from "../../services/account"
+import { useAccountOwnerIsSelf } from "./useAccountOwner"
 
 interface AccountListScreenItemContainerProps
   extends Pick<BoxProps, "borderBottomRadius"> {
@@ -38,12 +41,13 @@ export const AccountListScreenItemContainer: FC<
 }) => {
   const prettyAccountBalance = usePrettyAccountBalance(account)
   const navigate = useNavigate()
-  const originatingHost = useOriginatingHost()
+  const originatingPreAuthorizationHost = useOriginatingPreAuthorizationHost()
   // TODO: should not be needed when data layer was restructered, as all properties can be considered real time at that point.
   const status = useAccountStatus(account, selectedAccount)
   // TODO: waiting for multisig refactor to use views and services
   const multisig = useMultisig(account)
   const signerIsInMultisig = useIsSignerInMultisig(multisig)
+  const accountOwnerIsSelf = useAccountOwnerIsSelf(account)
   const isRemovedFromMultisig = useMemo(() => {
     if (multisig) {
       return !signerIsInMultisig
@@ -51,8 +55,10 @@ export const AccountListScreenItemContainer: FC<
     return false
   }, [multisig, signerIsInMultisig])
 
-  // TBD: this does not look wrong to me, but maybe a good example to think about how it should work
-  const isConnected = useIsPreauthorized(originatingHost || "", account)
+  const isConnected = useIsPreauthorized(
+    originatingPreAuthorizationHost,
+    account,
+  )
 
   const isDeprecated = useIsDeprecatedTxV0(account)
 
@@ -100,10 +106,11 @@ export const AccountListScreenItemContainer: FC<
       networkId={account.networkId}
       accountType={account.type}
       isShield={Boolean(account.guardian)}
+      isOwner={accountOwnerIsSelf}
       avatarOutlined={status.code === "CONNECTED"}
       deploying={status.code === "DEPLOYING"}
       upgrade={needsUpgrade}
-      connectedHost={isConnected ? originatingHost : undefined}
+      connectedHost={isConnected ? originatingPreAuthorizationHost : undefined}
       clickNavigateSettings={clickNavigateSettings}
       shouldDisplayGuardianBanner={shouldDisplayGuardianBanner}
       isDeprecated={isDeprecated}
diff --git a/packages/extension/src/ui/features/accounts/AccountScreen.tsx b/packages/extension/src/ui/features/accounts/AccountScreen.tsx
index b9782f19f..370f6138e 100644
--- a/packages/extension/src/ui/features/accounts/AccountScreen.tsx
+++ b/packages/extension/src/ui/features/accounts/AccountScreen.tsx
@@ -1,7 +1,5 @@
-import { SupportedNetworks, SwapProvider } from "@argent/x-swap"
-import { FC, ReactNode, useMemo } from "react"
+import { FC, ReactNode } from "react"
 
-import { getMulticallForNetwork } from "../../../shared/multicall"
 import { AccountActivityContainer } from "../accountActivity/AccountActivityContainer"
 import { AccountCollectionsContainer } from "../accountNfts/AccountCollectionsContainer"
 import { AccountTokensContainer } from "../accountTokens/AccountTokensContainer"
@@ -14,6 +12,7 @@ import { useAccount } from "./accounts.state"
 import { AccountScreenEmptyContainer } from "./AccountScreenEmptyContainer"
 import { selectedAccountView } from "../../views/account"
 import { useView } from "../../views/implementation/react"
+import { useIsDefaultNetwork } from "../networks/hooks/useIsDefaultNetwork"
 
 interface AccountScreenProps {
   tab: "tokens" | "collections" | "activity" | "swap"
@@ -27,17 +26,9 @@ export const AccountScreen: FC<AccountScreenProps> = ({ tab }) => {
   const shouldShowFullScreenStatusMessage =
     useShouldShowFullScreenStatusMessage()
 
-  const hasAccount = account !== undefined
-
-  const multicall = account && getMulticallForNetwork(account?.network)
+  const isDefaultNetwork = useIsDefaultNetwork()
 
-  const noSwap = useMemo(
-    () =>
-      ![SupportedNetworks.MAINNET, SupportedNetworks.TESTNET].includes(
-        account?.networkId as any,
-      ),
-    [account?.networkId],
-  )
+  const hasAccount = account !== undefined
 
   if (shouldShowFullScreenStatusMessage) {
     return <StatusMessageFullScreenContainer />
@@ -53,18 +44,7 @@ export const AccountScreen: FC<AccountScreenProps> = ({ tab }) => {
   } else if (tab === "activity") {
     body = <AccountActivityContainer account={account} />
   } else if (tab === "swap") {
-    body = noSwap ? (
-      <NoSwap />
-    ) : (
-      <SwapProvider
-        selectedAccount={account}
-        multicall={multicall}
-        rpcUrl={account.network.rpcUrl}
-        chainId={account.network.chainId}
-      >
-        <Swap />
-      </SwapProvider>
-    )
+    body = isDefaultNetwork ? <Swap /> : <NoSwap /> // Swap is only available on default network
   } else {
     tab satisfies never
   }
diff --git a/packages/extension/src/ui/features/accounts/AddNewAccountScreenContainer.tsx b/packages/extension/src/ui/features/accounts/AddNewAccountScreenContainer.tsx
index d9bf419ca..8185bf9f3 100644
--- a/packages/extension/src/ui/features/accounts/AddNewAccountScreenContainer.tsx
+++ b/packages/extension/src/ui/features/accounts/AddNewAccountScreenContainer.tsx
@@ -4,7 +4,7 @@ import { useNavigate } from "react-router-dom"
 
 import { useAction } from "../../hooks/useAction"
 import { routes, useReturnTo } from "../../routes"
-import { assertNever } from "../../services/assertNever"
+import { assertNever } from "../../../shared/utils/assertNever"
 import { useCurrentNetwork } from "../networks/hooks/useCurrentNetwork"
 import {
   AccountType,
diff --git a/packages/extension/src/ui/features/accounts/ClickableShieldBanner.tsx b/packages/extension/src/ui/features/accounts/ClickableShieldBanner.tsx
index 55ef5d64f..d68e35a39 100644
--- a/packages/extension/src/ui/features/accounts/ClickableShieldBanner.tsx
+++ b/packages/extension/src/ui/features/accounts/ClickableShieldBanner.tsx
@@ -1,6 +1,6 @@
-import { icons } from "@argent/ui"
+import { L2, icons } from "@argent/ui"
 
-import { Box, Flex, Text } from "@chakra-ui/react"
+import { Button, Flex, Text } from "@chakra-ui/react"
 import { useNavigate } from "react-router-dom"
 import { routes } from "../../routes"
 
@@ -12,26 +12,24 @@ export const ClickableShieldBanner = ({ address }: { address: string }) => {
     navigate(routes.shieldAccountStart(address))
   }
   return (
-    <Box
+    <Button
+      size="auto"
       onClick={handleClick}
-      p={2}
+      py={2}
       px={3}
-      backgroundColor="neutrals.700"
-      borderBottomRadius="lg"
-      cursor="pointer"
-      _hover={{ backgroundColor: "neutrals.600" }}
+      justifyContent="space-between"
+      alignItems="center"
+      w="full"
+      roundedTop="none"
+      roundedBottom="lg"
     >
-      <Flex justifyContent="space-between" alignItems="center">
-        <Flex alignItems="center">
-          <ArgentShieldIcon />{" "}
-          <Text fontSize="2xs" color="neutrals.300" ml={1}>
-            Argent Shield is not activated
-          </Text>
-        </Flex>
-        <Text fontSize="2xs" color="neutrals.500">
-          Click to enable
-        </Text>
+      <Flex alignItems="center" gap={1} color="neutrals.300">
+        <ArgentShieldIcon />
+        <L2 as={Text}>Argent Shield is not activated</L2>
       </Flex>
-    </Box>
+      <L2 as={Text} color="neutrals.500">
+        Click to enable
+      </L2>
+    </Button>
   )
 }
diff --git a/packages/extension/src/ui/features/accounts/HideOrDeleteAccountConfirmScreen.tsx b/packages/extension/src/ui/features/accounts/HideOrDeleteAccountConfirmScreen.tsx
index 96d809f3c..4a9923d42 100644
--- a/packages/extension/src/ui/features/accounts/HideOrDeleteAccountConfirmScreen.tsx
+++ b/packages/extension/src/ui/features/accounts/HideOrDeleteAccountConfirmScreen.tsx
@@ -2,9 +2,9 @@ import { H5, P3 } from "@argent/ui"
 import { Center, VStack } from "@chakra-ui/react"
 import { FC } from "react"
 
-import { formatFullAddress } from "../../services/addresses"
 import { ConfirmScreen } from "../actions/transaction/ApproveTransactionScreen/ConfirmScreen"
 import { HideOrDeleteAccountConfirmScreenProps } from "./hideOrDeleteAccountConfirmScreen.model"
+import { formatFullAddress } from "@argent/shared"
 
 export const HideOrDeleteAccountConfirmScreen: FC<
   HideOrDeleteAccountConfirmScreenProps
diff --git a/packages/extension/src/ui/features/accounts/PrettyAccountAddressArgentX.tsx b/packages/extension/src/ui/features/accounts/PrettyAccountAddressArgentX.tsx
index a3998e9d5..28c8aeeb2 100644
--- a/packages/extension/src/ui/features/accounts/PrettyAccountAddressArgentX.tsx
+++ b/packages/extension/src/ui/features/accounts/PrettyAccountAddressArgentX.tsx
@@ -3,9 +3,9 @@ import { FC, useMemo } from "react"
 
 import type { AddressBookContact } from "../../../shared/addressBook/type"
 import { useAddressBook } from "../../hooks/useAddressBook"
-import { isEqualAddress } from "../../services/addresses"
 import { accountFindFamily } from "../../views/account"
 import { useView } from "../../views/implementation/react"
+import { isEqualAddress } from "@argent/shared"
 
 const getContactNameForAddress = (
   accountAddress: string,
diff --git a/packages/extension/src/ui/features/accounts/accountListItem.model.ts b/packages/extension/src/ui/features/accounts/accountListItem.model.ts
index 4aba367b3..5951d053e 100644
--- a/packages/extension/src/ui/features/accounts/accountListItem.model.ts
+++ b/packages/extension/src/ui/features/accounts/accountListItem.model.ts
@@ -19,6 +19,7 @@ export interface AccountListItemProps extends CustomButtonCellProps {
   avatarOutlined?: boolean
   avatarSize?: number
   isShield?: boolean
+  isOwner?: boolean
   isClickable?: boolean
   isDeprecated?: boolean
   displayArgentShieldBanner?: boolean
diff --git a/packages/extension/src/ui/features/accounts/accountTransactions.state.ts b/packages/extension/src/ui/features/accounts/accountTransactions.state.ts
index 19f757adc..1cc0d7112 100644
--- a/packages/extension/src/ui/features/accounts/accountTransactions.state.ts
+++ b/packages/extension/src/ui/features/accounts/accountTransactions.state.ts
@@ -1,13 +1,13 @@
 import { memoize } from "lodash-es"
 import { useMemo } from "react"
 
-import { transactionsStore } from "../../../background/transactions/store"
-import { useArrayStorage } from "../../../shared/storage/hooks"
+import { transactionsStore } from "../../../shared/transactions/store"
+import { useArrayStorage } from "../../hooks/useStorage"
 import { Transaction } from "../../../shared/transactions"
 import { BaseWalletAccount } from "../../../shared/wallet.model"
 import { accountsEqual } from "../../../shared/utils/accountsEqual"
-import { TransactionExecutionStatus, TransactionFinalityStatus } from "starknet"
 import { getAccountIdentifier } from "@argent/shared"
+import { getTransactionStatus } from "../../../shared/transactions/utils"
 
 type UseAccountTransactions = (account?: BaseWalletAccount) => {
   transactions: Transaction[]
@@ -31,12 +31,10 @@ export const useAccountTransactions: UseAccountTransactions = (account) => {
     [transactions],
   )
 
-  const pendingTransactions = sortedTransactions.filter(
-    ({ finalityStatus, meta, executionStatus }) =>
-      finalityStatus === TransactionFinalityStatus.RECEIVED &&
-      executionStatus !== TransactionExecutionStatus.REJECTED && // Rejected transactions have finality status RECEIVED
-      !meta?.isDeployAccount,
-  )
+  const pendingTransactions = sortedTransactions.filter((transaction) => {
+    const { finality_status } = getTransactionStatus(transaction)
+    return finality_status === "RECEIVED" && !transaction.meta?.isDeployAccount
+  })
 
   return { transactions, pendingTransactions }
 }
@@ -54,12 +52,10 @@ export const useDeployAccountTransactions: UseAccountTransactions = (
     [transactions],
   )
 
-  const pendingTransactions = sortedTransactions.filter(
-    ({ finalityStatus, executionStatus, meta }) =>
-      finalityStatus === TransactionFinalityStatus.RECEIVED &&
-      executionStatus !== TransactionExecutionStatus.REJECTED && // Rejected transactions have finality status RECEIVED
-      meta?.isDeployAccount,
-  )
+  const pendingTransactions = sortedTransactions.filter((transaction) => {
+    const { finality_status } = getTransactionStatus(transaction)
+    return finality_status === "RECEIVED" && transaction.meta?.isDeployAccount
+  })
 
   return { transactions, pendingTransactions }
 }
@@ -77,12 +73,10 @@ export const useUpgradeAccountTransactions: UseAccountTransactions = (
     [transactions],
   )
 
-  const pendingTransactions = sortedTransactions.filter(
-    ({ finalityStatus, executionStatus, meta }) =>
-      finalityStatus === TransactionFinalityStatus.RECEIVED &&
-      executionStatus !== TransactionExecutionStatus.REJECTED && // Rejected transactions have finality status RECEIVED
-      meta?.isUpgrade,
-  )
+  const pendingTransactions = sortedTransactions.filter((transaction) => {
+    const { finality_status } = getTransactionStatus(transaction)
+    return finality_status === "RECEIVED" && transaction.meta?.isUpgrade
+  })
 
   return { transactions, pendingTransactions }
 }
diff --git a/packages/extension/src/ui/features/accounts/accountUpgradeCheck.test.ts b/packages/extension/src/ui/features/accounts/accountUpgradeCheck.test.ts
index b3e7306f7..955cc9549 100644
--- a/packages/extension/src/ui/features/accounts/accountUpgradeCheck.test.ts
+++ b/packages/extension/src/ui/features/accounts/accountUpgradeCheck.test.ts
@@ -6,7 +6,10 @@ import {
 import { WalletAccount } from "../../../shared/wallet.model"
 import { Network } from "../../../shared/network"
 import { getMockWalletAccount } from "../../../../test/walletAccount.mock"
-import { STANDARD_CAIRO_0_ACCOUNT_CLASS_HASH } from "../../../shared/network/constants"
+import {
+  ETH_TOKEN_ADDRESS,
+  STANDARD_CAIRO_0_ACCOUNT_CLASS_HASH,
+} from "../../../shared/network/constants"
 import { getMockNetwork } from "../../../../test/network.mock"
 
 describe("accountUpgradeCheck", () => {
@@ -32,6 +35,7 @@ describe("accountUpgradeCheck", () => {
         standardCairo0: STANDARD_CAIRO_0_ACCOUNT_CLASS_HASH,
         // ... other properties if needed
       },
+      possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS],
     })
   })
 
diff --git a/packages/extension/src/ui/features/accounts/accounts.service.ts b/packages/extension/src/ui/features/accounts/accounts.service.ts
index 3f1e90966..4b14cc61d 100644
--- a/packages/extension/src/ui/features/accounts/accounts.service.ts
+++ b/packages/extension/src/ui/features/accounts/accounts.service.ts
@@ -1,11 +1,14 @@
 /**
  * All of this file should probably go into the data model for accounts, either as a field which gets updated from a worker, or as a computed field, if we have such a concept.
  */
-import { num } from "starknet"
 import useSWR from "swr"
 
 import { updateAccountDetails } from "../../../shared/account/update"
-import { generateAvatarImage, id } from "@argent/shared"
+import {
+  generateAvatarImage,
+  id,
+  stripAddressZeroPadding,
+} from "@argent/shared"
 import { BaseWalletAccount } from "../../../shared/wallet.model"
 import { accountsEqual } from "../../../shared/utils/accountsEqual"
 import { withPolling } from "../../services/swr.service"
@@ -14,8 +17,6 @@ import { useView } from "../../views/implementation/react"
 import { Account } from "./Account"
 import { RefreshInterval } from "../../../shared/config"
 
-const { toBigInt } = num
-
 const argentColorsArray = [
   "02BBA8",
   "29C5FF",
@@ -44,15 +45,6 @@ export const getAccountImageUrl = (
   })
 }
 
-export const stripAddressZeroPadding = (accountAddress: string) => {
-  try {
-    return num.toHex(toBigInt(num.hexToDecimalString(accountAddress)))
-  } catch {
-    // ignore parsing errors
-  }
-  return ""
-}
-
 export const getNetworkAccountImageUrl = ({
   accountName,
   networkId,
diff --git a/packages/extension/src/ui/features/accounts/networkTransactions.state.ts b/packages/extension/src/ui/features/accounts/networkTransactions.state.ts
index d6b5d730f..85cc4654c 100644
--- a/packages/extension/src/ui/features/accounts/networkTransactions.state.ts
+++ b/packages/extension/src/ui/features/accounts/networkTransactions.state.ts
@@ -1,9 +1,9 @@
 import { memoize } from "lodash-es"
-import { useArrayStorage } from "../../../shared/storage/hooks"
+import { useArrayStorage } from "../../hooks/useStorage"
 import { Transaction } from "../../../shared/transactions"
-import { transactionsStore } from "../../../background/transactions/store"
+import { transactionsStore } from "../../../shared/transactions/store"
 import { useMemo } from "react"
-import { TransactionExecutionStatus, TransactionFinalityStatus } from "starknet"
+import { getTransactionStatus } from "../../../shared/transactions/utils"
 
 type UseTransactionsOnNetwork = (networkId?: string) => {
   transactions: Transaction[]
@@ -29,12 +29,10 @@ export const useUpgradeTransactionsOnNetwork: UseTransactionsOnNetwork = (
     [transactions],
   )
 
-  const pendingTransactions = sortedTransactions.filter(
-    ({ finalityStatus, executionStatus, meta }) =>
-      finalityStatus === TransactionFinalityStatus.RECEIVED &&
-      executionStatus !== TransactionExecutionStatus.REJECTED && // Rejected transactions have finality status RECEIVED
-      meta?.isUpgrade,
-  )
+  const pendingTransactions = sortedTransactions.filter((transaction) => {
+    const { finality_status } = getTransactionStatus(transaction)
+    return finality_status === "RECEIVED" && transaction.meta?.isUpgrade
+  })
 
   return { transactions, pendingTransactions }
 }
diff --git a/packages/extension/src/ui/features/accounts/useAccountOwner.ts b/packages/extension/src/ui/features/accounts/useAccountOwner.ts
new file mode 100644
index 000000000..715882510
--- /dev/null
+++ b/packages/extension/src/ui/features/accounts/useAccountOwner.ts
@@ -0,0 +1,32 @@
+import { isEqualAddress } from "@argent/shared"
+import { useRef } from "react"
+import useSWR from "swr"
+
+import type { BaseWalletAccount } from "../../../shared/wallet.model"
+import { getAccountIdentifier } from "../../../shared/wallet.service"
+import { accountMessagingService } from "../../services/accountMessaging"
+import { accountFindFamily } from "../../views/account"
+import { useView } from "../../views/implementation/react"
+
+export const useAccountOwnerIsSelf = (baseAccount?: BaseWalletAccount) => {
+  const publicKey = useRef<string>()
+  const account = useView(accountFindFamily(baseAccount))
+  const { data: accountOwnerIsSelf = true } = useSWR(
+    account ? [getAccountIdentifier(account), "accountOwnerIsSelf"] : null,
+    async () => {
+      if (!account?.owner) {
+        /** don't return false negative  */
+        return true
+      }
+      if (!publicKey.current) {
+        publicKey.current = await accountMessagingService.getPublicKey(account)
+      }
+      const accountOwnerIsSelf = isEqualAddress(
+        account.owner,
+        publicKey.current,
+      )
+      return accountOwnerIsSelf
+    },
+  )
+  return accountOwnerIsSelf
+}
diff --git a/packages/extension/src/ui/features/actions/AddNetworkScreen/AddNetworkScreen.test.tsx b/packages/extension/src/ui/features/actions/AddNetworkScreen/AddNetworkScreen.test.tsx
index 11108e1c0..f40fc9957 100644
--- a/packages/extension/src/ui/features/actions/AddNetworkScreen/AddNetworkScreen.test.tsx
+++ b/packages/extension/src/ui/features/actions/AddNetworkScreen/AddNetworkScreen.test.tsx
@@ -3,6 +3,7 @@ import { fireEvent, render, screen } from "@testing-library/react"
 
 import { Network } from "../../../../shared/network"
 import { AddNetworkScreen, AddNetworkScreenProps } from "./AddNetworkScreen"
+import { ETH_TOKEN_ADDRESS } from "../../../../shared/network/constants"
 
 const network: Network = {
   id: "networkId",
@@ -11,6 +12,7 @@ const network: Network = {
   explorerUrl: "https://etherscan.io",
   blockExplorerUrl: "https://blockchair.com/ethereum",
   rpcUrl: "https://mainnet.infura.io/v3/123456-RPC",
+  possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS],
 }
 
 describe("AddNetworkScreen", () => {
diff --git a/packages/extension/src/ui/features/actions/AddTokenScreen.tsx b/packages/extension/src/ui/features/actions/AddTokenScreen.tsx
index 0325ecd73..cd82c2543 100644
--- a/packages/extension/src/ui/features/actions/AddTokenScreen.tsx
+++ b/packages/extension/src/ui/features/actions/AddTokenScreen.tsx
@@ -15,7 +15,6 @@ import { useForm } from "react-hook-form"
 import { z } from "zod"
 
 import { ControlledInput } from "../../components/ControlledInput"
-import { WithActionScreenErrorFooter } from "./transaction/ApproveTransactionScreen/WithActionScreenErrorFooter"
 import {
   RequestToken,
   RequestTokenSchema,
diff --git a/packages/extension/src/ui/features/actions/AddTokenScreenContainer.tsx b/packages/extension/src/ui/features/actions/AddTokenScreenContainer.tsx
index c6f53bdef..b493c8527 100644
--- a/packages/extension/src/ui/features/actions/AddTokenScreenContainer.tsx
+++ b/packages/extension/src/ui/features/actions/AddTokenScreenContainer.tsx
@@ -1,4 +1,4 @@
-import { Address, addressSchema } from "@argent/shared"
+import { Address, addressSchema, isEqualAddress } from "@argent/shared"
 import { useToast } from "@argent/ui"
 import { debounce } from "lodash-es"
 import { FC, Suspense, useCallback, useMemo, useState } from "react"
@@ -10,7 +10,6 @@ import { ZodError } from "zod"
 import { getAccountIdentifier } from "../../../shared/wallet.service"
 import { useAppState } from "../../app.state"
 import { routes } from "../../routes"
-import { isEqualAddress } from "../../services/addresses"
 import { selectedAccountView } from "../../views/account"
 import { useView } from "../../views/implementation/react"
 import { useTokensInNetwork } from "../accountTokens/tokens.state"
diff --git a/packages/extension/src/ui/features/actions/ApproveDeployAccount.tsx b/packages/extension/src/ui/features/actions/ApproveDeployAccount.tsx
index e1a5c9357..e1c4ef56e 100644
--- a/packages/extension/src/ui/features/actions/ApproveDeployAccount.tsx
+++ b/packages/extension/src/ui/features/actions/ApproveDeployAccount.tsx
@@ -16,6 +16,7 @@ import {
 } from "./transactionV2/TransactionHeader"
 import { TransactionReviewActions } from "./transactionV2/action/TransactionReviewActions"
 import { ReviewOfTransaction } from "../../../shared/transactionReview/schema"
+import { ETH_TOKEN_ADDRESS } from "../../../shared/network/constants"
 
 export interface ApproveDeployAccountScreenProps
   extends Omit<ConfirmPageProps, "onSubmit">,
@@ -92,6 +93,7 @@ export const ApproveDeployAccountScreen: FC<
       footer={
         <WithActionScreenErrorFooter isTransaction>
           <DeployAccountFeeEstimation
+            feeTokenAddress={ETH_TOKEN_ADDRESS}
             onErrorChange={setDisableConfirm}
             accountAddress={selectedAccount.address}
             networkId={selectedAccount.networkId}
diff --git a/packages/extension/src/ui/features/actions/DeployAccountActionScreenContainer.tsx b/packages/extension/src/ui/features/actions/DeployAccountActionScreenContainer.tsx
index 6e73c081c..bfe6dfe8b 100644
--- a/packages/extension/src/ui/features/actions/DeployAccountActionScreenContainer.tsx
+++ b/packages/extension/src/ui/features/actions/DeployAccountActionScreenContainer.tsx
@@ -25,7 +25,11 @@ export const DeployAccountActionScreenContainer: FC = () => {
     if (isObject(result) && "error" in result) {
       // stay on error screen
     } else {
-      if (isObject(result) && "txHash" in result) {
+      if (
+        isObject(result) &&
+        "txHash" in result &&
+        typeof result.txHash === "string"
+      ) {
         accountWithDeployState?.updateDeployTx(result.txHash)
       }
       void closePopupIfLastAction()
diff --git a/packages/extension/src/ui/features/actions/DeployMultisigActionScreenContainer.tsx b/packages/extension/src/ui/features/actions/DeployMultisigActionScreenContainer.tsx
index f898b5ab2..1982b6f0b 100644
--- a/packages/extension/src/ui/features/actions/DeployMultisigActionScreenContainer.tsx
+++ b/packages/extension/src/ui/features/actions/DeployMultisigActionScreenContainer.tsx
@@ -24,7 +24,11 @@ export const DeployMultisigActionScreenContainer: FC = () => {
     if (isObject(result) && "error" in result) {
       // stay on error screen
     } else {
-      if (isObject(result) && "txHash" in result) {
+      if (
+        isObject(result) &&
+        "txHash" in result &&
+        typeof result.txHash === "string"
+      ) {
         multisig?.updateDeployTx(result.txHash)
       }
       void closePopupIfLastAction()
diff --git a/packages/extension/src/ui/features/actions/__fixtures__/aspect.ts b/packages/extension/src/ui/features/actions/__fixtures__/aspect.ts
index a6c99e616..bab300d96 100644
--- a/packages/extension/src/ui/features/actions/__fixtures__/aspect.ts
+++ b/packages/extension/src/ui/features/actions/__fixtures__/aspect.ts
@@ -204,6 +204,7 @@ export const aspect: TransactionActionFixture = {
         gasPrice: 1000000010,
         gasUsage: 3744,
         unit: "wei",
+        maxFee: 6744000037440,
       },
     },
   ],
diff --git a/packages/extension/src/ui/features/actions/__fixtures__/jediswap.ts b/packages/extension/src/ui/features/actions/__fixtures__/jediswap.ts
index 6dd57aafe..5097d7719 100644
--- a/packages/extension/src/ui/features/actions/__fixtures__/jediswap.ts
+++ b/packages/extension/src/ui/features/actions/__fixtures__/jediswap.ts
@@ -250,6 +250,7 @@ export const jediswap: TransactionActionFixture = {
         gasPrice: 1000000010,
         gasUsage: 3744,
         unit: "wei",
+        maxFee: 6744000037440,
       },
     },
   ],
diff --git a/packages/extension/src/ui/features/actions/__fixtures__/transfer.ts b/packages/extension/src/ui/features/actions/__fixtures__/transfer.ts
index efeb1b1e0..f9c4f898e 100644
--- a/packages/extension/src/ui/features/actions/__fixtures__/transfer.ts
+++ b/packages/extension/src/ui/features/actions/__fixtures__/transfer.ts
@@ -121,6 +121,7 @@ export const transfer: TransactionActionFixture = {
         gasPrice: 1000000010,
         gasUsage: 3744,
         unit: "wei",
+        maxFee: 6744000037440,
       },
     },
   ],
diff --git a/packages/extension/src/ui/features/actions/connectDapp/ConnectDappAccountSelect.tsx b/packages/extension/src/ui/features/actions/connectDapp/ConnectDappAccountSelect.tsx
index 6edff0a08..57e1b243f 100644
--- a/packages/extension/src/ui/features/actions/connectDapp/ConnectDappAccountSelect.tsx
+++ b/packages/extension/src/ui/features/actions/connectDapp/ConnectDappAccountSelect.tsx
@@ -1,9 +1,6 @@
 import { FC, useCallback, useMemo } from "react"
 
-import {
-  equalPreAuthorization,
-  usePreAuthorizations,
-} from "../../../../shared/preAuthorizations"
+import { usePreAuthorizations } from "../../preAuthorizations/hooks"
 import {
   BaseWalletAccount,
   WalletAccount,
@@ -11,6 +8,7 @@ import {
 import { accountsEqual } from "../../../../shared/utils/accountsEqual"
 import { AccountListItemProps } from "../../accounts/accountListItem.model"
 import { AccountSelect } from "../../accounts/AccountSelect"
+import { isEqualPreAuthorization } from "../../../../shared/preAuthorization/schema"
 
 export interface ConnectDappAccountSelectProps {
   accounts: WalletAccount[]
@@ -31,7 +29,7 @@ export const ConnectDappAccountSelect: FC<ConnectDappAccountSelectProps> = ({
       const accountName = account.name
       const connected = Boolean(
         preAuths.some((preAuth) =>
-          equalPreAuthorization(preAuth, {
+          isEqualPreAuthorization(preAuth, {
             host,
             account,
           }),
diff --git a/packages/extension/src/ui/features/actions/connectDapp/ConnectDappScreen.test.tsx b/packages/extension/src/ui/features/actions/connectDapp/ConnectDappScreen.test.tsx
index 4e0198315..33ded1abf 100644
--- a/packages/extension/src/ui/features/actions/connectDapp/ConnectDappScreen.test.tsx
+++ b/packages/extension/src/ui/features/actions/connectDapp/ConnectDappScreen.test.tsx
@@ -1,14 +1,10 @@
-import { act, screen } from "@testing-library/react"
+import { act, screen, waitFor } from "@testing-library/react"
 import userEvent from "@testing-library/user-event"
 
 import { renderWithLegacyProviders } from "../../../test/utils"
 import { accounts } from "../__fixtures__"
 import { ConnectDappScreen, ConnectDappScreenProps } from "./ConnectDappScreen"
 
-/**
- * @vitest-environment jsdom
- */
-
 describe("ConnectDappScreen", () => {
   const onConnect = vi.fn()
   const onDisconnect = vi.fn()
@@ -24,8 +20,10 @@ describe("ConnectDappScreen", () => {
     onSelectedAccountChange,
   }
 
-  beforeEach(() => {
-    renderWithLegacyProviders(<ConnectDappScreen {...props} />)
+  beforeEach(async () => {
+    await act(async () => {
+      return renderWithLegacyProviders(<ConnectDappScreen {...props} />)
+    })
   })
 
   it("should render dapp information", () => {
@@ -37,7 +35,9 @@ describe("ConnectDappScreen", () => {
 
   it("should call onConnect when Continue button is clicked", async () => {
     await act(async () => {
-      await userEvent.click(screen.getByText("Continue"))
+      const continueButton = screen.getByText("Continue")
+      await waitFor(() => expect(continueButton).toBeEnabled())
+      await userEvent.click(continueButton)
     })
     expect(onConnect).toHaveBeenCalled()
   })
@@ -46,6 +46,6 @@ describe("ConnectDappScreen", () => {
     await act(async () => {
       await userEvent.click(screen.getByText("Disconnect"))
     })
-    expect(onConnect).toHaveBeenCalled()
+    expect(onDisconnect).toHaveBeenCalled()
   })
 })
diff --git a/packages/extension/src/ui/features/actions/connectDapp/ConnectDappScreenContainer.tsx b/packages/extension/src/ui/features/actions/connectDapp/ConnectDappScreenContainer.tsx
index 67f13e217..d5a373a9e 100644
--- a/packages/extension/src/ui/features/actions/connectDapp/ConnectDappScreenContainer.tsx
+++ b/packages/extension/src/ui/features/actions/connectDapp/ConnectDappScreenContainer.tsx
@@ -1,9 +1,6 @@
 import { FC, useCallback, useMemo, useState } from "react"
 
-import {
-  removePreAuthorization,
-  useIsPreauthorized,
-} from "../../../../shared/preAuthorizations"
+import { useIsPreauthorized } from "../../preAuthorizations/hooks"
 import { BaseWalletAccount } from "../../../../shared/wallet.model"
 import { accountsEqual } from "../../../../shared/utils/accountsEqual"
 import { useAppState } from "../../../app.state"
@@ -13,10 +10,10 @@ import { useActionScreen } from "../hooks/useActionScreen"
 import { WithActionScreenErrorFooter } from "../transaction/ApproveTransactionScreen/WithActionScreenErrorFooter"
 import { ConnectDappScreen } from "./ConnectDappScreen"
 import { useDappDisplayAttributes } from "./useDappDisplayAttributes"
-import { useDisclosure } from "@chakra-ui/react"
 import { NavigationBar } from "@argent/ui"
 import { NetworkSwitcherContainer } from "../../networks/NetworkSwitcher/NetworkSwitcherContainer"
 import { clientAccountService } from "../../../services/account"
+import { preAuthorizationService } from "../../../../shared/preAuthorization/service"
 
 export const ConnectDappScreenContainer: FC = () => {
   const {
@@ -66,7 +63,10 @@ export const ConnectDappScreenContainer: FC = () => {
 
   const onDisconnect = useCallback(async () => {
     if (selectedAccount) {
-      await removePreAuthorization(action.payload.host, selectedAccount)
+      await preAuthorizationService.remove({
+        account: selectedAccount,
+        host: action.payload.host,
+      })
     }
     await reject()
   }, [action.payload.host, reject, selectedAccount])
diff --git a/packages/extension/src/ui/features/actions/connectDapp/DappIcon.tsx b/packages/extension/src/ui/features/actions/connectDapp/DappIcon.tsx
index 2115b5d9e..d84d56e93 100644
--- a/packages/extension/src/ui/features/actions/connectDapp/DappIcon.tsx
+++ b/packages/extension/src/ui/features/actions/connectDapp/DappIcon.tsx
@@ -1,9 +1,9 @@
-import { Box, SquareProps } from "@chakra-ui/react"
+import { Box, BoxProps } from "@chakra-ui/react"
 import { FC } from "react"
 
 import { DappDisplayAttributes } from "./useDappDisplayAttributes"
 
-interface DappIconProps extends SquareProps {
+interface DappIconProps extends BoxProps {
   dappDisplayAttributes?: DappDisplayAttributes
 }
 
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimation.test.tsx b/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimation.test.tsx
index 1e3cc9cfd..d8b767ab7 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimation.test.tsx
+++ b/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimation.test.tsx
@@ -47,8 +47,6 @@ describe("CombinedFeeEstimation", () => {
     expect(
       screen.getByText(/^Network fees are paid to the network/),
     ).toBeInTheDocument()
-    expect(screen.getByText(/≈ 0.00069 ETH/)).toBeInTheDocument()
-    expect(screen.getByText(/≈ 0.0015 ETH/)).toBeInTheDocument()
   })
 
   it("should render scenario 2 as expected", async () => {
@@ -64,8 +62,6 @@ describe("CombinedFeeEstimation", () => {
     expect(
       screen.getByText(/^Network fees are paid to the network/),
     ).toBeInTheDocument()
-    expect(screen.getByText(/≈ 0.000000000000069 ETH/)).toBeInTheDocument()
-    expect(screen.getByText(/≈ 0.00000000000015 ETH/)).toBeInTheDocument()
   })
 
   it("should render scenario 3 as expected", async () => {
@@ -87,8 +83,8 @@ describe("CombinedFeeEstimation", () => {
     expect(
       screen.getByText(/^Network fees are paid to the network/),
     ).toBeInTheDocument()
-    expect(screen.getByText(/≈ 0.000000000000069 ETH/)).toBeInTheDocument()
-    expect(screen.getByText(/≈ 0.00000000000015 ETH/)).toBeInTheDocument()
+    expect(screen.getByText(/≈ 0.000000000000061 ETH/)).toBeInTheDocument()
+    expect(screen.getByText(/Max 0.00000000000022 ETH/)).toBeInTheDocument()
 
     expect(window.scrollTo).toHaveBeenCalled()
   })
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimation.tsx b/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimation.tsx
index 49f8b5fe7..773cba5a6 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimation.tsx
+++ b/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimation.tsx
@@ -1,4 +1,4 @@
-import { bigDecimal } from "@argent/shared"
+import { TokenWithBalance, bigDecimal } from "@argent/shared"
 import { L1, P4, TextWithAmount } from "@argent/ui"
 import { Flex } from "@chakra-ui/react"
 import { FC, useMemo } from "react"
@@ -14,13 +14,14 @@ import { InsufficientFundsAccordion } from "./ui/InsufficientFundsAccordion"
 import { TransactionFailureAccordion } from "./ui/TransactionFailureAccordion"
 import { WaitingForFunds } from "./ui/WaitingForFunds"
 import { EstimatedFees } from "../../../../shared/transactionSimulation/fees/fees.model"
-import { Token } from "../../../../shared/token/__new/types/token.model"
+import { estimatedFeeToMaxFeeTotal } from "../../../../shared/transactionSimulation/utils"
+import { num } from "starknet"
 
 export interface CombinedFeeEstimationProps {
+  allowFeeTokenSelection?: boolean
   amountCurrencyValue?: string
   fee?: EstimatedFees
-  feeToken?: Token
-  feeTokenBalance?: bigint
+  feeToken?: TokenWithBalance
   parsedFeeEstimationError?: ParsedFeeError
   showError: boolean
   showEstimateError: boolean
@@ -32,10 +33,10 @@ export interface CombinedFeeEstimationProps {
 }
 
 export const CombinedFeeEstimation: FC<CombinedFeeEstimationProps> = ({
+  allowFeeTokenSelection,
   amountCurrencyValue,
   fee,
   feeToken,
-  feeTokenBalance,
   parsedFeeEstimationError,
   showError,
   showEstimateError,
@@ -50,20 +51,21 @@ export const CombinedFeeEstimation: FC<CombinedFeeEstimationProps> = ({
       return (
         <TooltipText
           feeToken={feeToken}
-          feeTokenBalance={feeTokenBalance}
           totalMaxFee={totalMaxFee}
-          maxAccountDeploymentFee={fee?.maxADFee}
-          maxNetworkFee={fee?.suggestedMaxFee}
+          maxAccountDeploymentFee={
+            fee?.deployment
+              ? num.toHex(estimatedFeeToMaxFeeTotal(fee.deployment))
+              : undefined
+          }
+          maxNetworkFee={
+            fee
+              ? num.toHex(estimatedFeeToMaxFeeTotal(fee.transactions))
+              : undefined
+          }
         />
       )
     }
-  }, [
-    fee?.maxADFee,
-    fee?.suggestedMaxFee,
-    feeToken,
-    feeTokenBalance,
-    totalMaxFee,
-  ])
+  }, [fee, feeToken, totalMaxFee])
   const primaryText = useMemo(() => {
     if (totalFee && totalMaxFee) {
       if (amountCurrencyValue !== undefined) {
@@ -116,6 +118,7 @@ export const CombinedFeeEstimation: FC<CombinedFeeEstimationProps> = ({
     return (
       <FeeEstimationBox>
         <FeeEstimationText
+          allowFeeTokenSelection={allowFeeTokenSelection}
           title={"Network fees"}
           tooltipText={tooltipText}
           subtitle={"Includes one-time activation fee"}
@@ -148,33 +151,26 @@ export const CombinedFeeEstimation: FC<CombinedFeeEstimationProps> = ({
 }
 
 interface FeeEstimationTooltipProps {
-  feeToken: Token
+  feeToken: TokenWithBalance
   maxNetworkFee?: string
   maxAccountDeploymentFee?: string
   totalMaxFee?: string
-  feeTokenBalance?: bigint
 }
 
 const TooltipText: FC<FeeEstimationTooltipProps> = ({
   feeToken,
-  feeTokenBalance,
   maxAccountDeploymentFee,
   maxNetworkFee,
   totalMaxFee,
 }) => {
-  if (
-    !maxNetworkFee ||
-    !maxAccountDeploymentFee ||
-    !totalMaxFee ||
-    !feeTokenBalance
-  ) {
+  if (!maxNetworkFee || !maxAccountDeploymentFee || !totalMaxFee || !feeToken) {
     return (
       <P4 color="neutrals.300" fontWeight={"normal"}>
         Network fee is still loading
       </P4>
     )
   }
-  if (feeTokenBalance >= BigInt(totalMaxFee)) {
+  if (feeToken.balance >= BigInt(totalMaxFee)) {
     return (
       <Flex flexDirection="column" gap={3} px={1} py={2}>
         <P4 color="neutrals.300" fontWeight={"normal"}>
@@ -218,7 +214,7 @@ const TooltipText: FC<FeeEstimationTooltipProps> = ({
   return (
     <P4 color="neutrals.500">
       Insufficient balance to pay network fees. You need at least $
-      {bigDecimal.formatEther(BigInt(totalMaxFee) - feeTokenBalance)} ETH more.
+      {bigDecimal.formatEther(BigInt(totalMaxFee) - feeToken.balance)} ETH more.
     </P4>
   )
 }
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimationContainer.tsx b/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimationContainer.tsx
index 23df03a05..da69ef809 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimationContainer.tsx
+++ b/packages/extension/src/ui/features/actions/feeEstimation/CombinedFeeEstimationContainer.tsx
@@ -2,18 +2,18 @@ import { isFunction, isUndefined } from "lodash-es"
 import { FC, useEffect, useMemo } from "react"
 
 import { useTokenAmountToCurrencyValue } from "../../accountTokens/tokenPriceHooks"
-import { useFeeTokenBalance } from "../../accountTokens/useFeeTokenBalance"
 import { useAccount } from "../../accounts/accounts.state"
 import { useAggregatedTxFeesData } from "../transaction/useTransactionSimulatedData"
 import { CombinedFeeEstimation } from "./CombinedFeeEstimation"
 import { ParsedFeeError, getParsedFeeError } from "./feeError"
 import { TransactionsFeeEstimationProps } from "./types"
 import { useMaxFeeEstimation } from "./utils"
-import { useNetworkFeeToken } from "../../accountTokens/tokens.state"
+import { useTokenBalance } from "../../accountTokens/tokens.state"
 
 export const CombinedFeeEstimationContainer: FC<
   TransactionsFeeEstimationProps
 > = ({
+  feeTokenAddress,
   accountAddress,
   transactions,
   actionHash,
@@ -22,7 +22,6 @@ export const CombinedFeeEstimationContainer: FC<
   networkId,
   userClickedAddFunds,
   transactionSimulation,
-  transactionSimulationFee,
   transactionSimulationFeeError,
   transactionSimulationLoading,
 }) => {
@@ -31,37 +30,36 @@ export const CombinedFeeEstimationContainer: FC<
     throw new Error("Account not found")
   }
 
-  const { feeTokenBalance } = useFeeTokenBalance(account)
+  const feeToken = useTokenBalance(feeTokenAddress, account)
 
   const { fee: feeSequencer, error } = useMaxFeeEstimation(
-    transactions,
     actionHash,
+    account,
+    transactions,
     transactionSimulation,
     transactionSimulationLoading,
   )
 
   const { fee, totalFee, totalMaxFee } = useAggregatedTxFeesData(
     transactionSimulation,
-    transactionSimulationFee,
     feeSequencer,
-    true,
   )
   const enoughBalance = useMemo(
     () =>
       Boolean(
         totalMaxFee &&
-          feeTokenBalance &&
-          feeTokenBalance >= BigInt(totalMaxFee),
+          feeToken?.balance &&
+          feeToken?.balance >= BigInt(totalMaxFee),
       ),
-    [feeTokenBalance, totalMaxFee],
+    [feeToken?.balance, totalMaxFee],
   )
 
-  const showFeeError = Boolean(fee && feeTokenBalance && !enoughBalance)
+  const showFeeError = Boolean(fee && feeToken?.balance && !enoughBalance)
   const showEstimateError =
     Boolean(error) || Boolean(transactionSimulationFeeError)
   const showError = showFeeError || showEstimateError
 
-  const hasError = !fee || !feeTokenBalance || !enoughBalance || showError
+  const hasError = !fee || !enoughBalance || showError
   useEffect(() => {
     onErrorChange?.(hasError)
     // only rerun when error changes
@@ -84,10 +82,9 @@ export const CombinedFeeEstimationContainer: FC<
       parsedFeeEstimationError = getParsedFeeError(error)
     }
   }
-  const feeToken = useNetworkFeeToken(networkId)
   const amountCurrencyValue = useTokenAmountToCurrencyValue(
     feeToken ?? undefined,
-    fee?.amount,
+    totalFee,
   )
 
   const totalMaxFeeCurrencyValue = useTokenAmountToCurrencyValue(
@@ -106,7 +103,6 @@ export const CombinedFeeEstimationContainer: FC<
       amountCurrencyValue={amountCurrencyValue}
       fee={fee}
       feeToken={feeToken}
-      feeTokenBalance={feeTokenBalance}
       parsedFeeEstimationError={parsedFeeEstimationError}
       showError={showError}
       showEstimateError={showEstimateError}
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/DeployAccountFeeEstimation.tsx b/packages/extension/src/ui/features/actions/feeEstimation/DeployAccountFeeEstimation.tsx
index 64b980d02..95310aa6e 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/DeployAccountFeeEstimation.tsx
+++ b/packages/extension/src/ui/features/actions/feeEstimation/DeployAccountFeeEstimation.tsx
@@ -2,13 +2,15 @@ import { FC, useEffect, useMemo } from "react"
 
 import { useAccount } from "../../accounts/accounts.state"
 import { useTokenAmountToCurrencyValue } from "../../accountTokens/tokenPriceHooks"
-import { useNetworkFeeToken } from "../../accountTokens/tokens.state"
-import { useFeeTokenBalance } from "../../accountTokens/useFeeTokenBalance"
 import { getParsedFeeError } from "./feeError"
 import { FeeEstimation } from "./FeeEstimation"
 import { TransactionsFeeEstimationProps } from "./types"
 import { useMaxAccountDeploymentFeeEstimation } from "./utils"
-import { EstimatedFees } from "../../../../shared/transactionSimulation/fees/fees.model"
+import { useTokenBalance } from "../../accountTokens/tokens.state"
+import {
+  estimatedFeeToMaxFeeTotal,
+  estimatedFeeToTotal,
+} from "../../../../shared/transactionSimulation/utils"
 
 type DeployAccountFeeEstimationProps = Omit<
   TransactionsFeeEstimationProps,
@@ -17,47 +19,54 @@ type DeployAccountFeeEstimationProps = Omit<
 
 export const DeployAccountFeeEstimation: FC<
   DeployAccountFeeEstimationProps
-> = ({ accountAddress, actionHash, onErrorChange, networkId }) => {
+> = ({
+  feeTokenAddress,
+  accountAddress,
+  actionHash,
+  onErrorChange,
+  networkId,
+}) => {
   const account = useAccount({ address: accountAddress, networkId })
 
   if (!account) {
     throw new Error("Account not found")
   }
 
-  const { feeTokenBalance } = useFeeTokenBalance(account)
+  const feeToken = useTokenBalance(feeTokenAddress, account)
   const { fee, error } = useMaxAccountDeploymentFeeEstimation(
     { address: accountAddress, networkId },
     actionHash,
   )
 
-  const deployAccountFeeToEstimateFeeResponse: EstimatedFees | undefined =
-    useMemo(() => {
-      if (!fee) {
-        return undefined
-      }
+  const deployAccountTotal = useMemo(() => {
+    if (!fee) {
+      return undefined
+    }
+    return estimatedFeeToTotal(fee)
+  }, [fee])
 
-      return {
-        suggestedMaxFee: fee.maxADFee,
-        amount: fee.amount,
-      }
-    }, [fee])
+  const deployAccountMaxFee = useMemo(() => {
+    if (!fee) {
+      return undefined
+    }
+    return estimatedFeeToMaxFeeTotal(fee)
+  }, [fee])
 
   const enoughBalance = useMemo(
     () =>
       Boolean(
-        deployAccountFeeToEstimateFeeResponse?.suggestedMaxFee &&
-          feeTokenBalance &&
-          feeTokenBalance >=
-            BigInt(deployAccountFeeToEstimateFeeResponse.suggestedMaxFee),
+        deployAccountTotal &&
+          feeToken &&
+          feeToken.balance >= deployAccountTotal,
       ),
-    [feeTokenBalance, deployAccountFeeToEstimateFeeResponse],
+    [deployAccountTotal, feeToken],
   )
 
-  const showFeeError = Boolean(fee && feeTokenBalance && !enoughBalance)
+  const showFeeError = Boolean(fee && feeToken && !enoughBalance)
   const showEstimateError = Boolean(error)
   const showError = showFeeError || showEstimateError
 
-  const hasError = !fee || !feeTokenBalance || !enoughBalance || showError
+  const hasError = !fee || !feeToken || !enoughBalance || showError
   useEffect(() => {
     onErrorChange?.(hasError)
   }, [hasError, onErrorChange])
@@ -65,15 +74,14 @@ export const DeployAccountFeeEstimation: FC<
   const parsedFeeEstimationError = showEstimateError
     ? getParsedFeeError(error)
     : undefined
-  const feeToken = useNetworkFeeToken(networkId)
   const amountCurrencyValue = useTokenAmountToCurrencyValue(
     feeToken || undefined,
-    fee?.amount,
+    deployAccountTotal,
   )
 
   const suggestedMaxFeeCurrencyValue = useTokenAmountToCurrencyValue(
     feeToken || undefined,
-    deployAccountFeeToEstimateFeeResponse?.suggestedMaxFee,
+    deployAccountMaxFee,
   )
 
   return (
@@ -81,9 +89,8 @@ export const DeployAccountFeeEstimation: FC<
       {feeToken && (
         <FeeEstimation
           amountCurrencyValue={amountCurrencyValue}
-          fee={deployAccountFeeToEstimateFeeResponse}
+          fee={fee ? { transactions: fee } : undefined}
           feeToken={feeToken}
-          feeTokenBalance={feeTokenBalance}
           parsedFeeEstimationError={parsedFeeEstimationError}
           showError={showError}
           showEstimateError={showEstimateError}
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimation.test.tsx b/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimation.test.tsx
index 3d97a52fc..d15b20ee8 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimation.test.tsx
+++ b/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimation.test.tsx
@@ -15,14 +15,14 @@ describe("FeeEstimation", () => {
   it("should render scenario 1 as expected", async () => {
     render(<FeeEstimation {...feeEstimationFixture1} />)
 
-    expect(screen.getByText(/(Max 0.00063 ETH)/)).toBeInTheDocument()
+    expect(screen.getByText(/(Max 0.00084 ETH)/)).toBeInTheDocument()
     expect(screen.getByText(/0.00021 ETH/)).toBeInTheDocument()
   })
 
   it("should render scenario 2 as expected", async () => {
     render(<FeeEstimation {...feeEstimationFixture2} />)
 
-    expect(screen.getByText(/(Max 0.000000000000063 ETH)/)).toBeInTheDocument()
+    expect(screen.getByText(/(Max 0.000000000000084 ETH)/)).toBeInTheDocument()
     expect(screen.getByText(/0.000000000000021 ETH/)).toBeInTheDocument()
   })
 
@@ -35,7 +35,7 @@ describe("FeeEstimation", () => {
       screen.getByText(/Insufficient funds to pay network fee/),
     ).toBeInTheDocument()
 
-    expect(screen.getByText(/(Max 0.000000000000063 ETH)/)).toBeInTheDocument()
+    expect(screen.getByText(/(Max 0.000000000000084 ETH)/)).toBeInTheDocument()
     expect(screen.getByText(/0.000000000000021 ETH/)).toBeInTheDocument()
 
     expect(window.scrollTo).toHaveBeenCalled()
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimation.tsx b/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimation.tsx
index 8dbe63b89..0e088cfce 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimation.tsx
+++ b/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimation.tsx
@@ -16,12 +16,15 @@ import { TransactionFailureAccordion } from "./ui/TransactionFailureAccordion"
 import { WaitingForFunds } from "./ui/WaitingForFunds"
 import { getTooltipText } from "./utils"
 import { FeeEstimationProps } from "./feeEstimation.model"
+import {
+  estimatedFeesToMaxFeeTotal,
+  estimatedFeesToTotal,
+} from "../../../../shared/transactionSimulation/utils"
 
 export const FeeEstimation: FC<FeeEstimationProps> = ({
   amountCurrencyValue,
   fee,
   feeToken,
-  feeTokenBalance,
   parsedFeeEstimationError,
   showError,
   showFeeError,
@@ -29,25 +32,27 @@ export const FeeEstimation: FC<FeeEstimationProps> = ({
   userClickedAddFunds,
   needsDeploy,
 }) => {
+  const amount = fee && estimatedFeesToTotal(fee)
+  const maxFee = fee && estimatedFeesToMaxFeeTotal(fee)
+
   const tooltipText = useMemo(() => {
-    if (fee) {
-      const suggestedMaxFeeBN = BigInt(fee.suggestedMaxFee)
-      return getTooltipText(suggestedMaxFeeBN, feeTokenBalance)
+    if (maxFee) {
+      return getTooltipText(maxFee, feeToken.balance)
     }
-  }, [fee, feeTokenBalance])
+  }, [feeToken.balance, maxFee])
   const primaryText = useMemo(() => {
-    if (fee) {
+    if (amount) {
       return (
-        <TextWithAmount amount={fee.amount} decimals={feeToken.decimals}>
+        <TextWithAmount amount={amount} decimals={feeToken.decimals}>
           <>
             {feeToken ? (
               prettifyTokenAmount({
-                amount: fee.amount,
+                amount,
                 decimals: feeToken.decimals,
                 symbol: feeToken.symbol,
               })
             ) : (
-              <>{fee.amount} Unknown</>
+              <>{amount} Unknown</>
             )}
             {amountCurrencyValue !== undefined &&
               ` (${prettifyCurrencyValue(amountCurrencyValue)})`}
@@ -55,24 +60,21 @@ export const FeeEstimation: FC<FeeEstimationProps> = ({
         </TextWithAmount>
       )
     }
-  }, [amountCurrencyValue, fee, feeToken])
+  }, [amount, amountCurrencyValue, feeToken])
   const secondaryText = useMemo(() => {
-    if (fee) {
+    if (maxFee) {
       return (
-        <TextWithAmount
-          amount={fee.suggestedMaxFee}
-          decimals={feeToken.decimals}
-        >
+        <TextWithAmount amount={maxFee} decimals={feeToken.decimals}>
           <>
             Max&nbsp;
             {feeToken ? (
               prettifyTokenAmount({
-                amount: fee.suggestedMaxFee,
+                amount: maxFee,
                 decimals: feeToken.decimals,
                 symbol: feeToken.symbol,
               })
             ) : (
-              <>{fee.suggestedMaxFee} Unknown</>
+              <>{maxFee} Unknown</>
             )}
             {suggestedMaxFeeCurrencyValue !== undefined &&
               ` (Max ${prettifyCurrencyValue(suggestedMaxFeeCurrencyValue)})`}
@@ -80,8 +82,8 @@ export const FeeEstimation: FC<FeeEstimationProps> = ({
         </TextWithAmount>
       )
     }
-  }, [fee, feeToken, suggestedMaxFeeCurrencyValue])
-  const isLoading = !fee || isUndefined(feeTokenBalance) // because 0n is a valid balance but falsy
+  }, [feeToken, maxFee, suggestedMaxFeeCurrencyValue])
+  const isLoading = !fee || isUndefined(feeToken.balance) // because 0n is a valid balance but falsy
 
   if (!showError) {
     return needsDeploy ? (
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimationContainer.tsx b/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimationContainer.tsx
index 441c48030..9d79c2e43 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimationContainer.tsx
+++ b/packages/extension/src/ui/features/actions/feeEstimation/FeeEstimationContainer.tsx
@@ -3,15 +3,15 @@ import { FC, useEffect, useMemo } from "react"
 
 import { useAccount } from "../../accounts/accounts.state"
 import { useTokenAmountToCurrencyValue } from "../../accountTokens/tokenPriceHooks"
-import { useNetworkFeeToken } from "../../accountTokens/tokens.state"
-import { useFeeTokenBalance } from "../../accountTokens/useFeeTokenBalance"
 import { useAggregatedTxFeesData } from "../transaction/useTransactionSimulatedData"
 import { ParsedFeeError, getParsedFeeError } from "./feeError"
 import { FeeEstimation } from "./FeeEstimation"
 import { TransactionsFeeEstimationProps } from "./types"
 import { useMaxFeeEstimation } from "./utils"
+import { useTokenBalance } from "../../accountTokens/tokens.state"
 
 export const FeeEstimationContainer: FC<TransactionsFeeEstimationProps> = ({
+  feeTokenAddress,
   accountAddress,
   networkId,
   onErrorChange,
@@ -20,7 +20,6 @@ export const FeeEstimationContainer: FC<TransactionsFeeEstimationProps> = ({
   actionHash,
   userClickedAddFunds,
   transactionSimulation,
-  transactionSimulationFee,
   transactionSimulationFeeError,
   transactionSimulationLoading,
   needsDeploy = false,
@@ -30,36 +29,38 @@ export const FeeEstimationContainer: FC<TransactionsFeeEstimationProps> = ({
     throw new Error("Account not found")
   }
 
-  const { feeTokenBalance } = useFeeTokenBalance(account)
+  const feeToken = useTokenBalance(feeTokenAddress, account)
   const { fee: feeSequencer, error } = useMaxFeeEstimation(
-    transactions,
     actionHash,
+    account,
+    transactions,
     transactionSimulation,
     transactionSimulationLoading,
   )
 
-  const { fee } = useAggregatedTxFeesData(
+  const { totalMaxFee, totalFee, fee } = useAggregatedTxFeesData(
     transactionSimulation,
-    transactionSimulationFee,
     feeSequencer,
   )
 
   const enoughBalance = useMemo(
     () =>
       Boolean(
-        fee?.suggestedMaxFee &&
-          feeTokenBalance &&
-          feeTokenBalance >= BigInt(fee.suggestedMaxFee),
+        totalMaxFee &&
+          feeToken?.balance &&
+          feeToken?.balance >= BigInt(totalMaxFee),
       ),
-    [feeTokenBalance, fee?.suggestedMaxFee],
+    [feeToken?.balance, totalMaxFee],
   )
 
-  const showFeeError = Boolean(fee && feeTokenBalance && !enoughBalance)
+  const showFeeError = Boolean(
+    totalMaxFee && feeToken?.balance && !enoughBalance,
+  )
   const showEstimateError =
     Boolean(error) || Boolean(transactionSimulationFeeError)
   const showError = showFeeError || showEstimateError
 
-  const hasError = !fee || !feeTokenBalance || !enoughBalance || showError
+  const hasError = !totalMaxFee || !enoughBalance || showError
   useEffect(() => {
     onErrorChange?.(hasError)
   }, [hasError, onErrorChange])
@@ -81,15 +82,14 @@ export const FeeEstimationContainer: FC<TransactionsFeeEstimationProps> = ({
       parsedFeeEstimationError = getParsedFeeError(error)
     }
   }
-  const feeToken = useNetworkFeeToken(networkId)
 
   const amountCurrencyValue = useTokenAmountToCurrencyValue(
     feeToken || undefined,
-    fee?.amount,
+    totalFee,
   )
   const suggestedMaxFeeCurrencyValue = useTokenAmountToCurrencyValue(
     feeToken || undefined,
-    fee?.suggestedMaxFee,
+    totalMaxFee,
   )
 
   return (
@@ -99,7 +99,6 @@ export const FeeEstimationContainer: FC<TransactionsFeeEstimationProps> = ({
           amountCurrencyValue={amountCurrencyValue}
           fee={fee}
           feeToken={feeToken}
-          feeTokenBalance={feeTokenBalance}
           parsedFeeEstimationError={parsedFeeEstimationError}
           showError={showError}
           showEstimateError={showEstimateError}
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/combinedFeeEstimation.ts b/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/combinedFeeEstimation.ts
index 88b51f1e5..0b31c96e6 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/combinedFeeEstimation.ts
+++ b/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/combinedFeeEstimation.ts
@@ -1,6 +1,7 @@
+import { ETH_TOKEN_ADDRESS } from "../../../../../shared/network/constants"
 import { CombinedFeeEstimationProps } from "../CombinedFeeEstimation"
 import { getParsedFeeError } from "../feeError"
-import { feeToken } from "./feeToken"
+import { feeTokenWithBalance } from "./feeToken"
 
 const parsedFeeEstimationError1 = getParsedFeeError(
   'Error in the called contract (0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7):\nError at pc=0:104:\nGot an exception while executing a hint.\nCairo traceback (most recent call last):\nUnknown location (pc=0:1678)\nUnknown location (pc=0:1664)\n\nError in the called contract (0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7):\nError at pc=0:9:\nGot an exception while executing a hint.\nCairo traceback (most recent call last):\nUnknown location (pc=0:1351)\nUnknown location (pc=0:1328)\nUnknown location (pc=0:915)\n\nTraceback (most recent call last):\n  File "<hint32>", line 3, in <module>\nAssertionError: assert_not_zero failed: 0 = 0.',
@@ -8,13 +9,18 @@ const parsedFeeEstimationError1 = getParsedFeeError(
 
 export const combinedFeeEstimationFixture1: CombinedFeeEstimationProps = {
   fee: {
-    amount: "115227362374192",
-    suggestedMaxFee: "691364174245152",
-    accountDeploymentFee: "491837039091068",
-    maxADFee: "1475511117273204",
+    transactions: {
+      amount: 10515252525n,
+      pricePerUnit: 20n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
+    deployment: {
+      amount: 10515252525n,
+      pricePerUnit: 20n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
   },
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   showError: false,
   showEstimateError: false,
   showFeeError: false,
@@ -25,13 +31,18 @@ export const combinedFeeEstimationFixture1: CombinedFeeEstimationProps = {
 
 export const combinedFeeEstimationFixture2: CombinedFeeEstimationProps = {
   fee: {
-    amount: "11522",
-    suggestedMaxFee: "69136",
-    accountDeploymentFee: "49183",
-    maxADFee: "147551",
+    transactions: {
+      amount: 1051n,
+      pricePerUnit: 20n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
+    deployment: {
+      amount: 1051n,
+      pricePerUnit: 20n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
   },
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   showError: false,
   showEstimateError: false,
   showFeeError: false,
@@ -42,13 +53,18 @@ export const combinedFeeEstimationFixture2: CombinedFeeEstimationProps = {
 
 export const combinedFeeEstimationFixture3: CombinedFeeEstimationProps = {
   fee: {
-    amount: "11522",
-    suggestedMaxFee: "69136",
-    accountDeploymentFee: "49183",
-    maxADFee: "147551",
+    transactions: {
+      amount: 1051n,
+      pricePerUnit: 20n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
+    deployment: {
+      amount: 1051n,
+      pricePerUnit: 20n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
   },
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   showError: true,
   showEstimateError: false,
   showFeeError: true,
@@ -59,13 +75,18 @@ export const combinedFeeEstimationFixture3: CombinedFeeEstimationProps = {
 
 export const combinedFeeEstimationFixture4: CombinedFeeEstimationProps = {
   fee: {
-    amount: "11522",
-    suggestedMaxFee: "69136",
-    accountDeploymentFee: "49183",
-    maxADFee: "147551",
+    transactions: {
+      amount: 1051n,
+      pricePerUnit: 20n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
+    deployment: {
+      amount: 1051n,
+      pricePerUnit: 20n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
   },
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   parsedFeeEstimationError: parsedFeeEstimationError1,
   showError: true,
   showEstimateError: true,
@@ -75,8 +96,7 @@ export const combinedFeeEstimationFixture4: CombinedFeeEstimationProps = {
 
 export const combinedFeeEstimationFixture5: CombinedFeeEstimationProps = {
   fee: undefined,
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   parsedFeeEstimationError: parsedFeeEstimationError1,
   showError: true,
   showEstimateError: true,
@@ -86,8 +106,7 @@ export const combinedFeeEstimationFixture5: CombinedFeeEstimationProps = {
 
 export const combinedFeeEstimationFixture6: CombinedFeeEstimationProps = {
   fee: undefined,
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   parsedFeeEstimationError: parsedFeeEstimationError1,
   showError: true,
   showEstimateError: true,
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/feeEstimation.ts b/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/feeEstimation.ts
index ebc58903b..43c00c53f 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/feeEstimation.ts
+++ b/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/feeEstimation.ts
@@ -1,6 +1,7 @@
+import { ETH_TOKEN_ADDRESS } from "../../../../../shared/network/constants"
 import { getParsedFeeError } from "../feeError"
 import { FeeEstimationProps } from "../feeEstimation.model"
-import { feeToken } from "./feeToken"
+import { feeTokenWithBalance } from "./feeToken"
 
 const parsedFeeEstimationError1 = getParsedFeeError(
   'Error in the called contract (0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7):\nError at pc=0:104:\nGot an exception while executing a hint.\nCairo traceback (most recent call last):\nUnknown location (pc=0:1678)\nUnknown location (pc=0:1664)\n\nError in the called contract (0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7):\nError at pc=0:9:\nGot an exception while executing a hint.\nCairo traceback (most recent call last):\nUnknown location (pc=0:1351)\nUnknown location (pc=0:1328)\nUnknown location (pc=0:915)\n\nTraceback (most recent call last):\n  File "<hint32>", line 3, in <module>\nAssertionError: assert_not_zero failed: 0 = 0.',
@@ -8,11 +9,13 @@ const parsedFeeEstimationError1 = getParsedFeeError(
 
 export const feeEstimationFixture1: FeeEstimationProps = {
   fee: {
-    amount: "210205026034208",
-    suggestedMaxFee: "630615078102624",
+    transactions: {
+      amount: 6568907063569n,
+      pricePerUnit: 32n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
   },
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   showError: false,
   showEstimateError: false,
   showFeeError: false,
@@ -21,11 +24,13 @@ export const feeEstimationFixture1: FeeEstimationProps = {
 
 export const feeEstimationFixture2: FeeEstimationProps = {
   fee: {
-    amount: "21020",
-    suggestedMaxFee: "63061",
+    transactions: {
+      amount: 1051n,
+      pricePerUnit: 20n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
   },
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   showError: false,
   showEstimateError: false,
   showFeeError: false,
@@ -34,11 +39,13 @@ export const feeEstimationFixture2: FeeEstimationProps = {
 
 export const feeEstimationFixture3: FeeEstimationProps = {
   fee: {
-    amount: "21020",
-    suggestedMaxFee: "63061",
+    transactions: {
+      amount: 1051n,
+      pricePerUnit: 20n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
   },
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   showError: true,
   showEstimateError: false,
   showFeeError: true,
@@ -47,11 +54,13 @@ export const feeEstimationFixture3: FeeEstimationProps = {
 
 export const feeEstimationFixture4: FeeEstimationProps = {
   fee: {
-    amount: "21020",
-    suggestedMaxFee: "63061",
+    transactions: {
+      amount: 1051n,
+      pricePerUnit: 20n,
+      feeTokenAddress: ETH_TOKEN_ADDRESS,
+    },
   },
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   parsedFeeEstimationError: parsedFeeEstimationError1,
   showError: true,
   showEstimateError: true,
@@ -61,8 +70,7 @@ export const feeEstimationFixture4: FeeEstimationProps = {
 
 export const feeEstimationFixture5: FeeEstimationProps = {
   fee: undefined,
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   parsedFeeEstimationError: parsedFeeEstimationError1,
   showError: true,
   showEstimateError: true,
@@ -72,8 +80,7 @@ export const feeEstimationFixture5: FeeEstimationProps = {
 
 export const feeEstimationFixture6: FeeEstimationProps = {
   fee: undefined,
-  feeToken,
-  feeTokenBalance: BigInt("9875209405595349"),
+  feeToken: feeTokenWithBalance,
   parsedFeeEstimationError: parsedFeeEstimationError1,
   showError: true,
   showEstimateError: true,
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/feeToken.ts b/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/feeToken.ts
index ab57ce590..b270ddbaf 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/feeToken.ts
+++ b/packages/extension/src/ui/features/actions/feeEstimation/__fixtures__/feeToken.ts
@@ -1,4 +1,15 @@
 import { Token } from "../../../../../shared/token/__new/types/token.model"
-import { getFeeToken } from "../../../../../shared/token/__new/utils"
+import { parsedDefaultTokens } from "../../../../../shared/token/__new/utils"
+
+export const getFeeToken = (networkId: string) =>
+  parsedDefaultTokens.find(
+    ({ symbol, networkId: network }) =>
+      symbol === "ETH" && network === networkId,
+  )
 
 export const feeToken = getFeeToken("goerli-alpha") as Token
+
+export const feeTokenWithBalance = {
+  ...feeToken,
+  balance: BigInt("9875209405595349"),
+}
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/feeError.test.ts b/packages/extension/src/ui/features/actions/feeEstimation/feeError.test.ts
index b289b4aa7..dee1dbb53 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/feeError.test.ts
+++ b/packages/extension/src/ui/features/actions/feeEstimation/feeError.test.ts
@@ -7,62 +7,56 @@ import { getParsedFeeError } from "./feeError"
 
 describe("features/actions/feeEstimation/feeError", () => {
   describe("getParsedFeeError", () => {
-    describe("when valid", () => {
-      test("returns expected error shape", () => {
-        test("String", () => {
-          expect(getParsedFeeError("foo")).toEqual({
-            message: "foo",
-          })
-        })
-        test("Error", () => {
-          expect(getParsedFeeError(new Error("foo"))).toEqual({
-            message: "foo",
-          })
-        })
-        test("GatewayError", () => {
-          expect(
-            getParsedFeeError(
-              new GatewayError("foo", "StarknetErrorCode.FOO_BAR_BAZ"),
-            ),
-          ).toEqual({
-            message: "foo",
-            title: "Foo bar baz",
-          })
-        })
-        test("FetcherError", () => {
-          expect(
-            getParsedFeeError(
-              fetcherError(
-                "foo",
-                new Response(),
-                JSON.stringify({ status: "fooBarBaz", message: "foo" }),
-              ),
-            ),
-          ).toEqual({
-            message: "foo",
-            title: "Foo bar baz",
-          })
-        })
+    test("returns expected error shape for String", () => {
+      expect(getParsedFeeError("foo")).toEqual({
+        message: "foo",
       })
     })
-    describe("when invalid", () => {
-      test("returns UNKNOWN_ERROR_MESSAGE", () => {
-        expect(getParsedFeeError()).toEqual({ message: UNKNOWN_ERROR_MESSAGE })
-        expect(getParsedFeeError({})).toEqual({
-          message: UNKNOWN_ERROR_MESSAGE,
-        })
-        // @ts-expect-error intentionally passing invalid argument(s) for testing
-        expect(getParsedFeeError(null)).toEqual({
-          message: UNKNOWN_ERROR_MESSAGE,
-        })
-        // @ts-expect-error intentionally passing invalid argument(s) for testing
-        expect(getParsedFeeError([])).toEqual({
-          message: UNKNOWN_ERROR_MESSAGE,
-        })
-        // @ts-expect-error intentionally passing invalid argument(s) for testing
-        expect(getParsedFeeError(123)).toEqual({
-          message: UNKNOWN_ERROR_MESSAGE,
-        })
+    test("returns expected error shape for Error", () => {
+      expect(getParsedFeeError(new Error("foo"))).toEqual({
+        message: "foo",
+      })
+    })
+    test("returns expected error shape for GatewayError", () => {
+      expect(
+        getParsedFeeError(
+          new GatewayError("foo", "StarknetErrorCode.FOO_BAR_BAZ"),
+        ),
+      ).toEqual({
+        message: "foo",
+        title: "Foo bar baz",
+      })
+    })
+    test("returns expected error shape for FetcherError", () => {
+      expect(
+        getParsedFeeError(
+          fetcherError(
+            "foo",
+            new Response(),
+            JSON.stringify({ status: "fooBarBaz", message: "foo" }),
+          ),
+        ),
+      ).toEqual({
+        message: "foo",
+        title: "Foo bar baz",
+      })
+    })
+    test("returns UNKNOWN_ERROR_MESSAGE when invalid", () => {
+      expect(getParsedFeeError()).toEqual({ message: UNKNOWN_ERROR_MESSAGE })
+      expect(getParsedFeeError({})).toEqual({
+        message: UNKNOWN_ERROR_MESSAGE,
+      })
+      // @ts-expect-error intentionally passing invalid argument(s) for testing
+      expect(getParsedFeeError(null)).toEqual({
+        message: UNKNOWN_ERROR_MESSAGE,
+      })
+      // @ts-expect-error intentionally passing invalid argument(s) for testing
+      expect(getParsedFeeError([])).toEqual({
+        message: UNKNOWN_ERROR_MESSAGE,
+      })
+      // @ts-expect-error intentionally passing invalid argument(s) for testing
+      expect(getParsedFeeError(123)).toEqual({
+        message: UNKNOWN_ERROR_MESSAGE,
       })
     })
   })
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/feeEstimation.model.ts b/packages/extension/src/ui/features/actions/feeEstimation/feeEstimation.model.ts
index 368d53c5c..6d7c4e79b 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/feeEstimation.model.ts
+++ b/packages/extension/src/ui/features/actions/feeEstimation/feeEstimation.model.ts
@@ -1,12 +1,11 @@
-import { Token } from "../../../../shared/token/__new/types/token.model"
+import { TokenWithBalance } from "@argent/shared"
 import { EstimatedFees } from "../../../../shared/transactionSimulation/fees/fees.model"
 import { ParsedFeeError } from "./feeError"
 
 export interface FeeEstimationProps {
   amountCurrencyValue?: string
   fee?: EstimatedFees
-  feeToken: Token
-  feeTokenBalance?: bigint
+  feeToken: TokenWithBalance
   parsedFeeEstimationError?: ParsedFeeError
   showError: boolean
   showEstimateError: boolean
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/types.ts b/packages/extension/src/ui/features/actions/feeEstimation/types.ts
index abbd81d75..bbeeff8d3 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/types.ts
+++ b/packages/extension/src/ui/features/actions/feeEstimation/types.ts
@@ -1,7 +1,9 @@
 import { Call } from "starknet"
 import { ApiTransactionBulkSimulationResponse } from "../../../../shared/transactionSimulation/types"
 import { EstimatedFees } from "../../../../shared/transactionSimulation/fees/fees.model"
+import { Address } from "@argent/shared"
 export interface TransactionsFeeEstimationProps {
+  feeTokenAddress: Address
   transactions: Call | Call[]
   defaultMaxFee?: bigint
   onChange?: (fee: bigint) => void
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/ui/FeeEstimationText.tsx b/packages/extension/src/ui/features/actions/feeEstimation/ui/FeeEstimationText.tsx
index 4e48b33cd..4f52af93c 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/ui/FeeEstimationText.tsx
+++ b/packages/extension/src/ui/features/actions/feeEstimation/ui/FeeEstimationText.tsx
@@ -1,6 +1,6 @@
 import { L2, P4, icons } from "@argent/ui"
 import {
-  Center,
+  // Center,
   Flex,
   Spinner,
   Text,
@@ -8,10 +8,12 @@ import {
   Tooltip,
 } from "@chakra-ui/react"
 import { FC, ReactNode } from "react"
+// import { TokenPicker } from "./TokenPicker"
 
 const { InfoIcon } = icons
 
 export interface FeeEstimationTextProps extends ThemingProps<"Flex"> {
+  allowFeeTokenSelection?: boolean
   title?: ReactNode
   subtitle?: ReactNode
   tooltipText?: ReactNode
@@ -21,6 +23,7 @@ export interface FeeEstimationTextProps extends ThemingProps<"Flex"> {
 }
 
 export const FeeEstimationText: FC<FeeEstimationTextProps> = ({
+  // allowFeeTokenSelection = true,
   colorScheme = "neutrals",
   tooltipText,
   title = "Estimated fee",
@@ -32,43 +35,58 @@ export const FeeEstimationText: FC<FeeEstimationTextProps> = ({
   return (
     <Flex flex={1} flexDirection="column" gap={1}>
       <Flex flexDirection={"row"} justifyContent="space-between">
-        <Center gap="5px" mr={2} flexShrink={0}>
-          <Flex alignItems="center" justifyContent="center" gap="5px">
-            <P4 fontWeight="medium" color={`${colorScheme}.300`} noOfLines={1}>
-              {title}
-            </P4>
-          </Flex>
-          {tooltipText && (
-            <Tooltip label={tooltipText}>
-              <Text
+        <Flex flexDirection="column" gap={1}>
+          <Flex alignItems="center" gap="5px" mr={2} flexShrink={0}>
+            <Flex alignItems="center" justifyContent="center" gap="5px">
+              <P4
+                fontWeight="medium"
                 color={`${colorScheme}.300`}
-                fontSize={"2xs"}
-                cursor="pointer"
-                _hover={{ color: "white" }}
-                aria-label={`Information about ${title}`}
+                noOfLines={1}
               >
-                <InfoIcon />
-              </Text>
-            </Tooltip>
-          )}
-        </Center>
+                {title}
+              </P4>
+            </Flex>
+            {tooltipText && (
+              <Tooltip label={tooltipText}>
+                <Text
+                  color={`${colorScheme}.300`}
+                  fontSize={"2xs"}
+                  cursor="pointer"
+                  _hover={{ color: "white" }}
+                  aria-label={`Information about ${title}`}
+                >
+                  <InfoIcon />
+                </Text>
+              </Tooltip>
+            )}
+          </Flex>
+          {subtitle && <L2 color={`${colorScheme}.300`}>{subtitle}</L2>}
+        </Flex>
         {isLoading ? (
           <Spinner size={"sm"} />
         ) : (
-          <Flex
-            gap="1"
-            alignItems="center"
-            direction="row-reverse"
-            flexWrap="wrap"
-          >
-            {primaryText && <P4 fontWeight="medium">{primaryText}</P4>}
+          <Flex gap="1" alignItems="end" direction="column" flexWrap="wrap">
+            {primaryText && (
+              <Flex gap="2" mr={2} alignItems={"center"}>
+                {/* {!allowFeeTokenSelection && (
+                  <TokenPicker
+                    selected={{
+                      name: "Starknet Network",
+                      symbol: "ETH",
+                      image: "https://argent.xyz/images/eth.svg",
+                    }}
+                    onClick={() => setIsTokenPickerOpen(true)}
+                  />
+                )} */}
+                <P4 fontWeight="medium">{primaryText}</P4>
+              </Flex>
+            )}
             {secondaryText && (
               <L2 color={`${colorScheme}.300`}>{secondaryText}</L2>
             )}
           </Flex>
         )}
       </Flex>
-      {subtitle && <L2 color={`${colorScheme}.300`}>{subtitle}</L2>}
     </Flex>
   )
 }
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/ui/TokenPicker.tsx b/packages/extension/src/ui/features/actions/feeEstimation/ui/TokenPicker.tsx
new file mode 100644
index 000000000..b81c14d3b
--- /dev/null
+++ b/packages/extension/src/ui/features/actions/feeEstimation/ui/TokenPicker.tsx
@@ -0,0 +1,36 @@
+import { Token } from "@argent/shared"
+import { icons } from "@argent/ui"
+
+import { Flex, Img } from "@chakra-ui/react"
+import { FC } from "react"
+
+const { DropdownDownIcon } = icons
+
+interface TokenPickerProps {
+  selected: Token
+  onClick: () => void
+}
+
+export const TokenPicker: FC<TokenPickerProps> = ({ onClick, selected }) => {
+  const { image, name } = selected
+  return (
+    <Flex
+      alignItems="center"
+      cursor="pointer"
+      rounded={"full"}
+      backgroundColor={"neutrals.700"}
+      width="fit-content"
+      color={"white"}
+      userSelect={"none"}
+    >
+      <DropdownDownIcon height="10px" width="10px" ml="6px" mr="4px" />
+      <Img
+        src={image}
+        alt={name}
+        onClick={onClick}
+        height="18px"
+        width="18px"
+      />
+    </Flex>
+  )
+}
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/ui/TokenPickerScreen.tsx b/packages/extension/src/ui/features/actions/feeEstimation/ui/TokenPickerScreen.tsx
new file mode 100644
index 000000000..7eaab8fa1
--- /dev/null
+++ b/packages/extension/src/ui/features/actions/feeEstimation/ui/TokenPickerScreen.tsx
@@ -0,0 +1,76 @@
+import { TokenWithBalance } from "@argent/shared"
+import { NavigationContainer } from "@argent/ui"
+import { FC, ReactNode } from "react"
+import { PageWrapper } from "../../../../components/Page"
+import { Grid, Text } from "@chakra-ui/react"
+import { TokenOption } from "../../../../components/TokenOption"
+import { getTokenIconUrl } from "../../../accountTokens/TokenIcon"
+import { formatTokenBalance } from "../../../../services/tokens/utils"
+
+function toTokenView(token: TokenWithBalance): {
+  address: string
+  name: string
+  symbol: string
+  balance: string
+  image: string
+} {
+  return {
+    ...token,
+    image: getTokenIconUrl({ ...token, url: token.image }),
+    balance: `${formatTokenBalance(6, token.balance, token.decimals)} ${
+      token.symbol
+    }`,
+  }
+}
+
+interface MinBalances {
+  [address: string]: bigint
+}
+
+interface TokenPickerScreenProps {
+  rightButton?: ReactNode
+
+  tokens: TokenWithBalance[]
+  minBalances?: MinBalances
+
+  onSelect: (token: TokenWithBalance) => void
+}
+
+export const TokenPickerScreen: FC<TokenPickerScreenProps> = ({
+  rightButton,
+  tokens,
+  minBalances = {},
+  onSelect,
+}) => {
+  return (
+    <NavigationContainer title={"Select a token"} rightButton={rightButton}>
+      <PageWrapper>
+        <Grid templateColumns="1fr" gap={4}>
+          {tokens.map((token) => {
+            const tokenView = toTokenView(token)
+            const minBalance = minBalances[token.address] ?? BigInt(1)
+            const disabled = token.balance < minBalance
+            return (
+              <TokenOption
+                disabled={disabled}
+                key={tokenView.address}
+                imageSrc={tokenView.image}
+                name={tokenView.name}
+                symbol={tokenView.symbol}
+                balance={tokenView.balance}
+                ccyBalance={
+                  disabled ? (
+                    <Text color={"red.50"}>Insufficient funds</Text>
+                  ) : (
+                    tokenView.balance
+                  )
+                }
+                onClick={() => onSelect(token)}
+              />
+            )
+          })}
+        </Grid>
+      </PageWrapper>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/actions/feeEstimation/utils.tsx b/packages/extension/src/ui/features/actions/feeEstimation/utils.tsx
index 69bf94342..3c6ee6bfa 100644
--- a/packages/extension/src/ui/features/actions/feeEstimation/utils.tsx
+++ b/packages/extension/src/ui/features/actions/feeEstimation/utils.tsx
@@ -2,17 +2,19 @@ import { bigDecimal, useConditionallyEnabledSWR } from "@argent/shared"
 import { Call, UniversalDeployerContractPayload } from "starknet"
 import useSWR from "swr"
 
-import { DeployAccountEstimateFeeResponse } from "../../../../shared/messages/TransactionMessage"
-import { DeclareContract } from "../../../../shared/udc/type"
+import { DeclareContract } from "../../../../shared/udc/schema"
 import { ErrorObject } from "../../../../shared/utils/error"
 import { BaseWalletAccount } from "../../../../shared/wallet.model"
 import {
   getAccountDeploymentEstimatedFee,
   getDeclareContractEstimatedFee,
   getDeployContractEstimatedFee,
-  getEstimatedFeeFromSequencer,
+  getEstimatedFee,
 } from "../../../services/backgroundTransactions"
-import { EstimatedFees } from "../../../../shared/transactionSimulation/fees/fees.model"
+import {
+  EstimatedFee,
+  EstimatedFees,
+} from "../../../../shared/transactionSimulation/fees/fees.model"
 import { ApiTransactionBulkSimulationResponse } from "../../../../shared/transactionSimulation/types"
 import { RefreshInterval } from "../../../../shared/config"
 
@@ -21,8 +23,9 @@ interface UseMaxFeeEstimationReturnProps {
   error: ErrorObject | undefined
 }
 export const useMaxFeeEstimation = (
-  transactions: Call | Call[],
   actionHash: string,
+  account: BaseWalletAccount,
+  transactions: Call | Call[],
   transactionSimulation?: ApiTransactionBulkSimulationResponse,
   isSimulationLoading?: boolean,
 ): UseMaxFeeEstimationReturnProps => {
@@ -30,7 +33,7 @@ export const useMaxFeeEstimation = (
     !isSimulationLoading &&
       (!transactionSimulation || transactionSimulation.length === 0),
     [actionHash, "feeEstimation"],
-    () => transactions && getEstimatedFeeFromSequencer(transactions),
+    () => transactions && getEstimatedFee(transactions, account),
     {
       suspense: false,
       refreshInterval: RefreshInterval.FAST * 1000, // 20 seconds
@@ -41,7 +44,7 @@ export const useMaxFeeEstimation = (
 }
 
 interface UseMaxAccountDeploymentFeeEstimationReturnProps {
-  fee: DeployAccountEstimateFeeResponse | undefined
+  fee: EstimatedFee | undefined
   error: ErrorObject | undefined
 }
 
diff --git a/packages/extension/src/ui/features/actions/hooks/useActionScreen.ts b/packages/extension/src/ui/features/actions/hooks/useActionScreen.ts
index d9bea8fe0..5ca42f7ff 100644
--- a/packages/extension/src/ui/features/actions/hooks/useActionScreen.ts
+++ b/packages/extension/src/ui/features/actions/hooks/useActionScreen.ts
@@ -41,11 +41,11 @@ export const useActionScreen = () => {
 
   const reject = useCallback(async () => {
     /** TODO: refactor: move tracking into service or action handler */
-    await analytics.track("rejectedTransaction", {
+    void analytics.track("rejectedTransaction", {
       networkId: selectedAccount?.networkId || "unknown",
       host: await getOriginatingHost(),
     })
-    action && (await clientActionService.reject(action.meta.hash))
+    action && void clientActionService.reject(action.meta.hash)
   }, [action, selectedAccount?.networkId])
 
   const rejectAndClose = useCallback(async () => {
diff --git a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/AccountNetworkInfoArgentX.tsx b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/AccountNetworkInfoArgentX.tsx
index d11ed7a04..17c2ecec4 100644
--- a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/AccountNetworkInfoArgentX.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/AccountNetworkInfoArgentX.tsx
@@ -2,8 +2,8 @@ import { P4, typographyStyles } from "@argent/ui"
 import { Flex, VStack } from "@chakra-ui/react"
 
 import { WalletAccount } from "../../../../../shared/wallet.model"
-import { formatTruncatedAddress } from "../../../../services/addresses"
 import { PrettyAccountAddressArgentX } from "../../../accounts/PrettyAccountAddressArgentX"
+import { formatTruncatedAddress } from "@argent/shared"
 
 interface AccountNetworkInfoArgentXProps {
   account: WalletAccount
diff --git a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreen.test.tsx b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreen.test.tsx
index 579c2d8a4..57679bdf2 100644
--- a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreen.test.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreen.test.tsx
@@ -17,10 +17,6 @@ import { ApproveTransactionScreen } from "./ApproveTransactionScreen"
 import { getDisplayWarnAndReasonForTransactionReview } from "../../../../../shared/transactionReview.service"
 import { ApproveTransactionScreenProps } from "./approveTransactionScreen.model"
 
-/**
- * @vitest-environment jsdom
- */
-
 const renderWithProps = async (
   props: TransactionActionFixture &
     Pick<ApproveTransactionScreenProps, "onReject" | "onSubmit">,
diff --git a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreen.tsx b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreen.tsx
index ef58b5e82..eef8b2fbf 100644
--- a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreen.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreen.tsx
@@ -3,7 +3,6 @@ import { WarningIcon } from "@chakra-ui/icons"
 import { Center, Collapse } from "@chakra-ui/react"
 import { FC, Suspense } from "react"
 
-import { normalizeAddress } from "../../../../services/addresses"
 import { MultisigPendingTxModal } from "../../../multisig/MultisigPendingTxModal"
 import { AccountNetworkInfoArgentX } from "./AccountNetworkInfoArgentX"
 import { BalanceChangeOverviewArgentX } from "./BalanceChangeOverviewArgentX"
@@ -14,6 +13,7 @@ import { SimulationLoadingBanner } from "./SimulationLoadingBanner"
 import { TransactionActions } from "./TransactionActions"
 import { TransactionBanner } from "./TransactionBanner"
 import { ApproveTransactionScreenProps } from "./approveTransactionScreen.model"
+import { normalizeAddress } from "@argent/shared"
 
 export const ApproveTransactionScreen: FC<ApproveTransactionScreenProps> = ({
   actionHash,
diff --git a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreenContainer.tsx b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreenContainer.tsx
index 454b35a6b..4afa3cd4e 100644
--- a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreenContainer.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ApproveTransactionScreenContainer.tsx
@@ -25,6 +25,7 @@ import { useEstimatedFees } from "../../feeEstimation/useEstimatedFees"
 import { WithActionScreenErrorFooter } from "./WithActionScreenErrorFooter"
 import { ApproveTransactionScreenContainerProps } from "./approveTransactionScreen.model"
 import { ensureArray } from "@argent/shared"
+import { ETH_TOKEN_ADDRESS } from "../../../../../shared/network/constants"
 
 export const ApproveTransactionScreenContainer: FC<
   ApproveTransactionScreenContainerProps
@@ -250,6 +251,7 @@ export const ApproveTransactionScreenContainer: FC<
         <WithActionScreenErrorFooter isTransaction>
           {selectedAccount.needsDeploy ? (
             <CombinedFeeEstimationContainer
+              feeTokenAddress={ETH_TOKEN_ADDRESS}
               onErrorChange={setDisableConfirm}
               onFeeErrorChange={onShowAddFunds}
               accountAddress={selectedAccount.address}
@@ -264,6 +266,7 @@ export const ApproveTransactionScreenContainer: FC<
             />
           ) : (
             <FeeEstimationContainer
+              feeTokenAddress={ETH_TOKEN_ADDRESS}
               onErrorChange={setDisableConfirm}
               onFeeErrorChange={onShowAddFunds}
               accountAddress={selectedAccount.address}
diff --git a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/BalanceChangeOverviewArgentX.tsx b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/BalanceChangeOverviewArgentX.tsx
index cd90b4bad..bfea8a8ed 100644
--- a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/BalanceChangeOverviewArgentX.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/BalanceChangeOverviewArgentX.tsx
@@ -16,7 +16,11 @@ import { motion } from "framer-motion"
 import { isEmpty, isString } from "lodash-es"
 import { FC, useMemo } from "react"
 
-import { bigDecimal } from "@argent/shared"
+import {
+  bigDecimal,
+  formatTruncatedAddress,
+  normalizeAddress,
+} from "@argent/shared"
 import {
   isUnlimitedAmount,
   prettifyCurrencyValue,
@@ -26,10 +30,6 @@ import {
   ApiTransactionReviewResponse,
   getTransactionReviewWithType,
 } from "../../../../../shared/transactionReview.service"
-import {
-  formatTruncatedAddress,
-  normalizeAddress,
-} from "../../../../services/addresses"
 import { useCurrentNetwork } from "../../../networks/hooks/useCurrentNetwork"
 import { useIsDefaultNetwork } from "../../../networks/hooks/useIsDefaultNetwork"
 import { UnknownTokenIcon } from "./DappHeader/TransactionIcon/UnknownTokenIcon"
diff --git a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ConfirmScreen.tsx b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ConfirmScreen.tsx
index 84e82cb30..9434aabe5 100644
--- a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ConfirmScreen.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/ConfirmScreen.tsx
@@ -5,6 +5,7 @@ import {
   ScrollContainer,
   StickyGroup,
   useNavigateBack,
+  icons,
 } from "@argent/ui"
 import { Box, Flex } from "@chakra-ui/react"
 import {
@@ -18,7 +19,9 @@ import {
 import Measure, { ContentRect } from "react-measure"
 
 import { WalletAccount } from "../../../../../shared/wallet.model"
-import { formatTruncatedAddress } from "../../../../services/addresses"
+import { formatTruncatedAddress } from "@argent/shared"
+
+const { AlertFillIcon } = icons
 
 export interface ConfirmPageProps {
   onSubmit?: (e: FormEvent<HTMLFormElement>) => void
@@ -135,18 +138,30 @@ export const ConfirmScreen: FC<ConfirmScreenProps> = ({
                           colorScheme={
                             !showConfirmButton ? "primary" : undefined
                           }
+                          sx={{
+                            pointerEvents: "auto !important",
+                          }}
                         >
                           {rejectButtonText}
                         </Button>
                       )}
                       {showConfirmButton && (
                         <Button
+                          id={confirmButtonText}
                           isDisabled={confirmButtonDisabled}
                           colorScheme={destructive ? "danger" : "primary"}
                           w="full"
                           type="submit"
                           isLoading={confirmButtonIsLoading}
                           loadingText={confirmButtonLoadingText}
+                          leftIcon={
+                            destructive ? (
+                              <AlertFillIcon color="white" />
+                            ) : undefined
+                          }
+                          sx={{
+                            pointerEvents: "auto !important",
+                          }}
                         >
                           {confirmButtonText}
                         </Button>
diff --git a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/TransactionActions.tsx b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/TransactionActions.tsx
index c8039d0d4..25095355e 100644
--- a/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/TransactionActions.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/ApproveTransactionScreen/TransactionActions.tsx
@@ -11,9 +11,9 @@ import { FC } from "react"
 import { CallData, num } from "starknet"
 
 import { entryPointToHumanReadable } from "../../../../../shared/transactions"
-import { formatTruncatedAddress } from "../../../../services/addresses"
 import { TransactionActionsType } from "../types"
 import { formatCalldataSafe } from "../../utils"
+import { formatTruncatedAddress } from "@argent/shared"
 
 export interface TransactionActionsProps {
   action: TransactionActionsType
diff --git a/packages/extension/src/ui/features/actions/transaction/fields/ContractField.tsx b/packages/extension/src/ui/features/actions/transaction/fields/ContractField.tsx
index 4f82ca51c..2b678e4e4 100644
--- a/packages/extension/src/ui/features/actions/transaction/fields/ContractField.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/fields/ContractField.tsx
@@ -3,7 +3,7 @@ import { FC } from "react"
 import { CopyTooltip } from "../../../../components/CopyTooltip"
 import { Field, FieldKey, FieldValue } from "../../../../components/Fields"
 import { ContentCopyIcon } from "../../../../components/Icons/MuiIcons"
-import { formatTruncatedAddress } from "../../../../services/addresses"
+import { formatTruncatedAddress } from "@argent/shared"
 
 interface ContractFieldProps {
   contractAddress?: string
diff --git a/packages/extension/src/ui/features/actions/transaction/fields/DappContractField.tsx b/packages/extension/src/ui/features/actions/transaction/fields/DappContractField.tsx
index 65550c2e3..74ec3831b 100644
--- a/packages/extension/src/ui/features/actions/transaction/fields/DappContractField.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/fields/DappContractField.tsx
@@ -30,7 +30,7 @@ export const DappContractField: FC<DappContractFieldProps> = ({
     <Field>
       <FieldKey>Dapp</FieldKey>
       <DappFieldValue>
-        <DappIcon dappDisplayAttributes={dappDisplayAttributes} size={6} />
+        <DappIcon dappDisplayAttributes={dappDisplayAttributes} w={6} h={6} />
         <LeftPaddedField>
           {dappDisplayAttributes?.title || host}
         </LeftPaddedField>
diff --git a/packages/extension/src/ui/features/actions/transaction/fields/FeeField.tsx b/packages/extension/src/ui/features/actions/transaction/fields/FeeField.tsx
index d7e8d6efb..9dcaf7107 100644
--- a/packages/extension/src/ui/features/actions/transaction/fields/FeeField.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/fields/FeeField.tsx
@@ -3,23 +3,26 @@ import { Box } from "@chakra-ui/react"
 import { FC } from "react"
 
 import { Field, FieldKey, LeftPaddedField } from "../../../../components/Fields"
-import { useNetworkFeeToken } from "../../../accountTokens/tokens.state"
 import { useDisplayTokenAmountAndCurrencyValue } from "../../../accountTokens/useDisplayTokenAmountAndCurrencyValue"
+import { useToken } from "../../../accountTokens/tokens.state"
+import { Address } from "@argent/shared"
 
 interface FeeFieldProps {
   title?: string
+  feeTokenAddress: Address
   fee: string
   networkId: string
 }
 
 export const FeeField: FC<FeeFieldProps> = ({
   title = "Network fee",
+  feeTokenAddress,
   fee,
   networkId,
 }) => {
-  const feeToken = useNetworkFeeToken(networkId)
+  const feeToken = useToken({ address: feeTokenAddress, networkId })
   const { displayAmount, displayValue } = useDisplayTokenAmountAndCurrencyValue(
-    { amount: fee, tokenAddress: feeToken?.address },
+    { amount: fee, tokenAddress: feeTokenAddress },
   )
   if (!feeToken) {
     return null
diff --git a/packages/extension/src/ui/features/actions/transaction/fields/ParameterField.tsx b/packages/extension/src/ui/features/actions/transaction/fields/ParameterField.tsx
index 9597e965f..e148c784b 100644
--- a/packages/extension/src/ui/features/actions/transaction/fields/ParameterField.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/fields/ParameterField.tsx
@@ -1,4 +1,4 @@
-import { isValidAddress } from "@argent/shared"
+import { formatTruncatedAddress, isValidAddress } from "@argent/shared"
 import { chakra } from "@chakra-ui/react"
 import { FC } from "react"
 
@@ -6,7 +6,6 @@ import { IExplorerTransactionParameters } from "../../../../../shared/explorer/t
 import { entryPointToHumanReadable } from "../../../../../shared/transactions"
 import { CopyIconButton } from "../../../../components/CopyIconButton"
 import { Field, FieldKey, FieldValue } from "../../../../components/Fields"
-import { formatTruncatedAddress } from "../../../../services/addresses"
 import { AccountAddressField } from "./AccountAddressField"
 
 interface ParameterFieldProps {
diff --git a/packages/extension/src/ui/features/actions/transaction/fields/TokenField.tsx b/packages/extension/src/ui/features/actions/transaction/fields/TokenField.tsx
index 036ce3721..6ac89f176 100644
--- a/packages/extension/src/ui/features/actions/transaction/fields/TokenField.tsx
+++ b/packages/extension/src/ui/features/actions/transaction/fields/TokenField.tsx
@@ -9,9 +9,9 @@ import {
   FieldValue,
   LeftPaddedField,
 } from "../../../../components/Fields"
-import { isEqualAddress } from "../../../../services/addresses"
 import { TokenIcon } from "../../../accountTokens/TokenIcon"
 import { Token } from "../../../../../shared/token/__new/types/token.model"
+import { isEqualAddress } from "@argent/shared"
 
 interface TokenFieldProps {
   label: string
diff --git a/packages/extension/src/ui/features/actions/transaction/useTransactionReview.ts b/packages/extension/src/ui/features/actions/transaction/useTransactionReview.ts
index ff93eda4f..d4caee912 100644
--- a/packages/extension/src/ui/features/actions/transaction/useTransactionReview.ts
+++ b/packages/extension/src/ui/features/actions/transaction/useTransactionReview.ts
@@ -2,7 +2,7 @@ import { useCallback } from "react"
 import { Call } from "starknet"
 
 import { ARGENT_TRANSACTION_REVIEW_API_ENABLED } from "../../../../shared/api/constants"
-import { argentApiNetworkForNetwork } from "../../../../shared/api/fetcher"
+import { argentApiNetworkForNetwork } from "../../../../shared/api/headers"
 import { fetchTransactionReview } from "../../../../shared/transactionReview.service"
 import { WalletAccount } from "../../../../shared/wallet.model"
 import { argentApiFetcher } from "../../../services/argentApiFetcher"
diff --git a/packages/extension/src/ui/features/actions/transaction/useTransactionSimulatedData.ts b/packages/extension/src/ui/features/actions/transaction/useTransactionSimulatedData.ts
index a15cbb512..4cea3bb24 100644
--- a/packages/extension/src/ui/features/actions/transaction/useTransactionSimulatedData.ts
+++ b/packages/extension/src/ui/features/actions/transaction/useTransactionSimulatedData.ts
@@ -1,4 +1,4 @@
-import { addressSchema } from "@argent/shared"
+import { addressSchema, isEqualAddress } from "@argent/shared"
 import type { Dictionary } from "lodash"
 import {
   flatten,
@@ -19,17 +19,20 @@ import {
   TokenDetails,
   TransactionSimulationTransfer,
 } from "../../../../shared/transactionSimulation/types"
-import { isEqualAddress } from "../../../services/addresses"
 import { useContractAddresses } from "../../accountNfts/nfts.state"
 import { Account } from "../../accounts/Account"
 import { useSelectedAccount } from "../../accounts/accounts.state"
 import { useTokensRecord } from "../../accountTokens/tokens.state"
 import { useCurrentNetwork } from "../../networks/hooks/useCurrentNetwork"
 import { bigDecimal } from "@argent/shared"
-import { num } from "starknet"
 import { EstimatedFees } from "../../../../shared/transactionSimulation/fees/fees.model"
 import { Token } from "../../../../shared/token/__new/types/token.model"
-import { FEE_OVERHEAD } from "../../../../shared/utils/argentMaxFee"
+import {
+  estimatedFeesToMaxFeeTotal,
+  estimatedFeesToTotal,
+  getEstimatedFeeFromBulkSimulation,
+} from "../../../../shared/transactionSimulation/utils"
+import { num } from "starknet"
 
 interface CommonSimulationData {
   token: Token
@@ -84,11 +87,6 @@ function partitionIncomingOutgoingTransfers(transfers: AggregatedSimData[]) {
   return partition(transfers, (t) => t.amount > 0n)
 }
 
-const FEE_MULTIPLIER = FEE_OVERHEAD
-const scale = 10
-const scaledMultiplier = Math.round(FEE_MULTIPLIER * scale)
-const FEE_MULTIPLIER_BIGINT = BigInt(scaledMultiplier)
-
 function orderAggregatedSimData(
   simData: AggregatedSimData[],
 ): AggregatedSimData[] {
@@ -148,70 +146,21 @@ export const useSimulationPreprocessor = (
 
 export const useAggregatedTxFeesData = (
   transactionSimulation?: ApiTransactionBulkSimulationResponse,
-  feeSimulation?: EstimatedFees,
-  feeSequencer?: EstimatedFees,
-  needsDeploy?: boolean,
+  providedFee?: EstimatedFees,
 ) => {
-  const totalFee = useMemo(() => {
-    if (needsDeploy && feeSequencer?.accountDeploymentFee) {
-      return num.toHex(
-        num.toBigInt(feeSequencer.accountDeploymentFee) +
-          num.toBigInt(feeSequencer.amount),
-      )
-    }
-    return feeSequencer?.amount
-  }, [needsDeploy, feeSequencer?.accountDeploymentFee, feeSequencer?.amount])
-
-  const totalMaxFee = useMemo(() => {
-    if (needsDeploy && feeSequencer?.maxADFee) {
-      return num.toHex(
-        num.toBigInt(feeSequencer.maxADFee) +
-          num.toBigInt(feeSequencer.suggestedMaxFee),
-      )
-    }
-    return feeSequencer?.suggestedMaxFee
-  }, [needsDeploy, feeSequencer?.maxADFee, feeSequencer?.suggestedMaxFee])
+  const fee = transactionSimulation
+    ? getEstimatedFeeFromBulkSimulation(transactionSimulation)
+    : providedFee
 
-  if (!transactionSimulation || transactionSimulation.length === 0) {
-    return {
-      fee: feeSequencer,
-      totalFee,
-      totalMaxFee,
-    }
-  }
-
-  if (!feeSimulation) {
-    return {
-      fee: feeSequencer,
-      totalFee,
-      totalMaxFee,
-    }
-  }
-
-  const { amount } = feeSimulation
-
-  const suggestedMaxFee =
-    (BigInt(amount) * BigInt(FEE_MULTIPLIER_BIGINT)) / BigInt(scale) // add 1.5x overhead
-  let maxADFee = num.toBigInt(0)
-  let accountDeploymentFee = num.toBigInt(0)
-
-  if (needsDeploy && transactionSimulation[0].feeEstimation) {
-    accountDeploymentFee = num.toBigInt(
-      transactionSimulation[0].feeEstimation.overallFee,
-    )
-    maxADFee =
-      (accountDeploymentFee.valueOf() * FEE_MULTIPLIER_BIGINT) / BigInt(scale) // add 1.5x overhead
-  }
+  const totalFee = fee ? num.toHex(estimatedFeesToTotal(fee)) : undefined
+  const totalMaxFee = fee
+    ? num.toHex(estimatedFeesToMaxFeeTotal(fee))
+    : undefined
 
   return {
-    fee: {
-      amount: amount.toString(),
-      suggestedMaxFee: suggestedMaxFee.toString(),
-      accountDeploymentFee: maxADFee.toString(),
-      maxADFee: maxADFee.toString(),
-    },
-    totalFee: amount.toString(),
-    totalMaxFee: suggestedMaxFee.toString(),
+    fee,
+    totalFee,
+    totalMaxFee,
   }
 }
 
@@ -224,6 +173,7 @@ const DEFAULT_TRANSACTION_SIMULATION = [
       gasUsage: 0,
       overallFee: 0,
       unit: "wei",
+      maxFee: 0,
     },
   },
 ]
diff --git a/packages/extension/src/ui/features/actions/transactionV2/FeeEstimationContainerV2.tsx b/packages/extension/src/ui/features/actions/transactionV2/FeeEstimationContainerV2.tsx
index e37dc9fc1..034b1e4c9 100644
--- a/packages/extension/src/ui/features/actions/transactionV2/FeeEstimationContainerV2.tsx
+++ b/packages/extension/src/ui/features/actions/transactionV2/FeeEstimationContainerV2.tsx
@@ -3,12 +3,19 @@ import { FC, useEffect, useMemo } from "react"
 
 import { useAccount } from "../../accounts/accounts.state"
 import { useTokenAmountToCurrencyValue } from "../../accountTokens/tokenPriceHooks"
-import { useNetworkFeeToken } from "../../accountTokens/tokens.state"
-import { useFeeTokenBalance } from "../../accountTokens/useFeeTokenBalance"
 import { FeeEstimation } from "../feeEstimation/FeeEstimation"
 import { ParsedFeeError, getParsedFeeError } from "../feeEstimation/feeError"
 import { EstimatedFees } from "../../../../shared/transactionSimulation/fees/fees.model"
+
+import { useTokenBalance } from "../../accountTokens/tokens.state"
+import { Address } from "@argent/shared"
+import {
+  estimatedFeesToMaxFeeTotal,
+  estimatedFeesToTotal,
+} from "../../../../shared/transactionSimulation/utils"
+
 export interface FeeEstimationContainerV2Props {
+  feeTokenAddress: Address
   onChange?: (fee: bigint) => void
   onErrorChange?: (error: boolean) => void
   onFeeErrorChange?: (error: boolean) => void
@@ -23,6 +30,7 @@ export interface FeeEstimationContainerV2Props {
 }
 
 export const FeeEstimationContainerV2: FC<FeeEstimationContainerV2Props> = ({
+  feeTokenAddress,
   accountAddress,
   networkId,
   onErrorChange,
@@ -37,24 +45,24 @@ export const FeeEstimationContainerV2: FC<FeeEstimationContainerV2Props> = ({
     throw new Error("Account not found")
   }
 
-  const { feeTokenBalance } = useFeeTokenBalance(account)
+  const feeToken = useTokenBalance(feeTokenAddress, account)
 
   const enoughBalance = useMemo(
     () =>
       Boolean(
-        feeTokenBalance && feeTokenBalance >= BigInt(fee.suggestedMaxFee),
+        feeToken?.balance && feeToken?.balance >= estimatedFeesToTotal(fee),
       ),
-    [feeTokenBalance, fee.suggestedMaxFee],
+    [feeToken?.balance, fee],
   )
 
   const showFeeError = Boolean(
-    fee && typeof feeTokenBalance === "bigint" && !enoughBalance,
+    fee && typeof feeToken?.balance === "bigint" && !enoughBalance,
   )
   const showEstimateError =
     Boolean(error) || Boolean(transactionSimulationFeeError)
   const showError = showFeeError || showEstimateError
 
-  const hasError = !fee || !feeTokenBalance || !enoughBalance || showError
+  const hasError = !fee || !enoughBalance || showError
   useEffect(() => {
     onErrorChange?.(hasError)
   }, [hasError, onErrorChange])
@@ -76,15 +84,14 @@ export const FeeEstimationContainerV2: FC<FeeEstimationContainerV2Props> = ({
       parsedFeeEstimationError = getParsedFeeError(error)
     }
   }
-  const feeToken = useNetworkFeeToken(networkId)
 
   const amountCurrencyValue = useTokenAmountToCurrencyValue(
     feeToken || undefined,
-    fee?.amount,
+    estimatedFeesToTotal(fee),
   )
   const suggestedMaxFeeCurrencyValue = useTokenAmountToCurrencyValue(
     feeToken || undefined,
-    fee.suggestedMaxFee,
+    estimatedFeesToMaxFeeTotal(fee),
   )
 
   return (
@@ -94,7 +101,6 @@ export const FeeEstimationContainerV2: FC<FeeEstimationContainerV2Props> = ({
           amountCurrencyValue={amountCurrencyValue}
           fee={fee}
           feeToken={feeToken}
-          feeTokenBalance={feeTokenBalance}
           parsedFeeEstimationError={parsedFeeEstimationError}
           showError={showError}
           showEstimateError={showEstimateError}
diff --git a/packages/extension/src/ui/features/actions/transactionV2/TransactionActionScreenContainerV2.tsx b/packages/extension/src/ui/features/actions/transactionV2/TransactionActionScreenContainerV2.tsx
index 507641b59..915f0183d 100644
--- a/packages/extension/src/ui/features/actions/transactionV2/TransactionActionScreenContainerV2.tsx
+++ b/packages/extension/src/ui/features/actions/transactionV2/TransactionActionScreenContainerV2.tsx
@@ -1,4 +1,4 @@
-import { FC, useCallback, useMemo, useState } from "react"
+import { FC, useCallback, useEffect, useMemo, useState } from "react"
 
 import { useTransactionReviewV2 } from "./useTransactionReviewV2"
 import { useActionScreen } from "../hooks/useActionScreen"
@@ -11,6 +11,7 @@ import {
   AccordionPanel,
   Box,
   Divider,
+  useDisclosure,
 } from "@chakra-ui/react"
 import { isArray } from "lodash-es"
 import { TransactionHeader } from "./TransactionHeader"
@@ -44,6 +45,11 @@ import {
 import { TransactionReviewLabel } from "./TransactionReviewLabel"
 
 const { AlertIcon } = icons
+import { ETH_TOKEN_ADDRESS } from "../../../../shared/network/constants"
+import { warningSchema } from "../../../../shared/transactionReview/schema"
+import { z } from "zod"
+import { ConfirmationModal } from "./warning/ConfirmationModal"
+import { getHighestSeverity } from "./warning/helper"
 
 export interface TransactionActionScreenContainerV2Props
   extends ConfirmScreenProps {
@@ -66,6 +72,11 @@ export const TransactionActionScreenContainerV2: FC<
       "TransactionActionScreenContainer used with incompatible action.type",
     )
   }
+  const {
+    isOpen: isConfirmationModalOpen,
+    onOpen: onConfirmationModalOpen,
+    onClose: onConfirmationModalClose,
+  } = useDisclosure()
 
   const navigate = useNavigate()
   const [disableConfirm, setDisableConfirm] = useState(true)
@@ -73,6 +84,7 @@ export const TransactionActionScreenContainerV2: FC<
   const [userClickedAddFunds, setUserClickedAddFunds] = useAtom(
     userClickedAddFundsAtom,
   )
+  const [askForConfirmation, setAskForConfirmation] = useState(false)
 
   const onSubmit = useCallback(async () => {
     const result = await approve()
@@ -198,24 +210,41 @@ export const TransactionActionScreenContainerV2: FC<
     })
   }, [transactionReview])
 
+  const warnings = transactionReview?.transactions.flatMap((transaction) => {
+    return transaction.reviewOfTransaction?.warnings
+  })
+
+  const warningsWithoutUndefined = z
+    .array(warningSchema)
+    .safeParse(
+      warnings?.filter((warning) => !isEmpty(warning) && warning !== undefined),
+    )
+
+  const highestSeverityWarning =
+    warningsWithoutUndefined.success &&
+    getHighestSeverity(warningsWithoutUndefined.data)
+
+  useEffect(() => {
+    if (
+      highestSeverityWarning &&
+      (highestSeverityWarning.severity === "critical" ||
+        highestSeverityWarning.severity === "high")
+    ) {
+      setAskForConfirmation(true)
+    }
+  }, [highestSeverityWarning])
+
   const transactionReviewWarnings = useMemo(() => {
-    return transactionReview?.transactions.flatMap((transaction, index) => {
-      if (isEmpty(transaction.reviewOfTransaction?.warnings)) {
-        return false
-      }
-      return (
-        <>
-          {transaction.reviewOfTransaction?.warnings?.map((warnings) => (
-            <WarningBanner
-              key={`warning-${index}-${warnings.reason}`}
-              reason={warnings.reason}
-              severity={warnings.severity}
-            />
-          ))}
-        </>
-      )
-    })
-  }, [transactionReview])
+    if (!warningsWithoutUndefined.success) {
+      return null
+    }
+    return (
+      <WarningBanner
+        warnings={warningsWithoutUndefined.data}
+        onReject={() => void reject()}
+      />
+    )
+  }, [warningsWithoutUndefined, reject])
 
   const transactionReviewFallback = useMemo(
     () =>
@@ -261,6 +290,11 @@ export const TransactionActionScreenContainerV2: FC<
     [setUserClickedAddFunds, userClickedAddFunds],
   )
 
+  const onConfirm = () => {
+    onConfirmationModalClose()
+    void onSubmit()
+  }
+
   const onSubmitWithChecks = () => {
     if (hasInsufficientFunds) {
       navigate(routes.funding(), { state: { showOnTop: true } })
@@ -273,6 +307,10 @@ export const TransactionActionScreenContainerV2: FC<
       multisigModalDisclosure.onOpen()
       return
     }
+    if (askForConfirmation) {
+      onConfirmationModalOpen()
+      return
+    }
     void onSubmit()
   }
 
@@ -282,10 +320,11 @@ export const TransactionActionScreenContainerV2: FC<
     <WithActionScreenErrorFooter isTransaction>
       {selectedAccount && transactionReview?.enrichedFeeEstimation && (
         <FeeEstimationContainerV2
+          feeTokenAddress={ETH_TOKEN_ADDRESS}
           onErrorChange={setDisableConfirm}
           onFeeErrorChange={onShowAddFunds}
           transactionSimulationLoading={isValidating}
-          fee={transactionReview?.enrichedFeeEstimation}
+          fee={transactionReview.enrichedFeeEstimation}
           networkId={selectedAccount.networkId}
           accountAddress={selectedAccount.address}
           needsDeploy={selectedAccount.needsDeploy}
@@ -318,6 +357,7 @@ export const TransactionActionScreenContainerV2: FC<
         showHeader={true}
         onReject={() => void reject()}
         footer={footer}
+        destructive={askForConfirmation}
         {...rest}
       >
         {multisigModal}
@@ -339,6 +379,11 @@ export const TransactionActionScreenContainerV2: FC<
         {transactionReviewActions}
         {loadingOrErrorState}
       </ConfirmScreen>
+      <ConfirmationModal
+        isOpen={isConfirmationModalOpen}
+        onClose={onConfirmationModalClose}
+        onConfirm={onConfirm}
+      />
     </WithArgentShieldVerified>
   )
 }
diff --git a/packages/extension/src/ui/features/actions/transactionV2/warning/ConfirmationModal.tsx b/packages/extension/src/ui/features/actions/transactionV2/warning/ConfirmationModal.tsx
new file mode 100644
index 000000000..c0d2b8cd9
--- /dev/null
+++ b/packages/extension/src/ui/features/actions/transactionV2/warning/ConfirmationModal.tsx
@@ -0,0 +1,51 @@
+import { H5, P3 } from "@argent/ui"
+import {
+  Button,
+  Modal,
+  ModalBody,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+} from "@chakra-ui/react"
+import { FC } from "react"
+
+interface ConfirmationModalProps {
+  isOpen: boolean
+  onClose: () => void
+  onConfirm: () => void
+}
+
+export const ConfirmationModal: FC<ConfirmationModalProps> = ({
+  isOpen,
+  onClose,
+  onConfirm,
+}) => {
+  return (
+    <Modal isOpen={isOpen} onClose={onClose} isCentered size="xs">
+      <ModalOverlay bg="rgba(0, 0, 0, 0.5)" />
+      <ModalContent background="neutrals.700" borderRadius="2xl">
+        <ModalHeader>
+          <H5 fontWeight="600" textAlign="center">
+            Dangerous transaction!
+          </H5>
+        </ModalHeader>
+        <ModalBody>
+          <P3 fontWeight="400" textAlign="center">
+            By confirming this transaction you are exposing your wallet to a
+            serious risk
+          </P3>
+        </ModalBody>
+
+        <ModalFooter flexDirection="column" gap="3">
+          <Button w="100%" colorScheme="danger" onClick={onConfirm}>
+            Confirm
+          </Button>
+          <Button w="100%" backgroundColor="neutrals.600" onClick={onClose}>
+            Go back
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  )
+}
diff --git a/packages/extension/src/ui/features/actions/transactionV2/warning/WarningBanner.tsx b/packages/extension/src/ui/features/actions/transactionV2/warning/WarningBanner.tsx
index 2e04652e7..74be7ee71 100644
--- a/packages/extension/src/ui/features/actions/transactionV2/warning/WarningBanner.tsx
+++ b/packages/extension/src/ui/features/actions/transactionV2/warning/WarningBanner.tsx
@@ -1,31 +1,84 @@
-import { Flex } from "@chakra-ui/react"
-import {
-  AssessmentReason,
-  AssessmentSeverity,
-} from "../../../../../shared/transactionReview/schema"
-import { riskToColorMap, riskToHeaderMap, warningMap } from "./warningMap"
+import { Button, Flex, useDisclosure } from "@chakra-ui/react"
+import { Warning } from "../../../../../shared/transactionReview/schema"
+import { riskToColorMap, riskToHeaderMap } from "./warningMap"
 import { B2, L2 } from "@argent/ui"
 
 import AlertFillIconWithHalo from "./AlertFillIconWithHalo"
 
+import { getHighestSeverity, getTitleForWarnings } from "./helper"
+import { WarningModal } from "./WarningModal"
+
 export const WarningBanner = ({
-  reason,
-  severity,
+  warnings,
+  onReject,
 }: {
-  reason: AssessmentReason
-  severity: AssessmentSeverity
+  warnings: Warning[]
+  onReject: () => void
 }) => {
-  const { title } = warningMap[reason]
-  const color = riskToColorMap[severity]
-  const header = riskToHeaderMap[severity]
+  const highestSeverityWarning = getHighestSeverity(warnings)
+  const {
+    isOpen: isWarningModalOpen,
+    onOpen: onWarningModalOpen,
+    onClose: onWarningModalClose,
+  } = useDisclosure()
+
+  if (!highestSeverityWarning) {
+    return null
+  }
+
+  const title = getTitleForWarnings(warnings)
+  const color = riskToColorMap[highestSeverityWarning.severity]
+  const header = riskToHeaderMap[highestSeverityWarning.severity]
+  const onClose = () => {
+    onWarningModalClose()
+  }
 
+  const handleReject = () => {
+    onReject()
+    onWarningModalClose()
+  }
   return (
-    <Flex borderRadius="lg" bgColor="surface.elevated" p={2}>
-      <AlertFillIconWithHalo color={color} />
-      <Flex direction="column" ml={2} justifyContent="space-between" my={0.5}>
-        <B2 color={color}>{header}</B2>
-        <L2 color="text.primary">{title}</L2>
+    <>
+      <Flex
+        borderRadius="lg"
+        bgColor="surface.elevated"
+        p={2}
+        justifyContent="space-between"
+      >
+        <Flex>
+          <AlertFillIconWithHalo color={color} />
+          <Flex
+            direction="column"
+            ml={2}
+            justifyContent="space-between"
+            my={0.5}
+          >
+            <B2 color={color}>{header}</B2>
+            <L2 color="text.primary">{title}</L2>
+          </Flex>
+        </Flex>
+        {highestSeverityWarning.severity !== "info" && (
+          <Button
+            bgColor="neutrals.600"
+            color="white"
+            size="3xs"
+            borderRadius={4}
+            px={2}
+            py={1}
+            onClick={onWarningModalOpen}
+          >
+            Review
+          </Button>
+        )}
       </Flex>
-    </Flex>
+      <WarningModal
+        color={color}
+        onClose={onClose}
+        onReject={handleReject}
+        isOpen={isWarningModalOpen}
+        warnings={warnings}
+        highestSeverityWarning={highestSeverityWarning}
+      />
+    </>
   )
 }
diff --git a/packages/extension/src/ui/features/actions/transactionV2/warning/WarningModal.tsx b/packages/extension/src/ui/features/actions/transactionV2/warning/WarningModal.tsx
new file mode 100644
index 000000000..c19fbe3ff
--- /dev/null
+++ b/packages/extension/src/ui/features/actions/transactionV2/warning/WarningModal.tsx
@@ -0,0 +1,110 @@
+import { Button, icons, H6, B3, P4, L1 } from "@argent/ui"
+import {
+  Badge,
+  Flex,
+  Modal,
+  ModalBody,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+} from "@chakra-ui/react"
+import { FC } from "react"
+import { Warning } from "../../../../../shared/transactionReview/schema"
+import {
+  riskToBadgeMap,
+  riskToColorMap,
+  riskToInvertedColorMap,
+  warningMap,
+} from "./warningMap"
+
+const { AlertFillIcon } = icons
+interface MultisigHideModalProps {
+  isOpen: boolean
+  onReject?: () => void
+  onClose: () => void
+  color: string
+  warnings: Warning[]
+  highestSeverityWarning: Warning
+}
+
+export const WarningModal: FC<MultisigHideModalProps> = ({
+  isOpen,
+  onReject,
+  onClose,
+  color,
+  warnings,
+  highestSeverityWarning,
+}) => {
+  return (
+    <Modal isOpen={isOpen} onClose={onClose} isCentered size="xs">
+      <ModalOverlay bg="rgba(0, 0, 0, 0.5)" />
+      <ModalContent background="neutrals.700" borderRadius="2xl">
+        <ModalHeader flexDir="column" pb={1} px={4}>
+          <Flex justifyContent="center">
+            <AlertFillIcon color={color} width={10} height={10} />
+          </Flex>
+          <H6 fontWeight="600" textAlign="center" mt={2}>
+            {warnings.length} risk{warnings.length === 1 ? "" : "s"} identified
+          </H6>
+          {highestSeverityWarning.severity === "critical" && (
+            <Flex
+              flexDir="column"
+              p={2}
+              px={4}
+              borderRadius={8}
+              backgroundColor={color}
+              mt={3}
+            >
+              <L1 color="white" textAlign="center">
+                We strongly recommend you do not proceed with this transaction
+              </L1>
+            </Flex>
+          )}
+        </ModalHeader>
+        <ModalBody px={4} maxHeight={350} overflowY={"auto"}>
+          {warnings.map((warning, index) => (
+            <Flex
+              key={`warning-${index}`}
+              flexDir="column"
+              p={3}
+              my={1}
+              borderRadius={8}
+              border="1px solid var(--neutrals-600, #595959)"
+            >
+              <Badge
+                backgroundColor={riskToColorMap[warning.severity]}
+                color={riskToInvertedColorMap[warning.severity]}
+                textTransform="none"
+                maxWidth="fit-content"
+                my={1}
+              >
+                {riskToBadgeMap[warning.severity]}
+              </Badge>
+              <B3 my={1} color="white">
+                {warningMap[warning.reason].title}
+              </B3>
+              <P4 my={1} color="white">
+                {warningMap[warning.reason].description}
+              </P4>
+            </Flex>
+          ))}
+        </ModalBody>
+
+        <ModalFooter flexDirection="row" gap="3">
+          <Button
+            w="100%"
+            backgroundColor="neutrals.600"
+            onClick={onClose}
+            px={12}
+          >
+            See transaction
+          </Button>
+          <Button w="100%" colorScheme="primary" onClick={onReject}>
+            Reject
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  )
+}
diff --git a/packages/extension/src/ui/features/actions/transactionV2/warning/helper.test.ts b/packages/extension/src/ui/features/actions/transactionV2/warning/helper.test.ts
new file mode 100644
index 000000000..161687140
--- /dev/null
+++ b/packages/extension/src/ui/features/actions/transactionV2/warning/helper.test.ts
@@ -0,0 +1,57 @@
+import { Warning } from "../../../../../shared/transactionReview/schema"
+import { getHighestSeverity, getTitleForWarnings } from "./helper"
+
+describe("getHighestSeverity", () => {
+  it("should return null for an empty array", () => {
+    expect(getHighestSeverity([])).toBeNull()
+  })
+
+  it("should return the warning with the highest severity", () => {
+    const warnings = [
+      { severity: "info" },
+      { severity: "high" },
+      { severity: "critical" },
+      { severity: "caution" },
+    ] as unknown as Warning[]
+    expect(getHighestSeverity(warnings)).toEqual({ severity: "critical" })
+  })
+
+  it("should return the first warning if all have the same severity", () => {
+    const warnings = [
+      { severity: "high" },
+      { severity: "high" },
+      { severity: "high" },
+    ] as unknown as Warning[]
+    expect(getHighestSeverity(warnings)).toEqual({ severity: "high" })
+  })
+
+  it("should handle a single warning", () => {
+    const warnings = [{ severity: "caution" }] as unknown as Warning[]
+    expect(getHighestSeverity(warnings)).toEqual({ severity: "caution" })
+  })
+
+  it("should return the first occurrence of the highest severity", () => {
+    const warnings = [
+      { severity: "high" },
+      { severity: "critical" },
+      { severity: "critical" },
+    ] as unknown as Warning[]
+    expect(getHighestSeverity(warnings)).toEqual({ severity: "critical" })
+  })
+})
+
+describe("getTitleForWarnings", () => {
+  it("should return the title for a single warning", () => {
+    const warnings = [{ reason: "undeployed_account" }] as unknown as Warning[]
+    expect(getTitleForWarnings(warnings)).toEqual(
+      "Sending to the correct account?",
+    )
+  })
+  it("should return the title for multiple warnings", () => {
+    const warnings = [
+      { reason: "undeployed_account" },
+      { reason: "contract_is_not_verified" },
+    ] as unknown as Warning[]
+    expect(getTitleForWarnings(warnings)).toEqual("2 risks identified")
+  })
+})
diff --git a/packages/extension/src/ui/features/actions/transactionV2/warning/helper.ts b/packages/extension/src/ui/features/actions/transactionV2/warning/helper.ts
new file mode 100644
index 000000000..5707f75ec
--- /dev/null
+++ b/packages/extension/src/ui/features/actions/transactionV2/warning/helper.ts
@@ -0,0 +1,22 @@
+import { Warning } from "../../../../../shared/transactionReview/schema"
+import { warningMap } from "./warningMap"
+
+export const getHighestSeverity = (warnings: Warning[]): Warning | null => {
+  if (warnings.length === 0) {
+    return null
+  }
+
+  const severityOrder = ["critical", "high", "caution", "info"]
+  return warnings.reduce((acc, curr) => {
+    const currIndex = severityOrder.indexOf(curr.severity)
+    const accIndex = severityOrder.indexOf(acc.severity)
+    return currIndex < accIndex ? curr : acc
+  }, warnings[0])
+}
+
+export const getTitleForWarnings = (warnings: Warning[]): string => {
+  if (warnings.length === 1) {
+    return warningMap[warnings[0].reason].title
+  }
+  return `${warnings.length} risks identified`
+}
diff --git a/packages/extension/src/ui/features/actions/transactionV2/warning/warningMap.ts b/packages/extension/src/ui/features/actions/transactionV2/warning/warningMap.ts
index a415f432f..35ca9b31a 100644
--- a/packages/extension/src/ui/features/actions/transactionV2/warning/warningMap.ts
+++ b/packages/extension/src/ui/features/actions/transactionV2/warning/warningMap.ts
@@ -11,12 +11,29 @@ export const riskToColorMap: Record<z.infer<typeof severitySchema>, string> = {
   critical: "error.500",
 }
 
+export const riskToInvertedColorMap: Record<
+  z.infer<typeof severitySchema>,
+  string
+> = {
+  info: "black",
+  caution: "black",
+  high: "white",
+  critical: "white",
+}
+
 export const riskToHeaderMap: Record<z.infer<typeof severitySchema>, string> = {
   info: "Double check",
   caution: "Caution",
   high: "High risk transaction",
   critical: "Critical risk transaction",
 }
+
+export const riskToBadgeMap: Record<z.infer<typeof severitySchema>, string> = {
+  info: "Info",
+  caution: "Caution",
+  high: "High risk",
+  critical: "Critical risk",
+}
 export const warningMap: Record<
   z.infer<typeof reasonsSchema>,
   {
diff --git a/packages/extension/src/ui/features/argentAccount/ArgentAccountEmailNotificationsScreen.tsx b/packages/extension/src/ui/features/argentAccount/ArgentAccountEmailNotificationsScreen.tsx
deleted file mode 100644
index 3356f3f52..000000000
--- a/packages/extension/src/ui/features/argentAccount/ArgentAccountEmailNotificationsScreen.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { useDebounce } from "@argent/shared"
-import {
-  BarBackButton,
-  CellStack,
-  H6,
-  NavigationContainer,
-  Switch,
-} from "@argent/ui"
-import { Box, Divider, Flex, SwitchProps, Text } from "@chakra-ui/react"
-import { FC } from "react"
-import { useNavigateReturnToOrBack } from "../../hooks/useNavigateReturnTo"
-
-interface CardWithSwitchProps extends SwitchProps {
-  title: string
-  description: string
-}
-
-const CardWithSwitch: FC<CardWithSwitchProps> = ({
-  title,
-  description,
-  ...rest
-}: CardWithSwitchProps) => {
-  return (
-    <Box w="full">
-      <Flex
-        bgColor="neutrals.800"
-        width="full"
-        borderTopRadius="lg"
-        justifyContent="space-between"
-        p={4}
-      >
-        <H6>{title}</H6>
-        <Switch colorScheme="primary" {...rest} />
-      </Flex>
-      <Divider color="neutrals.900" />
-      <Flex
-        bgColor="neutrals.800"
-        width="full"
-        borderBottomRadius="lg"
-        justifyContent="space-between"
-        p={4}
-      >
-        <Text>{description}</Text>
-      </Flex>
-    </Box>
-  )
-}
-
-type ArgentAccountEmailNotificationsScreenProps = {
-  isNewsletterEnabled?: boolean
-  isAnnouncementsEnabled?: boolean
-  onNewsletterChange: (isEnabled: boolean) => void
-  onAnnouncementsChange: (isEnabled: boolean) => void
-}
-export const ArgentAccountEmailNotificationsScreen = ({
-  isNewsletterEnabled = false,
-  isAnnouncementsEnabled = false,
-  onNewsletterChange,
-  onAnnouncementsChange,
-}: ArgentAccountEmailNotificationsScreenProps) => {
-  const debouncedOnNewsletterChange = useDebounce(onNewsletterChange, 500)
-  const debouncedOnAnnouncementsChange = useDebounce(onAnnouncementsChange, 500)
-  const onBack = useNavigateReturnToOrBack()
-
-  return (
-    <NavigationContainer
-      leftButton={<BarBackButton onClick={onBack} />}
-      title="Email alerts"
-    >
-      <CellStack pt={0}>
-        <CardWithSwitch
-          title="Security alerts (required)"
-          description="Get notified when there are important changes to Starknet or to your Argent X accounts"
-          isChecked={true}
-          isDisabled={true}
-        />
-        <CardWithSwitch
-          title="Argent announcements"
-          description="Learn about new Argent features and campaigns"
-          defaultChecked={isAnnouncementsEnabled}
-          onChange={(e) => debouncedOnAnnouncementsChange(e.target.checked)}
-        />
-        <CardWithSwitch
-          title="Starknet Newsletter"
-          description="Focused and relevant updates from the wider Ethereum ecosystem"
-          defaultChecked={isNewsletterEnabled}
-          onChange={(e) => debouncedOnNewsletterChange(e.target.checked)}
-        />
-      </CellStack>
-    </NavigationContainer>
-  )
-}
diff --git a/packages/extension/src/ui/features/argentAccount/ArgentAccountEmailNotificationsScreenContainer.tsx b/packages/extension/src/ui/features/argentAccount/ArgentAccountEmailNotificationsScreenContainer.tsx
deleted file mode 100644
index a1d98c867..000000000
--- a/packages/extension/src/ui/features/argentAccount/ArgentAccountEmailNotificationsScreenContainer.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { ArgentAccountEmailNotificationsScreen } from "./ArgentAccountEmailNotificationsScreen"
-import { argentAccountService } from "../../services/argentAccount"
-
-import {
-  EmailPreferences,
-  emailPreferencesSchema,
-  preferencesToEmailPreferences,
-} from "../../services/argentAccount/utils"
-import { useEmailPreferences } from "./hooks/useEmailPreferences"
-
-export const ArgentAccountEmailNotificationsScreenContainer = () => {
-  const { data: emailPreferences, mutate } = useEmailPreferences()
-
-  const updatePreferences = async (
-    newValue: boolean,
-    key: keyof EmailPreferences,
-  ) => {
-    const updatedPreferences =
-      await argentAccountService.updateEmailPreferences(
-        emailPreferencesSchema.parse({
-          ...emailPreferences,
-          [key]: newValue,
-        }),
-      )
-
-    if (updatedPreferences) {
-      await mutate(preferencesToEmailPreferences.parse(updatedPreferences))
-    }
-  }
-
-  const onNewsletterChange = (newValue: boolean) =>
-    updatePreferences(newValue, "isNewsletterEnabled")
-  const onAnnouncementsChange = (newValue: boolean) =>
-    updatePreferences(newValue, "isAnnouncementsEnabled")
-
-  return (
-    <ArgentAccountEmailNotificationsScreen
-      onNewsletterChange={onNewsletterChange}
-      onAnnouncementsChange={onAnnouncementsChange}
-      isNewsletterEnabled={emailPreferences?.isNewsletterEnabled}
-      isAnnouncementsEnabled={emailPreferences?.isAnnouncementsEnabled}
-    />
-  )
-}
diff --git a/packages/extension/src/ui/features/argentAccount/hooks/useIsSignedIn.tsx b/packages/extension/src/ui/features/argentAccount/hooks/useIsSignedIn.tsx
new file mode 100644
index 000000000..f63ab8b27
--- /dev/null
+++ b/packages/extension/src/ui/features/argentAccount/hooks/useIsSignedIn.tsx
@@ -0,0 +1,9 @@
+import { useShieldVerifiedEmail } from "../../shield/useShieldVerifiedEmail"
+import { useArgentAccountTokenExpired } from "./useArgentAccountTokenExpired"
+
+export const useIsSignedIn = () => {
+  const verifiedEmail = useShieldVerifiedEmail()
+  const { data: isArgentAccountTokenExpired } = useArgentAccountTokenExpired()
+  const isSignedIn = Boolean(verifiedEmail && !isArgentAccountTokenExpired)
+  return isSignedIn
+}
diff --git a/packages/extension/src/ui/features/funding/FundingFaucetFallbackScreen.tsx b/packages/extension/src/ui/features/funding/FundingFaucetFallbackScreen.tsx
index 04203f15d..ef448aa5e 100644
--- a/packages/extension/src/ui/features/funding/FundingFaucetFallbackScreen.tsx
+++ b/packages/extension/src/ui/features/funding/FundingFaucetFallbackScreen.tsx
@@ -12,9 +12,9 @@ import { PageWrapper } from "../../components/Page"
 import { routes } from "../../routes"
 import { Alert } from "@argent/ui"
 import { useCurrentNetwork } from "../networks/hooks/useCurrentNetwork"
-import { formatTruncatedAddress } from "../../services/addresses"
 import { A } from "../../components/TrackingLink"
 import { Grid } from "@chakra-ui/react"
+import { formatTruncatedAddress } from "@argent/shared"
 
 const { DocumentIcon } = icons
 
diff --git a/packages/extension/src/ui/features/funding/FundingProviderScreen.tsx b/packages/extension/src/ui/features/funding/FundingProviderScreen.tsx
index 8178b6b15..fd06f4d28 100644
--- a/packages/extension/src/ui/features/funding/FundingProviderScreen.tsx
+++ b/packages/extension/src/ui/features/funding/FundingProviderScreen.tsx
@@ -16,12 +16,11 @@ import { Option } from "../../components/Options"
 import { PageWrapper } from "../../components/Page"
 import { A } from "../../components/TrackingLink"
 import { routes } from "../../routes"
-import { normalizeAddress } from "../../services/addresses"
 import { trackAddFundsService } from "../../services/analytics"
 import { selectedAccountView } from "../../views/account"
 import { useView } from "../../views/implementation/react"
 import { useIsMainnet } from "../networks/hooks/useIsMainnet"
-import { isFeatureEnabled } from "@argent/shared"
+import { isFeatureEnabled, normalizeAddress } from "@argent/shared"
 import { Grid } from "@chakra-ui/react"
 
 const { RampLogo, BanxaLogo } = logos
diff --git a/packages/extension/src/ui/features/funding/FundingQrCodeScreen.test.tsx b/packages/extension/src/ui/features/funding/FundingQrCodeScreen.test.tsx
index b4180b5d9..1c7bbeb95 100644
--- a/packages/extension/src/ui/features/funding/FundingQrCodeScreen.test.tsx
+++ b/packages/extension/src/ui/features/funding/FundingQrCodeScreen.test.tsx
@@ -2,22 +2,28 @@ import { render, screen } from "@testing-library/react"
 import userEvent from "@testing-library/user-event"
 import { BrowserRouter } from "react-router-dom"
 import { describe, expect, it } from "vitest"
+import copy from "copy-to-clipboard"
 
 import { FundingQrCodeScreen } from "./FundingQrCodeScreen"
+import { normalizeAddress } from "@argent/shared"
+
+vi.mock("copy-to-clipboard", () => ({
+  __esModule: true,
+  default: vi.fn(),
+}))
+
+const accountAddress =
+  "0x7e00d496e324876bbc8531f2d9a82bf154d1a04a50218ee74cdd372f75a551a"
 
-/**
- * @vitest-environment jsdom
- */
 describe("FundingQrCodeScreen", () => {
   it("renders the component with correctly formatted address", async () => {
-    /** provides a stub for navigator.clipboard, requires jsdom */
     const user = userEvent.setup()
 
     const { container } = render(
       <BrowserRouter>
         <FundingQrCodeScreen
           accountName="Account 1"
-          accountAddress="0x7e00d496e324876bbc8531f2d9a82bf154d1a04a50218ee74cdd372f75a551a"
+          accountAddress={accountAddress}
         />
       </BrowserRouter>,
     )
@@ -42,10 +48,12 @@ describe("FundingQrCodeScreen", () => {
 
     /** in production app, this address will be formatted */
     await user.click(formattedAddress)
-    await user.copy()
-    const text = await navigator.clipboard.readText()
-    expect(text).toEqual(
-      "0x 07E0 0d49 6E32 4876 BbC8 531f 2D9A 82bf 154d 1A04 a502 18eE 74Cd D372 F75a 551A",
-    )
+
+    // Need to change the test a bit to make it work with happy-dom
+    // See issue: https://github.com/capricorn86/happy-dom/issues/1153
+    const normalizedAddress = normalizeAddress(accountAddress)
+    const copyButton = screen.getByRole("button", { name: /copy address/i })
+    await user.click(copyButton)
+    expect(copy).toHaveBeenCalledWith(normalizedAddress)
   })
 })
diff --git a/packages/extension/src/ui/features/funding/FundingQrCodeScreen.tsx b/packages/extension/src/ui/features/funding/FundingQrCodeScreen.tsx
index d10962f28..688ae4d07 100644
--- a/packages/extension/src/ui/features/funding/FundingQrCodeScreen.tsx
+++ b/packages/extension/src/ui/features/funding/FundingQrCodeScreen.tsx
@@ -10,8 +10,8 @@ import { Button, Flex } from "@chakra-ui/react"
 import copy from "copy-to-clipboard"
 import { FC, useCallback, useRef } from "react"
 
-import { formatFullAddress, normalizeAddress } from "../../services/addresses"
 import { QrCode } from "./QrCode"
+import { formatFullAddress, normalizeAddress } from "@argent/shared"
 
 const { CopyIcon } = icons
 
diff --git a/packages/extension/src/ui/features/funding/utils.ts b/packages/extension/src/ui/features/funding/utils.ts
index 14ba7233c..6c101a497 100644
--- a/packages/extension/src/ui/features/funding/utils.ts
+++ b/packages/extension/src/ui/features/funding/utils.ts
@@ -1,4 +1,4 @@
-import { normalizeAddress } from "../../services/addresses"
+import { normalizeAddress } from "@argent/shared"
 
 export const getLayerSwapUrl = (accountAddress: string) => {
   return `https://www.layerswap.io/?destNetwork=STARKNET_MAINNET&destAddress=${normalizeAddress(
diff --git a/packages/extension/src/ui/features/lock/PasswordForm.tsx b/packages/extension/src/ui/features/lock/PasswordForm.tsx
index da0771580..888db01ec 100644
--- a/packages/extension/src/ui/features/lock/PasswordForm.tsx
+++ b/packages/extension/src/ui/features/lock/PasswordForm.tsx
@@ -1,16 +1,17 @@
 import { FieldError, Input, icons } from "@argent/ui"
-import { Box, Text } from "@chakra-ui/react"
+import { Box, Flex, FlexProps, Text } from "@chakra-ui/react"
 import { isEmpty, isString } from "lodash-es"
 import { FC, ReactNode, useEffect } from "react"
 import { Controller, SubmitHandler, useForm } from "react-hook-form"
 
 import { validatePassword } from "../recovery/seedRecovery.state"
+import { useAutoFocusInputRef } from "../../hooks/useAutoFocusInputRef"
 
 interface FieldValues {
   password: string
 }
 
-interface PasswordFormProps {
+export interface PasswordFormProps extends Omit<FlexProps, "children"> {
   error?: string
   verifyPassword: (password: string) => Promise<boolean>
   children?: (options: { isDirty: boolean; isSubmitting: boolean }) => ReactNode
@@ -20,6 +21,7 @@ export const PasswordForm: FC<PasswordFormProps> = ({
   error,
   verifyPassword,
   children,
+  ...rest
 }) => {
   const { control, formState, handleSubmit, clearErrors, setError } =
     useForm<FieldValues>()
@@ -43,8 +45,16 @@ export const PasswordForm: FC<PasswordFormProps> = ({
       setError("password", { message: "Invalid password" })
     }
   }
+
+  const inputRef = useAutoFocusInputRef<HTMLInputElement>()
+
   return (
-    <form onSubmit={handleSubmit(handlePassword)}>
+    <Flex
+      as="form"
+      direction="column"
+      onSubmit={handleSubmit(handlePassword)}
+      {...rest}
+    >
       <Controller
         name="password"
         control={control}
@@ -52,11 +62,14 @@ export const PasswordForm: FC<PasswordFormProps> = ({
         defaultValue=""
         render={({ field: { ref, ...field } }) => (
           <Input
-            autoFocus
             placeholder="Password"
             type="password"
             {...field}
             isInvalid={!isEmpty(errors.password)}
+            ref={(e) => {
+              ref(e)
+              inputRef.current = e
+            }}
           />
         )}
       />
@@ -83,6 +96,6 @@ export const PasswordForm: FC<PasswordFormProps> = ({
         </Box>
       )}
       {children?.({ isDirty, isSubmitting })}
-    </form>
+    </Flex>
   )
 }
diff --git a/packages/extension/src/ui/features/multisig/AddOwnerForm.tsx b/packages/extension/src/ui/features/multisig/AddOwnerForm.tsx
index bf6aafcde..33b18279c 100644
--- a/packages/extension/src/ui/features/multisig/AddOwnerForm.tsx
+++ b/packages/extension/src/ui/features/multisig/AddOwnerForm.tsx
@@ -64,6 +64,7 @@ export const AddOwnersForm = ({
                 />
                 <InputRightElement my="auto">
                   <RoundButton
+                    data-testid={`closeButton.${index}`}
                     onClick={() => {
                       if (!isNewMultisig && fields.length === 1) {
                         addOwner()
@@ -95,6 +96,7 @@ export const AddOwnersForm = ({
       )}
       <Center width="100%">
         <Button
+          data-testid="addOwnerButton"
           variant="link"
           onClick={addOwner}
           size="xs"
diff --git a/packages/extension/src/ui/features/multisig/JoinMultisigScreen.tsx b/packages/extension/src/ui/features/multisig/JoinMultisigScreen.tsx
index 2f46f0b92..c52c1e438 100644
--- a/packages/extension/src/ui/features/multisig/JoinMultisigScreen.tsx
+++ b/packages/extension/src/ui/features/multisig/JoinMultisigScreen.tsx
@@ -64,7 +64,12 @@ export const JoinMultisigScreen: FC = () => {
         </Box>
 
         {signerKey && (
-          <Button onClick={onCopy} variant="link" gap={1}>
+          <Button
+            data-testid="copy-pubkey"
+            onClick={onCopy}
+            variant="link"
+            gap={1}
+          >
             <CopyIcon />
             <B3 color="neutrals.400">{hasCopied ? "Copied" : "Copy"}</B3>
           </Button>
@@ -72,7 +77,12 @@ export const JoinMultisigScreen: FC = () => {
       </Flex>
 
       <Box position="absolute" w="full" bottom={6} px={4}>
-        <Button bg="primary.500" w="full" onClick={onDone}>
+        <Button
+          data-testid="button-done"
+          bg="primary.500"
+          w="full"
+          onClick={onDone}
+        >
           Done
         </Button>
       </Box>
diff --git a/packages/extension/src/ui/features/multisig/MultisigBanner.tsx b/packages/extension/src/ui/features/multisig/MultisigBanner.tsx
index 37324e947..bfe7a593f 100644
--- a/packages/extension/src/ui/features/multisig/MultisigBanner.tsx
+++ b/packages/extension/src/ui/features/multisig/MultisigBanner.tsx
@@ -11,17 +11,13 @@ const { MultisigIcon } = icons
 
 export const MultisigBanner: FC<{
   multisig: Multisig
-  feeTokenBalance?: bigint
-}> = ({ multisig, feeTokenBalance }) => {
+  hasFeeTokenBalance?: boolean
+}> = ({ multisig, hasFeeTokenBalance }) => {
   const isMultisigDeploying = useIsMultisigDeploying(multisig)
 
   const showActivateMultisigBanner = useMemo(
-    () =>
-      !isMultisigDeploying &&
-      multisig.needsDeploy &&
-      feeTokenBalance &&
-      feeTokenBalance > 0n,
-    [feeTokenBalance, isMultisigDeploying, multisig.needsDeploy],
+    () => !isMultisigDeploying && multisig.needsDeploy && hasFeeTokenBalance,
+    [hasFeeTokenBalance, isMultisigDeploying, multisig.needsDeploy],
   )
 
   const onActivateMultisig = useCallback(async () => {
@@ -33,6 +29,7 @@ export const MultisigBanner: FC<{
   if (showActivateMultisigBanner) {
     return (
       <AlertButton
+        data-testid="activate-multisig"
         size="md"
         title="Activate multisig"
         description="Click to activate the multisig"
@@ -47,6 +44,7 @@ export const MultisigBanner: FC<{
   if (isMultisigDeploying) {
     return (
       <AlertButton
+        data-testid="activating-multisig"
         colorScheme={"warning"}
         title="Activating multisig"
         description="Waiting for the multisig to be activated"
diff --git a/packages/extension/src/ui/features/multisig/MultisigConfirmationsScreen.tsx b/packages/extension/src/ui/features/multisig/MultisigConfirmationsScreen.tsx
index 8f51c0fb5..5f06c26e0 100644
--- a/packages/extension/src/ui/features/multisig/MultisigConfirmationsScreen.tsx
+++ b/packages/extension/src/ui/features/multisig/MultisigConfirmationsScreen.tsx
@@ -175,7 +175,11 @@ export const BaseMultisigConfirmations = ({
             existingThreshold={threshold || multisig?.threshold}
             totalSigners={totalSigners}
           />
-          <Button colorScheme="primary" onClick={handleNextClick}>
+          <Button
+            data-testid="update-confirmations"
+            colorScheme="primary"
+            onClick={handleNextClick}
+          >
             {buttonTitle}
           </Button>
         </Flex>
diff --git a/packages/extension/src/ui/features/multisig/MultisigOwner.tsx b/packages/extension/src/ui/features/multisig/MultisigOwner.tsx
index bc51ba55d..5fe2492df 100644
--- a/packages/extension/src/ui/features/multisig/MultisigOwner.tsx
+++ b/packages/extension/src/ui/features/multisig/MultisigOwner.tsx
@@ -9,12 +9,11 @@ import {
   useDisclosure,
 } from "@chakra-ui/react"
 
-import { formatTruncatedSignerKey } from "../../services/addresses"
 import { MultisigOwnerNameModal } from "./MultisigOwnerNameModal"
 import { FC, PropsWithChildren, useMemo } from "react"
 import { Account } from "../accounts/Account"
 import { noop } from "lodash-es"
-import { encodeBase58 } from "@argent/shared"
+import { encodeBase58, formatTruncatedSignerKey } from "@argent/shared"
 import { SignerMetadata } from "../../../shared/multisig/types"
 import { MultisigRemoveOwnerModal } from "./MultisigRemoveOwnerModal"
 import { useNavigate } from "react-router-dom"
diff --git a/packages/extension/src/ui/features/multisig/MultisigPendingTransactionDetailsScreen.tsx b/packages/extension/src/ui/features/multisig/MultisigPendingTransactionDetailsScreen.tsx
index 2298395f3..d2d58c33c 100644
--- a/packages/extension/src/ui/features/multisig/MultisigPendingTransactionDetailsScreen.tsx
+++ b/packages/extension/src/ui/features/multisig/MultisigPendingTransactionDetailsScreen.tsx
@@ -6,7 +6,6 @@ import { Navigate, useNavigate } from "react-router-dom"
 import { setHasSeenTransaction } from "../../../shared/multisig/pendingTransactionsStore"
 import { useAppState } from "../../app.state"
 import { routes, useRouteRequestId } from "../../routes"
-import { formatTruncatedAddress } from "../../services/addresses"
 import { usePublicKey } from "../accounts/usePublicKey"
 import { MultisigBannerProps } from "../actions/transaction/ApproveTransactionScreen/MultisigBanner"
 import {
@@ -19,6 +18,7 @@ import { useView } from "../../views/implementation/react"
 import { selectedAccountView } from "../../views/account"
 import { ApproveScreenType } from "../actions/transaction/types"
 import { ApproveTransactionScreenContainer } from "../actions/transaction/ApproveTransactionScreen/ApproveTransactionScreenContainer"
+import { formatTruncatedAddress } from "@argent/shared"
 
 export const MultisigPendingTransactionDetailsScreen = () => {
   const selectedAccount = useView(selectedAccountView)
diff --git a/packages/extension/src/ui/features/multisig/NewMultisigScreen.tsx b/packages/extension/src/ui/features/multisig/NewMultisigScreen.tsx
index aef83d21e..9c4e9d005 100644
--- a/packages/extension/src/ui/features/multisig/NewMultisigScreen.tsx
+++ b/packages/extension/src/ui/features/multisig/NewMultisigScreen.tsx
@@ -7,7 +7,7 @@ import { urlWithQuery } from "../../../shared/utils/url"
 import { useAppState } from "../../app.state"
 import { CustomButtonCell } from "../../components/CustomButtonCell"
 import { routes } from "../../routes"
-import { assertNever } from "../../services/assertNever"
+import { assertNever } from "../../../shared/utils/assertNever"
 import { useCreatePendingMultisig } from "./hooks/useCreatePendingMultisig"
 import { uiService } from "../../../shared/__new/services/ui"
 
diff --git a/packages/extension/src/ui/features/multisig/PendingMultisigListItem.tsx b/packages/extension/src/ui/features/multisig/PendingMultisigListItem.tsx
index 5135e8a79..a0a24bd8f 100644
--- a/packages/extension/src/ui/features/multisig/PendingMultisigListItem.tsx
+++ b/packages/extension/src/ui/features/multisig/PendingMultisigListItem.tsx
@@ -6,9 +6,9 @@ import {
   CustomButtonCell,
   CustomButtonCellProps,
 } from "../../components/CustomButtonCell"
-import { formatTruncatedAddress } from "../../services/addresses"
 import { AccountAvatar } from "../accounts/AccountAvatar"
 import { getNetworkAccountImageUrl } from "../accounts/accounts.service"
+import { formatTruncatedAddress } from "@argent/shared"
 
 const { ViewIcon } = icons
 
diff --git a/packages/extension/src/ui/features/multisig/SetConfirmationsInput.tsx b/packages/extension/src/ui/features/multisig/SetConfirmationsInput.tsx
index a103aa958..a16f91249 100644
--- a/packages/extension/src/ui/features/multisig/SetConfirmationsInput.tsx
+++ b/packages/extension/src/ui/features/multisig/SetConfirmationsInput.tsx
@@ -39,6 +39,7 @@ export const SetConfirmationsInput = ({
                   mb="1.5"
                 >
                   <Button
+                    data-testid="decrease-threshold"
                     borderRadius="full"
                     backgroundColor="neutrals.900"
                     onClick={() =>
@@ -48,8 +49,11 @@ export const SetConfirmationsInput = ({
                   >
                     <MinusIcon />
                   </Button>
-                  <H1 defaultValue={existingThreshold}>{field.value}</H1>
+                  <H1 data-testid="threshold" defaultValue={existingThreshold}>
+                    {field.value}
+                  </H1>
                   <Button
+                    data-testid="increase-threshold"
                     borderRadius="90"
                     backgroundColor="neutrals.900"
                     onClick={() =>
diff --git a/packages/extension/src/ui/features/multisig/multisig.mock.ts b/packages/extension/src/ui/features/multisig/multisig.mock.ts
index 300c5a18e..d85b7228e 100644
--- a/packages/extension/src/ui/features/multisig/multisig.mock.ts
+++ b/packages/extension/src/ui/features/multisig/multisig.mock.ts
@@ -8,11 +8,13 @@ import {
   WalletAccountSigner,
 } from "../../../shared/wallet.model"
 import { Multisig } from "./Multisig"
+import { ETH_TOKEN_ADDRESS } from "../../../shared/network/constants"
 
 const defaultNetwork: Network = {
   id: "localhost",
   name: "localhostNetwork",
   chainId: "1",
+  possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS],
   rpcUrl: "rpcUrl",
 }
 const defaultSigner: WalletAccountSigner = {
diff --git a/packages/extension/src/ui/features/multisig/multisig.state.ts b/packages/extension/src/ui/features/multisig/multisig.state.ts
index 64ecae257..fca9431f2 100644
--- a/packages/extension/src/ui/features/multisig/multisig.state.ts
+++ b/packages/extension/src/ui/features/multisig/multisig.state.ts
@@ -21,7 +21,7 @@ import { Multisig } from "./Multisig"
 import {
   multisigBaseWalletView,
   pendingMultisigsView,
-} from "../../../shared/multisig/view"
+} from "../../views/multisig"
 
 export const mapMultisigWalletAccountsToMultisig = (
   walletAccounts: MultisigWalletAccount[],
diff --git a/packages/extension/src/ui/features/multisig/multisigTransactions.state.ts b/packages/extension/src/ui/features/multisig/multisigTransactions.state.ts
index 93bb8897c..0df6ed4af 100644
--- a/packages/extension/src/ui/features/multisig/multisigTransactions.state.ts
+++ b/packages/extension/src/ui/features/multisig/multisigTransactions.state.ts
@@ -6,7 +6,7 @@ import {
   byAccountSelector,
   multisigPendingTransactionsStore,
 } from "../../../shared/multisig/pendingTransactionsStore"
-import { useArrayStorage } from "../../../shared/storage/hooks"
+import { useArrayStorage } from "../../hooks/useStorage"
 import { BaseWalletAccount } from "../../../shared/wallet.model"
 import { useMultisig } from "./multisig.state"
 import { num } from "starknet"
diff --git a/packages/extension/src/ui/features/networks/NetworkSwitcher/NetworkSwitcherButton.tsx b/packages/extension/src/ui/features/networks/NetworkSwitcher/NetworkSwitcherButton.tsx
index eae2c70c7..ba00f10ad 100644
--- a/packages/extension/src/ui/features/networks/NetworkSwitcher/NetworkSwitcherButton.tsx
+++ b/packages/extension/src/ui/features/networks/NetworkSwitcher/NetworkSwitcherButton.tsx
@@ -2,10 +2,10 @@ import { Button, ButtonProps, MenuButton } from "@chakra-ui/react"
 import { FC } from "react"
 
 import { Network, NetworkStatus } from "../../../../shared/network"
-import {
-  StatusIndicator,
-  mapNetworkStatusToColor,
-} from "../../../components/StatusIndicator"
+// import {
+//   StatusIndicator,
+//   mapNetworkStatusToColor,
+// } from "../../../components/StatusIndicator"
 
 interface NetworkSwitcherButtonProps extends ButtonProps {
   disabled?: boolean
diff --git a/packages/extension/src/ui/features/networks/NetworkSwitcher/NetworkSwitcherList.tsx b/packages/extension/src/ui/features/networks/NetworkSwitcher/NetworkSwitcherList.tsx
index e7f82ecf2..d49bce9e1 100644
--- a/packages/extension/src/ui/features/networks/NetworkSwitcher/NetworkSwitcherList.tsx
+++ b/packages/extension/src/ui/features/networks/NetworkSwitcher/NetworkSwitcherList.tsx
@@ -3,10 +3,10 @@ import { Flex, MenuItem, MenuList, MenuListProps } from "@chakra-ui/react"
 import { FC } from "react"
 
 import { Network, NetworkStatus } from "../../../../shared/network"
-import {
-  StatusIndicator,
-  mapNetworkStatusToColor,
-} from "../../../components/StatusIndicator"
+// import {
+//   StatusIndicator,
+//   mapNetworkStatusToColor,
+// } from "../../../components/StatusIndicator"
 
 export interface NetworkSwitcherListProps extends MenuListProps {
   currentNetwork: Network
@@ -22,7 +22,7 @@ export const NetworkSwitcherList: FC<NetworkSwitcherListProps> = ({
 }) => {
   return (
     <MenuList {...rest}>
-      {allNetworks.map(({ id, name, status, rpcUrl, readonly }) => {
+      {allNetworks.map(({ id, name, status: _status, rpcUrl, readonly }) => {
         const isCurrent = id === currentNetwork.id
         return (
           <MenuItem
@@ -61,15 +61,9 @@ export const NetworkSwitcherList: FC<NetworkSwitcherListProps> = ({
                 {rpcUrl && !readonly && (
                   <L2
                     sx={{
-                      color: "neutrals.400",
-                      _groupHover: { color: "neutrals.300" },
+                      color: "neutrals.100",
+                      _groupHover: { color: "white" },
                     }}
-                    noOfLines={1}
-                    display="block"
-                    overflow={"hidden"}
-                    textOverflow={"ellipsis"}
-                    maxWidth={"180px"}
-                    whiteSpace={"nowrap"}
                   >
                     {rpcUrl}
                   </L2>
diff --git a/packages/extension/src/ui/features/networks/NetworkWarningScreen/NetworkWarningScreen.tsx b/packages/extension/src/ui/features/networks/NetworkWarningScreen/NetworkWarningScreen.tsx
index ddf54f928..aa44444f4 100644
--- a/packages/extension/src/ui/features/networks/NetworkWarningScreen/NetworkWarningScreen.tsx
+++ b/packages/extension/src/ui/features/networks/NetworkWarningScreen/NetworkWarningScreen.tsx
@@ -5,7 +5,7 @@ import { FC } from "react"
 const { NetworkIcon } = icons
 
 type NetworkWarningScreenProps = {
-  onClick: () => void
+  onClick?: () => void
 }
 export const NetworkWarningScreen: FC<NetworkWarningScreenProps> = ({
   onClick,
diff --git a/packages/extension/src/ui/features/onboarding/OnboardingDisclaimerScreen.test.tsx b/packages/extension/src/ui/features/onboarding/OnboardingDisclaimerScreen.test.tsx
index 9f790221f..8e77b1514 100644
--- a/packages/extension/src/ui/features/onboarding/OnboardingDisclaimerScreen.test.tsx
+++ b/packages/extension/src/ui/features/onboarding/OnboardingDisclaimerScreen.test.tsx
@@ -1,12 +1,8 @@
-import { fireEvent, render, screen } from "@testing-library/react"
+import { fireEvent, render, screen, act } from "@testing-library/react"
 import { describe, expect, it } from "vitest"
 
 import { OnboardingDisclaimerScreen } from "./OnboardingDisclaimerScreen"
 
-/**
- * @vitest-environment jsdom
- */
-
 describe("OnboardingDisclaimerScreen", () => {
   it("onContinue does not work until boxes are checked", async () => {
     const onContinue = vi.fn()
@@ -21,11 +17,15 @@ describe("OnboardingDisclaimerScreen", () => {
 
     expect(screen.getByText(/^Continue/)).toBeDisabled()
 
-    fireEvent.click(screen.getByText(/introduce changes/))
-    fireEvent.click(screen.getByText(/experience performance/))
+    act(() => {
+      fireEvent.click(screen.getByText(/introduce changes/))
+      fireEvent.click(screen.getByText(/experience performance/))
+    })
 
     expect(screen.getByText(/^Continue/)).not.toBeDisabled()
-    fireEvent.click(screen.getByText(/^Continue/))
+    act(() => {
+      fireEvent.click(screen.getByText(/^Continue/))
+    })
 
     expect(onContinue).toHaveBeenCalled()
   })
@@ -41,7 +41,9 @@ describe("OnboardingDisclaimerScreen", () => {
       />,
     )
 
-    fireEvent.click(screen.getByText(/^Privacy/))
+    act(() => {
+      fireEvent.click(screen.getByText(/^Privacy/))
+    })
 
     expect(onPrivacy).toHaveBeenCalled()
   })
diff --git a/packages/extension/src/ui/features/onboarding/OnboardingDisclaimerScreenContainer.tsx b/packages/extension/src/ui/features/onboarding/OnboardingDisclaimerScreenContainer.tsx
index 7859a1c9b..162f92ba8 100644
--- a/packages/extension/src/ui/features/onboarding/OnboardingDisclaimerScreenContainer.tsx
+++ b/packages/extension/src/ui/features/onboarding/OnboardingDisclaimerScreenContainer.tsx
@@ -3,22 +3,22 @@ import { FC, useCallback } from "react"
 import { useNavigate } from "react-router-dom"
 
 import { routes } from "../../routes"
-import { useTimeSpentWithSuccessTracking } from "../../services/analytics"
+// import { useTimeSpentWithSuccessTracking } from "../../services/analytics"
 import { OnboardingDisclaimerScreen } from "./OnboardingDisclaimerScreen"
 
 export const OnboardingDisclaimerScreenContainer: FC = () => {
-  const { trackSuccess } = useTimeSpentWithSuccessTracking(
-    "onboardingStepFinished",
-    { stepId: "disclaimer" },
-  )
+  // const { trackSuccess } = useTimeSpentWithSuccessTracking(
+  //   "onboardingStepFinished",
+  //   { stepId: "disclaimer" },
+  // )
 
   const navigate = useNavigate()
   const onBack = useNavigateBack()
 
   const onContinue = useCallback(() => {
-    trackSuccess()
+    // trackSuccess() // TODO: temporary disabled
     navigate(routes.onboardingPassword())
-  }, [navigate, trackSuccess])
+  }, [navigate])
 
   const onPrivacy = useCallback(() => {
     navigate(routes.onboardingPrivacyStatement())
diff --git a/packages/extension/src/ui/features/onboarding/OnboardingFinishScreenContainer.tsx b/packages/extension/src/ui/features/onboarding/OnboardingFinishScreenContainer.tsx
index 30a6478a5..bab34c0d8 100644
--- a/packages/extension/src/ui/features/onboarding/OnboardingFinishScreenContainer.tsx
+++ b/packages/extension/src/ui/features/onboarding/OnboardingFinishScreenContainer.tsx
@@ -1,17 +1,17 @@
 import { FC, useCallback } from "react"
 
-import { useTimeSpentWithSuccessTracking } from "../../services/analytics"
+// import { useTimeSpentWithSuccessTracking } from "../../services/analytics"
 import { OnboardingFinishScreen } from "./OnboardingFinishScreen"
 
 export const OnboardingFinishScreenContainer: FC = () => {
-  const { trackSuccess } = useTimeSpentWithSuccessTracking(
-    "onboardingStepFinished",
-    { stepId: "finish" },
-  )
+  // const { trackSuccess } = useTimeSpentWithSuccessTracking(
+  //   "onboardingStepFinished",
+  //   { stepId: "finish" },
+  // )
   const onFinish = useCallback(() => {
-    void trackSuccess()
+    // void trackSuccess() // TODO: temporary disabled
     window.close()
-  }, [trackSuccess])
+  }, [])
 
   return <OnboardingFinishScreen onFinish={onFinish} />
 }
diff --git a/packages/extension/src/ui/features/onboarding/OnboardingPasswordScreenContainer.tsx b/packages/extension/src/ui/features/onboarding/OnboardingPasswordScreenContainer.tsx
index 4c5c0d248..86159633e 100644
--- a/packages/extension/src/ui/features/onboarding/OnboardingPasswordScreenContainer.tsx
+++ b/packages/extension/src/ui/features/onboarding/OnboardingPasswordScreenContainer.tsx
@@ -5,18 +5,15 @@ import { useNavigate } from "react-router-dom"
 import { defaultNetwork } from "../../../shared/network"
 import { routes } from "../../routes"
 import { clientAccountService } from "../../services/account"
-import {
-  analytics,
-  useTimeSpentWithSuccessTracking,
-} from "../../services/analytics"
+import { analytics } from "../../services/analytics"
 import { OnboardingPasswordScreen } from "./OnboardingPasswordScreen"
 import { sessionService } from "../../services/session"
 
 export const OnboardingPasswordScreenContainer: FC = () => {
-  const { trackSuccess } = useTimeSpentWithSuccessTracking(
-    "onboardingStepFinished",
-    { stepId: "newWalletPassword" },
-  )
+  // const { trackSuccess } = useTimeSpentWithSuccessTracking(
+  //   "onboardingStepFinished",
+  //   { stepId: "newWalletPassword" },
+  // )
 
   const navigate = useNavigate()
   const onBack = useNavigateBack()
@@ -45,7 +42,7 @@ export const OnboardingPasswordScreenContainer: FC = () => {
         })
         // NOTE: this tracking call is legit, as it relies on information that's only accessable to the UI
         // NOTE: we're not interested in the return of this promise, we should indicate that with void
-        void trackSuccess()
+        // void trackSuccess() // TODO: temporary disabled
 
         // NOTE: return the navigate promise, to make sure the form waits for it to finish
         return navigate(routes.onboardingFinish.path, { replace: true })
@@ -61,7 +58,7 @@ export const OnboardingPasswordScreenContainer: FC = () => {
         throw error
       }
     },
-    [navigate, networkId, trackSuccess],
+    [navigate, networkId],
   )
 
   return (
diff --git a/packages/extension/src/ui/features/onboarding/OnboardingRestoreBackupScreenContainer.tsx b/packages/extension/src/ui/features/onboarding/OnboardingRestoreBackupScreenContainer.tsx
index 1867aad9a..9749d2043 100644
--- a/packages/extension/src/ui/features/onboarding/OnboardingRestoreBackupScreenContainer.tsx
+++ b/packages/extension/src/ui/features/onboarding/OnboardingRestoreBackupScreenContainer.tsx
@@ -7,7 +7,6 @@ import { useAppState } from "../../app.state"
 import { routes } from "../../routes"
 import { fileToString } from "../../services/files"
 import { clientRecoveryService } from "../../services/recovery"
-import { useOnboardingScreen } from "./hooks/useOnboardingScreen"
 import { OnboardingRestoreBackupScreen } from "./OnboardingRestoreBackupScreen"
 
 export const OnboardingRestoreBackupScreenContainer: FC = () => {
diff --git a/packages/extension/src/ui/features/onboarding/OnboardingRestoreSeedScreen.test.tsx b/packages/extension/src/ui/features/onboarding/OnboardingRestoreSeedScreen.test.tsx
index 3157ed910..c1588931e 100644
--- a/packages/extension/src/ui/features/onboarding/OnboardingRestoreSeedScreen.test.tsx
+++ b/packages/extension/src/ui/features/onboarding/OnboardingRestoreSeedScreen.test.tsx
@@ -1,14 +1,16 @@
 import { generateMnemonic } from "@scure/bip39"
 import { wordlist as en } from "@scure/bip39/wordlists/english"
-import { act, fireEvent, render, waitFor } from "@testing-library/react"
-import { describe, expect, it } from "vitest"
+import {
+  act,
+  fireEvent,
+  render,
+  waitFor,
+  getByTestId,
+} from "@testing-library/react"
+import { describe, expect, it, vi } from "vitest"
 
 import { OnboardingRestoreSeedScreen } from "./OnboardingRestoreSeedScreen"
 
-/**
- * @vitest-environment jsdom
- */
-
 describe("OnboardingRestoreSeedScreen", async () => {
   it("onRestore is called with the seed input", async () => {
     const onRestore = vi.fn()
@@ -18,7 +20,8 @@ describe("OnboardingRestoreSeedScreen", async () => {
     const screen = render(<OnboardingRestoreSeedScreen onRestore={onRestore} />)
     const { container } = screen
 
-    const focusedInput = container.querySelector(":focus")
+    const focusedInput = getByTestId(container, "seed-input-0")
+    expect(focusedInput).toHaveFocus()
     if (focusedInput) {
       await act(async () => {
         fireEvent.blur(focusedInput)
diff --git a/packages/extension/src/ui/features/onboarding/OnboardingRestoreSeedScreenContainer.tsx b/packages/extension/src/ui/features/onboarding/OnboardingRestoreSeedScreenContainer.tsx
index 17bb13872..c4993a1e3 100644
--- a/packages/extension/src/ui/features/onboarding/OnboardingRestoreSeedScreenContainer.tsx
+++ b/packages/extension/src/ui/features/onboarding/OnboardingRestoreSeedScreenContainer.tsx
@@ -2,16 +2,16 @@ import { useNavigateBack } from "@argent/ui"
 import { FC, useCallback } from "react"
 
 import { routes } from "../../routes"
-import { useTimeSpentWithSuccessTracking } from "../../services/analytics"
+// import { useTimeSpentWithSuccessTracking } from "../../services/analytics"
 import { useCustomNavigate } from "../recovery/hooks/useCustomNavigate"
 import { useSeedRecovery } from "../recovery/seedRecovery.state"
 import { OnboardingRestoreSeedScreen } from "./OnboardingRestoreSeedScreen"
 
 export const OnboardingRestoreSeedScreenContainer: FC = () => {
-  const { trackSuccess } = useTimeSpentWithSuccessTracking(
-    "onboardingStepFinished",
-    { stepId: "restoreSeedphrase" },
-  )
+  // const { trackSuccess } = useTimeSpentWithSuccessTracking(
+  //   "onboardingStepFinished",
+  //   { stepId: "restoreSeedphrase" },
+  // )
   const customNavigate = useCustomNavigate()
   const onBack = useNavigateBack()
 
@@ -19,10 +19,10 @@ export const OnboardingRestoreSeedScreenContainer: FC = () => {
     async (seedPhrase: string) => {
       // seedPhrase was already validated in the OnboardingRestoreSeedScreen form and will be validated again in the BG
       useSeedRecovery.setState({ seedPhrase }) // set to temorary state, so we can access it after the next screen
-      void trackSuccess()
+      // void trackSuccess() // TODO: temporary disabled
       await customNavigate(routes.onboardingRestorePassword())
     },
-    [customNavigate, trackSuccess],
+    [customNavigate],
   )
 
   const onUseBackup = useCallback(() => {
diff --git a/packages/extension/src/ui/features/onboarding/OnboardingStartScreenContainer.tsx b/packages/extension/src/ui/features/onboarding/OnboardingStartScreenContainer.tsx
index 0bc465e01..f77e1e2a1 100644
--- a/packages/extension/src/ui/features/onboarding/OnboardingStartScreenContainer.tsx
+++ b/packages/extension/src/ui/features/onboarding/OnboardingStartScreenContainer.tsx
@@ -2,26 +2,26 @@ import { FC, useCallback } from "react"
 import { useNavigate } from "react-router-dom"
 
 import { routes } from "../../routes"
-import { useTimeSpentWithSuccessTracking } from "../../services/analytics"
+// import { useTimeSpentWithSuccessTracking } from "../../services/analytics"
 import { OnboardingStartScreen } from "./OnboardingStartScreen"
 
 export const OnboardingStartScreenContainer: FC = () => {
-  const { trackSuccess } = useTimeSpentWithSuccessTracking(
-    "onboardingStepFinished",
-    { stepId: "welcome" },
-  )
+  // const { trackSuccess } = useTimeSpentWithSuccessTracking(
+  //   "onboardingStepFinished",
+  //   { stepId: "welcome" },
+  // )
 
   const navigate = useNavigate()
 
   const onCreate = useCallback(() => {
-    void trackSuccess()
+    // void trackSuccess()
     void navigate(routes.onboardingDisclaimer())
-  }, [navigate, trackSuccess])
+  }, [navigate])
 
   const onRestore = useCallback(() => {
-    void trackSuccess() // NOTE: there is nothing different between restore and create, so we track the same event?
+    // void trackSuccess() // NOTE: there is nothing different between restore and create, so we track the same event?
     void navigate(routes.onboardingRestoreSeed())
-  }, [navigate, trackSuccess])
+  }, [navigate])
 
   return <OnboardingStartScreen onCreate={onCreate} onRestore={onRestore} />
 }
diff --git a/packages/extension/src/ui/features/onboarding/hooks/useOnboardingScreen.ts b/packages/extension/src/ui/features/onboarding/hooks/useOnboardingScreen.ts
deleted file mode 100644
index 109ed7ea4..000000000
--- a/packages/extension/src/ui/features/onboarding/hooks/useOnboardingScreen.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { useEffect, useRef } from "react"
-import { useLocation, useNavigate } from "react-router-dom"
-
-import { useAppState } from "../../../app.state"
-import { routes } from "../../../routes"
-import { extensionIsInTab, openExtensionInTab } from "../../browser/tabs"
-import { isBackupStoredView } from "../../../views/session"
-import { useView } from "../../../views/implementation/react"
-
-/**
- * This hook is used to redirect to the finish screen if the wallet is already initialised
- * It also checks if the extension is in a tab, if not, it opens it in a tab
- *
- * @dev This hook should be called on every screen of the onboarding
- * @returns void
- */
-export const useOnboardingScreen = () => {
-  const navigate = useNavigate()
-  const location = useLocation()
-  const { isFirstRender } = useAppState()
-  const isBackupStored = useView(isBackupStoredView)
-
-  // TODO: this should not be nessessary, instead of pulling a value on focus, the UI should react to changes in real time by subscribing to the store
-  useEffect(() => {
-    /** on window focus, check if the wallet was initialised elsewhere and redirect to finish screen */
-    const onFocus = async () => {
-      if (
-        isBackupStored &&
-        isFirstRender &&
-        location.pathname !== routes.onboardingFinish.path &&
-        location.pathname !== routes.onboardingRestorePassword.path // feels very hacky this useEffect here, need to find something more sustainable
-      ) {
-        navigate(routes.onboardingFinish.path, { replace: true })
-      }
-    }
-    window.addEventListener("focus", onFocus)
-    onFocus()
-    return () => {
-      window.removeEventListener("focus", onFocus)
-    }
-  }, [location.pathname, navigate, isFirstRender, isBackupStored])
-
-  // NOTE: check if extension is in a tab, if not, open it in a tab
-  const didRunInit = useRef(false)
-  useEffect(() => {
-    const init = async () => {
-      /** prevent opening more than once when useEffect is called multiple times in dev */
-      if (!didRunInit.current) {
-        didRunInit.current = true
-        /** When user clicks extension icon, open onboarding in full screen */
-        const inTab = await extensionIsInTab()
-        if (!inTab) {
-          /** Note: cannot detect and focus an existing extension tab here, so open a new one */
-          await openExtensionInTab()
-          window.close()
-        }
-      }
-    }
-    init()
-  }, [isFirstRender])
-}
diff --git a/packages/extension/src/ui/features/preAuthorizations/hooks.ts b/packages/extension/src/ui/features/preAuthorizations/hooks.ts
new file mode 100644
index 000000000..bb3a96b55
--- /dev/null
+++ b/packages/extension/src/ui/features/preAuthorizations/hooks.ts
@@ -0,0 +1,50 @@
+import type { BaseWalletAccount } from "../../../shared/wallet.model"
+import { useView } from "../../views/implementation/react"
+import {
+  allPreAuthorizationsView,
+  isPreauthorized,
+  preAuthorizationsForAccount,
+  preAuthorizationsForNetworkId,
+  preAuthorizationsGroupedByAccountIdentifierForNetworkId,
+} from "../../views/preAuthorizations"
+import { useEffect, useState } from "react"
+import { getWindowURL } from "../../../shared/browser/host"
+
+export const usePreAuthorizations = () => useView(allPreAuthorizationsView)
+
+export const usePreAuthorizationsGroupedByAccountIdentifierForNetworkId = (
+  networkId: string,
+) => {
+  return useView(
+    preAuthorizationsGroupedByAccountIdentifierForNetworkId(networkId),
+  )
+}
+
+export const usePreAuthorizationsForNetworkId = (networkId: string) => {
+  return useView(preAuthorizationsForNetworkId(networkId))
+}
+
+export const usePreAuthorizationsForAccount = (account?: BaseWalletAccount) => {
+  return useView(preAuthorizationsForAccount(account))
+}
+
+export const useIsPreauthorized = (
+  host?: string,
+  account?: BaseWalletAccount,
+) => {
+  return useView(isPreauthorized({ account, host }))
+}
+
+/** pre-authorizations are set using 'origin', ie. with protocol, but are still called 'host' */
+
+export const useOriginatingPreAuthorizationHost = () => {
+  const [host, setHost] = useState<string | undefined>()
+  useEffect(() => {
+    const init = async () => {
+      const url = await getWindowURL()
+      setHost(url?.origin)
+    }
+    void init()
+  }, [])
+  return host
+}
diff --git a/packages/extension/src/ui/features/send/NftInput.tsx b/packages/extension/src/ui/features/send/NftInput.tsx
index fb0cc00aa..f22a8446a 100644
--- a/packages/extension/src/ui/features/send/NftInput.tsx
+++ b/packages/extension/src/ui/features/send/NftInput.tsx
@@ -46,8 +46,8 @@ export const NftInput: FC<NftInputProps> = ({
         h={14}
         fit={"cover"}
       />
-      <Flex direction={"column"} gap={1} flex={1}>
-        <H6>{title}</H6>
+      <Flex direction={"column"} gap={1} flex={1} overflow={"hidden"}>
+        <H6 whiteSpace="initial">{title}</H6>
         <P4 color={"neutrals.400"}>{subtitle}</P4>
       </Flex>
       <Circle size={7} bg={"neutrals.900"}>
diff --git a/packages/extension/src/ui/features/send/SendAmountAndAssetTokenScreenContainer.tsx b/packages/extension/src/ui/features/send/SendAmountAndAssetTokenScreenContainer.tsx
index 58977cb4a..4030827f2 100644
--- a/packages/extension/src/ui/features/send/SendAmountAndAssetTokenScreenContainer.tsx
+++ b/packages/extension/src/ui/features/send/SendAmountAndAssetTokenScreenContainer.tsx
@@ -27,7 +27,7 @@ import { getUint256CalldataFromBN } from "../../services/transactions"
 import { selectedAccountView } from "../../views/account"
 import { useView } from "../../views/implementation/react"
 import { useTokenUnitAmountToCurrencyValue } from "../accountTokens/tokenPriceHooks"
-import { useNetworkFeeToken, useToken } from "../accountTokens/tokens.state"
+import { useToken } from "../accountTokens/tokens.state"
 import { useMaxFeeEstimateForTransfer } from "../accountTokens/useMaxFeeForTransfer"
 import { amountInputSchema } from "./amountInput"
 import {
@@ -41,6 +41,10 @@ import { tokenService } from "../../services/tokens"
 import { useLiveTokenBalanceForAccount } from "../accountTokens/useLiveTokenBalanceForAccount"
 import { Spinner } from "@chakra-ui/react"
 import { clientStarknetAddressService } from "../../services/address"
+import {
+  pickBestFeeToken,
+  useFeeTokenBalances,
+} from "../accountTokens/useFeeTokenBalance"
 
 const formSchema = z.object({
   amount: amountInputSchema,
@@ -52,11 +56,6 @@ export const SendAmountAndAssetTokenScreenContainer: FC<
   SendAmountAndAssetScreenProps
 > = ({ tokenAddress, ...rest }) => {
   const account = useView(selectedAccountView)
-  const feeToken = useNetworkFeeToken(account?.networkId)
-  /** default to fee token if no token was selected yet */
-  if (!tokenAddress) {
-    tokenAddress = feeToken?.address || "0x0"
-  }
   const token = useToken({
     address: tokenAddress,
     networkId: account?.networkId || "Unknown",
@@ -114,25 +113,33 @@ const GuardedSendAmountAndAssetTokenScreenContainer: FC<
     handleSubmit,
     setError,
   } = useForm<FormType>({
-    defaultValues: { amount: propAmount || "" },
+    defaultValues: {
+      amount: propAmount || "",
+    },
     resolver: zodResolver(formSchema),
   })
   const hasAmountError = "amount" in errors
-  const inputAmount = watch().amount
+  const { amount: inputAmount } = watch()
   const { ref, onChange, ...amountInputRest } = register("amount")
   const inputRef = useAutoFocusInputRef<HTMLInputElement>()
 
   const network = useCurrentNetwork()
 
-  const feeToken = useNetworkFeeToken(account?.networkId)
+  const feeTokens = useFeeTokenBalances(account)
+  const feeToken = pickBestFeeToken(feeTokens, { avoid: [tokenAddress] })
 
   const currencyValue = useTokenUnitAmountToCurrencyValue(token, inputAmount)
 
   const {
-    maxFee,
+    data: maxFee,
     error: maxFeeError,
-    loading: maxFeeLoading,
-  } = useMaxFeeEstimateForTransfer(tokenAddress, balance, account)
+    isValidating: maxFeeLoading,
+  } = useMaxFeeEstimateForTransfer(
+    feeToken.address,
+    tokenAddress,
+    balance,
+    account,
+  )
 
   const onSubmit = useCallback(async () => {
     if (token && recipientAddress && inputAmount) {
@@ -172,18 +179,14 @@ const GuardedSendAmountAndAssetTokenScreenContainer: FC<
         tokenDecimals,
       )
 
-      const maxAmount =
-        account?.networkId ===
-        "localhost" /** FIXME: workaround for localhost fee estimate with devnet 0.3.4 */
-          ? balance - BigInt(maxFee) - 100000000000000n
-          : balance - BigInt(maxFee)
+      const maxAmount = balance - BigInt(maxFee)
 
       const formattedMaxAmount = formatUnits(maxAmount, tokenDecimals)
       setValue("amount", maxAmount <= 0n ? tokenBalance : formattedMaxAmount, {
         shouldDirty: true,
       })
     }
-  }, [balance, maxFee, token.decimals, account?.networkId, setValue])
+  }, [balance, maxFee, token.decimals, setValue])
 
   const parsedInputAmount = parseAmount(
     inputAmount || "0",
diff --git a/packages/extension/src/ui/features/send/SendAssetScreen.tsx b/packages/extension/src/ui/features/send/SendAssetScreen.tsx
index 604ea3f27..bc5967ae8 100644
--- a/packages/extension/src/ui/features/send/SendAssetScreen.tsx
+++ b/packages/extension/src/ui/features/send/SendAssetScreen.tsx
@@ -32,8 +32,7 @@ import { useFilteredTokens } from "./useFilteredTokens"
 const { SearchIcon, WalletIcon, NftIcon } = icons
 
 export const SendAssetScreen: FC = () => {
-  const { recipientAddress, tokenAddress, tokenId, amount, returnTo } =
-    useSendQuery()
+  const { recipientAddress, tokenId, amount, returnTo } = useSendQuery()
   const navigate = useNavigate()
   const account = useView(selectedAccountView)
   const { watch, register } = useForm({
diff --git a/packages/extension/src/ui/features/send/SendCollectionNftsScreenContainer.tsx b/packages/extension/src/ui/features/send/SendCollectionNftsScreenContainer.tsx
index b2406c201..59ee986aa 100644
--- a/packages/extension/src/ui/features/send/SendCollectionNftsScreenContainer.tsx
+++ b/packages/extension/src/ui/features/send/SendCollectionNftsScreenContainer.tsx
@@ -10,8 +10,7 @@ import { useSendQuery } from "./schema"
 
 export const SendCollectionNftsScreenContainer: FC = () => {
   const navigate = useNavigate()
-  const { recipientAddress, tokenAddress, tokenId, amount, returnTo } =
-    useSendQuery()
+  const { recipientAddress, tokenAddress, returnTo } = useSendQuery()
 
   const collection = useCollection(addressSchema.parse(tokenAddress))
   const nfts = useCollectionNfts(
diff --git a/packages/extension/src/ui/features/send/SendModalAddContactScreen.tsx b/packages/extension/src/ui/features/send/SendModalAddContactScreen.tsx
index cbb3e1910..02e379eda 100644
--- a/packages/extension/src/ui/features/send/SendModalAddContactScreen.tsx
+++ b/packages/extension/src/ui/features/send/SendModalAddContactScreen.tsx
@@ -6,7 +6,7 @@ import { ModalSheet } from "../../components/ModalSheet"
 import {
   AddressBookAddOrEditScreenContainer,
   AddressBookAddOrEditScreenContainerProps,
-} from "../settings/AddressBookAddOrEditScreenContainer"
+} from "../settings/addressBook/AddressBookAddOrEditScreenContainer"
 
 interface SendModalAddContactScreenProps
   extends Omit<DrawerProps, "children">,
diff --git a/packages/extension/src/ui/features/send/schema.test.ts b/packages/extension/src/ui/features/send/schema.test.ts
index 4e16db27c..17ba4669e 100644
--- a/packages/extension/src/ui/features/send/schema.test.ts
+++ b/packages/extension/src/ui/features/send/schema.test.ts
@@ -1,6 +1,10 @@
 import { describe, expect, test } from "vitest"
 
 import { parseQuery, sendQuerySchema } from "./schema"
+import { stark } from "starknet"
+import { addressSchema } from "@argent/shared"
+
+const mockTokenAddress = addressSchema.parse(stark.randomAddress())
 
 describe("send", () => {
   describe("schema", () => {
@@ -13,11 +17,13 @@ describe("send", () => {
           parseQuery(
             new URLSearchParams({
               tokenId: "123",
+              tokenAddress: mockTokenAddress,
             }),
             sendQuerySchema,
           ),
         ).toEqual({
           tokenId: "123",
+          tokenAddress: mockTokenAddress,
         })
       })
     })
@@ -31,11 +37,13 @@ describe("send", () => {
             new URLSearchParams({
               foo: "bar",
               tokenId: "123",
+              tokenAddress: mockTokenAddress,
             }),
             sendQuerySchema,
           ),
         ).toEqual({
           tokenId: "123",
+          tokenAddress: mockTokenAddress,
         })
       })
     })
diff --git a/packages/extension/src/ui/features/send/schema.ts b/packages/extension/src/ui/features/send/schema.ts
index 90eb70ca6..8d49932af 100644
--- a/packages/extension/src/ui/features/send/schema.ts
+++ b/packages/extension/src/ui/features/send/schema.ts
@@ -5,7 +5,7 @@ import { useQuery } from "../../hooks/useQuery"
 
 export const sendQuerySchema = z.object({
   recipientAddress: addressOrDomainSchema.optional(),
-  tokenAddress: addressSchema.optional(),
+  tokenAddress: addressSchema,
   tokenId: z.string().optional(),
   amount: z.string().optional(),
   returnTo: z.string().optional(),
diff --git a/packages/extension/src/ui/features/settings/BeforeYouContinueScreen.tsx b/packages/extension/src/ui/features/settings/BeforeYouContinueScreen.tsx
deleted file mode 100644
index d91e4aa98..000000000
--- a/packages/extension/src/ui/features/settings/BeforeYouContinueScreen.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { P3, icons, Button, NavigationContainer, H3 } from "@argent/ui"
-import { Box, Circle, Flex } from "@chakra-ui/react"
-import { useNavigate } from "react-router-dom"
-import { routes } from "../../routes"
-
-const { AlertIcon } = icons
-
-export const BeforeYouContinueScreen = () => {
-  const navigate = useNavigate()
-  const navigateToRecoveryPhrase = () => {
-    navigate(routes.setupSeedRecovery())
-  }
-  return (
-    <NavigationContainer>
-      <Flex
-        py={4}
-        px={5}
-        direction={"column"}
-        justifyContent={"space-between"}
-        alignContent={"center"}
-        borderRadius="2xl"
-        width="full"
-        height="full"
-      >
-        <Box>
-          <Circle
-            size={24}
-            bg={"primaryExtraDark.500"}
-            color={"primary.500"}
-            my={2}
-            mx="auto"
-          >
-            <AlertIcon fontSize={40} />
-          </Circle>
-          <Flex my={2} alignItems="center" mb={4} direction="column">
-            <H3 color={"white"} mb={3}>
-              Before you continue...
-            </H3>
-
-            <P3 color={"neutrals.100"} textAlign="center">
-              Please save your recovery phrase. This is the only way you will be
-              able to recover your Argent X accounts
-            </P3>
-          </Flex>
-        </Box>
-        <Button onClick={navigateToRecoveryPhrase} colorScheme="primary" px={2}>
-          Next
-        </Button>
-      </Flex>
-    </NavigationContainer>
-  )
-}
diff --git a/packages/extension/src/ui/features/settings/BetaFeatureSettings.tsx b/packages/extension/src/ui/features/settings/BetaFeatureSettings.tsx
deleted file mode 100644
index 24996d1c1..000000000
--- a/packages/extension/src/ui/features/settings/BetaFeatureSettings.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import {
-  BarBackButton,
-  ButtonCell,
-  CellStack,
-  NavigationContainer,
-} from "@argent/ui"
-import { FC } from "react"
-
-import { SettingsScreenWrapper } from "./SettingsScreen"
-
-// Disabled in AppRoutes.tsx
-// Re-enable when we have a beta feature to add
-
-export const BetaFeaturesSettings: FC = () => {
-  return (
-    <NavigationContainer leftButton={<BarBackButton />} title={"Beta Features"}>
-      <SettingsScreenWrapper>
-        <CellStack>
-          <ButtonCell></ButtonCell>
-        </CellStack>
-      </SettingsScreenWrapper>
-    </NavigationContainer>
-  )
-}
diff --git a/packages/extension/src/ui/features/settings/BlockExplorerSettingsScreen.tsx b/packages/extension/src/ui/features/settings/BlockExplorerSettingsScreen.tsx
deleted file mode 100644
index 124d8beff..000000000
--- a/packages/extension/src/ui/features/settings/BlockExplorerSettingsScreen.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { BarBackButton, NavigationContainer } from "@argent/ui"
-import { Radio } from "@mui/material"
-import { FC, Fragment } from "react"
-import styled from "styled-components"
-
-import { settingsStore } from "../../../shared/settings"
-import {
-  BlockExplorerKey,
-  defaultBlockExplorerKey,
-  defaultBlockExplorers,
-} from "../../../shared/settings/defaultBlockExplorers"
-import { useKeyValueStorage } from "../../../shared/storage/hooks"
-import { SettingsItem, SettingsScreenWrapper, Title } from "./SettingsScreen"
-
-const Default = styled.div`
-  color: ${({ theme }) => theme.text2};
-  font-size: 12px;
-  font-weight: 400;
-`
-
-const StyledRadio = styled(Radio)`
-  .MuiSvgIcon-root {
-    color: ${({ theme }) => theme.white};
-    font-size: 28px;
-  }
-`
-
-export const BlockExplorerSettingsScreen: FC = () => {
-  const blockExplorerKey = useKeyValueStorage(settingsStore, "blockExplorerKey")
-  return (
-    <NavigationContainer
-      leftButton={<BarBackButton />}
-      title={"Block explorer"}
-    >
-      <SettingsScreenWrapper>
-        <hr />
-        {Object.entries(defaultBlockExplorers).map(([key, blockExplorer]) => {
-          const { title } = blockExplorer
-          const checked = blockExplorerKey === key
-          const isDefault = defaultBlockExplorerKey === key
-          return (
-            <Fragment key={key}>
-              <SettingsItem>
-                <Title>
-                  <span>
-                    {title}
-                    {isDefault && <Default>Default</Default>}
-                  </span>
-                  <StyledRadio
-                    checked={checked}
-                    onClick={() =>
-                      settingsStore.set(
-                        "blockExplorerKey",
-                        key as BlockExplorerKey,
-                      )
-                    }
-                    inputProps={{ "aria-label": title }}
-                  />
-                </Title>
-              </SettingsItem>
-              <hr />
-            </Fragment>
-          )
-        })}
-      </SettingsScreenWrapper>
-    </NavigationContainer>
-  )
-}
diff --git a/packages/extension/src/ui/features/settings/DappConnectionsSettingsScreen.tsx b/packages/extension/src/ui/features/settings/DappConnectionsSettingsScreen.tsx
deleted file mode 100644
index 193191db9..000000000
--- a/packages/extension/src/ui/features/settings/DappConnectionsSettingsScreen.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import {
-  BarBackButton,
-  CellStack,
-  Empty,
-  HeaderCell,
-  NavigationContainer,
-  icons,
-} from "@argent/ui"
-import { uniq } from "lodash-es"
-import { FC, useMemo } from "react"
-import { useNavigate } from "react-router-dom"
-
-import {
-  removePreAuthorization,
-  resetPreAuthorizations,
-  usePreAuthorizations,
-} from "../../../shared/preAuthorizations"
-import { Button } from "../../components/Button"
-import { DappConnection } from "./DappConnection"
-
-const { NetworkIcon } = icons
-
-export const DappConnectionsSettingsScreen: FC = () => {
-  const preAuthorizations = usePreAuthorizations()
-
-  const preauthorizedHosts = useMemo(() => {
-    return uniq(
-      preAuthorizations.map((preAuthorization) => preAuthorization.host),
-    )
-  }, [preAuthorizations])
-
-  return <DappConnectionsSettings preauthorizedHosts={preauthorizedHosts} />
-}
-
-interface DappConnectionsSettingsProps {
-  preauthorizedHosts: string[]
-}
-
-export const DappConnectionsSettings: FC<DappConnectionsSettingsProps> = ({
-  preauthorizedHosts = [],
-}) => {
-  const navigate = useNavigate()
-  return (
-    <NavigationContainer
-      leftButton={<BarBackButton />}
-      title={"Dapp connections"}
-    >
-      {preauthorizedHosts.length === 0 ? (
-        <Empty
-          icon={<NetworkIcon />}
-          title={"You haven’t connected to any dapp yet."}
-        />
-      ) : (
-        <CellStack width={"full"}>
-          {preauthorizedHosts.map((host) => (
-            <DappConnection
-              key={host}
-              host={host}
-              onRemoveClick={async () => {
-                /** passing null as accountAddress will remove all accounts */
-                await removePreAuthorization(host)
-              }}
-            />
-          ))}
-
-          <HeaderCell>
-            Require all dapps to request a new connection to your wallet?
-          </HeaderCell>
-          <Button
-            onClick={() => {
-              resetPreAuthorizations()
-              navigate(-1)
-            }}
-          >
-            Reset all dapp connections
-          </Button>
-        </CellStack>
-      )}
-    </NavigationContainer>
-  )
-}
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings.tsx b/packages/extension/src/ui/features/settings/DeveloperSettings.tsx
deleted file mode 100644
index 1aef2f613..000000000
--- a/packages/extension/src/ui/features/settings/DeveloperSettings.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { BarBackButton, CellStack, NavigationBar } from "@argent/ui"
-import { FC } from "react"
-import { useNavigate } from "react-router-dom"
-
-import {
-  isExperimentalSettingsEnabled,
-  isBetaFeaturesEnabled,
-} from "../../../shared/settings"
-import { routes } from "../../routes"
-import { SettingsMenuItem } from "./SettingsMenuItem"
-import { useIsMainnet } from "../networks/hooks/useIsMainnet"
-
-const DeveloperSettings: FC = () => {
-  const navigate = useNavigate()
-  const isMainnet = useIsMainnet()
-
-  return (
-    <>
-      <NavigationBar
-        leftButton={<BarBackButton onClick={() => navigate(-1)} />}
-        title={"Developer Settings"}
-      />
-
-      <CellStack>
-        <SettingsMenuItem
-          to={routes.settingsNetworks()}
-          title="Manage networks"
-        />
-
-        <SettingsMenuItem
-          to={routes.settingsBlockExplorer()}
-          title="Block explorer"
-        />
-
-        {isBetaFeaturesEnabled && isMainnet && (
-          <SettingsMenuItem
-            to={routes.settingsBetaFeatures()}
-            title="Beta features"
-          />
-        )}
-
-        <SettingsMenuItem
-          to={routes.settingsSmartContractDevelopment()}
-          title="Smart contract development"
-        />
-        {isExperimentalSettingsEnabled && (
-          <SettingsMenuItem
-            to={routes.settingsExperimental()}
-            title="Experimental"
-          />
-        )}
-      </CellStack>
-    </>
-  )
-}
-export { DeveloperSettings }
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/deploySmartContractForm.model.ts b/packages/extension/src/ui/features/settings/DeveloperSettings/deploySmartContractForm.model.ts
deleted file mode 100644
index 6b30da107..000000000
--- a/packages/extension/src/ui/features/settings/DeveloperSettings/deploySmartContractForm.model.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { CairoVersion } from "starknet"
-
-export type ParameterField =
-  | {
-      name: string
-      type: `felt` | `Uint256`
-      value: string
-    }
-  | {
-      name: string
-      type: `felt*`
-      value: string[]
-    }
-
-export interface FieldValues {
-  account: string
-  classHash: string
-  network: string
-  parameters: ParameterField[]
-  salt: string
-  unique: boolean
-  cairoVersion: CairoVersion
-}
diff --git a/packages/extension/src/ui/features/settings/ExperimentalSettings.tsx b/packages/extension/src/ui/features/settings/ExperimentalSettings.tsx
deleted file mode 100644
index 062614c5c..000000000
--- a/packages/extension/src/ui/features/settings/ExperimentalSettings.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import {
-  AlertDialog,
-  BarBackButton,
-  ButtonCell,
-  CellStack,
-  NavigationContainer,
-  Switch,
-} from "@argent/ui"
-import { FC, useCallback, useState } from "react"
-
-import { settingsStore } from "../../../shared/settings"
-import { useKeyValueStorage } from "../../../shared/storage/hooks"
-import { WalletAccount } from "../../../shared/wallet.model"
-import { useAccountsWithGuardian } from "../shield/useAccountGuardian"
-import { SettingsScreenWrapper } from "./SettingsScreen"
-
-const formatAccountNames = (accounts: WalletAccount[]) => {
-  const elements = accounts.map((account) => {
-    const accountName = account ? account.name : "Unknown"
-    return accountName
-  })
-  const formatter = new Intl.ListFormat("en", {
-    style: "long",
-    type: "conjunction",
-  })
-  return formatter.format(elements)
-}
-
-export const PrivacyExperimentalSettings: FC = () => {
-  const [alertDialogIsOpen, setAlertDialogIsOpen] = useState(false)
-
-  const accountsWithGuardian = useAccountsWithGuardian()
-  const accountGuardianNames = formatAccountNames(accountsWithGuardian)
-
-  const experimentalAllowChooseAccount = useKeyValueStorage(
-    settingsStore,
-    "experimentalAllowChooseAccount",
-  )
-
-  const onCancel = useCallback(() => {
-    setAlertDialogIsOpen(false)
-  }, [])
-
-  return (
-    <NavigationContainer leftButton={<BarBackButton />} title={"Experimental"}>
-      <AlertDialog
-        isOpen={alertDialogIsOpen}
-        title={"Argent Shield in use"}
-        message={`To turn off this feature you need to first remove Argent Shield from ${accountGuardianNames}`}
-        cancelTitle={"Got it"}
-        onCancel={onCancel}
-      />
-      <SettingsScreenWrapper>
-        <CellStack>
-          <ButtonCell
-            onClick={() =>
-              settingsStore.set(
-                "experimentalAllowChooseAccount",
-                !experimentalAllowChooseAccount,
-              )
-            }
-            rightIcon={<Switch isChecked={experimentalAllowChooseAccount} />}
-            extendedDescription={
-              "Shows a new menu item in the account settings, which allows a user to switch account implementation for an account."
-            }
-          >
-            Change account implementation
-          </ButtonCell>
-        </CellStack>
-      </SettingsScreenWrapper>
-    </NavigationContainer>
-  )
-}
diff --git a/packages/extension/src/ui/features/settings/NetworkSettingsScreen.tsx b/packages/extension/src/ui/features/settings/NetworkSettingsScreen.tsx
deleted file mode 100644
index cef37cf62..000000000
--- a/packages/extension/src/ui/features/settings/NetworkSettingsScreen.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import { BarBackButton, CellStack, NavigationContainer } from "@argent/ui"
-import { AlertDialog } from "@argent/ui"
-import { isEqual } from "lodash-es"
-import { FC, useCallback, useMemo, useState } from "react"
-import { Link, useNavigate } from "react-router-dom"
-import styled from "styled-components"
-
-import { defaultCustomNetworks } from "../../../shared/network"
-import { networkService } from "../../../shared/network/service"
-import { IconButton } from "../../components/IconButton"
-import { AddIcon, RefreshIcon } from "../../components/Icons/MuiIcons"
-import { ResponsiveFixedBox } from "../../components/Responsive"
-import { Spinner } from "../../components/Spinner"
-import { routes } from "../../routes"
-import { P } from "../../theme/Typography"
-import { useNetworks } from "../networks/hooks/useNetworks"
-import { DappConnection } from "./DappConnection"
-import {
-  validateRemoveNetwork,
-  validateRestoreDefaultNetworks,
-} from "./validateRemoveNetwork"
-import { Box } from "@chakra-ui/react"
-
-const IconButtonCenter = styled(IconButton)`
-  margin: 0 auto;
-`
-
-const Footer = styled(ResponsiveFixedBox)`
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background-color: ${({ theme }) => theme.bg1};
-  background: linear-gradient(
-    180deg,
-    rgba(16, 16, 16, 0.4) 0%,
-    ${({ theme }) => theme.bg1} 73.72%
-  );
-  box-shadow: 0px 2px 12px rgba(0, 0, 0, 0.12);
-  backdrop-filter: blur(10px);
-  z-index: 100;
-  height: 56px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-`
-
-const RestoreDefaultsButton = styled.button`
-  appearance: none;
-  border: none;
-  background: none;
-  color: ${({ theme }) => theme.text3};
-  cursor: pointer;
-  font-size: 12px;
-  line-height: 1;
-  font-weight: 600;
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  transition: color 200ms ease-in-out;
-  &:hover {
-    color: ${({ theme }) => theme.text2};
-  }
-`
-
-const RestoreDefaultsButtonIcon = styled.div`
-  font-size: 14px;
-`
-
-export const NetworkSettingsScreen: FC = () => {
-  const allNetworks = useNetworks()
-  const navigate = useNavigate()
-  const [alertDialogIsOpen, setAlertDialogIsOpen] = useState(false)
-  const [errorMessage, setErrorMessage] = useState("")
-
-  const isDefaultCustomNetworks = useMemo(() => {
-    return isEqual(allNetworks, [...allNetworks, ...defaultCustomNetworks])
-  }, [allNetworks])
-
-  const removeNetworkClick = useCallback(async (networkId: string) => {
-    try {
-      const shouldRemoveNetwork = await validateRemoveNetwork(networkId)
-      if (shouldRemoveNetwork) {
-        await networkService.removeById(networkId)
-      }
-    } catch (error) {
-      if (error instanceof Error) {
-        setErrorMessage(error.message)
-        setAlertDialogIsOpen(true)
-      } else {
-        // unexpected, throw to error boundary
-        throw error
-      }
-    }
-  }, [])
-
-  const restoreDefaultsClick = useCallback(async () => {
-    try {
-      const shouldRemoveNetwork = await validateRestoreDefaultNetworks()
-      if (shouldRemoveNetwork) {
-        await networkService.restoreDefaults()
-      }
-    } catch (error) {
-      if (error instanceof Error) {
-        setErrorMessage(error.message)
-        setAlertDialogIsOpen(true)
-      } else {
-        // unexpected, throw to error boundary
-        throw error
-      }
-    }
-  }, [])
-
-  const onCancel = useCallback(() => {
-    setAlertDialogIsOpen(false)
-  }, [])
-
-  return (
-    <>
-      <NavigationContainer leftButton={<BarBackButton />} title={"Networks"}>
-        <CellStack pb={2}>
-          {!allNetworks ? (
-            <Spinner />
-          ) : allNetworks.length === 0 ? (
-            <P>No custom networks found</P>
-          ) : (
-            allNetworks.map((network) => (
-              <DappConnection
-                key={network.id}
-                host={network.name}
-                onClick={() => {
-                  navigate(routes.settingsEditCustomNetwork(network.id))
-                }}
-                hideRemove={network.readonly}
-                onRemoveClick={() => {
-                  removeNetworkClick(network.id)
-                }}
-              />
-            ))
-          )}
-        </CellStack>
-
-        <Box mb={!isDefaultCustomNetworks ? "56px" : "0"}>
-          <Link to={routes.settingsAddCustomNetwork()}>
-            <IconButtonCenter size={48} style={{ marginTop: "32px" }}>
-              <AddIcon fontSize="large" />
-            </IconButtonCenter>
-          </Link>
-        </Box>
-
-        {!isDefaultCustomNetworks && (
-          <Footer>
-            <RestoreDefaultsButton onClick={restoreDefaultsClick}>
-              <RestoreDefaultsButtonIcon>
-                <RefreshIcon fontSize="inherit" />
-              </RestoreDefaultsButtonIcon>
-              <div>Restore default networks</div>
-            </RestoreDefaultsButton>
-          </Footer>
-        )}
-      </NavigationContainer>
-
-      <AlertDialog
-        isOpen={alertDialogIsOpen}
-        title={"Cannot remove"}
-        message={errorMessage}
-        onCancel={onCancel}
-      />
-    </>
-  )
-}
diff --git a/packages/extension/src/ui/features/settings/PrivacySettingsScreen.tsx b/packages/extension/src/ui/features/settings/PrivacySettingsScreen.tsx
deleted file mode 100644
index 0489f1f38..000000000
--- a/packages/extension/src/ui/features/settings/PrivacySettingsScreen.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { BarBackButton, NavigationContainer, Switch } from "@argent/ui"
-import { FC } from "react"
-
-import { settingsStore } from "../../../shared/settings"
-import { useKeyValueStorage } from "../../../shared/storage/hooks"
-import { P, SettingsItem, SettingsScreenWrapper, Title } from "./SettingsScreen"
-
-export const PrivacySettingsScreen: FC = () => {
-  const privacyAutomaticErrorReporting = useKeyValueStorage(
-    settingsStore,
-    "privacyAutomaticErrorReporting",
-  )
-
-  const privacyShareAnalyticsData = useKeyValueStorage(
-    settingsStore,
-    "privacyShareAnalyticsData",
-  )
-
-  return (
-    <NavigationContainer leftButton={<BarBackButton />} title={"Privacy"}>
-      <SettingsScreenWrapper>
-        <hr />
-        <SettingsItem>
-          <Title>
-            <span>Automatic Error Reporting</span>
-            <Switch
-              colorScheme="primary"
-              isChecked={privacyAutomaticErrorReporting}
-              onChange={() =>
-                settingsStore.set(
-                  "privacyAutomaticErrorReporting",
-                  !privacyAutomaticErrorReporting,
-                )
-              }
-            />
-          </Title>
-          <P>Automatically share crash logs with Argent</P>
-        </SettingsItem>
-        <hr />
-        <SettingsItem>
-          <Title>
-            <span>Share anonymised data with Argent</span>
-            <Switch
-              colorScheme="primary"
-              isChecked={privacyShareAnalyticsData}
-              onChange={() =>
-                settingsStore.set(
-                  "privacyShareAnalyticsData",
-                  !privacyShareAnalyticsData,
-                )
-              }
-            />
-          </Title>
-          <P>
-            This helps the Argent team to identify issues, prioritise features
-            and build a better product without compromising your privacy
-          </P>
-        </SettingsItem>
-      </SettingsScreenWrapper>
-    </NavigationContainer>
-  )
-}
diff --git a/packages/extension/src/ui/features/settings/SeedSettingsScreen.tsx b/packages/extension/src/ui/features/settings/SeedSettingsScreen.tsx
deleted file mode 100644
index 23b335dd9..000000000
--- a/packages/extension/src/ui/features/settings/SeedSettingsScreen.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import {
-  BarBackButton,
-  Button,
-  CellStack,
-  NavigationContainer,
-} from "@argent/ui"
-import { FC, useCallback, useState } from "react"
-import { useNavigate } from "react-router-dom"
-
-import { useReturnTo } from "../../routes"
-import { StickyGroup } from "../actions/DeprecatedConfirmScreen"
-import { PasswordForm } from "../lock/PasswordForm"
-import { CopySeedPhrase } from "../recovery/CopySeedPhrase"
-import { useSeedPhrase } from "../recovery/hooks/useSeedPhrase"
-import { SeedPhrase } from "../recovery/SeedPhrase"
-import { Divider, Text } from "@chakra-ui/react"
-import { WarningRecoverySeedphraseBanner } from "../accountTokens/WarningRecoverySeedphraseBanner"
-import { sessionService } from "../../services/session"
-
-const CopySeedScreen: FC = () => {
-  const seedPhrase = useSeedPhrase()
-  return (
-    <>
-      <Text fontSize="sm" color="neutrals.300" mb={2}>
-        Write these words down on paper. It is unsafe to save them on your
-        computer.
-      </Text>
-      <Divider mb={2} color="neutrals.800" />
-
-      <SeedPhrase seedPhrase={seedPhrase} />
-      <CopySeedPhrase seedPhrase={seedPhrase} />
-    </>
-  )
-}
-
-const UnlockCopySeed: FC<{
-  setPasswordIsValid: (isValid: boolean) => void
-}> = ({ setPasswordIsValid }) => {
-  const verifyPassword = async (password: string) => {
-    const isValid = await sessionService.checkPassword(password)
-    setPasswordIsValid(isValid)
-    return isValid
-  }
-  return (
-    <>
-      <WarningRecoverySeedphraseBanner />
-      <Text fontSize={16} fontWeight="bold" ml={2}>
-        Enter your password
-      </Text>
-
-      <PasswordForm verifyPassword={verifyPassword}>
-        {(isDirty) => (
-          <StickyGroup>
-            <Button
-              type="submit"
-              disabled={!isDirty}
-              colorScheme="primary"
-              width="full"
-            >
-              Unlock
-            </Button>
-          </StickyGroup>
-        )}
-      </PasswordForm>
-    </>
-  )
-}
-
-export const SeedSettingsScreen: FC = () => {
-  const [passwordIsValid, setPasswordIsValid] = useState(false)
-  const returnTo = useReturnTo()
-  const navigate = useNavigate()
-
-  const onClick = useCallback(() => {
-    if (returnTo) {
-      navigate(returnTo)
-    } else {
-      navigate(-1)
-    }
-  }, [navigate, returnTo])
-
-  return (
-    <NavigationContainer
-      leftButton={<BarBackButton onClick={onClick} />}
-      title={"Recovery phrase"}
-    >
-      <CellStack>
-        {!passwordIsValid && (
-          <UnlockCopySeed setPasswordIsValid={setPasswordIsValid} />
-        )}
-        {passwordIsValid && <CopySeedScreen />}
-      </CellStack>
-    </NavigationContainer>
-  )
-}
diff --git a/packages/extension/src/ui/features/settings/SettingsMenuItem.tsx b/packages/extension/src/ui/features/settings/SettingsMenuItem.tsx
deleted file mode 100644
index 385b5eae7..000000000
--- a/packages/extension/src/ui/features/settings/SettingsMenuItem.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ButtonCell, ButtonCellProps, icons } from "@argent/ui"
-import { FC } from "react"
-import { Link } from "react-router-dom"
-
-const { ChevronRightIcon } = icons
-
-interface SettingsMenuItemProps extends ButtonCellProps {
-  title: string
-  to: string
-}
-
-const SettingsMenuItem: FC<SettingsMenuItemProps> = ({
-  rightIcon = <ChevronRightIcon />,
-  to,
-  title,
-  ...rest
-}) => (
-  <ButtonCell as={Link} rightIcon={rightIcon} width="100%" to={to} {...rest}>
-    {title}
-  </ButtonCell>
-)
-
-export { SettingsMenuItem }
diff --git a/packages/extension/src/ui/features/settings/SettingsScreen.tsx b/packages/extension/src/ui/features/settings/SettingsScreen.tsx
index b9f883438..50e8332e8 100644
--- a/packages/extension/src/ui/features/settings/SettingsScreen.tsx
+++ b/packages/extension/src/ui/features/settings/SettingsScreen.tsx
@@ -1,34 +1,28 @@
 import {
   BarCloseButton,
-  BarIconButton,
   Button,
   CellStack,
   NavigationContainer,
+  NavigationContainerProps,
   SpacerCell,
   icons,
 } from "@argent/ui"
-import { Box, Center } from "@chakra-ui/react"
-import { FC } from "react"
-import { useNavigate } from "react-router-dom"
-import styled from "styled-components"
+import { Center, Flex } from "@chakra-ui/react"
+import { FC, ReactEventHandler } from "react"
 
 import { isPrivacySettingsEnabled } from "../../../shared/settings"
-import { routes, useCurrentPathnameWithQuery } from "../../routes"
-import { useStopSession } from "../../services/useStopSession"
-import { H2 } from "../../theme/Typography"
-import { selectedAccountView } from "../../views/account"
-import { useView } from "../../views/implementation/react"
+import { routes } from "../../routes"
+import { Account } from "../accounts/Account"
 import { AccountListScreenItemContainer } from "../accounts/AccountListScreenItemContainer"
-import { useAccount } from "../accounts/accounts.state"
-import { useExtensionIsInTab, useOpenExtensionInTab } from "../browser/tabs"
-import { DapplandFooter } from "./DapplandFooter"
-import { SettingsMenuItem } from "./SettingsMenuItem"
-import { SupportFooter } from "./SupportFooter"
-import { useShieldVerifiedEmail } from "../shield/useShieldVerifiedEmail"
-import { useArgentAccountTokenExpired } from "../argentAccount/hooks/useArgentAccountTokenExpired"
-import { formatTruncatedString } from "../../services/addresses"
 import { ClickableShieldBanner } from "../accounts/ClickableShieldBanner"
-import { useNavigateReturnToOrBack } from "../../hooks/useNavigateReturnTo"
+import { DapplandFooter } from "./ui/DapplandFooter"
+import {
+  SettingsMenuItem,
+  SettingsMenuItemGroup,
+  SettingsMenuItemLink,
+} from "./ui/SettingsMenuItem"
+import { SupportFooter } from "./ui/SupportFooter"
+import { formatTruncatedString } from "@argent/shared"
 
 const {
   LockIcon,
@@ -37,103 +31,50 @@ const {
   ExpandIcon,
   ExtendedIcon,
   LinkIcon,
-  PasswordIcon,
   ShieldIcon,
   EmailIcon,
   ChevronRightIcon,
+  PreferencesIcon,
 } = icons
 
-export const Title = styled.h3`
-  font-weight: 600;
-  font-size: 17px;
-  line-height: 22px;
-  color: ${({ theme }) => theme.text1};
-
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-
-  svg {
-    color: ${({ theme }) => theme.text2};
-    font-size: 12px;
-  }
-`
-
-export const P = styled.p`
-  font-size: 15px;
-  color: ${({ theme }) => theme.text2};
-  margin-top: 16px;
-`
-
-export const SettingsItem = styled.div`
-  padding: 24px 32px;
-`
-
-// TODO: remove this when we have a proper settings page
-export const SettingsScreenWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  padding: 0 0 24px 0;
-
-  ${H2} {
-    margin: 0 32px 32px 32px;
-  }
-
-  hr {
-    border: none;
-    height: 1px;
-    background-color: ${({ theme }) => theme.bg2};
-  }
-`
-
-export const SettingsScreen: FC = () => {
-  const onBack = useNavigateReturnToOrBack()
-  const openExtensionInTab = useOpenExtensionInTab()
-  const extensionIsInTab = useExtensionIsInTab()
-  const selectedAccount = useView(selectedAccountView)
-  const returnTo = useCurrentPathnameWithQuery()
-  const account = useAccount(selectedAccount)
-  const navigate = useNavigate()
-  const stopSession = useStopSession()
-  const verifiedEmail = useShieldVerifiedEmail()
-  const { data: isArgentAccountTokenExpired } = useArgentAccountTokenExpired()
-
-  const isSignedIn = verifiedEmail && !isArgentAccountTokenExpired
-  const handleSignin = () => {
-    navigate(
-      routes.argentAccountEmail(
-        selectedAccount?.address,
-        "argentAccount",
-        returnTo,
-      ),
-    )
-  }
-  const navigateToAccount = () => {
-    navigate(routes.argentAccountLoggedIn(selectedAccount?.address))
-  }
-
-  const shouldDisplayGuardianBanner =
-    account && !account.guardian && account.type !== "multisig"
+interface SettingsScreenProps extends NavigationContainerProps {
+  onBack: ReactEventHandler
+  onLock: ReactEventHandler
+  onNavigateToAccount: ReactEventHandler
+  account?: Account
+  shouldDisplayGuardianBanner: boolean
+  isSignedIn: boolean
+  onSignIn: ReactEventHandler
+  extensionIsInTab: boolean
+  openExtensionInTab: ReactEventHandler
+  returnTo: string
+  verifiedEmail?: string | null
+}
 
+export const SettingsScreen: FC<SettingsScreenProps> = ({
+  onBack,
+  onLock,
+  onNavigateToAccount,
+  account,
+  shouldDisplayGuardianBanner,
+  isSignedIn,
+  onSignIn,
+  extensionIsInTab,
+  openExtensionInTab,
+  returnTo,
+  verifiedEmail,
+}) => {
   return (
     <>
       <NavigationContainer
         rightButton={<BarCloseButton onClick={onBack} />}
         title={"Settings"}
-        leftButton={
-          <BarIconButton
-            onClick={() => void stopSession(true)}
-            aria-label="Lock wallet"
-          >
-            <LockIcon />
-          </BarIconButton>
-        }
         scrollKey={"settings/SettingsScreen"}
       >
         <CellStack>
           {account && (
             <>
-              <Box w={"full"}>
+              <Flex direction={"column"} w={"full"} gap={"1px"}>
                 <AccountListScreenItemContainer
                   account={account}
                   clickNavigateSettings
@@ -144,64 +85,56 @@ export const SettingsScreen: FC = () => {
                 {shouldDisplayGuardianBanner && (
                   <ClickableShieldBanner address={account.address} />
                 )}
-              </Box>
+              </Flex>
               <SpacerCell />
             </>
           )}
-          {!extensionIsInTab && (
-            <SettingsMenuItem
-              leftIcon={<ExtendedIcon />}
-              rightIcon={<ExpandIcon />}
-              to={routes.settings()}
-              onClick={openExtensionInTab}
-              title="Extended view"
+          <SettingsMenuItemGroup>
+            <SettingsMenuItemLink
+              leftIcon={<PreferencesIcon />}
+              to={routes.settingsPreferences(returnTo)}
+              title="Preferences"
             />
-          )}
-          <SettingsMenuItem
-            leftIcon={<EmailIcon />}
-            to={
-              isSignedIn
-                ? routes.argentAccountEmailPreferences(returnTo)
-                : routes.argentAccountEmail(
-                    selectedAccount?.address,
-                    "emailPreferences",
-                    returnTo,
-                  )
-            }
-            title="Email notifications"
-          />
-
-          <SettingsMenuItem
-            leftIcon={<AddressBookIcon />}
-            to={routes.settingsAddressBook()}
-            title="Address book"
-          />
-
-          <SettingsMenuItem
-            leftIcon={<LinkIcon />}
-            to={routes.settingsDappConnections()}
-            title="Connected dapps"
-          />
-
-          <SettingsMenuItem
-            leftIcon={<PasswordIcon />}
-            to={routes.settingsSeed(returnTo)}
-            title="Recovery phrase"
-          />
-
-          <SettingsMenuItem
+            {isPrivacySettingsEnabled && (
+              <SettingsMenuItemLink
+                leftIcon={<ShieldIcon />}
+                to={routes.settingsPrivacy(returnTo)}
+                title="Security & privacy"
+              />
+            )}
+          </SettingsMenuItemGroup>
+          <SettingsMenuItemGroup>
+            <SettingsMenuItemLink
+              leftIcon={<AddressBookIcon />}
+              to={routes.settingsAddressBook()}
+              title="Address book"
+            />
+            <SettingsMenuItemLink
+              leftIcon={<LinkIcon />}
+              to={routes.settingsDappConnectionsAccountList()}
+              title="Connected dapps"
+            />
+          </SettingsMenuItemGroup>
+          <SettingsMenuItemLink
             leftIcon={<CodeIcon />}
             to={routes.settingsDeveloper()}
             title="Developer settings"
           />
-
-          {isPrivacySettingsEnabled && (
+          <SettingsMenuItemGroup>
+            {!extensionIsInTab && (
+              <SettingsMenuItem
+                leftIcon={<ExtendedIcon />}
+                rightIcon={<ExpandIcon />}
+                onClick={openExtensionInTab}
+                title="Extended view"
+              />
+            )}
             <SettingsMenuItem
-              leftIcon={<ShieldIcon />}
-              to={routes.settingsPrivacy()}
-              title="Privacy"
+              leftIcon={<LockIcon />}
+              title="Lock wallet"
+              onClick={onLock}
             />
-          )}
+          </SettingsMenuItemGroup>
           <DapplandFooter />
           <SupportFooter />
         </CellStack>
@@ -214,7 +147,7 @@ export const SettingsScreen: FC = () => {
           boxShadow="menu"
         >
           <Button
-            onClick={navigateToAccount}
+            onClick={onNavigateToAccount}
             size="md"
             colorScheme="transparent"
             color="white"
@@ -227,7 +160,9 @@ export const SettingsScreen: FC = () => {
             textOverflow={"ellipsis"}
             overflow={"hidden"}
           >
-            {formatTruncatedString(verifiedEmail, 28)}
+            {verifiedEmail
+              ? formatTruncatedString(verifiedEmail, 28)
+              : "No email"}
           </Button>
         </Center>
       ) : (
@@ -238,7 +173,7 @@ export const SettingsScreen: FC = () => {
           boxShadow="menu"
         >
           <Button
-            onClick={handleSignin}
+            onClick={onSignIn}
             size="md"
             colorScheme="transparent"
             color="white"
diff --git a/packages/extension/src/ui/features/settings/SettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/SettingsScreenContainer.tsx
new file mode 100644
index 000000000..ad966220f
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/SettingsScreenContainer.tsx
@@ -0,0 +1,61 @@
+import { FC } from "react"
+import { useNavigate } from "react-router-dom"
+import { useNavigateReturnToOrBack } from "../../hooks/useNavigateReturnTo"
+import { routes, useCurrentPathnameWithQuery } from "../../routes"
+import { useStopSession } from "../../services/useStopSession"
+import { selectedAccountView } from "../../views/account"
+import { useView } from "../../views/implementation/react"
+import { useAccount } from "../accounts/accounts.state"
+import { useExtensionIsInTab, useOpenExtensionInTab } from "../browser/tabs"
+import { useShieldVerifiedEmail } from "../shield/useShieldVerifiedEmail"
+import { SettingsScreen } from "./SettingsScreen"
+import { useIsSignedIn } from "../argentAccount/hooks/useIsSignedIn"
+
+export const SettingsScreenContainer: FC = () => {
+  const onBack = useNavigateReturnToOrBack()
+  const openExtensionInTab = useOpenExtensionInTab()
+  const extensionIsInTab = useExtensionIsInTab()
+  const selectedAccount = useView(selectedAccountView)
+  const returnTo = useCurrentPathnameWithQuery()
+  const account = useAccount(selectedAccount)
+  const navigate = useNavigate()
+  const stopSession = useStopSession()
+  const verifiedEmail = useShieldVerifiedEmail()
+  const isSignedIn = useIsSignedIn()
+
+  const onSignIn = () => {
+    navigate(
+      routes.argentAccountEmail(
+        selectedAccount?.address,
+        "argentAccount",
+        returnTo,
+      ),
+    )
+  }
+
+  const onNavigateToAccount = () => {
+    navigate(routes.argentAccountLoggedIn(selectedAccount?.address))
+  }
+
+  const onLock = () => void stopSession(true)
+
+  const shouldDisplayGuardianBanner = Boolean(
+    account && !account.guardian && account.type !== "multisig",
+  )
+
+  return (
+    <SettingsScreen
+      onBack={onBack}
+      onLock={onLock}
+      onNavigateToAccount={onNavigateToAccount}
+      account={account}
+      shouldDisplayGuardianBanner={shouldDisplayGuardianBanner}
+      isSignedIn={isSignedIn}
+      onSignIn={onSignIn}
+      extensionIsInTab={extensionIsInTab}
+      openExtensionInTab={openExtensionInTab}
+      returnTo={returnTo}
+      verifiedEmail={verifiedEmail}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/AddressBookAddOrEditScreen.tsx b/packages/extension/src/ui/features/settings/addressBook/AddressBookAddOrEditScreen.tsx
similarity index 95%
rename from packages/extension/src/ui/features/settings/AddressBookAddOrEditScreen.tsx
rename to packages/extension/src/ui/features/settings/addressBook/AddressBookAddOrEditScreen.tsx
index e0cf06334..ae51b0859 100644
--- a/packages/extension/src/ui/features/settings/AddressBookAddOrEditScreen.tsx
+++ b/packages/extension/src/ui/features/settings/addressBook/AddressBookAddOrEditScreen.tsx
@@ -31,15 +31,15 @@ import { zodResolver } from "@hookform/resolvers/zod"
 import { FC, FormEvent, useCallback, useEffect, useMemo, useState } from "react"
 import { Controller, useForm } from "react-hook-form"
 
-import { addressBookContactNoIdSchema } from "../../../shared/addressBook/schema"
+import { addressBookContactNoIdSchema } from "../../../../shared/addressBook/schema"
 import {
   AddressBookContact,
   AddressBookContactNoId,
   isAddressBookContact,
-} from "../../../shared/addressBook/type"
-import { ControlledInput } from "../../components/ControlledInput"
-import { getNetworkAccountImageUrl } from "../accounts/accounts.service"
-import { useGetAddressFromDomainNameInput } from "../send/useGetAddressFromDomainName"
+} from "../../../../shared/addressBook/type"
+import { ControlledInput } from "../../../components/ControlledInput"
+import { getNetworkAccountImageUrl } from "../../accounts/accounts.service"
+import { useGetAddressFromDomainNameInput } from "../../send/useGetAddressFromDomainName"
 
 const { ProfileIcon, BinIcon } = icons
 
@@ -96,7 +96,6 @@ export const AddressBookAddOrEditScreen: FC<AddressBookAddOrEditScreeProps> = ({
   const {
     isLoading,
     error: starknetIdError,
-    result: starknetAddress,
     isValid: starknetAddressIsValid,
   } = useGetAddressFromDomainNameInput(contactAddress, contactNetwork)
 
diff --git a/packages/extension/src/ui/features/settings/AddressBookAddOrEditScreenContainer.tsx b/packages/extension/src/ui/features/settings/addressBook/AddressBookAddOrEditScreenContainer.tsx
similarity index 88%
rename from packages/extension/src/ui/features/settings/AddressBookAddOrEditScreenContainer.tsx
rename to packages/extension/src/ui/features/settings/addressBook/AddressBookAddOrEditScreenContainer.tsx
index 6150c8f84..1063b97de 100644
--- a/packages/extension/src/ui/features/settings/AddressBookAddOrEditScreenContainer.tsx
+++ b/packages/extension/src/ui/features/settings/addressBook/AddressBookAddOrEditScreenContainer.tsx
@@ -7,13 +7,13 @@ import {
   AddressBookContact,
   AddressBookContactNoId,
   isAddressBookContact,
-} from "../../../shared/addressBook/type"
-import { useQuery } from "../../hooks/useQuery"
-import { addressBookService } from "../../services/addressBook"
-import { addressBookContactIdView } from "../../views/addressBook"
-import { useView } from "../../views/implementation/react"
-import { useCurrentNetwork } from "../networks/hooks/useCurrentNetwork"
-import { useNetworks } from "../networks/hooks/useNetworks"
+} from "../../../../shared/addressBook/type"
+import { useQuery } from "../../../hooks/useQuery"
+import { addressBookService } from "../../../services/addressBook"
+import { addressBookContactIdView } from "../../../views/addressBook"
+import { useView } from "../../../views/implementation/react"
+import { useCurrentNetwork } from "../../networks/hooks/useCurrentNetwork"
+import { useNetworks } from "../../networks/hooks/useNetworks"
 import { AddressBookAddOrEditScreen } from "./AddressBookAddOrEditScreen"
 
 export interface AddressBookAddOrEditScreenContainerProps
diff --git a/packages/extension/src/ui/features/settings/AddressBookSettingsScreen.tsx b/packages/extension/src/ui/features/settings/addressBook/AddressBookSettingsScreen.tsx
similarity index 93%
rename from packages/extension/src/ui/features/settings/AddressBookSettingsScreen.tsx
rename to packages/extension/src/ui/features/settings/addressBook/AddressBookSettingsScreen.tsx
index dd2af1ab3..18943a5e6 100644
--- a/packages/extension/src/ui/features/settings/AddressBookSettingsScreen.tsx
+++ b/packages/extension/src/ui/features/settings/addressBook/AddressBookSettingsScreen.tsx
@@ -12,10 +12,10 @@ import { InputGroup, InputLeftElement } from "@chakra-ui/react"
 import { FC, useCallback, useMemo } from "react"
 import { useForm } from "react-hook-form"
 
-import { AddressBookContact } from "../../../shared/addressBook/type"
-import { Network } from "../../../shared/network"
-import { useAutoFocusInputRef } from "../../hooks/useAutoFocusInputRef"
-import { AccountListItem } from "../accounts/AccountListItem"
+import { AddressBookContact } from "../../../../shared/addressBook/type"
+import { Network } from "../../../../shared/network"
+import { useAutoFocusInputRef } from "../../../hooks/useAutoFocusInputRef"
+import { AccountListItem } from "../../accounts/AccountListItem"
 
 const { SearchIcon, AddressBookIcon, AddIcon } = icons
 
diff --git a/packages/extension/src/ui/features/settings/AddressBookSettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/addressBook/AddressBookSettingsScreenContainer.tsx
similarity index 72%
rename from packages/extension/src/ui/features/settings/AddressBookSettingsScreenContainer.tsx
rename to packages/extension/src/ui/features/settings/addressBook/AddressBookSettingsScreenContainer.tsx
index 0ec20c6b6..157410f7e 100644
--- a/packages/extension/src/ui/features/settings/AddressBookSettingsScreenContainer.tsx
+++ b/packages/extension/src/ui/features/settings/addressBook/AddressBookSettingsScreenContainer.tsx
@@ -1,11 +1,11 @@
 import { FC, useCallback } from "react"
 import { useNavigate } from "react-router-dom"
 
-import { AddressBookContact } from "../../../shared/addressBook/type"
-import { routes } from "../../routes"
-import { allAddressBookContactsView } from "../../views/addressBook"
-import { useView } from "../../views/implementation/react"
-import { allNetworksView } from "../../views/network"
+import { AddressBookContact } from "../../../../shared/addressBook/type"
+import { routes } from "../../../routes"
+import { allAddressBookContactsView } from "../../../views/addressBook"
+import { useView } from "../../../views/implementation/react"
+import { allNetworksView } from "../../../views/network"
 import { AddressBookSettingsScreen } from "./AddressBookSettingsScreen"
 
 export const AddressBookSettingsScreenContainer: FC = () => {
diff --git a/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountListScreen.tsx b/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountListScreen.tsx
new file mode 100644
index 000000000..865fcae8d
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountListScreen.tsx
@@ -0,0 +1,95 @@
+import {
+  BarBackButton,
+  CellStack,
+  Empty,
+  NavigationContainer,
+  P3,
+  icons,
+} from "@argent/ui"
+import { FC, ReactEventHandler } from "react"
+
+import { PreAuthorization } from "../../../../shared/preAuthorization/schema"
+import { useAccount } from "../../accounts/accounts.state"
+import { AccountListItem } from "../../accounts/AccountListItem"
+import { useNavigate } from "react-router-dom"
+import { routes } from "../../../routes"
+import { Flex } from "@chakra-ui/react"
+
+const { LinkIcon, ChevronRightIcon } = icons
+
+interface DappConnectionsAccountListScreenProps {
+  onBack: ReactEventHandler
+  preAuthorizationsByAccountIdentifier: Record<string, PreAuthorization[]>
+}
+
+export const DappConnectionsAccountListScreen: FC<
+  DappConnectionsAccountListScreenProps
+> = ({ preAuthorizationsByAccountIdentifier, onBack }) => {
+  const accountIdentifiers = Object.keys(preAuthorizationsByAccountIdentifier)
+  return (
+    <NavigationContainer
+      leftButton={<BarBackButton onClick={onBack} />}
+      title={"Connected dapps"}
+    >
+      {accountIdentifiers.length === 0 ? (
+        <Empty icon={<LinkIcon />} title={"No connected dapps"} />
+      ) : (
+        <CellStack width={"full"}>
+          <P3 color="text.secondary">
+            One or more dapps are connected to these accounts:
+          </P3>
+          <Flex
+            w="full"
+            borderTop="1px solid"
+            borderColor={"neutrals.700"}
+            mt={2}
+            pb={3}
+          />
+          {Object.entries(preAuthorizationsByAccountIdentifier).map(
+            ([accountIdentifier, preAuthorizations]) => {
+              return (
+                <DappConnectionsAccountListItem
+                  key={accountIdentifier}
+                  preAuthorizations={preAuthorizations}
+                />
+              )
+            },
+          )}
+        </CellStack>
+      )}
+    </NavigationContainer>
+  )
+}
+
+function DappConnectionsAccountListItem({
+  preAuthorizations,
+}: {
+  preAuthorizations: PreAuthorization[]
+}) {
+  const navigate = useNavigate()
+  const account = useAccount(preAuthorizations[0].account)
+  const onClick = () => {
+    navigate(routes.settingsDappConnectionsAccount(account?.address))
+  }
+  if (!account) {
+    return null
+  }
+  const accountDescription =
+    preAuthorizations.length === 1
+      ? "1 dapp connected"
+      : `${preAuthorizations.length} dapps connected`
+  return (
+    <AccountListItem
+      avatarSize={9}
+      accountName={account.name}
+      accountAddress={account.address}
+      accountDescription={accountDescription}
+      networkId={account.networkId}
+      accountType={account.type}
+      isShield={Boolean(account.guardian)}
+      onClick={onClick}
+    >
+      <ChevronRightIcon opacity={0.6} />
+    </AccountListItem>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountListScreenContainer.tsx b/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountListScreenContainer.tsx
new file mode 100644
index 000000000..72ee9ab65
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountListScreenContainer.tsx
@@ -0,0 +1,22 @@
+import { FC } from "react"
+import { usePreAuthorizationsGroupedByAccountIdentifierForNetworkId } from "../../preAuthorizations/hooks"
+import { useNavigateReturnToOrBack } from "../../../hooks/useNavigateReturnTo"
+import { DappConnectionsAccountListScreen } from "./DappConnectionsAccountListScreen"
+import { useAppState } from "../../../app.state"
+
+export const DappConnectionsAccountListScreenContainer: FC = () => {
+  const { switcherNetworkId } = useAppState()
+  const onBack = useNavigateReturnToOrBack()
+  const preAuthorizationsByAccountIdentifier =
+    usePreAuthorizationsGroupedByAccountIdentifierForNetworkId(
+      switcherNetworkId,
+    )
+  return (
+    <DappConnectionsAccountListScreen
+      onBack={onBack}
+      preAuthorizationsByAccountIdentifier={
+        preAuthorizationsByAccountIdentifier
+      }
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountScreen.tsx b/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountScreen.tsx
new file mode 100644
index 000000000..cacc9687a
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountScreen.tsx
@@ -0,0 +1,63 @@
+import {
+  BarBackButton,
+  CellStack,
+  Empty,
+  H6,
+  NavigationContainer,
+  P4,
+  icons,
+} from "@argent/ui"
+import { FC, ReactEventHandler } from "react"
+
+import { Flex } from "@chakra-ui/react"
+import { DappConnectionMenuItem } from "../ui/DappConnectionMenuItem"
+import { PreAuthorization } from "../../../../shared/preAuthorization/schema"
+
+const { LinkIcon } = icons
+
+interface DappConnectionsAccountScreenProps {
+  accountName?: string
+  preAuthorizations: PreAuthorization[]
+  onRemoveAll: ReactEventHandler
+  onRemove: (preAuthorization: PreAuthorization) => void
+}
+
+export const DappConnectionsAccountScreen: FC<
+  DappConnectionsAccountScreenProps
+> = ({ accountName, preAuthorizations = [], onRemoveAll, onRemove }) => {
+  return (
+    <NavigationContainer
+      leftButton={<BarBackButton />}
+      title={accountName ?? "Connected dapps"}
+    >
+      {preAuthorizations.length === 0 ? (
+        <Empty icon={<LinkIcon />} title={"No connected dapps"} />
+      ) : (
+        <CellStack width={"full"}>
+          <Flex w="full" alignItems={"center"}>
+            <H6 color="text.secondary">Connected dapps</H6>
+            <P4
+              ml="auto"
+              fontWeight="semibold"
+              color="primary.500"
+              cursor="pointer"
+              transitionProperty={"common"}
+              transitionDuration={"fast"}
+              onClick={onRemoveAll}
+              _hover={{ color: "primary.600" }}
+            >
+              Disconnect all
+            </P4>
+          </Flex>
+          {preAuthorizations.map((preAuthorization) => (
+            <DappConnectionMenuItem
+              key={preAuthorization.host}
+              host={preAuthorization.host}
+              onRemoveClick={() => void onRemove(preAuthorization)}
+            />
+          ))}
+        </CellStack>
+      )}
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountScreenContainer.tsx b/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountScreenContainer.tsx
new file mode 100644
index 000000000..a85b82bc9
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountScreenContainer.tsx
@@ -0,0 +1,36 @@
+import { FC } from "react"
+import { usePreAuthorizationsForAccount } from "../../preAuthorizations/hooks"
+import { PreAuthorization } from "../../../../shared/preAuthorization/schema"
+import { useNavigateReturnToOrBack } from "../../../hooks/useNavigateReturnTo"
+import { useRouteAccount } from "../../shield/useRouteAccount"
+import { DappConnectionsAccountScreen } from "./DappConnectionsAccountScreen"
+import { preAuthorizationService } from "../../../../shared/preAuthorization/service"
+
+export const DappConnectionsAccountScreenContainer: FC = () => {
+  const onBack = useNavigateReturnToOrBack()
+  const account = useRouteAccount()
+  const preAuthorizations = usePreAuthorizationsForAccount(account)
+
+  const onRemove = (preAuthorization: PreAuthorization) => {
+    void preAuthorizationService.remove(preAuthorization)
+    if (preAuthorizations.length === 1) {
+      onBack()
+    }
+  }
+
+  const onRemoveAll = () => {
+    if (account) {
+      void preAuthorizationService.removeAll(account)
+    }
+    onBack()
+  }
+
+  return (
+    <DappConnectionsAccountScreen
+      accountName={account?.name}
+      preAuthorizations={preAuthorizations}
+      onRemoveAll={onRemoveAll}
+      onRemove={onRemove}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/developerSettings/DeveloperSettingsScreen.tsx b/packages/extension/src/ui/features/settings/developerSettings/DeveloperSettingsScreen.tsx
new file mode 100644
index 000000000..666c23aba
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/developerSettings/DeveloperSettingsScreen.tsx
@@ -0,0 +1,45 @@
+import { BarBackButton, CellStack, NavigationContainer } from "@argent/ui"
+import { FC } from "react"
+
+import { routes } from "../../../routes"
+import { SettingsMenuItemLink } from "../ui/SettingsMenuItem"
+
+interface DeveloperSettingsScreenProps {
+  showBetaFeatures: boolean
+  showExperimentalSettings: boolean
+}
+
+export const DeveloperSettingsScreen: FC<DeveloperSettingsScreenProps> = ({
+  showBetaFeatures,
+  showExperimentalSettings,
+}) => {
+  return (
+    <NavigationContainer
+      leftButton={<BarBackButton />}
+      title={"Developer Settings"}
+    >
+      <CellStack>
+        <SettingsMenuItemLink
+          to={routes.settingsNetworks()}
+          title="Manage networks"
+        />
+        {showBetaFeatures && (
+          <SettingsMenuItemLink
+            to={routes.settingsBetaFeatures()}
+            title="Beta features"
+          />
+        )}
+        <SettingsMenuItemLink
+          to={routes.settingsSmartContractDevelopment()}
+          title="Smart contract development"
+        />
+        {showExperimentalSettings && (
+          <SettingsMenuItemLink
+            to={routes.settingsExperimental()}
+            title="Experimental"
+          />
+        )}
+      </CellStack>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/developerSettings/DeveloperSettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/developerSettings/DeveloperSettingsScreenContainer.tsx
new file mode 100644
index 000000000..85a9cfbe3
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/developerSettings/DeveloperSettingsScreenContainer.tsx
@@ -0,0 +1,18 @@
+import { FC } from "react"
+
+import {
+  isBetaFeaturesEnabled,
+  isExperimentalSettingsEnabled,
+} from "../../../../shared/settings"
+import { useIsMainnet } from "../../networks/hooks/useIsMainnet"
+import { DeveloperSettingsScreen } from "./DeveloperSettingsScreen"
+
+export const DeveloperSettingsScreenContainer: FC = () => {
+  const isMainnet = useIsMainnet()
+  return (
+    <DeveloperSettingsScreen
+      showBetaFeatures={isBetaFeaturesEnabled && isMainnet}
+      showExperimentalSettings={isExperimentalSettingsEnabled}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/developerSettings/betaFeatures/BetaFeaturesSettingsScreen.tsx b/packages/extension/src/ui/features/settings/developerSettings/betaFeatures/BetaFeaturesSettingsScreen.tsx
new file mode 100644
index 000000000..2d1abff21
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/developerSettings/betaFeatures/BetaFeaturesSettingsScreen.tsx
@@ -0,0 +1,28 @@
+import {
+  BarBackButton,
+  ButtonCell,
+  CellStack,
+  NavigationContainer,
+  Switch,
+} from "@argent/ui"
+import { FC } from "react"
+
+interface BetaFeaturesSettingsScreenProps {}
+
+export const BetaFeaturesSettingsScreen: FC<
+  BetaFeaturesSettingsScreenProps
+> = () => {
+  return (
+    <NavigationContainer leftButton={<BarBackButton />} title={"Beta Features"}>
+      <CellStack>
+        <ButtonCell
+          rightIcon={<Switch isChecked={false} pointerEvents="none" />}
+          extendedDescription="ArgentX will use an RPC Provider (instead of the feeder gateway) to
+            interact with Starknet."
+        >
+          Use RPC Provider
+        </ButtonCell>
+      </CellStack>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/developerSettings/betaFeatures/BetaFeaturesSettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/developerSettings/betaFeatures/BetaFeaturesSettingsScreenContainer.tsx
new file mode 100644
index 000000000..a44e2009f
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/developerSettings/betaFeatures/BetaFeaturesSettingsScreenContainer.tsx
@@ -0,0 +1,8 @@
+import { FC } from "react"
+import { useCurrentNetwork } from "../../../networks/hooks/useCurrentNetwork"
+import { networkRepo } from "../../../../../shared/network/store"
+import { BetaFeaturesSettingsScreen } from "./BetaFeaturesSettingsScreen"
+
+export const BetaFeaturesSettingsScreenContainer: FC = () => {
+  return <BetaFeaturesSettingsScreen />
+}
diff --git a/packages/extension/src/ui/features/settings/developerSettings/experimental/ExperimentalSettingsScreen.tsx b/packages/extension/src/ui/features/settings/developerSettings/experimental/ExperimentalSettingsScreen.tsx
new file mode 100644
index 000000000..ba6ec87b4
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/developerSettings/experimental/ExperimentalSettingsScreen.tsx
@@ -0,0 +1,36 @@
+import {
+  BarBackButton,
+  ButtonCell,
+  CellStack,
+  NavigationContainer,
+  Switch,
+} from "@argent/ui"
+import { FC, ReactEventHandler } from "react"
+
+interface ExperimentalSettingsScreenProps {
+  experimentalAllowChooseAccount: boolean
+  toggleExperimentalAllowChooseAccount: ReactEventHandler
+}
+
+export const ExperimentalSettingsScreen: FC<
+  ExperimentalSettingsScreenProps
+> = ({
+  experimentalAllowChooseAccount,
+  toggleExperimentalAllowChooseAccount,
+}) => {
+  return (
+    <NavigationContainer leftButton={<BarBackButton />} title={"Experimental"}>
+      <CellStack>
+        <ButtonCell
+          onClick={toggleExperimentalAllowChooseAccount}
+          rightIcon={<Switch isChecked={experimentalAllowChooseAccount} />}
+          extendedDescription={
+            "Shows a new menu item in the account settings, which allows a user to switch account implementation for an account."
+          }
+        >
+          Change account implementation
+        </ButtonCell>
+      </CellStack>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/developerSettings/experimental/ExperimentalSettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/developerSettings/experimental/ExperimentalSettingsScreenContainer.tsx
new file mode 100644
index 000000000..ed2d9713b
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/developerSettings/experimental/ExperimentalSettingsScreenContainer.tsx
@@ -0,0 +1,27 @@
+import { FC } from "react"
+import { settingsStore } from "../../../../../shared/settings"
+import { useKeyValueStorage } from "../../../../hooks/useStorage"
+import { ExperimentalSettingsScreen } from "./ExperimentalSettingsScreen"
+
+export const ExperimentalSettingsScreenContainer: FC = () => {
+  const experimentalAllowChooseAccount = useKeyValueStorage(
+    settingsStore,
+    "experimentalAllowChooseAccount",
+  )
+
+  const toggleExperimentalAllowChooseAccount = () => {
+    void settingsStore.set(
+      "experimentalAllowChooseAccount",
+      !experimentalAllowChooseAccount,
+    )
+  }
+
+  return (
+    <ExperimentalSettingsScreen
+      experimentalAllowChooseAccount={experimentalAllowChooseAccount}
+      toggleExperimentalAllowChooseAccount={
+        toggleExperimentalAllowChooseAccount
+      }
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/NetworkSettingsEditScreen.tsx b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsEditScreen.tsx
similarity index 80%
rename from packages/extension/src/ui/features/settings/NetworkSettingsEditScreen.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsEditScreen.tsx
index 846ce6b5b..8182c0ef3 100644
--- a/packages/extension/src/ui/features/settings/NetworkSettingsEditScreen.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsEditScreen.tsx
@@ -1,9 +1,9 @@
 import { FC } from "react"
 import { Navigate, useParams } from "react-router-dom"
 
-import { routes } from "../../routes"
+import { routes } from "../../../../routes"
 import { NetworkSettingsFormScreenContainer } from "./NetworkSettingsFormScreenContainer"
-import { useNetworkOrUndefined } from "../networks/hooks/useNetwork"
+import { useNetworkOrUndefined } from "../../../networks/hooks/useNetwork"
 
 export const NetworkSettingsEditScreen: FC = () => {
   const { networkId } = useParams<"networkId">()
diff --git a/packages/extension/src/ui/features/settings/NetworkSettingsFormScreen.tsx b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsFormScreen.tsx
similarity index 92%
rename from packages/extension/src/ui/features/settings/NetworkSettingsFormScreen.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsFormScreen.tsx
index ca76dca84..ab4341e17 100644
--- a/packages/extension/src/ui/features/settings/NetworkSettingsFormScreen.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsFormScreen.tsx
@@ -4,13 +4,13 @@ import { FC } from "react"
 import { Control, FieldErrors } from "react-hook-form"
 import styled from "styled-components"
 
-import { Network } from "../../../shared/network"
-import { IconButton } from "../../components/IconButton"
-import { ArrowBackIosNewIcon } from "../../components/Icons/MuiIcons"
-import { ControlledInputText } from "../../components/InputText"
-import { makeClickable } from "../../services/a11y"
-import { A, FormError, P } from "../../theme/Typography"
-import { ConfirmScreen } from "../actions/transaction/ApproveTransactionScreen/ConfirmScreen"
+import { Network } from "../../../../../shared/network"
+import { IconButton } from "../../../../components/IconButton"
+import { ArrowBackIosNewIcon } from "../../../../components/Icons/MuiIcons"
+import { ControlledInputText } from "../../../../components/InputText"
+import { makeClickable } from "../../../../services/a11y"
+import { A, FormError, P } from "../../../../theme/Typography"
+import { ConfirmScreen } from "../../../actions/transaction/ApproveTransactionScreen/ConfirmScreen"
 
 const ExtendableControl = styled.div`
   display: flex;
diff --git a/packages/extension/src/ui/features/settings/NetworkSettingsFormScreenContainer.tsx b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsFormScreenContainer.tsx
similarity index 66%
rename from packages/extension/src/ui/features/settings/NetworkSettingsFormScreenContainer.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsFormScreenContainer.tsx
index e3efb6cb7..10c1e5062 100644
--- a/packages/extension/src/ui/features/settings/NetworkSettingsFormScreenContainer.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsFormScreenContainer.tsx
@@ -3,23 +3,23 @@ import { FC, useEffect, useMemo, useState } from "react"
 import { useForm } from "react-hook-form"
 import { useNavigate } from "react-router-dom"
 
-import { Network, networkSchema } from "../../../shared/network"
-import { settingsStore } from "../../../shared/settings"
-import { defaultBlockExplorers } from "../../../shared/settings/defaultBlockExplorers"
-import { useKeyValueStorage } from "../../../shared/storage/hooks"
+import { Network, networkSchema } from "../../../../../shared/network"
+import { settingsStore } from "../../../../../shared/settings"
+import { defaultBlockExplorers } from "../../../../../shared/settings/defaultBlockExplorers"
+import { useKeyValueStorage } from "../../../../hooks/useStorage"
 import { slugify } from "./slugify"
 import { addressSchema } from "@argent/shared"
 import { addAddressPadding } from "starknet"
 import { NetworkSettingsFormScreen } from "./NetworkSettingsFormScreen"
 import {
-  FEE_TOKEN_ADDRESS_ETH,
+  ETH_TOKEN_ADDRESS,
   MULTICALL_CONTRACT_ADDRESS,
   STANDARD_ACCOUNT_CLASS_HASH,
-} from "../../../shared/network/constants"
-import { networkService } from "../../../shared/network/service"
-import { Token } from "../../../shared/token/__new/types/token.model"
-import { TokenSchema } from "../../../shared/token/__new/types/token.model"
-import { tokenService } from "../../services/tokens"
+} from "../../../../../shared/network/constants"
+import { networkService } from "../../../../../shared/network/service"
+import { Token } from "../../../../../shared/token/__new/types/token.model"
+import { TokenSchema } from "../../../../../shared/token/__new/types/token.model"
+import { tokenService } from "../../../../services/tokens"
 
 type NetworkSettingsFormScreenContainerProps =
   | {
@@ -49,8 +49,7 @@ export const NetworkSettingsFormScreenContainer: FC<
         accountClassHash: {
           standard: STANDARD_ACCOUNT_CLASS_HASH,
         },
-        feeTokenAddress: FEE_TOKEN_ADDRESS_ETH,
-
+        possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS],
         // should we add a default for this or use undefined? For better UX, its a good idea to have a default imo - Dhruv
         multicallAddress: MULTICALL_CONTRACT_ADDRESS,
       }
@@ -96,35 +95,37 @@ export const NetworkSettingsFormScreenContainer: FC<
     try {
       await networkService.add(network)
 
-      if (network.feeTokenAddress) {
-        const parsedFeeTokenAddress = addressSchema.parse(
-          network.feeTokenAddress,
-        )
-
-        const token = await tokenService.fetchDetails(
-          parsedFeeTokenAddress,
-          network.id,
-        )
+      const promises = network.possibleFeeTokenAddresses.map(
+        async (feeTokenAddress) => {
+          const parsedFeeTokenAddress = addressSchema.parse(feeTokenAddress)
 
-        const parsedToken = TokenSchema.parse({
-          ...token,
-          networkId: network.id,
-        })
+          const token = await tokenService.fetchDetails(
+            parsedFeeTokenAddress,
+            network.id,
+          )
 
-        if (parsedToken) {
-          const addTokenData: Token = {
-            ...parsedToken,
-            address: addressSchema.parse(
-              addAddressPadding(parsedFeeTokenAddress),
-            ),
+          const parsedToken = TokenSchema.parse({
+            ...token,
             networkId: network.id,
-            custom: true,
-            showAlways: true, // fee token should always be shown
+          })
+
+          if (parsedToken) {
+            const addTokenData: Token = {
+              ...parsedToken,
+              address: addressSchema.parse(
+                addAddressPadding(parsedFeeTokenAddress),
+              ),
+              networkId: network.id,
+              custom: true,
+              showAlways: true, // fee token should always be shown
+            }
+
+            await tokenService.addToken(addTokenData)
           }
+        },
+      )
 
-          await tokenService.addToken(addTokenData)
-        }
-      }
+      await Promise.allSettled(promises)
 
       navigate(-1)
     } catch (e) {
diff --git a/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsScreen.tsx b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsScreen.tsx
new file mode 100644
index 000000000..350928c02
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsScreen.tsx
@@ -0,0 +1,106 @@
+import {
+  AlertDialog,
+  BarAddButton,
+  BarBackButton,
+  Button,
+  CellStack,
+  Empty,
+  NavigationContainer,
+  StickyGroup,
+  icons,
+} from "@argent/ui"
+import { FC, ReactEventHandler } from "react"
+
+import type { Network } from "../../../../../shared/network"
+import {
+  SettingsMenuItem,
+  SettingsMenuItemRemove,
+} from "../../ui/SettingsMenuItem"
+
+const { NetworkIcon, RestoreIcon } = icons
+
+interface NetworkSettingsScreenProps {
+  onBack: ReactEventHandler
+  allNetworks: Network[]
+  onViewNetwork: (network: Network) => void
+  onRemoveNetwork: (network: Network) => void
+  onAlertDialogClose: () => void
+  isAlertDialogOpen: boolean
+  alertDialogMessage: string
+  onRestoreDefaults: ReactEventHandler
+  isDefaultCustomNetworks: boolean
+  onAddNetwork: ReactEventHandler
+}
+
+export const NetworkSettingsScreen: FC<NetworkSettingsScreenProps> = ({
+  onBack,
+  allNetworks = [],
+  onViewNetwork,
+  onRemoveNetwork,
+  onAlertDialogClose,
+  isAlertDialogOpen,
+  alertDialogMessage,
+  onRestoreDefaults,
+  isDefaultCustomNetworks,
+  onAddNetwork,
+}) => {
+  return (
+    <>
+      <NavigationContainer
+        leftButton={<BarBackButton onClick={onBack} />}
+        rightButton={<BarAddButton onClick={onAddNetwork} />}
+        title={"Networks"}
+      >
+        <CellStack pb={!isDefaultCustomNetworks ? 16 : 4} flex={1}>
+          {allNetworks.length === 0 ? (
+            <Empty icon={<NetworkIcon />} title={"No custom networks"} />
+          ) : (
+            allNetworks.map((network) => {
+              if (network.readonly) {
+                return (
+                  <SettingsMenuItem
+                    key={network.id}
+                    title={network.name}
+                    onClick={() => {
+                      onViewNetwork(network)
+                    }}
+                  />
+                )
+              }
+              return (
+                <SettingsMenuItemRemove
+                  key={network.id}
+                  title={network.name}
+                  onRemoveClick={() => {
+                    onRemoveNetwork(network)
+                  }}
+                />
+              )
+            })
+          )}
+        </CellStack>
+
+        {!isDefaultCustomNetworks && (
+          <StickyGroup px="4" pb="4" alignItems="center">
+            <Button
+              onClick={onRestoreDefaults}
+              size={"2xs"}
+              colorScheme="transparent"
+              leftIcon={<RestoreIcon />}
+              color="text.secondary"
+            >
+              Restore default networks
+            </Button>
+          </StickyGroup>
+        )}
+      </NavigationContainer>
+
+      <AlertDialog
+        isOpen={isAlertDialogOpen}
+        title={"Cannot remove"}
+        message={alertDialogMessage}
+        onCancel={onAlertDialogClose}
+      />
+    </>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsScreenContainer.tsx
new file mode 100644
index 000000000..70932a022
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsScreenContainer.tsx
@@ -0,0 +1,94 @@
+import { isEqual } from "lodash-es"
+import { FC, useCallback, useMemo, useState } from "react"
+import { useNavigate } from "react-router-dom"
+import { useDisclosure } from "@chakra-ui/react"
+import {
+  defaultCustomNetworks,
+  type Network,
+} from "../../../../../shared/network"
+import { networkService } from "../../../../../shared/network/service"
+import { routes } from "../../../../routes"
+import { useNetworks } from "../../../networks/hooks/useNetworks"
+import {
+  validateRemoveNetwork,
+  validateRestoreDefaultNetworks,
+} from "./validateRemoveNetwork"
+import { NetworkSettingsScreen } from "./NetworkSettingsScreen"
+import { useNavigateReturnToOrBack } from "../../../../hooks/useNavigateReturnTo"
+
+export const NetworkSettingsScreenContainer: FC = () => {
+  const onBack = useNavigateReturnToOrBack()
+  const allNetworks = useNetworks()
+  const navigate = useNavigate()
+  const {
+    isOpen: isAlertDialogOpen,
+    onOpen: onAlertDialogOpen,
+    onClose: onAlertDialogClose,
+  } = useDisclosure()
+
+  const [errorMessage, setErrorMessage] = useState("")
+
+  const isDefaultCustomNetworks = useMemo(() => {
+    return isEqual(allNetworks, [...allNetworks, ...defaultCustomNetworks])
+  }, [allNetworks])
+
+  const onRemoveNetwork = useCallback(
+    async (network: Network) => {
+      try {
+        const shouldRemoveNetwork = await validateRemoveNetwork(network.id)
+        if (shouldRemoveNetwork) {
+          await networkService.removeById(network.id)
+        }
+      } catch (error) {
+        if (error instanceof Error) {
+          setErrorMessage(error.message)
+          onAlertDialogOpen()
+        } else {
+          // unexpected, throw to error boundary
+          throw error
+        }
+      }
+    },
+    [onAlertDialogOpen],
+  )
+
+  const onRestoreDefaults = useCallback(async () => {
+    try {
+      const shouldRemoveNetwork = await validateRestoreDefaultNetworks()
+      if (shouldRemoveNetwork) {
+        await networkService.restoreDefaults()
+      }
+    } catch (error) {
+      if (error instanceof Error) {
+        setErrorMessage(error.message)
+        onAlertDialogOpen()
+      } else {
+        // unexpected, throw to error boundary
+        throw error
+      }
+    }
+  }, [onAlertDialogOpen])
+
+  const onViewNetwork = (network: Network) => {
+    navigate(routes.settingsEditCustomNetwork(network.id))
+  }
+
+  const onAddNetwork = () => {
+    navigate(routes.settingsAddCustomNetwork())
+  }
+
+  return (
+    <NetworkSettingsScreen
+      onBack={onBack}
+      allNetworks={allNetworks}
+      onViewNetwork={onViewNetwork}
+      onRemoveNetwork={onRemoveNetwork}
+      onAlertDialogClose={onAlertDialogClose}
+      isAlertDialogOpen={isAlertDialogOpen}
+      alertDialogMessage={errorMessage}
+      onRestoreDefaults={onRestoreDefaults}
+      isDefaultCustomNetworks={isDefaultCustomNetworks}
+      onAddNetwork={onAddNetwork}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/slugify.ts b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/slugify.ts
similarity index 100%
rename from packages/extension/src/ui/features/settings/slugify.ts
rename to packages/extension/src/ui/features/settings/developerSettings/manageNetworks/slugify.ts
diff --git a/packages/extension/src/ui/features/settings/validateRemoveNetwork.ts b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/validateRemoveNetwork.ts
similarity index 87%
rename from packages/extension/src/ui/features/settings/validateRemoveNetwork.ts
rename to packages/extension/src/ui/features/settings/developerSettings/manageNetworks/validateRemoveNetwork.ts
index fd1f77d1f..a5327cd54 100644
--- a/packages/extension/src/ui/features/settings/validateRemoveNetwork.ts
+++ b/packages/extension/src/ui/features/settings/developerSettings/manageNetworks/validateRemoveNetwork.ts
@@ -1,5 +1,5 @@
-import { defaultNetworks } from "../../../shared/network"
-import { useAppState } from "../../app.state"
+import { defaultNetworks } from "../../../../../shared/network"
+import { useAppState } from "../../../../app.state"
 
 export const validateRemoveNetwork = async (networkId: string) => {
   const { switcherNetworkId } = useAppState.getState()
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/ClassHashInputActions.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/ClassHashInputActions.tsx
similarity index 98%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/ClassHashInputActions.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/ClassHashInputActions.tsx
index b308eb567..1624f3b4d 100644
--- a/packages/extension/src/ui/features/settings/DeveloperSettings/ClassHashInputActions.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/ClassHashInputActions.tsx
@@ -2,7 +2,7 @@ import { Button, H6, icons } from "@argent/ui"
 import { Box, ScaleFade } from "@chakra-ui/react"
 import { FC, useCallback, useEffect, useRef, useState } from "react"
 
-import { Transaction } from "../../../../shared/transactions"
+import { Transaction } from "../../../../../shared/transactions"
 import { ClassHashOption } from "./ClassHashOption"
 
 const { HistoryIcon, CloseIcon } = icons
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/ClassHashOption.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/ClassHashOption.tsx
similarity index 80%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/ClassHashOption.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/ClassHashOption.tsx
index b633bda72..eb1fc15df 100644
--- a/packages/extension/src/ui/features/settings/DeveloperSettings/ClassHashOption.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/ClassHashOption.tsx
@@ -2,11 +2,11 @@ import { H6, P4 } from "@argent/ui"
 import { Flex } from "@chakra-ui/react"
 import { FC } from "react"
 
-import { Transaction } from "../../../../shared/transactions"
-import { formatTruncatedAddress } from "../../../services/addresses"
-import { formatDateTimeBase } from "../../../services/dates"
-import { AccountAvatar } from "../../accounts/AccountAvatar"
-import { getNetworkAccountImageUrl } from "../../accounts/accounts.service"
+import { Transaction } from "../../../../../shared/transactions"
+import { formatTruncatedAddress } from "@argent/shared"
+import { formatDateTimeBase } from "../../../../services/dates"
+import { AccountAvatar } from "../../../accounts/AccountAvatar"
+import { getNetworkAccountImageUrl } from "../../../accounts/accounts.service"
 
 interface ClassHashOptionProps {
   handleToggle: () => void
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/DeclareOrDeployContractSuccessScreen.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareOrDeployContractSuccessScreen.tsx
similarity index 100%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/DeclareOrDeployContractSuccessScreen.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareOrDeployContractSuccessScreen.tsx
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/DeclareOrDeployContractSuccessScreenContainer.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareOrDeployContractSuccessScreenContainer.tsx
similarity index 93%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/DeclareOrDeployContractSuccessScreenContainer.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareOrDeployContractSuccessScreenContainer.tsx
index 8bb0c06ff..817c07c31 100644
--- a/packages/extension/src/ui/features/settings/DeveloperSettings/DeclareOrDeployContractSuccessScreenContainer.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareOrDeployContractSuccessScreenContainer.tsx
@@ -1,7 +1,7 @@
 import { FC } from "react"
 import { useNavigate, useParams } from "react-router-dom"
 
-import { routes } from "../../../routes"
+import { routes } from "../../../../routes"
 import { DeclareOrDeployContractSuccessScreen } from "./DeclareOrDeployContractSuccessScreen"
 
 export const DeclareOrDeployContractSuccessScreenContainer: FC = () => {
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/DeclareSmartContractForm.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareSmartContractForm.tsx
similarity index 97%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/DeclareSmartContractForm.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareSmartContractForm.tsx
index b7aa42e9c..2574c9e98 100644
--- a/packages/extension/src/ui/features/settings/DeveloperSettings/DeclareSmartContractForm.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareSmartContractForm.tsx
@@ -6,13 +6,13 @@ import { CompiledSierraCasm, hash, isSierra } from "starknet"
 import { chakra } from "@chakra-ui/react"
 
 import { readFileAsString } from "@argent/shared"
-import { useAppState } from "../../../app.state"
+import { useAppState } from "../../../../app.state"
 import { FileNameWithClassHash } from "./ui/ContractWithClassHash"
 import { FileInputButton } from "./ui/FileInputButton"
 import { useFormSelects } from "./useFormSelects"
-import { udcService } from "../../../services/udc"
-import { DeclareContractBackgroundPayload } from "../../../../shared/udc/type"
-import { clientAccountService } from "../../../services/account"
+import { udcService } from "../../../../services/udc"
+import { DeclareContractBackgroundPayload } from "../../../../../shared/udc/schema"
+import { clientAccountService } from "../../../../services/account"
 
 interface FieldValues {
   contractJson: string
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/DeclareSmartContractScreen.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareSmartContractScreen.tsx
similarity index 100%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/DeclareSmartContractScreen.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareSmartContractScreen.tsx
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/DeploySmartContractForm.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeploySmartContractForm.tsx
similarity index 92%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/DeploySmartContractForm.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeploySmartContractForm.tsx
index 3c119ce93..1677b890f 100644
--- a/packages/extension/src/ui/features/settings/DeveloperSettings/DeploySmartContractForm.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeploySmartContractForm.tsx
@@ -10,18 +10,18 @@ import {
   useForm,
 } from "react-hook-form"
 
-import { Transaction } from "../../../../shared/transactions"
-import { useAppState } from "../../../app.state"
+import { Transaction } from "../../../../../shared/transactions"
+import { useAppState } from "../../../../app.state"
 
 import { ClassHashInputActions } from "./ClassHashInputActions"
 import { useLastDeclaredContracts } from "./udc.state"
 import { useFormSelects } from "./useFormSelects"
-import { useAutoFocusInputRef } from "../../../hooks/useAutoFocusInputRef"
+import { useAutoFocusInputRef } from "../../../../hooks/useAutoFocusInputRef"
 import { DeploySmartContractParametersContainer } from "./DeploySmartContractParametersContainer"
-import { udcService } from "../../../services/udc"
-import { DeployContractPayload } from "../../../../shared/udc/service/interface"
-import { FieldValues } from "./deploySmartContractForm.model"
-import { clientAccountService } from "../../../services/account"
+import { udcService } from "../../../../services/udc"
+import { DeployContractPayload } from "../../../../../shared/udc/service/interface"
+import { clientAccountService } from "../../../../services/account"
+import { FieldValues } from "../../../../../shared/udc/schema"
 
 interface DeploySmartContractFormProps {
   children?: (options: { isDirty: boolean; isSubmitting: boolean }) => ReactNode
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/DeploySmartContractParameters.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeploySmartContractParameters.tsx
similarity index 100%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/DeploySmartContractParameters.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeploySmartContractParameters.tsx
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/DeploySmartContractParametersContainer.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeploySmartContractParametersContainer.tsx
similarity index 100%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/DeploySmartContractParametersContainer.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeploySmartContractParametersContainer.tsx
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/DeploySmartContractScreen.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeploySmartContractScreen.tsx
similarity index 100%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/DeploySmartContractScreen.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeploySmartContractScreen.tsx
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/SelectOptionAccount.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/SelectOptionAccount.tsx
similarity index 82%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/SelectOptionAccount.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/SelectOptionAccount.tsx
index 87a3bdf02..b12bd20bf 100644
--- a/packages/extension/src/ui/features/settings/DeveloperSettings/SelectOptionAccount.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/SelectOptionAccount.tsx
@@ -2,8 +2,8 @@ import { H6, P4 } from "@argent/ui"
 import { Flex } from "@chakra-ui/react"
 import { FC } from "react"
 
-import { formatTruncatedAddress } from "../../../services/addresses"
-import { Account } from "../../accounts/Account"
+import { formatTruncatedAddress } from "@argent/shared"
+import { Account } from "../../../accounts/Account"
 
 interface SelectOptionAvatarProps {
   account: Account
diff --git a/packages/extension/src/ui/features/settings/SmartContractDevelopmentScreen.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/SmartContractDevelopmentScreen.tsx
similarity index 76%
rename from packages/extension/src/ui/features/settings/SmartContractDevelopmentScreen.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/SmartContractDevelopmentScreen.tsx
index 5a0bab6db..2e1f03bd9 100644
--- a/packages/extension/src/ui/features/settings/SmartContractDevelopmentScreen.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/SmartContractDevelopmentScreen.tsx
@@ -7,10 +7,10 @@ import {
 } from "@argent/ui"
 import { FC } from "react"
 
-import { routes } from "../../routes"
-import { selectedAccountView } from "../../views/account"
-import { useView } from "../../views/implementation/react"
-import { SettingsMenuItem } from "./SettingsMenuItem"
+import { routes } from "../../../../routes"
+import { selectedAccountView } from "../../../../views/account"
+import { useView } from "../../../../views/implementation/react"
+import { SettingsMenuItemLink } from "../../ui/SettingsMenuItem"
 
 const { ShieldIcon } = icons
 
@@ -32,12 +32,12 @@ const SmartContractDevelopmentScreen: FC = () => {
         />
       ) : (
         <CellStack>
-          <SettingsMenuItem
+          <SettingsMenuItemLink
             to={routes.settingsSmartContractDeclare()}
             title="Declare smart contract"
           />
 
-          <SettingsMenuItem
+          <SettingsMenuItemLink
             to={routes.settingsSmartContractDeploy()}
             title="Deploy smart contract"
           />
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/udc.state.ts b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/udc.state.ts
similarity index 80%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/udc.state.ts
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/udc.state.ts
index 8867d9731..d0c5aaa2a 100644
--- a/packages/extension/src/ui/features/settings/DeveloperSettings/udc.state.ts
+++ b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/udc.state.ts
@@ -1,7 +1,7 @@
 import { useMemo } from "react"
 
-import { useArrayStorage } from "../../../../shared/storage/hooks"
-import { declaredTransactionsStore } from "../../../../shared/udc/store"
+import { useArrayStorage } from "../../../../hooks/useStorage"
+import { declaredTransactionsStore } from "../../../../../shared/udc/store"
 
 export const useLastDeclaredContracts = ({ limit }: { limit?: number }) => {
   const declaredTransactions = useArrayStorage(declaredTransactionsStore)
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/ui/ContractWithClassHash.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/ui/ContractWithClassHash.tsx
similarity index 100%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/ui/ContractWithClassHash.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/ui/ContractWithClassHash.tsx
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/ui/FileInputButton.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/ui/FileInputButton.tsx
similarity index 100%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/ui/FileInputButton.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/ui/FileInputButton.tsx
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/useConstructorParams.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/useConstructorParams.tsx
similarity index 87%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/useConstructorParams.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/useConstructorParams.tsx
index a113ebf7e..cfd54a5f7 100644
--- a/packages/extension/src/ui/features/settings/DeveloperSettings/useConstructorParams.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/useConstructorParams.tsx
@@ -1,5 +1,5 @@
 import useSWR from "swr"
-import { udcService } from "../../../services/udc"
+import { udcService } from "../../../../services/udc"
 
 export const useConstructorParams = (
   currentClassHash: string,
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings/useFormSelects.tsx b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/useFormSelects.tsx
similarity index 71%
rename from packages/extension/src/ui/features/settings/DeveloperSettings/useFormSelects.tsx
rename to packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/useFormSelects.tsx
index 8f97a3f3e..66f163a01 100644
--- a/packages/extension/src/ui/features/settings/DeveloperSettings/useFormSelects.tsx
+++ b/packages/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/useFormSelects.tsx
@@ -1,13 +1,13 @@
 import { useMemo } from "react"
 
-import { Network } from "../../../../shared/network/type"
-import { WalletAccount } from "../../../../shared/wallet.model"
-import { visibleAccountsView } from "../../../views/account"
-import { useView } from "../../../views/implementation/react"
-import type { Account } from "../../accounts/Account"
-import { AccountAvatar } from "../../accounts/AccountAvatar"
-import { getNetworkAccountImageUrl } from "../../accounts/accounts.service"
-import { useNetworks } from "../../networks/hooks/useNetworks"
+import { Network } from "../../../../../shared/network/type"
+import { WalletAccount } from "../../../../../shared/wallet.model"
+import { visibleAccountsView } from "../../../../views/account"
+import { useView } from "../../../../views/implementation/react"
+import type { Account } from "../../../accounts/Account"
+import { AccountAvatar } from "../../../accounts/AccountAvatar"
+import { getNetworkAccountImageUrl } from "../../../accounts/accounts.service"
+import { useNetworks } from "../../../networks/hooks/useNetworks"
 import { SelectOptionAccount } from "./SelectOptionAccount"
 
 const useFormSelects = (selectedNetwork: string) => {
diff --git a/packages/extension/src/ui/features/settings/preferences/BlockExplorerSettingsScreen.tsx b/packages/extension/src/ui/features/settings/preferences/BlockExplorerSettingsScreen.tsx
new file mode 100644
index 000000000..561d58b84
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/preferences/BlockExplorerSettingsScreen.tsx
@@ -0,0 +1,48 @@
+import { BarBackButton, CellStack, NavigationContainer } from "@argent/ui"
+import { FC, ReactEventHandler } from "react"
+
+import {
+  BlockExplorerKey,
+  defaultBlockExplorers,
+} from "../../../../shared/settings/defaultBlockExplorers"
+import { SettingsMenuItem } from "../ui/SettingsMenuItem"
+import { SettingsMenuItemLogo } from "../ui/SettingsMenuItemLogo"
+import { SettingsRadioIcon } from "../ui/SettingsRadioIcon"
+
+interface BlockExplorerSettingsScreenProps {
+  onBack: ReactEventHandler
+  blockExplorerKey: BlockExplorerKey
+  onChange: (key: BlockExplorerKey) => void
+}
+
+export const BlockExplorerSettingsScreen: FC<
+  BlockExplorerSettingsScreenProps
+> = ({ onBack, blockExplorerKey, onChange }) => {
+  return (
+    <NavigationContainer
+      leftButton={<BarBackButton onClick={onBack} />}
+      title={"Default block explorer"}
+    >
+      <CellStack>
+        {Object.entries(defaultBlockExplorers).map(([key, blockExplorer]) => {
+          const { title, logo } = blockExplorer
+          const checked = blockExplorerKey === key
+          const leftIcon = <SettingsMenuItemLogo logo={logo} />
+          const rightIcon = <SettingsRadioIcon checked={checked} />
+          const onClick = () => {
+            onChange(key)
+          }
+          return (
+            <SettingsMenuItem
+              key={key}
+              title={title}
+              onClick={onClick}
+              leftIcon={leftIcon}
+              rightIcon={rightIcon}
+            />
+          )
+        })}
+      </CellStack>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/preferences/BlockExplorerSettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/preferences/BlockExplorerSettingsScreenContainer.tsx
new file mode 100644
index 000000000..2bdd8eb86
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/preferences/BlockExplorerSettingsScreenContainer.tsx
@@ -0,0 +1,22 @@
+import { FC } from "react"
+
+import { settingsStore } from "../../../../shared/settings"
+import { BlockExplorerKey } from "../../../../shared/settings/defaultBlockExplorers"
+import { useKeyValueStorage } from "../../../hooks/useStorage"
+import { BlockExplorerSettingsScreen } from "./BlockExplorerSettingsScreen"
+import { useNavigateReturnToOrBack } from "../../../hooks/useNavigateReturnTo"
+
+export const BlockExplorerSettingsScreenContainer: FC = () => {
+  const onBack = useNavigateReturnToOrBack()
+  const blockExplorerKey = useKeyValueStorage(settingsStore, "blockExplorerKey")
+  const onChange = (key: BlockExplorerKey) => {
+    void settingsStore.set("blockExplorerKey", key)
+  }
+  return (
+    <BlockExplorerSettingsScreen
+      onBack={onBack}
+      blockExplorerKey={blockExplorerKey}
+      onChange={onChange}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/preferences/EmailNotificationsSettingsScreen.tsx b/packages/extension/src/ui/features/settings/preferences/EmailNotificationsSettingsScreen.tsx
new file mode 100644
index 000000000..7634679a3
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/preferences/EmailNotificationsSettingsScreen.tsx
@@ -0,0 +1,61 @@
+import {
+  BarBackButton,
+  ButtonCell,
+  CellStack,
+  NavigationContainer,
+  Switch,
+} from "@argent/ui"
+import { FC, ReactEventHandler } from "react"
+
+interface EmailNotificationsSettingsScreenProps {
+  onBack: ReactEventHandler
+  isNewsletterEnabled?: boolean
+  isAnnouncementsEnabled?: boolean
+  onNewsletterChange: (newValue: boolean) => void | Promise<void>
+  onAnnouncementsChange: (newValue: boolean) => void | Promise<void>
+}
+
+export const EmailNotificationsSettingsScreen: FC<
+  EmailNotificationsSettingsScreenProps
+> = ({
+  onBack,
+  isNewsletterEnabled = false,
+  isAnnouncementsEnabled = false,
+  onNewsletterChange,
+  onAnnouncementsChange,
+}) => {
+  return (
+    <NavigationContainer
+      leftButton={<BarBackButton onClick={onBack} />}
+      title="Email notifications"
+    >
+      <CellStack>
+        <ButtonCell
+          rightIcon={<Switch isChecked isDisabled />}
+          extendedDescription="Get notified when there are important changes to Starknet or to your Argent X accounts"
+          pointerEvents="none"
+        >
+          Security alerts (required)
+        </ButtonCell>
+        <ButtonCell
+          rightIcon={
+            <Switch isChecked={isAnnouncementsEnabled} pointerEvents="none" />
+          }
+          extendedDescription="Learn about new Argent features and campaigns"
+          onClick={() => void onAnnouncementsChange(!isAnnouncementsEnabled)}
+        >
+          Argent announcements
+        </ButtonCell>
+        <ButtonCell
+          rightIcon={
+            <Switch isChecked={isNewsletterEnabled} pointerEvents="none" />
+          }
+          extendedDescription="Focused and relevant updates from the wider Ethereum ecosystem"
+          onClick={() => void onNewsletterChange(!isNewsletterEnabled)}
+        >
+          Starknet Newsletter
+        </ButtonCell>
+      </CellStack>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/preferences/EmailNotificationsSettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/preferences/EmailNotificationsSettingsScreenContainer.tsx
new file mode 100644
index 000000000..a8a300146
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/preferences/EmailNotificationsSettingsScreenContainer.tsx
@@ -0,0 +1,64 @@
+import { EmailNotificationsSettingsScreen } from "./EmailNotificationsSettingsScreen"
+import { argentAccountService } from "../../../services/argentAccount"
+
+import {
+  EmailPreferences,
+  emailPreferencesSchema,
+} from "../../../../shared/argentAccount/schema"
+import { useEmailPreferences } from "../../argentAccount/hooks/useEmailPreferences"
+import { useDebounce } from "@argent/shared"
+import { useNavigateReturnToOrBack } from "../../../hooks/useNavigateReturnTo"
+
+export const EmailNotificationsSettingsScreenContainer = () => {
+  const { data: emailPreferences, mutate } = useEmailPreferences()
+
+  const updateServicePreferences = async (
+    key: keyof EmailPreferences,
+    newValue: boolean,
+  ) => {
+    await argentAccountService.updateEmailPreferences(
+      emailPreferencesSchema.parse({
+        ...emailPreferences,
+        [key]: newValue,
+      }),
+    )
+    /** re-fetch from server */
+    await mutate()
+  }
+
+  const debouncedUpdateServicePreferences = useDebounce(
+    updateServicePreferences,
+    500,
+  )
+
+  const updatePreferences = async (
+    key: keyof EmailPreferences,
+    newValue: boolean,
+  ) => {
+    const updatedPreferences = emailPreferencesSchema.parse({
+      ...emailPreferences,
+      [key]: newValue,
+    })
+    /** optimistic update to local state, don't re-fetch yet */
+    await mutate(updatedPreferences, { revalidate: false })
+    debouncedUpdateServicePreferences(key, newValue)
+  }
+
+  const onNewsletterChange = (newValue: boolean) =>
+    updatePreferences("isNewsletterEnabled", newValue)
+
+  const onAnnouncementsChange = (newValue: boolean) =>
+    updatePreferences("isAnnouncementsEnabled", newValue)
+
+  const onBack = useNavigateReturnToOrBack()
+
+  return (
+    <EmailNotificationsSettingsScreen
+      onBack={onBack}
+      onNewsletterChange={onNewsletterChange}
+      onAnnouncementsChange={onAnnouncementsChange}
+      isNewsletterEnabled={emailPreferences?.isNewsletterEnabled}
+      isAnnouncementsEnabled={emailPreferences?.isAnnouncementsEnabled}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/preferences/NftMarketplaceSettingsScreen.tsx b/packages/extension/src/ui/features/settings/preferences/NftMarketplaceSettingsScreen.tsx
new file mode 100644
index 000000000..72d1fd8ef
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/preferences/NftMarketplaceSettingsScreen.tsx
@@ -0,0 +1,50 @@
+import { BarBackButton, CellStack, NavigationContainer } from "@argent/ui"
+import { FC, ReactEventHandler } from "react"
+
+import { SettingsMenuItem } from "../ui/SettingsMenuItem"
+import { SettingsMenuItemLogo } from "../ui/SettingsMenuItemLogo"
+import { SettingsRadioIcon } from "../ui/SettingsRadioIcon"
+import {
+  NftMarketplaceKey,
+  defaultNftMarketplaces,
+} from "../../../../shared/nft/marketplaces"
+
+interface NftMarketplaceSettingsScreenProps {
+  onBack: ReactEventHandler
+  nftMarketplaceKey: NftMarketplaceKey
+  onChange: (key: NftMarketplaceKey) => void
+}
+
+export const NftMarketplaceSettingsScreen: FC<
+  NftMarketplaceSettingsScreenProps
+> = ({ onBack, nftMarketplaceKey, onChange }) => {
+  return (
+    <NavigationContainer
+      leftButton={<BarBackButton onClick={onBack} />}
+      title={"Default NFT marketplace"}
+    >
+      <CellStack>
+        {Object.entries(defaultNftMarketplaces).map(([key, nftMarketplace]) => {
+          const { title, logo } = nftMarketplace
+          const checked = nftMarketplaceKey === key
+          const leftIcon = logo ? (
+            <SettingsMenuItemLogo logo={logo} />
+          ) : undefined
+          const rightIcon = <SettingsRadioIcon checked={checked} />
+          const onClick = () => {
+            onChange(key)
+          }
+          return (
+            <SettingsMenuItem
+              key={key}
+              title={title}
+              onClick={onClick}
+              leftIcon={leftIcon}
+              rightIcon={rightIcon}
+            />
+          )
+        })}
+      </CellStack>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/preferences/NftMarketplaceSettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/preferences/NftMarketplaceSettingsScreenContainer.tsx
new file mode 100644
index 000000000..58ac4407e
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/preferences/NftMarketplaceSettingsScreenContainer.tsx
@@ -0,0 +1,25 @@
+import { FC } from "react"
+
+import { settingsStore } from "../../../../shared/settings"
+import { useKeyValueStorage } from "../../../hooks/useStorage"
+import { NftMarketplaceSettingsScreen } from "./NftMarketplaceSettingsScreen"
+import { useNavigateReturnToOrBack } from "../../../hooks/useNavigateReturnTo"
+import { NftMarketplaceKey } from "../../../../shared/nft/marketplaces"
+
+export const NftMarketplaceSettingsScreenContainer: FC = () => {
+  const onBack = useNavigateReturnToOrBack()
+  const nftMarketplaceKey = useKeyValueStorage(
+    settingsStore,
+    "nftMarketplaceKey",
+  )
+  const onChange = (key: NftMarketplaceKey) => {
+    void settingsStore.set("nftMarketplaceKey", key)
+  }
+  return (
+    <NftMarketplaceSettingsScreen
+      onBack={onBack}
+      nftMarketplaceKey={nftMarketplaceKey}
+      onChange={onChange}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/preferences/PreferencesSettings.tsx b/packages/extension/src/ui/features/settings/preferences/PreferencesSettings.tsx
new file mode 100644
index 000000000..53850fbc9
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/preferences/PreferencesSettings.tsx
@@ -0,0 +1,75 @@
+import {
+  BarBackButton,
+  CellStack,
+  NavigationContainer,
+  Switch,
+} from "@argent/ui"
+import { FC, ReactEventHandler } from "react"
+
+import { NftMarketplace } from "../../../../shared/nft/marketplaces"
+import { BlockExplorer } from "../../../../shared/settings/defaultBlockExplorers"
+import { BaseWalletAccount } from "../../../../shared/wallet.model"
+import { routes } from "../../../routes"
+import { SettingsMenuItem, SettingsMenuItemLink } from "../ui/SettingsMenuItem"
+
+interface PreferencesSettingsProps {
+  onBack: ReactEventHandler
+  hideTokensWithNoBalance: boolean
+  toggleHideTokensWithNoBalance: ReactEventHandler
+  isSignedIn: boolean
+  returnTo: string
+  blockExplorer: BlockExplorer
+  nftMarketplace: NftMarketplace
+  selectedAccount?: BaseWalletAccount
+}
+
+export const PreferencesSettings: FC<PreferencesSettingsProps> = ({
+  onBack,
+  toggleHideTokensWithNoBalance,
+  hideTokensWithNoBalance,
+  isSignedIn,
+  returnTo,
+  blockExplorer,
+  nftMarketplace,
+  selectedAccount,
+}) => {
+  return (
+    <NavigationContainer
+      leftButton={<BarBackButton onClick={onBack} />}
+      title={"Preferences"}
+    >
+      <CellStack>
+        <SettingsMenuItem
+          onClick={toggleHideTokensWithNoBalance}
+          title={"Hide tokens with no balance"}
+          subtitle={"ETH will always be shown"}
+          rightIcon={<Switch isChecked={hideTokensWithNoBalance} />}
+        >
+          Change account implementation
+        </SettingsMenuItem>
+        <SettingsMenuItemLink
+          to={routes.settingsBlockExplorer(returnTo)}
+          title="Default block explorer"
+          subtitle={blockExplorer.title}
+        />
+        <SettingsMenuItemLink
+          to={routes.settingsNftMarketplace(returnTo)}
+          title="Default NFT marketplace"
+          subtitle={nftMarketplace.title}
+        />
+        <SettingsMenuItemLink
+          to={
+            isSignedIn
+              ? routes.settingsEmailNotifications(returnTo)
+              : routes.argentAccountEmail(
+                  selectedAccount?.address,
+                  "emailPreferences",
+                  returnTo,
+                )
+          }
+          title="Email notifications"
+        />
+      </CellStack>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/preferences/PreferencesSettingsContainer.tsx b/packages/extension/src/ui/features/settings/preferences/PreferencesSettingsContainer.tsx
new file mode 100644
index 000000000..6357a1599
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/preferences/PreferencesSettingsContainer.tsx
@@ -0,0 +1,45 @@
+import { FC, MouseEvent } from "react"
+import { defaultNftMarketplaces } from "../../../../shared/nft/marketplaces"
+import { settingsStore } from "../../../../shared/settings"
+import { defaultBlockExplorers } from "../../../../shared/settings/defaultBlockExplorers"
+import { useKeyValueStorage } from "../../../hooks/useStorage"
+import { useNavigateReturnToOrBack } from "../../../hooks/useNavigateReturnTo"
+import { useCurrentPathnameWithQuery } from "../../../routes"
+import { selectedAccountView } from "../../../views/account"
+import { useView } from "../../../views/implementation/react"
+import { useIsSignedIn } from "../../argentAccount/hooks/useIsSignedIn"
+import { PreferencesSettings } from "./PreferencesSettings"
+
+export const PreferencesSettingsContainer: FC = () => {
+  const isSignedIn = useIsSignedIn()
+  const selectedAccount = useView(selectedAccountView)
+  const returnTo = useCurrentPathnameWithQuery()
+  const onBack = useNavigateReturnToOrBack()
+  const blockExplorerKey = useKeyValueStorage(settingsStore, "blockExplorerKey")
+  const blockExplorer = defaultBlockExplorers[blockExplorerKey]
+  const nftMarketplaceKey = useKeyValueStorage(
+    settingsStore,
+    "nftMarketplaceKey",
+  )
+  const nftMarketplace = defaultNftMarketplaces[nftMarketplaceKey]
+  const hideTokensWithNoBalance = useKeyValueStorage(
+    settingsStore,
+    "hideTokensWithNoBalance",
+  )
+  const toggleHideTokensWithNoBalance = (e: MouseEvent<HTMLElement>) => {
+    e.preventDefault()
+    void settingsStore.set("hideTokensWithNoBalance", !hideTokensWithNoBalance)
+  }
+  return (
+    <PreferencesSettings
+      onBack={onBack}
+      toggleHideTokensWithNoBalance={toggleHideTokensWithNoBalance}
+      hideTokensWithNoBalance={hideTokensWithNoBalance}
+      isSignedIn={isSignedIn}
+      returnTo={returnTo}
+      blockExplorer={blockExplorer}
+      nftMarketplace={nftMarketplace}
+      selectedAccount={selectedAccount}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/securityAndPrivacy/AutoLockTimerSettingsScreen.tsx b/packages/extension/src/ui/features/settings/securityAndPrivacy/AutoLockTimerSettingsScreen.tsx
new file mode 100644
index 000000000..de4715a14
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/securityAndPrivacy/AutoLockTimerSettingsScreen.tsx
@@ -0,0 +1,47 @@
+import { BarBackButton, CellStack, NavigationContainer } from "@argent/ui"
+import { FC, MouseEvent, ReactEventHandler } from "react"
+
+import {
+  defaultAutoLockTimesMinutes,
+  getTitleForAutoLockTimeMinutes,
+} from "../../../../shared/settings/defaultAutoLockTimes"
+import { SettingsMenuItem } from "../ui/SettingsMenuItem"
+import { SettingsRadioIcon } from "../ui/SettingsRadioIcon"
+
+interface AutoLockTimerSettingsScreenProps {
+  onBack: ReactEventHandler
+  autoLockTimeMinutes: number
+  onChange: (autoLockTimeMinutes: number) => void
+}
+
+export const AutoLockTimerSettingsScreen: FC<
+  AutoLockTimerSettingsScreenProps
+> = ({ onBack, autoLockTimeMinutes, onChange }) => {
+  return (
+    <NavigationContainer
+      leftButton={<BarBackButton onClick={onBack} />}
+      title={"Auto lock timer"}
+    >
+      <CellStack>
+        {defaultAutoLockTimesMinutes.map((minutes) => {
+          const checked = autoLockTimeMinutes === minutes
+          const rightIcon = <SettingsRadioIcon checked={checked} />
+          const onClick = (e: MouseEvent<HTMLButtonElement>) => {
+            e.preventDefault()
+            onChange(minutes)
+          }
+          const key = `${minutes}`
+          const title = getTitleForAutoLockTimeMinutes(minutes)
+          return (
+            <SettingsMenuItem
+              key={key}
+              title={title}
+              onClick={onClick}
+              rightIcon={rightIcon}
+            />
+          )
+        })}
+      </CellStack>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/securityAndPrivacy/AutoLockTimerSettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/securityAndPrivacy/AutoLockTimerSettingsScreenContainer.tsx
new file mode 100644
index 000000000..861bd5007
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/securityAndPrivacy/AutoLockTimerSettingsScreenContainer.tsx
@@ -0,0 +1,24 @@
+import { FC } from "react"
+
+import { settingsStore } from "../../../../shared/settings"
+import { useKeyValueStorage } from "../../../hooks/useStorage"
+import { useNavigateReturnToOrBack } from "../../../hooks/useNavigateReturnTo"
+import { AutoLockTimerSettingsScreen } from "./AutoLockTimerSettingsScreen"
+
+export const AutoLockTimerSettingsScreenContainer: FC = () => {
+  const onBack = useNavigateReturnToOrBack()
+  const autoLockTimeMinutes = useKeyValueStorage(
+    settingsStore,
+    "autoLockTimeMinutes",
+  )
+  const onChange = (autoLockTimeMinutes: number) => {
+    void settingsStore.set("autoLockTimeMinutes", autoLockTimeMinutes)
+  }
+  return (
+    <AutoLockTimerSettingsScreen
+      onBack={onBack}
+      autoLockTimeMinutes={autoLockTimeMinutes}
+      onChange={onChange}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/securityAndPrivacy/BeforeYouContinueScreen.tsx b/packages/extension/src/ui/features/settings/securityAndPrivacy/BeforeYouContinueScreen.tsx
new file mode 100644
index 000000000..af56e22bb
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/securityAndPrivacy/BeforeYouContinueScreen.tsx
@@ -0,0 +1,22 @@
+import { Button, Warning } from "@argent/ui"
+import { Flex } from "@chakra-ui/react"
+import { useNavigate } from "react-router-dom"
+import { routes } from "../../../routes"
+
+export const BeforeYouContinueScreen = () => {
+  const navigate = useNavigate()
+  const navigateToRecoveryPhrase = () => {
+    navigate(routes.setupSeedRecovery())
+  }
+  return (
+    <Flex py={4} px={5} direction={"column"} flex={1}>
+      <Warning
+        title="Before you continue..."
+        subtitle="Please save your recovery phrase. This is the only way you will be able to recover your Argent X accounts"
+      />
+      <Button onClick={navigateToRecoveryPhrase} colorScheme="primary" px={2}>
+        Next
+      </Button>
+    </Flex>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/securityAndPrivacy/SecurityAndPrivacySettingsScreen.tsx b/packages/extension/src/ui/features/settings/securityAndPrivacy/SecurityAndPrivacySettingsScreen.tsx
new file mode 100644
index 000000000..54a23d8e0
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/securityAndPrivacy/SecurityAndPrivacySettingsScreen.tsx
@@ -0,0 +1,94 @@
+import {
+  BarBackButton,
+  ButtonCell,
+  CellStack,
+  NavigationContainer,
+  SpacerCell,
+  Switch,
+} from "@argent/ui"
+import { FC, ReactEventHandler } from "react"
+
+import { ISettingsStorage } from "../../../../shared/settings/types"
+import { routes } from "../../../routes"
+import { SettingsMenuItemLink } from "../ui/SettingsMenuItem"
+import { getTitleForAutoLockTimeMinutes } from "../../../../shared/settings/defaultAutoLockTimes"
+
+type Settings = Pick<
+  ISettingsStorage,
+  | "privacyAutomaticErrorReporting"
+  | "privacyShareAnalyticsData"
+  | "autoLockTimeMinutes"
+>
+
+interface SecurityAndPrivacySettingsScreenProps {
+  onBack: ReactEventHandler
+  returnTo: string
+  settings: Settings
+  onChangeSetting: <T extends keyof Settings>(
+    key: T,
+    value: ISettingsStorage[T],
+  ) => void
+}
+
+export const SecurityAndPrivacySettingsScreen: FC<
+  SecurityAndPrivacySettingsScreenProps
+> = ({ onBack, returnTo, settings, onChangeSetting }) => {
+  const {
+    privacyAutomaticErrorReporting,
+    privacyShareAnalyticsData,
+    autoLockTimeMinutes,
+  } = settings
+  return (
+    <NavigationContainer
+      leftButton={<BarBackButton onClick={onBack} />}
+      title={"Security & Privacy"}
+    >
+      <CellStack>
+        <SettingsMenuItemLink
+          to={routes.settingsAutoLockTimer(returnTo)}
+          title="Auto lock timer"
+          subtitle={getTitleForAutoLockTimeMinutes(autoLockTimeMinutes)}
+        />
+        <SettingsMenuItemLink
+          to={routes.settingsSeed(returnTo)}
+          title="Recovery phrase"
+        />
+        <SpacerCell />
+        <ButtonCell
+          rightIcon={
+            <Switch
+              isChecked={privacyAutomaticErrorReporting}
+              pointerEvents="none"
+            />
+          }
+          extendedDescription="Automatically share crash logs with Argent"
+          onClick={() =>
+            onChangeSetting(
+              "privacyAutomaticErrorReporting",
+              !privacyAutomaticErrorReporting,
+            )
+          }
+        >
+          Automatic Error Reporting
+        </ButtonCell>
+        <ButtonCell
+          rightIcon={
+            <Switch
+              isChecked={privacyShareAnalyticsData}
+              pointerEvents="none"
+            />
+          }
+          extendedDescription="This helps the Argent team to identify issues, prioritise features and build a better product without compromising your privacy"
+          onClick={() =>
+            onChangeSetting(
+              "privacyShareAnalyticsData",
+              !privacyShareAnalyticsData,
+            )
+          }
+        >
+          Share anonymous data
+        </ButtonCell>
+      </CellStack>
+    </NavigationContainer>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/securityAndPrivacy/SecurityAndPrivacySettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/securityAndPrivacy/SecurityAndPrivacySettingsScreenContainer.tsx
new file mode 100644
index 000000000..9cff82669
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/securityAndPrivacy/SecurityAndPrivacySettingsScreenContainer.tsx
@@ -0,0 +1,43 @@
+import { FC } from "react"
+import { settingsStore } from "../../../../shared/settings"
+import { useKeyValueStorage } from "../../../hooks/useStorage"
+import { SecurityAndPrivacySettingsScreen } from "./SecurityAndPrivacySettingsScreen"
+import { useNavigateReturnToOrBack } from "../../../hooks/useNavigateReturnTo"
+import { useCurrentPathnameWithQuery } from "../../../routes"
+
+export const SecurityAndPrivacySettingsScreenContainer: FC = () => {
+  const onBack = useNavigateReturnToOrBack()
+  const returnTo = useCurrentPathnameWithQuery()
+
+  const privacyAutomaticErrorReporting = useKeyValueStorage(
+    settingsStore,
+    "privacyAutomaticErrorReporting",
+  )
+
+  const privacyShareAnalyticsData = useKeyValueStorage(
+    settingsStore,
+    "privacyShareAnalyticsData",
+  )
+
+  const autoLockTimeMinutes = useKeyValueStorage(
+    settingsStore,
+    "autoLockTimeMinutes",
+  )
+
+  const settings = {
+    privacyAutomaticErrorReporting,
+    privacyShareAnalyticsData,
+    autoLockTimeMinutes,
+  }
+
+  const onChangeSetting = settingsStore.set.bind(settingsStore)
+
+  return (
+    <SecurityAndPrivacySettingsScreen
+      onBack={onBack}
+      returnTo={returnTo}
+      settings={settings}
+      onChangeSetting={onChangeSetting}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/securityAndPrivacy/SeedSettingsScreen.tsx b/packages/extension/src/ui/features/settings/securityAndPrivacy/SeedSettingsScreen.tsx
new file mode 100644
index 000000000..ec6393558
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/securityAndPrivacy/SeedSettingsScreen.tsx
@@ -0,0 +1,81 @@
+import {
+  BarBackButton,
+  Button,
+  CellStack,
+  HeaderCell,
+  NavigationContainer,
+} from "@argent/ui"
+import { FC, ReactEventHandler } from "react"
+
+import { PasswordForm, PasswordFormProps } from "../../lock/PasswordForm"
+import { CopySeedPhrase } from "../../recovery/CopySeedPhrase"
+import { useSeedPhrase } from "../../recovery/hooks/useSeedPhrase"
+import { SeedPhrase } from "../../recovery/SeedPhrase"
+import { Divider, Flex, Text } from "@chakra-ui/react"
+import { WarningRecoverySeedphraseBanner } from "../../accountTokens/WarningRecoverySeedphraseBanner"
+
+export interface SeedSettingsScreenProps
+  extends Pick<PasswordFormProps, "verifyPassword"> {
+  onBack: ReactEventHandler
+  passwordIsValid: boolean
+}
+
+export const SeedSettingsScreen: FC<SeedSettingsScreenProps> = ({
+  onBack,
+  passwordIsValid,
+  verifyPassword,
+}) => {
+  return (
+    <NavigationContainer
+      leftButton={<BarBackButton onClick={onBack} />}
+      title={"Recovery phrase"}
+    >
+      {passwordIsValid ? (
+        <CopySeedScreen />
+      ) : (
+        <UnlockCopySeed verifyPassword={verifyPassword} />
+      )}
+    </NavigationContainer>
+  )
+}
+
+function CopySeedScreen() {
+  const seedPhrase = useSeedPhrase()
+  return (
+    <CellStack>
+      <Text fontSize="sm" color="neutrals.300" mb={2}>
+        Write these words down on paper. It is unsafe to save them on your
+        computer.
+      </Text>
+      <Divider mb={2} color="neutrals.800" />
+      <SeedPhrase seedPhrase={seedPhrase} />
+      <CopySeedPhrase seedPhrase={seedPhrase} />
+    </CellStack>
+  )
+}
+
+function UnlockCopySeed({
+  verifyPassword,
+}: Pick<PasswordFormProps, "verifyPassword">) {
+  return (
+    <CellStack flex={1}>
+      <WarningRecoverySeedphraseBanner />
+      <HeaderCell color={"text.primary"}>Enter your password</HeaderCell>
+      <PasswordForm flex={1} verifyPassword={verifyPassword}>
+        {(isDirty) => (
+          <>
+            <Flex flex={1}></Flex>
+            <Button
+              type="submit"
+              disabled={!isDirty}
+              colorScheme="primary"
+              width="full"
+            >
+              Unlock
+            </Button>
+          </>
+        )}
+      </PasswordForm>
+    </CellStack>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/securityAndPrivacy/SeedSettingsScreenContainer.tsx b/packages/extension/src/ui/features/settings/securityAndPrivacy/SeedSettingsScreenContainer.tsx
new file mode 100644
index 000000000..5cca6025d
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/securityAndPrivacy/SeedSettingsScreenContainer.tsx
@@ -0,0 +1,21 @@
+import { FC, useState } from "react"
+import { sessionService } from "../../../services/session"
+import { useNavigateReturnToOrBack } from "../../../hooks/useNavigateReturnTo"
+import { SeedSettingsScreen } from "./SeedSettingsScreen"
+
+export const SeedSettingsScreenContainer: FC = () => {
+  const [passwordIsValid, setPasswordIsValid] = useState(false)
+  const onBack = useNavigateReturnToOrBack()
+  const verifyPassword = async (password: string) => {
+    const isValid = await sessionService.checkPassword(password)
+    setPasswordIsValid(isValid)
+    return isValid
+  }
+  return (
+    <SeedSettingsScreen
+      onBack={onBack}
+      passwordIsValid={passwordIsValid}
+      verifyPassword={verifyPassword}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/ui/DappConnectionMenuItem.tsx b/packages/extension/src/ui/features/settings/ui/DappConnectionMenuItem.tsx
new file mode 100644
index 000000000..8cb2b5358
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/ui/DappConnectionMenuItem.tsx
@@ -0,0 +1,37 @@
+import { FC } from "react"
+import { DappIcon } from "../../actions/connectDapp/DappIcon"
+import { useDappDisplayAttributes } from "../../actions/connectDapp/useDappDisplayAttributes"
+import {
+  SettingsMenuItemRemove,
+  SettingsMenuItemRemoveProps,
+} from "./SettingsMenuItem"
+
+interface DappConnectionMenuItemProps
+  extends Omit<SettingsMenuItemRemoveProps, "title"> {
+  host: string
+}
+
+export const DappConnectionMenuItem: FC<DappConnectionMenuItemProps> = ({
+  host,
+  ...rest
+}) => {
+  const hostName = new URL(host).hostname
+  const dappDisplayAttributes = useDappDisplayAttributes(host)
+  const title = dappDisplayAttributes.title ?? hostName
+  const subtitle = dappDisplayAttributes.title ? hostName : undefined
+  return (
+    <SettingsMenuItemRemove
+      leftIcon={
+        <DappIcon
+          dappDisplayAttributes={dappDisplayAttributes}
+          rounded="xl"
+          w={10}
+          h={10}
+        />
+      }
+      title={title}
+      subtitle={subtitle}
+      {...rest}
+    />
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/DapplandFooter.tsx b/packages/extension/src/ui/features/settings/ui/DapplandFooter.tsx
similarity index 93%
rename from packages/extension/src/ui/features/settings/DapplandFooter.tsx
rename to packages/extension/src/ui/features/settings/ui/DapplandFooter.tsx
index f05ab6686..b0321edbd 100644
--- a/packages/extension/src/ui/features/settings/DapplandFooter.tsx
+++ b/packages/extension/src/ui/features/settings/ui/DapplandFooter.tsx
@@ -2,7 +2,7 @@ import { Button, P3 } from "@argent/ui"
 import { SimpleGrid, VStack } from "@chakra-ui/react"
 import { FC } from "react"
 
-import { DapplandIcon } from "./assets/DapplandIcon"
+import { DapplandIcon } from "./DapplandIcon"
 
 const DapplandFooter: FC = () => (
   <VStack mt={4} borderTop="solid 1px" borderTopColor="border">
diff --git a/packages/extension/src/ui/features/settings/assets/DapplandIcon.tsx b/packages/extension/src/ui/features/settings/ui/DapplandIcon.tsx
similarity index 100%
rename from packages/extension/src/ui/features/settings/assets/DapplandIcon.tsx
rename to packages/extension/src/ui/features/settings/ui/DapplandIcon.tsx
diff --git a/packages/extension/src/ui/features/settings/ui/SettingsMenuItem.tsx b/packages/extension/src/ui/features/settings/ui/SettingsMenuItem.tsx
new file mode 100644
index 000000000..243d8f715
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/ui/SettingsMenuItem.tsx
@@ -0,0 +1,89 @@
+import { ButtonCell, P4, icons } from "@argent/ui"
+import { Box, Button, ButtonProps, Flex, Text } from "@chakra-ui/react"
+import { FC, PropsWithChildren, ReactEventHandler } from "react"
+import { Link, LinkProps } from "react-router-dom"
+
+const { ChevronRightIcon, MinusIcon } = icons
+
+export interface SettingsMenuItemProps extends ButtonProps {
+  title: string
+  subtitle?: string
+}
+
+export const SettingsMenuItem: FC<SettingsMenuItemProps> = ({
+  rightIcon = <ChevronRightIcon />,
+  title,
+  subtitle,
+  ...rest
+}) => (
+  <ButtonCell rightIcon={rightIcon} width="full" {...rest}>
+    <Flex w={"full"} direction={"column"} gap={0.5}>
+      <Text overflow={"hidden"} textOverflow={"ellipsis"}>
+        {title}
+      </Text>
+      {subtitle && <P4 color="text.secondary">{subtitle}</P4>}
+    </Flex>
+  </ButtonCell>
+)
+
+export const SettingsMenuItemLink: FC<SettingsMenuItemProps & LinkProps> = (
+  props,
+) => {
+  return <SettingsMenuItem as={Link} {...props} />
+}
+
+export interface SettingsMenuItemRemoveProps extends SettingsMenuItemProps {
+  onRemoveClick: ReactEventHandler
+}
+
+export const SettingsMenuItemRemove: FC<SettingsMenuItemRemoveProps> = ({
+  onRemoveClick,
+  ...rest
+}) => (
+  <SettingsMenuItem
+    as={Box}
+    py={3}
+    rightIcon={
+      <Button
+        rounded={"full"}
+        size={"auto"}
+        p={1.5}
+        bg={"neutrals.900"}
+        _hover={{ bg: "neutrals.600" }}
+        pointerEvents={"auto"}
+        onClick={(e) => {
+          e.stopPropagation()
+          onRemoveClick(e)
+        }}
+      >
+        <MinusIcon fontSize={"base"} />
+      </Button>
+    }
+    pointerEvents={"none"}
+    _hover={{}}
+    _active={{}}
+    {...rest}
+  />
+)
+
+export const SettingsMenuItemGroup: FC<PropsWithChildren> = ({ children }) => {
+  return (
+    <Flex
+      w={"full"}
+      direction={"column"}
+      gap={"1px"}
+      sx={{
+        "> .chakra-button": {
+          _notFirst: {
+            roundedTop: "none",
+          },
+          _notLast: {
+            roundedBottom: "none",
+          },
+        },
+      }}
+    >
+      {children}
+    </Flex>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/ui/SettingsMenuItemLogo.tsx b/packages/extension/src/ui/features/settings/ui/SettingsMenuItemLogo.tsx
new file mode 100644
index 000000000..2f22db099
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/ui/SettingsMenuItemLogo.tsx
@@ -0,0 +1,19 @@
+import { logos } from "@argent/ui"
+import { Center, CenterProps } from "@chakra-ui/react"
+import { FC } from "react"
+
+interface SettingsRadioIconProps extends CenterProps {
+  logo: keyof typeof logos
+}
+
+export const SettingsMenuItemLogo: FC<SettingsRadioIconProps> = ({
+  logo,
+  ...rest
+}) => {
+  const LogoComponent = logos[logo]
+  return (
+    <Center rounded="xl" bg="black" w={10} h={10} {...rest}>
+      <LogoComponent fontSize="3xl" bg="black" />
+    </Center>
+  )
+}
diff --git a/packages/extension/src/ui/features/settings/DappConnection.tsx b/packages/extension/src/ui/features/settings/ui/SettingsNetworkListItem.tsx
similarity index 89%
rename from packages/extension/src/ui/features/settings/DappConnection.tsx
rename to packages/extension/src/ui/features/settings/ui/SettingsNetworkListItem.tsx
index 8e4d59a6c..e51483bf2 100644
--- a/packages/extension/src/ui/features/settings/DappConnection.tsx
+++ b/packages/extension/src/ui/features/settings/ui/SettingsNetworkListItem.tsx
@@ -3,14 +3,14 @@ import { FC } from "react"
 
 const { MinusIcon } = icons
 
-interface DappConnectionProps {
+interface SettingsNetworkListItemProps {
   host: string
   hideRemove?: boolean
   onClick?: () => void
   onRemoveClick?: () => void
 }
 
-export const DappConnection: FC<DappConnectionProps> = ({
+export const SettingsNetworkListItem: FC<SettingsNetworkListItemProps> = ({
   host,
   hideRemove = false,
   onClick,
diff --git a/packages/extension/src/ui/features/settings/ui/SettingsRadioIcon.tsx b/packages/extension/src/ui/features/settings/ui/SettingsRadioIcon.tsx
new file mode 100644
index 000000000..03932cb3d
--- /dev/null
+++ b/packages/extension/src/ui/features/settings/ui/SettingsRadioIcon.tsx
@@ -0,0 +1,19 @@
+import { icons } from "@argent/ui"
+import { ComponentProps, FC } from "react"
+
+const { CheckboxActiveIcon, CheckboxDefaultIcon } = icons
+
+interface SettingsRadioIconProps
+  extends ComponentProps<typeof CheckboxDefaultIcon> {
+  checked: boolean
+}
+
+export const SettingsRadioIcon: FC<SettingsRadioIconProps> = ({
+  checked,
+  ...rest
+}) => {
+  if (checked) {
+    return <CheckboxActiveIcon fontSize="3xl" color="primary.500" {...rest} />
+  }
+  return <CheckboxDefaultIcon fontSize="3xl" color="text.secondary" {...rest} />
+}
diff --git a/packages/extension/src/ui/features/settings/SupportFooter.tsx b/packages/extension/src/ui/features/settings/ui/SupportFooter.tsx
similarity index 98%
rename from packages/extension/src/ui/features/settings/SupportFooter.tsx
rename to packages/extension/src/ui/features/settings/ui/SupportFooter.tsx
index fde87eeea..89a3b7585 100644
--- a/packages/extension/src/ui/features/settings/SupportFooter.tsx
+++ b/packages/extension/src/ui/features/settings/ui/SupportFooter.tsx
@@ -3,7 +3,7 @@ import { SimpleGrid, VStack, StackProps } from "@chakra-ui/react"
 import { FC } from "react"
 import { Link } from "react-router-dom"
 
-import { routes } from "../../routes"
+import { routes } from "../../../routes"
 
 const { SupportIcon } = icons
 const { DiscordLogo, GithubLogo, TwitterLogo } = logos
diff --git a/packages/extension/src/ui/features/shield/ShieldAccountOTPScreen.tsx b/packages/extension/src/ui/features/shield/ShieldAccountOTPScreen.tsx
index 4354bc6f3..13dde1a5e 100644
--- a/packages/extension/src/ui/features/shield/ShieldAccountOTPScreen.tsx
+++ b/packages/extension/src/ui/features/shield/ShieldAccountOTPScreen.tsx
@@ -44,7 +44,7 @@ export const ShieldAccountOTPScreen: FC = () => {
           replace: true,
         })
       case "emailPreferences":
-        return navigate(routes.argentAccountEmailPreferences(), {
+        return navigate(routes.settingsEmailNotifications(), {
           replace: true,
         })
     }
diff --git a/packages/extension/src/ui/features/shield/ShieldBaseOTPScreen.tsx b/packages/extension/src/ui/features/shield/ShieldBaseOTPScreen.tsx
index 44e0847d9..83e4ce0c1 100644
--- a/packages/extension/src/ui/features/shield/ShieldBaseOTPScreen.tsx
+++ b/packages/extension/src/ui/features/shield/ShieldBaseOTPScreen.tsx
@@ -28,7 +28,7 @@ import { coerceErrorToString } from "../../../shared/utils/error"
 import { ControlledPinInput } from "../../components/ControlledPinInput"
 import { useRouteFlow } from "../../routes"
 import { argentAccountService } from "../../services/argentAccount"
-import { useYupValidationResolver } from "../settings/useYupValidationResolver"
+import { useYupValidationResolver } from "./useYupValidationResolver"
 import { ShieldValidationErrorScreen } from "./ShieldValidationErrorScreen"
 import { useShieldVerifiedEmail } from "./useShieldVerifiedEmail"
 
diff --git a/packages/extension/src/ui/features/shield/escape/useAccountEscape.ts b/packages/extension/src/ui/features/shield/escape/useAccountEscape.ts
index 42fc85503..953d8ac99 100644
--- a/packages/extension/src/ui/features/shield/escape/useAccountEscape.ts
+++ b/packages/extension/src/ui/features/shield/escape/useAccountEscape.ts
@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom"
 import useSWR from "swr"
 
 import { Escape } from "../../../../shared/account/details/escape.model"
-import { useArrayStorage } from "../../../../shared/storage/hooks"
+import { useArrayStorage } from "../../../hooks/useStorage"
 import { isNumeric } from "../../../../shared/utils/number"
 import {
   BaseWalletAccount,
diff --git a/packages/extension/src/ui/features/shield/useAccountGuardian.ts b/packages/extension/src/ui/features/shield/useAccountGuardian.ts
index 6d197f7ef..11dabf207 100644
--- a/packages/extension/src/ui/features/shield/useAccountGuardian.ts
+++ b/packages/extension/src/ui/features/shield/useAccountGuardian.ts
@@ -4,11 +4,11 @@ import useSWR from "swr"
 import { withGuardianSelector } from "../../../shared/account/selectors"
 import { WalletAccount } from "../../../shared/wallet.model"
 import { getAccountIdentifier } from "../../../shared/wallet.service"
-import { isEqualAddress } from "../../services/addresses"
 import { withPolling } from "../../services/swr.service"
 import { allAccountsView } from "../../views/account"
 import { useView } from "../../views/implementation/react"
 import { accountMessagingService } from "../../services/accountMessaging"
+import { isEqualAddress } from "@argent/shared"
 
 export const useAccountsWithGuardian = () => {
   const allAccounts = useView(allAccountsView)
diff --git a/packages/extension/src/ui/features/settings/useYupValidationResolver.ts b/packages/extension/src/ui/features/shield/useYupValidationResolver.ts
similarity index 100%
rename from packages/extension/src/ui/features/settings/useYupValidationResolver.ts
rename to packages/extension/src/ui/features/shield/useYupValidationResolver.ts
diff --git a/packages/extension/src/ui/features/statusMessage/useStatusMessage.ts b/packages/extension/src/ui/features/statusMessage/useStatusMessage.ts
index ca1b1ef52..f5a3c6736 100644
--- a/packages/extension/src/ui/features/statusMessage/useStatusMessage.ts
+++ b/packages/extension/src/ui/features/statusMessage/useStatusMessage.ts
@@ -6,7 +6,7 @@ import {
 } from "../../../shared/api/constants"
 import { statusMessageStore } from "../../../shared/statusMessage/storage"
 import { IStatusMessage } from "../../../shared/statusMessage/types"
-import { useKeyValueStorage } from "../../../shared/storage/hooks"
+import { useKeyValueStorage } from "../../hooks/useStorage"
 import { argentApiFetcher } from "../../services/argentApiFetcher"
 import {
   useConditionallyEnabledSWR,
diff --git a/packages/extension/src/ui/features/swap/Swap.test.tsx b/packages/extension/src/ui/features/swap/Swap.test.tsx
new file mode 100644
index 000000000..b4147b7f4
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/Swap.test.tsx
@@ -0,0 +1,303 @@
+import { fireEvent, render, screen, act } from "@testing-library/react"
+import { Swap, spin } from "./Swap"
+import * as useSwapInfoModule from "./hooks/useSwapInfo"
+import * as useSwapStateModule from "./state/fields"
+import * as useSwapActionHandlersModule from "./hooks/useSwapActionHandler"
+import * as useSwapCallbackModule from "./hooks/useSwapCallback"
+import * as analyticsModule from "../../services/analytics"
+import * as useAppStateModule from "../../app.state"
+import * as useUserStateModule from "./state/user"
+import {
+  getMockToken,
+  getMockTokenWithOptionalBigIntBalance,
+} from "../../../../test/token.mock"
+import { getMockTrade } from "../../../../test/trade.mock"
+
+// Mocking modules
+vi.mock("./hooks/useSwapInfo")
+vi.mock("./state/fields")
+vi.mock("./hooks/useSwapActionHandler")
+vi.mock("./hooks/useSwapCallback")
+vi.mock("../../services/analytics")
+vi.mock("../../app.state")
+vi.mock("./state/user")
+
+const mockPayToken = getMockToken({ symbol: "PAY" })
+const mockReceiveToken = getMockToken({ symbol: "RECEIVE" })
+
+const mockPayTokenBalance = getMockTokenWithOptionalBigIntBalance({
+  symbol: "PAY",
+  balance: BigInt(200),
+})
+
+const mockReceiveTokenBalance = getMockTokenWithOptionalBigIntBalance({
+  symbol: "RECEIVE",
+  balance: BigInt(100),
+})
+
+describe("Swap Component Tests", () => {
+  // Setup function to initialize the component with default or provided props
+  const setup = (
+    swapInfoOverrides = {},
+    swapState = {},
+    actionHandlers = {},
+    userState = {},
+    appState = {},
+    swapCallback = vi.fn(),
+  ) => {
+    const swapInfo: useSwapInfoModule.SwapInfo = {
+      tokens: {
+        PAY: mockPayToken,
+        RECEIVE: mockReceiveToken,
+      },
+      tokenBalances: {
+        PAY: mockPayTokenBalance,
+        RECEIVE: mockReceiveTokenBalance,
+      },
+      parsedAmount: 100n,
+      trade: getMockTrade({
+        payAmount: "100",
+        receiveAmount: "200",
+      }),
+      inputError: undefined,
+      tradeLoading: false,
+    }
+
+    const defaultUserState: useUserStateModule.UserState = {
+      ...userState,
+      updateUserSlippageTolerance: vi.fn(),
+      userSlippageTolerance: 10,
+    }
+
+    const defaultSwapState = {
+      ...useSwapStateModule.initialState,
+      ...swapState,
+    }
+
+    const defaultAppState = {
+      switcherNetworkId: "mainnet-alpha",
+      ...appState,
+    }
+
+    const defaultActionHandlers = {
+      onUserInput: vi.fn(),
+      onTokenSelection: vi.fn(),
+      onSwitchTokens: vi.fn(),
+      ...actionHandlers,
+    }
+
+    const defaultSwapInfo = { ...swapInfo, ...swapInfoOverrides }
+    vi.spyOn(useSwapInfoModule, "useSwapInfo").mockReturnValue(defaultSwapInfo)
+    vi.spyOn(useSwapStateModule, "useSwapState").mockReturnValue(
+      defaultSwapState,
+    )
+    vi.spyOn(
+      useSwapActionHandlersModule,
+      "useSwapActionHandlers",
+    ).mockReturnValue(defaultActionHandlers)
+    vi.spyOn(useUserStateModule, "useUserState").mockReturnValue(
+      defaultUserState,
+    )
+    vi.spyOn(useAppStateModule, "useAppState").mockReturnValue(defaultAppState)
+    vi.spyOn(useSwapCallbackModule, "useSwapCallback").mockReturnValue(
+      swapCallback,
+    )
+    return render(<Swap />)
+  }
+
+  beforeEach(() => {
+    // Reset all mocks before each test
+    vi.resetAllMocks()
+  })
+
+  it("renders without crashing", async () => {
+    await act(async () => {
+      return setup()
+    })
+    expect(screen.getByTestId("swap-container")).toBeInTheDocument()
+  })
+
+  it("handles switch direction button click", async () => {
+    const onSwitchTokensMock = vi.fn()
+    await act(async () => {
+      return setup({}, {}, { onSwitchTokens: onSwitchTokensMock })
+    })
+
+    fireEvent.click(screen.getByLabelText("Switch input and output"))
+    expect(onSwitchTokensMock).toHaveBeenCalled()
+  })
+
+  it("handles input selection", async () => {
+    const onTokenSelectionMock = vi.fn()
+    const onUserInputMock = vi.fn()
+    await act(async () => {
+      return setup(
+        {},
+        {},
+        {
+          onTokenSelection: onTokenSelectionMock,
+          onUserInput: onUserInputMock,
+        },
+      )
+    })
+
+    fireEvent.change(screen.getByTestId("swap-input-pay-panel"), {
+      target: { value: "100" },
+    })
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 500))
+    })
+    expect(onUserInputMock).toHaveBeenCalledWith("PAY", "100")
+  })
+
+  it("handles max input", async () => {
+    const onUserInputMock = vi.fn()
+    await act(async () => {
+      return setup({}, {}, { onUserInput: onUserInputMock })
+    })
+
+    fireEvent.click(screen.getByText("Max"))
+    expect(onUserInputMock).toHaveBeenCalled()
+  })
+
+  it("disables swap button when there is an input error", async () => {
+    await act(async () => {
+      return setup({
+        inputError: useSwapInfoModule.SwapInputError.NO_AMOUNT,
+      })
+    })
+    expect(screen.getByText("Enter amount")).toBeDisabled()
+  })
+
+  it("initiates swap on swap button click", async () => {
+    const swapCallbackMock = vi.fn().mockResolvedValue({})
+    const onUserInputMock = vi.fn()
+    await act(async () => {
+      return setup(
+        {
+          trade: getMockTrade({
+            payAmount: "100",
+            receiveAmount: "200",
+          }),
+        },
+        {},
+        { onUserInput: onUserInputMock },
+        {},
+        {},
+        swapCallbackMock,
+      )
+    })
+
+    fireEvent.click(screen.getByText("Review swap"))
+    await act(async () => {
+      await swapCallbackMock()
+    })
+    expect(swapCallbackMock).toHaveBeenCalled()
+  })
+
+  // Test for checking if the trade loading indicator is shown when trade is loading
+  it("shows loading indicator when trade is loading", async () => {
+    await act(async () => {
+      return setup({ tradeLoading: true, trade: undefined })
+    })
+    expect(screen.getByTestId("swap-trade-loading")).toBeInTheDocument()
+  })
+
+  // Test for checking if the trade prices info is shown when trade is present
+  it("shows trade prices info when trade is present", async () => {
+    await act(async () => {
+      return setup({
+        trade: getMockTrade({
+          payAmount: "100",
+          receiveAmount: "200",
+        }),
+      })
+    })
+    expect(screen.getByTestId("swap-prices-info")).toBeInTheDocument()
+  })
+
+  // Test for checking if the warning message is shown when there is an error
+  it("shows warning message when there is an error", async () => {
+    await act(async () => {
+      return setup({
+        inputError: useSwapInfoModule.SwapInputError.NO_ACCOUNT,
+      })
+    })
+    expect(screen.getByTestId("swap-error-button")).toBeInTheDocument()
+  })
+
+  // Test for checking if the switch direction button triggers the rotation animation
+  it("triggers rotation animation on switch direction button click", async () => {
+    await act(async () => {
+      return setup(
+        {},
+        {
+          switchTokens: vi.fn(),
+        },
+      )
+    })
+    const switchDirectionButton = screen.getByLabelText(
+      "Switch input and output",
+    )
+    fireEvent.click(switchDirectionButton)
+    expect(switchDirectionButton).toHaveStyle(
+      `animation: ${spin.name} 0.125s linear`,
+    )
+  })
+
+  // Test for checking if the switch direction button resets rotation after animation
+  it("resets rotation after switch direction button animation", async () => {
+    vi.useFakeTimers()
+    await act(async () => {
+      return setup(
+        {},
+        {
+          switchTokens: vi.fn(),
+        },
+      )
+    })
+    const switchDirectionButton = screen.getByLabelText(
+      "Switch input and output",
+    )
+    fireEvent.click(switchDirectionButton)
+    act(() => {
+      vi.runAllTimers()
+    })
+    expect(switchDirectionButton).not.toHaveStyle(
+      `animation: ${spin.name} 0.125s linear`,
+    )
+    vi.useRealTimers()
+  })
+
+  // Test for checking if the analytics track event is called with the correct parameters on swap
+  it("calls analytics track event with correct parameters on swap", async () => {
+    const swapCallbackMock = vi.fn().mockResolvedValue({})
+    const analyticsTrackMock = vi.spyOn(analyticsModule.analytics, "track")
+    await act(async () => {
+      return setup(
+        {
+          trade: getMockTrade({
+            payAmount: "100",
+            receiveAmount: "200",
+          }),
+        },
+        {
+          typedValue: "100",
+        },
+        {},
+        {},
+        {},
+        swapCallbackMock,
+      )
+    })
+
+    fireEvent.click(screen.getByText("Review swap"))
+    await act(async () => {
+      await swapCallbackMock()
+    })
+    expect(analyticsTrackMock).toHaveBeenCalledWith("swapInitiated", {
+      networkId: expect.any(String),
+      pair: expect.any(String),
+    })
+  })
+})
diff --git a/packages/extension/src/ui/features/swap/Swap.tsx b/packages/extension/src/ui/features/swap/Swap.tsx
index 1ce52562c..5445a6a30 100644
--- a/packages/extension/src/ui/features/swap/Swap.tsx
+++ b/packages/extension/src/ui/features/swap/Swap.tsx
@@ -1,31 +1,21 @@
-import { Button, CellStack, L2, icons } from "@argent/ui"
-import {
-  ALLOWED_PRICE_IMPACT_HIGH,
-  Currency,
-  CurrencyAmount,
-  Field,
-  JSBI,
-  SupportedNetworks,
-  USDC,
-  computeTradePriceBreakdown,
-  maxAmountSpend,
-  useDerivedSwapInfo,
-  useSwapActionHandlers,
-  useSwapCallback,
-  useSwapState,
-  useUserState,
-} from "@argent/x-swap"
-import { Box, Flex, IconButton, chakra, useDisclosure } from "@chakra-ui/react"
-import { keyframes } from "@chakra-ui/react"
-import { useCallback, useEffect, useMemo, useState } from "react"
-
-import { analytics } from "../../../background/analytics"
-import { useCurrentNetwork } from "../networks/hooks/useCurrentNetwork"
-import { HighPriceImpactModal } from "./ui/HighPriceImpactModal"
+import { Button, CellStack, icons } from "@argent/ui"
+import { Box, Flex, IconButton, chakra, keyframes } from "@chakra-ui/react"
+import { useCallback, useMemo, useState } from "react"
+
 import { SwapInputPanel } from "./ui/SwapInputPanel"
 import { SwapPricesInfo } from "./ui/SwapPricesInfo"
-import { SwapWarning } from "./ui/SwapWarning"
-import { tokenService } from "../../services/tokens"
+import { SwapInputError, useSwapInfo } from "./hooks/useSwapInfo"
+import { bigDecimal } from "@argent/shared"
+import { Field, useSwapState } from "./state/fields"
+import { useSwapActionHandlers } from "./hooks/useSwapActionHandler"
+import { Token } from "../../../shared/token/__new/types/token.model"
+import { maxAmountSpendFromTokenBalance } from "./utils"
+import { SwapTradeLoading } from "./ui/SwapTradeLoading"
+import { useSwapCallback } from "./hooks/useSwapCallback"
+import { analytics } from "../../services/analytics"
+import { useAppState } from "../../app.state"
+import { useUserState } from "./state/user"
+import { SwapQuoteRefresh } from "./ui/SwapQuoteRefresh"
 
 const { SwitchDirectionIcon } = icons
 
@@ -36,6 +26,7 @@ const SwapContainer = chakra(CellStack, {
     justifyContent: "center",
     alignItems: "center",
     flex: 1,
+    py: "8px",
   },
 })
 
@@ -67,157 +58,152 @@ const StyledSwitchDirectionIcon = chakra(SwitchDirectionIcon, {
   },
 })
 
-const spin = keyframes`
+export const spin = keyframes`
   from { transform: translate(-50%, -50%) rotate(0deg); }
   to { transform: translate(-50%, -50%) rotate(180deg); }
 `
 
 const Swap = () => {
   const {
-    currencies,
+    tokens,
+    tokenBalances,
     trade,
+    tradeLoading,
     parsedAmount,
-    currencyBalances,
     inputError: swapInputError,
-    tradeLoading,
-  } = useDerivedSwapInfo()
-  const { id: networkId } = useCurrentNetwork()
-  const { independentField, typedValue, switchCurrencies } = useSwapState()
-  const { onCurrencySelection, onUserInput } = useSwapActionHandlers()
-  const [rotate, setRotate] = useState(false)
+  } = useSwapInfo()
+  const { independentField, typedValue } = useSwapState()
+  const { onTokenSelection, onUserInput, onSwitchTokens } =
+    useSwapActionHandlers()
   const { userSlippageTolerance } = useUserState()
+  const { switcherNetworkId: networkId } = useAppState()
 
-  const {
-    isOpen: isPISopen,
-    onOpen: onPISopen,
-    onClose: onPISclose,
-  } = useDisclosure()
-
-  const parsedAmounts = {
-    [Field.INPUT]:
-      independentField === Field.INPUT ? parsedAmount : trade?.inputAmount,
-    [Field.OUTPUT]:
-      independentField === Field.OUTPUT ? parsedAmount : trade?.outputAmount,
-  }
+  const [rotate, setRotate] = useState(false)
+  const [swapUnavailable, setSwapUnavailable] = useState<boolean>(false)
+
+  const payToken = tokens[Field.PAY]
+  const receiveToken = tokens[Field.RECEIVE]
+
+  const parsedAmounts = useMemo(
+    () => ({
+      [Field.PAY]:
+        independentField === Field.PAY
+          ? parsedAmount
+          : BigInt(trade?.payAmount ?? 0),
+      [Field.RECEIVE]:
+        independentField === Field.RECEIVE
+          ? parsedAmount
+          : BigInt(trade?.receiveAmount ?? 0),
+    }),
+    [independentField, parsedAmount, trade],
+  )
 
   const handleTypeInput = useCallback(
     (value: string) => {
-      onUserInput(Field.INPUT, value)
+      onUserInput(Field.PAY, value)
     },
     [onUserInput],
   )
   const handleTypeOutput = useCallback(
     (value: string) => {
-      onUserInput(Field.OUTPUT, value)
+      onUserInput(Field.RECEIVE, value)
     },
     [onUserInput],
   )
 
   const dependentField: Field =
-    independentField === Field.INPUT ? Field.OUTPUT : Field.INPUT
+    independentField === Field.PAY ? Field.RECEIVE : Field.PAY
+
+  const formattedAmounts = useMemo(
+    () => ({
+      [independentField]: typedValue,
+      [dependentField]: bigDecimal.formatUnits({
+        value: parsedAmounts[dependentField] ?? 0n,
+        decimals: tokens[dependentField]?.decimals ?? 18,
+      }),
+    }),
+    [dependentField, independentField, parsedAmounts, typedValue, tokens],
+  )
 
-  const formattedAmounts = {
-    [independentField]: typedValue,
-    [dependentField]: parsedAmounts[dependentField]?.toSignificant(6) ?? "",
-  }
+  const payTokenBalance = tokenBalances[Field.PAY]
+  const payAmount = parsedAmounts[Field.PAY]
 
-  const maxAmountInput: CurrencyAmount | undefined = maxAmountSpend(
-    currencyBalances[Field.INPUT],
-  )
+  const maxAmountInput = maxAmountSpendFromTokenBalance(payTokenBalance)
+
+  const hasZeroBalance = !payTokenBalance || payTokenBalance.balance === 0n
 
   const atMaxAmountInput = Boolean(
-    maxAmountInput && parsedAmounts[Field.INPUT]?.equalTo(maxAmountInput),
+    maxAmountInput && payAmount && payAmount === maxAmountInput,
   )
 
   const handleInputSelect = useCallback(
-    (inputCurrency: Currency) => {
-      onCurrencySelection(Field.INPUT, inputCurrency)
+    (payToken: Token) => {
+      onTokenSelection(Field.PAY, payToken)
       handleTypeInput("")
     },
-    [handleTypeInput, onCurrencySelection],
+    [handleTypeInput, onTokenSelection],
   )
 
   const handleMaxInput = useCallback(() => {
-    maxAmountInput && onUserInput(Field.INPUT, maxAmountInput.toExact())
-  }, [maxAmountInput, onUserInput])
+    maxAmountInput &&
+      payToken?.decimals &&
+      onUserInput(
+        Field.PAY,
+        bigDecimal.formatUnits({
+          value: maxAmountInput,
+          decimals: payToken.decimals,
+        }),
+      )
+  }, [maxAmountInput, onUserInput, payToken?.decimals])
 
   const handleOutputSelect = useCallback(
-    (outputCurrency: Currency) =>
-      onCurrencySelection(Field.OUTPUT, outputCurrency),
-    [onCurrencySelection],
+    (receiveToken: Token) => onTokenSelection(Field.RECEIVE, receiveToken),
+    [onTokenSelection],
   )
 
   const noRoute = !trade?.route
 
+  const independentFieldAmount = parsedAmounts[independentField]
+
   const userHasSpecifiedInputOutput = Boolean(
-    currencies[Field.INPUT] &&
-      currencies[Field.OUTPUT] &&
-      parsedAmounts[independentField]?.greaterThan(JSBI.BigInt(0)),
+    payToken &&
+      receiveToken &&
+      independentFieldAmount &&
+      independentFieldAmount > 0n,
   )
 
   const insufficientLiquidityError =
     !tradeLoading && userHasSpecifiedInputOutput && noRoute
 
-  const isValid = !swapInputError && !insufficientLiquidityError
+  const isValid =
+    !swapInputError && !insufficientLiquidityError && !swapUnavailable
 
-  const { callback: swapCallback, error: swapCallbackError } = useSwapCallback(
-    trade,
-    userSlippageTolerance,
-  )
-
-  const handleSwap = useCallback(async () => {
-    if (swapCallbackError) {
-      console.error(swapCallbackError)
-      return
-    }
+  const swapCallback = useSwapCallback(trade, userSlippageTolerance)
 
+  const handleSwap = useCallback(() => {
     if (swapCallback) {
-      const swapCalls = swapCallback()
       void analytics.track("swapInitiated", {
         networkId,
-        pair:
-          trade?.inputAmount.currency.symbol +
-          "-" +
-          trade?.outputAmount.currency.symbol,
+        pair: payToken?.symbol + "-" + receiveToken?.symbol,
       })
-      await tokenService.swap(
-        swapCalls,
-        `Swap ${trade?.inputAmount.currency.symbol} to ${trade?.outputAmount.currency.symbol}`,
-      )
-
-      onUserInput(Field.INPUT, "")
+      return swapCallback()
+        .then(() => {
+          onUserInput(Field.PAY, "")
+        })
+        .catch(() => {
+          setSwapUnavailable(true)
+        })
     }
-  }, [
-    networkId,
-    onUserInput,
-    swapCallback,
-    swapCallbackError,
-    trade?.inputAmount.currency.symbol,
-    trade?.outputAmount.currency.symbol,
-  ])
-
-  useEffect(() => {
-    onCurrencySelection(
-      Field.OUTPUT,
-      networkId === SupportedNetworks.MAINNET
-        ? USDC[SupportedNetworks.MAINNET]
-        : USDC[SupportedNetworks.TESTNET],
-    )
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [networkId])
-
-  const { priceImpactWithoutFee: priceImpact } = useMemo(
-    () => computeTradePriceBreakdown(trade),
-    [trade],
-  )
+  }, [swapCallback, onUserInput, payToken, receiveToken, networkId])
 
-  const isPriceImpactHigh = useMemo(() => {
-    return priceImpact && !priceImpact.lessThan(ALLOWED_PRICE_IMPACT_HIGH)
-  }, [priceImpact])
+  const showMaxButton = useMemo(
+    () => !atMaxAmountInput && !formattedAmounts[Field.PAY] && !hasZeroBalance,
+    [atMaxAmountInput, formattedAmounts, hasZeroBalance],
+  )
 
   return (
     <>
-      <SwapContainer>
+      <SwapContainer data-testid="swap-container">
         <Flex
           position="relative"
           flexDirection="column"
@@ -227,26 +213,26 @@ const Swap = () => {
           <SwapInputPanel
             type="pay"
             id="swap-input-pay-panel"
-            currency={currencies[Field.INPUT]}
-            value={formattedAmounts[Field.INPUT]}
+            token={payToken}
+            value={formattedAmounts[Field.PAY]}
             onUserInput={handleTypeInput}
-            onCurrencySelect={handleInputSelect}
-            showMaxButton={!atMaxAmountInput && !formattedAmounts[Field.INPUT]}
+            onTokenSelect={handleInputSelect}
+            showMaxButton={showMaxButton}
             onMax={handleMaxInput}
-            otherCurrency={currencies[Field.OUTPUT]}
-            currentBalance={currencyBalances[Field.INPUT]}
+            otherToken={receiveToken}
+            currentBalance={payTokenBalance}
             tradeLoading={tradeLoading}
-            insufficientBalance={!isValid && !!formattedAmounts[Field.INPUT]}
+            insufficientBalance={!isValid && !!formattedAmounts[Field.PAY]}
           />
           <SwapInputPanel
             type="receive"
             id="swap-input-receive-panel"
-            currency={currencies[Field.OUTPUT]}
-            value={formattedAmounts[Field.OUTPUT]}
+            token={receiveToken}
+            value={formattedAmounts[Field.RECEIVE]}
             onUserInput={handleTypeOutput}
-            onCurrencySelect={handleOutputSelect}
-            otherCurrency={currencies[Field.INPUT]}
-            currentBalance={currencyBalances[Field.OUTPUT]}
+            onTokenSelect={handleOutputSelect}
+            otherToken={payToken}
+            currentBalance={tokenBalances[Field.RECEIVE]}
             tradeLoading={tradeLoading}
           />
           <SwitchDirectionButton
@@ -256,81 +242,69 @@ const Swap = () => {
             onClick={() => {
               setRotate(true)
               setTimeout(() => setRotate(false), 150)
-              switchCurrencies()
+              onSwitchTokens()
             }}
           />
         </Flex>
 
-        {trade && (
+        {!trade && !swapInputError && tradeLoading && <SwapTradeLoading />}
+
+        {trade && isValid && (
           <SwapPricesInfo
-            currencyIn={currencies[Field.INPUT]}
-            currencyOut={currencies[Field.OUTPUT]}
+            tokenIn={payToken}
+            tokenOut={receiveToken}
             trade={trade}
-            priceImpact={priceImpact}
-            isPriceImpactHigh={isPriceImpactHigh}
           />
         )}
 
-        <L2
-          textAlign="center"
-          mt="4"
-          as={"a"}
-          rounded={"lg"}
-          color={"neutrals.500"}
-          href="https://jediswap.xyz/"
-          title="JediSwap"
-          target="_blank"
-          _hover={{
-            textDecoration: "underline",
-          }}
-        >
-          Powered by JediSwap
-        </L2>
+        {isValid && (
+          <SwapQuoteRefresh
+            trade={trade}
+            tradeLoading={tradeLoading}
+            tradeError={swapInputError}
+          />
+        )}
       </SwapContainer>
       <Flex flex={1} />
       <Box mx="4">
         {isValid ? (
           <Button
-            isLoading={tradeLoading}
             w="100%"
             bg="primary.500"
-            mb="6"
-            disabled={
-              !formattedAmounts[Field.INPUT] || !formattedAmounts[Field.OUTPUT]
+            mb="3"
+            isDisabled={
+              !formattedAmounts[Field.PAY] ||
+              !formattedAmounts[Field.RECEIVE] ||
+              tradeLoading
             }
-            onClick={() => {
-              isPriceImpactHigh ? onPISopen() : handleSwap()
-            }}
+            onClick={handleSwap}
           >
             Review swap
           </Button>
         ) : (
           <Button
-            isLoading={tradeLoading}
             w="100%"
-            bg={swapInputError ? "primary.500" : "error.500"}
-            mb="6"
-            disabled
+            bg={
+              swapInputError === SwapInputError.NO_AMOUNT
+                ? "primary.500"
+                : "error.500"
+            }
+            mb="3"
+            isDisabled
+            data-testid="swap-error-button"
           >
             {swapInputError ? (
               <>{swapInputError}</>
             ) : insufficientLiquidityError ? (
               <>{insufficientLiquidityError}</>
+            ) : swapUnavailable ? (
+              <>Swap currently unavailable</>
             ) : (
               <>Unknown Error</>
             )}
           </Button>
         )}
       </Box>
-      <SwapWarning />
-
-      {isPISopen && (
-        <HighPriceImpactModal
-          isOpen={isPISopen}
-          onClose={onPISclose}
-          onAccept={handleSwap}
-        />
-      )}
     </>
   )
 }
diff --git a/packages/extension/src/ui/features/swap/hooks/useSwapActionHandler.ts b/packages/extension/src/ui/features/swap/hooks/useSwapActionHandler.ts
new file mode 100644
index 000000000..9327d86a5
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/hooks/useSwapActionHandler.ts
@@ -0,0 +1,40 @@
+import { Field, useSwapState } from "../state/fields"
+import { useCallback } from "react"
+import { BaseToken } from "../../../../shared/token/__new/types/token.model"
+
+export function useSwapActionHandlers(): {
+  onTokenSelection: (field: Field, token: BaseToken) => void
+  onSwitchTokens: () => void
+  onUserInput: (field: Field, typedValue: string) => void
+} {
+  const { selectToken, switchTokens, typeInput, resetIndependentField } =
+    useSwapState()
+
+  const onTokenSelection = useCallback(
+    (field: Field, token: BaseToken) => {
+      selectToken({
+        field,
+        tokenAddress: token.address,
+      })
+    },
+    [selectToken],
+  )
+
+  const onSwitchTokens = useCallback(() => {
+    switchTokens()
+    resetIndependentField() // Required to force the backend to recalculate the quote
+  }, [resetIndependentField, switchTokens])
+
+  const onUserInput = useCallback(
+    (field: Field, typedValue: string) => {
+      typeInput({ field, typedValue })
+    },
+    [typeInput],
+  )
+
+  return {
+    onSwitchTokens,
+    onTokenSelection,
+    onUserInput,
+  }
+}
diff --git a/packages/extension/src/ui/features/swap/hooks/useSwapCallback.test.ts b/packages/extension/src/ui/features/swap/hooks/useSwapCallback.test.ts
new file mode 100644
index 000000000..e76bc98f6
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/hooks/useSwapCallback.test.ts
@@ -0,0 +1,134 @@
+import { renderHook, act } from "@testing-library/react"
+import { useSwapCallback } from "./useSwapCallback"
+import * as reactViews from "../../../views/implementation/react"
+import * as swapServices from "../../../services/swap"
+import { addressSchema } from "@argent/shared"
+import { getMockTrade } from "../../../../../test/trade.mock"
+import { sampleOrderResponse } from "../../../../shared/swap/service/order.mock"
+import { stark } from "starknet"
+
+vi.mock("../../../views/implementation/react", () => ({
+  useView: vi.fn(),
+}))
+
+vi.mock("../../../services/swap", () => ({
+  swapService: {
+    getSwapOrderFromTrade: vi.fn(),
+    makeSwap: vi.fn(),
+  },
+}))
+
+describe("useSwapCallback", () => {
+  const mockTrade = getMockTrade()
+  const mockParsedAddress = addressSchema.parse(stark.randomAddress())
+  const mockSelectedAccount = { address: mockParsedAddress }
+  const mockCalls = sampleOrderResponse.calls
+
+  beforeEach(() => {
+    vi.resetAllMocks() // Reset all mocks to their initial state
+
+    vi.mocked(reactViews.useView).mockReturnValue(mockSelectedAccount)
+    vi.mocked(swapServices.swapService.getSwapOrderFromTrade).mockResolvedValue(
+      {
+        calls: mockCalls,
+      },
+    )
+  })
+
+  it("should return a handleSwap function", () => {
+    const { result } = renderHook(() => useSwapCallback(mockTrade, 0.01))
+    expect(typeof result.current).toBe("function")
+  })
+
+  it("should not execute swap if trade, userSlippageTolerance, or selectedAccount is missing", async () => {
+    const { result } = renderHook(() => useSwapCallback(undefined, undefined))
+    await act(async () => {
+      await result.current()
+    })
+    expect(
+      swapServices.swapService.getSwapOrderFromTrade,
+    ).not.toHaveBeenCalled()
+    expect(swapServices.swapService.makeSwap).not.toHaveBeenCalled()
+  })
+
+  it("should execute swap when trade, userSlippageTolerance, and selectedAccount are provided", async () => {
+    const { result } = renderHook(() => useSwapCallback(mockTrade, 0.01))
+    await act(async () => {
+      await result.current()
+    })
+    expect(swapServices.swapService.getSwapOrderFromTrade).toHaveBeenCalledWith(
+      mockParsedAddress,
+      mockTrade,
+      0.01,
+    )
+    expect(swapServices.swapService.makeSwap).toHaveBeenCalledWith(
+      mockCalls,
+      "Swap ETH to DAI",
+    )
+  })
+
+  // Additional tests within the describe('useSwapCallback', () => { ... }) block
+
+  it("should throw an error if getSwapOrderFromTrade fails", async () => {
+    vi.mocked(swapServices.swapService.getSwapOrderFromTrade).mockRejectedValue(
+      new Error("Failed to get swap order"),
+    )
+    const { result } = renderHook(() => useSwapCallback(mockTrade, 0.01))
+    let error: any
+    await act(async () => {
+      try {
+        await result.current()
+      } catch (e) {
+        error = e
+      }
+    })
+    expect(error).toBeDefined()
+    expect(error?.message).toBe("Failed to get swap order")
+    expect(swapServices.swapService.makeSwap).not.toHaveBeenCalled()
+  })
+
+  it("should throw an error if executeTransaction fails", async () => {
+    vi.mocked(swapServices.swapService.makeSwap).mockRejectedValue(
+      new Error("Transaction failed"),
+    )
+    const { result } = renderHook(() => useSwapCallback(mockTrade, 0.01))
+    let error: any
+    await act(async () => {
+      try {
+        await result.current()
+      } catch (e) {
+        error = e
+      }
+    })
+    expect(error).toBeDefined()
+    expect(error.message).toBe("Transaction failed")
+  })
+
+  it("should handle the case when selectedAccount is null", async () => {
+    vi.mocked(reactViews.useView).mockReturnValue(null)
+    const { result } = renderHook(() => useSwapCallback(mockTrade, 0.01))
+    await act(async () => {
+      await result.current()
+    })
+    expect(
+      swapServices.swapService.getSwapOrderFromTrade,
+    ).not.toHaveBeenCalled()
+    expect(swapServices.swapService.makeSwap).not.toHaveBeenCalled()
+  })
+
+  it("should handle the case when userSlippageTolerance is zero", async () => {
+    const { result } = renderHook(() => useSwapCallback(mockTrade, 0))
+    await act(async () => {
+      await result.current()
+    })
+    expect(swapServices.swapService.getSwapOrderFromTrade).toHaveBeenCalledWith(
+      mockParsedAddress,
+      mockTrade,
+      0,
+    )
+    expect(swapServices.swapService.makeSwap).toHaveBeenCalledWith(
+      mockCalls,
+      "Swap ETH to DAI",
+    )
+  })
+})
diff --git a/packages/extension/src/ui/features/swap/hooks/useSwapCallback.ts b/packages/extension/src/ui/features/swap/hooks/useSwapCallback.ts
new file mode 100644
index 000000000..3488bf9ad
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/hooks/useSwapCallback.ts
@@ -0,0 +1,31 @@
+import { selectedBaseAccountView } from "../../../views/account"
+import { useView } from "../../../views/implementation/react"
+import { swapService } from "../../../services/swap"
+import { addressSchema } from "@argent/shared"
+import { Trade } from "../../../../shared/swap/model/trade.model"
+import { isUndefined } from "lodash-es"
+
+export function useSwapCallback(trade?: Trade, userSlippageTolerance?: number) {
+  const selectedAccount = useView(selectedBaseAccountView)
+
+  const handleSwap = async () => {
+    if (!trade || isUndefined(userSlippageTolerance) || !selectedAccount) {
+      return
+    }
+
+    const accountAddress = addressSchema.parse(selectedAccount.address)
+
+    const { calls } = await swapService.getSwapOrderFromTrade(
+      accountAddress,
+      trade,
+      userSlippageTolerance,
+    )
+
+    return swapService.makeSwap(
+      calls,
+      `Swap ${trade.payToken.symbol} to ${trade.receiveToken.symbol}`,
+    )
+  }
+
+  return handleSwap
+}
diff --git a/packages/extension/src/ui/features/swap/hooks/useSwapInfo.ts b/packages/extension/src/ui/features/swap/hooks/useSwapInfo.ts
new file mode 100644
index 000000000..b18cd623b
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/hooks/useSwapInfo.ts
@@ -0,0 +1,128 @@
+import { Token } from "../../../../shared/token/__new/types/token.model"
+import { TokenWithOptionalBigIntBalance } from "../../../../shared/token/__new/types/tokenBalance.model"
+import { selectedAccountView } from "../../../views/account"
+import { useView } from "../../../views/implementation/react"
+import { useTokenOnCurrentNetworkByAddress } from "../../accountTokens/tokens.state"
+import { useTokenBalanceForAccount } from "../../accountTokens/useTokenBalanceForAccount"
+import { Field, useSwapState } from "../state/fields"
+import { bigDecimal } from "@argent/shared"
+import { useSwapQuoteForPay } from "./useSwapQuoteForPay"
+import { useTradeFromSwapQuote } from "./useTradeFromSwapQuote"
+import { Trade } from "../../../../shared/swap/model/trade.model"
+import { useUserState } from "../state/user"
+import { computeSlippageAdjustedAmounts } from "../utils/prices"
+import { isUndefined } from "lodash-es"
+
+export enum SwapInputError {
+  NO_ACCOUNT = "No account selected",
+  NO_AMOUNT = "Enter amount",
+  NO_TOKEN = "Select a Token",
+  INSUFFICIENT_BALANCE = "Insufficient balance",
+  NO_QUOTE = "Quote could not be retrieved",
+}
+export interface SwapInfo {
+  tokens: { [field in Field]?: Token }
+  tokenBalances: { [field in Field]?: TokenWithOptionalBigIntBalance }
+  parsedAmount: bigint | undefined
+  trade: Trade | undefined
+  inputError: SwapInputError | undefined
+  tradeLoading: boolean
+}
+
+export function useSwapInfo(): SwapInfo {
+  const selectedAccount = useView(selectedAccountView)
+
+  const {
+    independentField,
+    typedValue,
+    [Field.PAY]: { tokenAddress: payTokenAddress },
+    [Field.RECEIVE]: { tokenAddress: receiveTokenAddress },
+  } = useSwapState()
+  const { userSlippageTolerance } = useUserState()
+
+  const payToken = useTokenOnCurrentNetworkByAddress(payTokenAddress)
+  const receiveToken = useTokenOnCurrentNetworkByAddress(receiveTokenAddress)
+
+  const payTokenBalance = useTokenBalanceForAccount({
+    token: payToken,
+    account: selectedAccount,
+  })
+
+  const receiveTokenBalance = useTokenBalanceForAccount({
+    token: receiveToken,
+    account: selectedAccount,
+  })
+
+  const isExactIn: boolean = independentField === Field.PAY // This will always be true until we add ability to create a trade from Receive field
+  const tokenDecimals = isExactIn ? payToken?.decimals : receiveToken?.decimals
+
+  const parsedAmount = tokenDecimals
+    ? bigDecimal.parseUnits(typedValue, tokenDecimals).value
+    : undefined
+
+  const { paySwapQuote, paySwapQuoteLoading, paySwapQuoteError } =
+    useSwapQuoteForPay({
+      payToken,
+      receiveToken,
+      payAmount: parsedAmount,
+      account: selectedAccount,
+    })
+
+  const tradeFromPay = useTradeFromSwapQuote(paySwapQuote)
+
+  const tokenBalances = {
+    [Field.PAY]: payTokenBalance,
+    [Field.RECEIVE]: receiveTokenBalance,
+  }
+
+  const tokens = {
+    [Field.PAY]: payToken,
+    [Field.RECEIVE]: receiveToken,
+  }
+
+  let inputError: SwapInputError | undefined
+  if (!selectedAccount) {
+    inputError = SwapInputError.NO_ACCOUNT
+  }
+
+  if (!parsedAmount) {
+    inputError = inputError ?? SwapInputError.NO_AMOUNT
+  }
+
+  if (!tokens[Field.PAY] || !tokens[Field.RECEIVE]) {
+    inputError = inputError ?? SwapInputError.NO_TOKEN
+  }
+
+  const trade = isExactIn ? tradeFromPay : null // null until we add ability to create a trade from Receive field
+
+  const slippageAdjustedAmounts =
+    trade &&
+    userSlippageTolerance &&
+    computeSlippageAdjustedAmounts(trade, userSlippageTolerance)
+
+  // compare input balance to max input based on version
+  const [balanceIn, amountIn] = [
+    tokenBalances[Field.PAY]?.balance,
+    slippageAdjustedAmounts ? slippageAdjustedAmounts[Field.PAY] : null,
+  ]
+
+  const isInvalidAmount =
+    amountIn && !isUndefined(balanceIn) && balanceIn < amountIn.value
+
+  if (isInvalidAmount) {
+    inputError = inputError ?? SwapInputError.INSUFFICIENT_BALANCE
+  }
+
+  if (paySwapQuoteError) {
+    inputError = inputError ?? SwapInputError.NO_QUOTE
+  }
+
+  return {
+    tokens,
+    tokenBalances,
+    parsedAmount,
+    trade: tradeFromPay,
+    inputError,
+    tradeLoading: paySwapQuoteLoading,
+  }
+}
diff --git a/packages/extension/src/ui/features/swap/hooks/useSwapQuoteForPay.ts b/packages/extension/src/ui/features/swap/hooks/useSwapQuoteForPay.ts
new file mode 100644
index 000000000..5a2f82654
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/hooks/useSwapQuoteForPay.ts
@@ -0,0 +1,62 @@
+import useSWR from "swr"
+import { Token } from "../../../../shared/token/__new/types/token.model"
+import { BaseWalletAccount } from "../../../../shared/wallet.model"
+import { RefreshInterval } from "../../../../shared/config"
+import { swapService } from "../../../services/swap"
+import { addressSchema } from "@argent/shared"
+
+interface IUseSwapQuoteForPay {
+  payToken?: Token
+  receiveToken?: Token
+  payAmount?: bigint
+  account?: BaseWalletAccount
+}
+
+export function useSwapQuoteForPay({
+  payToken,
+  receiveToken,
+  payAmount = 0n,
+  account,
+}: IUseSwapQuoteForPay) {
+  const {
+    data: paySwapQuote,
+    isValidating: paySwapQuoteLoading,
+    error: paySwapQuoteError,
+  } = useSWR(
+    [
+      "tradeFromPay",
+      payToken?.address,
+      receiveToken?.address,
+      payAmount,
+      account?.address,
+    ],
+    async () => {
+      if (!payToken || !receiveToken || !payAmount || !account) return
+
+      const parsedPayTokenAddress = addressSchema.parse(payToken.address)
+      const parsedReceiveTokenAddress = addressSchema.parse(
+        receiveToken.address,
+      )
+      const parsedAccountAddress = addressSchema.parse(account.address)
+
+      const trade = await swapService.getSwapQuoteForPay(
+        parsedPayTokenAddress,
+        parsedReceiveTokenAddress,
+        payAmount.toString(),
+        parsedAccountAddress,
+      )
+      return trade
+    },
+    {
+      revalidateOnFocus: true,
+      refreshInterval: (RefreshInterval.MEDIUM * 1000) / 2, // 30s
+      revalidateIfStale: true,
+    },
+  )
+
+  return {
+    paySwapQuote,
+    paySwapQuoteLoading,
+    paySwapQuoteError,
+  }
+}
diff --git a/packages/extension/src/ui/features/swap/hooks/useTradeFromSwapQuote.ts b/packages/extension/src/ui/features/swap/hooks/useTradeFromSwapQuote.ts
new file mode 100644
index 000000000..2ecbea12b
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/hooks/useTradeFromSwapQuote.ts
@@ -0,0 +1,61 @@
+import { useTokenOnCurrentNetworkByAddress } from "../../accountTokens/tokens.state"
+import { useMemo } from "react"
+import { Field, useSwapState } from "../state/fields"
+import { SwapQuoteResponse } from "../../../../shared/swap/model/quote.model"
+import {
+  Trade,
+  TradeSchema,
+  TradeType,
+} from "../../../../shared/swap/model/trade.model"
+import { calculateTotalFee } from "../../../../shared/swap/utils"
+
+export function useTradeFromSwapQuote(
+  swapQuote?: SwapQuoteResponse,
+): Trade | undefined {
+  const {
+    [Field.PAY]: { tokenAddress: payTokenAddress },
+    [Field.RECEIVE]: { tokenAddress: receiveTokenAddress },
+    independentField,
+  } = useSwapState()
+
+  // Try to get the tokens from the swap quote, otherwise fallback to the ones from the state / default ones
+  const payToken = useTokenOnCurrentNetworkByAddress(
+    swapQuote?.sellToken ?? payTokenAddress,
+  )
+  const receiveToken = useTokenOnCurrentNetworkByAddress(
+    swapQuote?.buyToken ?? receiveTokenAddress,
+  )
+
+  return useMemo(() => {
+    if (!swapQuote || !payToken || !receiveToken) {
+      return undefined
+    }
+
+    const tradeType =
+      independentField === Field.PAY
+        ? TradeType.EXACT_PAY
+        : TradeType.EXACT_RECEIVE
+
+    const { totalFee, totalFeeInCurrency, totalFeePercentage } =
+      calculateTotalFee(swapQuote)
+
+    const trade = TradeSchema.parse({
+      payToken,
+      receiveToken,
+      tradeType,
+      payAmount: swapQuote.sellAmount,
+      receiveAmount: swapQuote.buyAmount,
+      payAmountInCurrency: swapQuote.sellAmountInCurrency,
+      receiveAmountInCurrency: swapQuote.buyAmountInCurrency,
+      totalFee,
+      totalFeeInCurrency,
+      totalFeePercentage,
+      expiresAt: swapQuote.expiresAt,
+      expiresIn: swapQuote.expiresIn,
+      route: swapQuote.routes[0],
+      data: swapQuote.data,
+    })
+
+    return trade
+  }, [swapQuote, payToken, receiveToken, independentField])
+}
diff --git a/packages/extension/src/ui/features/swap/state/fields.ts b/packages/extension/src/ui/features/swap/state/fields.ts
new file mode 100644
index 000000000..24fcd05c3
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/state/fields.ts
@@ -0,0 +1,130 @@
+import { Address } from "@argent/shared"
+import { create } from "zustand"
+import { ETH, USDC } from "../../../../shared/token/__new/constants"
+import { constants } from "starknet"
+import { defaultNetwork } from "../../../../shared/network"
+
+export enum Field {
+  PAY = "PAY",
+  RECEIVE = "RECEIVE",
+}
+
+export interface SwapState {
+  readonly independentField: Field
+  readonly typedValue: string
+  readonly [Field.PAY]: {
+    readonly tokenAddress: Address | undefined
+  }
+  readonly [Field.RECEIVE]: {
+    readonly tokenAddress: Address | undefined
+  }
+
+  // actions
+  selectToken: (params: SelectToken) => void
+  switchTokens: () => void
+  typeInput: (params: TypeInput) => void
+  replaceSwapState: (params: ReplaceSwapState) => void
+  resetIndependentField: () => void
+}
+
+type SelectToken = {
+  field: Field
+  tokenAddress: Address
+}
+
+type TypeInput = {
+  field: Field
+  typedValue: string
+}
+
+type ReplaceSwapState = {
+  field: Field
+  typedValue: string
+  payTokenAddress?: Address
+  receiveTokenAddress?: Address
+}
+
+const defaultNetworkChainId =
+  defaultNetwork.id === "mainnet-alpha"
+    ? constants.StarknetChainId.SN_MAIN
+    : constants.StarknetChainId.SN_GOERLI
+
+export const initialState = {
+  independentField: Field.PAY,
+  typedValue: "",
+  [Field.PAY]: {
+    tokenAddress: ETH[defaultNetworkChainId].address,
+  },
+  [Field.RECEIVE]: {
+    tokenAddress: USDC[defaultNetworkChainId].address,
+  },
+}
+
+export const useSwapState = create<SwapState>()((set) => ({
+  ...initialState,
+
+  // Select Token
+  selectToken: ({ field, tokenAddress }: SelectToken) =>
+    set((state) => {
+      const otherField = field === Field.PAY ? Field.RECEIVE : Field.PAY
+      if (tokenAddress === state[otherField].tokenAddress) {
+        // the case where we have to swap the order
+        return {
+          ...state,
+          independentField:
+            state.independentField === Field.PAY ? Field.RECEIVE : Field.PAY,
+          [field]: { tokenAddress },
+          [otherField]: { tokenAddress: state[field].tokenAddress },
+        }
+      } else {
+        // the normal case
+        return {
+          ...state,
+          [field]: { tokenAddress },
+        }
+      }
+    }),
+
+  // Switch Currencies
+  switchTokens: () =>
+    set((state) => ({
+      ...state,
+      // independentField: Field.PAY, // for now backend only supports trade from a Pay amount. Uncomment the line below when backend supports trade from a Receive amount as well
+      independentField:
+        state.independentField === Field.PAY ? Field.RECEIVE : Field.PAY,
+      [Field.PAY]: { tokenAddress: state[Field.RECEIVE].tokenAddress },
+      [Field.RECEIVE]: { tokenAddress: state[Field.PAY].tokenAddress },
+    })),
+
+  // typeInput
+  typeInput: ({ field, typedValue }: TypeInput) =>
+    set((state) => {
+      return {
+        ...state,
+        // for now backend only supports trade from a Pay amount. Uncomment the line below when backend supports trade from a Receive amount as well
+        // independentField: Field.PAY,
+        independentField: field,
+        typedValue,
+      }
+    }),
+
+  // replaceSwapState
+  replaceSwapState: ({
+    field,
+    typedValue,
+    payTokenAddress,
+    receiveTokenAddress,
+  }: ReplaceSwapState) =>
+    set(() => ({
+      independentField: field,
+      typedValue,
+      [Field.PAY]: { tokenAddress: payTokenAddress },
+      [Field.RECEIVE]: { tokenAddress: receiveTokenAddress },
+    })),
+
+  resetIndependentField: () =>
+    set((state) => ({
+      ...state,
+      independentField: Field.PAY,
+    })),
+}))
diff --git a/packages/extension/src/ui/features/swap/state/user.ts b/packages/extension/src/ui/features/swap/state/user.ts
new file mode 100644
index 000000000..b9852421e
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/state/user.ts
@@ -0,0 +1,26 @@
+import { create } from "zustand"
+import { persist } from "zustand/middleware"
+
+import { INITIAL_ALLOWED_SLIPPAGE } from "../utils/constants"
+
+export interface UserState {
+  // user defined slippage tolerance in bips, used in all txns
+  userSlippageTolerance: number
+  updateUserSlippageTolerance: (userSlippageTolerance: number) => void
+}
+
+export const useUserState = create<UserState>()(
+  persist(
+    (set) => ({
+      userSlippageTolerance: INITIAL_ALLOWED_SLIPPAGE,
+      updateUserSlippageTolerance: (userSlippageTolerance: number) =>
+        set((state) => {
+          return {
+            ...state,
+            userSlippageTolerance,
+          }
+        }),
+    }),
+    { name: "avnu:user" },
+  ),
+)
diff --git a/packages/extension/src/ui/features/swap/ui/OwnedToken.tsx b/packages/extension/src/ui/features/swap/ui/OwnedToken.tsx
index 5d5d18fa9..8241f6eca 100644
--- a/packages/extension/src/ui/features/swap/ui/OwnedToken.tsx
+++ b/packages/extension/src/ui/features/swap/ui/OwnedToken.tsx
@@ -1,16 +1,6 @@
 import { addressSchema } from "@argent/shared"
 import { TokenButton } from "@argent/ui"
-import {
-  Currency,
-  ETHER,
-  ETH_LOGO_URL,
-  SupportedNetworks,
-  WrappedTokenInfo,
-  useCurrencyBalance,
-  wrappedCurrency,
-} from "@argent/x-swap"
 import { FC } from "react"
-
 import {
   prettifyCurrencyValue,
   prettifyTokenBalance,
@@ -20,46 +10,35 @@ import { useView } from "../../../views/implementation/react"
 import { getTokenIconUrl } from "../../accountTokens/TokenIcon"
 import { useTokenAmountToCurrencyValue } from "../../accountTokens/tokenPriceHooks"
 import { TokenWithOptionalBigIntBalance } from "../../../../shared/token/__new/types/tokenBalance.model"
+import { Token } from "../../../../shared/token/__new/types/token.model"
+import { useTokenBalanceForAccount } from "../../accountTokens/useTokenBalanceForAccount"
 
 interface OwnedTokenProps {
-  currency: Currency
+  token: Token
   onClick: () => void
 }
 
-const OwnedToken: FC<OwnedTokenProps> = ({ onClick, currency }) => {
+const OwnedToken: FC<OwnedTokenProps> = ({ onClick, token }) => {
   const account = useView(selectedAccountView)
 
-  const token = wrappedCurrency(
-    currency,
-    account?.networkId as SupportedNetworks,
-  )
+  const tokenBalance = useTokenBalanceForAccount({ token, account })
 
-  const balance = useCurrencyBalance(account?.address, token)
+  const balance = BigInt(tokenBalance?.balance || "0")
 
-  const currencyValue = useTokenAmountToCurrencyValue(
-    token,
-    balance?.raw.toString(),
-  )
+  const currencyValue = useTokenAmountToCurrencyValue(token, balance)
 
-  if (!token) {
+  if (!token || balance === 0n) {
     return <></>
   }
 
-  const tokenImage =
-    token instanceof WrappedTokenInfo
-      ? token.image
-      : currency === ETHER
-      ? ETH_LOGO_URL
-      : undefined
-
   const tokenDetailsWithBalance: TokenWithOptionalBigIntBalance = {
     name: token.name || "",
     symbol: token.symbol || "",
     decimals: token.decimals,
     address: addressSchema.parse(token.address),
     networkId: token.networkId,
-    iconUrl: tokenImage,
-    balance: BigInt(balance?.raw.toString() || "0"),
+    iconUrl: token.iconUrl,
+    balance: BigInt(tokenBalance?.balance || "0"),
   }
 
   const displayBalance = prettifyTokenBalance(tokenDetailsWithBalance)
diff --git a/packages/extension/src/ui/features/swap/ui/SlippageModal.tsx b/packages/extension/src/ui/features/swap/ui/SlippageModal.tsx
new file mode 100644
index 000000000..1228d2d59
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/ui/SlippageModal.tsx
@@ -0,0 +1,173 @@
+import { B3, H6, icons } from "@argent/ui"
+import {
+  Modal,
+  ModalContent,
+  ModalBody,
+  ModalHeader,
+  Flex,
+  ModalCloseButton,
+  IconButton,
+  chakra,
+  Input,
+  ModalFooter,
+  Button,
+  Box,
+  InputGroup,
+  Text,
+  ModalOverlay,
+} from "@chakra-ui/react"
+import { useUserState } from "../state/user"
+import { useCallback, useState } from "react"
+import { isAllowedNumericInputValue } from "../../../components/utils/isAllowedNumericInputValue"
+import { isNumber } from "lodash-es"
+
+const { AddIcon, MinusIcon, TickIcon } = icons
+
+const MAX_SLIPPAGE = 10000
+
+export interface SlippageModalProps {
+  onClose: () => void
+  isOpen: boolean
+}
+
+const UpdateSlippageButton = chakra(IconButton, {
+  baseStyle: {
+    backgroundColor: "neutrals.800",
+    borderColor: "neutrals.600",
+    display: "flex",
+    justifyContent: "center",
+    alignItems: "center",
+    minHeight: "24px",
+    minWidth: "24px",
+    paddingX: "16px",
+    borderRadius: "none",
+  },
+})
+
+export const SlippageModal = ({ isOpen, onClose }: SlippageModalProps) => {
+  const { updateUserSlippageTolerance, userSlippageTolerance } = useUserState()
+  const [localSlippage, localSlippageHandler] = useState(
+    userSlippageTolerance, // Convert bips to percentage for display
+  )
+
+  const onSave = useCallback(() => {
+    if (isNumber(localSlippage)) {
+      updateUserSlippageTolerance(localSlippage)
+      onClose()
+    }
+  }, [localSlippage, onClose, updateUserSlippageTolerance])
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose} isCentered size="xs">
+      <ModalOverlay bg="rgba(0, 0, 0, 0.5)" />
+      <ModalContent background="neutrals.700" borderRadius="2xl">
+        <ModalHeader>
+          <Flex justifyContent="space-between" alignItems="center" px="1">
+            <H6 color="color">Edit max slippage</H6>
+            <ModalCloseButton onClick={onClose} />
+          </Flex>
+        </ModalHeader>
+        <ModalBody>
+          <Flex
+            gap="0"
+            bg="neutrals.900"
+            border="1px solid"
+            borderColor="neutrals.600"
+            borderRadius="lg"
+          >
+            <UpdateSlippageButton
+              size="lg"
+              borderTopLeftRadius="lg"
+              borderBottomLeftRadius="lg"
+              aria-label="Decrease slippage tolerance"
+              disabled={localSlippage <= 0}
+              onClick={() => {
+                const updatedValue = localSlippage - 10
+                localSlippageHandler(Math.max(updatedValue, 0))
+              }}
+              icon={<MinusIcon />}
+            />
+            <InputGroup
+              flexGrow="1"
+              bgColor="neutrals.900"
+              justifyContent="center"
+              alignItems="center"
+              borderLeft="1px solid"
+              borderRight="1px solid"
+              borderColor="neutrals.600"
+              borderRadius="none"
+            >
+              <Input
+                type="number"
+                bg="neutrals.900"
+                value={localSlippage / 100} // Convert bips to percentage for display
+                placeholder="0"
+                size="sm"
+                borderRadius="none"
+                border="none"
+                w="auto"
+                textAlign="center"
+                maxW="12"
+                p="0"
+                onChange={(e) => {
+                  const inputString = e.target.value
+                  if (isAllowedNumericInputValue(inputString, 2)) {
+                    let parsedValue = parseFloat(inputString) * 100
+                    parsedValue = Math.min(
+                      Math.round(parsedValue), // Round to nearest integer, issue with float 0.55 * 100 = 55.00000000000001
+                      MAX_SLIPPAGE,
+                    )
+                    localSlippageHandler(parsedValue)
+                  }
+                }}
+                _hover={{
+                  border: "none",
+                }}
+                _focusVisible={{
+                  border: "none",
+                  boxShadow: "none",
+                  zIndex: "0",
+                }}
+              />
+              <Box>
+                <Text color="neutrals.300" fontSize="base">
+                  %
+                </Text>
+              </Box>
+            </InputGroup>
+            <UpdateSlippageButton
+              size="lg"
+              borderTopRightRadius="lg"
+              borderBottomRightRadius="lg"
+              aria-label="Increase slippage tolerance"
+              disabled={localSlippage >= MAX_SLIPPAGE}
+              onClick={() => {
+                const updatedValue = localSlippage + 10
+                localSlippageHandler(Math.min(updatedValue, MAX_SLIPPAGE))
+              }}
+              icon={<AddIcon />}
+            />
+          </Flex>
+        </ModalBody>
+
+        <ModalFooter>
+          <Flex justifyContent="center" alignItems="center" w="full">
+            <Button
+              display="flex"
+              justifyContent="center"
+              alignItems="center"
+              gap="2"
+              borderRadius="full"
+              bgColor="neutrals.600"
+              onClick={onSave}
+              isDisabled={isNaN(localSlippage)}
+            >
+              <TickIcon />
+              <B3 color="white">Save</B3>
+            </Button>
+          </Flex>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  )
+}
diff --git a/packages/extension/src/ui/features/swap/ui/SwapInputPanel.tsx b/packages/extension/src/ui/features/swap/ui/SwapInputPanel.tsx
index 6edcacffd..0510d40ff 100644
--- a/packages/extension/src/ui/features/swap/ui/SwapInputPanel.tsx
+++ b/packages/extension/src/ui/features/swap/ui/SwapInputPanel.tsx
@@ -1,23 +1,17 @@
-import { Button, H6, Input, L2, LoadingPulse, P4, icons } from "@argent/ui"
-import {
-  Currency,
-  CurrencyAmount,
-  ETHER,
-  TokenAmount,
-  WrappedTokenInfo,
-  useAllTokens,
-  useSwapProvider,
-  wrappedCurrency,
-} from "@argent/x-swap"
-import { Flex, useDisclosure } from "@chakra-ui/react"
 import { debounce } from "lodash-es"
 import { FC, useCallback, useEffect, useMemo, useState } from "react"
 
 import { isAllowedNumericInputValue } from "../../../components/utils/isAllowedNumericInputValue"
 import { TokenIcon } from "../../accountTokens/TokenIcon"
-import { CurrencyValue } from "./CurrencyValue"
+import { TokenValue } from "./TokenValue"
 import { MaxEthModal } from "./MaxEthModal"
 import { SwapTokensModal } from "./SwapTokensModal"
+import { Token } from "../../../../shared/token/__new/types/token.model"
+import { TokenWithOptionalBigIntBalance } from "../../../../shared/token/__new/types/tokenBalance.model"
+import { isETH } from "../utils"
+import { useDisclosure, Flex, Input, Button } from "@chakra-ui/react"
+import { H6, L2, LoadingPulse, P4, icons } from "@argent/ui"
+import { prettifyTokenAmount } from "../../../../shared/token/price"
 
 const { ChevronDownIcon } = icons
 
@@ -26,11 +20,11 @@ interface SwapInputPanelProps {
   type: "pay" | "receive"
   onUserInput: (value: string) => void
   onMax?: () => void
-  currency?: Currency | undefined
+  token?: Token | undefined
   showMaxButton?: boolean
-  onCurrencySelect?: (currency: Currency) => void
-  currentBalance?: CurrencyAmount | TokenAmount
-  otherCurrency?: Currency | null
+  onTokenSelect?: (token: Token) => void
+  currentBalance?: TokenWithOptionalBigIntBalance
+  otherToken?: Token | null
   id: string
   tradeLoading: boolean
   insufficientBalance?: boolean
@@ -41,16 +35,14 @@ const SwapInputPanel: FC<SwapInputPanelProps> = ({
   value,
   onUserInput,
   type,
-  currency,
+  token,
   currentBalance,
-  onCurrencySelect,
+  onTokenSelect,
   onMax,
   showMaxButton = false,
   tradeLoading,
   insufficientBalance,
 }) => {
-  const { networkId } = useSwapProvider()
-  const allTokens = useAllTokens()
   const {
     isOpen: isOpenEthModal,
     onOpen: onOpenEthModal,
@@ -64,34 +56,53 @@ const SwapInputPanel: FC<SwapInputPanelProps> = ({
 
   const [inputValue, setInputValue] = useState("")
 
-  const token = useMemo(() => {
-    const wrapped = wrappedCurrency(currency, networkId)
-    return wrapped ? (allTokens[wrapped.address] as WrappedTokenInfo) : null
-  }, [allTokens, currency, networkId])
-
   const onMaxCheck = useCallback(() => {
-    if (currency === ETHER) {
+    if (token && isETH(token)) {
       onOpenEthModal()
     } else {
       onMax?.()
     }
-  }, [currency, onMax, onOpenEthModal])
+  }, [token, onMax, onOpenEthModal])
 
-  // eslint-disable-next-line
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   const delayedOnChange = useCallback(
-    debounce((value: string) => {
-      if (isAllowedNumericInputValue(value)) {
-        onUserInput(value)
-      }
+    debounce((nextValue) => {
+      onUserInput(nextValue)
     }, 500),
-    [],
+    [onUserInput],
   )
 
+  useEffect(() => {
+    return () => {
+      delayedOnChange.cancel()
+    }
+  }, [delayedOnChange])
+
   const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setInputValue(e.target.value)
-    delayedOnChange(e.target.value)
+    if (isAllowedNumericInputValue(e.target.value)) {
+      setInputValue(e.target.value)
+      delayedOnChange(e.target.value)
+    }
   }
 
+  const prettyBalance = useMemo(() => {
+    const significantDigits = 6
+
+    if (!currentBalance) {
+      return "0"
+    }
+
+    const { balance, decimals } = currentBalance
+
+    return prettifyTokenAmount({
+      amount: balance ?? 0n,
+      decimals,
+      prettyConfigOverrides: {
+        minDecimalSignificantDigits: significantDigits,
+      },
+    })
+  }, [currentBalance])
+
   useEffect(() => {
     setInputValue(value)
   }, [value])
@@ -125,6 +136,9 @@ const SwapInputPanel: FC<SwapInputPanelProps> = ({
               lineHeight="26px"
               value={inputValue}
               onChange={onChange}
+              data-testid={id}
+              isDisabled={type === "receive"}
+              _disabled={{ opacity: 1, cursor: "default" }}
             />
           </LoadingPulse>
 
@@ -140,7 +154,7 @@ const SwapInputPanel: FC<SwapInputPanelProps> = ({
                 leftIcon={
                   <TokenIcon
                     name={token?.name || "?"}
-                    url={token?.image}
+                    url={token?.iconUrl}
                     size="5"
                   />
                 }
@@ -167,7 +181,7 @@ const SwapInputPanel: FC<SwapInputPanelProps> = ({
               </L2>
             )}
             {value && token && (
-              <CurrencyValue
+              <TokenValue
                 amount={value}
                 token={token}
                 approx={type === "receive"}
@@ -175,7 +189,7 @@ const SwapInputPanel: FC<SwapInputPanelProps> = ({
             )}
           </Flex>
           <L2 fontWeight="500" color="neutrals.400">
-            Balance: {currentBalance?.toSignificant(6) ?? 0}
+            {`Balance: ${prettyBalance}`}
           </L2>
         </Flex>
       </Flex>
@@ -192,7 +206,7 @@ const SwapInputPanel: FC<SwapInputPanelProps> = ({
         isOpen={isTokenListOpen}
         onClose={onCloseTokenList}
         isPay={type === "pay"}
-        onCurrencySelect={onCurrencySelect}
+        onTokenSelect={onTokenSelect}
       />
     </>
   )
diff --git a/packages/extension/src/ui/features/swap/ui/SwapPricesInfo.tsx b/packages/extension/src/ui/features/swap/ui/SwapPricesInfo.tsx
index 7444f2605..184c593d9 100644
--- a/packages/extension/src/ui/features/swap/ui/SwapPricesInfo.tsx
+++ b/packages/extension/src/ui/features/swap/ui/SwapPricesInfo.tsx
@@ -1,58 +1,60 @@
-import { FloatingForm, L1, P4, icons } from "@argent/ui"
+import { L1, P4, icons } from "@argent/ui"
+import { Box, Flex, Text, Tooltip, useDisclosure } from "@chakra-ui/react"
+import { FC, useCallback, useMemo, useState } from "react"
 import {
-  Currency,
-  ONE_BIPS,
-  Percent,
-  Trade,
-  basisPointsToPercent,
-  formatExecutionPriceWithFee,
-  useUserState,
-} from "@argent/x-swap"
-import { Box, Flex, Text, Tooltip } from "@chakra-ui/react"
-import { FC, useCallback, useState } from "react"
+  formatExecutionPrice,
+  minimumAmountOutFromTrade,
+} from "../utils/prices"
+import { Token } from "../../../../shared/token/__new/types/token.model"
+import { useUserState } from "../state/user"
+import { getProvidersFromTradeRoute } from "../utils"
+import { prettifyTokenAmount } from "../../../../shared/token/price"
+import { SlippageModal } from "./SlippageModal"
+import { Trade } from "../../../../shared/swap/model/trade.model"
 
-const { InfoIcon, SettingsIcon } = icons
-
-const MAX_SLIPPAGE = 1_000
+const { InfoIcon, EditIcon } = icons
 
 interface SwapPricesInfoProps {
-  currencyIn?: Currency
-  currencyOut?: Currency
+  tokenIn?: Token
+  tokenOut?: Token
   trade: Trade
-  priceImpact?: Percent
-  isPriceImpactHigh?: boolean
 }
 
 export const SwapPricesInfo: FC<SwapPricesInfoProps> = ({
-  currencyOut,
+  tokenOut,
   trade,
-  priceImpact,
-  isPriceImpactHigh,
 }) => {
   const [inverted, setInverted] = useState(false)
-  const [showSlippageForm, setShowSlippageForm] = useState(false)
-  const { userSlippageTolerance, updateUserSlippageTolerance } = useUserState()
+  const { userSlippageTolerance } = useUserState()
   const switchRate = useCallback(() => {
     setInverted(!inverted)
   }, [inverted])
 
-  const showSlippage = useCallback(() => {
-    setShowSlippageForm(!showSlippageForm)
-  }, [showSlippageForm])
-  const reduceSlippage = () => {
-    const updatedValue = userSlippageTolerance - 20
-    updateUserSlippageTolerance(updatedValue < 0 ? 0 : updatedValue)
-  }
-  const changeSlippage = (newSlippage: number) => {
-    const value = +newSlippage > 10 ? MAX_SLIPPAGE : +newSlippage * 100
-    updateUserSlippageTolerance(value)
-  }
-  const increaseSlippage = () => {
-    const updatedValue = userSlippageTolerance + 20
-    updateUserSlippageTolerance(
-      updatedValue > MAX_SLIPPAGE ? MAX_SLIPPAGE : updatedValue,
+  const {
+    isOpen: isSlippageModalOpen,
+    onOpen: onOpenSlippageModal,
+    onClose: onCloseSlippageModal,
+  } = useDisclosure()
+
+  const prettifiedMinReceived = useMemo(() => {
+    const { value, decimals } = minimumAmountOutFromTrade(
+      trade,
+      userSlippageTolerance,
     )
-  }
+
+    return prettifyTokenAmount({
+      amount: value,
+      decimals,
+      symbol: tokenOut?.symbol,
+    })
+  }, [trade, userSlippageTolerance, tokenOut?.symbol])
+
+  const executionPrice = useMemo(
+    /** Execution price taking fees into account */
+    () => formatExecutionPrice({ trade, inverted, includeFee: false }),
+    [trade, inverted],
+  )
+
   return (
     <>
       <Flex
@@ -62,114 +64,69 @@ export const SwapPricesInfo: FC<SwapPricesInfoProps> = ({
         borderColor="neutrals.700"
         borderRadius="lg"
         w="100%"
-        mt="4"
+        mt="2"
         p="3"
         gap="3"
+        data-testid="swap-prices-info"
       >
         <Flex justifyContent="space-between">
           <Flex alignItems="center" gap="1">
-            <P4 color="neutrals.300">Rate</P4>
-            <Tooltip label="Includes JediSwap's 0.3% protocol fee">
+            <P4 color="neutrals.300">Min received (incl. fees) </P4>
+            <Tooltip label="The minimum amount of tokens you're guaranteed to receive given the slippage percentage">
               <Text color="neutrals.300" cursor="pointer">
                 <InfoIcon />
               </Text>
             </Tooltip>
           </Flex>
+          <P4 fontWeight="bold">{prettifiedMinReceived}</P4>
+        </Flex>
+        <Flex justifyContent="space-between">
+          <Flex alignItems="center" gap="1">
+            <P4 color="neutrals.300">Rate</P4>
+          </Flex>
           <P4
             fontWeight="bold"
             cursor="pointer"
             _hover={{ color: "accent.500" }}
             onClick={switchRate}
           >
-            {formatExecutionPriceWithFee(trade, inverted, "≈")}
+            {executionPrice}
           </P4>
         </Flex>
         <Flex justifyContent="space-between">
           <Flex alignItems="center" gap="1">
-            <P4 color="neutrals.300">Min received</P4>
-            <Tooltip label="The minimum amount of tokens you're guaranteed to receive given the slippage percentage">
+            <P4 color="neutrals.300">Max Slippage</P4>
+            <Tooltip label="Maximum allowed slippage for the trade">
               <Text color="neutrals.300" cursor="pointer">
                 <InfoIcon />
               </Text>
             </Tooltip>
           </Flex>
-          <Flex gap={2}>
-            <Box position="relative">
-              <Flex
-                cursor="pointer"
-                _hover={{ color: "accent.500" }}
-                gap="1"
-                alignItems="center"
-                onClick={showSlippage}
-              >
-                <SettingsIcon />
-                <P4 fontWeight="500" color="neutrals.300">
-                  Slippage {userSlippageTolerance / 100}%
-                </P4>
-              </Flex>
-              {showSlippageForm && (
-                <FloatingForm
-                  onClose={() => setShowSlippageForm(false)}
-                  onChange={changeSlippage}
-                  onIncrease={increaseSlippage}
-                  onReduce={reduceSlippage}
-                  value={userSlippageTolerance / 100}
-                  min={0}
-                  max={MAX_SLIPPAGE}
-                />
-              )}
-            </Box>
-            <P4 fontWeight="bold">
-              {trade
-                .minimumAmountOut(basisPointsToPercent(userSlippageTolerance))
-                .toSignificant(6)}
-              {currencyOut?.symbol}
-            </P4>
-          </Flex>
+          <Box position="relative">
+            <Flex
+              cursor="pointer"
+              _hover={{ color: "accent.500" }}
+              gap="2"
+              alignItems="center"
+              onClick={onOpenSlippageModal}
+            >
+              <EditIcon />
+              <P4 fontWeight="500">{userSlippageTolerance / 100}%</P4>
+            </Flex>
+          </Box>
         </Flex>
         <Flex justifyContent="space-between">
-          <Flex alignItems="center" gap="1">
-            <P4 color="neutrals.300">Price impact</P4>
-            <Tooltip label="Difference between the market price and estimated price due to trade size">
-              <Text color="neutrals.300" cursor="pointer">
-                <InfoIcon />
-              </Text>
-            </Tooltip>
-          </Flex>
-          <Flex alignItems="center" gap="1">
-            {isPriceImpactHigh && (
-              <Tooltip label={<HighPriceImpactLabel />} placement="top-start">
-                <Text color="neutrals.300" cursor="pointer">
-                  <InfoIcon color="#CC3247" />
-                  {/** Using Hex here because error.500 is not working for some reason */}
-                </Text>
-              </Tooltip>
-            )}
-            <P4
-              fontWeight="bold"
-              color={isPriceImpactHigh ? "error.500" : "white"}
-            >
-              {priceImpact
-                ? priceImpact.lessThan(ONE_BIPS)
-                  ? "<0.01%"
-                  : `${priceImpact.toFixed(2)}%`
-                : "-"}
-            </P4>
-          </Flex>
+          <P4 color="neutrals.300">Providers</P4>
+          <P4 fontWeight="bold">
+            {getProvidersFromTradeRoute(trade.route).join(", ")}
+          </P4>
         </Flex>
-        {/** Keeping this here, might be useful in future. }
-         <Flex justifyContent="space-between">
-          <Flex alignItems="center" gap="1">
-            <P4 color="neutrals.300">Estimated Fees</P4>
-            <Tooltip label="A portion of each trade (0.30%) goes to JediSwap liquidity providers as a protocol incentive">
-              <Text color="neutrals.300" cursor="pointer">
-                <InfoIcon />
-              </Text>
-            </Tooltip>
-          </Flex>
-          <P4 fontWeight="bold">TODO</P4>
-        </Flex> */}
       </Flex>
+
+      <SlippageModal
+        isOpen={isSlippageModalOpen}
+        onClose={onCloseSlippageModal}
+      />
     </>
   )
 }
diff --git a/packages/extension/src/ui/features/swap/ui/SwapQuoteRefresh.tsx b/packages/extension/src/ui/features/swap/ui/SwapQuoteRefresh.tsx
new file mode 100644
index 000000000..b6b45eb80
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/ui/SwapQuoteRefresh.tsx
@@ -0,0 +1,35 @@
+import { Flex, Spinner, Text } from "@chakra-ui/react"
+import { Trade } from "../../../../shared/swap/model/trade.model"
+import { P4, icons } from "@argent/ui"
+import { SwapInputError } from "../hooks/useSwapInfo"
+
+const { ApproveIcon } = icons
+
+interface SwapQuoteRefreshProps {
+  trade?: Trade
+  tradeLoading?: boolean
+  tradeError?: SwapInputError
+}
+
+export const SwapQuoteRefresh = ({
+  trade,
+  tradeLoading = false,
+  tradeError,
+}: SwapQuoteRefreshProps) => {
+  return trade && !tradeError ? (
+    <Flex
+      w="full"
+      px={3}
+      py={1.5}
+      alignItems="center"
+      justifyContent="space-between"
+    >
+      <P4 color="neutrals.300">
+        Quote {tradeLoading ? "updating" : "up-to date"}
+      </P4>
+      <Text color="primary.500">
+        {tradeLoading ? <Spinner size={"xs"} /> : <ApproveIcon />}
+      </Text>
+    </Flex>
+  ) : null
+}
diff --git a/packages/extension/src/ui/features/swap/ui/SwapTokensModal.tsx b/packages/extension/src/ui/features/swap/ui/SwapTokensModal.tsx
index 958807633..a39b81931 100644
--- a/packages/extension/src/ui/features/swap/ui/SwapTokensModal.tsx
+++ b/packages/extension/src/ui/features/swap/ui/SwapTokensModal.tsx
@@ -1,5 +1,4 @@
 import { CellStack, H5, SearchInput } from "@argent/ui"
-import { Currency, Token, useAllTokens } from "@argent/x-swap"
 import {
   Modal,
   ModalBody,
@@ -12,17 +11,19 @@ import { useForm } from "react-hook-form"
 
 import { OwnedToken } from "./OwnedToken"
 import { TokenPrice } from "./TokenPrice"
+import { Token } from "../../../../shared/token/__new/types/token.model"
+import { useTradableTokensInCurrentNetwork } from "../../accountTokens/tokens.state"
 
 interface SwapTokensModalProps {
   onClose: () => void
-  onCurrencySelect?: (currency: Currency) => void
+  onTokenSelect?: (token: Token) => void
   isOpen: boolean
   isPay: boolean
 }
 
 const SwapTokensModal: FC<SwapTokensModalProps> = ({
   onClose,
-  onCurrencySelect,
+  onTokenSelect,
   isOpen,
   isPay,
 }) => {
@@ -30,7 +31,7 @@ const SwapTokensModal: FC<SwapTokensModalProps> = ({
     defaultValues: { query: "" },
   })
   const currentQueryValue = watch("query")
-  const tokens = useAllTokens()
+  const tokens = useTradableTokensInCurrentNetwork()
 
   const filteredTokens: Token[] = useMemo(() => {
     if (!currentQueryValue) {
@@ -46,11 +47,11 @@ const SwapTokensModal: FC<SwapTokensModalProps> = ({
   }, [tokens, currentQueryValue])
 
   const selectToken = useCallback(
-    (currency: Currency) => {
-      onCurrencySelect?.(currency)
+    (token: Token) => {
+      onTokenSelect?.(token)
       onClose()
     },
-    [onCurrencySelect, onClose],
+    [onTokenSelect, onClose],
   )
 
   if (!filteredTokens) {
@@ -59,7 +60,7 @@ const SwapTokensModal: FC<SwapTokensModalProps> = ({
 
   return (
     <>
-      <Modal isOpen={isOpen} onClose={onClose} size="full">
+      <Modal isOpen={isOpen} onClose={onClose} size="full" motionPreset="none">
         <ModalContent bg="neutrals.900">
           <ModalHeader>
             <H5 fontWeight="600" textAlign="center">
@@ -76,7 +77,7 @@ const SwapTokensModal: FC<SwapTokensModalProps> = ({
                   {isPay ? (
                     <OwnedToken
                       key={token.address}
-                      currency={token}
+                      token={token}
                       onClick={() => {
                         selectToken(token)
                       }}
@@ -87,7 +88,7 @@ const SwapTokensModal: FC<SwapTokensModalProps> = ({
                       onClick={() => {
                         selectToken(token)
                       }}
-                      currency={token}
+                      token={token}
                     />
                   )}
                 </Fragment>
diff --git a/packages/extension/src/ui/features/swap/ui/SwapTradeLoading.tsx b/packages/extension/src/ui/features/swap/ui/SwapTradeLoading.tsx
new file mode 100644
index 000000000..31248f540
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/ui/SwapTradeLoading.tsx
@@ -0,0 +1,24 @@
+import { P4 } from "@argent/ui"
+import { Flex, Spinner, Box } from "@chakra-ui/react"
+
+export function SwapTradeLoading() {
+  return (
+    <Box
+      bg="neutrals.900"
+      border="solid 1px"
+      borderColor="neutrals.700"
+      borderRadius="lg"
+      boxShadow="menu"
+      w="100%"
+      mt="4"
+      py="2"
+      gap="3"
+      data-testid="swap-trade-loading"
+    >
+      <Flex justifyContent="space-between" py="1.5" px="3">
+        <P4 color="neutrals.300">Finding the best rate...</P4>
+        <Spinner size="xs" />
+      </Flex>
+    </Box>
+  )
+}
diff --git a/packages/extension/src/ui/features/swap/ui/SwapWarning.tsx b/packages/extension/src/ui/features/swap/ui/SwapWarning.tsx
deleted file mode 100644
index bbf4af911..000000000
--- a/packages/extension/src/ui/features/swap/ui/SwapWarning.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { B3, Button, H3, P3, icons } from "@argent/ui"
-import {
-  Circle,
-  Modal,
-  ModalBody,
-  ModalContent,
-  ModalFooter,
-  Text,
-  useDisclosure,
-} from "@chakra-ui/react"
-import { useCallback, useEffect } from "react"
-
-const { AlertIcon, ExpandIcon } = icons
-
-const SwapWarning = () => {
-  const { isOpen, onOpen, onClose } = useDisclosure()
-
-  useEffect(() => {
-    if (localStorage.getItem("seenSwapWarning") !== "true") {
-      onOpen()
-    }
-  }, [onOpen])
-
-  const onClick = useCallback(() => {
-    localStorage.setItem("seenSwapWarning", "true")
-    onClose()
-  }, [onClose])
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose} size="full">
-      <ModalContent bg="neutrals.900">
-        <ModalBody
-          display="flex"
-          flexDirection="column"
-          alignItems="center"
-          justifyContent="center"
-        >
-          <Circle size="24" bg="#371709" mb="8">
-            <Text fontSize="48" color="primary.500">
-              <AlertIcon />
-            </Text>
-          </Circle>
-          <H3>Alpha warning</H3>
-          <P3 color="neutrals.100" textAlign="center" mt="3" mb="8">
-            The swap feature is powered by JediSwap, an AMM on StarkNet that is
-            not yet audited. Both JediSwap and StarkNet are in Alpha, which
-            means new changes are introduced frequently and some flows might
-            break. Also, Total value locked in Jediswap is still very low and
-            some trades might not be favourable, specially with large volumes
-          </P3>
-          <B3
-            display="flex"
-            color="neutrals.400"
-            alignItems="center"
-            justifyContent="center"
-            as="a"
-            href="https://jediswap.xyz/"
-            title="JediSwap"
-            target="_blank"
-            _hover={{
-              textDecoration: "underline",
-            }}
-          >
-            Learn more about JediSwap
-            <Text ml="1">
-              <ExpandIcon />
-            </Text>
-          </B3>
-        </ModalBody>
-        <ModalFooter>
-          <Button colorScheme="primary" w="100%" onClick={onClick}>
-            I understand
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  )
-}
-
-export { SwapWarning }
diff --git a/packages/extension/src/ui/features/swap/ui/TokenPrice.tsx b/packages/extension/src/ui/features/swap/ui/TokenPrice.tsx
index 16e8b2638..e7d1c44f9 100644
--- a/packages/extension/src/ui/features/swap/ui/TokenPrice.tsx
+++ b/packages/extension/src/ui/features/swap/ui/TokenPrice.tsx
@@ -1,12 +1,4 @@
 import { P4, TokenButton } from "@argent/ui"
-import {
-  Currency,
-  ETHER,
-  ETH_LOGO_URL,
-  SupportedNetworks,
-  WrappedTokenInfo,
-  wrappedCurrency,
-} from "@argent/x-swap"
 import { FC } from "react"
 
 import { prettifyCurrencyValue } from "../../../../shared/token/price"
@@ -15,20 +7,16 @@ import {
   useTokenAmountToCurrencyValue,
   useTokenPriceDetails,
 } from "../../accountTokens/tokenPriceHooks"
-import { useCurrentNetwork } from "../../networks/hooks/useCurrentNetwork"
 import { bigDecimal } from "@argent/shared"
+import { Token } from "../../../../shared/token/__new/types/token.model"
 
 interface TokenPriceProps {
-  currency: Currency
+  token: Token
   onClick: () => void
   showCurrencyValue?: boolean
 }
 
-const TokenPrice: FC<TokenPriceProps> = ({ currency, onClick }) => {
-  const network = useCurrentNetwork()
-
-  const token = wrappedCurrency(currency, network.id as SupportedNetworks)
-
+const TokenPrice: FC<TokenPriceProps> = ({ token, onClick }) => {
   const currencyValue = useTokenAmountToCurrencyValue(
     token,
     bigDecimal.parseUnits("1", token?.decimals ?? 18).value,
@@ -40,13 +28,6 @@ const TokenPrice: FC<TokenPriceProps> = ({ currency, onClick }) => {
     return <></>
   }
 
-  const tokenImage =
-    token instanceof WrappedTokenInfo
-      ? token.image
-      : currency === ETHER
-      ? ETH_LOGO_URL
-      : undefined
-
   const displayCurrencyValue = prettifyCurrencyValue(currencyValue)
 
   const displayPriceDetails =
@@ -56,7 +37,7 @@ const TokenPrice: FC<TokenPriceProps> = ({ currency, onClick }) => {
     <TokenButton
       onClick={onClick}
       name={token.name || ""}
-      image={tokenImage || ""}
+      image={token.iconUrl || ""}
       getTokenIconUrl={getTokenIconUrl}
       symbol={token.symbol || ""}
       showTokenSymbol
diff --git a/packages/extension/src/ui/features/swap/ui/CurrencyValue.tsx b/packages/extension/src/ui/features/swap/ui/TokenValue.tsx
similarity index 73%
rename from packages/extension/src/ui/features/swap/ui/CurrencyValue.tsx
rename to packages/extension/src/ui/features/swap/ui/TokenValue.tsx
index d48e0dbb2..469fa1477 100644
--- a/packages/extension/src/ui/features/swap/ui/CurrencyValue.tsx
+++ b/packages/extension/src/ui/features/swap/ui/TokenValue.tsx
@@ -1,5 +1,4 @@
 import { L2 } from "@argent/ui"
-import { WrappedTokenInfo } from "@argent/x-swap"
 import { FC } from "react"
 
 import { prettifyCurrencyValue } from "../../../../shared/token/price"
@@ -7,15 +6,15 @@ import { useTokenAmountToCurrencyValue } from "../../accountTokens/tokenPriceHoo
 import { bigDecimal } from "@argent/shared"
 import { Token } from "../../../../shared/token/__new/types/token.model"
 
-interface CurrencyValueProps {
+interface TokenValueProps {
   amount: string
   approx?: boolean
-  token: WrappedTokenInfo
+  token: Token
 }
 
-const CurrencyValue: FC<CurrencyValueProps> = ({ amount, approx, token }) => {
+export const TokenValue: FC<TokenValueProps> = ({ amount, approx, token }) => {
   const currencyValue = useTokenAmountToCurrencyValue(
-    token as Token,
+    token,
     amount ? bigDecimal.parseUnits(amount, token.decimals).value : 0,
   )
 
@@ -26,5 +25,3 @@ const CurrencyValue: FC<CurrencyValueProps> = ({ amount, approx, token }) => {
     </L2>
   )
 }
-
-export { CurrencyValue }
diff --git a/packages/extension/src/ui/features/swap/utils/constants.ts b/packages/extension/src/ui/features/swap/utils/constants.ts
new file mode 100644
index 000000000..af256c38e
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/utils/constants.ts
@@ -0,0 +1,3 @@
+export const INITIAL_ALLOWED_SLIPPAGE = 50 // 0.5%
+
+export const MIN_ETH: bigint = 10n ** 15n // .001 ETH
diff --git a/packages/extension/src/ui/features/swap/utils/index.test.ts b/packages/extension/src/ui/features/swap/utils/index.test.ts
new file mode 100644
index 000000000..7a9f2cec8
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/utils/index.test.ts
@@ -0,0 +1,92 @@
+import {
+  isETH,
+  maxAmountSpendFromTokenBalance,
+  maxAmountSpend,
+  bipsToPercent,
+} from "./index"
+import { BaseToken } from "../../../../shared/token/__new/types/token.model"
+import { MIN_ETH } from "./constants"
+import { ETH, USDC } from "../../../../shared/token/__new/constants"
+import { constants } from "starknet"
+import { getMockBaseToken, getMockToken } from "../../../../../test/token.mock"
+
+describe("swap utils", () => {
+  describe("isETH", () => {
+    it("should return true if the token is ETH", () => {
+      const token: BaseToken = {
+        ...ETH[constants.StarknetChainId.SN_MAIN],
+      }
+      expect(isETH(token)).toBe(true)
+    })
+
+    it("should return false if the token is not ETH", () => {
+      const token: BaseToken = {
+        ...USDC[constants.StarknetChainId.SN_MAIN],
+      }
+      expect(isETH(token)).toBe(false)
+    })
+  })
+
+  describe("maxAmountSpendFromTokenBalance", () => {
+    it("should return undefined if tokenBalance is not provided", () => {
+      expect(maxAmountSpendFromTokenBalance(undefined)).toBeUndefined()
+    })
+
+    it("should return undefined if tokenBalance has no balance", () => {
+      const tokenBalance = {
+        ...getMockToken(),
+        balance: undefined,
+      }
+      expect(maxAmountSpendFromTokenBalance(tokenBalance)).toBeUndefined()
+    })
+
+    it("should return the correct max amount spendable", () => {
+      const tokenBalance = {
+        balance: 100000000000000000n,
+        ...getMockToken(),
+      }
+      expect(maxAmountSpendFromTokenBalance(tokenBalance)).toBe(
+        tokenBalance.balance,
+      )
+    })
+  })
+
+  describe("maxAmountSpend", () => {
+    it("should return undefined if tokenAmount is not provided", () => {
+      expect(maxAmountSpend(undefined)).toBeUndefined()
+    })
+
+    it("should return the full amount if the token is not ETH", () => {
+      const tokenAmount = {
+        amount: 100000000000000000n,
+        ...getMockBaseToken(),
+      }
+      expect(maxAmountSpend(tokenAmount)).toBe(tokenAmount.amount)
+    })
+
+    it("should return the amount minus MIN_ETH if the token is ETH and amount is greater than MIN_ETH", () => {
+      const tokenAmount = {
+        amount: 100000000000000000n,
+        ...ETH[constants.StarknetChainId.SN_MAIN],
+      }
+      expect(maxAmountSpend(tokenAmount)).toBe(tokenAmount.amount - MIN_ETH)
+    })
+
+    it("should return 0 if the token is ETH and amount is less than or equal to MIN_ETH", () => {
+      const tokenAmount = {
+        amount: MIN_ETH,
+        ...ETH[constants.StarknetChainId.SN_MAIN],
+      }
+      expect(maxAmountSpend(tokenAmount)).toBe(0n)
+    })
+  })
+
+  describe("bipsToPercent", () => {
+    it("should convert bips to percent correctly", () => {
+      const bips = 100 // 1%
+      const percent = bipsToPercent(bips)
+      expect(percent.value).toBe(BigInt(1))
+      expect(percent.decimals).toBe(2)
+    })
+  })
+})
diff --git a/packages/extension/src/ui/features/swap/utils/index.ts b/packages/extension/src/ui/features/swap/utils/index.ts
new file mode 100644
index 000000000..b59857e03
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/utils/index.ts
@@ -0,0 +1,88 @@
+import { bigDecimal, BigDecimal } from "@argent/shared"
+import { BaseToken } from "../../../../shared/token/__new/types/token.model"
+import { BaseTokenAmount } from "../../../../shared/token/__new/types/tokenAmount.model"
+import { TokenWithOptionalBigIntBalance } from "../../../../shared/token/__new/types/tokenBalance.model"
+import { MIN_ETH } from "./constants"
+import {
+  SwapQuoteRoute,
+  SwapQuoteRouteSchema,
+} from "../../../../shared/swap/model/quote.model"
+import { ETH } from "../../../../shared/token/__new/constants"
+import { equalToken } from "../../../../shared/token/__new/utils"
+
+/**
+ * Checks if the given token is equivalent to Ethereum.
+ * @param token - The token to check.
+ * @returns {boolean} - True if the token represents Ethereum, false otherwise.
+ */
+export const isETH = (token: BaseToken): boolean =>
+  Object.values(ETH).some((t) => equalToken(t, token))
+
+/**
+ * Calculates the maximum amount of a token that can be spent.
+ * @param tokenBalance - The token balance, including the amount available.
+ * @returns {bigint | undefined} - The maximum spendable amount or undefined if not calculable.
+ */
+export function maxAmountSpendFromTokenBalance(
+  tokenBalance?: TokenWithOptionalBigIntBalance,
+): bigint | undefined {
+  if (!tokenBalance || !tokenBalance.balance) {
+    return undefined
+  }
+
+  return maxAmountSpend({
+    ...tokenBalance,
+    amount: tokenBalance.balance,
+  })
+}
+
+/**
+ * Determines the maximum spendable amount of a token, accounting for Ethereum-specific logic.
+ * @param tokenAmount - The amount of the token to check.
+ * @returns {bigint | undefined} - The maximum spendable amount or undefined if not applicable.
+ */
+export function maxAmountSpend(
+  tokenAmount?: BaseTokenAmount,
+): bigint | undefined {
+  if (!tokenAmount) {
+    return undefined
+  }
+  if (!isETH(tokenAmount)) {
+    return tokenAmount.amount
+  }
+  if (tokenAmount.amount > MIN_ETH) {
+    return tokenAmount.amount - MIN_ETH
+  }
+  return 0n
+}
+
+/**
+ * Extracts provider names from a trade route.
+ * @param route - The trade route to parse.
+ * @returns {string[]} - An array of provider names.
+ */
+export function getProvidersFromTradeRoute(route: SwapQuoteRoute): string[] {
+  // As SwapQuoteRoute is any, let's parse it with zod to ensure we have the right data
+  const parsedRoute = SwapQuoteRouteSchema.parse(route)
+
+  const providers: string[] = [
+    parsedRoute.name,
+    ...parsedRoute.routes.map(getProvidersFromTradeRoute),
+  ]
+
+  return providers.flat()
+}
+
+/**
+ * Converts basis points to a percentage representation.
+ * @param bips - The number of basis points.
+ * @returns {BigDecimal} - The percentage representation of the basis points.
+ */
+export function bipsToPercent(bips: number): BigDecimal {
+  const numerator: BigDecimal = { value: BigInt(bips), decimals: 2 }
+  const denominator: BigDecimal = {
+    value: BigInt(10000),
+    decimals: 2,
+  }
+  return bigDecimal.div(numerator, denominator)
+}
diff --git a/packages/extension/src/ui/features/swap/utils/prices.test.ts b/packages/extension/src/ui/features/swap/utils/prices.test.ts
new file mode 100644
index 000000000..1b78be345
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/utils/prices.test.ts
@@ -0,0 +1,281 @@
+import {
+  formatExecutionPrice,
+  getExecutionPrice,
+  minimumAmountOutFromTrade,
+  maximumAmountInForTrade,
+} from "./prices"
+import { getMockTrade } from "../../../../../test/trade.mock"
+import { getMockToken } from "../../../../../test/token.mock"
+import { Trade, TradeType } from "../../../../shared/swap/model/trade.model"
+import { bigDecimal } from "@argent/shared"
+
+describe("prices utils", () => {
+  describe("formatExecutionPriceWithFee", () => {
+    const mockTrade = getMockTrade({
+      payAmount: "500000000000000000",
+      receiveAmount: "1000000000000000000",
+      payToken: getMockToken({ symbol: "ETH" }),
+      receiveToken: getMockToken({ symbol: "DAI" }),
+      totalFee: "485264460032841",
+      totalFeeInCurrency: "0.0004839",
+      totalFeePercentage: 0.0002,
+    })
+
+    it("should return an empty string if trade is not provided", () => {
+      expect(formatExecutionPrice({ trade: undefined })).toBe("")
+    })
+
+    it("should return the correct execution price (with fees) without inversion", () => {
+      const result = formatExecutionPrice({
+        trade: mockTrade,
+        includeFee: true,
+        inverted: false,
+      })
+      expect(result).toEqual("1 ETH ~ 2.0019 DAI")
+    })
+
+    it("should return the correct execution price (with fees) with inversion", () => {
+      const result = formatExecutionPrice({
+        trade: mockTrade,
+        includeFee: true,
+        inverted: true,
+      })
+      expect(result).toEqual("1 DAI ~ 0.4995 ETH")
+    })
+
+    it("should return the correct execution price (without fees) without inversion", () => {
+      const result = formatExecutionPrice({
+        trade: mockTrade,
+        includeFee: false,
+        inverted: false,
+      })
+      expect(result).toEqual("1 ETH ~ 2.0 DAI")
+    })
+
+    it("should return the correct execution price (without fees)  with inversion", () => {
+      const result = formatExecutionPrice({
+        trade: mockTrade,
+        includeFee: false,
+        inverted: true,
+      })
+      expect(result).toEqual("1 DAI ~ 0.5 ETH")
+    })
+
+    it("should handle custom separators", () => {
+      const separator = ":"
+      const result = formatExecutionPrice({
+        trade: mockTrade,
+        includeFee: true,
+        inverted: false,
+        separator: separator,
+      })
+      expect(result).toContain(`1 ETH ${separator}`)
+    })
+
+    // Edge case: Trade with zero amounts
+    it("should handle trades with zero amounts", () => {
+      const zeroTrade: Trade = {
+        ...mockTrade,
+        payAmount: "0",
+        receiveAmount: "0",
+        totalFee: "0",
+      }
+      expect(() => formatExecutionPrice({ trade: zeroTrade })).toThrow()
+    })
+
+    // Edge case: Trade with very large amounts
+    it("should handle trades with very large amounts", () => {
+      const largeTrade: Trade = {
+        ...mockTrade,
+        payAmount: "1000000000000000000000000000",
+        receiveAmount: "5000000000000000000000000000",
+      }
+      const result = formatExecutionPrice({ trade: largeTrade })
+      expect(result).toContain(`1 ETH ~`)
+      expect(result).toContain(`DAI`)
+    })
+  })
+
+  describe("getExecutionPrice", () => {
+    it("should return the correct execution price", () => {
+      const numerator = { value: 1n, decimals: 0 }
+      const denominator = { value: 2n, decimals: 0 }
+      const executionPrice = getExecutionPrice(numerator, denominator)
+      expect(executionPrice.value).toBe(0n)
+      expect(executionPrice.decimals).toBe(0)
+    })
+
+    // Edge case: Division by zero
+    it("should handle division by zero", () => {
+      const numerator = { value: 1n, decimals: 0 }
+      const denominator = { value: 0n, decimals: 0 }
+      expect(() => getExecutionPrice(numerator, denominator)).toThrow()
+    })
+
+    // Edge case: Very large numbers
+    it("should handle very large numbers", () => {
+      const numerator = {
+        value: 1000000000000000000000000000n,
+        decimals: 18,
+      }
+      const denominator = { value: 1000000000000000000n, decimals: 18 }
+      const executionPrice = getExecutionPrice(numerator, denominator)
+      expect(executionPrice.value).toBe(1000000000000000000000000000n)
+      expect(executionPrice.decimals).toBe(18)
+    })
+  })
+
+  describe("minimumAmountOutFromTrade", () => {
+    it("should calculate the minimum amount out correctly with normal slippage", () => {
+      const trade = getMockTrade({
+        receiveAmount: "1000000",
+      })
+      const slippage = 100 // 1%
+      const minimumAmount = minimumAmountOutFromTrade(trade, slippage)
+      const expectedValue = 990099n
+      expect(minimumAmount.value).toBe(expectedValue)
+      expect(minimumAmount.decimals).toBe(trade.receiveToken.decimals)
+    })
+
+    it("should handle zero slippage", () => {
+      const trade = getMockTrade({
+        receiveAmount: "1000000",
+      })
+      const slippage = 0
+      const minimumAmount = minimumAmountOutFromTrade(trade, slippage)
+      expect(minimumAmount.value).toBe(BigInt(trade.receiveAmount))
+      expect(minimumAmount.decimals).toBe(trade.receiveToken.decimals)
+    })
+
+    it("should handle very high slippage", () => {
+      const trade = getMockTrade({
+        receiveAmount: "1000000",
+      })
+      const slippage = 10000 // 100%
+      const minimumAmount = minimumAmountOutFromTrade(trade, slippage)
+      const expectedValue = BigInt(trade.receiveAmount) / 2n // As slippage is 100%, the output is halved
+      expect(minimumAmount.value).toBe(expectedValue)
+      expect(minimumAmount.decimals).toBe(trade.receiveToken.decimals)
+    })
+
+    it("should handle slippage greater than 100%", () => {
+      const trade = getMockTrade({
+        receiveAmount: "1000000",
+      })
+      const slippage = 20000 // 200%
+      const minimumAmount = minimumAmountOutFromTrade(trade, slippage)
+      const expectedValue = BigInt(trade.receiveAmount) / 3n // As slippage is 200%, the output is a third
+      expect(minimumAmount.value).toBe(expectedValue)
+      expect(minimumAmount.decimals).toBe(trade.receiveToken.decimals)
+    })
+
+    it("should return the correct minimum amount when receiveAmount is a very large number", () => {
+      const trade = getMockTrade({
+        receiveAmount: "1000000000000000000000", // A very large number
+      })
+      const slippage = 100 // 1%
+      const minimumAmount = minimumAmountOutFromTrade(trade, slippage)
+      const expectedValue = 990099009900990099009n
+      expect(minimumAmount.value).toBe(expectedValue)
+      expect(minimumAmount.decimals).toBe(trade.receiveToken.decimals)
+    })
+  })
+
+  describe("maximumAmountInForTrade", () => {
+    const mockTrade: Trade = getMockTrade({
+      payAmount: "1000000",
+      payToken: getMockToken({ symbol: "TOKEN", decimals: 18 }),
+      tradeType: TradeType.EXACT_PAY,
+    })
+
+    const mockNonExactPayTrade: Trade = {
+      ...mockTrade,
+      tradeType: TradeType.EXACT_RECEIVE,
+    }
+
+    it("returns the input amount for an EXACT_PAY trade type without slippage", () => {
+      const result = maximumAmountInForTrade(mockTrade, 0)
+      expect(result.value).toBe(BigInt(mockTrade.payAmount))
+      expect(result.decimals).toBe(mockTrade.payToken.decimals)
+    })
+
+    it("calculates the maximum amount in with slippage for a non-EXACT_PAY trade type", () => {
+      const slippage = 100 // 1%
+      const result = maximumAmountInForTrade(mockNonExactPayTrade, slippage)
+      const slippageInPercent = bigDecimal.div(
+        { value: BigInt(slippage), decimals: 2 },
+        { value: BigInt(10000), decimals: 2 },
+      )
+      const expectedValue = bigDecimal.mul(
+        {
+          value: BigInt(mockTrade.payAmount),
+          decimals: mockTrade.payToken.decimals,
+        },
+        bigDecimal.add(bigDecimal.ONE, slippageInPercent),
+      )
+      expect(result.value).toBe(expectedValue.value)
+      expect(result.decimals).toBe(expectedValue.decimals)
+    })
+
+    it("handles zero slippage for a non-EXACT_PAY trade type", () => {
+      const result = maximumAmountInForTrade(mockNonExactPayTrade, 0)
+      // When slippage is zero, the expected value should be the original payAmount
+      const expectedValue = {
+        value: BigInt(mockNonExactPayTrade.payAmount),
+        decimals: mockNonExactPayTrade.payToken.decimals,
+      }
+      expect(result.value).toBe(expectedValue.value)
+      expect(result.decimals).toBe(expectedValue.decimals)
+    })
+
+    it("handles very high slippage for a non-EXACT_PAY trade type", () => {
+      const slippage = 10000 // 100%
+      const result = maximumAmountInForTrade(mockNonExactPayTrade, slippage)
+      const slippageInPercent = bigDecimal.div(
+        { value: BigInt(slippage), decimals: 2 },
+        { value: BigInt(10000), decimals: 2 },
+      )
+      const expectedValue = bigDecimal.mul(
+        {
+          value: BigInt(mockNonExactPayTrade.payAmount),
+          decimals: mockNonExactPayTrade.payToken.decimals,
+        },
+        {
+          ...bigDecimal.add(bigDecimal.ONE, slippageInPercent),
+        },
+      )
+      expect(result.value).toBe(expectedValue.value)
+      expect(result.decimals).toBe(expectedValue.decimals)
+    })
+
+    it("handles slippage greater than 100% for a non-EXACT_PAY trade type", () => {
+      const slippage = 20000 // 200%
+      const result = maximumAmountInForTrade(mockNonExactPayTrade, slippage)
+      const slippageInPercent = bigDecimal.div(
+        { value: BigInt(slippage), decimals: 2 },
+        { value: BigInt(10000), decimals: 2 },
+      )
+      const expectedValue = bigDecimal.mul(
+        {
+          value: BigInt(mockNonExactPayTrade.payAmount),
+          decimals: mockNonExactPayTrade.payToken.decimals,
+        },
+        {
+          ...bigDecimal.add(bigDecimal.ONE, slippageInPercent),
+        },
+      )
+      expect(result.value).toBe(expectedValue.value)
+      expect(result.decimals).toBe(expectedValue.decimals)
+    })
+
+    it("handles negative slippage as zero slippage for a non-EXACT_PAY trade type", () => {
+      const result = maximumAmountInForTrade(mockNonExactPayTrade, -100)
+      const expectedValue = {
+        value: BigInt(mockNonExactPayTrade.payAmount),
+        decimals: mockNonExactPayTrade.payToken.decimals,
+      }
+      expect(result.value).toBe(expectedValue.value)
+      expect(result.decimals).toBe(expectedValue.decimals)
+    })
+  })
+})
diff --git a/packages/extension/src/ui/features/swap/utils/prices.ts b/packages/extension/src/ui/features/swap/utils/prices.ts
new file mode 100644
index 000000000..18613f963
--- /dev/null
+++ b/packages/extension/src/ui/features/swap/utils/prices.ts
@@ -0,0 +1,180 @@
+import { bipsToPercent } from "."
+import { Trade, TradeType } from "../../../../shared/swap/model/trade.model"
+import { prettifyTokenAmount } from "../../../../shared/token/price"
+import { BigDecimal, bigDecimal } from "@argent/shared"
+import { Field } from "../state/fields"
+
+/**
+ * Calculates the execution price given a numerator and denominator.
+ * @param numerator - The numerator amount in BigDecimal.
+ * @param denominator - The denominator amount in BigDecimal.
+ * @returns The execution price as a BigDecimal.
+ */
+export function getExecutionPrice(
+  numerator: BigDecimal,
+  denominator: BigDecimal,
+) {
+  return bigDecimal.div(numerator, denominator)
+}
+
+/**
+ * Helper function to format the execution price from BigDecimal amounts.
+ * @param a - The numerator amount in BigDecimal.
+ * @param b - The denominator amount in BigDecimal.
+ * @returns The formatted execution price or null if not calculable.
+ */
+function formattedExecutionPrice(a: BigDecimal, b: BigDecimal): string | null {
+  const executionPrice = getExecutionPrice(a, b)
+  return prettifyTokenAmount({
+    amount: executionPrice.value,
+    decimals: executionPrice.decimals,
+  })
+}
+
+/**
+ * Options for formatting the execution price of a trade.
+ */
+interface FormatExecutionPriceOptions {
+  /**
+   * The trade to format the execution price for.
+   */
+  trade?: Trade
+  /**
+   * Whether to invert the price in the formatting.
+   */
+  inverted?: boolean
+  /**
+   * Whether to include fees in the execution price.
+   */
+  includeFee?: boolean
+  /**
+   * The separator to use between the tokens in the formatted price.
+   */
+  separator?: string
+}
+
+/**
+ * Formats the execution price of a trade including or excluding fees.
+ * @param options - The FormatExecutionPriceOptions object.
+ * @returns The formatted execution price with or without fees.
+ */
+export function formatExecutionPrice({
+  trade,
+  includeFee = true,
+  inverted = false,
+  separator = "~",
+}: FormatExecutionPriceOptions) {
+  if (!trade) {
+    return ""
+  }
+
+  let payTokenAmount = bigDecimal.toBigDecimal(
+    trade.payAmount,
+    trade.payToken.decimals,
+  )
+
+  const feeTokenAmount = bigDecimal.toBigDecimal(
+    trade.totalFee,
+    trade.payToken.decimals,
+  )
+
+  if (includeFee) {
+    // Actual Execution price will be (payAmount - feeAmount) / receiveAmount
+    payTokenAmount = bigDecimal.sub(payTokenAmount, feeTokenAmount)
+  }
+
+  const receiveTokenAmount = bigDecimal.toBigDecimal(
+    trade.receiveAmount,
+    trade.receiveToken.decimals,
+  )
+
+  return inverted
+    ? `1 ${trade.receiveToken.symbol} ${separator} ${formattedExecutionPrice(
+        payTokenAmount,
+        receiveTokenAmount,
+      )} ${trade.payToken.symbol}`
+    : `1 ${trade.payToken.symbol} ${separator} ${formattedExecutionPrice(
+        receiveTokenAmount,
+        payTokenAmount,
+      )} ${trade.receiveToken.symbol}`
+}
+
+/**
+ * Computes the slippage-adjusted amounts for a trade.
+ * @param trade - The trade to compute the amounts for.
+ * @param allowedSlippage - The user-specified allowed slippage in bips.
+ * @returns An object containing the maximum amount in and minimum amount out for the trade.
+ */
+export function computeSlippageAdjustedAmounts(
+  trade: Trade | undefined,
+  allowedSlippage: number,
+): { [field in Field]?: BigDecimal } {
+  if (!trade)
+    return {
+      [Field.PAY]: undefined,
+      [Field.RECEIVE]: undefined,
+    }
+  return {
+    [Field.PAY]: maximumAmountInForTrade(trade, allowedSlippage),
+    [Field.RECEIVE]: minimumAmountOutFromTrade(trade, allowedSlippage),
+  }
+}
+
+/**
+ * Calculates the minimum amount that should be received from a trade after accounting for slippage.
+ * @param trade - The trade to calculate for.
+ * @param slippage - The slippage percentage in basis points.
+ * @returns The minimum amount that should be received as a BigDecimal.
+ */
+export function minimumAmountOutFromTrade(
+  trade: Trade,
+  slippage: number,
+): BigDecimal {
+  const slippageInPercent = bipsToPercent(slippage)
+
+  const outputAmount: BigDecimal = {
+    value: BigInt(trade.receiveAmount),
+    decimals: trade.receiveToken.decimals,
+  }
+
+  if (trade.tradeType === TradeType.EXACT_RECEIVE) {
+    return outputAmount
+  }
+
+  // Calculate the minimum amount out using the slippage
+  // slippageAdjustedAmountOut = outputAmount / (1 + slippageInPercent)
+
+  const denominator = bigDecimal.add(bigDecimal.ONE, slippageInPercent)
+
+  return bigDecimal.div(outputAmount, denominator)
+}
+
+/**
+ * Calculates the maximum amount that should be paid for a trade after accounting for slippage.
+ * @param trade - The trade to calculate for.
+ * @param slippage - The slippage percentage in basis points.
+ * @returns The maximum amount that should be paid as a BigDecimal.
+ */
+export function maximumAmountInForTrade(
+  trade: Trade,
+  slippage: number,
+): BigDecimal {
+  const slippageInPercent = bipsToPercent(slippage)
+  const inputAmount: BigDecimal = {
+    value: BigInt(trade.payAmount),
+    decimals: trade.payToken.decimals,
+  }
+
+  if (trade.tradeType === TradeType.EXACT_PAY) {
+    return inputAmount
+  }
+
+  if (slippageInPercent.value <= 0n) {
+    return inputAmount
+  }
+
+  // Calculate the maximum amount in using the slippage
+  // slippageAdjustedAmountIn = inputAmount * (1 + slippageInPercent)
+  const multiplier = bigDecimal.add(bigDecimal.ONE, slippageInPercent)
+  return bigDecimal.mul(inputAmount, multiplier)
+}
diff --git a/packages/extension/src/shared/storage/__test__/hooks.test.tsx b/packages/extension/src/ui/hooks/useStorage.test.tsx
similarity index 88%
rename from packages/extension/src/shared/storage/__test__/hooks.test.tsx
rename to packages/extension/src/ui/hooks/useStorage.test.tsx
index 8e0e9d7ee..94cbd5047 100644
--- a/packages/extension/src/shared/storage/__test__/hooks.test.tsx
+++ b/packages/extension/src/ui/hooks/useStorage.test.tsx
@@ -1,10 +1,14 @@
 import { fireEvent, render, screen } from "@testing-library/react"
 import { describe, test } from "vitest"
 
-import { ArrayStorage } from "../array"
-import { useArrayStorage, useKeyValueStorage, useObjectStorage } from "../hooks"
-import { KeyValueStorage } from "../keyvalue"
-import { ObjectStorage } from "../object"
+import { ArrayStorage } from "../../shared/storage/array"
+import {
+  useArrayStorage,
+  useKeyValueStorage,
+  useObjectStorage,
+} from "./useStorage"
+import { KeyValueStorage } from "../../shared/storage/keyvalue"
+import { ObjectStorage } from "../../shared/storage/object"
 
 describe("useKeyValueStorage()", () => {
   test("should render with storage values", async () => {
diff --git a/packages/extension/src/shared/storage/hooks.ts b/packages/extension/src/ui/hooks/useStorage.ts
similarity index 87%
rename from packages/extension/src/shared/storage/hooks.ts
rename to packages/extension/src/ui/hooks/useStorage.ts
index 5ccf56878..9f96740c2 100644
--- a/packages/extension/src/shared/storage/hooks.ts
+++ b/packages/extension/src/ui/hooks/useStorage.ts
@@ -1,11 +1,11 @@
 import { memoize } from "lodash-es"
 import { useCallback, useEffect, useMemo, useRef, useState } from "react"
 
-import { swrCacheProvider } from "../../ui/services/swr.service"
-import { IArrayStorage } from "./array"
-import { IKeyValueStorage } from "./keyvalue"
-import { IObjectStorage } from "./object"
-import { SelectorFn } from "./types"
+import { swrCacheProvider } from "../services/swr.service"
+import { IArrayStorage } from "../../shared/storage/array"
+import { IKeyValueStorage } from "../../shared/storage/keyvalue"
+import { IObjectStorage } from "../../shared/storage/object"
+import { SelectorFn } from "../../shared/storage/types"
 
 export function useKeyValueStorage<
   T extends Record<string, any> = Record<string, any>,
diff --git a/packages/extension/src/ui/routes.ts b/packages/extension/src/ui/routes.ts
index 0da3385e2..eb4aff8ba 100644
--- a/packages/extension/src/ui/routes.ts
+++ b/packages/extension/src/ui/routes.ts
@@ -132,8 +132,14 @@ export const routes = {
     `/account/activity/transaction-detail/:txHash`,
   ),
   accountDeprecated: route("/account/account-deprecated"),
+  accountOwnerWarning: routeWithReturnTo("/account/account-owner-warning"),
   accountsHidden: route(
-    (networkId: string) => `/accounts/hidden/${networkId}`,
+    (networkId: string, returnTo?: string) =>
+      returnTo
+        ? `/accounts/hidden/${networkId}?returnTo=${encodeURIComponent(
+            returnTo,
+          )}`
+        : `/accounts/hidden/${networkId}`,
     "/accounts/hidden/:networkId",
   ),
   accounts: routeWithReturnTo("/accounts"),
@@ -171,9 +177,6 @@ export const routes = {
     (accountAddress) => `/accounts/${accountAddress}/logged-in`,
     "/accounts/:accountAddress/logged-in",
   ),
-  argentAccountEmailPreferences: routeWithReturnTo(
-    "/settings/email-preferences",
-  ),
   shieldAccountOTP: route(
     (accountAddress: string, email: string, flow: Flow) =>
       `/accounts/${accountAddress}/${flow}/otp?email=${encodeURIComponent(
@@ -214,8 +217,19 @@ export const routes = {
   reset: route("/reset"),
   legacy: route("/legacy"),
   settings: routeWithReturnTo("/settings"),
+  settingsPreferences: routeWithReturnTo("/settings/preferences"),
+  settingsBlockExplorer: routeWithReturnTo(
+    "/settings/preferences/block-explorer",
+  ),
+  settingsNftMarketplace: routeWithReturnTo(
+    "/settings/preferences/nft-marketplace",
+  ),
+  settingsEmailNotifications: routeWithReturnTo(
+    "/settings/preferences/email-notifications",
+  ),
   settingsNetworks: route("/settings/developer-settings/networks"),
   settingsSeed: routeWithReturnTo("/settings/seed"),
+  settingsAutoLockTimer: routeWithReturnTo("/settings/auto-lock-timer"),
   settingsAddCustomNetwork: route("/settings/developer-settings/networks/add"),
   settingsEditCustomNetwork: route(
     (networkId) => `/settings/developer-settings/networks/${networkId}/edit`,
@@ -224,12 +238,15 @@ export const routes = {
   settingsRemoveCustomNetwork: route(
     "/settings/developer-settings/networks/remove",
   ),
-  settingsDappConnections: route("/settings/dapp-connections"),
-  settingsPrivacy: route("/settings/privacy"),
+  settingsDappConnectionsAccountList: route("/settings/dapp-connections"),
+  settingsDappConnectionsAccount: route(
+    (accountAddress) => `/settings/dapp-connections/${accountAddress}`,
+    "/settings/dapp-connections/:accountAddress",
+  ),
+  settingsPrivacy: routeWithReturnTo("/settings/privacy"),
   settingsDeveloper: route("/settings/developer-settings"),
   settingsExperimental: route("/settings/developer-settings/experimental"),
   settingsBetaFeatures: route("/settings/developer-settings/beta-features"),
-  settingsBlockExplorer: route("/settings/developer-settings/block-explorer"),
   settingsAddressBook: route("/settings/addressbook"),
   settingsAddressBookAddOrEdit: route(
     (contact?: AddressBookContact) =>
diff --git a/packages/extension/src/ui/services/addresses.ts b/packages/extension/src/ui/services/addresses.ts
deleted file mode 100644
index 004758a05..000000000
--- a/packages/extension/src/ui/services/addresses.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { memoize } from "lodash-es"
-import { getChecksumAddress, num } from "starknet"
-
-// TODO remove this file and use the shared one
-
-export const normalizeAddress = (address: string) => getChecksumAddress(address)
-
-export const formatTruncatedSignerKey = memoize((signerKey: string) => {
-  const start = signerKey.slice(0, 6)
-  const end = signerKey.slice(-4)
-  return `${start}…${end}`
-})
-
-export const formatTruncatedAddress = memoize((address: string) => {
-  const normalized = normalizeAddress(address)
-  const hex = normalized.slice(0, 2)
-  const start = normalized.slice(2, 6)
-  const end = normalized.slice(-4)
-  return `${hex}${start}…${end}`
-})
-
-export const formatFullAddress = memoize((address: string) => {
-  const normalized = normalizeAddress(address)
-  const hex = normalized.slice(0, 2)
-  const rest = normalized.slice(2)
-  const parts = rest.match(/.{1,4}/g) || []
-  return `${hex} ${parts.join(" ")}`
-})
-
-export const isEqualAddress = (a: string, b?: string) => {
-  try {
-    if (!b) {
-      return false
-    }
-    return num.hexToDecimalString(a) === num.hexToDecimalString(b)
-  } catch {
-    // ignore parsing error
-  }
-  return false
-}
-
-export const formatTruncatedString = memoize(
-  (string: string, targetLength: number) => {
-    if (string.length < targetLength) {
-      return string
-    }
-
-    const startEndLength = Math.floor((targetLength - 1) / 2)
-    const start = string.slice(0, startEndLength)
-    const end = string.slice(-startEndLength)
-
-    return `${start}…${end}`
-  },
-)
diff --git a/packages/extension/src/ui/services/argentAccount/implementation.ts b/packages/extension/src/ui/services/argentAccount/implementation.ts
index 1064e9d57..78a8ce3e5 100644
--- a/packages/extension/src/ui/services/argentAccount/implementation.ts
+++ b/packages/extension/src/ui/services/argentAccount/implementation.ts
@@ -1,7 +1,7 @@
 import { messageClient } from "../messaging/trpc"
-import { IArgentAccountServiceUI } from "../../../shared/argentAccount/service/interface"
+import { IArgentAccountServiceUI } from "../../../shared/argentAccount/interface"
 import { booleanToStringSchema } from "@argent/shared"
-import { EmailPreferences } from "./utils"
+import { EmailPreferences } from "../../../shared/argentAccount/schema"
 
 export class ArgentAccountService implements IArgentAccountServiceUI {
   constructor(private trpcMessageClient: typeof messageClient) {}
diff --git a/packages/extension/src/ui/services/argentAccount/utils.ts b/packages/extension/src/ui/services/argentAccount/utils.ts
index 0a3ce33df..0d8ce5719 100644
--- a/packages/extension/src/ui/services/argentAccount/utils.ts
+++ b/packages/extension/src/ui/services/argentAccount/utils.ts
@@ -1,13 +1,9 @@
 import { stringToBooleanSchema } from "@argent/shared"
 import { z } from "zod"
-import { preferencesEndpointPayload } from "../../../background/__new/procedures/argentAccount/updatePreferences.model"
-
-export const emailPreferencesSchema = z.object({
-  isNewsletterEnabled: z.boolean(),
-  isAnnouncementsEnabled: z.boolean(),
-})
-
-export type EmailPreferences = z.infer<typeof emailPreferencesSchema>
+import {
+  preferencesEndpointPayload,
+  emailPreferencesSchema,
+} from "../../../shared/argentAccount/schema"
 
 export const preferencesToEmailPreferences =
   preferencesEndpointPayload.transform((val) => {
diff --git a/packages/extension/src/ui/services/argentApiFetcher.ts b/packages/extension/src/ui/services/argentApiFetcher.ts
index f197e1a38..93aa5d5a3 100644
--- a/packages/extension/src/ui/services/argentApiFetcher.ts
+++ b/packages/extension/src/ui/services/argentApiFetcher.ts
@@ -1,8 +1,5 @@
-import {
-  Fetcher,
-  argentApiHeadersForNetwork,
-  fetcher,
-} from "../../shared/api/fetcher"
+import { Fetcher, fetcher } from "../../shared/api/fetcher"
+import { argentApiHeadersForNetwork } from "../../shared/api/headers"
 import { useAppState } from "../app.state"
 
 /**
diff --git a/packages/extension/src/ui/services/backgroundTransactions.ts b/packages/extension/src/ui/services/backgroundTransactions.ts
index 31eb95ac9..1c80c7952 100644
--- a/packages/extension/src/ui/services/backgroundTransactions.ts
+++ b/packages/extension/src/ui/services/backgroundTransactions.ts
@@ -2,26 +2,25 @@ import { Call, UniversalDeployerContractPayload } from "starknet"
 
 import { sendMessage, waitForMessage } from "../../shared/messages"
 import { ExecuteTransactionRequest } from "../../shared/messages/TransactionMessage"
-import { DeclareContract } from "../../shared/udc/type"
 import { BaseWalletAccount } from "../../shared/wallet.model"
+import { messageClient } from "./messaging/trpc"
+import { ETH_TOKEN_ADDRESS } from "../../shared/network/constants"
+import { DeclareContract } from "../../shared/udc/schema"
 
 export const executeTransaction = (data: ExecuteTransactionRequest) => {
   return sendMessage({ type: "EXECUTE_TRANSACTION", data })
 }
 
-export const getEstimatedFeeFromSequencer = async (call: Call | Call[]) => {
-  void sendMessage({ type: "ESTIMATE_TRANSACTION_FEE", data: call })
-
-  const response = await Promise.race([
-    waitForMessage("ESTIMATE_TRANSACTION_FEE_RES"),
-    waitForMessage("ESTIMATE_TRANSACTION_FEE_REJ"),
-  ])
-
-  if ("error" in response) {
-    throw response.error
-  }
-
-  return response
+export const getEstimatedFee = async (
+  call: Call | Call[],
+  account: BaseWalletAccount,
+  feeTokenAddress: string = ETH_TOKEN_ADDRESS,
+) => {
+  return messageClient.transactionEstimate.estimateTransaction.query({
+    transactions: call,
+    account,
+    feeTokenAddress,
+  })
 }
 
 export const getSimulationEstimatedFee = async (call: Call | Call[]) => {
@@ -46,23 +45,16 @@ export const getSimulationEstimatedFee = async (call: Call | Call[]) => {
 
 export const getAccountDeploymentEstimatedFee = async (
   account?: BaseWalletAccount,
+  feeTokenAddress: string = ETH_TOKEN_ADDRESS,
 ) => {
-  sendMessage({ type: "ESTIMATE_ACCOUNT_DEPLOYMENT_FEE", data: account })
-
-  const response = await Promise.race([
-    waitForMessage("ESTIMATE_ACCOUNT_DEPLOYMENT_FEE_RES"),
-    waitForMessage("ESTIMATE_ACCOUNT_DEPLOYMENT_FEE_REJ"),
-  ])
-
-  if ("error" in response) {
-    throw response.error
-  }
-
-  return response
+  return messageClient.transactionEstimate.estimateAccountDeploy.query({
+    account,
+    feeTokenAddress,
+  })
 }
 
 export const getDeclareContractEstimatedFee = async (data: DeclareContract) => {
-  sendMessage({ type: "ESTIMATE_DECLARE_CONTRACT_FEE", data })
+  void sendMessage({ type: "ESTIMATE_DECLARE_CONTRACT_FEE", data })
 
   const response = await Promise.race([
     waitForMessage("ESTIMATE_DECLARE_CONTRACT_FEE_RES"),
@@ -79,7 +71,7 @@ export const getDeclareContractEstimatedFee = async (data: DeclareContract) => {
 export const getDeployContractEstimatedFee = async (
   data: UniversalDeployerContractPayload,
 ) => {
-  sendMessage({ type: "ESTIMATE_DEPLOY_CONTRACT_FEE", data })
+  void sendMessage({ type: "ESTIMATE_DEPLOY_CONTRACT_FEE", data })
 
   const response = await Promise.race([
     waitForMessage("ESTIMATE_DEPLOY_CONTRACT_FEE_RES"),
diff --git a/packages/extension/src/ui/services/blockExplorer.service.ts b/packages/extension/src/ui/services/blockExplorer.service.ts
index 98a8d60e7..912adda24 100644
--- a/packages/extension/src/ui/services/blockExplorer.service.ts
+++ b/packages/extension/src/ui/services/blockExplorer.service.ts
@@ -7,7 +7,7 @@ import {
   defaultBlockExplorerKey,
   defaultBlockExplorers,
 } from "../../shared/settings/defaultBlockExplorers"
-import { useKeyValueStorage } from "../../shared/storage/hooks"
+import { useKeyValueStorage } from "../hooks/useStorage"
 import { getNetworkIdFromChainId } from "../../shared/network/utils"
 
 export const useBlockExplorerTitle = () => {
diff --git a/packages/extension/src/ui/services/messaging/trpc.ts b/packages/extension/src/ui/services/messaging/trpc.ts
index 5b7e070b8..0a26b9f42 100644
--- a/packages/extension/src/ui/services/messaging/trpc.ts
+++ b/packages/extension/src/ui/services/messaging/trpc.ts
@@ -1,12 +1,18 @@
 import { createTRPCProxyClient } from "@trpc/client"
 import { chromeLink } from "trpc-browser/link"
 import { autoReconnect } from "trpc-browser/shared/chrome"
+import superjson from "superjson"
 import browser from "webextension-polyfill"
 
+/**
+ * This is safe as it's explicity importing a type which can only reasonably be created in background trpc router
+ */
+// eslint-disable-next-line @argent/local/code-import-patterns
 import type { AppRouter } from "../../../background/__new/router"
 
 const initalPort = browser.runtime.connect()
 let _messageClient = createTRPCProxyClient<AppRouter>({
+  transformer: superjson,
   links: [chromeLink({ port: initalPort })],
 })
 
@@ -21,6 +27,7 @@ void autoReconnect(
   (newPort) => {
     console.log("Reconnecting to new port", newPort.name)
     _messageClient = createTRPCProxyClient<AppRouter>({
+      transformer: superjson,
       links: [chromeLink({ port: newPort })],
     })
   },
diff --git a/packages/extension/src/ui/services/sentry.ts b/packages/extension/src/ui/services/sentry.ts
index 04964d277..cd725228b 100644
--- a/packages/extension/src/ui/services/sentry.ts
+++ b/packages/extension/src/ui/services/sentry.ts
@@ -2,7 +2,7 @@ import * as Sentry from "@sentry/react"
 import { useEffect } from "react"
 
 import { settingsStore } from "../../shared/settings"
-import { useKeyValueStorage } from "../../shared/storage/hooks"
+import { useKeyValueStorage } from "../hooks/useStorage"
 
 export const useSentryInit = () => {
   const enableErrorReporting = useKeyValueStorage(
diff --git a/packages/extension/src/ui/services/swap/implementation.ts b/packages/extension/src/ui/services/swap/implementation.ts
new file mode 100644
index 000000000..bc7ce359a
--- /dev/null
+++ b/packages/extension/src/ui/services/swap/implementation.ts
@@ -0,0 +1,54 @@
+import { Address } from "@argent/shared"
+import { messageClient } from "../messaging/trpc"
+import { ISwapService } from "./interface"
+import { SwapQuoteResponse } from "../../../shared/swap/model/quote.model"
+import { Trade } from "../../../shared/swap/model/trade.model"
+import { SwapOrderResponse } from "../../../shared/swap/model/order.model"
+import { Call } from "starknet"
+
+export class SwapService implements ISwapService {
+  constructor(private trpcMessageClient: typeof messageClient) {}
+
+  async getSwapQuoteForPay(
+    payTokenAddress: Address,
+    receiveTokenAddress: Address,
+    payAmount: string,
+    accountAddress: Address,
+  ): Promise<SwapQuoteResponse> {
+    return this.trpcMessageClient.swap.getSwapQuoteForPay.query({
+      payTokenAddress,
+      receiveTokenAddress,
+      payAmount,
+      accountAddress,
+    })
+  }
+
+  getSwapTradeFromQuote(
+    quote: SwapQuoteResponse,
+    networkId: string,
+  ): Promise<Trade> {
+    return this.trpcMessageClient.swap.getSwapTradeFromQuote.query({
+      quote,
+      networkId,
+    })
+  }
+
+  getSwapOrderFromTrade(
+    accountAddress: Address,
+    trade: Trade,
+    userSlippageTolerance: number,
+  ): Promise<SwapOrderResponse> {
+    return this.trpcMessageClient.swap.getSwapOrderFromTrade.mutate({
+      accountAddress,
+      trade,
+      userSlippageTolerance,
+    })
+  }
+
+  async makeSwap(transactions: Call[], title: string) {
+    await this.trpcMessageClient.swap.makeSwap.mutate({
+      transactions,
+      title,
+    })
+  }
+}
diff --git a/packages/extension/src/ui/services/swap/index.ts b/packages/extension/src/ui/services/swap/index.ts
new file mode 100644
index 000000000..440893a1e
--- /dev/null
+++ b/packages/extension/src/ui/services/swap/index.ts
@@ -0,0 +1,4 @@
+import { SwapService } from "./implementation"
+import { messageClient } from "../messaging/trpc"
+
+export const swapService = new SwapService(messageClient)
diff --git a/packages/extension/src/ui/services/swap/interface.ts b/packages/extension/src/ui/services/swap/interface.ts
new file mode 100644
index 000000000..d09b9eb06
--- /dev/null
+++ b/packages/extension/src/ui/services/swap/interface.ts
@@ -0,0 +1,24 @@
+import { Address } from "@argent/shared"
+import { SwapOrderResponse } from "../../../shared/swap/model/order.model"
+import { SwapQuoteResponse } from "../../../shared/swap/model/quote.model"
+import { Trade } from "../../../shared/swap/model/trade.model"
+import { Call } from "starknet"
+
+export interface ISwapService {
+  getSwapQuoteForPay: (
+    payTokenAddress: Address,
+    receiveTokenAddress: Address,
+    payAmount: string,
+    accountAddress: Address,
+  ) => Promise<SwapQuoteResponse>
+  getSwapTradeFromQuote: (
+    quote: SwapQuoteResponse,
+    networkId: string,
+  ) => Promise<Trade>
+  getSwapOrderFromTrade: (
+    accountAddress: Address,
+    trade: Trade,
+    userSlippage: number,
+  ) => Promise<SwapOrderResponse>
+  makeSwap(transaction: Call[], title: string): Promise<void>
+}
diff --git a/packages/extension/src/ui/services/swr.service.ts b/packages/extension/src/ui/services/swr.service.ts
index 4e59a8853..f1e86c274 100644
--- a/packages/extension/src/ui/services/swr.service.ts
+++ b/packages/extension/src/ui/services/swr.service.ts
@@ -32,7 +32,9 @@ const swrPersistedCache: Cache = {
       setItemWithStorageQuotaExceededStrategy(
         unstable_serialize(key),
         JSON.stringify(value, (_key, value) =>
-          typeof value === "bigint" ? value.toString() : value,
+          typeof value === "bigint"
+            ? { __type: "bigint", value: value.toString() }
+            : value,
         ),
       )
     } catch (e) {
@@ -97,7 +99,7 @@ export function useConditionallyEnabledSWR<Data = any, Error = any>(
   /** reset the cache when disabled */
   useEffect(() => {
     if (!enabled) {
-      result.mutate()
+      void result.mutate()
       cache.delete(key)
     }
     // dont add result to dependencies to avoid revalidating on every render
diff --git a/packages/extension/src/ui/services/tokens/implementation.ts b/packages/extension/src/ui/services/tokens/implementation.ts
index c98c82a2d..3b53d5e4e 100644
--- a/packages/extension/src/ui/services/tokens/implementation.ts
+++ b/packages/extension/src/ui/services/tokens/implementation.ts
@@ -1,8 +1,6 @@
 import { Address } from "@argent/shared"
 
-import { Network } from "../../../shared/network"
 import { TokenView } from "../../features/accountTokens/tokens.service"
-import { getNetworkFeeToken } from "../../features/accountTokens/tokens.state"
 import { messageClient } from "../messaging/trpc"
 import { ITokensService } from "./interface"
 import { formatTokenBalance } from "./utils"
@@ -12,7 +10,6 @@ import {
   BaseTokenWithBalance,
   TokenWithOptionalBigIntBalance,
 } from "../../../shared/token/__new/types/tokenBalance.model"
-import { TokenError } from "../../../shared/errors/token"
 import { BaseToken, Token } from "../../../shared/token/__new/types/token.model"
 
 export const DEFAULT_TOKEN_LENGTH = 9
@@ -122,53 +119,6 @@ export class TokenService implements ITokensService {
     }, {})
   }
 
-  async fetchFeeTokenBalance(accountAddress: Address, networkId: string) {
-    // todo move to constructor
-    const token = await getNetworkFeeToken(networkId)
-    if (!token) {
-      return "0x0"
-    }
-
-    const { balance } = await this.getAccountBalance(
-      token.address,
-      accountAddress,
-      networkId,
-    )
-
-    return balance
-  }
-
-  async fetchFeeTokenBalanceForAllAccounts(
-    accountAddresses: Address[],
-    network: Network,
-  ) {
-    const token = await getNetworkFeeToken(network.id)
-    if (!token) {
-      throw new TokenError({
-        code: "FEE_TOKEN_NOT_FOUND",
-      })
-    }
-
-    const balances = (
-      await Promise.all(
-        accountAddresses.map((accountAddress) =>
-          this.trpcMessageClient.tokens.getAccountBalance.query({
-            tokenAddress: token.address,
-            accountAddress,
-            networkId: network.id,
-          }),
-        ),
-      )
-    ).map(({ balance }) => balance)
-
-    return accountAddresses.reduce<Record<string, string>>((acc, addr, i) => {
-      return {
-        ...acc,
-        [addr]: balances[i],
-      }
-    }, {})
-  }
-
   async send({
     to,
     method,
@@ -192,11 +142,4 @@ export class TokenService implements ITokensService {
       subtitle,
     })
   }
-
-  async swap(transactions: Call[], title: string) {
-    await this.trpcMessageClient.tokens.swap.mutate({
-      transactions,
-      title,
-    })
-  }
 }
diff --git a/packages/extension/src/ui/services/tokens/interface.ts b/packages/extension/src/ui/services/tokens/interface.ts
index dd3616220..eb8f25981 100644
--- a/packages/extension/src/ui/services/tokens/interface.ts
+++ b/packages/extension/src/ui/services/tokens/interface.ts
@@ -1,8 +1,7 @@
 import { Address } from "@argent/shared"
 
-import { Network } from "../../../shared/network"
 import { TokenView } from "../../features/accountTokens/tokens.service"
-import { BigNumberish, Call, RawArgs } from "starknet"
+import { Call, RawArgs } from "starknet"
 import { BalancesMap } from "./types"
 import {
   BaseTokenWithBalance,
@@ -39,14 +38,6 @@ export interface ITokensService {
     accountAddress: Address,
     networkId: string,
   ) => Promise<BalancesMap>
-  fetchFeeTokenBalance: (
-    accountAddress: Address,
-    networkId: Address,
-  ) => Promise<BigNumberish>
-  fetchFeeTokenBalanceForAllAccounts(
-    accountAddresses: Address[],
-    network: Network,
-  ): Promise<Record<string, string>>
   send({
     to,
     method,
@@ -60,5 +51,4 @@ export interface ITokensService {
     title: string
     subtitle: string
   }): Promise<void>
-  swap(transaction: Call[], title: string): Promise<void>
 }
diff --git a/packages/extension/src/ui/services/tokens/test/index.test.ts b/packages/extension/src/ui/services/tokens/test/index.test.ts
index 44a423ce2..1afae9f72 100644
--- a/packages/extension/src/ui/services/tokens/test/index.test.ts
+++ b/packages/extension/src/ui/services/tokens/test/index.test.ts
@@ -1,9 +1,8 @@
 import { Address } from "@argent/shared"
 
-import { Network } from "../../../../shared/network"
-import { mockNetworks } from "../../../features/networks/NetworkSwitcher/NetworkSwitcher.test"
 import { messageClient } from "../../messaging/trpc"
 import { TokenService } from "../implementation"
+import { Mocked } from "vitest"
 
 const messageClientMock = {
   tokens: {
@@ -32,7 +31,7 @@ const messageClientMock = {
       ]),
     },
   },
-} as unknown as jest.Mocked<typeof messageClient>
+} as unknown as Mocked<typeof messageClient>
 
 describe("TokenService", () => {
   let testClass: TokenService
@@ -167,127 +166,4 @@ describe("TokenService", () => {
       })
     })
   })
-
-  describe("fetchFeeTokenBalance", () => {
-    it("should return the fee token balance for an account", async () => {
-      // Mock the trpcMessageClient.tokens.getAccountBalance.query method
-      vi.mock("../../../features/accountTokens/tokens.state", () => ({
-        getNetworkFeeToken: vi.fn().mockReturnValue(
-          Promise.resolve({
-            address: "0x123",
-            symbol: "TKN",
-            networkId: "1",
-            name: "Token",
-            decimals: 18,
-          }),
-        ),
-      }))
-      messageClientMock.tokens.getAccountBalance.query = vi
-        .fn()
-        .mockResolvedValue({
-          address: "0x123",
-          networkId: "1",
-          account: {
-            address: "0x789",
-            networkId: "1",
-          },
-          balance: "500",
-        })
-
-      const result = await testClass.fetchFeeTokenBalance("0x123", "1")
-
-      expect(result).toEqual("500")
-      expect(
-        messageClientMock.tokens.getAccountBalance.query,
-      ).toHaveBeenCalledWith({
-        tokenAddress: expect.any(String),
-        accountAddress: "0x123",
-        networkId: "1",
-      })
-    })
-  })
-
-  describe("fetchFeeTokenBalanceForAllAccounts", () => {
-    it("should return the fee token balances for all accounts", async () => {
-      // Mock the trpcMessageClient.tokens.getAccountBalance.query method
-      messageClientMock.tokens.getAccountBalance.query = vi
-        .fn()
-        .mockImplementation(({ accountAddress }) => {
-          if (accountAddress === "0x789") {
-            return Promise.resolve({
-              address: "0x123",
-              networkId: "2",
-              account: {
-                address: "0x789",
-                networkId: "2",
-              },
-              balance: "1000",
-            })
-          }
-          if (accountAddress === "0xabc") {
-            return Promise.resolve({
-              address: "0x123",
-              networkId: "2",
-              account: {
-                address: "0xabc",
-                networkId: "2",
-              },
-              balance: "2000",
-            })
-          }
-        })
-
-      const network: Network = {
-        ...mockNetworks[1],
-        multicallAddress: "0xmulticall",
-      }
-
-      const result = await testClass.fetchFeeTokenBalanceForAllAccounts(
-        ["0x789", "0xabc"],
-        network,
-      )
-
-      expect(result).toEqual({
-        "0x789": BigInt(1000).toString(),
-        "0xabc": BigInt(2000).toString(),
-      })
-      expect(
-        messageClientMock.tokens.getAccountBalance.query,
-      ).toHaveBeenCalledTimes(2)
-      expect(
-        messageClientMock.tokens.getAccountBalance.query,
-      ).toHaveBeenNthCalledWith(1, {
-        tokenAddress: expect.any(String),
-        accountAddress: "0x789",
-        networkId: "2",
-      })
-      expect(
-        messageClientMock.tokens.getAccountBalance.query,
-      ).toHaveBeenNthCalledWith(2, {
-        tokenAddress: expect.any(String),
-        accountAddress: "0xabc",
-        networkId: "2",
-      })
-    })
-  })
-  describe("fetchFeeTokenBalance", () => {
-    it("should throw an error if fee token is not found", async () => {
-      const module = await import(
-        "../../../features/accountTokens/tokens.state"
-      )
-      module.getNetworkFeeToken = vi.fn().mockResolvedValueOnce(null)
-      const network: Network = {
-        ...mockNetworks[0],
-        multicallAddress: "0xmulticall",
-        feeTokenAddress: undefined,
-      }
-
-      await expect(() =>
-        testClass.fetchFeeTokenBalanceForAllAccounts(
-          ["0x789", "0xabc"],
-          network,
-        ),
-      ).rejects.toThrowError("Fee token not found")
-    })
-  })
 })
diff --git a/packages/extension/src/ui/services/udc/implementation.ts b/packages/extension/src/ui/services/udc/implementation.ts
index 20ac6d29c..e95e1dd4e 100644
--- a/packages/extension/src/ui/services/udc/implementation.ts
+++ b/packages/extension/src/ui/services/udc/implementation.ts
@@ -1,10 +1,10 @@
+import { DeclareContractBackgroundPayload } from "../../../shared/udc/schema"
 import {
   DeployContractPayload,
   IUdcService,
 } from "../../../shared/udc/service/interface"
 import { messageClient } from "../messaging/trpc"
 import { z } from "zod"
-import { DeclareContractBackgroundPayload } from "../../../shared/udc/type"
 
 export class UdcService implements IUdcService {
   constructor(private trpcMessageClient: typeof messageClient) {}
diff --git a/packages/extension/src/ui/views/account.ts b/packages/extension/src/ui/views/account.ts
index ee309e9b8..88577d101 100644
--- a/packages/extension/src/ui/views/account.ts
+++ b/packages/extension/src/ui/views/account.ts
@@ -63,7 +63,7 @@ export const hiddenAccountsOnNetworkFamily =
   accountsOnNetworkFamilyFactory(hiddenAccountsView)
 
 export const accountFindFamily = atomFamily(
-  (baseAccount: BaseWalletAccount) =>
+  (baseAccount?: BaseWalletAccount) =>
     atom(async (get) => {
       const accounts = await get(allAccountsView)
       return accounts.find((account) => accountsEqual(account, baseAccount))
diff --git a/packages/extension/src/ui/views/estimatedFees.ts b/packages/extension/src/ui/views/estimatedFees.ts
index 4bd0ac2e0..225df6ea6 100644
--- a/packages/extension/src/ui/views/estimatedFees.ts
+++ b/packages/extension/src/ui/views/estimatedFees.ts
@@ -1,11 +1,9 @@
 import { Call } from "starknet"
-import {
-  estimatedFeesRepo,
-  isEqualTransactions,
-} from "../../shared/transactionSimulation/fees/estimatedFeesRepository"
+import { estimatedFeesRepo } from "../../shared/transactionSimulation/fees/estimatedFeesRepository"
 import { atomFromRepo } from "./implementation/atomFromRepo"
 import { atomFamily } from "jotai/utils"
 import { atom } from "jotai"
+import { objectHash } from "../../shared/objectHash"
 
 export const allEstimatedFeesAtom = atomFromRepo(estimatedFeesRepo)
 
@@ -13,9 +11,8 @@ export const estimatedFeesAtom = atomFamily(
   (transactions: Call | Call[]) =>
     atom(async (get) => {
       const estimatedFees = await get(allEstimatedFeesAtom)
-      return estimatedFees.find((estimatedFee) =>
-        isEqualTransactions(estimatedFee.transactions, transactions),
-      )
+      const id = objectHash(transactions)
+      return estimatedFees.find((estimatedFee) => id === estimatedFee.id)
     }),
-  (a, b) => isEqualTransactions(a, b),
+  (a, b) => objectHash(a) === objectHash(b),
 )
diff --git a/packages/extension/src/ui/views/multisig.ts b/packages/extension/src/ui/views/multisig.ts
index df0f0a4ce..e63759eec 100644
--- a/packages/extension/src/ui/views/multisig.ts
+++ b/packages/extension/src/ui/views/multisig.ts
@@ -3,7 +3,11 @@ import { atomFamily } from "jotai/utils"
 
 import { atomFromRepo } from "./implementation/atomFromRepo"
 import { isEqualAddress } from "@argent/shared"
-import { multisigMetadataRepo } from "../../shared/multisig/repository"
+import {
+  multisigBaseWalletRepo,
+  multisigMetadataRepo,
+  pendingMultisigRepo,
+} from "../../shared/multisig/repository"
 import { BaseMultisigWalletAccount } from "../../shared/wallet.model"
 import { MultisigMetadata } from "../../shared/multisig/types"
 
@@ -31,3 +35,7 @@ export const creatorMultisigMetadataAtomFamily = (
 export const creatorMultisigMetadataView = creatorMultisigMetadataAtomFamily(
   allMultisigMetadataView,
 )
+
+export const pendingMultisigsView = atomFromRepo(pendingMultisigRepo)
+
+export const multisigBaseWalletView = atomFromRepo(multisigBaseWalletRepo)
diff --git a/packages/extension/src/ui/views/preAuthorizations.ts b/packages/extension/src/ui/views/preAuthorizations.ts
new file mode 100644
index 000000000..12dbaff2a
--- /dev/null
+++ b/packages/extension/src/ui/views/preAuthorizations.ts
@@ -0,0 +1,70 @@
+import { getAccountIdentifier } from "@argent/shared"
+import { atom } from "jotai"
+import { atomFamily } from "jotai/utils"
+import { groupBy } from "lodash-es"
+
+import {
+  PreAuthorization,
+  isEqualPreAuthorization,
+} from "../../shared/preAuthorization/schema"
+import { preAuthorizationRepo } from "../../shared/preAuthorization/store"
+import { accountsEqual } from "../../shared/utils/accountsEqual"
+import type { BaseWalletAccount } from "../../shared/wallet.model"
+import { atomFromRepo } from "./implementation/atomFromRepo"
+
+/**
+ * @internal use `allPreAuthorizationsView` instead
+ */
+const allPreAuthorizationsAtom = atomFromRepo(preAuthorizationRepo)
+
+export const allPreAuthorizationsView = atom(async (get) => {
+  const all = await get(allPreAuthorizationsAtom)
+  return all
+})
+
+export const preAuthorizationsGroupedByAccountIdentifierForNetworkId =
+  atomFamily((networkId: string) => {
+    return atom(async (get) => {
+      const all = await get(preAuthorizationsForNetworkId(networkId))
+      const grouped = groupBy(all, (preAuthorization) =>
+        getAccountIdentifier(preAuthorization.account),
+      )
+      return grouped
+    })
+  })
+
+export const preAuthorizationsForNetworkId = atomFamily((networkId: string) => {
+  return atom(async (get) => {
+    const all = await get(allPreAuthorizationsView)
+    const filtered = all.filter(
+      (preAuthorization) => networkId === preAuthorization.account.networkId,
+    )
+    return filtered
+  })
+})
+
+export const preAuthorizationsForAccount = atomFamily(
+  (account?: BaseWalletAccount) => {
+    return atom(async (get) => {
+      const all = await get(allPreAuthorizationsView)
+      const filtered = all.filter((preAuthorization) =>
+        accountsEqual(preAuthorization.account, account),
+      )
+      return filtered
+    })
+  },
+  (a, b) => accountsEqual(a, b),
+)
+
+export const isPreauthorized = atomFamily(
+  (maybePreAuthorization: Partial<PreAuthorization>) => {
+    return atom(async (get) => {
+      const all = await get(allPreAuthorizationsView)
+      const result = all.some((preAuthorization) =>
+        isEqualPreAuthorization(maybePreAuthorization, preAuthorization),
+      )
+      return result
+    })
+  },
+  (a, b) => isEqualPreAuthorization(a, b),
+)
diff --git a/packages/extension/src/ui/views/settings.ts b/packages/extension/src/ui/views/settings.ts
new file mode 100644
index 000000000..724e32eb3
--- /dev/null
+++ b/packages/extension/src/ui/views/settings.ts
@@ -0,0 +1,13 @@
+import { atom } from "jotai"
+
+import { settingsStore } from "../../shared/settings/store"
+import { atomFromKeyValueStore } from "./implementation/atomFromKeyValueStore"
+
+export const hideTokensWithNoBalanceAtom = atomFromKeyValueStore(
+  settingsStore,
+  "hideTokensWithNoBalance",
+)
+
+export const hideTokensWithNoBalanceView = atom((get) =>
+  get(hideTokensWithNoBalanceAtom),
+)
diff --git a/packages/extension/src/ui/views/token.ts b/packages/extension/src/ui/views/token.ts
index 69ba372e7..39fc3d96a 100644
--- a/packages/extension/src/ui/views/token.ts
+++ b/packages/extension/src/ui/views/token.ts
@@ -15,13 +15,6 @@ export const allTokensView = atom(async (get) => {
   return tokens
 })
 
-export const tokensToShowView = atom(async (get) => {
-  const tokens = await get(allTokensAtom)
-  return tokens.filter(
-    (token) => token.showAlways || token.popular || token.custom,
-  )
-})
-
 /**
  * @returns ETH for ALL networks
  */
@@ -69,22 +62,23 @@ export const allTokensOnNetworkFamily =
 /**
  * @returns Fee Token for a given network
  */
-export const networkFeeTokenOnNetworkFamily = atomFamily((networkId?: string) =>
-  atom(async (get) => {
-    if (!networkId) {
-      return
-    }
-    const tokens = await get(allTokensView)
-    const network = await get(networkView(networkId))
-    if (!network?.feeTokenAddress) {
-      return
-    }
-    return tokens.find(
-      (token) =>
-        token.address === network.feeTokenAddress &&
-        token.networkId === networkId,
-    )
-  }),
+export const networkFeeTokensOnNetworkFamily = atomFamily(
+  (networkId?: string) =>
+    atom(async (get) => {
+      if (!networkId) {
+        return
+      }
+      const tokens = await get(allTokensView)
+      const network = await get(networkView(networkId))
+      if (!network) {
+        return
+      }
+      return tokens.filter(
+        (token) =>
+          network.possibleFeeTokenAddresses.includes(token.address) &&
+          token.networkId === networkId,
+      )
+    }),
 )
 
 export const tokenFindFamily = atomFamily(
diff --git a/packages/extension/src/ui/views/tokenBalances.ts b/packages/extension/src/ui/views/tokenBalances.ts
index 249a30710..d786f48d9 100644
--- a/packages/extension/src/ui/views/tokenBalances.ts
+++ b/packages/extension/src/ui/views/tokenBalances.ts
@@ -6,7 +6,7 @@ import { BaseWalletAccount } from "../../shared/wallet.model"
 import { accountsEqual } from "../../shared/utils/accountsEqual"
 import { BaseToken } from "../../shared/token/__new/types/token.model"
 import { equalToken } from "../../shared/token/__new/utils"
-import { networkFeeTokenOnNetworkFamily } from "./token"
+import { networkFeeTokensOnNetworkFamily } from "./token"
 
 const tokenBalancesAtom = atomFromRepo(tokenBalanceRepo)
 
@@ -45,18 +45,18 @@ export const tokenBalanceForTokenView = atomFamily(
   (a, b) => !!a && !!b && equalToken(a, b),
 )
 
-export const feeTokenBalanceView = atomFamily(
+export const feeTokenBalancesView = atomFamily(
   (account?: BaseWalletAccount) => {
     return atom(async (get) => {
       const tokenBalances = await get(tokenBalanceForAccountView(account))
       if (!account || !tokenBalances) {
         return
       }
-      const feeToken = await get(
-        networkFeeTokenOnNetworkFamily(account.networkId),
+      const feeTokens = await get(
+        networkFeeTokensOnNetworkFamily(account.networkId),
       )
-      return tokenBalances.find(
-        (tokenBalance) => feeToken && equalToken(tokenBalance, feeToken),
+      return tokenBalances.filter((tokenBalance) =>
+        feeTokens?.some((token) => equalToken(token, tokenBalance)),
       )
     })
   },
diff --git a/packages/extension/src/ui/views/tokenPrices.ts b/packages/extension/src/ui/views/tokenPrices.ts
index 175f9d090..19e783553 100644
--- a/packages/extension/src/ui/views/tokenPrices.ts
+++ b/packages/extension/src/ui/views/tokenPrices.ts
@@ -1,10 +1,6 @@
-import { atomFamily } from "jotai/utils"
 import { atom } from "jotai"
-import { tokenBalanceRepo } from "../../shared/token/__new/repository/tokenBalance"
 import { tokenPriceRepo } from "../../shared/token/__new/repository/tokenPrice"
 import { atomFromRepo } from "./implementation/atomFromRepo"
-import { BaseWalletAccount } from "../../shared/wallet.model"
-import { accountsEqual } from "../../shared/utils/accountsEqual"
 
 const tokenPricesAtom = atomFromRepo(tokenPriceRepo)
 
diff --git a/packages/extension/test/account.mock.ts b/packages/extension/test/account.mock.ts
index 5c7a55ddd..66126598a 100644
--- a/packages/extension/test/account.mock.ts
+++ b/packages/extension/test/account.mock.ts
@@ -8,11 +8,13 @@ import {
   WalletAccountSigner,
 } from "../src/shared/wallet.model"
 import { Account } from "../src/ui/features/accounts/Account"
+import { ETH_TOKEN_ADDRESS } from "../src/shared/network/constants"
 
 const defaultNetwork: Network = {
   id: "localhost",
   name: "localhostNetwork",
   chainId: "1",
+  possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS],
   rpcUrl: "rpcUrl",
 }
 const defaultSigner: WalletAccountSigner = {
diff --git a/packages/extension/test/addresses.test.ts b/packages/extension/test/addresses.test.ts
deleted file mode 100644
index af16e1bba..000000000
--- a/packages/extension/test/addresses.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { describe, expect, test } from "vitest"
-
-import { isEqualAddress } from "../src/ui/services/addresses"
-
-describe("isEqualAddress", () => {
-  describe("when valid", () => {
-    test("should match same address", () => {
-      expect(
-        isEqualAddress(
-          "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
-          "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
-        ),
-      ).toBe(true)
-    })
-    test("should match same address regardless of zero padding", () => {
-      expect(
-        isEqualAddress(
-          "0x33d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
-          "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
-        ),
-      ).toBe(true)
-      expect(
-        isEqualAddress(
-          "33d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
-          "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
-        ),
-      ).toBe(true)
-    })
-    test("should match regardless of case", () => {
-      expect(
-        isEqualAddress(
-          "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
-          "0x033D2A165D2A2AE64CBAF8E6DFF7F0C1974D0F41CD4F0C24D273373D4837BCFD",
-        ),
-      ).toBe(true)
-    })
-  })
-  describe("when invalid", () => {
-    test("should return false without throwing", () => {
-      expect(
-        isEqualAddress(
-          "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
-          "foo",
-        ),
-      ).toBe(false)
-      expect(isEqualAddress("foo", "foo")).toBe(false)
-    })
-  })
-})
diff --git a/packages/extension/test/error.test.ts b/packages/extension/test/error.test.ts
index 62459e270..fe9371c75 100644
--- a/packages/extension/test/error.test.ts
+++ b/packages/extension/test/error.test.ts
@@ -19,11 +19,11 @@ describe("error", () => {
           /** 'false' excludes the stack trace which is environment-specific */
           expect(coerceErrorToString(error, false)).toMatchInlineSnapshot(`
           "{
-            \\"message\\": \\"Error message\\",
-            \\"url\\": \\"http://foo/v1/bar\\",
-            \\"status\\": 123,
-            \\"statusText\\": \\"Foo bar\\",
-            \\"responseText\\": \\"Foo bar baz\\"
+            "message": "Error message",
+            "url": "http://foo/v1/bar",
+            "status": 123,
+            "statusText": "Foo bar",
+            "responseText": "Foo bar baz"
           }"
         `)
         })
@@ -33,15 +33,15 @@ describe("error", () => {
           expect(coerceErrorToString({})).toMatchInlineSnapshot('"{}"')
           expect(coerceErrorToString({ foo: "bar" })).toMatchInlineSnapshot(`
           "{
-            \\"foo\\": \\"bar\\"
+            "foo": "bar"
           }"
         `)
           expect(coerceErrorToString([1, 2, 3])).toMatchInlineSnapshot(`
           "{
-            \\"0\\": 1,
-            \\"1\\": 2,
-            \\"2\\": 3,
-            \\"length\\": 3
+            "0": 1,
+            "1": 2,
+            "2": 3,
+            "length": 3
           }"
         `)
         })
diff --git a/packages/extension/test/fetcher.test.ts b/packages/extension/test/fetcher.test.ts
index dccd37dba..2941253a7 100644
--- a/packages/extension/test/fetcher.test.ts
+++ b/packages/extension/test/fetcher.test.ts
@@ -13,10 +13,6 @@ const BASE_URL_ENDPOINT = "http://foo/v1/bar"
 const INVALID_URL_ENDPOINT = "http://foo/v1/bar/invalid"
 const INVALID_PAYLOAD_URL_ENDPOINT = "http://foo/v1/bar/invalid/payload"
 
-/**
- * @vitest-environment jsdom
- */
-
 const server = setupServer(
   rest.get(BASE_URL_ENDPOINT, (req, res, ctx) => {
     return res(ctx.json({ foo: "bar" }))
diff --git a/packages/extension/test/keyDerivation.test.ts b/packages/extension/test/keyDerivation.test.ts
index fe24fe6dd..eac2cfda0 100644
--- a/packages/extension/test/keyDerivation.test.ts
+++ b/packages/extension/test/keyDerivation.test.ts
@@ -1,7 +1,6 @@
-import { describe, expect, test } from "vitest"
+import { expect, test } from "vitest"
 
 import {
-  getNextPathIndex,
   getStarkPair,
   pathHash,
   grindKey,
@@ -37,72 +36,3 @@ test("pathHash", () => {
   expect(pathHash("starkex")).toBe(579218131)
   expect(pathHash("argentx")).toBe(1148870696)
 })
-
-describe("getNextPathIndex", () => {
-  test("incrementing", () => {
-    expect(
-      getNextPathIndex(
-        ["m/44'/9004'/0'/0/0", "m/44'/9004'/0'/0/1", "m/44'/9004'/0'/0/2"],
-        STANDARD_DERIVATION_PATH,
-      ),
-    ).toBe(3)
-  })
-
-  test("fill incrementing gap", () => {
-    expect(
-      getNextPathIndex(
-        ["m/44'/9004'/0'/0/0", "m/44'/9004'/0'/0/1", "m/44'/9004'/0'/0/3"],
-        STANDARD_DERIVATION_PATH,
-      ),
-    ).toBe(2)
-  })
-
-  test("fill big gap", () => {
-    expect(
-      getNextPathIndex(
-        ["m/44'/9004'/0'/0/0", "m/44'/9004'/0'/0/4", "m/44'/9004'/0'/0/11"],
-        STANDARD_DERIVATION_PATH,
-      ),
-    ).toBe(1)
-  })
-
-  test("fill 0 gap", () => {
-    expect(
-      getNextPathIndex(
-        ["m/44'/9004'/0'/0/3", "m/44'/9004'/0'/0/1"],
-        STANDARD_DERIVATION_PATH,
-      ),
-    ).toBe(0)
-  })
-
-  test("legacy gets ignored", () => {
-    expect(
-      getNextPathIndex(
-        [
-          "m/2645'/1195502025'/1148870696'/0'/0'/0",
-          "m/2645'/1195502025'/1148870696'/0'/0'/1",
-        ],
-        STANDARD_DERIVATION_PATH,
-      ),
-    ).toBe(0)
-  })
-
-  test("can still add legacy paths to mixed array", () => {
-    expect(
-      getNextPathIndex(
-        [
-          "m/2645'/1195502025'/1148870696'/0'/0'/0",
-          "m/2645'/1195502025'/1148870696'/0'/0'/1",
-          "m/44'/9004'/0'/0/0",
-          "m/44'/9004'/0'/0/1",
-          "m/44'/9004'/0'/0/2",
-        ],
-        "m/2645'/1195502025'/1148870696'/0'/0'",
-      ),
-    ).toBe(2)
-  })
-
-  test("empty array", () => {
-    expect(getNextPathIndex([], STANDARD_DERIVATION_PATH)).toBe(0)
-  })
-})
diff --git a/packages/extension/test/network.mock.ts b/packages/extension/test/network.mock.ts
index f7b40198e..5e5afabd3 100644
--- a/packages/extension/test/network.mock.ts
+++ b/packages/extension/test/network.mock.ts
@@ -1,4 +1,8 @@
 import { Network } from "../src/shared/network"
+import {
+  ETH_TOKEN_ADDRESS,
+  STRK_TOKEN_ADDRESS,
+} from "../src/shared/network/constants"
 
 const defaultNetwork: Network = {
   id: "mock",
@@ -9,6 +13,7 @@ const defaultNetwork: Network = {
   accountClassHash: {
     standard: "standard",
   },
+  possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS, STRK_TOKEN_ADDRESS],
 }
 
 export const getMockNetwork = (overrides?: Partial<Network>) => ({
diff --git a/packages/extension/test/setup.ts b/packages/extension/test/setup.ts
index e3559241b..8e984178c 100644
--- a/packages/extension/test/setup.ts
+++ b/packages/extension/test/setup.ts
@@ -39,4 +39,9 @@ vi.stubGlobal("chrome", {
       addListener: noop,
     },
   },
+  tabs: {
+    onRemoved: {
+      addListener: noop,
+    },
+  },
 })
diff --git a/packages/extension/test/swr.test.tsx b/packages/extension/test/swr.test.tsx
index e22108247..2337a9c5f 100644
--- a/packages/extension/test/swr.test.tsx
+++ b/packages/extension/test/swr.test.tsx
@@ -10,7 +10,7 @@ import {
   withPolling,
 } from "../src/ui/services/swr.service"
 
-const getTimeout = (retryCount: number) => 100 // no need for backoff in testing
+const getTimeout = (_retryCount: number) => 100 // no need for backoff in testing
 
 describe("swr", () => {
   describe("useConditionallyEnabledSWR()", () => {
diff --git a/packages/extension/test/token.mock.ts b/packages/extension/test/token.mock.ts
index ef871b979..265eaf9b8 100644
--- a/packages/extension/test/token.mock.ts
+++ b/packages/extension/test/token.mock.ts
@@ -4,7 +4,10 @@ import {
   BaseToken,
   Token,
 } from "../src/shared/token/__new/types/token.model"
-import { TokenWithBalance } from "../src/shared/token/__new/types/tokenBalance.model"
+import {
+  TokenWithBalance,
+  TokenWithOptionalBigIntBalance,
+} from "../src/shared/token/__new/types/tokenBalance.model"
 import {
   TokenPriceDetails,
   TokenWithPrice,
@@ -49,6 +52,11 @@ const defaultTokenWithBalance: TokenWithBalance = {
   account: getMockWalletAccount({}),
 }
 
+const defaultTokenWithOptionalBigIntBalance: TokenWithOptionalBigIntBalance = {
+  ...defaultToken,
+  balance: BigInt(100),
+}
+
 export const defaultTokenWithPrice: TokenWithPrice = {
   ...defaultToken,
   usdValue: "100",
@@ -95,6 +103,13 @@ export const getMockTokenWithBalance = (
   ...(overrides ?? {}),
 })
 
+export const getMockTokenWithOptionalBigIntBalance = (
+  overrides?: Partial<TokenWithOptionalBigIntBalance>,
+) => ({
+  ...defaultTokenWithOptionalBigIntBalance,
+  ...(overrides ?? {}),
+})
+
 export const getMockTokenWithPrice = (overrides?: Partial<TokenWithPrice>) => ({
   ...defaultTokenWithPrice,
   ...(overrides ?? {}),
diff --git a/packages/extension/test/trade.mock.ts b/packages/extension/test/trade.mock.ts
new file mode 100644
index 000000000..368aea721
--- /dev/null
+++ b/packages/extension/test/trade.mock.ts
@@ -0,0 +1,48 @@
+import { Trade, TradeType } from "../src/shared/swap/model/trade.model"
+
+const defaultTrade: Trade = {
+  receiveAmount: "2480805239052254504",
+  receiveToken: {
+    address: "0xda114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3",
+    decimals: 18,
+    symbol: "DAI",
+    name: "Dai Stablecoin",
+    networkId: "mainnet-alpha",
+  },
+  tradeType: TradeType.EXACT_PAY,
+  receiveAmountInCurrency: "2.4753275",
+  payAmount: "2480805239052254504",
+  payToken: {
+    address:
+      "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+    decimals: 18,
+    symbol: "ETH",
+    name: "Ether",
+    networkId: "mainnet-alpha",
+  },
+  payAmountInCurrency: "2.477736",
+  totalFee: "485264460032841",
+  totalFeeInCurrency: "0.0004839",
+  totalFeePercentage: 0.0002,
+  expiresAt: 1700717256144,
+  expiresIn: 120000,
+  route: {
+    name: "10kSwap",
+    percent: 1.0,
+    sellToken:
+      "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+    buyToken:
+      "0xda114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3",
+    routes: [],
+  },
+  data: {
+    quoteId: "691cae98-4aad-486d-a135-6ebcad8a42ac",
+  },
+}
+
+export const getMockTrade = (trade: Partial<Trade> = {}): Trade => {
+  return {
+    ...defaultTrade,
+    ...trade,
+  }
+}
diff --git a/packages/extension/test/url.test.ts b/packages/extension/test/url.test.ts
index 83417ae54..8c25bf650 100644
--- a/packages/extension/test/url.test.ts
+++ b/packages/extension/test/url.test.ts
@@ -48,7 +48,7 @@ describe("url", () => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         expect(() => urlWithQuery({})).toThrowErrorMatchingInlineSnapshot(
-          '"Url must be a string. Received undefined"',
+          "[TypeError: Url must be a string. Received undefined]",
         )
       })
     })
diff --git a/packages/extension/test/wallet.test.ts b/packages/extension/test/wallet.test.ts
index 7196153a1..ba081864d 100644
--- a/packages/extension/test/wallet.test.ts
+++ b/packages/extension/test/wallet.test.ts
@@ -21,10 +21,13 @@ import {
   deserializeFactory,
   serialize,
 } from "../src/shared/account/store/serialize"
+import { tryToMintFeeToken } from "../src/shared/devnet/mintFeeToken"
+import { WalletError } from "../src/shared/errors/wallet"
+import { MultisigBackendService } from "../src/shared/multisig/service/backend/implementation"
 import { PendingMultisig } from "../src/shared/multisig/types"
+import { pendingMultisigEqual } from "../src/shared/multisig/utils/selectors"
 import { Network } from "../src/shared/network"
 import { INetworkService } from "../src/shared/network/service/interface"
-import { chromeScheduleService } from "../src/shared/schedule"
 import {
   ArrayStorage,
   KeyValueStorage,
@@ -37,18 +40,14 @@ import {
 import { adaptKeyValue } from "../src/shared/storage/__new/keyvalue"
 import { adaptObjectStorage } from "../src/shared/storage/__new/object"
 import { adaptArrayStorage } from "../src/shared/storage/__new/repository"
+import { accountsEqual } from "../src/shared/utils/accountsEqual"
 import {
   BaseMultisigWalletAccount,
   WalletAccount,
 } from "../src/shared/wallet.model"
-import { accountsEqual } from "../src/shared/utils/accountsEqual"
 import { WalletStorageProps } from "../src/shared/wallet/walletStore"
-import backupWrong from "./backup_wrong.mock.json"
 import backup from "./backup.mock.json"
-import { WalletError } from "../src/shared/errors/wallet"
-import { pendingMultisigEqual } from "../src/shared/multisig/utils/selectors"
-import { tryToMintFeeToken } from "../src/shared/devnet/mintFeeToken"
-import { MultisigBackendService } from "../src/shared/multisig/service/backend/implementation"
+import backupWrong from "./backup_wrong.mock.json"
 
 const backupString = JSON.stringify(backup)
 const backupWrongString = JSON.stringify(backupWrong)
@@ -118,7 +117,6 @@ const getPendingMultisigStore = (
 const REGEX_HEXSTRING = /^0x[a-fA-F0-9]+/i
 
 const SCRYPT_N = 262144
-const SESSION_DURATION = 24 * 60 * 60
 
 const getWallet = ({
   storage,
@@ -177,8 +175,6 @@ const getWallet = ({
     sessionStore,
     defaultBackUpService,
     defaultRecoverySharedService,
-    chromeScheduleService,
-    SESSION_DURATION,
     SCRYPT_N,
   )
 
diff --git a/packages/extension/test/walletAccount.mock.ts b/packages/extension/test/walletAccount.mock.ts
index e0439b7e7..ef91b787d 100644
--- a/packages/extension/test/walletAccount.mock.ts
+++ b/packages/extension/test/walletAccount.mock.ts
@@ -1,4 +1,5 @@
 import { Network } from "../src/shared/network"
+import { ETH_TOKEN_ADDRESS } from "../src/shared/network/constants"
 import {
   ArgentAccountType,
   WalletAccount,
@@ -9,6 +10,7 @@ const defaultNetwork: Network = {
   id: "localhost",
   name: "localhostNetwork",
   chainId: "1",
+  possibleFeeTokenAddresses: [ETH_TOKEN_ADDRESS],
   rpcUrl: "rpcUrl",
 }
 const defaultSigner: WalletAccountSigner = {
diff --git a/packages/extension/vitest.config.ts b/packages/extension/vitest.config.ts
index 219855a5d..4f35a0fde 100644
--- a/packages/extension/vitest.config.ts
+++ b/packages/extension/vitest.config.ts
@@ -8,6 +8,7 @@ import viteConfig from "./vite.config"
 export default mergeConfig(viteConfig, {
   test: {
     environment: "happy-dom",
+    pool: "forks",
     globals: true,
     setupFiles: "test/setup.ts",
     testTimeout: 50 * 60 * 1000,
@@ -37,7 +38,7 @@ export default mergeConfig(viteConfig, {
       reporter: ["text", "lcov"],
       all: true,
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      provider: "istanbul",
+      provider: "v8",
     },
     /** TODO: remove after refactor: this allows testing of components that import .svg directly */
     alias: [
diff --git a/packages/get-starknet/package.json b/packages/get-starknet/package.json
index f71086732..c1097a355 100644
--- a/packages/get-starknet/package.json
+++ b/packages/get-starknet/package.json
@@ -59,7 +59,7 @@
     "tailwindcss": "^3.1.6",
     "tslib": "^2.4.0",
     "typescript": "^5.0.4",
-    "vite": "^4.3.8",
+    "vite": "^5.0.0",
     "vite-plugin-dts": "^3.0.0",
     "ws": "^8.8.1"
   },
diff --git a/packages/guardian/package.json b/packages/guardian/package.json
index 05df83434..3ca40848f 100644
--- a/packages/guardian/package.json
+++ b/packages/guardian/package.json
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@types/async-retry": "^1.4.5",
     "typescript": "^5.0.4",
-    "vite": "^4.3.8",
+    "vite": "^5.0.0",
     "vite-plugin-dts": "^3.0.0"
   },
   "peerDependencies": {
diff --git a/packages/sessions/CHANGELOG.md b/packages/sessions/CHANGELOG.md
index d0f2e654e..f6771ea82 100644
--- a/packages/sessions/CHANGELOG.md
+++ b/packages/sessions/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @argent/x-sessions
 
+## 6.5.2
+
+### Patch Changes
+
+- 6e01d0331: Release
+
+## 6.5.1
+
+### Patch Changes
+
+- ce8935719: Release
+
 ## 6.5.0
 
 ### Minor Changes
diff --git a/packages/sessions/package.json b/packages/sessions/package.json
index 1aac62f82..ae747cb5b 100644
--- a/packages/sessions/package.json
+++ b/packages/sessions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@argent/x-sessions",
-  "version": "6.5.0",
+  "version": "6.5.2",
   "private": false,
   "description": "Manage sessions for Argent X wallets",
   "keywords": [
@@ -48,14 +48,16 @@
     "url": "https://github.com/argentlabs/argent-x/issues"
   },
   "devDependencies": {
-    "@argent/shared": "^6.3.3",
     "@rollup/plugin-node-resolve": "^15.0.0",
     "@types/minimalistic-assert": "^1.0.1",
+    "@vitest/browser": "1.0.2",
     "@vitest/coverage-c8": "^0.33.0",
+    "@vitest/coverage-v8": "1.0.2",
+    "@vitest/ui": "1.0.2",
     "happy-dom": "^12.0.0",
-    "vite": "^4.3.8",
+    "vite": "^5.0.0",
     "vite-plugin-dts": "^3.0.0",
-    "vitest": "^0.34.0"
+    "vitest": "1.0.2"
   },
   "dependencies": {
     "minimalistic-assert": "^1.0.1",
diff --git a/packages/sessions/src/ensureArray.ts b/packages/sessions/src/ensureArray.ts
new file mode 100644
index 000000000..d9c666bf4
--- /dev/null
+++ b/packages/sessions/src/ensureArray.ts
@@ -0,0 +1,16 @@
+export const ensureArray = <T>(maybeArray: T | T[] | undefined): T[] => {
+  /**
+   * Ensures that the input value is always returned as an array, even if it's already an array,
+   * a single value, or undefined. This function is useful for standardizing input values to arrays.
+   *
+   * @param maybeArray - The input value that should be converted to an array if necessary.
+   * @returns An array containing the input value, or an empty array if the input is undefined or null.
+   */
+  if (maybeArray === undefined || maybeArray === null) {
+    return []
+  }
+  if (Array.isArray(maybeArray)) {
+    return maybeArray
+  }
+  return [maybeArray]
+}
diff --git a/packages/sessions/src/offchainSessionAccount.ts b/packages/sessions/src/offchainSessionAccount.ts
index d417ebebc..318a9e20e 100644
--- a/packages/sessions/src/offchainSessionAccount.ts
+++ b/packages/sessions/src/offchainSessionAccount.ts
@@ -1,4 +1,4 @@
-import { ensureArray } from "@argent/shared"
+import { ensureArray } from "./ensureArray"
 import {
   Abi,
   Account,
@@ -144,10 +144,15 @@ export class OffchainSessionAccount
       dappSignature,
     )
 
-    return this.account?.execute(
-      transactionsWithSession,
-      abis,
-      transactionsDetail,
-    )
+    /*  
+      need to use the same values for transactionDetails (nonce, maxFee, version)
+      otherwise the cosign would fail most of the times 
+      since maxFee could change in a very short time if calculated in both this package and in webwallet
+    */
+    return this.account?.execute(transactionsWithSession, abis, {
+      nonce,
+      maxFee,
+      version,
+    })
   }
 }
diff --git a/packages/sessions/src/offchainSessionUtils.ts b/packages/sessions/src/offchainSessionUtils.ts
index e8b33c56d..770a38192 100644
--- a/packages/sessions/src/offchainSessionUtils.ts
+++ b/packages/sessions/src/offchainSessionUtils.ts
@@ -1,6 +1,7 @@
-import { Hex } from "@argent/shared"
 import { AccountInterface, Signature } from "starknet"
 
+export type Hex = `0x${string}`
+
 export interface GasFees {
   tokenAddress: Hex
   maximumAmount: {
diff --git a/packages/sessions/vite.config.ts b/packages/sessions/vite.config.ts
index 05482b504..d58b25dd9 100644
--- a/packages/sessions/vite.config.ts
+++ b/packages/sessions/vite.config.ts
@@ -7,7 +7,7 @@ import { defineConfig } from "vitest/config"
 export default defineConfig({
   build: {
     rollupOptions: {
-      external: ["starknet", "@argent/shared"],
+      external: ["starknet"],
       output: {
         exports: "named",
       },
@@ -29,34 +29,7 @@ export default defineConfig({
       insertTypesEntry: true,
     }),
   ],
-  test: {
-    deps: {
-      optimizer: {
-        web: {
-          enabled: false,
-        },
-      },
-    },
-    environment: "happy-dom",
-    exclude: ["**/node_modules/**", "**/*.mock.ts"],
-    coverage: {
-      exclude: [
-        "**/*.mock.ts",
-        "**/setup.ts",
-        "**/*.json",
-        "**/*.config.{js,ts}",
-        "test{,s}/**",
-        "spec{,s}/**",
-        "test{,-*}.{js,cjs,mjs,ts,tsx,jsx}",
-        "spec{,-*}.{js,cjs,mjs,ts,tsx,jsx}",
-        "**/*.d.ts",
-      ],
-      reportsDirectory: "./coverage",
-      excludeNodeModules: true,
-      reporter: ["text", "lcov"],
-      all: true,
-    },
-  },
+
   esbuild: {
     pure: process.env.NODE_ENV === "production" ? ["console.log"] : [],
   },
diff --git a/packages/sessions/vitest.config.ts b/packages/sessions/vitest.config.ts
new file mode 100644
index 000000000..43618d3fa
--- /dev/null
+++ b/packages/sessions/vitest.config.ts
@@ -0,0 +1,34 @@
+import { mergeConfig } from "vitest/config"
+
+import viteConfig from "./vite.config"
+
+export default mergeConfig(viteConfig, {
+  test: {
+    deps: {
+      optimizer: {
+        web: {
+          enabled: false,
+        },
+      },
+    },
+    environment: "happy-dom",
+    exclude: ["**/node_modules/**", "**/*.mock.ts"],
+    coverage: {
+      exclude: [
+        "**/*.mock.ts",
+        "**/setup.ts",
+        "**/*.json",
+        "**/*.config.{js,ts}",
+        "test{,s}/**",
+        "spec{,s}/**",
+        "test{,-*}.{js,cjs,mjs,ts,tsx,jsx}",
+        "spec{,-*}.{js,cjs,mjs,ts,tsx,jsx}",
+        "**/*.d.ts",
+      ],
+      reportsDirectory: "./coverage",
+      excludeNodeModules: true,
+      reporter: ["text", "lcov"],
+      all: true,
+    },
+  },
+})
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 44c90d7a6..fd9fc1b22 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -27,12 +27,15 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
+    "@vitest/browser": "1.0.2",
+    "@vitest/coverage-v8": "1.0.2",
+    "@vitest/ui": "1.0.2",
     "happy-dom": "^12.0.0",
     "msw": "^1.0.0",
     "typescript": "^5.0.4",
-    "vite": "^4.3.8",
+    "vite": "^5.0.0",
     "vite-plugin-dts": "^3.0.0",
-    "vitest": "^0.34.0"
+    "vitest": "1.0.2"
   },
   "dependencies": {
     "@argent/x-multicall": "^7.0.12",
diff --git a/packages/shared/src/assets/tokens.json b/packages/shared/src/assets/tokens.json
index 63bbaba6d..68b56f4a9 100644
--- a/packages/shared/src/assets/tokens.json
+++ b/packages/shared/src/assets/tokens.json
@@ -15,14 +15,6 @@
     "networkId": "goerli-alpha",
     "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/eth.png"
   },
-  {
-    "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
-    "name": "Ether",
-    "symbol": "ETH",
-    "decimals": 18,
-    "networkId": "integration",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/eth.png"
-  },
   {
     "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
     "name": "Ether",
diff --git a/packages/shared/src/bigdecimal/constants.ts b/packages/shared/src/bigdecimal/constants.ts
new file mode 100644
index 000000000..7e87521fe
--- /dev/null
+++ b/packages/shared/src/bigdecimal/constants.ts
@@ -0,0 +1,3 @@
+import { BigDecimal } from "./types"
+
+export const ONE: BigDecimal = { value: 1n, decimals: 0 }
diff --git a/packages/shared/src/bigdecimal/createUnitsSchema.test.ts b/packages/shared/src/bigdecimal/createUnitsSchema.test.ts
index d6a760bfd..81677b3b4 100644
--- a/packages/shared/src/bigdecimal/createUnitsSchema.test.ts
+++ b/packages/shared/src/bigdecimal/createUnitsSchema.test.ts
@@ -5,7 +5,7 @@ describe("createUnitsSchema", () => {
   const schemaFor2Decimals = createUnitsSchema(2)
 
   it("should allow valid number formats", () => {
-    test.each([
+    const validNumbers = [
       "123",
       "-123",
       "123.45",
@@ -13,13 +13,14 @@ describe("createUnitsSchema", () => {
       "0.45",
       "-0.45",
       "0.000000000001",
-    ])(`%s`, (input) => {
+    ]
+    validNumbers.forEach((input) => {
       expect(() => schemaFor2Decimals.parse(input)).not.toThrow()
     })
   })
 
   it("should reject invalid number formats", () => {
-    test.each([
+    const invalidNumbers = [
       "123..",
       "-123..45",
       "abc",
@@ -28,7 +29,8 @@ describe("createUnitsSchema", () => {
       ".123",
       "-.123",
       "--123",
-    ])(`%s`, (input) => {
+    ]
+    invalidNumbers.forEach((input) => {
       expect(() => schemaFor2Decimals.parse(input)).toThrow(z.ZodError)
 
       const result = schemaFor2Decimals.safeParse(input)
diff --git a/packages/shared/src/bigdecimal/index.ts b/packages/shared/src/bigdecimal/index.ts
index cfc9e7d44..e557fe7b2 100644
--- a/packages/shared/src/bigdecimal/index.ts
+++ b/packages/shared/src/bigdecimal/index.ts
@@ -2,4 +2,6 @@ export * from "./utils"
 export * from "./lib"
 export * from "./parseUnits"
 export * from "./formatUnits"
+export * from "./type"
+export * from "./constants"
 export * from "./createUnitsSchema"
diff --git a/packages/shared/src/bigdecimal/lib.ts b/packages/shared/src/bigdecimal/lib.ts
index 3b54e075e..183922801 100644
--- a/packages/shared/src/bigdecimal/lib.ts
+++ b/packages/shared/src/bigdecimal/lib.ts
@@ -4,7 +4,7 @@ export const toFixedDecimals = (
   amount: BigDecimal,
   decimals: number,
 ): BigDecimal => ({
-  decimals: decimals,
+  decimals,
   value:
     decimals >= amount.decimals
       ? amount.value * BigInt(10) ** BigInt(decimals - amount.decimals)
@@ -12,12 +12,18 @@ export const toFixedDecimals = (
 })
 
 export const toTiniestPossibleDecimal = (amount: BigDecimal): BigDecimal => {
-  const decimalsReduction = amount.value
-    .toString()
-    .split("")
-    .reverse()
-    .reduce((acc, char) => (char === "0" ? acc + 1 : acc), 0)
-  return toFixedDecimals(amount, amount.decimals - decimalsReduction)
+  const reverseAmount = amount.value.toString().split("").reverse()
+  let trailingZerosCount = 0
+
+  for (let i = 0; i < reverseAmount.length; i++) {
+    if (reverseAmount[i] !== "0") {
+      break
+    }
+    trailingZerosCount++
+  }
+
+  const newDecimals = amount.decimals - trailingZerosCount
+  return toFixedDecimals(amount, newDecimals)
 }
 
 const getAdjustedValues = (
diff --git a/packages/shared/src/bigdecimal/type.ts b/packages/shared/src/bigdecimal/type.ts
new file mode 100644
index 000000000..e1c47f2d2
--- /dev/null
+++ b/packages/shared/src/bigdecimal/type.ts
@@ -0,0 +1,4 @@
+export interface BigDecimal {
+  readonly value: bigint
+  readonly decimals: number
+}
diff --git a/packages/shared/src/bigdecimal/utils.ts b/packages/shared/src/bigdecimal/utils.ts
index 19d69b759..8efb4787e 100644
--- a/packages/shared/src/bigdecimal/utils.ts
+++ b/packages/shared/src/bigdecimal/utils.ts
@@ -2,6 +2,7 @@ import { parseUnits } from "./parseUnits"
 import { formatUnits } from "./formatUnits"
 import { BigDecimal } from "./types"
 import { abs } from "./lib"
+import { BigNumberish } from "starknet"
 
 /**
  * Formats a BigInt representing wei into a string representing ether,
@@ -75,3 +76,20 @@ export function absBigInt(num: bigint): bigint {
 export function parseCurrencyAbs(amount: string): BigDecimal {
   return abs(parseCurrency(amount))
 }
+
+/**
+ * Converts a BigNumberish to a BigDecimal.
+ *
+ * This is unsafe, please use with caution.
+ * @param {BigNumberish} value - The number to be converted to a BigDecimal.
+ * @returns {BigDecimal} The converted number.
+ */
+export function toBigDecimal(
+  value: BigNumberish,
+  decimals: number,
+): BigDecimal {
+  return {
+    value: BigInt(value),
+    decimals,
+  }
+}
diff --git a/packages/shared/src/chains/starknet/address.test.ts b/packages/shared/src/chains/starknet/address.test.ts
index 2d51c251c..b8488b81c 100644
--- a/packages/shared/src/chains/starknet/address.test.ts
+++ b/packages/shared/src/chains/starknet/address.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "vitest"
 
-import { addressSchema, isZeroAddress } from "./address"
+import { addressSchema, isEqualAddress, isZeroAddress } from "./address"
 
 describe("chains/starknet/address", () => {
   describe("addressSchema", () => {
@@ -79,4 +79,49 @@ describe("chains/starknet/address", () => {
       })
     })
   })
+  describe("isEqualAddress", () => {
+    describe("when valid", () => {
+      test("should match same address", () => {
+        expect(
+          isEqualAddress(
+            "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
+            "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
+          ),
+        ).toBe(true)
+      })
+      test("should match same address regardless of zero padding", () => {
+        expect(
+          isEqualAddress(
+            "0x33d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
+            "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
+          ),
+        ).toBe(true)
+        expect(
+          isEqualAddress(
+            "33d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
+            "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
+          ),
+        ).toBe(true)
+      })
+      test("should match regardless of case", () => {
+        expect(
+          isEqualAddress(
+            "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
+            "0x033D2A165D2A2AE64CBAF8E6DFF7F0C1974D0F41CD4F0C24D273373D4837BCFD",
+          ),
+        ).toBe(true)
+      })
+    })
+    describe("when invalid", () => {
+      test("should return false without throwing", () => {
+        expect(
+          isEqualAddress(
+            "0x033d2a165d2a2ae64cbaf8e6dff7f0c1974d0f41cd4f0c24d273373d4837bcfd",
+            "foo",
+          ),
+        ).toBe(false)
+        expect(isEqualAddress("foo", "foo")).toBe(false)
+      })
+    })
+  })
 })
diff --git a/packages/shared/src/chains/starknet/address.ts b/packages/shared/src/chains/starknet/address.ts
index 94985caea..1062d2dbf 100644
--- a/packages/shared/src/chains/starknet/address.ts
+++ b/packages/shared/src/chains/starknet/address.ts
@@ -8,6 +8,7 @@ import {
 import { z } from "zod"
 
 import { Hex } from "../../utils/hex"
+import { memoize } from "lodash-es"
 
 export type TxHash = Hex
 export type Address = Hex
@@ -73,7 +74,7 @@ export const addressSchemaArgentBackend = addressSchemaBase.transform(
   },
 )
 
-export const isAddress = (string: string): string is Address =>
+export const isAddress = (string?: string): string is Address =>
   addressSchema.safeParse(string).success
 
 export const isValidAddress = isAddress
@@ -126,3 +127,27 @@ export const isZeroAddress = (address: string) => {
   }
   return false
 }
+
+export const includesAddress = (needle: string, haystack?: string[]) => {
+  return Boolean(haystack?.some((value) => isEqualAddress(value, needle)))
+}
+
+export const formatTruncatedSignerKey = memoize((signerKey: string) => {
+  const start = signerKey.slice(0, 6)
+  const end = signerKey.slice(-4)
+  return `${start}…${end}`
+})
+
+export const formatTruncatedString = memoize(
+  (string: string, targetLength: number) => {
+    if (string.length < targetLength) {
+      return string
+    }
+
+    const startEndLength = Math.floor((targetLength - 1) / 2)
+    const start = string.slice(0, startEndLength)
+    const end = string.slice(-startEndLength)
+
+    return `${start}…${end}`
+  },
+)
diff --git a/packages/shared/src/nfts/utils.ts b/packages/shared/src/nfts/utils.ts
index 850ab2efc..285a197ae 100644
--- a/packages/shared/src/nfts/utils.ts
+++ b/packages/shared/src/nfts/utils.ts
@@ -62,51 +62,3 @@ export const getNftPicture = (
 export const equalNft = (a: NftItem, b: NftItem) =>
   a.token_id === b.token_id &&
   isEqualAddress(a.contract_address, b.contract_address)
-
-export const openNft = (
-  contractAddress: string,
-  tokenId: string,
-  networkId: string,
-) => {
-  return openNftOnAspect(contractAddress, tokenId, networkId)
-}
-
-export const openNftOnAspect = (
-  contractAddress: string,
-  tokenId: string,
-  networkId: string,
-) => {
-  const url =
-    networkId === "goerli-alpha"
-      ? `https://testnet.aspect.co/asset/${contractAddress}/${tokenId}`
-      : `https://aspect.co/asset/${contractAddress}/${tokenId}`
-  window.open(url, "_blank")?.focus()
-}
-
-export const openNftOnUnframed = (
-  contractAddress: string,
-  tokenId: string,
-  networkId: string,
-) => {
-  if (networkId !== "mainnet-alpha") {
-    throw new Error("Unframed is only available on mainnet")
-  }
-
-  const url = `https://unframed.co/item/${contractAddress}/${tokenId}`
-
-  window.open(url, "_blank")?.focus()
-}
-
-export const openNftOnFlex = (
-  contractAddress: string,
-  tokenId: string,
-  networkId: string,
-) => {
-  if (networkId !== "mainnet-alpha") {
-    throw new Error("Flex is only available on mainnet")
-  }
-
-  const url = `https://flexing.gg/starknet/asset/${contractAddress}/${tokenId}`
-
-  window.open(url, "_blank")?.focus()
-}
diff --git a/packages/shared/src/tokens/balances.ts b/packages/shared/src/tokens/balances.ts
index 1c5345b6e..cc454e2ce 100644
--- a/packages/shared/src/tokens/balances.ts
+++ b/packages/shared/src/tokens/balances.ts
@@ -55,10 +55,6 @@ export const getTokens = async (): Promise<Token[]> => {
   return tokens as Token[]
 }
 
-export const getFeeToken = async (): Promise<Token | null> => {
-  return (tokens.find((t) => t.symbol === "ETH") as Token) || null
-}
-
 export const useToken = ({
   address,
   networkId,
diff --git a/packages/stack-router/package.json b/packages/stack-router/package.json
index 3e9576cf8..7a0d018cc 100644
--- a/packages/stack-router/package.json
+++ b/packages/stack-router/package.json
@@ -28,7 +28,7 @@
     "@chakra-ui/react": "^2.6.1",
     "@emotion/react": "^11.11.0",
     "@emotion/styled": "^11.11.0",
-    "framer-motion": "^10.0.0",
+    "framer-motion": "^10.16.4",
     "history": "^5.3.0",
     "lodash-es": "^4.17.21"
   },
@@ -43,12 +43,11 @@
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "jsdom": "^22.0.0",
     "react-scripts": "5.0.1",
     "typescript": "^5.0.4",
-    "vite": "^4.3.8",
+    "vite": "^5.0.0",
     "vite-plugin-dts": "^3.0.0",
-    "vitest": "^0.34.0"
+    "vitest": "^1.0.0"
   },
   "peerDependencies": {
     "colord": "^2.9.2",
diff --git a/packages/starknet-react-webwallet-connector/package.json b/packages/starknet-react-webwallet-connector/package.json
index de60a518c..7992cce03 100644
--- a/packages/starknet-react-webwallet-connector/package.json
+++ b/packages/starknet-react-webwallet-connector/package.json
@@ -37,13 +37,13 @@
   "dependencies": {
     "@argent/web-sdk": "^6.4.1",
     "@argent/x-window": "^6.4.0",
-    "@starknet-react/core": "2.0.0-next.5"
+    "@starknet-react/core": "2.1.1"
   },
   "devDependencies": {
     "@tsconfig/svelte": "^5.0.0",
     "get-starknet-core": "^3.1.0",
     "typescript": "^5.0.4",
-    "vite": "^4.3.8",
+    "vite": "^5.0.0",
     "vite-plugin-dts": "^3.0.0"
   },
   "peerDependencies": {
diff --git a/packages/storybook/src/features/accountTokens/TokenListItem.stories.tsx b/packages/storybook/src/features/accountTokens/TokenListItem.stories.tsx
index 204abdec2..78c679b16 100644
--- a/packages/storybook/src/features/accountTokens/TokenListItem.stories.tsx
+++ b/packages/storybook/src/features/accountTokens/TokenListItem.stories.tsx
@@ -1,5 +1,4 @@
 import { TokenListItem } from "@argent-x/extension/src/ui/features/accountTokens/TokenListItem"
-import { TokenDetailsWithBalance } from "@argent-x/extension/src/ui/features/accountTokens/tokens.state"
 import { CellStack } from "@argent/ui"
 import { ComponentProps } from "react"
 import { tokenWithBalance, tokenWithSymbol } from "../../tokens"
diff --git a/packages/storybook/src/features/accounts/AddNewAccountScreen.stories.tsx b/packages/storybook/src/features/accounts/AddNewAccountScreen.stories.tsx
index c64ef4972..46ba8fd67 100644
--- a/packages/storybook/src/features/accounts/AddNewAccountScreen.stories.tsx
+++ b/packages/storybook/src/features/accounts/AddNewAccountScreen.stories.tsx
@@ -2,7 +2,7 @@ import { AddNewAccountScreen } from "@argent-x/extension/src/ui/features/account
 import {
   AccountType,
   AccountTypeId,
-} from "@argent-x/extension/src/ui/features/accounts/AddNewAccountScreenContainer"
+} from "@argent-x/extension/src/ui/features/accounts/AddNewAccountScreen"
 import { icons } from "@argent/ui"
 
 import { decorators } from "../../decorators/routerDecorators"
diff --git a/packages/storybook/src/features/accounts/TransactionDetailRaw.stories.tsx b/packages/storybook/src/features/accounts/TransactionDetailRaw.stories.tsx
index b2552c112..0fe3d3403 100644
--- a/packages/storybook/src/features/accounts/TransactionDetailRaw.stories.tsx
+++ b/packages/storybook/src/features/accounts/TransactionDetailRaw.stories.tsx
@@ -1,6 +1,3 @@
-import { defaultNetwork } from "@argent-x/extension/src/shared/network"
-import { Transaction } from "@argent-x/extension/src/shared/transactions"
-import { TransactionDetail } from "@argent-x/extension/src/ui/features/accountActivity/TransactionDetail"
 import {
   erc20MintTestToken,
   erc20SwapAlphaRoad,
@@ -9,7 +6,10 @@ import {
   erc20Transfer,
   erc721MintAspect,
   erc721Transfer,
-} from "@argent-x/extension/src/ui/features/accountActivity/transform/transaction/__test__/__fixtures__/transaction-calls/goerli-alpha"
+} from "@argent-x/extension/src/shared/call/__test__/__fixtures__/transaction-calls/goerli-alpha"
+import { defaultNetwork } from "@argent-x/extension/src/shared/network"
+import { Transaction } from "@argent-x/extension/src/shared/transactions"
+import { TransactionDetail } from "@argent-x/extension/src/ui/features/accountActivity/TransactionDetail"
 import { Account } from "@argent-x/extension/src/ui/features/accounts/Account"
 import { ComponentProps } from "react"
 import { Call } from "starknet"
@@ -28,7 +28,9 @@ const makeTransaction = (transactions?: Call | Call[]): Transaction => {
     meta: {
       transactions,
     },
-    status: "ACCEPTED_ON_L2",
+    status: {
+      finality_status: "ACCEPTED_ON_L2",
+    },
     timestamp: 1662047260,
   }
 }
diff --git a/packages/storybook/src/features/accounts/TransactionListItem.stories.tsx b/packages/storybook/src/features/accounts/TransactionListItem.stories.tsx
index 29f9adcc3..e841907cf 100644
--- a/packages/storybook/src/features/accounts/TransactionListItem.stories.tsx
+++ b/packages/storybook/src/features/accounts/TransactionListItem.stories.tsx
@@ -242,3 +242,48 @@ export const Erc721Receive = {
       "0x69b49c2cc8b16e80e86bfc5b0614a59aa8c9b601569c7b80dde04d3f3151b79",
   },
 }
+
+export const CancelledErc20Transfer = {
+  ...Default,
+  args: {
+    explorerTransaction: erc20Transfer as IExplorerTransaction,
+    network,
+    failureReason: "CANCELLED",
+  },
+}
+
+export const RejectedErc20Transfer = {
+  ...Default,
+  args: {
+    explorerTransaction: erc20Transfer as IExplorerTransaction,
+    network,
+    failureReason: "REJECTED",
+  },
+}
+
+export const RevertedErc20Transfer = {
+  ...Default,
+  args: {
+    explorerTransaction: erc20Transfer as IExplorerTransaction,
+    network,
+    failureReason: "REVERTED",
+  },
+}
+
+export const RevertedErc20SwapJediswap = {
+  ...Default,
+  args: {
+    explorerTransaction: erc20SwapJediswap as IExplorerTransaction,
+    network,
+    failureReason: "REVERTED",
+  },
+}
+
+export const RevertedDappBriq = {
+  ...Default,
+  args: {
+    explorerTransaction: dappBriq as IExplorerTransaction,
+    network,
+    failureReason: "REVERTED",
+  },
+}
diff --git a/packages/storybook/src/features/actions/transaction/CombinedFeeEstimation.stories.tsx b/packages/storybook/src/features/actions/transactionV2/CombinedFeeEstimation.stories.tsx
similarity index 100%
rename from packages/storybook/src/features/actions/transaction/CombinedFeeEstimation.stories.tsx
rename to packages/storybook/src/features/actions/transactionV2/CombinedFeeEstimation.stories.tsx
diff --git a/packages/storybook/src/features/actions/transaction/FeeEstimation.stories.tsx b/packages/storybook/src/features/actions/transactionV2/FeeEstimation.stories.tsx
similarity index 100%
rename from packages/storybook/src/features/actions/transaction/FeeEstimation.stories.tsx
rename to packages/storybook/src/features/actions/transactionV2/FeeEstimation.stories.tsx
diff --git a/packages/storybook/src/features/actions/transaction/FeeEstimationText.stories.tsx b/packages/storybook/src/features/actions/transactionV2/FeeEstimationText.stories.tsx
similarity index 100%
rename from packages/storybook/src/features/actions/transaction/FeeEstimationText.stories.tsx
rename to packages/storybook/src/features/actions/transactionV2/FeeEstimationText.stories.tsx
diff --git a/packages/storybook/src/features/actions/transactionV2/TokenPicker.stories.tsx b/packages/storybook/src/features/actions/transactionV2/TokenPicker.stories.tsx
new file mode 100644
index 000000000..b685855ac
--- /dev/null
+++ b/packages/storybook/src/features/actions/transactionV2/TokenPicker.stories.tsx
@@ -0,0 +1,14 @@
+import { TokenPicker } from "@argent-x/extension/src/ui/features/actions/feeEstimation/ui/TokenPicker"
+
+export default {
+  component: TokenPicker,
+}
+
+export const Default = {
+  args: {
+    selected: {
+      image: "https://dv3jj1unlp2jl.cloudfront.net/128/color/eth.png",
+      name: "Ethereum",
+    },
+  },
+}
diff --git a/packages/storybook/src/features/actions/transactionV2/TokenPickerScreen.stories.tsx b/packages/storybook/src/features/actions/transactionV2/TokenPickerScreen.stories.tsx
new file mode 100644
index 000000000..01322efc9
--- /dev/null
+++ b/packages/storybook/src/features/actions/transactionV2/TokenPickerScreen.stories.tsx
@@ -0,0 +1,28 @@
+import { parsedDefaultTokens } from "@argent-x/extension/src/shared/token/__new/utils"
+import { TokenPickerScreen } from "@argent-x/extension/src/ui/features/actions/feeEstimation/ui/TokenPickerScreen"
+import { StoryObj } from "@storybook/react"
+
+export default {
+  component: TokenPickerScreen,
+}
+
+export const Default: StoryObj<typeof TokenPickerScreen> = {
+  args: {
+    tokens: parsedDefaultTokens
+      .filter((x) => x.networkId === "mainnet-alpha")
+      .map((token) => {
+        const disabled = Math.random() < 0.2
+
+        return {
+          ...token,
+          image: token.iconUrl,
+          balance: BigInt(
+            disabled
+              ? 0
+              : Math.floor(Math.random() * 10 ** token.decimals * 10) +
+                  Math.floor(Math.random() * 10 ** (token.decimals - 3)),
+          ),
+        }
+      }),
+  },
+}
diff --git a/packages/storybook/src/features/settings/AddressBookAddOrEditScreen.stories.tsx b/packages/storybook/src/features/settings/AddressBookAddOrEditScreen.stories.tsx
index 21c51373b..2501e7c07 100644
--- a/packages/storybook/src/features/settings/AddressBookAddOrEditScreen.stories.tsx
+++ b/packages/storybook/src/features/settings/AddressBookAddOrEditScreen.stories.tsx
@@ -1,4 +1,4 @@
-import { AddressBookAddOrEditScreen } from "@argent-x/extension/src/ui/features/settings/AddressBookAddOrEditScreen"
+import { AddressBookAddOrEditScreen } from "@argent-x/extension/src/ui/features/settings/addressBook/AddressBookAddOrEditScreen"
 
 import { decorators } from "../../decorators/routerDecorators"
 
diff --git a/packages/storybook/src/features/settings/AddressBookSettingsScreen.stories.tsx b/packages/storybook/src/features/settings/AddressBookSettingsScreen.stories.tsx
index 8c81d204d..4fab9ab69 100644
--- a/packages/storybook/src/features/settings/AddressBookSettingsScreen.stories.tsx
+++ b/packages/storybook/src/features/settings/AddressBookSettingsScreen.stories.tsx
@@ -1,4 +1,4 @@
-import { AddressBookSettingsScreen } from "@argent-x/extension/src/ui/features/settings/AddressBookSettingsScreen"
+import { AddressBookSettingsScreen } from "@argent-x/extension/src/ui/features/settings/addressBook/AddressBookSettingsScreen"
 
 import { decorators } from "../../decorators/routerDecorators"
 import { addressBook } from "../accounts/__fixtures__/addressBook"
diff --git a/packages/storybook/src/features/settings/AutoLockTimerSettingsScreen.stories.tsx b/packages/storybook/src/features/settings/AutoLockTimerSettingsScreen.stories.tsx
new file mode 100644
index 000000000..516328432
--- /dev/null
+++ b/packages/storybook/src/features/settings/AutoLockTimerSettingsScreen.stories.tsx
@@ -0,0 +1,17 @@
+import { AutoLockTimerSettingsScreen } from "@argent-x/extension/src/ui/features/settings/securityAndPrivacy/AutoLockTimerSettingsScreen"
+
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: AutoLockTimerSettingsScreen,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const Default = {
+  args: {
+    autoLockTimeMinutes: 30,
+  },
+}
diff --git a/packages/storybook/src/features/settings/BetaFeaturesSettingsScreen.stories.tsx b/packages/storybook/src/features/settings/BetaFeaturesSettingsScreen.stories.tsx
new file mode 100644
index 000000000..f8ace5a81
--- /dev/null
+++ b/packages/storybook/src/features/settings/BetaFeaturesSettingsScreen.stories.tsx
@@ -0,0 +1,15 @@
+import { BetaFeaturesSettingsScreen } from "@argent-x/extension/src/ui/features/settings/developerSettings/betaFeatures/BetaFeaturesSettingsScreen"
+
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: BetaFeaturesSettingsScreen,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const Default = {
+  args: {},
+}
diff --git a/packages/storybook/src/features/settings/BlockExplorerSettingsScreen.stories.tsx b/packages/storybook/src/features/settings/BlockExplorerSettingsScreen.stories.tsx
new file mode 100644
index 000000000..7e6ac924d
--- /dev/null
+++ b/packages/storybook/src/features/settings/BlockExplorerSettingsScreen.stories.tsx
@@ -0,0 +1,17 @@
+import { BlockExplorerSettingsScreen } from "@argent-x/extension/src/ui/features/settings/preferences/BlockExplorerSettingsScreen"
+
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: BlockExplorerSettingsScreen,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const Default = {
+  args: {
+    blockExplorerKey: "starkScan",
+  },
+}
diff --git a/packages/storybook/src/features/settings/DappConnectionsSettings.stories.tsx b/packages/storybook/src/features/settings/DappConnectionsSettings.stories.tsx
deleted file mode 100644
index 9a18cce9b..000000000
--- a/packages/storybook/src/features/settings/DappConnectionsSettings.stories.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { DappConnectionsSettings } from "@argent-x/extension/src/ui/features/settings/DappConnectionsSettingsScreen"
-
-import { decorators } from "../../decorators/routerDecorators"
-
-export default {
-  component: DappConnectionsSettings,
-  decorators,
-  parameters: {
-    layout: "fullscreen",
-  },
-}
-
-export const Empty = {
-  args: {},
-}
-
-export const Populated = {
-  args: {
-    preauthorizedHosts: [
-      "http://examples.com",
-      "http://lorem-ipsum-dolor-sit-amet.com",
-    ],
-  },
-}
diff --git a/packages/storybook/src/features/settings/DappConnectionsSettingsScreen.stories.tsx b/packages/storybook/src/features/settings/DappConnectionsSettingsScreen.stories.tsx
new file mode 100644
index 000000000..29100858a
--- /dev/null
+++ b/packages/storybook/src/features/settings/DappConnectionsSettingsScreen.stories.tsx
@@ -0,0 +1,31 @@
+import { DappConnectionsAccountScreen } from "@argent-x/extension/src/ui/features/settings/connectedDapps/DappConnectionsAccountScreen"
+
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: DappConnectionsAccountScreen,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const Empty = {
+  args: {},
+}
+
+export const Populated = {
+  args: {
+    preAuthorizations: [
+      {
+        host: "https://app.starknet.id",
+      },
+      {
+        host: "http://examples.com",
+      },
+      {
+        host: "http://lorem-ipsum-dolor-sit-amet.com",
+      },
+    ],
+  },
+}
diff --git a/packages/storybook/src/features/settings/DeclareOrDeployContractSuccessScreen.stories.tsx b/packages/storybook/src/features/settings/DeclareOrDeployContractSuccessScreen.stories.tsx
index 81c1a7f29..f33afdc74 100644
--- a/packages/storybook/src/features/settings/DeclareOrDeployContractSuccessScreen.stories.tsx
+++ b/packages/storybook/src/features/settings/DeclareOrDeployContractSuccessScreen.stories.tsx
@@ -1,4 +1,4 @@
-import { DeclareOrDeployContractSuccessScreen } from "@argent-x/extension/src/ui/features/settings/DeveloperSettings/DeclareOrDeployContractSuccessScreen"
+import { DeclareOrDeployContractSuccessScreen } from "@argent-x/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareOrDeployContractSuccessScreen"
 
 import { decorators } from "../../decorators/routerDecorators"
 
diff --git a/packages/storybook/src/features/settings/DeclareSmartContractForm.stories.tsx b/packages/storybook/src/features/settings/DeclareSmartContractForm.stories.tsx
index 6c85f7f5a..3a97f86e7 100644
--- a/packages/storybook/src/features/settings/DeclareSmartContractForm.stories.tsx
+++ b/packages/storybook/src/features/settings/DeclareSmartContractForm.stories.tsx
@@ -1,4 +1,4 @@
-import { DeclareSmartContractForm } from "@argent-x/extension/src/ui/features/settings/DeveloperSettings/DeclareSmartContractForm"
+import { DeclareSmartContractForm } from "@argent-x/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeclareSmartContractForm"
 
 import { decorators } from "../../decorators/routerDecorators"
 
diff --git a/packages/storybook/src/features/settings/DeploySmartContractForm.stories.tsx b/packages/storybook/src/features/settings/DeploySmartContractForm.stories.tsx
index 43acd0b44..73486d65f 100644
--- a/packages/storybook/src/features/settings/DeploySmartContractForm.stories.tsx
+++ b/packages/storybook/src/features/settings/DeploySmartContractForm.stories.tsx
@@ -1,4 +1,4 @@
-import { DeploySmartContractForm } from "@argent-x/extension/src/ui/features/settings/DeveloperSettings/DeploySmartContractForm"
+import { DeploySmartContractForm } from "@argent-x/extension/src/ui/features/settings/developerSettings/smartContractDevelopment/DeploySmartContractForm"
 
 import { decorators } from "../../decorators/routerDecorators"
 
diff --git a/packages/storybook/src/features/settings/DeveloperSettingsScreen.stories.tsx b/packages/storybook/src/features/settings/DeveloperSettingsScreen.stories.tsx
new file mode 100644
index 000000000..6e1d8c308
--- /dev/null
+++ b/packages/storybook/src/features/settings/DeveloperSettingsScreen.stories.tsx
@@ -0,0 +1,22 @@
+import { DeveloperSettingsScreen } from "@argent-x/extension/src/ui/features/settings/developerSettings/DeveloperSettingsScreen"
+
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: DeveloperSettingsScreen,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const Default = {
+  args: {},
+}
+
+export const All = {
+  args: {
+    showBetaFeatures: true,
+    showExperimentalSettings: true,
+  },
+}
diff --git a/packages/storybook/src/features/settings/EmailNotificationsSettingsScreen.stories.tsx b/packages/storybook/src/features/settings/EmailNotificationsSettingsScreen.stories.tsx
new file mode 100644
index 000000000..b1ce666bc
--- /dev/null
+++ b/packages/storybook/src/features/settings/EmailNotificationsSettingsScreen.stories.tsx
@@ -0,0 +1,17 @@
+import { EmailNotificationsSettingsScreen } from "@argent-x/extension/src/ui/features/settings/preferences/EmailNotificationsSettingsScreen"
+
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: EmailNotificationsSettingsScreen,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const Default = {
+  args: {
+    isNewsletterEnabled: true,
+  },
+}
diff --git a/packages/storybook/src/features/settings/NetworkSettingsScreen.stories.tsx b/packages/storybook/src/features/settings/NetworkSettingsScreen.stories.tsx
new file mode 100644
index 000000000..d35db8d96
--- /dev/null
+++ b/packages/storybook/src/features/settings/NetworkSettingsScreen.stories.tsx
@@ -0,0 +1,67 @@
+import { NetworkSettingsScreen } from "@argent-x/extension/src/ui/features/settings/developerSettings/manageNetworks/NetworkSettingsScreen"
+
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: NetworkSettingsScreen,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const Populated = {
+  args: {
+    allNetworks: [
+      {
+        name: "Foo network",
+        readonly: true,
+      },
+      {
+        name: "Bar network",
+        readonly: true,
+      },
+      {
+        name: "Baz network",
+      },
+      {
+        name: "Lorem ipsum dolor sit amet network",
+      },
+      {
+        name: "Readonly lorem ipsum dolor sit amet network",
+        readonly: true,
+      },
+      {
+        name: "Foo network",
+        readonly: true,
+      },
+      {
+        name: "Bar network",
+        readonly: true,
+      },
+      {
+        name: "Baz network",
+      },
+      {
+        name: "Lorem ipsum dolor sit amet network",
+      },
+      {
+        name: "Readonly lorem ipsum dolor sit amet network",
+        readonly: true,
+      },
+    ],
+  },
+}
+
+export const PopulatedDefault = {
+  args: {
+    ...Populated.args,
+    isDefaultCustomNetworks: true,
+  },
+}
+
+export const Empty = {
+  args: {
+    allNetworks: [],
+  },
+}
diff --git a/packages/storybook/src/features/settings/NftMarketplaceSettingsScreen.stories.tsx b/packages/storybook/src/features/settings/NftMarketplaceSettingsScreen.stories.tsx
new file mode 100644
index 000000000..84381fc77
--- /dev/null
+++ b/packages/storybook/src/features/settings/NftMarketplaceSettingsScreen.stories.tsx
@@ -0,0 +1,17 @@
+import { NftMarketplaceSettingsScreen } from "@argent-x/extension/src/ui/features/settings/preferences/NftMarketplaceSettingsScreen"
+
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: NftMarketplaceSettingsScreen,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const Default = {
+  args: {
+    nftMarketplaceKey: "unframed",
+  },
+}
diff --git a/packages/storybook/src/features/settings/PreferencesSettings.stories.tsx b/packages/storybook/src/features/settings/PreferencesSettings.stories.tsx
new file mode 100644
index 000000000..7321ff93f
--- /dev/null
+++ b/packages/storybook/src/features/settings/PreferencesSettings.stories.tsx
@@ -0,0 +1,22 @@
+import { PreferencesSettings } from "@argent-x/extension/src/ui/features/settings/preferences/PreferencesSettings"
+
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: PreferencesSettings,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const Default = {
+  args: {
+    nftMarketplace: {
+      title: "Foo",
+    },
+    blockExplorer: {
+      title: "Bar",
+    },
+  },
+}
diff --git a/packages/storybook/src/features/settings/SecurityAndPrivacySettingsScreen.stories.tsx b/packages/storybook/src/features/settings/SecurityAndPrivacySettingsScreen.stories.tsx
new file mode 100644
index 000000000..7680fb3bf
--- /dev/null
+++ b/packages/storybook/src/features/settings/SecurityAndPrivacySettingsScreen.stories.tsx
@@ -0,0 +1,19 @@
+import { SecurityAndPrivacySettingsScreen } from "@argent-x/extension/src/ui/features/settings/securityAndPrivacy/SecurityAndPrivacySettingsScreen"
+
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: SecurityAndPrivacySettingsScreen,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const Default = {
+  args: {
+    settings: {
+      privacyAutomaticErrorReporting: true,
+    },
+  },
+}
diff --git a/packages/storybook/src/features/settings/SeedSettingsScreen.stories.tsx b/packages/storybook/src/features/settings/SeedSettingsScreen.stories.tsx
new file mode 100644
index 000000000..a040ef39e
--- /dev/null
+++ b/packages/storybook/src/features/settings/SeedSettingsScreen.stories.tsx
@@ -0,0 +1,23 @@
+import { SeedSettingsScreen } from "@argent-x/extension/src/ui/features/settings/securityAndPrivacy/SeedSettingsScreen"
+
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: SeedSettingsScreen,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const PasswordIsNotValid = {
+  args: {
+    passwordIsValid: false,
+  },
+}
+
+export const PasswordIsValid = {
+  args: {
+    passwordIsValid: true,
+  },
+}
diff --git a/packages/storybook/src/features/settings/SettingsScreen.stories.tsx b/packages/storybook/src/features/settings/SettingsScreen.stories.tsx
index 62f0a9a3d..70789ea1a 100644
--- a/packages/storybook/src/features/settings/SettingsScreen.stories.tsx
+++ b/packages/storybook/src/features/settings/SettingsScreen.stories.tsx
@@ -10,6 +10,18 @@ export default {
   },
 }
 
+const account = {
+  name: "Account Lorem Ipsum Dolor Sit Amet 10",
+  address: "0x7e00d496e324876bbc8531f2d9a82bf154d1a04a50218ee74cdd372f75a551a",
+  network: {
+    id: "goerli-alpha",
+  },
+  type: "standard",
+}
+
 export const Default = {
-  args: {},
+  args: {
+    account,
+    shouldDisplayGuardianBanner: true,
+  },
 }
diff --git a/packages/storybook/src/features/shield/ShieldValidationErrorScreen.stories.tsx b/packages/storybook/src/features/shield/ShieldValidationErrorScreen.stories.tsx
index f61107006..a7e5403ee 100644
--- a/packages/storybook/src/features/shield/ShieldValidationErrorScreen.stories.tsx
+++ b/packages/storybook/src/features/shield/ShieldValidationErrorScreen.stories.tsx
@@ -2,7 +2,7 @@ import {
   SHIELD_EMAIL_VALIDATION_FAILURE_SCENARIO_1,
   SHIELD_EMAIL_VALIDATION_FAILURE_SCENARIO_2,
   SHIELD_EMAIL_VALIDATION_FAILURE_SCENARIO_3,
-} from "@argent-x/extension/src/shared/shield/validation/validateAccount"
+} from "@argent-x/extension/src/shared/errors/argentAccount"
 import { ShieldValidationErrorScreen } from "@argent-x/extension/src/ui/features/shield/ShieldValidationErrorScreen"
 
 import { decorators } from "../../decorators/routerDecorators"
diff --git a/packages/storybook/src/tokens.ts b/packages/storybook/src/tokens.ts
index 054c7aa66..a6b9b130b 100644
--- a/packages/storybook/src/tokens.ts
+++ b/packages/storybook/src/tokens.ts
@@ -1,7 +1,5 @@
-import {
-  getFeeToken,
-  parsedDefaultTokens,
-} from "@argent-x/extension/src/shared/token/__new/utils"
+import { parsedDefaultTokens } from "@argent-x/extension/src/shared/token/__new/utils"
+import { getFeeToken } from "@argent-x/extension/src/ui/features/actions/feeEstimation/__fixtures__/feeToken"
 
 export const tokensByNetwork = parsedDefaultTokens.filter(
   ({ networkId }) => networkId === "goerli-alpha",
diff --git a/packages/storybook/src/ui/components/ModalDialog.stories.tsx b/packages/storybook/src/ui/components/ModalDialog.stories.tsx
index 02a250eeb..945554f55 100644
--- a/packages/storybook/src/ui/components/ModalDialog.stories.tsx
+++ b/packages/storybook/src/ui/components/ModalDialog.stories.tsx
@@ -1,8 +1,6 @@
-import { ModalDialog, P4, icons } from "@argent/ui"
+import { ModalDialog, P4 } from "@argent/ui"
 import { ComponentProps } from "react"
 
-const { CopyIcon } = icons
-
 export default {
   component: ModalDialog,
 }
diff --git a/packages/storybook/src/ui/components/WarningScreen.stories.tsx b/packages/storybook/src/ui/components/WarningScreen.stories.tsx
new file mode 100644
index 000000000..3aaca19d4
--- /dev/null
+++ b/packages/storybook/src/ui/components/WarningScreen.stories.tsx
@@ -0,0 +1,26 @@
+import { AccountDeprecatedModal } from "@argent-x/extension/src/ui/features/accountTokens/warning/AccountDeprecatedModal"
+import { AccountOwnerWarningScreen } from "@argent-x/extension/src/ui/features/accountTokens/warning/AccountOwnerWarningScreen"
+import { BeforeYouContinueScreen } from "@argent-x/extension/src/ui/features/settings/securityAndPrivacy/BeforeYouContinueScreen"
+
+import { Flex } from "@chakra-ui/react"
+import { decorators } from "../../decorators/routerDecorators"
+
+export default {
+  component: Flex,
+  decorators,
+  parameters: {
+    layout: "fullscreen",
+  },
+}
+
+export const AccountDeprecated = {
+  render: () => <AccountDeprecatedModal />,
+}
+
+export const BeforeYouContinue = {
+  render: () => <BeforeYouContinueScreen />,
+}
+
+export const AccountOwnerWarning = {
+  render: () => <AccountOwnerWarningScreen />,
+}
diff --git a/packages/swap/.eslintrc.js b/packages/swap/.eslintrc.js
deleted file mode 100644
index 402185a11..000000000
--- a/packages/swap/.eslintrc.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  extends: ["../extension/.eslintrc.base.js"],
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-  },
-}
diff --git a/packages/swap/.gitignore b/packages/swap/.gitignore
deleted file mode 100644
index f542e808d..000000000
--- a/packages/swap/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-pnpm-debug.log*
-pnpm-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
diff --git a/packages/swap/.prettierrc b/packages/swap/.prettierrc
deleted file mode 100644
index 67ba0010a..000000000
--- a/packages/swap/.prettierrc
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "useTabs": false,
-  "trailingComma": "all",
-  "singleQuote": false,
-  "semi": false,
-  "overrides": [
-    {
-      "files": "*.md",
-      "options": {
-        "printWidth": 70,
-        "useTabs": false,
-        "trailingComma": "none",
-        "arrowParens": "avoid",
-        "proseWrap": "never"
-      }
-    }
-  ]
-}
diff --git a/packages/swap/package.json b/packages/swap/package.json
deleted file mode 100644
index 4660b639b..000000000
--- a/packages/swap/package.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "name": "@argent/x-swap",
-  "version": "6.3.2",
-  "license": "MIT",
-  "private": true,
-  "files": [
-    "dist"
-  ],
-  "main": "./dist/x-swap.umd.js",
-  "module": "./dist/x-swap.es.js",
-  "exports": {
-    ".": {
-      "import": "./dist/x-swap.es.js",
-      "require": "./dist/x-swap.umd.js",
-      "types": "./dist/x-swap.d.ts"
-    }
-  },
-  "scripts": {
-    "dev": "vite build --watch",
-    "setup": "vite build",
-    "build": "vite build",
-    "preview": "vite preview",
-    "lint": "eslint . --cache --ext .ts,.tsx --fix"
-  },
-  "dependencies": {
-    "@argent/x-multicall": "^7.0.12",
-    "@chakra-ui/react": "^2.6.1",
-    "@ethersproject/units": "^5.7.0",
-    "big.js": "^6.2.1",
-    "decimal.js-light": "^2.5.1",
-    "jsbi": "^4.3.0",
-    "micro-starknet": "^0.2.3",
-    "swr": "^1.3.0",
-    "tiny-invariant": "^1.2.0",
-    "tiny-warning": "^1.0.3",
-    "toformat": "^2.0.0",
-    "uuid": "^9.0.0",
-    "zustand": "^4.1.4"
-  },
-  "devDependencies": {
-    "@types/big.js": "^6.1.6",
-    "@types/jest": "^29.2.5",
-    "@types/react": "^18.0.24",
-    "@types/react-dom": "^18.0.8",
-    "babel-plugin-transform-jsbi-to-bigint": "^1.3.1",
-    "eslint": "^8.42.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "typescript": "^5.0.4",
-    "vite": "^4.3.8",
-    "vite-plugin-dts": "3.6.3"
-  },
-  "peerDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "starknet": "5.24.3"
-  }
-}
diff --git a/packages/swap/src/assets/react.svg b/packages/swap/src/assets/react.svg
deleted file mode 100644
index 6c87de9bb..000000000
--- a/packages/swap/src/assets/react.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
\ No newline at end of file
diff --git a/packages/swap/src/assets/tokens.json b/packages/swap/src/assets/tokens.json
deleted file mode 100644
index 196ede43d..000000000
--- a/packages/swap/src/assets/tokens.json
+++ /dev/null
@@ -1,98 +0,0 @@
-[
-  {
-    "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
-    "name": "Ether",
-    "symbol": "ETH",
-    "decimals": "18",
-    "networkId": "mainnet-alpha",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/eth.png"
-  },
-  {
-    "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
-    "name": "Ether",
-    "symbol": "ETH",
-    "decimals": "18",
-    "networkId": "goerli-alpha",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/eth.png"
-  },
-  {
-    "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
-    "name": "Ether",
-    "symbol": "ETH",
-    "decimals": "18",
-    "networkId": "integration",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/eth.png"
-  },
-  {
-    "address": "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
-    "name": "Ether",
-    "symbol": "ETH",
-    "decimals": "18",
-    "networkId": "localhost",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/eth.png"
-  },
-  {
-    "address": "0x00da114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3",
-    "name": "DAI",
-    "symbol": "DAI",
-    "decimals": "18",
-    "networkId": "mainnet-alpha",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/dai.png"
-  },
-  {
-    "address": "0x03e85bfbb8e2a42b7bead9e88e9a1b19dbccf661471061807292120462396ec9",
-    "name": "DAI",
-    "symbol": "DAI",
-    "decimals": "18",
-    "networkId": "goerli-alpha",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/dai.png"
-  },
-  {
-    "address": "0x03fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac",
-    "name": "Wrapped BTC",
-    "symbol": "WBTC",
-    "decimals": "8",
-    "networkId": "mainnet-alpha",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/wbtc.png"
-  },
-  {
-    "address": "0x12d537dc323c439dc65c976fad242d5610d27cfb5f31689a0a319b8be7f3d56",
-    "name": "Wrapped BTC",
-    "symbol": "WBTC",
-    "decimals": "8",
-    "networkId": "goerli-alpha",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/wbtc.png"
-  },
-  {
-    "address": "0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8",
-    "name": "USD Coin",
-    "symbol": "USDC",
-    "decimals": "6",
-    "networkId": "mainnet-alpha",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/usdc.png"
-  },
-  {
-    "address": "0x005a643907b9a4bc6a55e9069c4fd5fd1f5c79a22470690f75556c4736e34426",
-    "name": "USD Coin",
-    "symbol": "USDC",
-    "decimals": "6",
-    "networkId": "goerli-alpha",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/usdc.png"
-  },
-  {
-    "address": "0x068f5c6a61780768455de69077e07e89787839bf8166decfbf92b645209c0fb8",
-    "name": "Tether USD",
-    "symbol": "USDT",
-    "decimals": "6",
-    "networkId": "mainnet-alpha",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/usdt.png"
-  },
-  {
-    "address": "0x386e8d061177f19b3b485c20e31137e6f6bc497cc635ccdfcab96fadf5add6a",
-    "name": "Tether USD",
-    "symbol": "USDT",
-    "decimals": "6",
-    "networkId": "goerli-alpha",
-    "image": "https://dv3jj1unlp2jl.cloudfront.net/128/color/usdt.png"
-  }
-]
diff --git a/packages/swap/src/index.ts b/packages/swap/src/index.ts
deleted file mode 100644
index d204b3681..000000000
--- a/packages/swap/src/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./sdk"
-export * from "./lib"
-export * from "./tokenlist"
diff --git a/packages/swap/src/lib/constants.ts b/packages/swap/src/lib/constants.ts
deleted file mode 100644
index dce6bc97d..000000000
--- a/packages/swap/src/lib/constants.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { JSBI, Percent, SupportedNetworks, Token, WETH } from "../sdk"
-
-// default allowed slippage, in bips
-export const INITIAL_ALLOWED_SLIPPAGE = 200
-export const ONE_BIPS = new Percent(JSBI.BigInt(1), JSBI.BigInt(10000))
-export const BIPS_BASE = JSBI.BigInt(10000)
-
-// used for warning states
-export const ALLOWED_PRICE_IMPACT_LOW: Percent = new Percent(
-  JSBI.BigInt(100),
-  BIPS_BASE,
-) // 1%
-
-export const ALLOWED_PRICE_IMPACT_HIGH: Percent = new Percent(
-  JSBI.BigInt(300),
-  BIPS_BASE,
-) // 3%
-
-// 60 minutes, denominated in seconds
-export const DEFAULT_DEADLINE_FROM_NOW = 60 * 60
-
-// a list of tokens by chain
-type ChainTokenList = {
-  readonly [network in SupportedNetworks]: Token[]
-}
-
-const WETH_ONLY: ChainTokenList = {
-  [SupportedNetworks.MAINNET]: [WETH[SupportedNetworks.MAINNET]],
-  [SupportedNetworks.TESTNET]: [WETH[SupportedNetworks.TESTNET]],
-}
-
-export const DAI = {
-  [SupportedNetworks.TESTNET]: new Token(
-    SupportedNetworks.TESTNET,
-    "0x03e85bfbb8e2a42b7bead9e88e9a1b19dbccf661471061807292120462396ec9",
-    18,
-    "DAI",
-    "Dai Stablecoin",
-  ),
-  [SupportedNetworks.MAINNET]: new Token(
-    SupportedNetworks.MAINNET,
-    "0x00da114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3",
-    18,
-    "DAI",
-    "Dai Stablecoin",
-  ),
-}
-export const USDC = {
-  [SupportedNetworks.TESTNET]: new Token(
-    SupportedNetworks.TESTNET,
-    "0x005a643907b9a4bc6a55e9069c4fd5fd1f5c79a22470690f75556c4736e34426",
-    6,
-    "USDC",
-    "USD//C",
-  ),
-  [SupportedNetworks.MAINNET]: new Token(
-    SupportedNetworks.MAINNET,
-    "0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8",
-    6,
-    "USDC",
-    "USD//C",
-  ),
-}
-
-export const USDT = {
-  [SupportedNetworks.TESTNET]: new Token(
-    SupportedNetworks.TESTNET,
-    "0x386e8d061177f19b3b485c20e31137e6f6bc497cc635ccdfcab96fadf5add6a",
-    6,
-    "USDT",
-    "Tether USD",
-  ),
-  [SupportedNetworks.MAINNET]: new Token(
-    SupportedNetworks.MAINNET,
-    "0x068f5c6a61780768455de69077e07e89787839bf8166decfbf92b645209c0fb8",
-    6,
-    "USDT",
-    "Tether USD",
-  ),
-}
-
-// used to construct intermediary pairs for trading
-export const BASES_TO_CHECK_TRADES_AGAINST: ChainTokenList = {
-  ...WETH_ONLY,
-  [SupportedNetworks.TESTNET]: [
-    ...WETH_ONLY[SupportedNetworks.TESTNET],
-    DAI[SupportedNetworks.TESTNET],
-    USDC[SupportedNetworks.TESTNET],
-    USDT[SupportedNetworks.TESTNET],
-  ],
-  [SupportedNetworks.MAINNET]: [
-    ...WETH_ONLY[SupportedNetworks.MAINNET],
-    DAI[SupportedNetworks.MAINNET],
-    USDC[SupportedNetworks.MAINNET],
-    USDT[SupportedNetworks.MAINNET],
-  ],
-}
-
-export const MIN_ETH: JSBI = JSBI.exponentiate(JSBI.BigInt(10), JSBI.BigInt(15)) // .001 ETH
-
-export const ETH_LOGO_URL =
-  "https://dv3jj1unlp2jl.cloudfront.net/128/color/eth.png"
diff --git a/packages/swap/src/lib/hooks/Pairs.ts b/packages/swap/src/lib/hooks/Pairs.ts
deleted file mode 100644
index 1bd9827e2..000000000
--- a/packages/swap/src/lib/hooks/Pairs.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { validateAndParseAddress } from "starknet"
-
-import { FACTORY_ADDRESS } from "../../sdk"
-import { useSwapProvider } from "../providers"
-import { useMulticall } from "./useMulticall"
-
-export function useAllPairs() {
-  const { networkId } = useSwapProvider()
-
-  if (!networkId) {
-    throw new Error("Network not supported")
-  }
-
-  const { result, error } = useMulticall(
-    {
-      contractAddress: FACTORY_ADDRESS[networkId],
-      entrypoint: "get_all_pairs",
-    },
-    true,
-  )
-
-  if (error) {
-    console.warn("Call get_all_pairs failed", error)
-    return []
-  }
-
-  return result?.map((r) => validateAndParseAddress(r)) ?? []
-}
diff --git a/packages/swap/src/lib/hooks/Reserves.ts b/packages/swap/src/lib/hooks/Reserves.ts
deleted file mode 100644
index 100747d60..000000000
--- a/packages/swap/src/lib/hooks/Reserves.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import { useMemo } from "react"
-import { validateAndParseAddress } from "starknet"
-import useSWR from "swr"
-
-import { Currency, Pair, Token, TokenAmount } from "../../sdk"
-import { useSwapProvider } from "../providers"
-import { NoMulticallError } from "../services/multicall"
-import { uint256ToHex } from "../utils"
-import { wrappedCurrency } from "../utils/wrappedCurrency"
-import { useAllPairs } from "./Pairs"
-
-export enum PairState {
-  LOADING,
-  NOT_EXISTS,
-  EXISTS,
-  INVALID,
-}
-
-export interface LiquidityPairToken {
-  liquidityToken: Token | undefined
-  tokens: [Token, Token]
-}
-
-export interface Reserves {
-  reserve0: string
-  reserve1: string
-}
-
-export function useReserves(pairAddresses: (string | undefined)[]) {
-  const { multicall, networkId } = useSwapProvider()
-
-  const pairAddressesString = pairAddresses.filter(Boolean).join("-")
-
-  const key = ["get_reserves", pairAddressesString, networkId]
-    .filter(Boolean)
-    .join("-")
-
-  const {
-    data: reserves,
-    isValidating: loading,
-    ...rest
-  } = useSWR(key, async () => {
-    if (!multicall) {
-      throw new NoMulticallError("Multicall not available")
-    }
-
-    const promises = pairAddresses.map((pairAddress) =>
-      pairAddress
-        ? multicall.callContract({
-            contractAddress: pairAddress,
-            entrypoint: "get_reserves",
-          })
-        : undefined,
-    )
-
-    const response = await Promise.all(promises)
-
-    return response.map((res) => {
-      if (!res) {
-        return undefined
-      }
-
-      return {
-        reserve0: uint256ToHex({ low: res.result[0], high: res.result[1] }),
-        reserve1: uint256ToHex({ low: res.result[2], high: res.result[3] }),
-      } as Reserves
-    })
-  })
-
-  return { reserves, loading, ...rest }
-}
-
-export function usePairs(
-  currencies: [Currency | undefined, Currency | undefined][],
-): [PairState, Pair | null][] {
-  const { networkId } = useSwapProvider()
-  const allPairs = useAllPairs()
-
-  const tokens = useMemo(
-    () =>
-      currencies.map(([currencyA, currencyB]) => [
-        wrappedCurrency(currencyA, networkId),
-        wrappedCurrency(currencyB, networkId),
-      ]),
-    [currencies, networkId],
-  )
-
-  const pairAddresses = useMemo(
-    () =>
-      tokens.map(([tokenA, tokenB]) => {
-        return tokenA && tokenB && !tokenA.equals(tokenB)
-          ? validateAndParseAddress(Pair.getAddress(tokenA, tokenB))
-          : undefined
-      }),
-    [tokens],
-  )
-
-  const validatedPairAddress = useMemo(
-    () =>
-      pairAddresses.map((addr) =>
-        addr && allPairs.includes(addr) ? addr : undefined,
-      ),
-    [allPairs, pairAddresses],
-  )
-
-  const { reserves, loading } = useReserves(validatedPairAddress)
-
-  return useMemo(() => {
-    return validatedPairAddress.map((pairAddress, i) => {
-      if (loading || !reserves) {
-        return [PairState.LOADING, null]
-      }
-
-      const tokenA = tokens?.[i]?.[0]
-      const tokenB = tokens?.[i]?.[1]
-      const currentReserves = reserves[i]
-
-      if (!tokenA || !tokenB || tokenA.equals(tokenB)) {
-        return [PairState.INVALID, null]
-      }
-
-      if (!pairAddress || !currentReserves) {
-        return [PairState.NOT_EXISTS, null]
-      }
-
-      const { reserve0, reserve1 } = currentReserves
-
-      const [token0, token1] = tokenA.sortsBefore(tokenB)
-        ? [tokenA, tokenB]
-        : [tokenB, tokenA]
-
-      return [
-        PairState.EXISTS,
-        new Pair(
-          new TokenAmount(token0, reserve0),
-          new TokenAmount(token1, reserve1),
-        ),
-      ]
-    })
-  }, [loading, reserves, tokens, validatedPairAddress])
-}
-
-export function usePair(
-  tokenA?: Currency,
-  tokenB?: Currency,
-): [PairState, Pair | null] {
-  const pairs = usePairs([[tokenA, tokenB]])?.[0]
-  return pairs ?? [PairState.LOADING, null]
-}
diff --git a/packages/swap/src/lib/hooks/Swap.ts b/packages/swap/src/lib/hooks/Swap.ts
deleted file mode 100644
index 16f3b0ea1..000000000
--- a/packages/swap/src/lib/hooks/Swap.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import { useCallback } from "react"
-
-import { WrappedTokenInfo } from "./../../tokenlist/types"
-import { Currency, CurrencyAmount, ETHER, Token, Trade } from "../../sdk"
-import { useSwapProvider } from "./../providers/swap"
-import { Field, useSwapState } from "../state/swap"
-import useUserState from "../state/user"
-import { tryParseAmount } from "../utils/parseAmount"
-import { computeSlippageAdjustedAmounts } from "../utils/prices"
-import { useCurrency } from "./Tokens"
-import { useTradeExactIn, useTradeExactOut } from "./Trade"
-import { useCurrencyBalances } from "./Wallet"
-
-// from the current swap inputs, compute the best trade and return it.
-export function useDerivedSwapInfo(): {
-  currencies: { [field in Field]?: Currency | WrappedTokenInfo }
-  currencyBalances: { [field in Field]?: CurrencyAmount }
-  parsedAmount: CurrencyAmount | undefined
-  trade: Trade | undefined
-  inputError?: string
-  tradeLoading: boolean
-} {
-  const { selectedAccount: account } = useSwapProvider()
-
-  const connectedAddress = account?.address
-
-  const {
-    independentField,
-    typedValue,
-    [Field.INPUT]: { currencyId: inputCurrencyId },
-    [Field.OUTPUT]: { currencyId: outputCurrencyId },
-  } = useSwapState()
-
-  const inputCurrency = useCurrency(inputCurrencyId)
-  const outputCurrency = useCurrency(outputCurrencyId)
-
-  const relevantTokenBalances = useCurrencyBalances(
-    connectedAddress ?? undefined,
-    [inputCurrency ?? undefined, outputCurrency ?? undefined],
-  )
-
-  const isExactIn: boolean = independentField === Field.INPUT
-  const parsedAmount = tryParseAmount(
-    typedValue,
-    (isExactIn ? inputCurrency : outputCurrency) ?? undefined,
-  )
-
-  const [bestTradeExactIn, bestTradeInLoading] = useTradeExactIn(
-    isExactIn ? parsedAmount : undefined,
-    outputCurrency ?? undefined,
-  )
-
-  const [bestTradeExactOut, bestTradeOutLoading] = useTradeExactOut(
-    inputCurrency ?? undefined,
-    !isExactIn ? parsedAmount : undefined,
-  )
-
-  const trade = isExactIn ? bestTradeExactIn : bestTradeExactOut
-
-  const currencyBalances = {
-    [Field.INPUT]: relevantTokenBalances[0],
-    [Field.OUTPUT]: relevantTokenBalances[1],
-  }
-
-  const currencies: { [field in Field]?: Currency } = {
-    [Field.INPUT]: inputCurrency ?? undefined,
-    [Field.OUTPUT]: outputCurrency ?? undefined,
-  }
-
-  // get link to trade on v1, if a better rate exists
-  // const v1Trade = useV1Trade(isExactIn, currencies[Field.INPUT], currencies[Field.OUTPUT], parsedAmount)
-
-  let inputError: string | undefined
-  if (!account) {
-    inputError = "Connect Wallet"
-  }
-
-  if (!parsedAmount) {
-    inputError = inputError ?? "Enter an amount"
-  }
-
-  if (!currencies[Field.INPUT] || !currencies[Field.OUTPUT]) {
-    inputError = inputError ?? "Select a Token"
-  }
-
-  const { userSlippageTolerance } = useUserState()
-
-  const slippageAdjustedAmounts =
-    trade &&
-    userSlippageTolerance &&
-    computeSlippageAdjustedAmounts(trade, userSlippageTolerance)
-
-  // compare input balance to max input based on version
-  const [balanceIn, amountIn] = [
-    currencyBalances[Field.INPUT],
-    slippageAdjustedAmounts ? slippageAdjustedAmounts[Field.INPUT] : null,
-  ]
-
-  if (balanceIn && amountIn && balanceIn.lessThan(amountIn)) {
-    inputError = "Insufficient " + amountIn.currency.symbol + " balance"
-  }
-
-  return {
-    currencies,
-    currencyBalances,
-    parsedAmount,
-    trade: trade ?? undefined,
-    inputError,
-    /* TODO: ask always */
-    tradeLoading: isExactIn ? bestTradeInLoading : bestTradeOutLoading,
-  }
-}
-
-export function useSwapActionHandlers(): {
-  onCurrencySelection: (field: Field, currency: Currency) => void
-  onSwitchTokens: () => void
-  onUserInput: (field: Field, typedValue: string) => void
-} {
-  const { selectCurrency, switchCurrencies, typeInput } = useSwapState()
-
-  const onCurrencySelection = useCallback(
-    (field: Field, currency: Currency) => {
-      selectCurrency({
-        field,
-        currencyId:
-          currency instanceof Token
-            ? currency.address
-            : currency === ETHER
-            ? "ETH"
-            : "",
-      })
-    },
-    [selectCurrency],
-  )
-
-  const onSwitchTokens = useCallback(() => {
-    switchCurrencies()
-  }, [switchCurrencies])
-
-  const onUserInput = useCallback(
-    (field: Field, typedValue: string) => {
-      typeInput({ field, typedValue })
-    },
-    [typeInput],
-  )
-
-  return {
-    onSwitchTokens,
-    onCurrencySelection,
-    onUserInput,
-  }
-}
diff --git a/packages/swap/src/lib/hooks/Tokens.ts b/packages/swap/src/lib/hooks/Tokens.ts
deleted file mode 100644
index 3358e8f65..000000000
--- a/packages/swap/src/lib/hooks/Tokens.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { useMemo } from "react"
-
-import { Currency, ETHER, Token } from "../../sdk"
-import { validateAndParseAddress } from "../../sdk/utils"
-import { useArgentTokenList } from "../../tokenlist"
-import { useSwapProvider } from "../providers"
-
-export function useAllTokens(): { [address: string]: Token } {
-  const { selectedAccount, networkId } = useSwapProvider()
-
-  const allTokens = useArgentTokenList()
-
-  return useMemo(() => {
-    if (!selectedAccount || !networkId) {
-      return {}
-    }
-
-    return allTokens[networkId]
-  }, [selectedAccount, networkId, allTokens])
-}
-
-// undefined if invalid or does not exist
-// null if loading
-// otherwise returns the token
-export function useToken(tokenAddress?: string): Token | undefined | null {
-  const { selectedAccount } = useSwapProvider()
-  const currencyTokens = useAllTokens()
-
-  const tokens = { ...currencyTokens }
-
-  const address = tokenAddress && validateAndParseAddress(tokenAddress)
-  const token: Token | undefined = address ? tokens[address] : undefined
-
-  return useMemo(() => {
-    if (token) {
-      return token
-    }
-    if (!selectedAccount || !address) {
-      return undefined
-    }
-
-    return undefined
-  }, [address, selectedAccount, token])
-}
-
-export function useCurrency(
-  currencyId: string | undefined,
-): Currency | null | undefined {
-  const isETH = currencyId?.toUpperCase() === "ETH"
-  // const isTOKEN1 = currencyId === TOKEN1.address
-  const token = useToken(isETH ? undefined : currencyId)
-  return isETH ? ETHER : token
-}
diff --git a/packages/swap/src/lib/hooks/Trade.ts b/packages/swap/src/lib/hooks/Trade.ts
deleted file mode 100644
index 3c82b248c..000000000
--- a/packages/swap/src/lib/hooks/Trade.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import { flatMap } from "lodash-es"
-import { useMemo } from "react"
-
-import { Currency, CurrencyAmount, Pair, Token, Trade } from "../../sdk"
-import { useSwapProvider } from "./../providers/swap"
-import { BASES_TO_CHECK_TRADES_AGAINST } from "../constants"
-// import { BASES_TO_CHECK_TRADES_AGAINST } from "../constants"
-import { wrappedCurrency } from "../utils/wrappedCurrency"
-import { PairState, usePairs } from "./Reserves"
-
-function useAllCommonPairs(
-  currencyA?: Currency,
-  currencyB?: Currency,
-): [Pair[], boolean] {
-  const { networkId } = useSwapProvider()
-
-  const bases: Token[] = useMemo(
-    () =>
-      networkId ? Object.values(BASES_TO_CHECK_TRADES_AGAINST[networkId]) : [],
-    [networkId],
-  )
-
-  const [tokenA, tokenB] = networkId
-    ? [
-        wrappedCurrency(currencyA, networkId),
-        wrappedCurrency(currencyB, networkId),
-      ]
-    : [undefined, undefined]
-
-  const basePairs: [Token, Token][] = useMemo(
-    () =>
-      flatMap(bases, (base): [Token, Token][] =>
-        bases.map((otherBase) => [base, otherBase]),
-      ).filter(([t0, t1]) => t0.address !== t1.address),
-    [bases],
-  )
-
-  const allPairCombinations: [Token, Token][] = useMemo(
-    () =>
-      tokenA && tokenB
-        ? [
-            // the direct pair
-            [tokenA, tokenB],
-            // token A against all bases
-            ...bases.map((base): [Token, Token] => [tokenA, base]),
-            // token B against all bases
-            ...bases.map((base): [Token, Token] => [tokenB, base]),
-            // each base against all bases
-            ...basePairs,
-          ]
-            .filter((tokens): tokens is [Token, Token] =>
-              Boolean(tokens[0] && tokens[1]),
-            )
-            .filter(([t0, t1]) => t0.address !== t1.address)
-        : [],
-    [tokenA, tokenB, bases, basePairs],
-  )
-
-  const allPairs = usePairs(allPairCombinations)
-  const anyPairLoading = allPairs.some(
-    ([pairState]) => pairState === PairState.LOADING,
-  )
-
-  // only pass along valid pairs, non-duplicated pairs
-  return [
-    useMemo(
-      () =>
-        Object.values(
-          allPairs
-            // filter out invalid pairs
-            .filter((result): result is [PairState.EXISTS, Pair] =>
-              Boolean(result[0] === PairState.EXISTS && result[1]),
-            )
-            // filter out duplicated pairs
-            .reduce<{ [pairAddress: string]: Pair }>((memo, [, curr]) => {
-              memo[curr.liquidityToken.address] =
-                memo[curr.liquidityToken.address] ?? curr
-              return memo
-            }, {}),
-        ),
-      [allPairs],
-    ),
-    anyPairLoading,
-  ]
-}
-
-/**
- * Returns the best trade for the exact amount of tokens in to the given token out
- */
-export function useTradeExactIn(
-  currencyAmountIn?: CurrencyAmount,
-  currencyOut?: Currency,
-): [Trade | null, boolean] {
-  const [allowedPairs, pairLoading] = useAllCommonPairs(
-    currencyAmountIn?.currency,
-    currencyOut,
-  )
-
-  return [
-    useMemo(() => {
-      if (currencyAmountIn && currencyOut && allowedPairs.length > 0) {
-        const trade =
-          Trade.bestTradeExactIn(allowedPairs, currencyAmountIn, currencyOut, {
-            maxHops: 1, // TODO: Change back to 3 when Jediswap has more liquidity
-            maxNumResults: 1,
-          })[0] ?? null
-
-        return trade
-      }
-      return null
-    }, [allowedPairs, currencyAmountIn, currencyOut]),
-    pairLoading,
-  ]
-}
-
-/**
- * Returns the best trade for the token in to the exact amount of token out
- */
-export function useTradeExactOut(
-  currencyIn?: Currency,
-  currencyAmountOut?: CurrencyAmount,
-): [Trade | null, boolean] {
-  const [allowedPairs, pairLoading] = useAllCommonPairs(
-    currencyIn,
-    currencyAmountOut?.currency,
-  )
-
-  return [
-    useMemo(() => {
-      if (currencyIn && currencyAmountOut && allowedPairs.length > 0) {
-        return (
-          Trade.bestTradeExactOut(allowedPairs, currencyIn, currencyAmountOut, {
-            maxHops: 1, // TODO: Change back to 3 when Jediswap has more liquidity
-            maxNumResults: 1,
-          })[0] ?? null
-        )
-      }
-      return null
-    }, [allowedPairs, currencyIn, currencyAmountOut]),
-    pairLoading,
-  ]
-}
diff --git a/packages/swap/src/lib/hooks/Wallet.ts b/packages/swap/src/lib/hooks/Wallet.ts
deleted file mode 100644
index 0779ba6da..000000000
--- a/packages/swap/src/lib/hooks/Wallet.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-import { useMemo } from "react"
-import { uint256 } from "starknet"
-import useSWR from "swr"
-
-import { DEFAULT_NETWORK_ID } from "./../../sdk/constants"
-import {
-  Currency,
-  CurrencyAmount,
-  ETHER,
-  JSBI,
-  Token,
-  TokenAmount,
-  WETH,
-} from "../../sdk"
-import { useSwapProvider } from "../providers"
-import { NoMulticallError } from "../services/multicall"
-import { isAddress, uint256ToHex } from "../utils"
-import { useAllTokens } from "./Tokens"
-import { useAddressNormalizer } from "./useAddressNormalizer"
-import { useMulticall } from "./useMulticall"
-
-export function useMultipleTokenBalances(
-  tokenAddresses: (string | undefined)[],
-  accountAddress: string,
-) {
-  const { multicall, networkId } = useSwapProvider()
-
-  const tokenAddressesString = tokenAddresses.filter(Boolean).join("-")
-
-  const key = ["balanceOf", tokenAddressesString, networkId]
-    .filter(Boolean)
-    .join("-")
-
-  const {
-    data: balances,
-    isValidating: loading,
-    ...rest
-  } = useSWR(key, async () => {
-    if (!multicall) {
-      throw new NoMulticallError("Multicall not available")
-    }
-
-    const promises = tokenAddresses.map((pairAddress) =>
-      pairAddress
-        ? multicall.callContract({
-            contractAddress: pairAddress,
-            entrypoint: "balanceOf",
-            calldata: [accountAddress],
-          })
-        : undefined,
-    )
-
-    const response = await Promise.all(promises)
-
-    return response.map((res) => {
-      if (!res) {
-        return undefined
-      }
-
-      return uint256ToHex({ low: res.result[0], high: res.result[1] })
-    })
-  })
-
-  return { balances, loading, ...rest }
-}
-
-/**
- * Fetch ETH balance for the given address
- * @param accountAddress
- * @returns CurrencyAmount | undefined
- */
-
-export function useETHBalance(
-  accountAddress?: string,
-): CurrencyAmount | undefined {
-  const { networkId } = useSwapProvider()
-
-  const ethAddress = WETH[networkId ?? DEFAULT_NETWORK_ID].address
-
-  const address = useAddressNormalizer(accountAddress)
-
-  // const balance = useSingleCallResult(tokenContract, "balanceOf", {
-  //   account: address ?? "",
-  // })
-
-  const balance = useMulticall({
-    contractAddress: ethAddress,
-    entrypoint: "balanceOf",
-    calldata: address ? [address] : [],
-  })
-
-  const uint256Balance: uint256.Uint256 | undefined = useMemo(() => {
-    if (Array.isArray(balance?.result) && balance?.result.length > 0) {
-      return { low: balance?.result?.[0], high: balance?.result?.[1] }
-    }
-    return undefined
-  }, [balance?.result])
-
-  return useMemo(() => {
-    const value = uint256Balance
-      ? uint256.uint256ToBN(uint256Balance)
-      : undefined
-    if (value && address) {
-      return CurrencyAmount.ether(JSBI.BigInt(value.toString()))
-    }
-    return undefined
-  }, [address, uint256Balance])
-}
-
-/**
- * Returns a map of token addresses to their eventually consistent token balances for a single account.
- */
-export function useTokenBalancesWithLoadingIndicator(
-  address?: string,
-  tokens?: (Token | undefined)[],
-): [{ [tokenAddress: string]: TokenAmount | undefined }, boolean] {
-  const validatedTokens: Token[] = useMemo(
-    () =>
-      tokens?.filter(
-        (t?: Token): t is Token => isAddress(t?.address) !== false,
-      ) ?? [],
-    [tokens],
-  )
-
-  const validatedTokenAddresses = useMemo(
-    () => validatedTokens.map((vt) => vt.address),
-    [validatedTokens],
-  )
-
-  const { balances, loading } = useMultipleTokenBalances(
-    validatedTokenAddresses,
-    address ?? "",
-  )
-
-  return [
-    useMemo(
-      () =>
-        address && validatedTokens.length > 0
-          ? validatedTokens.reduce<{
-              [tokenAddress: string]: TokenAmount | undefined
-            }>((memo, token, i) => {
-              const value = balances?.[i]
-              const amount = value ? JSBI.BigInt(value.toString()) : undefined
-              if (amount) {
-                memo[token.address] = new TokenAmount(token, amount)
-              }
-              return memo
-            }, {})
-          : {},
-      [address, validatedTokens, balances],
-    ),
-    loading || !balances,
-  ]
-}
-
-export function useTokenBalances(
-  address?: string,
-  tokens?: (Token | undefined)[],
-): { [tokenAddress: string]: TokenAmount | undefined } {
-  return useTokenBalancesWithLoadingIndicator(address, tokens)[0]
-}
-
-// get the balance for a single token/account combo
-export function useTokenBalance(
-  account?: string,
-  token?: Token,
-): TokenAmount | undefined {
-  const tokenBalances = useTokenBalances(account, [token])
-  if (!token) {
-    return undefined
-  }
-  return tokenBalances[token.address]
-}
-
-export function useCurrencyBalances(
-  account?: string,
-  currencies?: (Currency | undefined)[],
-): (CurrencyAmount | undefined)[] {
-  const tokens = useMemo(
-    () =>
-      currencies?.filter(
-        (currency): currency is Token => currency instanceof Token,
-      ) ?? [],
-    [currencies],
-  )
-
-  const token0Balance = useETHBalance(account)
-  const tokenBalances = useTokenBalances(account, tokens)
-  const containsTOKEN0: boolean = useMemo(
-    () => currencies?.some((currency) => currency === ETHER) ?? false,
-    [currencies],
-  )
-
-  return useMemo(
-    () =>
-      currencies?.map((currency) => {
-        if (!account || !currency) {
-          return undefined
-        }
-        if (currency instanceof Token) {
-          return tokenBalances[currency.address]
-        }
-        if (containsTOKEN0) {
-          return token0Balance
-        }
-        return undefined
-      }) ?? [],
-    [account, containsTOKEN0, currencies, token0Balance, tokenBalances],
-  )
-}
-
-export function useCurrencyBalance(
-  account?: string,
-  currency?: Currency,
-): CurrencyAmount | undefined {
-  return useCurrencyBalances(account, [currency])[0]
-}
-
-// mimics useAllBalances
-export function useAllTokenBalances(): {
-  [tokenAddress: string]: TokenAmount | undefined
-} {
-  const { selectedAccount } = useSwapProvider()
-  const allTokens = useAllTokens()
-  const allTokensArray = useMemo(
-    () => Object.values(allTokens ?? {}),
-    [allTokens],
-  )
-  const balances = useTokenBalances(selectedAccount?.address, allTokensArray)
-  return balances ?? {}
-}
diff --git a/packages/swap/src/lib/hooks/index.ts b/packages/swap/src/lib/hooks/index.ts
deleted file mode 100644
index 39cfe6f92..000000000
--- a/packages/swap/src/lib/hooks/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from "./Swap"
-export * from "./Pairs"
-export * from "./Reserves"
-export * from "./Wallet"
-export * from "./Trade"
-export * from "./Tokens"
-export * from "./useSwapCallback"
diff --git a/packages/swap/src/lib/hooks/useAddressNormalizer.ts b/packages/swap/src/lib/hooks/useAddressNormalizer.ts
deleted file mode 100644
index 0533ed859..000000000
--- a/packages/swap/src/lib/hooks/useAddressNormalizer.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { useMemo } from "react"
-import { validateAndParseAddress } from "starknet"
-
-export function useAddressNormalizer(
-  addr: string | null | undefined,
-): string | null {
-  return useMemo(() => {
-    if (addr && typeof addr === "string") {
-      return validateAndParseAddress(addr)
-    }
-    return null
-  }, [addr])
-}
diff --git a/packages/swap/src/lib/hooks/useApproveCall.ts b/packages/swap/src/lib/hooks/useApproveCall.ts
deleted file mode 100644
index d34605819..000000000
--- a/packages/swap/src/lib/hooks/useApproveCall.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { useCallback, useMemo } from "react"
-import { Call, CallData, RawArgs, uint256 } from "starknet"
-
-import {
-  CurrencyAmount,
-  ETHER,
-  Token,
-  TokenAmount,
-  Trade,
-  WETH,
-} from "../../sdk"
-import { DEFAULT_NETWORK_ID, ROUTER_ADDRESS } from "../../sdk/constants"
-import { useSwapProvider } from "../providers"
-import { Field } from "../state"
-import { computeSlippageAdjustedAmounts } from "../utils/prices"
-
-export function useApprovalCall(
-  amountToApprove?: CurrencyAmount,
-  spender?: string,
-): () => Call | null {
-  const { networkId } = useSwapProvider()
-  const token: Token | undefined =
-    amountToApprove instanceof TokenAmount
-      ? amountToApprove.token
-      : amountToApprove?.currency === ETHER
-      ? WETH[networkId ?? "goerli-alpha"]
-      : undefined
-
-  return useCallback(() => {
-    if (!token) {
-      console.error("no token")
-      return null
-    }
-
-    if (!amountToApprove) {
-      console.error("missing amount to approve")
-      return null
-    }
-
-    if (!spender) {
-      console.error("no spender")
-      return null
-    }
-
-    const uint256AmountToApprove = uint256.bnToUint256(
-      amountToApprove.raw.toString(),
-    )
-
-    const approveArgs: RawArgs = {
-      spender,
-      amount: uint256AmountToApprove,
-    }
-
-    const approveCalldata = CallData.compile(approveArgs)
-
-    const approveCall: Call = {
-      contractAddress: token.address,
-      entrypoint: "approve",
-      calldata: approveCalldata,
-    }
-
-    return approveCall
-  }, [amountToApprove, spender, token])
-}
-
-export function useApprovalCallFromTrade(trade?: Trade, allowedSlippage = 0) {
-  const { networkId } = useSwapProvider()
-
-  const amountToApprove = useMemo(
-    () =>
-      trade
-        ? computeSlippageAdjustedAmounts(trade, allowedSlippage)[Field.INPUT]
-        : undefined,
-    [trade, allowedSlippage],
-  )
-
-  const spender = ROUTER_ADDRESS[networkId ?? DEFAULT_NETWORK_ID]
-
-  return useApprovalCall(amountToApprove, spender)
-}
diff --git a/packages/swap/src/lib/hooks/useCurrentBlockTimestamp.ts b/packages/swap/src/lib/hooks/useCurrentBlockTimestamp.ts
deleted file mode 100644
index 4a91f48ae..000000000
--- a/packages/swap/src/lib/hooks/useCurrentBlockTimestamp.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import useSWR from "swr"
-
-import { useSwapProvider } from "../providers"
-import { getRpcProvider } from "../services/provider"
-
-// gets the current timestamp from the blockchain
-export default function useCurrentBlockTimestamp(): number | undefined {
-  const { rpcUrl, chainId } = useSwapProvider()
-
-  const { data } = useSWR("block-timestamp", async () => {
-    if (!rpcUrl) {
-      return undefined
-    }
-
-    const { timestamp } = await getRpcProvider(
-      rpcUrl,
-      chainId,
-    ).getBlockWithTxHashes("latest")
-
-    return timestamp
-  })
-
-  return data
-}
diff --git a/packages/swap/src/lib/hooks/useMulticall.ts b/packages/swap/src/lib/hooks/useMulticall.ts
deleted file mode 100644
index 57bbe9e45..000000000
--- a/packages/swap/src/lib/hooks/useMulticall.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Call, CallData } from "starknet"
-import useSWR from "swr"
-
-import { useSwapProvider } from "../providers"
-import { NoMulticallError } from "../services/multicall"
-
-export const useMulticall = (call: Call, unique = false) => {
-  const { multicall, selectedAccount, networkId } = useSwapProvider()
-  const { contractAddress, entrypoint, calldata } = call
-
-  const key = [
-    contractAddress,
-    entrypoint,
-    networkId,
-    ...CallData.toCalldata(calldata),
-    ...(unique ? [selectedAccount?.address] : []),
-  ]
-    .filter(Boolean)
-    .join("-")
-
-  const {
-    data: result,
-    isValidating: loading,
-    ...rest
-  } = useSWR(
-    key,
-    async () => {
-      if (!multicall) {
-        throw new NoMulticallError("Multicall not available")
-      }
-
-      const { result } = await multicall.callContract(call)
-      return result
-    },
-    {
-      shouldRetryOnError: (err) => {
-        if (err instanceof NoMulticallError) {
-          /** no use retrying if there is no multicall address */
-          return false
-        }
-        return true
-      },
-      refreshInterval: 60e3,
-    },
-  )
-
-  return { result, loading, ...rest }
-}
diff --git a/packages/swap/src/lib/hooks/useSwapCallback.ts b/packages/swap/src/lib/hooks/useSwapCallback.ts
deleted file mode 100644
index 1be885355..000000000
--- a/packages/swap/src/lib/hooks/useSwapCallback.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { useMemo } from "react"
-import { Call, CallData, RawArgs, uint256 } from "starknet"
-
-import {
-  JSBI,
-  Percent,
-  Router,
-  SwapParameters,
-  Trade,
-  TradeType,
-} from "../../sdk"
-import { ROUTER_ADDRESS, SupportedNetworks } from "../../sdk/constants"
-import { BIPS_BASE, INITIAL_ALLOWED_SLIPPAGE } from "../constants"
-import { useSwapProvider } from "../providers"
-// import useENS from './useENS'
-import { useApprovalCallFromTrade } from "./useApproveCall"
-import useTransactionDeadline from "./useTransactionDeadline"
-
-// import useTransactionDeadline from "./useTransactionDeadline"
-
-export enum SwapCallbackState {
-  INVALID,
-  LOADING,
-  VALID,
-}
-
-interface SwapCall {
-  routerAddress: string
-  parameters: SwapParameters
-}
-
-/**
- * Returns the swap calls that can be used to make the trade
- * @param trade trade to execute
- * @param allowedSlippage user allowed slippage
- * @param recipientAddressOrName
- */
-function useSwapCallArguments(
-  trade: Trade | undefined, // trade to execute, required
-  allowedSlippage: number = INITIAL_ALLOWED_SLIPPAGE, // in bips
-): SwapCall[] {
-  const { selectedAccount, networkId } = useSwapProvider()
-
-  const recipient = selectedAccount?.address
-
-  const deadline = useTransactionDeadline()
-
-  const routerAddress =
-    networkId &&
-    Object.values(SupportedNetworks).includes(networkId) &&
-    ROUTER_ADDRESS[networkId]
-
-  return useMemo(() => {
-    if (!trade || !recipient || !deadline || !routerAddress) {
-      return []
-    }
-
-    const swapMethods: any[] = []
-
-    swapMethods.push(
-      Router.swapCallParameters(trade, {
-        feeOnTransfer: false,
-        allowedSlippage: new Percent(JSBI.BigInt(allowedSlippage), BIPS_BASE),
-        recipient,
-        deadline,
-      }),
-    )
-
-    if (trade.tradeType === TradeType.EXACT_INPUT) {
-      swapMethods.push(
-        Router.swapCallParameters(trade, {
-          feeOnTransfer: true,
-          allowedSlippage: new Percent(JSBI.BigInt(allowedSlippage), BIPS_BASE),
-          recipient,
-          deadline,
-        }),
-      )
-    }
-    return swapMethods.map((parameters) => ({
-      routerAddress,
-      parameters,
-    }))
-  }, [allowedSlippage, deadline, recipient, routerAddress, trade])
-}
-
-// returns a function that will execute a swap, if the parameters are all valid
-// and the user has approved the slippage adjusted input amount for the trade
-export function useSwapCallback(
-  trade: Trade | undefined, // trade to execute, required
-  allowedSlippage: number = INITIAL_ALLOWED_SLIPPAGE, // in bips
-): {
-  state: SwapCallbackState
-  callback: null | (() => Call[])
-  error: string | null
-} {
-  const { selectedAccount } = useSwapProvider()
-
-  const approvalCallback = useApprovalCallFromTrade(trade, allowedSlippage)
-  const swapCalls = useSwapCallArguments(trade, allowedSlippage)
-
-  const recipient = selectedAccount?.address
-
-  return useMemo(() => {
-    if (!trade || !selectedAccount) {
-      return {
-        state: SwapCallbackState.INVALID,
-        callback: null,
-        error: "Missing dependencies",
-      }
-    }
-    if (!recipient) {
-      return { state: SwapCallbackState.LOADING, callback: null, error: null }
-    }
-
-    return {
-      state: SwapCallbackState.VALID,
-      callback: function onSwap(): Call[] {
-        const approval = approvalCallback()
-
-        if (!approval) {
-          throw new Error("Unexpected Approval Call error")
-        }
-
-        const {
-          routerAddress,
-          parameters: { methodName, args },
-        } = swapCalls[0]
-
-        const [amountIn, amountOut, path, to, deadline] = args
-
-        const uint256AmountIn = uint256.bnToUint256(amountIn as string)
-        const uint256AmountOut = uint256.bnToUint256(amountOut as string)
-
-        const swapArgs: RawArgs = {
-          amountIn: uint256AmountIn,
-          amountOutMin: uint256AmountOut,
-          path,
-          to,
-          deadline,
-        }
-
-        const swapCalldata = CallData.compile(swapArgs)
-
-        const swapCall: Call = {
-          contractAddress: routerAddress,
-          entrypoint: methodName,
-          calldata: swapCalldata,
-        }
-
-        return [approval, swapCall]
-      },
-      error: null,
-    }
-  }, [trade, selectedAccount, recipient, swapCalls, approvalCallback])
-}
diff --git a/packages/swap/src/lib/hooks/useTransactionDeadline.ts b/packages/swap/src/lib/hooks/useTransactionDeadline.ts
deleted file mode 100644
index 21d67d87b..000000000
--- a/packages/swap/src/lib/hooks/useTransactionDeadline.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { useMemo } from "react"
-
-import { DEFAULT_DEADLINE_FROM_NOW } from "../constants"
-import useCurrentBlockTimestamp from "./useCurrentBlockTimestamp"
-
-// combines the block timestamp with the user setting to give the deadline that should be used for any submitted transaction
-export default function useTransactionDeadline(): number | undefined {
-  const blockTimestamp = useCurrentBlockTimestamp()
-  return useMemo(() => {
-    if (blockTimestamp) {
-      // normal number is enough here, as timestamps wont be bigger
-      return blockTimestamp + DEFAULT_DEADLINE_FROM_NOW
-    }
-    return undefined
-  }, [blockTimestamp])
-}
diff --git a/packages/swap/src/lib/index.ts b/packages/swap/src/lib/index.ts
deleted file mode 100644
index a29c841fa..000000000
--- a/packages/swap/src/lib/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from "./hooks"
-export * from "./constants"
-export * from "./state"
-export * from "./providers"
-export * from "./utils"
diff --git a/packages/swap/src/lib/providers/index.ts b/packages/swap/src/lib/providers/index.ts
deleted file mode 100644
index eabe1099f..000000000
--- a/packages/swap/src/lib/providers/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./swap"
-export * from "./types"
diff --git a/packages/swap/src/lib/providers/swap.tsx b/packages/swap/src/lib/providers/swap.tsx
deleted file mode 100644
index 8d5bade44..000000000
--- a/packages/swap/src/lib/providers/swap.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { createContext, useContext } from "react"
-
-import { SupportedNetworks } from "../../sdk"
-import { getMulticall } from "../services/multicall"
-import { SwapContextInterface, SwapProviderArgs } from "./types"
-import { constants, shortString } from "starknet"
-
-const SwapContext = createContext<SwapContextInterface>({
-  multicall: undefined,
-  selectedAccount: undefined,
-  rpcUrl: undefined,
-  chainId: undefined,
-})
-
-export function SwapProvider({
-  multicall,
-  selectedAccount,
-  rpcUrl,
-  chainId,
-  children,
-}: SwapProviderArgs) {
-  const networkId = selectedAccount?.networkId as SupportedNetworks | undefined
-  const starknetChainId = chainId
-    ? (shortString.encodeShortString(chainId) as constants.StarknetChainId)
-    : undefined
-  const fallbackMulticall = rpcUrl
-    ? getMulticall(rpcUrl, starknetChainId)
-    : undefined
-
-  return (
-    <SwapContext.Provider
-      value={{
-        multicall: multicall || fallbackMulticall,
-        selectedAccount,
-        networkId,
-        rpcUrl,
-        chainId: starknetChainId,
-      }}
-    >
-      {children}
-    </SwapContext.Provider>
-  )
-}
-
-export const useSwapProvider = () => {
-  return useContext(SwapContext)
-}
diff --git a/packages/swap/src/lib/providers/types.ts b/packages/swap/src/lib/providers/types.ts
deleted file mode 100644
index f7e151ff4..000000000
--- a/packages/swap/src/lib/providers/types.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ProviderInterface, constants } from "starknet"
-import { SupportedNetworks } from "../../sdk"
-
-interface BaseWalletAccount {
-  address: string
-  networkId: string
-}
-
-type MinimalProvider = Pick<ProviderInterface, "callContract">
-
-export interface SwapContextInterface {
-  selectedAccount?: BaseWalletAccount
-  multicall?: MinimalProvider
-  networkId?: SupportedNetworks
-  rpcUrl?: string
-  chainId?: constants.StarknetChainId
-}
-
-export interface SwapProviderArgs {
-  selectedAccount?: BaseWalletAccount
-  rpcUrl?: string
-  multicall?: MinimalProvider
-  chainId?: string
-  children: React.ReactNode
-}
diff --git a/packages/swap/src/lib/services/multicall.ts b/packages/swap/src/lib/services/multicall.ts
deleted file mode 100644
index fce7f0a60..000000000
--- a/packages/swap/src/lib/services/multicall.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { getBatchProvider } from "@argent/x-multicall"
-import { memoize } from "lodash-es"
-
-import type { ProviderInterface, constants } from "starknet"
-import { getRpcProvider } from "./provider"
-
-export class NoMulticallError extends Error {
-  constructor(message?: string) {
-    super(message)
-    this.name = "NoMulticallError"
-  }
-}
-
-export const getMulticall = memoize(
-  (
-    rpcUrl: string,
-    chainId?: constants.StarknetChainId,
-  ): Pick<ProviderInterface, "callContract"> => {
-    return getBatchProvider(getRpcProvider(rpcUrl, chainId))
-  },
-  (networkId) => networkId,
-)
diff --git a/packages/swap/src/lib/services/network.ts b/packages/swap/src/lib/services/network.ts
deleted file mode 100644
index 2a4599cca..000000000
--- a/packages/swap/src/lib/services/network.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useMemo } from "react"
-import { constants } from "starknet"
-
-import { SupportedChainIds, SupportedNetworks } from "../../sdk/constants"
-
-export function getNetworkIdFromChainId(
-  chainId?: SupportedChainIds,
-): SupportedNetworks | undefined {
-  switch (chainId) {
-    case constants.StarknetChainId.SN_MAIN:
-      return SupportedNetworks.MAINNET
-
-    case constants.StarknetChainId.SN_GOERLI:
-      return SupportedNetworks.TESTNET
-
-    // case ChainId.TESTNET2:
-    //   return SupportedNetworks.TESTNET2  /// AMM is not deployed on testnet2
-
-    default:
-      return undefined
-  }
-}
-
-export function useNetworkIdFromChainId(
-  chainId?: SupportedChainIds,
-): SupportedNetworks | undefined {
-  return useMemo(
-    () => (chainId ? getNetworkIdFromChainId(chainId) : undefined),
-    [chainId],
-  )
-}
diff --git a/packages/swap/src/lib/services/provider.ts b/packages/swap/src/lib/services/provider.ts
deleted file mode 100644
index f7b98304e..000000000
--- a/packages/swap/src/lib/services/provider.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { memoize } from "lodash-es"
-import { RpcProvider, constants } from "starknet"
-
-export const getRpcProvider = memoize(
-  (nodeUrl: string, chainId?: constants.StarknetChainId) => {
-    return new RpcProvider({ nodeUrl, chainId })
-  },
-  (baseUrl) => baseUrl,
-)
diff --git a/packages/swap/src/lib/state/index.ts b/packages/swap/src/lib/state/index.ts
deleted file mode 100644
index c9f3af736..000000000
--- a/packages/swap/src/lib/state/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./swap"
-export * from "./user"
diff --git a/packages/swap/src/lib/state/swap.ts b/packages/swap/src/lib/state/swap.ts
deleted file mode 100644
index 89492882f..000000000
--- a/packages/swap/src/lib/state/swap.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { create } from "zustand"
-
-import { USDC } from "../../lib/constants"
-import { SupportedNetworks } from "../../sdk/constants"
-
-export enum Field {
-  INPUT = "INPUT",
-  OUTPUT = "OUTPUT",
-}
-
-export interface SwapState {
-  readonly independentField: Field
-  readonly typedValue: string
-  readonly [Field.INPUT]: {
-    readonly currencyId: string | undefined
-  }
-  readonly [Field.OUTPUT]: {
-    readonly currencyId: string | undefined
-  }
-
-  // actions
-  selectCurrency: (params: SelectCurrency) => void
-  switchCurrencies: () => void
-  typeInput: (params: TypeInput) => void
-  replaceSwapState: (params: ReplaceSwapState) => void
-}
-
-type SelectCurrency = {
-  field: Field
-  currencyId: string
-}
-
-type TypeInput = {
-  field: Field
-  typedValue: string
-}
-
-type ReplaceSwapState = {
-  field: Field
-  typedValue: string
-  inputCurrencyId?: string
-  outputCurrencyId?: string
-}
-
-const initialState = {
-  independentField: Field.INPUT,
-  typedValue: "",
-  [Field.INPUT]: {
-    currencyId: "ETH",
-  },
-  [Field.OUTPUT]: {
-    currencyId: USDC[SupportedNetworks.MAINNET].address, // TODO: make support of testnet
-  },
-}
-
-export const useSwapState = create<SwapState>()((set) => ({
-  ...initialState,
-
-  // Select Currency
-  selectCurrency: ({ field, currencyId }: SelectCurrency) =>
-    set((state) => {
-      const otherField = field === Field.INPUT ? Field.OUTPUT : Field.INPUT
-      if (currencyId === state[otherField].currencyId) {
-        // the case where we have to swap the order
-        return {
-          ...state,
-          independentField:
-            state.independentField === Field.INPUT ? Field.OUTPUT : Field.INPUT,
-          [field]: { currencyId: currencyId },
-          [otherField]: { currencyId: state[field].currencyId },
-        }
-      } else {
-        // the normal case
-        return {
-          ...state,
-          [field]: { currencyId: currencyId },
-        }
-      }
-    }),
-
-  // Switch Currencies
-  switchCurrencies: () =>
-    set((state) => ({
-      ...state,
-      independentField:
-        state.independentField === Field.INPUT ? Field.OUTPUT : Field.INPUT,
-      [Field.INPUT]: { currencyId: state[Field.OUTPUT].currencyId },
-      [Field.OUTPUT]: { currencyId: state[Field.INPUT].currencyId },
-    })),
-
-  // typeInput
-  typeInput: ({ field, typedValue }: TypeInput) =>
-    set((state) => {
-      return {
-        ...state,
-        independentField: field,
-        typedValue,
-      }
-    }),
-
-  // replaceSwapState
-  replaceSwapState: ({
-    field,
-    typedValue,
-    inputCurrencyId,
-    outputCurrencyId,
-  }: ReplaceSwapState) =>
-    set(() => ({
-      independentField: field,
-      typedValue,
-      [Field.INPUT]: { currencyId: inputCurrencyId },
-      [Field.OUTPUT]: { currencyId: outputCurrencyId },
-    })),
-}))
-
-export default useSwapState
diff --git a/packages/swap/src/lib/state/user.ts b/packages/swap/src/lib/state/user.ts
deleted file mode 100644
index 8e7bc2589..000000000
--- a/packages/swap/src/lib/state/user.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { create } from "zustand"
-import { persist } from "zustand/middleware"
-
-import { INITIAL_ALLOWED_SLIPPAGE } from "../constants"
-
-export interface UserState {
-  // user defined slippage tolerance in bips, used in all txns
-  userSlippageTolerance: number
-  updateUserSlippageTolerance: (userSlippageTolerance: number) => void
-}
-
-export const useUserState = create<UserState>()(
-  persist(
-    (set) => ({
-      userSlippageTolerance: INITIAL_ALLOWED_SLIPPAGE,
-      updateUserSlippageTolerance: (userSlippageTolerance: number) =>
-        set((state) => {
-          return {
-            ...state,
-            userSlippageTolerance,
-          }
-        }),
-    }),
-    { name: "user" },
-  ),
-)
-
-// export function useUserSlippageTolerance(): [
-//   number,
-//   (slippage: number) => void,
-// ] {
-//   const dispatch = useDispatch<AppDispatch>()
-//   const userSlippageTolerance = useSelector<
-//     AppState,
-//     AppState["user"]["userSlippageTolerance"]
-//   >((state) => {
-//     return state.user.userSlippageTolerance
-//   })
-
-//   const setUserSlippageTolerance = useCallback(
-//     (userSlippageTolerance: number) => {
-//       dispatch(updateUserSlippageTolerance({ userSlippageTolerance }))
-//     },
-//     [dispatch],
-//   )
-
-//   return [userSlippageTolerance, setUserSlippageTolerance]
-// }
-
-export default useUserState
diff --git a/packages/swap/src/lib/utils/index.ts b/packages/swap/src/lib/utils/index.ts
deleted file mode 100644
index a23fc4572..000000000
--- a/packages/swap/src/lib/utils/index.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { number, uint256 } from "starknet"
-
-import { CurrencyAmount, ETHER, JSBI, Percent } from "../../sdk"
-import { validateAndParseAddress } from "../../sdk/utils"
-import { MIN_ETH } from "../constants"
-import { tryParseAmount } from "./parseAmount"
-import { wrappedCurrency } from "./wrappedCurrency"
-
-export { tryParseAmount, wrappedCurrency }
-export * from "./prices"
-
-// converts a basis points value to a sdk percent
-export function basisPointsToPercent(num: number): Percent {
-  return new Percent(JSBI.BigInt(num), JSBI.BigInt(10000))
-}
-
-// returns the checksummed address if the address is valid, otherwise returns false
-export function isAddress(addr: string | null | undefined): string | false {
-  try {
-    if (addr && !isZero(addr)) {
-      return validateAndParseAddress(addr)
-    }
-    return false
-  } catch {
-    return false
-  }
-}
-
-/**
- * Returns true if the string value is zero in hex
- * @param hexNumberString
- */
-export function isZero(hexNumberString: string) {
-  return /^0x0*$/.test(hexNumberString)
-}
-
-export function uint256ToHex(value: uint256.Uint256): string {
-  return number.toHex(uint256.uint256ToBN(value))
-}
-
-/**
- * Given some token amount, return the max that can be spent of it
- * @param currencyAmount to return max of
- * This function can be used in future to ensure that user don't spend all the baseToken
- * for a trade
- * Let's keep it around for that reason
- */
-
-export function maxAmountSpend(
-  currencyAmount?: CurrencyAmount,
-): CurrencyAmount | undefined {
-  if (!currencyAmount) {
-    return undefined
-  }
-  if (currencyAmount.currency === ETHER) {
-    if (JSBI.greaterThan(currencyAmount.raw, MIN_ETH)) {
-      return CurrencyAmount.ether(JSBI.subtract(currencyAmount.raw, MIN_ETH))
-    } else {
-      return CurrencyAmount.ether(JSBI.BigInt(0))
-    }
-  }
-  return currencyAmount
-}
diff --git a/packages/swap/src/lib/utils/parseAmount.ts b/packages/swap/src/lib/utils/parseAmount.ts
deleted file mode 100644
index e1fff7ed8..000000000
--- a/packages/swap/src/lib/utils/parseAmount.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { parseUnits } from "@ethersproject/units"
-
-import { Currency, CurrencyAmount, JSBI, Token, TokenAmount } from "../../sdk"
-
-// try to parse a user entered amount for a given token
-export function tryParseAmount(
-  value?: string,
-  currency?: Currency,
-): CurrencyAmount | undefined {
-  if (!value || !currency) {
-    return undefined
-  }
-  try {
-    const typedValueParsed = parseUnits(value, currency.decimals).toString()
-    if (typedValueParsed !== "0") {
-      return currency instanceof Token
-        ? new TokenAmount(currency, JSBI.BigInt(typedValueParsed))
-        : CurrencyAmount.ether(JSBI.BigInt(typedValueParsed))
-    }
-  } catch (error) {
-    // should fail if the user specifies too many decimal places of precision (or maybe exceed max uint?)
-    console.debug(`Failed to parse input amount: "${value}"`, error)
-  }
-  // necessary for all paths to return a value
-  return undefined
-}
diff --git a/packages/swap/src/lib/utils/prices.ts b/packages/swap/src/lib/utils/prices.ts
deleted file mode 100644
index a35691dec..000000000
--- a/packages/swap/src/lib/utils/prices.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import {
-  CurrencyAmount,
-  Fraction,
-  JSBI,
-  Percent,
-  TokenAmount,
-  Trade,
-} from "../../sdk"
-import { Field } from "../state/swap"
-import { basisPointsToPercent } from "./index"
-
-const ONE_HUNDRED_PERCENT = new Percent(JSBI.BigInt(10000), JSBI.BigInt(10000))
-const BASE_FEE = new Percent(JSBI.BigInt(30), JSBI.BigInt(10000))
-const INPUT_FRACTION_AFTER_FEE = ONE_HUNDRED_PERCENT.subtract(BASE_FEE)
-
-// computes price breakdown for the trade
-export function computeTradePriceBreakdown(trade?: Trade): {
-  priceImpactWithoutFee?: Percent
-  realizedLPFee?: CurrencyAmount
-} {
-  // for each hop in our trade, take away the x*y=k price impact from 0.3% fees
-  // e.g. for 3 tokens/2 hops: 1 - ((1 - .03) * (1-.03))
-  const realizedLPFee = !trade
-    ? undefined
-    : ONE_HUNDRED_PERCENT.subtract(
-        trade.route.pairs.reduce<Fraction>(
-          (currentFee: Fraction): Fraction =>
-            currentFee.multiply(INPUT_FRACTION_AFTER_FEE),
-          ONE_HUNDRED_PERCENT,
-        ),
-      )
-
-  // remove lp fees from price impact
-  const priceImpactWithoutFeeFraction =
-    trade && realizedLPFee
-      ? trade.priceImpact.subtract(realizedLPFee)
-      : undefined
-
-  // the x*y=k impact
-  const priceImpactWithoutFeePercent = priceImpactWithoutFeeFraction
-    ? new Percent(
-        priceImpactWithoutFeeFraction?.numerator,
-        priceImpactWithoutFeeFraction?.denominator,
-      )
-    : undefined
-
-  // the amount of the input that accrues to LPs
-  const realizedLPFeeAmount =
-    realizedLPFee &&
-    trade &&
-    (trade.inputAmount instanceof TokenAmount
-      ? new TokenAmount(
-          trade.inputAmount.token,
-          realizedLPFee.multiply(trade.inputAmount.raw).quotient,
-        )
-      : CurrencyAmount.ether(
-          realizedLPFee.multiply(trade.inputAmount.raw).quotient,
-        ))
-
-  return {
-    priceImpactWithoutFee: priceImpactWithoutFeePercent,
-    realizedLPFee: realizedLPFeeAmount,
-  }
-}
-
-// computes the minimum amount out and maximum amount in for a trade given a user specified allowed slippage in bips
-export function computeSlippageAdjustedAmounts(
-  trade: Trade | undefined,
-  allowedSlippage: number,
-): { [field in Field]?: CurrencyAmount } {
-  const pct = basisPointsToPercent(allowedSlippage)
-  return {
-    [Field.INPUT]: trade?.maximumAmountIn(pct),
-    [Field.OUTPUT]: trade?.minimumAmountOut(pct),
-  }
-}
-
-export function formatExecutionPrice(
-  trade?: Trade,
-  inverted?: boolean,
-  separator = "~",
-): string {
-  if (!trade) {
-    return ""
-  }
-
-  return inverted
-    ? `1 ${
-        trade.outputAmount.currency.symbol
-      } ${separator} ${trade.executionPrice.invert().toSignificant(5)} ${
-        trade.inputAmount.currency.symbol
-      }`
-    : `1 ${
-        trade.inputAmount.currency.symbol
-      } ${separator} ${trade.executionPrice.toSignificant(5)} ${
-        trade.outputAmount.currency.symbol
-      } `
-}
-
-export function formatExecutionPriceWithFee(
-  trade?: Trade,
-  inverted?: boolean,
-  separator = "~",
-): string {
-  if (!trade) {
-    return ""
-  }
-
-  return inverted
-    ? `1 ${
-        trade.outputAmount.currency.symbol
-      } ${separator} ${trade.executionPriceWithFee.invert().toSignificant(5)} ${
-        trade.inputAmount.currency.symbol
-      }`
-    : `1 ${
-        trade.inputAmount.currency.symbol
-      } ${separator} ${trade.executionPriceWithFee.toSignificant(5)} ${
-        trade.outputAmount.currency.symbol
-      } `
-}
diff --git a/packages/swap/src/lib/utils/wrappedCurrency.ts b/packages/swap/src/lib/utils/wrappedCurrency.ts
deleted file mode 100644
index 50379f3c0..000000000
--- a/packages/swap/src/lib/utils/wrappedCurrency.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
-  Currency,
-  CurrencyAmount,
-  ETHER,
-  SupportedNetworks,
-  Token,
-  TokenAmount,
-  WETH,
-} from "../../sdk"
-
-export function wrappedCurrency(
-  currency: Currency | undefined,
-  networkId: SupportedNetworks | undefined,
-): Token | undefined {
-  return networkId && currency === ETHER
-    ? WETH[networkId]
-    : currency instanceof Token
-    ? currency
-    : undefined
-}
-
-export function wrappedCurrencyAmount(
-  currencyAmount: CurrencyAmount | undefined,
-  networkId: SupportedNetworks | undefined,
-): TokenAmount | undefined {
-  const token =
-    currencyAmount && networkId
-      ? wrappedCurrency(currencyAmount.currency, networkId)
-      : undefined
-  return token && currencyAmount
-    ? new TokenAmount(token, currencyAmount.raw)
-    : undefined
-}
-
-export function unwrappedToken(token: Token): Currency {
-  if (token.equals(WETH[token.networkId])) {
-    return ETHER
-  }
-  return token
-}
diff --git a/packages/swap/src/sdk/constants.ts b/packages/swap/src/sdk/constants.ts
deleted file mode 100644
index c8cae4763..000000000
--- a/packages/swap/src/sdk/constants.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import JSBI from "jsbi"
-import { constants } from "starknet"
-
-// exports for external consumption
-export type BigintIsh = JSBI | bigint | string
-
-export enum ChainId { // From starknet.js
-  MAINNET = "0x534e5f4d41494e", // encodeShortString('SN_MAIN'),
-  TESTNET = "0x534e5f474f45524c49", // encodeShortString('SN_GOERLI'),
-  TESTNET2 = "0x534e5f474f45524c4932", // encodeShortString('SN_GOERLI2')
-}
-
-export type SupportedChainIds =
-  | typeof constants.StarknetChainId.SN_MAIN
-  | typeof constants.StarknetChainId.SN_GOERLI
-
-export enum SupportedNetworks {
-  MAINNET = "mainnet-alpha",
-  TESTNET = "goerli-alpha",
-}
-
-export const DEFAULT_NETWORK_ID = SupportedNetworks.TESTNET
-
-export enum TradeType {
-  EXACT_INPUT,
-  EXACT_OUTPUT,
-}
-
-export enum Rounding {
-  ROUND_DOWN,
-  ROUND_HALF_UP,
-  ROUND_UP,
-}
-
-export const ROUTER_ADDRESS: { [network in SupportedNetworks]: string } = {
-  [SupportedNetworks.MAINNET]:
-    "0x41fd22b238fa21cfcf5dd45a8548974d8263b3a531a60388411c5e230f97023",
-  [SupportedNetworks.TESTNET]:
-    "0x2bcc885342ebbcbcd170ae6cafa8a4bed22bb993479f49806e72d96af94c965",
-}
-
-export const FACTORY_ADDRESS: { [networkId in SupportedNetworks]: string } = {
-  [SupportedNetworks.MAINNET]:
-    "0xdad44c139a476c7a17fc8141e6db680e9abc9f56fe249a105094c44382c2fd",
-  [SupportedNetworks.TESTNET]:
-    "0x262744f8cea943dadc8823c318eaf24d0110dee2ee8026298f49a3bc58ed74a",
-}
-
-export const PAIR_CLASS_HASH =
-  "0x2b39bc3f4c1fd5bef8b7d21504c44e0da59cf27b350551b13d913da52e40d3b" // Pair Classhash should remain same independent of network
-
-export const PAIR_PROXY_CLASS_HASH =
-  "0x7b5cd6a6949cc1730f89d795f2442f6ab431ea6c9a5be00685d50f97433c5eb" // Same with Pair Proxy Classhash
-
-export const FEE_TO_SETTER_ADDRESS: {
-  [networkId in SupportedNetworks]: string
-} = {
-  [SupportedNetworks.MAINNET]:
-    "0x284a1ad6382cffc520d8f711cf9519ccf43b3c105b89ef081cbe1a625322410",
-  [SupportedNetworks.TESTNET]:
-    "0x284a1ad6382cffc520d8f711cf9519ccf43b3c105b89ef081cbe1a625322410",
-}
-
-export const MINIMUM_LIQUIDITY = JSBI.BigInt(1000)
-
-// exports for internal consumption
-export const ZERO = JSBI.BigInt(0)
-export const ONE = JSBI.BigInt(1)
-export const TWO = JSBI.BigInt(2)
-export const THREE = JSBI.BigInt(3)
-export const FIVE = JSBI.BigInt(5)
-export const TEN = JSBI.BigInt(10)
-export const _100 = JSBI.BigInt(100)
-export const _997 = JSBI.BigInt(997)
-export const _1000 = JSBI.BigInt(1000)
-
-export enum SolidityType {
-  uint8 = "uint8",
-  uint256 = "uint256",
-}
-
-export const SOLIDITY_TYPE_MAXIMA = {
-  [SolidityType.uint8]: JSBI.BigInt("0xff"),
-  [SolidityType.uint256]: JSBI.BigInt(
-    "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-  ),
-}
diff --git a/packages/swap/src/sdk/declarations.d.ts b/packages/swap/src/sdk/declarations.d.ts
deleted file mode 100644
index b151bcafa..000000000
--- a/packages/swap/src/sdk/declarations.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module "toformat"
diff --git a/packages/swap/src/sdk/entities/currency.ts b/packages/swap/src/sdk/entities/currency.ts
deleted file mode 100644
index 775f00f11..000000000
--- a/packages/swap/src/sdk/entities/currency.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import JSBI from "jsbi"
-
-import { SolidityType } from "../constants"
-import { validateSolidityTypeInstance } from "../utils"
-
-/**
- * A currency is any fungible financial instrument on Ethereum, including Ether and all ERC20 tokens.
- *
- * The only instance of the base class `Currency` is Ether.
- */
-export class Currency {
-  public readonly decimals: number
-  public readonly symbol?: string
-  public readonly name?: string
-
-  /**
-   * The only instance of the base class `Currency`.
-   */
-  public static readonly ETHER: Currency = new Currency(18, "ETH", "Ether")
-  // public static readonly TOKEN0: Currency = new Currency(18, 'J23FEB0', 'Jedi23Feb 0 ')
-
-  /**
-   * Constructs an instance of the base class `Currency`. The only instance of the base class `Currency` is `Currency.ETHER`.
-   * @param decimals decimals of the currency
-   * @param symbol symbol of the currency
-   * @param name of the currency
-   */
-  protected constructor(decimals: number, symbol?: string, name?: string) {
-    validateSolidityTypeInstance(JSBI.BigInt(decimals), SolidityType.uint8)
-
-    this.decimals = decimals
-    this.symbol = symbol
-    this.name = name
-  }
-}
-
-const ETHER = Currency.ETHER
-// const TOKEN0 = Currency.TOKEN0
-export { ETHER }
diff --git a/packages/swap/src/sdk/entities/fractions/currencyAmount.ts b/packages/swap/src/sdk/entities/fractions/currencyAmount.ts
deleted file mode 100644
index b82df9c69..000000000
--- a/packages/swap/src/sdk/entities/fractions/currencyAmount.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import _Big from "big.js"
-import JSBI from "jsbi"
-import invariant from "tiny-invariant"
-import toFormat from "toformat"
-
-import { BigintIsh, Rounding, SolidityType, TEN } from "../../constants"
-import { parseBigintIsh, validateSolidityTypeInstance } from "../../utils"
-import { Currency, ETHER } from "../currency"
-import { currencyEquals } from "../token"
-import { Fraction } from "./fraction"
-
-const Big = toFormat(_Big)
-
-export class CurrencyAmount extends Fraction {
-  public readonly currency: Currency
-
-  /**
-   * Helper that calls the constructor with the ETHER currency
-   * @param amount ether amount in wei
-   */
-  // public static ether(amount: BigintIsh): CurrencyAmount {
-  //   return new CurrencyAmount(ETHER, amount)
-  // }
-
-  public static ether(amount: BigintIsh): CurrencyAmount {
-    return new CurrencyAmount(ETHER, amount)
-  }
-
-  // amount _must_ be raw, i.e. in the native representation
-  protected constructor(currency: Currency, amount: BigintIsh) {
-    const parsedAmount = parseBigintIsh(amount)
-    validateSolidityTypeInstance(parsedAmount, SolidityType.uint256)
-
-    super(parsedAmount, JSBI.exponentiate(TEN, JSBI.BigInt(currency.decimals)))
-    this.currency = currency
-  }
-
-  public get raw(): JSBI {
-    return this.numerator
-  }
-
-  public add(other: CurrencyAmount): CurrencyAmount {
-    invariant(currencyEquals(this.currency, other.currency), "TOKEN")
-    return new CurrencyAmount(this.currency, JSBI.add(this.raw, other.raw))
-  }
-
-  public subtract(other: CurrencyAmount): CurrencyAmount {
-    invariant(currencyEquals(this.currency, other.currency), "TOKEN")
-    return new CurrencyAmount(this.currency, JSBI.subtract(this.raw, other.raw))
-  }
-
-  public toSignificant(
-    significantDigits = 6,
-    format?: object,
-    rounding: Rounding = Rounding.ROUND_DOWN,
-  ): string {
-    return super.toSignificant(significantDigits, format, rounding)
-  }
-
-  public toFixed(
-    decimalPlaces: number = this.currency.decimals,
-    format?: object,
-    rounding: Rounding = Rounding.ROUND_DOWN,
-  ): string {
-    invariant(decimalPlaces <= this.currency.decimals, "DECIMALS")
-    return super.toFixed(decimalPlaces, format, rounding)
-  }
-
-  public toExact(format: object = { groupSeparator: "" }): string {
-    Big.DP = this.currency.decimals
-    return new Big(this.numerator.toString())
-      .div(this.denominator.toString())
-      .toFormat(format)
-  }
-}
diff --git a/packages/swap/src/sdk/entities/fractions/fraction.ts b/packages/swap/src/sdk/entities/fractions/fraction.ts
deleted file mode 100644
index ae193994b..000000000
--- a/packages/swap/src/sdk/entities/fractions/fraction.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import _Big from "big.js"
-import _Decimal from "decimal.js-light"
-import JSBI from "jsbi"
-import invariant from "tiny-invariant"
-import toFormat from "toformat"
-
-import { BigintIsh, Rounding } from "../../constants"
-import { ONE } from "../../constants"
-import { parseBigintIsh } from "../../utils"
-import { RoundingMode } from "./rounding"
-
-const Decimal = toFormat(_Decimal)
-const Big = toFormat(_Big)
-
-const toSignificantRounding = {
-  [Rounding.ROUND_DOWN]: Decimal.ROUND_DOWN,
-  [Rounding.ROUND_HALF_UP]: Decimal.ROUND_HALF_UP,
-  [Rounding.ROUND_UP]: Decimal.ROUND_UP,
-}
-
-const toFixedRounding = {
-  [Rounding.ROUND_DOWN]: RoundingMode.RoundDown,
-  [Rounding.ROUND_HALF_UP]: RoundingMode.RoundHalfUp,
-  [Rounding.ROUND_UP]: RoundingMode.RoundUp,
-}
-
-export class Fraction {
-  public readonly numerator: JSBI
-  public readonly denominator: JSBI
-
-  public constructor(numerator: BigintIsh, denominator: BigintIsh = ONE) {
-    this.numerator = parseBigintIsh(numerator)
-    this.denominator = parseBigintIsh(denominator)
-  }
-
-  // performs floor division
-  public get quotient(): JSBI {
-    return JSBI.divide(this.numerator, this.denominator)
-  }
-
-  // remainder after floor division
-  public get remainder(): Fraction {
-    return new Fraction(
-      JSBI.remainder(this.numerator, this.denominator),
-      this.denominator,
-    )
-  }
-
-  public invert(): Fraction {
-    return new Fraction(this.denominator, this.numerator)
-  }
-
-  public add(other: Fraction | BigintIsh): Fraction {
-    const otherParsed =
-      other instanceof Fraction ? other : new Fraction(parseBigintIsh(other))
-    if (JSBI.equal(this.denominator, otherParsed.denominator)) {
-      return new Fraction(
-        JSBI.add(this.numerator, otherParsed.numerator),
-        this.denominator,
-      )
-    }
-    return new Fraction(
-      JSBI.add(
-        JSBI.multiply(this.numerator, otherParsed.denominator),
-        JSBI.multiply(otherParsed.numerator, this.denominator),
-      ),
-      JSBI.multiply(this.denominator, otherParsed.denominator),
-    )
-  }
-
-  public subtract(other: Fraction | BigintIsh): Fraction {
-    const otherParsed =
-      other instanceof Fraction ? other : new Fraction(parseBigintIsh(other))
-    if (JSBI.equal(this.denominator, otherParsed.denominator)) {
-      return new Fraction(
-        JSBI.subtract(this.numerator, otherParsed.numerator),
-        this.denominator,
-      )
-    }
-    return new Fraction(
-      JSBI.subtract(
-        JSBI.multiply(this.numerator, otherParsed.denominator),
-        JSBI.multiply(otherParsed.numerator, this.denominator),
-      ),
-      JSBI.multiply(this.denominator, otherParsed.denominator),
-    )
-  }
-
-  public lessThan(other: Fraction | BigintIsh): boolean {
-    const otherParsed =
-      other instanceof Fraction ? other : new Fraction(parseBigintIsh(other))
-    return JSBI.lessThan(
-      JSBI.multiply(this.numerator, otherParsed.denominator),
-      JSBI.multiply(otherParsed.numerator, this.denominator),
-    )
-  }
-
-  public equalTo(other: Fraction | BigintIsh): boolean {
-    const otherParsed =
-      other instanceof Fraction ? other : new Fraction(parseBigintIsh(other))
-    return JSBI.equal(
-      JSBI.multiply(this.numerator, otherParsed.denominator),
-      JSBI.multiply(otherParsed.numerator, this.denominator),
-    )
-  }
-
-  public greaterThan(other: Fraction | BigintIsh): boolean {
-    const otherParsed =
-      other instanceof Fraction ? other : new Fraction(parseBigintIsh(other))
-    return JSBI.greaterThan(
-      JSBI.multiply(this.numerator, otherParsed.denominator),
-      JSBI.multiply(otherParsed.numerator, this.denominator),
-    )
-  }
-
-  public multiply(other: Fraction | BigintIsh): Fraction {
-    const otherParsed =
-      other instanceof Fraction ? other : new Fraction(parseBigintIsh(other))
-    return new Fraction(
-      JSBI.multiply(this.numerator, otherParsed.numerator),
-      JSBI.multiply(this.denominator, otherParsed.denominator),
-    )
-  }
-
-  public divide(other: Fraction | BigintIsh): Fraction {
-    const otherParsed =
-      other instanceof Fraction ? other : new Fraction(parseBigintIsh(other))
-    return new Fraction(
-      JSBI.multiply(this.numerator, otherParsed.denominator),
-      JSBI.multiply(this.denominator, otherParsed.numerator),
-    )
-  }
-
-  public toSignificant(
-    significantDigits: number,
-    format: object = { groupSeparator: "" },
-    rounding: Rounding = Rounding.ROUND_HALF_UP,
-  ): string {
-    invariant(
-      Number.isInteger(significantDigits),
-      `${significantDigits} is not an integer.`,
-    )
-    invariant(significantDigits > 0, `${significantDigits} is not positive.`)
-
-    Decimal.set({
-      precision: significantDigits + 1,
-      rounding: toSignificantRounding[rounding],
-    })
-    const quotient = new Decimal(this.numerator.toString())
-      .div(this.denominator.toString())
-      .toSignificantDigits(significantDigits)
-    return quotient.toFormat(quotient.decimalPlaces(), format)
-  }
-
-  public toFixed(
-    decimalPlaces: number,
-    format: object = { groupSeparator: "" },
-    rounding: Rounding = Rounding.ROUND_HALF_UP,
-  ): string {
-    invariant(
-      Number.isInteger(decimalPlaces),
-      `${decimalPlaces} is not an integer.`,
-    )
-    invariant(decimalPlaces >= 0, `${decimalPlaces} is negative.`)
-
-    Big.DP = decimalPlaces
-    Big.RM = toFixedRounding[rounding]
-    return new Big(this.numerator.toString())
-      .div(this.denominator.toString())
-      .toFormat(decimalPlaces, format)
-  }
-}
diff --git a/packages/swap/src/sdk/entities/fractions/index.ts b/packages/swap/src/sdk/entities/fractions/index.ts
deleted file mode 100644
index d22b8ecda..000000000
--- a/packages/swap/src/sdk/entities/fractions/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from "./fraction"
-export * from "./percent"
-export * from "./tokenAmount"
-export * from "./currencyAmount"
-export * from "./price"
diff --git a/packages/swap/src/sdk/entities/fractions/percent.ts b/packages/swap/src/sdk/entities/fractions/percent.ts
deleted file mode 100644
index 1015c1855..000000000
--- a/packages/swap/src/sdk/entities/fractions/percent.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Rounding, _100 } from "../../constants"
-import { Fraction } from "./fraction"
-
-const _100_PERCENT = new Fraction(_100)
-
-export class Percent extends Fraction {
-  public toSignificant(
-    significantDigits = 5,
-    format?: object,
-    rounding?: Rounding,
-  ): string {
-    return this.multiply(_100_PERCENT).toSignificant(
-      significantDigits,
-      format,
-      rounding,
-    )
-  }
-
-  public toFixed(
-    decimalPlaces = 2,
-    format?: object,
-    rounding?: Rounding,
-  ): string {
-    return this.multiply(_100_PERCENT).toFixed(decimalPlaces, format, rounding)
-  }
-}
diff --git a/packages/swap/src/sdk/entities/fractions/price.ts b/packages/swap/src/sdk/entities/fractions/price.ts
deleted file mode 100644
index 6437ad907..000000000
--- a/packages/swap/src/sdk/entities/fractions/price.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import JSBI from "jsbi"
-import invariant from "tiny-invariant"
-
-import { BigintIsh, Rounding, TEN } from "../../constants"
-import { Currency } from "../currency"
-import { Route } from "../route"
-import { Token } from "../token"
-import { currencyEquals } from "../token"
-import { CurrencyAmount } from "./currencyAmount"
-import { Fraction } from "./fraction"
-import { TokenAmount } from "./tokenAmount"
-
-export class Price extends Fraction {
-  public readonly baseCurrency: Currency // input i.e. denominator
-  public readonly quoteCurrency: Currency // output i.e. numerator
-  public readonly scalar: Fraction // used to adjust the raw fraction w/r/t the decimals of the {base,quote}Token
-
-  public static fromRoute(route: Route): Price {
-    const prices: Price[] = []
-    for (const [i, pair] of route.pairs.entries()) {
-      prices.push(
-        route.path[i].equals(pair.token0)
-          ? new Price(
-              pair.reserve0.currency,
-              pair.reserve1.currency,
-              pair.reserve0.raw,
-              pair.reserve1.raw,
-            )
-          : new Price(
-              pair.reserve1.currency,
-              pair.reserve0.currency,
-              pair.reserve1.raw,
-              pair.reserve0.raw,
-            ),
-      )
-    }
-    return prices
-      .slice(1)
-      .reduce(
-        (accumulator, currentValue) => accumulator.multiply(currentValue),
-        prices[0],
-      )
-  }
-
-  // denominator and numerator _must_ be raw, i.e. in the native representation
-  public constructor(
-    baseCurrency: Currency,
-    quoteCurrency: Currency,
-    denominator: BigintIsh,
-    numerator: BigintIsh,
-  ) {
-    super(numerator, denominator)
-
-    this.baseCurrency = baseCurrency
-    this.quoteCurrency = quoteCurrency
-    this.scalar = new Fraction(
-      JSBI.exponentiate(TEN, JSBI.BigInt(baseCurrency.decimals)),
-      JSBI.exponentiate(TEN, JSBI.BigInt(quoteCurrency.decimals)),
-    )
-  }
-
-  public get raw(): Fraction {
-    return new Fraction(this.numerator, this.denominator)
-  }
-
-  public get adjusted(): Fraction {
-    return super.multiply(this.scalar)
-  }
-
-  public invert(): Price {
-    return new Price(
-      this.quoteCurrency,
-      this.baseCurrency,
-      this.numerator,
-      this.denominator,
-    )
-  }
-
-  public multiply(other: Price): Price {
-    invariant(currencyEquals(this.quoteCurrency, other.baseCurrency), "TOKEN")
-    const fraction = super.multiply(other)
-    return new Price(
-      this.baseCurrency,
-      other.quoteCurrency,
-      fraction.denominator,
-      fraction.numerator,
-    )
-  }
-
-  // performs floor division on overflow
-  public quote(currencyAmount: CurrencyAmount): CurrencyAmount {
-    invariant(
-      currencyEquals(currencyAmount.currency, this.baseCurrency),
-      "TOKEN",
-    )
-    if (this.quoteCurrency instanceof Token) {
-      return new TokenAmount(
-        this.quoteCurrency,
-        super.multiply(currencyAmount.raw).quotient,
-      )
-    }
-    return CurrencyAmount.ether(super.multiply(currencyAmount.raw).quotient)
-  }
-
-  public toSignificant(
-    significantDigits = 6,
-    format?: object,
-    rounding?: Rounding,
-  ): string {
-    return this.adjusted.toSignificant(significantDigits, format, rounding)
-  }
-
-  public toFixed(
-    decimalPlaces = 4,
-    format?: object,
-    rounding?: Rounding,
-  ): string {
-    return this.adjusted.toFixed(decimalPlaces, format, rounding)
-  }
-}
diff --git a/packages/swap/src/sdk/entities/fractions/rounding.ts b/packages/swap/src/sdk/entities/fractions/rounding.ts
deleted file mode 100644
index 4e8083e18..000000000
--- a/packages/swap/src/sdk/entities/fractions/rounding.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export const enum RoundingMode {
-  /**
-   * Rounds towards zero.
-   * I.e. truncate, no rounding.
-   */
-  RoundDown = 0,
-  /**
-   * Rounds towards nearest neighbour.
-   * If equidistant, rounds away from zero.
-   */
-  RoundHalfUp = 1,
-  /**
-   * Rounds towards nearest neighbour.
-   * If equidistant, rounds towards even neighbour.
-   */
-  RoundHalfEven = 2,
-  /**
-   * Rounds away from zero.
-   */
-  RoundUp = 3,
-}
diff --git a/packages/swap/src/sdk/entities/fractions/tokenAmount.ts b/packages/swap/src/sdk/entities/fractions/tokenAmount.ts
deleted file mode 100644
index f84aa3de4..000000000
--- a/packages/swap/src/sdk/entities/fractions/tokenAmount.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import JSBI from "jsbi"
-import invariant from "tiny-invariant"
-
-import { BigintIsh } from "../../constants"
-import { Token } from "../token"
-import { CurrencyAmount } from "./currencyAmount"
-
-export class TokenAmount extends CurrencyAmount {
-  public readonly token: Token
-
-  // amount _must_ be raw, i.e. in the native representation
-  public constructor(token: Token, amount: BigintIsh) {
-    super(token, amount)
-    this.token = token
-  }
-
-  public add(other: TokenAmount): TokenAmount {
-    invariant(this.token.equals(other.token), "TOKEN")
-    return new TokenAmount(this.token, JSBI.add(this.raw, other.raw))
-  }
-
-  public subtract(other: TokenAmount): TokenAmount {
-    invariant(this.token.equals(other.token), "TOKEN")
-    return new TokenAmount(this.token, JSBI.subtract(this.raw, other.raw))
-  }
-}
diff --git a/packages/swap/src/sdk/entities/index.ts b/packages/swap/src/sdk/entities/index.ts
deleted file mode 100644
index eabd3b517..000000000
--- a/packages/swap/src/sdk/entities/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from "./token"
-export * from "./lpToken"
-export * from "./pair"
-export * from "./route"
-export * from "./trade"
-export * from "./currency"
-
-export * from "./fractions"
diff --git a/packages/swap/src/sdk/entities/lpToken.ts b/packages/swap/src/sdk/entities/lpToken.ts
deleted file mode 100644
index 2af1cfa78..000000000
--- a/packages/swap/src/sdk/entities/lpToken.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { SupportedNetworks } from "../constants"
-import { Token } from "./token"
-
-export class LPToken extends Token {
-  token0: Token
-  token1: Token
-
-  constructor(
-    networkId: SupportedNetworks,
-    token0: Token,
-    token1: Token,
-    address: string,
-  ) {
-    const tokens = token0.sortsBefore(token1)
-      ? [token0, token1]
-      : [token1, token0]
-
-    const lpSymbol = `${tokens[0].symbol}-${tokens[1].symbol}`
-    const lpName = `${tokens[0].name}/${tokens[1].name}`
-
-    super(networkId, address, 18, lpSymbol, lpName)
-    this.token0 = tokens[0]
-    this.token1 = tokens[1]
-  }
-}
diff --git a/packages/swap/src/sdk/entities/pair.ts b/packages/swap/src/sdk/entities/pair.ts
deleted file mode 100644
index 933794a27..000000000
--- a/packages/swap/src/sdk/entities/pair.ts
+++ /dev/null
@@ -1,317 +0,0 @@
-import JSBI from "jsbi"
-import invariant from "tiny-invariant"
-
-import {
-  BigintIsh,
-  DEFAULT_NETWORK_ID,
-  FACTORY_ADDRESS,
-  FEE_TO_SETTER_ADDRESS,
-  FIVE,
-  MINIMUM_LIQUIDITY,
-  ONE,
-  PAIR_CLASS_HASH,
-  PAIR_PROXY_CLASS_HASH,
-  ZERO,
-  _1000,
-  _997,
-} from "../constants"
-import {
-  InsufficientInputAmountError,
-  InsufficientReservesError,
-} from "../errors"
-import { parseBigintIsh, sqrt } from "../utils"
-import { Price } from "./fractions/price"
-import { TokenAmount } from "./fractions/tokenAmount"
-import { Token } from "./token"
-import { hash, ec } from "starknet"
-
-let PAIR_ADDRESS_CACHE: {
-  [token0Address: string]: { [token1Address: string]: string }
-} = {}
-
-export class Pair {
-  public readonly liquidityToken: Token
-  private readonly tokenAmounts: [TokenAmount, TokenAmount]
-
-  public static getAddress(tokenA: Token, tokenB: Token): string {
-    const tokens = tokenA.sortsBefore(tokenB)
-      ? [tokenA, tokenB]
-      : [tokenB, tokenA] // does safety checks
-
-    const salt = ec.starkCurve.pedersen(tokens[0].address, tokens[1].address)
-
-    const contructorCalldata = [
-      PAIR_CLASS_HASH,
-      tokens[0].address,
-      tokens[1].address,
-      FEE_TO_SETTER_ADDRESS[tokens[0].networkId ?? DEFAULT_NETWORK_ID],
-    ]
-
-    if (
-      PAIR_ADDRESS_CACHE?.[tokens[0].address]?.[tokens[1].address] === undefined
-    ) {
-      PAIR_ADDRESS_CACHE = {
-        ...PAIR_ADDRESS_CACHE,
-        [tokens[0].address]: {
-          ...PAIR_ADDRESS_CACHE?.[tokens[0].address],
-          [tokens[1].address]: hash.calculateContractAddressFromHash(
-            salt,
-            PAIR_PROXY_CLASS_HASH,
-            contructorCalldata,
-            FACTORY_ADDRESS[tokens[0].networkId ?? DEFAULT_NETWORK_ID],
-          ),
-        },
-      }
-    }
-
-    return PAIR_ADDRESS_CACHE[tokens[0].address][tokens[1].address]
-  }
-
-  public constructor(
-    tokenAmountA: TokenAmount,
-    tokenAmountB: TokenAmount,
-    pairAddress?: string,
-  ) {
-    const tokenAmounts = tokenAmountA.token.sortsBefore(tokenAmountB.token) // does safety checks
-      ? [tokenAmountA, tokenAmountB]
-      : [tokenAmountB, tokenAmountA]
-
-    this.liquidityToken = new Token(
-      tokenAmounts[0].token.networkId,
-      pairAddress
-        ? pairAddress
-        : Pair.getAddress(tokenAmounts[0].token, tokenAmounts[1].token),
-      18,
-      "JEDI-P",
-      "JediSwap Pair",
-    )
-    this.tokenAmounts = tokenAmounts as [TokenAmount, TokenAmount]
-  }
-
-  /**
-   * Returns true if the token is either token0 or token1
-   * @param token to check
-   */
-  public involvesToken(token: Token): boolean {
-    return token.equals(this.token0) || token.equals(this.token1)
-  }
-
-  /**
-   * Returns the current mid price of the pair in terms of token0, i.e. the ratio of reserve1 to reserve0
-   */
-  public get token0Price(): Price {
-    return new Price(
-      this.token0,
-      this.token1,
-      this.tokenAmounts[0].raw,
-      this.tokenAmounts[1].raw,
-    )
-  }
-
-  /**
-   * Returns the current mid price of the pair in terms of token1, i.e. the ratio of reserve0 to reserve1
-   */
-  public get token1Price(): Price {
-    return new Price(
-      this.token1,
-      this.token0,
-      this.tokenAmounts[1].raw,
-      this.tokenAmounts[0].raw,
-    )
-  }
-
-  /**
-   * Return the price of the given token in terms of the other token in the pair.
-   * @param token token to return price of
-   */
-  public priceOf(token: Token): Price {
-    invariant(this.involvesToken(token), "TOKEN")
-    return token.equals(this.token0) ? this.token0Price : this.token1Price
-  }
-
-  /**
-   * Returns the chain ID of the tokens in the pair.
-   */
-  public get networkId() {
-    return this.token0.networkId
-  }
-
-  public get token0(): Token {
-    return this.tokenAmounts[0].token
-  }
-
-  public get token1(): Token {
-    return this.tokenAmounts[1].token
-  }
-
-  public get reserve0(): TokenAmount {
-    return this.tokenAmounts[0]
-  }
-
-  public get reserve1(): TokenAmount {
-    return this.tokenAmounts[1]
-  }
-
-  public reserveOf(token: Token): TokenAmount {
-    invariant(this.involvesToken(token), "TOKEN")
-    return token.equals(this.token0) ? this.reserve0 : this.reserve1
-  }
-
-  public getOutputAmount(inputAmount: TokenAmount): [TokenAmount, Pair] {
-    invariant(this.involvesToken(inputAmount.token), "TOKEN")
-    if (
-      JSBI.equal(this.reserve0.raw, ZERO) ||
-      JSBI.equal(this.reserve1.raw, ZERO)
-    ) {
-      throw new InsufficientReservesError()
-    }
-    const inputReserve = this.reserveOf(inputAmount.token)
-    const outputReserve = this.reserveOf(
-      inputAmount.token.equals(this.token0) ? this.token1 : this.token0,
-    )
-    const inputAmountWithFee = JSBI.multiply(inputAmount.raw, _997)
-    const numerator = JSBI.multiply(inputAmountWithFee, outputReserve.raw)
-    const denominator = JSBI.add(
-      JSBI.multiply(inputReserve.raw, _1000),
-      inputAmountWithFee,
-    )
-    const outputAmount = new TokenAmount(
-      inputAmount.token.equals(this.token0) ? this.token1 : this.token0,
-      JSBI.divide(numerator, denominator),
-    )
-    if (JSBI.equal(outputAmount.raw, ZERO)) {
-      throw new InsufficientInputAmountError()
-    }
-    return [
-      outputAmount,
-      new Pair(
-        inputReserve.add(inputAmount),
-        outputReserve.subtract(outputAmount),
-      ),
-    ]
-  }
-
-  public getInputAmount(outputAmount: TokenAmount): [TokenAmount, Pair] {
-    invariant(this.involvesToken(outputAmount.token), "TOKEN")
-    if (
-      JSBI.equal(this.reserve0.raw, ZERO) ||
-      JSBI.equal(this.reserve1.raw, ZERO) ||
-      JSBI.greaterThanOrEqual(
-        outputAmount.raw,
-        this.reserveOf(outputAmount.token).raw,
-      )
-    ) {
-      throw new InsufficientReservesError()
-    }
-
-    const outputReserve = this.reserveOf(outputAmount.token)
-    const inputReserve = this.reserveOf(
-      outputAmount.token.equals(this.token0) ? this.token1 : this.token0,
-    )
-    const numerator = JSBI.multiply(
-      JSBI.multiply(inputReserve.raw, outputAmount.raw),
-      _1000,
-    )
-    const denominator = JSBI.multiply(
-      JSBI.subtract(outputReserve.raw, outputAmount.raw),
-      _997,
-    )
-    const inputAmount = new TokenAmount(
-      outputAmount.token.equals(this.token0) ? this.token1 : this.token0,
-      JSBI.add(JSBI.divide(numerator, denominator), ONE),
-    )
-    return [
-      inputAmount,
-      new Pair(
-        inputReserve.add(inputAmount),
-        outputReserve.subtract(outputAmount),
-      ),
-    ]
-  }
-
-  public getLiquidityMinted(
-    totalSupply: TokenAmount,
-    tokenAmountA: TokenAmount,
-    tokenAmountB: TokenAmount,
-  ): TokenAmount {
-    invariant(totalSupply.token.equals(this.liquidityToken), "LIQUIDITY")
-    const tokenAmounts = tokenAmountA.token.sortsBefore(tokenAmountB.token) // does safety checks
-      ? [tokenAmountA, tokenAmountB]
-      : [tokenAmountB, tokenAmountA]
-    invariant(
-      tokenAmounts[0].token.equals(this.token0) &&
-        tokenAmounts[1].token.equals(this.token1),
-      "TOKEN",
-    )
-
-    let liquidity: JSBI
-    if (JSBI.equal(totalSupply.raw, ZERO)) {
-      liquidity = JSBI.subtract(
-        sqrt(JSBI.multiply(tokenAmounts[0].raw, tokenAmounts[1].raw)),
-        MINIMUM_LIQUIDITY,
-      )
-    } else {
-      const amount0 = JSBI.divide(
-        JSBI.multiply(tokenAmounts[0].raw, totalSupply.raw),
-        this.reserve0.raw,
-      )
-      const amount1 = JSBI.divide(
-        JSBI.multiply(tokenAmounts[1].raw, totalSupply.raw),
-        this.reserve1.raw,
-      )
-      liquidity = JSBI.lessThanOrEqual(amount0, amount1) ? amount0 : amount1
-    }
-    if (!JSBI.greaterThan(liquidity, ZERO)) {
-      throw new InsufficientInputAmountError()
-    }
-    return new TokenAmount(this.liquidityToken, liquidity)
-  }
-
-  public getLiquidityValue(
-    token: Token,
-    totalSupply: TokenAmount,
-    liquidity: TokenAmount,
-    feeOn = false,
-    kLast?: BigintIsh,
-  ): TokenAmount {
-    invariant(this.involvesToken(token), "TOKEN")
-    invariant(totalSupply.token.equals(this.liquidityToken), "TOTAL_SUPPLY")
-    invariant(liquidity.token.equals(this.liquidityToken), "LIQUIDITY")
-    invariant(JSBI.lessThanOrEqual(liquidity.raw, totalSupply.raw), "LIQUIDITY")
-
-    let totalSupplyAdjusted: TokenAmount
-    if (!feeOn) {
-      totalSupplyAdjusted = totalSupply
-    } else {
-      invariant(!!kLast, "K_LAST")
-      const kLastParsed = parseBigintIsh(kLast)
-      if (!JSBI.equal(kLastParsed, ZERO)) {
-        const rootK = sqrt(JSBI.multiply(this.reserve0.raw, this.reserve1.raw))
-        const rootKLast = sqrt(kLastParsed)
-        if (JSBI.greaterThan(rootK, rootKLast)) {
-          const numerator = JSBI.multiply(
-            totalSupply.raw,
-            JSBI.subtract(rootK, rootKLast),
-          )
-          const denominator = JSBI.add(JSBI.multiply(rootK, FIVE), rootKLast)
-          const feeLiquidity = JSBI.divide(numerator, denominator)
-          totalSupplyAdjusted = totalSupply.add(
-            new TokenAmount(this.liquidityToken, feeLiquidity),
-          )
-        } else {
-          totalSupplyAdjusted = totalSupply
-        }
-      } else {
-        totalSupplyAdjusted = totalSupply
-      }
-    }
-
-    return new TokenAmount(
-      token,
-      JSBI.divide(
-        JSBI.multiply(liquidity.raw, this.reserveOf(token).raw),
-        totalSupplyAdjusted.raw,
-      ),
-    )
-  }
-}
diff --git a/packages/swap/src/sdk/entities/route.ts b/packages/swap/src/sdk/entities/route.ts
deleted file mode 100644
index 2d85ed230..000000000
--- a/packages/swap/src/sdk/entities/route.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import invariant from "tiny-invariant"
-
-import { Currency } from "./currency"
-import { Price } from "./fractions/price"
-import { Pair } from "./pair"
-import { Token, WETH } from "./token"
-import { ETHER, SupportedNetworks } from ".."
-
-export class Route {
-  public readonly pairs: Pair[]
-  public readonly path: Token[]
-  public readonly input: Currency
-  public readonly output: Currency
-  public readonly midPrice: Price
-
-  public constructor(pairs: Pair[], input: Currency, output?: Currency) {
-    invariant(pairs.length > 0, "PAIRS")
-    invariant(
-      pairs.every((pair) => pair.networkId === pairs[0].networkId),
-      "CHAIN_IDS",
-    )
-    invariant(
-      (input instanceof Token && pairs[0].involvesToken(input)) ||
-        (input === ETHER && pairs[0].involvesToken(WETH[pairs[0].networkId])),
-      "INPUT",
-    )
-    invariant(
-      typeof output === "undefined" ||
-        (output instanceof Token &&
-          pairs[pairs.length - 1].involvesToken(output)) ||
-        (output === ETHER &&
-          pairs[pairs.length - 1].involvesToken(WETH[pairs[0].networkId])),
-      "OUTPUT",
-    )
-
-    const path: Token[] = [
-      input instanceof Token ? input : WETH[pairs[0].networkId],
-    ]
-    for (const [i, pair] of pairs.entries()) {
-      const currentInput = path[i]
-      invariant(
-        currentInput.equals(pair.token0) || currentInput.equals(pair.token1),
-        "PATH",
-      )
-      const output = currentInput.equals(pair.token0)
-        ? pair.token1
-        : pair.token0
-      path.push(output)
-    }
-
-    this.pairs = pairs
-    this.path = path
-    this.midPrice = Price.fromRoute(this)
-    this.input = input
-    this.output = output ?? path[path.length - 1]
-  }
-
-  public get networkId(): SupportedNetworks {
-    return this.pairs[0].networkId
-  }
-}
diff --git a/packages/swap/src/sdk/entities/token.ts b/packages/swap/src/sdk/entities/token.ts
deleted file mode 100644
index 39db6fc01..000000000
--- a/packages/swap/src/sdk/entities/token.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { validateAndParseAddress } from "starknet"
-import { num } from "starknet"
-import invariant from "tiny-invariant"
-
-import { SupportedNetworks } from "../constants"
-import { Currency, ETHER } from "./currency"
-
-/**
- * Represents an ERC20 token with a unique address and some metadata.
- */
-export class Token extends Currency {
-  public readonly networkId: SupportedNetworks
-  public readonly address: string
-
-  public constructor(
-    networkId: SupportedNetworks,
-    address: string,
-    decimals: number,
-    symbol?: string,
-    name?: string,
-  ) {
-    super(decimals, symbol, name)
-    this.networkId = networkId
-    this.address = validateAndParseAddress(address).toLowerCase()
-  }
-
-  /**
-   * Returns true if the two tokens are equivalent, i.e. have the same chainId and address.
-   * @param other other token to compare
-   */
-  public equals(other: Token): boolean {
-    // short circuit on reference equality
-    if (this === other) {
-      return true
-    }
-    return this.networkId === other.networkId && this.address === other.address
-  }
-
-  /**
-   * Returns true if the address of this token sorts before the address of the other token
-   * @param other other token to compare
-   * @throws if the tokens have the same address
-   * @throws if the tokens are on different chains
-   */
-  public sortsBefore(other: Token): boolean {
-    invariant(this.networkId === other.networkId, "CHAIN_IDS")
-    invariant(this.address !== other.address, "ADDRESSES")
-    const thisAddress = num.toBigInt(this.address)
-    const otherAddress = num.toBigInt(other.address)
-
-    return thisAddress < otherAddress
-  }
-}
-
-/**
- * Compares two currencies for equality
- */
-export function currencyEquals(
-  currencyA: Currency,
-  currencyB: Currency,
-): boolean {
-  if (currencyA instanceof Token && currencyB instanceof Token) {
-    return currencyA.equals(currencyB)
-  } else if (currencyA instanceof Token) {
-    return false
-  } else if (currencyB instanceof Token) {
-    return false
-  } else {
-    return currencyA === currencyB
-  }
-}
-
-export const WETH: { [network in SupportedNetworks]: Token } = {
-  [SupportedNetworks.MAINNET]: new Token(
-    SupportedNetworks.MAINNET,
-    "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
-    ETHER.decimals,
-    ETHER.symbol,
-    ETHER.name,
-  ),
-  [SupportedNetworks.TESTNET]: new Token(
-    SupportedNetworks.TESTNET,
-    "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
-    ETHER.decimals,
-    ETHER.symbol,
-    ETHER.name,
-  ),
-  [SupportedNetworks.TESTNET2]: new Token(
-    SupportedNetworks.TESTNET,
-    "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
-    ETHER.decimals,
-    ETHER.symbol,
-    ETHER.name,
-  ),
-}
diff --git a/packages/swap/src/sdk/entities/trade.ts b/packages/swap/src/sdk/entities/trade.ts
deleted file mode 100644
index c539da3d2..000000000
--- a/packages/swap/src/sdk/entities/trade.ts
+++ /dev/null
@@ -1,504 +0,0 @@
-import JSBI from "jsbi"
-import invariant from "tiny-invariant"
-
-import { InsufficientInputAmountError } from "./../errors"
-import {
-  ONE,
-  SupportedNetworks,
-  TradeType,
-  ZERO,
-  _1000,
-  _997,
-} from "../constants"
-import { InsufficientReservesError } from "../errors"
-import { sortedInsert } from "../utils"
-import { Currency, ETHER } from "./currency"
-import { CurrencyAmount } from "./fractions/currencyAmount"
-import { Fraction } from "./fractions/fraction"
-import { Percent } from "./fractions/percent"
-import { Price } from "./fractions/price"
-import { TokenAmount } from "./fractions/tokenAmount"
-import { Pair } from "./pair"
-import { Route } from "./route"
-import { Token, WETH, currencyEquals } from "./token"
-
-/**
- * Returns the percent difference between the mid price and the execution price, i.e. price impact.
- * @param midPrice mid price before the trade
- * @param inputAmount the input amount of the trade
- * @param outputAmount the output amount of the trade
- */
-function computePriceImpact(
-  midPrice: Price,
-  inputAmount: CurrencyAmount,
-  outputAmount: CurrencyAmount,
-): Percent {
-  const exactQuote = midPrice.raw.multiply(inputAmount.raw)
-  // calculate slippage := (exactQuote - outputAmount) / exactQuote
-  const slippage = exactQuote.subtract(outputAmount.raw).divide(exactQuote)
-  return new Percent(slippage.numerator, slippage.denominator)
-}
-
-// minimal interface so the input output comparator may be shared across types
-interface InputOutput {
-  readonly inputAmount: CurrencyAmount
-  readonly outputAmount: CurrencyAmount
-}
-
-// comparator function that allows sorting trades by their output amounts, in decreasing order, and then input amounts
-// in increasing order. i.e. the best trades have the most outputs for the least inputs and are sorted first
-export function inputOutputComparator(a: InputOutput, b: InputOutput): number {
-  // must have same input and output token for comparison
-  invariant(
-    currencyEquals(a.inputAmount.currency, b.inputAmount.currency),
-    "INPUT_CURRENCY",
-  )
-  invariant(
-    currencyEquals(a.outputAmount.currency, b.outputAmount.currency),
-    "OUTPUT_CURRENCY",
-  )
-  if (a.outputAmount.equalTo(b.outputAmount)) {
-    if (a.inputAmount.equalTo(b.inputAmount)) {
-      return 0
-    }
-    // trade A requires less input than trade B, so A should come first
-    if (a.inputAmount.lessThan(b.inputAmount)) {
-      return -1
-    } else {
-      return 1
-    }
-  } else {
-    // tradeA has less output than trade B, so should come second
-    if (a.outputAmount.lessThan(b.outputAmount)) {
-      return 1
-    } else {
-      return -1
-    }
-  }
-}
-
-// extension of the input output comparator that also considers other dimensions of the trade in ranking them
-export function tradeComparator(a: Trade, b: Trade) {
-  const ioComp = inputOutputComparator(a, b)
-  if (ioComp !== 0) {
-    return ioComp
-  }
-
-  // consider lowest slippage next, since these are less likely to fail
-  if (a.priceImpact.lessThan(b.priceImpact)) {
-    return -1
-  } else if (a.priceImpact.greaterThan(b.priceImpact)) {
-    return 1
-  }
-
-  // finally consider the number of hops since each hop costs gas
-  return a.route.path.length - b.route.path.length
-}
-
-export interface BestTradeOptions {
-  // how many results to return
-  maxNumResults?: number
-  // the maximum number of hops a trade should contain
-  maxHops?: number
-}
-
-/**
- * Given a currency amount and a chain ID, returns the equivalent representation as the token amount.
- * In other words, if the currency is ETHER, returns the WETH token amount for the given chain. Otherwise, returns
- * the input currency amount.
- */
-function wrappedAmount(
-  currencyAmount: CurrencyAmount,
-  networkId: SupportedNetworks,
-): TokenAmount {
-  if (currencyAmount instanceof TokenAmount) {
-    return currencyAmount
-  }
-  if (currencyAmount.currency === ETHER) {
-    return new TokenAmount(WETH[networkId], currencyAmount.raw)
-  }
-  invariant(false, "CURRENCY")
-}
-
-function wrappedCurrency(
-  currency: Currency,
-  networkId: SupportedNetworks,
-): Token {
-  if (currency instanceof Token) {
-    return currency
-  }
-  if (currency === ETHER) {
-    return WETH[networkId]
-  }
-  invariant(false, "CURRENCY")
-}
-
-/**
- * Represents a trade executed against a list of pairs.
- * Does not account for slippage, i.e. trades that front run this trade and move the price.
- */
-export class Trade {
-  /**
-   * The route of the trade, i.e. which pairs the trade goes through.
-   */
-  public readonly route: Route
-  /**
-   * The type of the trade, either exact in or exact out.
-   */
-  public readonly tradeType: TradeType
-  /**
-   * The input amount for the trade assuming no slippage.
-   */
-  public readonly inputAmount: CurrencyAmount
-  /**
-   * The output amount for the trade assuming no slippage.
-   */
-  public readonly outputAmount: CurrencyAmount
-  /**
-   * The price expressed in terms of output amount/input amount.
-   */
-  public readonly executionPrice: Price
-  /**
-   * The price expressed in terms of output amount/(input amount - 0.3% fee).
-   */
-  public readonly executionPriceWithFee: Price
-  /**
-   * The mid price after the trade executes assuming no slippage.
-   */
-  public readonly nextMidPrice: Price
-  /**
-   * The percent difference between the mid price before the trade and the trade execution price.
-   */
-  public readonly priceImpact: Percent
-
-  /**
-   * Constructs an exact in trade with the given amount in and route
-   * @param route route of the exact in trade
-   * @param amountIn the amount being passed in
-   */
-  public static exactIn(route: Route, amountIn: CurrencyAmount): Trade {
-    return new Trade(route, amountIn, TradeType.EXACT_INPUT)
-  }
-
-  /**
-   * Constructs an exact out trade with the given amount out and route
-   * @param route route of the exact out trade
-   * @param amountOut the amount returned by the trade
-   */
-  public static exactOut(route: Route, amountOut: CurrencyAmount): Trade {
-    return new Trade(route, amountOut, TradeType.EXACT_OUTPUT)
-  }
-
-  public constructor(
-    route: Route,
-    amount: CurrencyAmount,
-    tradeType: TradeType,
-  ) {
-    const amounts: TokenAmount[] = new Array(route.path.length)
-    const nextPairs: Pair[] = new Array(route.pairs.length)
-    if (tradeType === TradeType.EXACT_INPUT) {
-      invariant(currencyEquals(amount.currency, route.input), "INPUT")
-      amounts[0] = wrappedAmount(amount, route.networkId)
-      for (let i = 0; i < route.path.length - 1; i++) {
-        const pair = route.pairs[i]
-        const [outputAmount, nextPair] = pair.getOutputAmount(amounts[i])
-        amounts[i + 1] = outputAmount
-        nextPairs[i] = nextPair
-      }
-    } else {
-      invariant(currencyEquals(amount.currency, route.output), "OUTPUT")
-      amounts[amounts.length - 1] = wrappedAmount(amount, route.networkId)
-      for (let i = route.path.length - 1; i > 0; i--) {
-        const pair = route.pairs[i - 1]
-        const [inputAmount, nextPair] = pair.getInputAmount(amounts[i])
-        amounts[i - 1] = inputAmount
-        nextPairs[i - 1] = nextPair
-      }
-    }
-
-    this.route = route
-    this.tradeType = tradeType
-    this.inputAmount =
-      tradeType === TradeType.EXACT_INPUT
-        ? amount
-        : route.input === ETHER
-        ? CurrencyAmount.ether(amounts[0].raw)
-        : amounts[0]
-    this.outputAmount =
-      tradeType === TradeType.EXACT_OUTPUT
-        ? amount
-        : route.output === ETHER
-        ? CurrencyAmount.ether(amounts[amounts.length - 1].raw)
-        : amounts[amounts.length - 1]
-    this.executionPrice = new Price(
-      this.inputAmount.currency,
-      this.outputAmount.currency,
-      this.inputAmount.raw,
-      this.outputAmount.raw,
-    )
-
-    this.executionPriceWithFee = new Price(
-      this.inputAmount.currency,
-      this.outputAmount.currency,
-      JSBI.multiply(this.inputAmount.raw, _997),
-      JSBI.multiply(this.outputAmount.raw, _1000),
-    )
-
-    this.nextMidPrice = Price.fromRoute(new Route(nextPairs, route.input))
-    this.priceImpact = computePriceImpact(
-      route.midPrice,
-      this.inputAmount,
-      this.outputAmount,
-    )
-  }
-
-  /**
-   * Get the minimum amount that must be received from this trade for the given slippage tolerance
-   * @param slippageTolerance tolerance of unfavorable slippage from the execution price of this trade
-   */
-  public minimumAmountOut(slippageTolerance: Percent): CurrencyAmount {
-    invariant(!slippageTolerance.lessThan(ZERO), "SLIPPAGE_TOLERANCE")
-    if (this.tradeType === TradeType.EXACT_OUTPUT) {
-      return this.outputAmount
-    } else {
-      const slippageAdjustedAmountOut = new Fraction(ONE)
-        .add(slippageTolerance)
-        .invert()
-        .multiply(this.outputAmount.raw).quotient
-      return this.outputAmount instanceof TokenAmount
-        ? new TokenAmount(this.outputAmount.token, slippageAdjustedAmountOut)
-        : CurrencyAmount.ether(slippageAdjustedAmountOut)
-    }
-  }
-
-  /**
-   * Get the maximum amount in that can be spent via this trade for the given slippage tolerance
-   * @param slippageTolerance tolerance of unfavorable slippage from the execution price of this trade
-   */
-  public maximumAmountIn(slippageTolerance: Percent): CurrencyAmount {
-    invariant(!slippageTolerance.lessThan(ZERO), "SLIPPAGE_TOLERANCE")
-    if (this.tradeType === TradeType.EXACT_INPUT) {
-      return this.inputAmount
-    } else {
-      const slippageAdjustedAmountIn = new Fraction(ONE)
-        .add(slippageTolerance)
-        .multiply(this.inputAmount.raw).quotient
-      return this.inputAmount instanceof TokenAmount
-        ? new TokenAmount(this.inputAmount.token, slippageAdjustedAmountIn)
-        : CurrencyAmount.ether(slippageAdjustedAmountIn)
-    }
-  }
-
-  /**
-   * Given a list of pairs, and a fixed amount in, returns the top `maxNumResults` trades that go from an input token
-   * amount to an output token, making at most `maxHops` hops.
-   * Note this does not consider aggregation, as routes are linear. It's possible a better route exists by splitting
-   * the amount in among multiple routes.
-   * @param pairs the pairs to consider in finding the best trade
-   * @param currencyAmountIn exact amount of input currency to spend
-   * @param currencyOut the desired currency out
-   * @param maxNumResults maximum number of results to return
-   * @param maxHops maximum number of hops a returned trade can make, e.g. 1 hop goes through a single pair
-   * @param currentPairs used in recursion; the current list of pairs
-   * @param originalAmountIn used in recursion; the original value of the currencyAmountIn parameter
-   * @param bestTrades used in recursion; the current list of best trades
-   */
-  public static bestTradeExactIn(
-    pairs: Pair[],
-    currencyAmountIn: CurrencyAmount,
-    currencyOut: Currency,
-    { maxNumResults = 3, maxHops = 3 }: BestTradeOptions = {},
-    // used in recursion.
-    currentPairs: Pair[] = [],
-    originalAmountIn: CurrencyAmount = currencyAmountIn,
-    bestTrades: Trade[] = [],
-  ): Trade[] {
-    invariant(pairs.length > 0, "PAIRS")
-    invariant(maxHops > 0, "MAX_HOPS")
-    invariant(
-      originalAmountIn === currencyAmountIn || currentPairs.length > 0,
-      "INVALID_RECURSION",
-    )
-    const networkId: SupportedNetworks | undefined =
-      currencyAmountIn instanceof TokenAmount
-        ? currencyAmountIn.token.networkId
-        : currencyOut instanceof Token
-        ? currencyOut.networkId
-        : undefined
-    invariant(networkId !== undefined, "CHAIN_ID")
-
-    const amountIn = wrappedAmount(currencyAmountIn, networkId)
-    const tokenOut = wrappedCurrency(currencyOut, networkId)
-    for (let i = 0; i < pairs.length; i++) {
-      const pair = pairs[i]
-      // pair irrelevant
-      if (
-        !pair.token0.equals(amountIn.token) &&
-        !pair.token1.equals(amountIn.token)
-      ) {
-        continue
-      }
-      if (pair.reserve0.equalTo(ZERO) || pair.reserve1.equalTo(ZERO)) {
-        continue
-      }
-
-      let amountOut: TokenAmount
-      try {
-        ;[amountOut] = pair.getOutputAmount(amountIn)
-      } catch (error) {
-        // input too low
-        if (
-          error instanceof InsufficientInputAmountError &&
-          error.isInsufficientInputAmountError
-        ) {
-          continue
-        }
-        throw error
-      }
-      // we have arrived at the output token, so this is the final trade of one of the paths
-      if (amountOut.token.equals(tokenOut)) {
-        sortedInsert(
-          bestTrades,
-          new Trade(
-            new Route(
-              [...currentPairs, pair],
-              originalAmountIn.currency,
-              currencyOut,
-            ),
-            originalAmountIn,
-            TradeType.EXACT_INPUT,
-          ),
-          maxNumResults,
-          tradeComparator,
-        )
-      } else if (maxHops > 1 && pairs.length > 1) {
-        const pairsExcludingThisPair = pairs
-          .slice(0, i)
-          .concat(pairs.slice(i + 1, pairs.length))
-
-        // otherwise, consider all the other paths that lead from this token as long as we have not exceeded maxHops
-        Trade.bestTradeExactIn(
-          pairsExcludingThisPair,
-          amountOut,
-          currencyOut,
-          {
-            maxNumResults,
-            maxHops: maxHops - 1,
-          },
-          [...currentPairs, pair],
-          originalAmountIn,
-          bestTrades,
-        )
-      }
-    }
-
-    return bestTrades
-  }
-
-  /**
-   * similar to the above method but instead targets a fixed output amount
-   * given a list of pairs, and a fixed amount out, returns the top `maxNumResults` trades that go from an input token
-   * to an output token amount, making at most `maxHops` hops
-   * note this does not consider aggregation, as routes are linear. it's possible a better route exists by splitting
-   * the amount in among multiple routes.
-   * @param pairs the pairs to consider in finding the best trade
-   * @param currencyIn the currency to spend
-   * @param currencyAmountOut the exact amount of currency out
-   * @param maxNumResults maximum number of results to return
-   * @param maxHops maximum number of hops a returned trade can make, e.g. 1 hop goes through a single pair
-   * @param currentPairs used in recursion; the current list of pairs
-   * @param originalAmountOut used in recursion; the original value of the currencyAmountOut parameter
-   * @param bestTrades used in recursion; the current list of best trades
-   */
-  public static bestTradeExactOut(
-    pairs: Pair[],
-    currencyIn: Currency,
-    currencyAmountOut: CurrencyAmount,
-    { maxNumResults = 3, maxHops = 3 }: BestTradeOptions = {},
-    // used in recursion.
-    currentPairs: Pair[] = [],
-    originalAmountOut: CurrencyAmount = currencyAmountOut,
-    bestTrades: Trade[] = [],
-  ): Trade[] {
-    invariant(pairs.length > 0, "PAIRS")
-    invariant(maxHops > 0, "MAX_HOPS")
-    invariant(
-      originalAmountOut === currencyAmountOut || currentPairs.length > 0,
-      "INVALID_RECURSION",
-    )
-    const networkId: SupportedNetworks | undefined =
-      currencyAmountOut instanceof TokenAmount
-        ? currencyAmountOut.token.networkId
-        : currencyIn instanceof Token
-        ? currencyIn.networkId
-        : undefined
-    invariant(networkId !== undefined, "CHAIN_ID")
-
-    const amountOut = wrappedAmount(currencyAmountOut, networkId)
-    const tokenIn = wrappedCurrency(currencyIn, networkId)
-    for (let i = 0; i < pairs.length; i++) {
-      const pair = pairs[i]
-      // pair irrelevant
-      if (
-        !pair.token0.equals(amountOut.token) &&
-        !pair.token1.equals(amountOut.token)
-      ) {
-        continue
-      }
-      if (pair.reserve0.equalTo(ZERO) || pair.reserve1.equalTo(ZERO)) {
-        continue
-      }
-
-      let amountIn: TokenAmount
-      try {
-        ;[amountIn] = pair.getInputAmount(amountOut)
-      } catch (error) {
-        // not enough liquidity in this pair
-        if (
-          error instanceof InsufficientReservesError &&
-          error.isInsufficientReservesError
-        ) {
-          continue
-        }
-        throw error
-      }
-      // we have arrived at the input token, so this is the first trade of one of the paths
-      if (amountIn.token.equals(tokenIn)) {
-        sortedInsert(
-          bestTrades,
-          new Trade(
-            new Route(
-              [pair, ...currentPairs],
-              currencyIn,
-              originalAmountOut.currency,
-            ),
-            originalAmountOut,
-            TradeType.EXACT_OUTPUT,
-          ),
-          maxNumResults,
-          tradeComparator,
-        )
-      } else if (maxHops > 1 && pairs.length > 1) {
-        const pairsExcludingThisPair = pairs
-          .slice(0, i)
-          .concat(pairs.slice(i + 1, pairs.length))
-
-        // otherwise, consider all the other paths that arrive at this token as long as we have not exceeded maxHops
-        Trade.bestTradeExactOut(
-          pairsExcludingThisPair,
-          currencyIn,
-          amountIn,
-          {
-            maxNumResults,
-            maxHops: maxHops - 1,
-          },
-          [pair, ...currentPairs],
-          originalAmountOut,
-          bestTrades,
-        )
-      }
-    }
-
-    return bestTrades
-  }
-}
diff --git a/packages/swap/src/sdk/errors.ts b/packages/swap/src/sdk/errors.ts
deleted file mode 100644
index 13b858d2c..000000000
--- a/packages/swap/src/sdk/errors.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// see https://stackoverflow.com/a/41102306
-const CAN_SET_PROTOTYPE = "setPrototypeOf" in Object
-
-/**
- * Indicates that the pair has insufficient reserves for a desired output amount. I.e. the amount of output cannot be
- * obtained by sending any amount of input.
- */
-export class InsufficientReservesError extends Error {
-  public readonly isInsufficientReservesError = true
-
-  public constructor() {
-    super()
-    this.name = this.constructor.name
-    if (CAN_SET_PROTOTYPE) {
-      Object.setPrototypeOf(this, new.target.prototype)
-    }
-  }
-}
-
-/**
- * Indicates that the input amount is too small to produce any amount of output. I.e. the amount of input sent is less
- * than the price of a single unit of output after fees.
- */
-export class InsufficientInputAmountError extends Error {
-  public readonly isInsufficientInputAmountError = true
-
-  public constructor() {
-    super()
-    this.name = this.constructor.name
-    if (CAN_SET_PROTOTYPE) {
-      Object.setPrototypeOf(this, new.target.prototype)
-    }
-  }
-}
diff --git a/packages/swap/src/sdk/index.ts b/packages/swap/src/sdk/index.ts
deleted file mode 100644
index 435e79265..000000000
--- a/packages/swap/src/sdk/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import JSBI from "jsbi"
-
-export type { BigintIsh } from "./constants"
-
-export { JSBI }
-
-export {
-  SupportedNetworks,
-  TradeType,
-  Rounding,
-  FACTORY_ADDRESS,
-  PAIR_CLASS_HASH,
-  MINIMUM_LIQUIDITY,
-} from "./constants"
-
-export * from "./errors"
-export * from "./entities"
-export * from "./router"
diff --git a/packages/swap/src/sdk/router.ts b/packages/swap/src/sdk/router.ts
deleted file mode 100644
index 13b48955c..000000000
--- a/packages/swap/src/sdk/router.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { validateAndParseAddress } from "starknet"
-import invariant from "tiny-invariant"
-
-import { TradeType } from "./constants"
-import { CurrencyAmount, ETHER, Percent, Trade } from "./entities"
-
-/**
- * Options for producing the arguments to send call to the router.
- */
-export interface TradeOptions {
-  /**
-   * How much the execution price is allowed to move unfavorably from the trade execution price.
-   */
-  allowedSlippage: Percent
-  /**
-   * How long the swap is valid until it expires, in seconds.
-   * This will be used to produce a `deadline` parameter which is computed from when the swap call parameters
-   * are generated.
-   */
-  ttl: number
-  /**
-   * The account that should receive the output of the swap.
-   */
-  recipient: string
-
-  /**
-   * Whether any of the tokens in the path are fee on transfer tokens, which should be handled with special methods
-   */
-  feeOnTransfer?: boolean
-}
-
-export interface TradeOptionsDeadline extends Omit<TradeOptions, "ttl"> {
-  /**
-   * When the transaction expires.
-   * This is an atlernate to specifying the ttl, for when you do not want to use local time.
-   */
-  deadline: number
-}
-
-/**
- * The parameters to use in the call to the Uniswap V2 Router to execute a trade.
- */
-export interface SwapParameters {
-  /**
-   * The method to call on the Uniswap V2 Router.
-   */
-  methodName: string
-  /**
-   * The arguments to pass to the method, all hex encoded.
-   */
-  args: (string | string[])[]
-  /**
-   * The amount of wei to send in hex.
-   */
-  value: string
-}
-
-function toHex(currencyAmount: CurrencyAmount) {
-  return `0x${currencyAmount.raw.toString(16)}`
-}
-
-const ZERO_HEX = "0x0"
-
-/**
- * Represents the Uniswap V2 Router, and has static methods for helping execute trades.
- */
-export abstract class Router {
-  /**
-   * Cannot be constructed.
-   */
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  private constructor(_: any) {}
-  /**
-   * Produces the on-chain method name to call and the hex encoded parameters to pass as arguments for a given trade.
-   * @param trade to produce call parameters for
-   * @param options options for the call parameters
-   */
-  public static swapCallParameters(
-    trade: Trade,
-    options: TradeOptions | TradeOptionsDeadline,
-  ): SwapParameters {
-    const etherIn = trade.inputAmount.currency === ETHER
-    const etherOut = trade.outputAmount.currency === ETHER
-    // the router does not support both ether in and out
-    invariant(!(etherIn && etherOut), "ETHER_IN_OUT")
-    invariant(!("ttl" in options) || options.ttl > 0, "TTL")
-
-    const to: string = validateAndParseAddress(options.recipient)
-    const amountIn: string = toHex(
-      trade.maximumAmountIn(options.allowedSlippage),
-    )
-    const amountOut: string = toHex(
-      trade.minimumAmountOut(options.allowedSlippage),
-    )
-    const path: string[] = trade.route.path.map((token) => token.address)
-    const deadline =
-      "ttl" in options
-        ? `0x${(Math.floor(new Date().getTime() / 1000) + options.ttl).toString(
-            16,
-          )}`
-        : `0x${options.deadline.toString(16)}`
-
-    // const useFeeOnTransfer = Boolean(options.feeOnTransfer)
-
-    let methodName: string
-    let args: (string | string[])[]
-    let value: string
-    switch (trade.tradeType) {
-      case TradeType.EXACT_INPUT:
-        // TODO: Implement this once a Base Token in finalized
-        // if (etherIn) {
-        //   methodName = useFeeOnTransfer ? 'swapExactETHForTokensSupportingFeeOnTransferTokens' : 'swapExactETHForTokens'
-        //   // (uint amountOutMin, address[] calldata path, address to, uint deadline)
-        //   args = [amountOut, path, to, deadline]
-        //   value = amountIn
-        // } else if (etherOut) {
-        //   methodName = useFeeOnTransfer ? 'swapExactTokensForETHSupportingFeeOnTransferTokens' : 'swapExactTokensForETH'
-        //   // (uint amountIn, uint amountOutMin, address[] calldata path, address to, uint deadline)
-        //   args = [amountIn, amountOut, path, to, deadline]
-        //   value = ZERO_HEX
-        // } else {
-
-        // TODO: Implement UseFeeOnTransfer when fee mechanism is confirmed
-        /*  methodName = useFeeOnTransfer
-          ? 'swapExactTokensForTokensSupportingFeeOnTransferTokens'
-          : 'swapExactTokensForTokens' */
-        // (uint amountIn, uint amountOutMin, address[] calldata path, address to, uint deadline)
-
-        methodName = "swap_exact_tokens_for_tokens"
-        args = [amountIn, amountOut, path, to, deadline]
-        value = ZERO_HEX
-        // }
-        break
-      case TradeType.EXACT_OUTPUT:
-        // invariant(!useFeeOnTransfer, 'EXACT_OUT_FOT')
-        // if (etherIn) {
-        //   methodName = 'swapETHForExactTokens'
-        //   // (uint amountOut, address[] calldata path, address to, uint deadline)
-        //   args = [amountOut, path, to, deadline]
-        //   value = amountIn
-        // } else if (etherOut) {
-        //   methodName = 'swapTokensForExactETH'
-        //   // (uint amountOut, uint amountInMax, address[] calldata path, address to, uint deadline)
-        //   args = [amountOut, amountIn, path, to, deadline]
-        //   value = ZERO_HEX
-        // } else {
-        methodName = "swap_tokens_for_exact_tokens"
-        // (uint amountOut, uint amountInMax, address[] calldata path, address to, uint deadline)
-        args = [amountOut, amountIn, path, to, deadline]
-        value = ZERO_HEX
-        // }
-        break
-    }
-    return {
-      methodName,
-      args,
-      value,
-    }
-  }
-}
diff --git a/packages/swap/src/sdk/utils.ts b/packages/swap/src/sdk/utils.ts
deleted file mode 100644
index 2dfa43d3b..000000000
--- a/packages/swap/src/sdk/utils.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import JSBI from "jsbi"
-import invariant from "tiny-invariant"
-
-import {
-  BigintIsh,
-  ONE,
-  SOLIDITY_TYPE_MAXIMA,
-  SolidityType,
-  THREE,
-  TWO,
-  ZERO,
-} from "./constants"
-
-export function validateSolidityTypeInstance(
-  value: JSBI,
-  solidityType: SolidityType,
-) {
-  invariant(
-    JSBI.greaterThanOrEqual(value, ZERO),
-    `${value} is not a ${solidityType}.`,
-  )
-  invariant(
-    JSBI.lessThanOrEqual(value, SOLIDITY_TYPE_MAXIMA[solidityType]),
-    `${value} is not a ${solidityType}.`,
-  )
-}
-
-// warns if addresses are not checksummed
-export function validateAndParseAddress(address: string): string {
-  invariant(typeof address === "string", `${address} is invalid address type`)
-
-  invariant(
-    address.match(/^(0x)?[0-9a-fA-F]{63,64}$/),
-    `${address} is invalid address format`,
-  )
-
-  return address.substring(0, 2) === "0x" ? address : `0x${address}`
-}
-
-export function parseBigintIsh(bigintIsh: BigintIsh): JSBI {
-  return bigintIsh instanceof JSBI
-    ? bigintIsh
-    : typeof bigintIsh === "bigint"
-    ? JSBI.BigInt(bigintIsh.toString())
-    : JSBI.BigInt(bigintIsh)
-}
-
-// mock the on-chain sqrt function
-export function sqrt(y: JSBI): JSBI {
-  validateSolidityTypeInstance(y, SolidityType.uint256)
-  let z: JSBI = ZERO
-  let x: JSBI
-  if (JSBI.greaterThan(y, THREE)) {
-    z = y
-    x = JSBI.add(JSBI.divide(y, TWO), ONE)
-    while (JSBI.lessThan(x, z)) {
-      z = x
-      x = JSBI.divide(JSBI.add(JSBI.divide(y, x), x), TWO)
-    }
-  } else if (JSBI.notEqual(y, ZERO)) {
-    z = ONE
-  }
-  return z
-}
-
-// given an array of items sorted by `comparator`, insert an item into its sort index and constrain the size to
-// `maxSize` by removing the last item
-export function sortedInsert<T>(
-  items: T[],
-  add: T,
-  maxSize: number,
-  comparator: (a: T, b: T) => number,
-): T | undefined {
-  invariant(maxSize > 0, "MAX_SIZE_ZERO")
-  // this is an invariant because the interface cannot return multiple removed items if items.length exceeds maxSize
-  invariant(items.length <= maxSize, "ITEMS_SIZE")
-
-  // short circuit first item add
-  if (items.length === 0) {
-    items.push(add)
-    return undefined
-  } else {
-    const isFull = items.length === maxSize
-    // short circuit if full and the additional item does not come before the last item
-    if (isFull && comparator(items[items.length - 1], add) <= 0) {
-      return add
-    }
-
-    let lo = 0,
-      hi = items.length
-
-    while (lo < hi) {
-      const mid = (lo + hi) >>> 1
-      if (comparator(items[mid], add) <= 0) {
-        lo = mid + 1
-      } else {
-        hi = mid
-      }
-    }
-    items.splice(lo, 0, add)
-    return isFull ? items.pop() : undefined
-  }
-}
diff --git a/packages/swap/src/tokenlist/index.ts b/packages/swap/src/tokenlist/index.ts
deleted file mode 100644
index d18091e45..000000000
--- a/packages/swap/src/tokenlist/index.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { useMemo } from "react"
-
-import ArgentTokenList from "../assets/tokens.json"
-import { SupportedNetworks } from "../sdk"
-import { TokenAddressMap, TokenInfoList, WrappedTokenInfo } from "./types"
-
-const EMPTY_LIST: TokenAddressMap = {
-  "mainnet-alpha": {},
-  "goerli-alpha": {},
-}
-
-export function useTokenList(): TokenInfoList {
-  return useMemo(
-    () =>
-      ArgentTokenList.filter((ti) =>
-        Object.values(SupportedNetworks).includes(ti.networkId as any),
-      ).map((ti) => {
-        return {
-          ...ti,
-          networkId: ti.networkId as SupportedNetworks,
-          decimals: parseInt(ti.decimals),
-        }
-      }),
-    [],
-  )
-}
-
-export function listToTokenMap(tokens: TokenInfoList): TokenAddressMap {
-  const map = tokens.reduce<TokenAddressMap>(
-    (tokenMap, tokenInfo) => {
-      const token = new WrappedTokenInfo(tokenInfo)
-      if (tokenMap[token.networkId][token.address] !== undefined) {
-        throw Error("Duplicate tokens.")
-      }
-      return {
-        ...tokenMap,
-        [token.networkId]: {
-          ...tokenMap[token.networkId],
-          [token.address]: token,
-        },
-      }
-    },
-    { ...EMPTY_LIST },
-  )
-  return map
-}
-
-export function useArgentTokenList() {
-  const argentTokenList = useTokenList()
-
-  return useMemo(() => listToTokenMap(argentTokenList), [argentTokenList])
-}
-
-export { WrappedTokenInfo }
diff --git a/packages/swap/src/tokenlist/types.ts b/packages/swap/src/tokenlist/types.ts
deleted file mode 100644
index 25ff83473..000000000
--- a/packages/swap/src/tokenlist/types.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { SupportedNetworks, Token } from "../sdk"
-
-export interface TokenInfo {
-  readonly networkId: SupportedNetworks
-  readonly address: string
-  readonly name: string
-  readonly decimals: number
-  readonly symbol: string
-  readonly image?: string
-}
-
-export type TokenInfoList = TokenInfo[]
-
-/**
- * Token instances created from token info.
- */
-export class WrappedTokenInfo extends Token {
-  public readonly tokenInfo: TokenInfo
-  constructor(tokenInfo: TokenInfo) {
-    super(
-      tokenInfo.networkId,
-      tokenInfo.address,
-      tokenInfo.decimals,
-      tokenInfo.symbol,
-      tokenInfo.name,
-    )
-    this.tokenInfo = tokenInfo
-  }
-  public get image(): string | undefined {
-    return this.tokenInfo.image
-  }
-}
-
-export type TokenAddressMap = Readonly<{
-  [networkId in SupportedNetworks]: Readonly<{
-    [tokenAddress: string]: WrappedTokenInfo
-  }>
-}>
diff --git a/packages/swap/src/vite-env.d.ts b/packages/swap/src/vite-env.d.ts
deleted file mode 100644
index 11f02fe2a..000000000
--- a/packages/swap/src/vite-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="vite/client" />
diff --git a/packages/swap/tsconfig.json b/packages/swap/tsconfig.json
deleted file mode 100644
index 3a09c3cab..000000000
--- a/packages/swap/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "lib": ["DOM", "DOM.Iterable", "ESNext"],
-    "allowJs": false,
-    "skipLibCheck": true,
-    "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
-    "noEmit": true,
-    "jsx": "react-jsx",
-    "isolatedModules": true
-  },
-  "include": ["src", ".eslintrc.js"]
-}
diff --git a/packages/swap/vite.config.ts b/packages/swap/vite.config.ts
deleted file mode 100644
index b04ffb0a9..000000000
--- a/packages/swap/vite.config.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { resolve as resolvePath } from "path"
-
-import react from "@vitejs/plugin-react-swc"
-import { PluginOption, defineConfig } from "vite"
-import dts from "vite-plugin-dts"
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [
-    dts({
-      insertTypesEntry: true,
-    }) as PluginOption,
-    react() as PluginOption, // stops TS from complaining
-  ],
-  build: {
-    lib: {
-      entry: resolvePath(__dirname, "src/index.ts"),
-      name: "x-swap",
-      formats: ["es", "umd"],
-      fileName: (format) => `x-swap.${format}.js`,
-    },
-
-    emptyOutDir: false,
-    rollupOptions: {
-      external: ["react", "react-dom", "react/jsx-runtime"],
-      output: {
-        globals: {
-          react: "React",
-          "react-dom": "ReactDOM",
-          "react/jsx-runtime": "ReactJSXRuntime",
-        },
-      },
-    },
-    sourcemap: true,
-    target: "esnext",
-    minify: true,
-  },
-  esbuild: {
-    pure: process.env.NODE_ENV === "production" ? ["console.log"] : [],
-  },
-})
diff --git a/packages/ui/assets/avnuBannerBackground@3x.png b/packages/ui/assets/avnuBannerBackground@3x.png
new file mode 100644
index 000000000..b16db9847
Binary files /dev/null and b/packages/ui/assets/avnuBannerBackground@3x.png differ
diff --git a/packages/ui/assets/dapplandBannerBackground.png b/packages/ui/assets/dapplandBannerBackground.png
deleted file mode 100644
index fa9f3cb9e..000000000
Binary files a/packages/ui/assets/dapplandBannerBackground.png and /dev/null differ
diff --git a/packages/ui/assets/ekuboBannerBackground@3x.png b/packages/ui/assets/ekuboBannerBackground@3x.png
new file mode 100644
index 000000000..61069371a
Binary files /dev/null and b/packages/ui/assets/ekuboBannerBackground@3x.png differ
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 7b5a25f08..3c9ed7d26 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -16,7 +16,8 @@
       "require": "./dist/ui.umd.js",
       "types": "./dist/ui.d.ts"
     },
-    "./assets/dapplandBannerBackground.png": "./assets/dapplandBannerBackground.png"
+    "./assets/ekuboBannerBackground.png": "./assets/ekuboBannerBackground@3x.png",
+    "./assets/avnuBannerBackground.png": "./assets/avnuBannerBackground@3x.png"
   },
   "devDependencies": {
     "@chakra-ui/cli": "^2.4.1",
@@ -28,17 +29,19 @@
     "@types/react-dom": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
+    "@vitest/browser": "1.0.2",
+    "@vitest/coverage-v8": "1.0.2",
+    "@vitest/ui": "1.0.2",
     "@zxcvbn-ts/core": "^3.0.0",
     "eslint": "^8.7.0",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "jsdom": "^22.0.0",
     "rollup-plugin-visualizer": "^5.9.0",
     "ts-custom-error": "^3.3.1",
     "typescript": "^5.0.4",
-    "vite": "^4.3.8",
+    "vite": "^5.0.0",
     "vite-plugin-dts": "^3.0.0",
-    "vitest": "^0.34.0"
+    "vitest": "1.0.2"
   },
   "scripts": {
     "gen:theme-typings": "chakra-cli tokens ./src/theme/index.tsx",
@@ -57,7 +60,7 @@
     "@emotion/react": "^11.11.0",
     "@emotion/styled": "^11.11.0",
     "@scure/bip39": "^1.2.1",
-    "framer-motion": "^10.0.0",
+    "framer-motion": "^10.16.4",
     "popmotion": "^11.0.5",
     "ts-node": "^10.9.1"
   },
diff --git a/packages/ui/src/components/Absolute.tsx b/packages/ui/src/components/Absolute.tsx
index 18172f019..3b1ba68cd 100644
--- a/packages/ui/src/components/Absolute.tsx
+++ b/packages/ui/src/components/Absolute.tsx
@@ -1,4 +1,5 @@
 import { Flex, Box, chakra } from "@chakra-ui/react"
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import * as _ from "@chakra-ui/layout" /** Fixes 'cannot be named without a reference' type error */
 
 export const AbsoluteBox = chakra(Box, {
diff --git a/packages/ui/src/components/DapplandBanner.tsx b/packages/ui/src/components/Banner.tsx
similarity index 59%
rename from packages/ui/src/components/DapplandBanner.tsx
rename to packages/ui/src/components/Banner.tsx
index 1dcfd66e4..21c412c36 100644
--- a/packages/ui/src/components/DapplandBanner.tsx
+++ b/packages/ui/src/components/Banner.tsx
@@ -9,26 +9,37 @@ interface CloseButtonProps {
   onClick?: MouseEventHandler<HTMLDivElement>
 }
 
-interface DapplandBannerProps {
-  href: string
+interface ThemedBanner {
+  dark?: boolean
+}
+
+interface BannerProps {
+  href?: string
   backgroundImageUrl: string
   title?: string
   subTitle?: string
   onClose?: () => void
+  onClick?: () => void
 }
 
-const Scrim: FC = () => (
+const Scrim: FC<ThemedBanner> = ({ dark }) => (
   <Box
     position="absolute"
     top="0"
     left="0"
     right="0"
     bottom="0"
-    background="linear-gradient(180deg, rgba(255, 255, 255, 0.5) 0%, rgba(255, 255, 255, 0) 100%)"
-    zIndex="0"
+    background={
+      dark
+        ? `linear-gradient(180deg, rgba(0, 0, 0, 0.50) 0%, rgba(255, 255, 255, 0.00) 20%)`
+        : `linear-gradient(180deg, rgba(255, 255, 255, 0.50) 0%, rgba(255, 255, 255, 0.00) 100%)`
+    }
   />
 )
-const CloseButton: FC<CloseButtonProps> = ({ ...props }) => (
+const CloseButton: FC<CloseButtonProps & ThemedBanner> = ({
+  dark,
+  ...props
+}) => (
   <Box
     position="absolute"
     top="0"
@@ -36,8 +47,8 @@ const CloseButton: FC<CloseButtonProps> = ({ ...props }) => (
     width="24px"
     height="24px"
     zIndex="1"
-    background="black"
-    color="white"
+    background={dark ? "white" : "black"}
+    color={dark ? "black" : "white"}
     borderRadius={"50%"}
     m={1}
     display="flex"
@@ -45,16 +56,18 @@ const CloseButton: FC<CloseButtonProps> = ({ ...props }) => (
     alignItems="center"
     {...props}
   >
-    <CloseIcon fontSize="xs" data-testid="close-dappland-banner" />
+    <CloseIcon fontSize="xs" data-testid="close-banner" />
   </Box>
 )
 
-export const DapplandBanner: FC<DapplandBannerProps> = ({
+export const Banner: FC<BannerProps & ThemedBanner> = ({
   href,
   backgroundImageUrl,
   title = "Discover",
   subTitle = "Starknet dapps",
   onClose,
+  dark,
+  onClick,
 }) => {
   return (
     <ButtonCell
@@ -62,29 +75,30 @@ export const DapplandBanner: FC<DapplandBannerProps> = ({
       overflow="hidden"
       position={"relative"}
       rightIcon={null}
-      bgColor="#DCCAC0"
+      bgColor="#FFFFFF"
       background={`url("${backgroundImageUrl}")`}
-      backgroundSize="contain"
+      backgroundSize="cover"
       backgroundPosition="right top"
       backgroundRepeat="no-repeat"
       as="a"
-      title="Dappland"
+      title={title}
       target="_blank"
       // reset hover styles
       _hover={{
         background: `url("${backgroundImageUrl}")`,
-        backgroundSize: "contain",
+        backgroundSize: "cover",
         backgroundPosition: "right top",
         backgroundRepeat: "no-repeat",
-        bgColor: "#DCCAC0",
+        backgroundColor: "white",
       }}
       href={href}
+      onClick={onClick}
     >
-      <Scrim />
-      <P3 zIndex="1" color="black" fontWeight="extrabold">
+      <Scrim dark={dark} />
+      <P3 zIndex="1" color={dark ? "white" : "black"} fontWeight="extrabold">
         {title}
       </P3>
-      <P4 zIndex="1" color="black" fontWeight="medium">
+      <P4 zIndex="1" color={dark ? "white" : "black"} fontWeight="medium">
         {subTitle}
       </P4>
       <CloseButton
@@ -93,6 +107,7 @@ export const DapplandBanner: FC<DapplandBannerProps> = ({
           e.stopPropagation()
           onClose?.()
         }}
+        dark={dark}
       />
     </ButtonCell>
   )
diff --git a/packages/ui/src/components/Button.tsx b/packages/ui/src/components/Button.tsx
index eb3d62aa9..94c1e7824 100644
--- a/packages/ui/src/components/Button.tsx
+++ b/packages/ui/src/components/Button.tsx
@@ -53,6 +53,9 @@ export const buttonTheme = defineStyleConfig({
       minHeight: 10,
       px: 5,
       py: 2,
+      ".chakra-button__icon": {
+        fontSize: "base",
+      },
     },
     md: {
       ...typographyStyles.B2,
diff --git a/packages/ui/src/components/ButtonRect.tsx b/packages/ui/src/components/ButtonRect.tsx
index d994289d3..6f0b0f38a 100644
--- a/packages/ui/src/components/ButtonRect.tsx
+++ b/packages/ui/src/components/ButtonRect.tsx
@@ -1,4 +1,5 @@
 import { Button, chakra } from "@chakra-ui/react"
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import * as _ from "@chakra-ui/button" /** Fixes 'cannot be named without a reference' type error */
 
 export const ButtonRect = chakra(Button, {
diff --git a/packages/ui/src/components/CellStack.tsx b/packages/ui/src/components/CellStack.tsx
index 5f67153ff..ca55286f5 100644
--- a/packages/ui/src/components/CellStack.tsx
+++ b/packages/ui/src/components/CellStack.tsx
@@ -70,10 +70,12 @@ export const ButtonCell: ButtonCellComponent = ({
         alignItems={"center"}
         textAlign={"left"}
       >
-        {leftIcon && <Flex fontSize="base">{leftIcon}</Flex>}
-        <H6>{children}</H6>
+        {leftIcon && <Flex fontSize="xl">{leftIcon}</Flex>}
+        <H6 overflow={"hidden"} textOverflow={"ellipsis"}>
+          {children}
+        </H6>
         {rightIcon && (
-          <Flex ml={"auto"} fontSize="base">
+          <Flex ml={"auto"} fontSize="base" color={"text.secondary"}>
             {rightIcon}
           </Flex>
         )}
diff --git a/packages/ui/src/components/CopyTooltip.tsx b/packages/ui/src/components/CopyTooltip.tsx
index 588a9a104..d5006e9e2 100644
--- a/packages/ui/src/components/CopyTooltip.tsx
+++ b/packages/ui/src/components/CopyTooltip.tsx
@@ -1,5 +1,5 @@
 import { Box, Tooltip, TooltipProps } from "@chakra-ui/react"
-import { FC, PropsWithChildren, useEffect, useRef, useState } from "react"
+import { FC, useEffect, useRef, useState } from "react"
 import CopyToClipboard from "react-copy-to-clipboard"
 
 import { useOnClickOutside } from "../hooks"
diff --git a/packages/ui/src/components/NavigationContainer.tsx b/packages/ui/src/components/NavigationContainer.tsx
index 59c81ae85..eee0ebdb3 100644
--- a/packages/ui/src/components/NavigationContainer.tsx
+++ b/packages/ui/src/components/NavigationContainer.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren } from "react"
+import { FC, PropsWithChildren } from "react"
 
 import { useScroll } from "../hooks"
 import { useScrollRestoration } from "../hooks/useScrollRestoration"
diff --git a/packages/ui/src/components/PasswordStrengthIndicator.tsx b/packages/ui/src/components/PasswordStrengthIndicator.tsx
index ebc1eecfb..06900e42c 100644
--- a/packages/ui/src/components/PasswordStrengthIndicator.tsx
+++ b/packages/ui/src/components/PasswordStrengthIndicator.tsx
@@ -3,7 +3,6 @@ import { zxcvbnOptions } from "@zxcvbn-ts/core"
 import { FC } from "react"
 
 import { usePasswordStrength } from "../hooks/usePasswordStrength"
-import { H6 } from "./Typography"
 import { PasswordStrengthIndicatorBar } from "./PasswordStrengthIndicatorBar"
 
 interface PasswordStrengthIndicatorProps {
diff --git a/packages/ui/src/components/Warning.tsx b/packages/ui/src/components/Warning.tsx
new file mode 100644
index 000000000..0fbf69187
--- /dev/null
+++ b/packages/ui/src/components/Warning.tsx
@@ -0,0 +1,32 @@
+import { Center, CenterProps, Circle, Text } from "@chakra-ui/react"
+import { FC, ReactNode } from "react"
+
+import { H3, P3 } from "./Typography"
+import * as icons from "./icons"
+
+const { AlertIcon } = icons
+
+interface WarningProps extends Omit<CenterProps, "title"> {
+  icon?: ReactNode
+  title?: ReactNode
+  subtitle?: ReactNode
+}
+
+export const Warning: FC<WarningProps> = ({
+  icon = <AlertIcon />,
+  title = "Warning",
+  subtitle,
+  children,
+  ...rest
+}) => (
+  <Center flex={1} py={4} px={6} {...rest}>
+    <Center flexDirection={"column"} gap={3} textAlign="center">
+      <Circle size={24} bg="primaryExtraDark.500" color="primary.500" mb={5}>
+        <Text fontSize={40}>{icon}</Text>
+      </Circle>
+      {title && <H3>{title}</H3>}
+      {subtitle && <P3 color="text.secondary">{subtitle}</P3>}
+      {children}
+    </Center>
+  </Center>
+)
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts
index c341c5183..a494a8ba1 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/components/index.ts
@@ -10,7 +10,7 @@ export * from "./Button"
 export * from "./ButtonRect"
 export * from "./CellStack"
 export * from "./CopyTooltip"
-export * from "./DapplandBanner"
+export * from "./Banner"
 export * from "./DetailAccordion"
 export * from "./Empty"
 export * from "./ErrorMessage"
@@ -44,6 +44,7 @@ export * from "./TextWithAmount"
 export * from "./TokenButton"
 export * from "./Tooltip"
 export * from "./Typography"
+export * from "./Warning"
 
 export * from "./transactions"
 export * from "./fees"
diff --git a/packages/web-sdk/package.json b/packages/web-sdk/package.json
index 61cc9d821..225ec46e7 100644
--- a/packages/web-sdk/package.json
+++ b/packages/web-sdk/package.json
@@ -38,13 +38,13 @@
     "@argent/x-window": "^6.4.0",
     "get-starknet-core": "^3.1.0",
     "lodash-es": "^4.17.21",
-    "trpc-browser": "^1.3.2"
+    "trpc-browser": "^1.3.7"
   },
   "devDependencies": {
     "@types/async-retry": "^1.4.5",
     "@tsconfig/svelte": "^5.0.0",
     "typescript": "^5.0.4",
-    "vite": "^4.3.8",
+    "vite": "^5.0.0",
     "vite-plugin-dts": "^3.0.0"
   },
   "peerDependencies": {
diff --git a/packages/web-sdk/src/main.ts b/packages/web-sdk/src/main.ts
index 406cdb281..1590def68 100644
--- a/packages/web-sdk/src/main.ts
+++ b/packages/web-sdk/src/main.ts
@@ -20,15 +20,12 @@ function mapTargetUrlToNetworkId(target: string): constants.NetworkName {
     if (origin.includes("localhost") || origin.includes("127.0.0.1")) {
       return DEVELOPMENT_NETWORK
     }
-    if (origin.includes("hydrogen")) {
+    if (origin.includes("hydrogen") || origin.includes("dev")) {
       return Network.SN_GOERLI
     }
     if (origin.includes("staging")) {
       return Network.SN_MAIN
     }
-    if (origin.includes("dev")) {
-      return Network.SN_GOERLI2
-    }
     if (origin.includes("argent.xyz")) {
       return Network.SN_MAIN
     }
diff --git a/packages/window/package.json b/packages/window/package.json
index bfdb2c7d9..3180fe532 100644
--- a/packages/window/package.json
+++ b/packages/window/package.json
@@ -24,11 +24,14 @@
     "setup": "pnpm run build"
   },
   "devDependencies": {
-    "get-starknet-core": "^3.2.0",
     "@argent/eslint-plugin-local": "^6.3.1",
+    "@vitest/browser": "1.0.2",
+    "@vitest/coverage-v8": "1.0.2",
+    "@vitest/ui": "1.0.2",
+    "get-starknet-core": "^3.2.0",
     "typescript": "^5.0.4",
-    "vite": "^4.3.8",
-    "vitest": "^0.34.0",
+    "vite": "^5.0.0",
+    "vitest": "1.0.2",
     "zod": "^3.20.6"
   },
   "peerDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 169d95a42..d7c0cc8bd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,8 +5,8 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
-  '@babel/preset-react': 7.22.15
-  '@babel/plugin-transform-react-jsx': 7.22.15
+  '@babel/preset-react': 7.23.3
+  '@babel/plugin-transform-react-jsx': 7.23.4
 
 importers:
 
@@ -47,7 +47,7 @@ importers:
         version: 0.0.7(prettier@2.8.8)
       ts-node:
         specifier: ^10.9.1
-        version: 10.9.1(@types/node@20.8.10)(typescript@5.1.3)
+        version: 10.9.1(@types/node@20.10.4)(typescript@5.1.3)
 
   packages/dapp:
     dependencies:
@@ -62,13 +62,13 @@ importers:
         version: link:../sessions
       '@chakra-ui/react':
         specifier: ^2.6.1
-        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0)
+        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0)
       '@starknet-react/chains':
-        specifier: 0.1.0-next.1
-        version: 0.1.0-next.1
+        specifier: 0.1.0
+        version: 0.1.0
       '@starknet-react/core':
-        specifier: 2.0.0-next.6
-        version: 2.0.0-next.6(get-starknet-core@3.2.0)(react-dom@18.2.0)(react@18.2.0)(starknet@5.24.3)
+        specifier: 2.1.1
+        version: 2.1.1(get-starknet-core@3.2.0)(react@18.2.0)(starknet@5.24.3)
       micro-starknet:
         specifier: ^0.2.3
         version: 0.2.3
@@ -85,12 +85,12 @@ importers:
         specifier: 5.24.3
         version: 5.24.3
       starknetkit:
-        specifier: ^1.0.21
-        version: 1.0.21(starknet@5.24.3)
+        specifier: ^1.0.22
+        version: 1.0.22(starknet@5.24.3)
     devDependencies:
       '@types/node':
-        specifier: 20.8.10
-        version: 20.8.10
+        specifier: 20.10.4
+        version: 20.10.4
       '@types/react':
         specifier: ^18.0.0
         version: 18.2.12
@@ -170,11 +170,8 @@ importers:
         specifier: ^7.0.12
         version: 7.0.12(typescript@5.1.3)
       '@argent/x-sessions':
-        specifier: ^6.5.0
+        specifier: ^6.5.2
         version: link:../sessions
-      '@argent/x-swap':
-        specifier: ^6.3.1
-        version: link:../swap
       '@argent/x-window':
         specifier: ^6.3.1
         version: link:../window
@@ -183,7 +180,7 @@ importers:
         version: 2.0.19(@chakra-ui/system@2.5.8)(react@18.2.0)
       '@chakra-ui/react':
         specifier: ^2.6.1
-        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0)
+        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0)
       '@ethersproject/bignumber':
         specifier: ^5.7.0
         version: 5.7.0
@@ -233,8 +230,8 @@ importers:
         specifier: ^10.31.0
         version: 10.34.0
       '@vitest/coverage-istanbul':
-        specifier: ^0.34.0
-        version: 0.34.5(vitest@0.33.0)
+        specifier: ^1.0.0
+        version: 1.0.2(vitest@1.0.2)
       async-retry:
         specifier: ^1.3.3
         version: 1.3.3
@@ -328,12 +325,15 @@ importers:
       styled-normalize:
         specifier: ^8.0.7
         version: 8.0.7(styled-components@5.3.11)
+      superjson:
+        specifier: ^2.2.1
+        version: 2.2.1
       swr:
         specifier: ^1.3.0
         version: 1.3.0(react@18.2.0)
       trpc-browser:
-        specifier: ^1.3.6
-        version: 1.3.6(@trpc/client@10.30.0)(@trpc/server@10.34.0)
+        specifier: ^1.3.7
+        version: 1.3.7(@trpc/client@10.30.0)(@trpc/server@10.34.0)
       url-join:
         specifier: ^5.0.0
         version: 5.0.0
@@ -347,8 +347,8 @@ importers:
         specifier: ^3.20.2
         version: 3.21.4
       zustand:
-        specifier: ^4.3.6
-        version: 4.3.8(react@18.2.0)
+        specifier: ^4.4.4
+        version: 4.4.7(@types/react@18.2.12)(react@18.2.0)
     devDependencies:
       '@argent/eslint-plugin-local':
         specifier: ^6.3.0
@@ -358,7 +358,7 @@ importers:
         version: 8.0.1
       '@testing-library/jest-dom':
         specifier: ^6.0.0
-        version: 6.0.0(vitest@0.33.0)
+        version: 6.0.0(vitest@1.0.2)
       '@testing-library/react':
         specifier: ^14.0.0
         version: 14.0.0(react-dom@18.2.0)(react@18.2.0)
@@ -366,8 +366,8 @@ importers:
         specifier: ^1.4.5
         version: 1.4.5
       '@types/chrome':
-        specifier: ^0.0.248
-        version: 0.0.248
+        specifier: ^0.0.254
+        version: 0.0.254
       '@types/fs-extra':
         specifier: ^11.0.1
         version: 11.0.1
@@ -381,8 +381,8 @@ importers:
         specifier: ^18.0.0
         version: 18.2.12
       '@types/react-copy-to-clipboard':
-        specifier: 5.0.6
-        version: 5.0.6
+        specifier: 5.0.7
+        version: 5.0.7
       '@types/react-dom':
         specifier: ^18.0.0
         version: 18.2.5
@@ -409,10 +409,16 @@ importers:
         version: 6.3.0(eslint@8.42.0)(typescript@5.1.3)
       '@vitejs/plugin-react-swc':
         specifier: ^3.3.1
-        version: 3.3.2(vite@4.3.9)
+        version: 3.3.2(vite@5.0.6)
+      '@vitest/browser':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
       '@vitest/coverage-v8':
-        specifier: ^0.34.0
-        version: 0.34.5(vitest@0.33.0)
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
+      '@vitest/ui':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
       chokidar:
         specifier: ^3.5.2
         version: 3.5.3
@@ -456,17 +462,14 @@ importers:
         specifier: ^11.1.1
         version: 11.1.1
       happy-dom:
-        specifier: ^12.0.0
-        version: 12.2.0
+        specifier: ^12.10.3
+        version: 12.10.3
       html-webpack-plugin:
         specifier: ^5.5.0
         version: 5.5.3(webpack@5.88.1)
       isomorphic-fetch:
         specifier: ^3.0.0
         version: 3.0.0
-      jsdom:
-        specifier: ^22.0.0
-        version: 22.1.0
       minimatch:
         specifier: ^9.0.1
         version: 9.0.1
@@ -478,7 +481,7 @@ importers:
         version: 4.0.2(webpack@5.88.1)
       ts-node:
         specifier: ^10.9.1
-        version: 10.9.1(@types/node@20.8.10)(typescript@5.1.3)
+        version: 10.9.1(@types/node@20.10.4)(typescript@5.1.3)
       type-fest:
         specifier: ^4.0.0
         version: 4.1.0
@@ -492,11 +495,11 @@ importers:
         specifier: ^4.1.1
         version: 4.1.1(file-loader@6.2.0)(webpack@5.88.1)
       vite:
-        specifier: ^4.3.8
-        version: 4.3.9(@types/node@20.8.10)
+        specifier: ^5.0.0
+        version: 5.0.6(@types/node@20.10.4)
       vitest:
-        specifier: ^0.33.0
-        version: 0.33.0(happy-dom@12.2.0)(jsdom@22.1.0)
+        specifier: 1.0.2
+        version: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.10.3)
       wait-for-expect:
         specifier: ^3.0.2
         version: 3.0.2
@@ -536,7 +539,7 @@ importers:
     devDependencies:
       '@sveltejs/vite-plugin-svelte':
         specifier: ^2.2.0
-        version: 2.4.1(svelte@4.1.1)(vite@4.3.9)
+        version: 2.4.1(svelte@4.1.1)(vite@5.0.6)
       '@tsconfig/svelte':
         specifier: ^5.0.0
         version: 5.0.0
@@ -580,11 +583,11 @@ importers:
         specifier: ^5.0.4
         version: 5.1.3
       vite:
-        specifier: ^4.3.8
-        version: 4.3.9(@types/node@20.8.10)
+        specifier: ^5.0.0
+        version: 5.0.6(@types/node@20.10.4)
       vite-plugin-dts:
         specifier: ^3.0.0
-        version: 3.6.0(@types/node@20.8.10)(typescript@5.1.3)(vite@4.3.9)
+        version: 3.6.0(@types/node@20.10.4)(typescript@5.1.3)(vite@5.0.6)
       ws:
         specifier: ^8.8.1
         version: 8.13.0
@@ -608,11 +611,11 @@ importers:
         specifier: ^5.0.4
         version: 5.1.3
       vite:
-        specifier: ^4.3.8
-        version: 4.3.9(@types/node@20.8.10)
+        specifier: ^5.0.0
+        version: 5.0.6(@types/node@20.10.4)
       vite-plugin-dts:
         specifier: ^3.0.0
-        version: 3.6.0(@types/node@20.8.10)(typescript@5.1.3)(vite@4.3.9)
+        version: 3.6.0(@types/node@20.10.4)(typescript@5.1.3)(vite@5.0.6)
 
   packages/sessions:
     dependencies:
@@ -626,30 +629,36 @@ importers:
         specifier: npm:starknet@4.22.0
         version: /starknet@4.22.0
     devDependencies:
-      '@argent/shared':
-        specifier: ^6.3.3
-        version: link:../shared
       '@rollup/plugin-node-resolve':
         specifier: ^15.0.0
         version: 15.1.0
       '@types/minimalistic-assert':
         specifier: ^1.0.1
         version: 1.0.1
+      '@vitest/browser':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
       '@vitest/coverage-c8':
         specifier: ^0.33.0
-        version: 0.33.0(vitest@0.34.6)
+        version: 0.33.0(vitest@1.0.2)
+      '@vitest/coverage-v8':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
+      '@vitest/ui':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
       happy-dom:
         specifier: ^12.0.0
         version: 12.2.0
       vite:
-        specifier: ^4.3.8
-        version: 4.3.9(@types/node@20.8.10)
+        specifier: ^5.0.0
+        version: 5.0.6(@types/node@20.10.4)
       vite-plugin-dts:
         specifier: ^3.0.0
-        version: 3.6.0(@types/node@20.8.10)(typescript@5.1.3)(vite@4.3.9)
+        version: 3.6.0(@types/node@20.10.4)(typescript@5.1.3)(vite@5.0.6)
       vitest:
-        specifier: ^0.34.0
-        version: 0.34.6(happy-dom@12.2.0)
+        specifier: 1.0.2
+        version: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.2.0)
 
   packages/shared:
     dependencies:
@@ -693,6 +702,15 @@ importers:
       '@types/react-dom':
         specifier: ^18.0.0
         version: 18.2.5
+      '@vitest/browser':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
+      '@vitest/coverage-v8':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
+      '@vitest/ui':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
       happy-dom:
         specifier: ^12.0.0
         version: 12.2.0
@@ -703,20 +721,20 @@ importers:
         specifier: ^5.0.4
         version: 5.1.3
       vite:
-        specifier: ^4.3.8
-        version: 4.3.9(@types/node@20.8.10)
+        specifier: ^5.0.0
+        version: 5.0.6(@types/node@20.10.4)
       vite-plugin-dts:
         specifier: ^3.0.0
-        version: 3.6.0(@types/node@20.8.10)(typescript@5.1.3)(vite@4.3.9)
+        version: 3.6.0(@types/node@20.10.4)(typescript@5.1.3)(vite@5.0.6)
       vitest:
-        specifier: ^0.34.0
-        version: 0.34.6(happy-dom@12.2.0)
+        specifier: 1.0.2
+        version: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.2.0)
 
   packages/stack-router:
     dependencies:
       '@chakra-ui/react':
         specifier: ^2.6.1
-        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0)
+        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0)
       '@emotion/react':
         specifier: ^11.11.0
         version: 11.11.1(@types/react@18.2.12)(react@18.2.0)
@@ -727,8 +745,8 @@ importers:
         specifier: ^2.9.2
         version: 2.9.3
       framer-motion:
-        specifier: ^10.0.0
-        version: 10.15.1(react-dom@18.2.0)(react@18.2.0)
+        specifier: ^10.16.4
+        version: 10.16.15(react-dom@18.2.0)(react@18.2.0)
       history:
         specifier: ^5.3.0
         version: 5.3.0
@@ -768,31 +786,28 @@ importers:
         version: 8.42.0
       eslint-config-react-app:
         specifier: ^7.0.1
-        version: 7.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.42.0)(jest@27.5.1)(typescript@5.1.3)
+        version: 7.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.42.0)(jest@27.5.1)(typescript@5.1.3)
       eslint-plugin-react:
         specifier: ^7.28.0
         version: 7.32.2(eslint@8.42.0)
       eslint-plugin-react-hooks:
         specifier: ^4.6.0
         version: 4.6.0(eslint@8.42.0)
-      jsdom:
-        specifier: ^22.0.0
-        version: 22.1.0
       react-scripts:
         specifier: 5.0.1
-        version: 5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.42.0)(react@18.2.0)(ts-node@10.9.1)(typescript@5.1.3)
+        version: 5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.42.0)(react@18.2.0)(ts-node@10.9.1)(typescript@5.1.3)
       typescript:
         specifier: ^5.0.4
         version: 5.1.3
       vite:
-        specifier: ^4.3.8
-        version: 4.3.9(@types/node@20.8.10)
+        specifier: ^5.0.0
+        version: 5.0.6(@types/node@20.10.4)
       vite-plugin-dts:
         specifier: ^3.0.0
-        version: 3.4.0(@types/node@20.8.10)(rollup@2.79.1)(typescript@5.1.3)(vite@4.3.9)
+        version: 3.4.0(@types/node@20.10.4)(rollup@2.79.1)(typescript@5.1.3)(vite@5.0.6)
       vitest:
-        specifier: ^0.34.0
-        version: 0.34.6(jsdom@22.1.0)
+        specifier: ^1.0.0
+        version: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.2.0)
 
   packages/starknet-react-webwallet-connector:
     dependencies:
@@ -803,8 +818,8 @@ importers:
         specifier: ^6.4.0
         version: link:../window
       '@starknet-react/core':
-        specifier: 2.0.0-next.5
-        version: 2.0.0-next.5(get-starknet-core@3.1.0)(react@18.2.0)(starknet@5.24.3)
+        specifier: 2.1.1
+        version: 2.1.1(get-starknet-core@3.1.0)(react@18.2.0)(starknet@5.24.3)
       starknet:
         specifier: 5.24.3
         version: 5.24.3
@@ -819,11 +834,11 @@ importers:
         specifier: ^5.0.4
         version: 5.1.3
       vite:
-        specifier: ^4.3.8
-        version: 4.3.9(@types/node@20.8.10)
+        specifier: ^5.0.0
+        version: 5.0.6(@types/node@20.10.4)
       vite-plugin-dts:
         specifier: ^3.0.0
-        version: 3.6.0(@types/node@20.8.10)(typescript@5.1.3)(vite@4.3.9)
+        version: 3.6.0(@types/node@20.10.4)(typescript@5.1.3)(vite@5.0.6)
 
   packages/storybook:
     devDependencies:
@@ -843,14 +858,14 @@ importers:
         specifier: ^7.21.4
         version: 7.22.5(@babel/core@7.22.5)
       '@babel/preset-react':
-        specifier: 7.22.15
-        version: 7.22.15(@babel/core@7.22.5)
+        specifier: 7.23.3
+        version: 7.23.3(@babel/core@7.22.5)
       '@babel/preset-typescript':
         specifier: ^7.21.4
         version: 7.22.5(@babel/core@7.22.5)
       '@chakra-ui/react':
         specifier: ^2.6.1
-        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0)
+        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0)
       '@chakra-ui/storybook-addon':
         specifier: ^5.0.1
         version: 5.0.1(@chakra-ui/react@2.7.0)(@storybook/components@7.5.0)(@storybook/manager-api@7.5.0)(@storybook/preview-api@7.5.0)(@storybook/types@7.5.0)(react-dom@18.2.0)(react@18.2.0)
@@ -918,85 +933,6 @@ importers:
         specifier: ^5.0.4
         version: 5.1.3
 
-  packages/swap:
-    dependencies:
-      '@argent/x-multicall':
-        specifier: ^7.0.12
-        version: 7.0.12(typescript@5.1.3)
-      '@chakra-ui/react':
-        specifier: ^2.6.1
-        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0)
-      '@ethersproject/units':
-        specifier: ^5.7.0
-        version: 5.7.0
-      big.js:
-        specifier: ^6.2.1
-        version: 6.2.1
-      decimal.js-light:
-        specifier: ^2.5.1
-        version: 2.5.1
-      jsbi:
-        specifier: ^4.3.0
-        version: 4.3.0
-      micro-starknet:
-        specifier: ^0.2.3
-        version: 0.2.3
-      starknet:
-        specifier: 5.24.3
-        version: 5.24.3
-      swr:
-        specifier: ^1.3.0
-        version: 1.3.0(react@18.2.0)
-      tiny-invariant:
-        specifier: ^1.2.0
-        version: 1.3.1
-      tiny-warning:
-        specifier: ^1.0.3
-        version: 1.0.3
-      toformat:
-        specifier: ^2.0.0
-        version: 2.0.0
-      uuid:
-        specifier: ^9.0.0
-        version: 9.0.0
-      zustand:
-        specifier: ^4.1.4
-        version: 4.3.8(react@18.2.0)
-    devDependencies:
-      '@types/big.js':
-        specifier: ^6.1.6
-        version: 6.1.6
-      '@types/jest':
-        specifier: ^29.2.5
-        version: 29.5.2
-      '@types/react':
-        specifier: ^18.0.24
-        version: 18.2.12
-      '@types/react-dom':
-        specifier: ^18.0.8
-        version: 18.2.5
-      babel-plugin-transform-jsbi-to-bigint:
-        specifier: ^1.3.1
-        version: 1.4.0
-      eslint:
-        specifier: ^8.42.0
-        version: 8.42.0
-      react:
-        specifier: ^18.2.0
-        version: 18.2.0
-      react-dom:
-        specifier: ^18.2.0
-        version: 18.2.0(react@18.2.0)
-      typescript:
-        specifier: ^5.0.4
-        version: 5.1.3
-      vite:
-        specifier: ^4.3.8
-        version: 4.3.9(@types/node@20.8.10)
-      vite-plugin-dts:
-        specifier: 3.6.3
-        version: 3.6.3(@types/node@20.8.10)(typescript@5.1.3)(vite@4.3.9)
-
   packages/ui:
     dependencies:
       '@argent/shared':
@@ -1004,7 +940,7 @@ importers:
         version: link:../shared
       '@chakra-ui/react':
         specifier: ^2.6.1
-        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0)
+        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0)
       '@chakra-ui/system':
         specifier: ^2.5.7
         version: 2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
@@ -1027,8 +963,8 @@ importers:
         specifier: ^2.9.2
         version: 2.9.3
       framer-motion:
-        specifier: ^10.0.0
-        version: 10.15.1(react-dom@18.2.0)(react@18.2.0)
+        specifier: ^10.16.4
+        version: 10.16.15(react-dom@18.2.0)(react@18.2.0)
       lodash-es:
         specifier: ^4.17.21
         version: 4.17.21
@@ -1046,7 +982,7 @@ importers:
         version: 6.13.0(react-dom@18.2.0)(react@18.2.0)
       ts-node:
         specifier: ^10.9.1
-        version: 10.9.1(@types/node@20.8.10)(typescript@5.1.3)
+        version: 10.9.1(@types/node@20.10.4)(typescript@5.1.3)
     devDependencies:
       '@chakra-ui/cli':
         specifier: ^2.4.1
@@ -1075,6 +1011,15 @@ importers:
       '@typescript-eslint/parser':
         specifier: ^6.0.0
         version: 6.3.0(eslint@8.42.0)(typescript@5.1.3)
+      '@vitest/browser':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
+      '@vitest/coverage-v8':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
+      '@vitest/ui':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
       '@zxcvbn-ts/core':
         specifier: ^3.0.0
         version: 3.0.3
@@ -1087,9 +1032,6 @@ importers:
       eslint-plugin-react-hooks:
         specifier: ^4.6.0
         version: 4.6.0(eslint@8.42.0)
-      jsdom:
-        specifier: ^22.0.0
-        version: 22.1.0
       rollup-plugin-visualizer:
         specifier: ^5.9.0
         version: 5.9.2
@@ -1100,14 +1042,14 @@ importers:
         specifier: ^5.0.4
         version: 5.1.3
       vite:
-        specifier: ^4.3.8
-        version: 4.3.9(@types/node@20.8.10)
+        specifier: ^5.0.0
+        version: 5.0.6(@types/node@20.10.4)
       vite-plugin-dts:
         specifier: ^3.0.0
-        version: 3.6.0(@types/node@20.8.10)(typescript@5.1.3)(vite@4.3.9)
+        version: 3.6.0(@types/node@20.10.4)(typescript@5.1.3)(vite@5.0.6)
       vitest:
-        specifier: ^0.34.0
-        version: 0.34.6(jsdom@22.1.0)
+        specifier: 1.0.2
+        version: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.2.0)
 
   packages/web:
     dependencies:
@@ -1128,7 +1070,7 @@ importers:
         version: link:../window
       '@chakra-ui/react':
         specifier: ^2.6.1
-        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0)
+        version: 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0)
       '@hookform/resolvers':
         specifier: ^3.0.0
         version: 3.1.1(react-hook-form@7.44.3)
@@ -1196,14 +1138,14 @@ importers:
         specifier: ^7.39.1
         version: 7.44.3(react@18.2.0)
       sharp:
-        specifier: ^0.32.0
-        version: 0.32.4
+        specifier: ^0.33.0
+        version: 0.33.0
       starknet:
         specifier: 5.24.3
         version: 5.24.3
       trpc-browser:
-        specifier: ^1.3.2
-        version: 1.3.6(@trpc/client@10.42.0)(@trpc/server@10.42.0)
+        specifier: ^1.3.7
+        version: 1.3.7(@trpc/client@10.42.0)(@trpc/server@10.42.0)
       zod:
         specifier: ^3.20.2
         version: 3.21.4
@@ -1221,23 +1163,32 @@ importers:
         specifier: ^1.4.5
         version: 1.4.5
       '@types/node':
-        specifier: 20.8.10
-        version: 20.8.10
+        specifier: 20.10.4
+        version: 20.10.4
       '@types/react':
         specifier: ^18.0.25
         version: 18.2.12
       '@types/react-dom':
         specifier: ^18.2.1
         version: 18.2.5
+      '@vitest/browser':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
+      '@vitest/coverage-v8':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
+      '@vitest/ui':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
       eslint:
         specifier: ^8.27.0
         version: 8.42.0
       eslint-config-next:
         specifier: ^13.0.2
         version: 13.2.3(eslint@8.42.0)(typescript@5.1.3)
-      jsdom:
-        specifier: ^22.0.0
-        version: 22.1.0
+      happy-dom:
+        specifier: ^12.0.0
+        version: 12.10.3
       next-transpile-modules:
         specifier: ^10.0.0
         version: 10.0.0
@@ -1245,8 +1196,8 @@ importers:
         specifier: ^5.0.4
         version: 5.1.3
       vitest:
-        specifier: ^0.34.0
-        version: 0.34.6(jsdom@22.1.0)
+        specifier: 1.0.2
+        version: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.10.3)
 
   packages/web-sdk:
     dependencies:
@@ -1263,8 +1214,8 @@ importers:
         specifier: 5.24.3
         version: 5.24.3
       trpc-browser:
-        specifier: ^1.3.2
-        version: 1.3.6(@trpc/client@10.42.0)(@trpc/server@10.42.0)
+        specifier: ^1.3.7
+        version: 1.3.7(@trpc/client@10.42.0)(@trpc/server@10.42.0)
     devDependencies:
       '@tsconfig/svelte':
         specifier: ^5.0.0
@@ -1276,11 +1227,11 @@ importers:
         specifier: ^5.0.4
         version: 5.1.3
       vite:
-        specifier: ^4.3.8
-        version: 4.3.9(@types/node@20.8.10)
+        specifier: ^5.0.0
+        version: 5.0.6(@types/node@20.10.4)
       vite-plugin-dts:
         specifier: ^3.0.0
-        version: 3.6.0(@types/node@20.8.10)(typescript@5.1.3)(vite@4.3.9)
+        version: 3.6.0(@types/node@20.10.4)(typescript@5.1.3)(vite@5.0.6)
 
   packages/window:
     dependencies:
@@ -1291,6 +1242,15 @@ importers:
       '@argent/eslint-plugin-local':
         specifier: ^6.3.1
         version: link:../eslint-plugin-local
+      '@vitest/browser':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
+      '@vitest/coverage-v8':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
+      '@vitest/ui':
+        specifier: 1.0.2
+        version: 1.0.2(vitest@1.0.2)
       get-starknet-core:
         specifier: ^3.2.0
         version: 3.2.0(starknet@5.24.3)
@@ -1298,11 +1258,11 @@ importers:
         specifier: ^5.0.4
         version: 5.1.3
       vite:
-        specifier: ^4.3.8
-        version: 4.3.9(@types/node@20.8.10)
+        specifier: ^5.0.0
+        version: 5.0.6(@types/node@20.10.4)
       vitest:
-        specifier: ^0.34.0
-        version: 0.34.6(jsdom@22.1.0)
+        specifier: 1.0.2
+        version: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.2.0)
       zod:
         specifier: ^3.20.6
         version: 3.21.4
@@ -1385,13 +1345,13 @@ packages:
       '@ampproject/remapping': 2.2.1
       '@babel/code-frame': 7.22.10
       '@babel/generator': 7.22.10
-      '@babel/helper-compilation-targets': 7.22.10
+      '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.10)
       '@babel/helpers': 7.22.10
-      '@babel/parser': 7.22.10
+      '@babel/parser': 7.23.5
       '@babel/template': 7.22.5
       '@babel/traverse': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       convert-source-map: 1.9.0
       debug: 4.3.4(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
@@ -1440,7 +1400,7 @@ packages:
     resolution: {integrity: sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       '@jridgewell/gen-mapping': 0.3.3
       '@jridgewell/trace-mapping': 0.3.18
       jsesc: 2.5.2
@@ -1449,7 +1409,7 @@ packages:
     resolution: {integrity: sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       '@jridgewell/gen-mapping': 0.3.3
       '@jridgewell/trace-mapping': 0.3.18
       jsesc: 2.5.2
@@ -1464,7 +1424,7 @@ packages:
     resolution: {integrity: sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     dev: true
 
   /@babel/helper-compilation-targets@7.22.10:
@@ -1476,6 +1436,7 @@ packages:
       browserslist: 4.21.9
       lru-cache: 5.1.1
       semver: 6.3.1
+    dev: true
 
   /@babel/helper-compilation-targets@7.22.15:
     resolution: {integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==}
@@ -1486,7 +1447,6 @@ packages:
       browserslist: 4.21.9
       lru-cache: 5.1.1
       semver: 6.3.1
-    dev: true
 
   /@babel/helper-compilation-targets@7.22.5(@babel/core@7.22.5):
     resolution: {integrity: sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==}
@@ -1587,7 +1547,7 @@ packages:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
       '@babel/core': 7.22.10
-      '@babel/helper-compilation-targets': 7.22.10
+      '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
       debug: 4.3.4(supports-color@5.5.0)
       lodash.debounce: 4.0.8
@@ -1605,19 +1565,19 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/template': 7.22.5
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
 
   /@babel/helper-hoist-variables@7.22.5:
     resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
 
   /@babel/helper-member-expression-to-functions@7.22.5:
     resolution: {integrity: sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     dev: true
 
   /@babel/helper-module-imports@7.22.15:
@@ -1630,7 +1590,7 @@ packages:
     resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
 
   /@babel/helper-module-transforms@7.22.5:
     resolution: {integrity: sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==}
@@ -1643,7 +1603,7 @@ packages:
       '@babel/helper-validator-identifier': 7.22.20
       '@babel/template': 7.22.5
       '@babel/traverse': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     transitivePeerDependencies:
       - supports-color
 
@@ -1678,7 +1638,7 @@ packages:
     resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     dev: true
 
   /@babel/helper-plugin-utils@7.22.5:
@@ -1696,7 +1656,7 @@ packages:
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-environment-visitor': 7.22.5
       '@babel/helper-wrap-function': 7.22.5
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1711,7 +1671,7 @@ packages:
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-environment-visitor': 7.22.5
       '@babel/helper-wrap-function': 7.22.5
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1737,7 +1697,7 @@ packages:
       '@babel/helper-optimise-call-expression': 7.22.5
       '@babel/template': 7.22.5
       '@babel/traverse': 7.22.5(supports-color@5.5.0)
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1746,31 +1706,35 @@ packages:
     resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
 
   /@babel/helper-skip-transparent-expression-wrappers@7.22.5:
     resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     dev: true
 
   /@babel/helper-split-export-declaration@7.22.5:
     resolution: {integrity: sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
 
   /@babel/helper-split-export-declaration@7.22.6:
     resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
 
   /@babel/helper-string-parser@7.22.5:
     resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/helper-string-parser@7.23.4:
+    resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
+    engines: {node: '>=6.9.0'}
+
   /@babel/helper-validator-identifier@7.22.20:
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
@@ -1778,7 +1742,6 @@ packages:
   /@babel/helper-validator-option@7.22.15:
     resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==}
     engines: {node: '>=6.9.0'}
-    dev: true
 
   /@babel/helper-validator-option@7.22.5:
     resolution: {integrity: sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==}
@@ -1790,7 +1753,7 @@ packages:
     dependencies:
       '@babel/helper-function-name': 7.22.5
       '@babel/template': 7.22.5
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     dev: true
 
   /@babel/helper-wrap-function@7.22.5:
@@ -1800,7 +1763,7 @@ packages:
       '@babel/helper-function-name': 7.22.5
       '@babel/template': 7.22.5
       '@babel/traverse': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1811,7 +1774,7 @@ packages:
     dependencies:
       '@babel/template': 7.22.5
       '@babel/traverse': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     transitivePeerDependencies:
       - supports-color
 
@@ -1821,7 +1784,7 @@ packages:
     dependencies:
       '@babel/template': 7.22.5
       '@babel/traverse': 7.22.5(supports-color@5.5.0)
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     transitivePeerDependencies:
       - supports-color
 
@@ -1833,19 +1796,19 @@ packages:
       chalk: 2.4.2
       js-tokens: 4.0.0
 
-  /@babel/parser@7.22.10:
-    resolution: {integrity: sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==}
+  /@babel/parser@7.22.5:
+    resolution: {integrity: sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
 
-  /@babel/parser@7.22.5:
-    resolution: {integrity: sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==}
+  /@babel/parser@7.23.5:
+    resolution: {integrity: sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
 
   /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.22.10):
     resolution: {integrity: sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==}
@@ -2237,6 +2200,26 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
+  /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.22.10):
+    resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.22.10
+      '@babel/helper-plugin-utils': 7.22.5
+    dev: true
+
+  /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.22.5):
+    resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.22.5
+      '@babel/helper-plugin-utils': 7.22.5
+    dev: true
+
   /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.10):
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
@@ -3390,8 +3373,18 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-react-display-name@7.22.5(@babel/core@7.22.5):
-    resolution: {integrity: sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==}
+  /@babel/plugin-transform-react-display-name@7.23.3(@babel/core@7.22.10):
+    resolution: {integrity: sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.22.10
+      '@babel/helper-plugin-utils': 7.22.5
+    dev: true
+
+  /@babel/plugin-transform-react-display-name@7.23.3(@babel/core@7.22.5):
+    resolution: {integrity: sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -3407,7 +3400,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.22.10
-      '@babel/plugin-transform-react-jsx': 7.22.15(@babel/core@7.22.10)
+      '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.22.10)
     dev: true
 
   /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.22.5):
@@ -3417,11 +3410,11 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.22.5
-      '@babel/plugin-transform-react-jsx': 7.22.15(@babel/core@7.22.5)
+      '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.22.5)
     dev: true
 
-  /@babel/plugin-transform-react-jsx@7.22.15(@babel/core@7.22.10):
-    resolution: {integrity: sha512-oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA==}
+  /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.22.10):
+    resolution: {integrity: sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -3430,12 +3423,12 @@ packages:
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.10)
-      '@babel/types': 7.23.0
+      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.22.10)
+      '@babel/types': 7.23.5
     dev: true
 
-  /@babel/plugin-transform-react-jsx@7.22.15(@babel/core@7.22.5):
-    resolution: {integrity: sha512-oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA==}
+  /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.22.5):
+    resolution: {integrity: sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -3444,12 +3437,12 @@ packages:
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.5)
-      '@babel/types': 7.23.0
+      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.22.5)
+      '@babel/types': 7.23.5
     dev: true
 
-  /@babel/plugin-transform-react-pure-annotations@7.22.5(@babel/core@7.22.10):
-    resolution: {integrity: sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==}
+  /@babel/plugin-transform-react-pure-annotations@7.23.3(@babel/core@7.22.10):
+    resolution: {integrity: sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -3459,8 +3452,8 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-react-pure-annotations@7.22.5(@babel/core@7.22.5):
-    resolution: {integrity: sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==}
+  /@babel/plugin-transform-react-pure-annotations@7.23.3(@babel/core@7.22.5):
+    resolution: {integrity: sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -3774,7 +3767,7 @@ packages:
       '@babel/core': 7.22.10
       '@babel/helper-compilation-targets': 7.22.10
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-option': 7.22.5
+      '@babel/helper-validator-option': 7.22.15
       '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.5(@babel/core@7.22.10)
       '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.5(@babel/core@7.22.10)
       '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.10)
@@ -3845,7 +3838,7 @@ packages:
       '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.22.10)
       '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.22.10)
       '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.22.10)
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       babel-plugin-polyfill-corejs2: 0.4.5(@babel/core@7.22.10)
       babel-plugin-polyfill-corejs3: 0.8.3(@babel/core@7.22.10)
       babel-plugin-polyfill-regenerator: 0.5.2(@babel/core@7.22.10)
@@ -3967,7 +3960,7 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
       '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.22.5)
       '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.22.5)
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       esutils: 2.0.3
     dev: true
 
@@ -3978,12 +3971,12 @@ packages:
     dependencies:
       '@babel/core': 7.22.10
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       esutils: 2.0.3
     dev: true
 
-  /@babel/preset-react@7.22.15(@babel/core@7.22.10):
-    resolution: {integrity: sha512-Csy1IJ2uEh/PecCBXXoZGAZBeCATTuePzCSB7dLYWS0vOEj6CNpjxIhW4duWwZodBNueH7QO14WbGn8YyeuN9w==}
+  /@babel/preset-react@7.23.3(@babel/core@7.22.10):
+    resolution: {integrity: sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -3991,14 +3984,14 @@ packages:
       '@babel/core': 7.22.10
       '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-validator-option': 7.22.15
-      '@babel/plugin-transform-react-display-name': 7.22.5(@babel/core@7.22.10)
-      '@babel/plugin-transform-react-jsx': 7.22.15(@babel/core@7.22.10)
+      '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.22.10)
+      '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.22.10)
       '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.22.10)
-      '@babel/plugin-transform-react-pure-annotations': 7.22.5(@babel/core@7.22.10)
+      '@babel/plugin-transform-react-pure-annotations': 7.23.3(@babel/core@7.22.10)
     dev: true
 
-  /@babel/preset-react@7.22.15(@babel/core@7.22.5):
-    resolution: {integrity: sha512-Csy1IJ2uEh/PecCBXXoZGAZBeCATTuePzCSB7dLYWS0vOEj6CNpjxIhW4duWwZodBNueH7QO14WbGn8YyeuN9w==}
+  /@babel/preset-react@7.23.3(@babel/core@7.22.5):
+    resolution: {integrity: sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -4006,10 +3999,10 @@ packages:
       '@babel/core': 7.22.5
       '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-validator-option': 7.22.15
-      '@babel/plugin-transform-react-display-name': 7.22.5(@babel/core@7.22.5)
-      '@babel/plugin-transform-react-jsx': 7.22.15(@babel/core@7.22.5)
+      '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.22.5)
+      '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.22.5)
       '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.22.5)
-      '@babel/plugin-transform-react-pure-annotations': 7.22.5(@babel/core@7.22.5)
+      '@babel/plugin-transform-react-pure-annotations': 7.23.3(@babel/core@7.22.5)
     dev: true
 
   /@babel/preset-typescript@7.22.5(@babel/core@7.22.10):
@@ -4079,8 +4072,8 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.22.10
-      '@babel/parser': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/parser': 7.23.5
+      '@babel/types': 7.23.5
 
   /@babel/traverse@7.22.10:
     resolution: {integrity: sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==}
@@ -4092,8 +4085,8 @@ packages:
       '@babel/helper-function-name': 7.22.5
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/parser': 7.23.5
+      '@babel/types': 7.23.5
       debug: 4.3.4(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
@@ -4109,8 +4102,8 @@ packages:
       '@babel/helper-function-name': 7.22.5
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/parser': 7.23.5
+      '@babel/types': 7.23.5
       debug: 4.3.4(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
@@ -4132,6 +4125,14 @@ packages:
       '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
 
+  /@babel/types@7.23.5:
+    resolution: {integrity: sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.23.4
+      '@babel/helper-validator-identifier': 7.22.20
+      to-fast-properties: 2.0.0
+
   /@base2/pretty-print-object@1.0.1:
     resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==}
     dev: true
@@ -4140,7 +4141,7 @@ packages:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
 
-  /@chakra-ui/accordion@2.2.0(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react@18.2.0):
+  /@chakra-ui/accordion@2.2.0(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react@18.2.0):
     resolution: {integrity: sha512-2IK1iLzTZ22u8GKPPPn65mqJdZidn4AvkgAbv17ISdKA07VHJ8jSd4QF1T5iCXjKfZ0XaXozmhP4kDhjwF2IbQ==}
     peerDependencies:
       '@chakra-ui/system': '>=2.0.0'
@@ -4154,8 +4155,8 @@ packages:
       '@chakra-ui/react-use-merge-refs': 2.0.7(react@18.2.0)
       '@chakra-ui/shared-utils': 2.0.5
       '@chakra-ui/system': 2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
-      '@chakra-ui/transition': 2.0.16(framer-motion@10.15.1)(react@18.2.0)
-      framer-motion: 10.15.1(react-dom@18.2.0)(react@18.2.0)
+      '@chakra-ui/transition': 2.0.16(framer-motion@10.16.15)(react@18.2.0)
+      framer-motion: 10.16.15(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
 
   /@chakra-ui/alert@2.1.0(@chakra-ui/system@2.5.8)(react@18.2.0):
@@ -4467,7 +4468,7 @@ packages:
       '@chakra-ui/system': 2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
       react: 18.2.0
 
-  /@chakra-ui/menu@2.1.15(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react@18.2.0):
+  /@chakra-ui/menu@2.1.15(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react@18.2.0):
     resolution: {integrity: sha512-+1fh7KBKZyhy8wi7Q6nQAzrvjM6xggyhGMnSna0rt6FJVA2jlfkjb5FozyIVPnkfJKjkKd8THVhrs9E7pHNV/w==}
     peerDependencies:
       '@chakra-ui/system': '>=2.0.0'
@@ -4489,11 +4490,11 @@ packages:
       '@chakra-ui/react-use-update-effect': 2.0.7(react@18.2.0)
       '@chakra-ui/shared-utils': 2.0.5
       '@chakra-ui/system': 2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
-      '@chakra-ui/transition': 2.0.16(framer-motion@10.15.1)(react@18.2.0)
-      framer-motion: 10.15.1(react-dom@18.2.0)(react@18.2.0)
+      '@chakra-ui/transition': 2.0.16(framer-motion@10.16.15)(react@18.2.0)
+      framer-motion: 10.16.15(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
 
-  /@chakra-ui/modal@2.2.12(@chakra-ui/system@2.5.8)(@types/react@18.2.12)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0):
+  /@chakra-ui/modal@2.2.12(@chakra-ui/system@2.5.8)(@types/react@18.2.12)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-F1nNmYGvyqlmxidbwaBM3y57NhZ/Qeyc8BE9tb1FL1v9nxQhkfrPvMQ9miK0O1syPN6aZ5MMj+uD3AsRFE+/tA==}
     peerDependencies:
       '@chakra-ui/system': '>=2.0.0'
@@ -4509,9 +4510,9 @@ packages:
       '@chakra-ui/react-use-merge-refs': 2.0.7(react@18.2.0)
       '@chakra-ui/shared-utils': 2.0.5
       '@chakra-ui/system': 2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
-      '@chakra-ui/transition': 2.0.16(framer-motion@10.15.1)(react@18.2.0)
+      '@chakra-ui/transition': 2.0.16(framer-motion@10.16.15)(react@18.2.0)
       aria-hidden: 1.2.3
-      framer-motion: 10.15.1(react-dom@18.2.0)(react@18.2.0)
+      framer-motion: 10.16.15(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       react-remove-scroll: 2.5.6(@types/react@18.2.12)(react@18.2.0)
@@ -4560,7 +4561,7 @@ packages:
       '@chakra-ui/system': 2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
       react: 18.2.0
 
-  /@chakra-ui/popover@2.1.12(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react@18.2.0):
+  /@chakra-ui/popover@2.1.12(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react@18.2.0):
     resolution: {integrity: sha512-Corh8trA1f3ydcMQqomgSvYNNhAlpxiBpMY2sglwYazOJcueHA8CI05cJVD0T/wwoTob7BShabhCGFZThn61Ng==}
     peerDependencies:
       '@chakra-ui/system': '>=2.0.0'
@@ -4579,7 +4580,7 @@ packages:
       '@chakra-ui/react-use-merge-refs': 2.0.7(react@18.2.0)
       '@chakra-ui/shared-utils': 2.0.5
       '@chakra-ui/system': 2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
-      framer-motion: 10.15.1(react-dom@18.2.0)(react@18.2.0)
+      framer-motion: 10.16.15(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
 
   /@chakra-ui/popper@3.0.14(react@18.2.0):
@@ -4819,7 +4820,7 @@ packages:
       '@chakra-ui/utils': 2.0.15
       react: 18.2.0
 
-  /@chakra-ui/react@2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0):
+  /@chakra-ui/react@2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-+FcUFQMsPfhWuM9Iu7uqufwwhmHN2IX6FWsBixYGOalO86dpgETsILMZP9PuWfgj7GpWiy2Dum6HXekh0Tk2Mg==}
     peerDependencies:
       '@emotion/react': ^11.0.0
@@ -4828,7 +4829,7 @@ packages:
       react: '>=18'
       react-dom: '>=18'
     dependencies:
-      '@chakra-ui/accordion': 2.2.0(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react@18.2.0)
+      '@chakra-ui/accordion': 2.2.0(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react@18.2.0)
       '@chakra-ui/alert': 2.1.0(@chakra-ui/system@2.5.8)(react@18.2.0)
       '@chakra-ui/avatar': 2.2.11(@chakra-ui/system@2.5.8)(react@18.2.0)
       '@chakra-ui/breadcrumb': 2.1.5(@chakra-ui/system@2.5.8)(react@18.2.0)
@@ -4849,11 +4850,11 @@ packages:
       '@chakra-ui/layout': 2.2.0(@chakra-ui/system@2.5.8)(react@18.2.0)
       '@chakra-ui/live-region': 2.0.13(react@18.2.0)
       '@chakra-ui/media-query': 3.2.12(@chakra-ui/system@2.5.8)(react@18.2.0)
-      '@chakra-ui/menu': 2.1.15(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react@18.2.0)
-      '@chakra-ui/modal': 2.2.12(@chakra-ui/system@2.5.8)(@types/react@18.2.12)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0)
+      '@chakra-ui/menu': 2.1.15(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react@18.2.0)
+      '@chakra-ui/modal': 2.2.12(@chakra-ui/system@2.5.8)(@types/react@18.2.12)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0)
       '@chakra-ui/number-input': 2.0.19(@chakra-ui/system@2.5.8)(react@18.2.0)
       '@chakra-ui/pin-input': 2.0.20(@chakra-ui/system@2.5.8)(react@18.2.0)
-      '@chakra-ui/popover': 2.1.12(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react@18.2.0)
+      '@chakra-ui/popover': 2.1.12(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react@18.2.0)
       '@chakra-ui/popper': 3.0.14(react@18.2.0)
       '@chakra-ui/portal': 2.0.16(react-dom@18.2.0)(react@18.2.0)
       '@chakra-ui/progress': 2.1.6(@chakra-ui/system@2.5.8)(react@18.2.0)
@@ -4867,7 +4868,7 @@ packages:
       '@chakra-ui/stat': 2.0.18(@chakra-ui/system@2.5.8)(react@18.2.0)
       '@chakra-ui/stepper': 2.2.0(@chakra-ui/system@2.5.8)(react@18.2.0)
       '@chakra-ui/styled-system': 2.9.1
-      '@chakra-ui/switch': 2.0.27(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react@18.2.0)
+      '@chakra-ui/switch': 2.0.27(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react@18.2.0)
       '@chakra-ui/system': 2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
       '@chakra-ui/table': 2.0.17(@chakra-ui/system@2.5.8)(react@18.2.0)
       '@chakra-ui/tabs': 2.1.9(@chakra-ui/system@2.5.8)(react@18.2.0)
@@ -4875,14 +4876,14 @@ packages:
       '@chakra-ui/textarea': 2.0.19(@chakra-ui/system@2.5.8)(react@18.2.0)
       '@chakra-ui/theme': 3.1.2(@chakra-ui/styled-system@2.9.1)
       '@chakra-ui/theme-utils': 2.0.18
-      '@chakra-ui/toast': 6.1.4(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0)
-      '@chakra-ui/tooltip': 2.2.9(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0)
-      '@chakra-ui/transition': 2.0.16(framer-motion@10.15.1)(react@18.2.0)
+      '@chakra-ui/toast': 6.1.4(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0)
+      '@chakra-ui/tooltip': 2.2.9(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0)
+      '@chakra-ui/transition': 2.0.16(framer-motion@10.16.15)(react@18.2.0)
       '@chakra-ui/utils': 2.0.15
       '@chakra-ui/visually-hidden': 2.0.15(@chakra-ui/system@2.5.8)(react@18.2.0)
       '@emotion/react': 11.11.1(@types/react@18.2.12)(react@18.2.0)
       '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.2.12)(react@18.2.0)
-      framer-motion: 10.15.1(react-dom@18.2.0)(react@18.2.0)
+      framer-motion: 10.16.15(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     transitivePeerDependencies:
@@ -4983,7 +4984,7 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@chakra-ui/react': 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0)
+      '@chakra-ui/react': 2.7.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.12)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0)
       '@storybook/components': 7.5.0(@types/react-dom@18.2.5)(@types/react@18.2.12)(react-dom@18.2.0)(react@18.2.0)
       '@storybook/manager-api': 7.5.0(react-dom@18.2.0)(react@18.2.0)
       '@storybook/preview-api': 7.5.0
@@ -4999,7 +5000,7 @@ packages:
       csstype: 3.1.2
       lodash.mergewith: 4.6.2
 
-  /@chakra-ui/switch@2.0.27(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react@18.2.0):
+  /@chakra-ui/switch@2.0.27(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react@18.2.0):
     resolution: {integrity: sha512-z76y2fxwMlvRBrC5W8xsZvo3gP+zAEbT3Nqy5P8uh/IPd5OvDsGeac90t5cgnQTyxMOpznUNNK+1eUZqtLxWnQ==}
     peerDependencies:
       '@chakra-ui/system': '>=2.0.0'
@@ -5009,7 +5010,7 @@ packages:
       '@chakra-ui/checkbox': 2.2.15(@chakra-ui/system@2.5.8)(react@18.2.0)
       '@chakra-ui/shared-utils': 2.0.5
       '@chakra-ui/system': 2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
-      framer-motion: 10.15.1(react-dom@18.2.0)(react@18.2.0)
+      framer-motion: 10.16.15(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
 
   /@chakra-ui/system@2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
@@ -5109,7 +5110,7 @@ packages:
       '@chakra-ui/styled-system': 2.9.1
       '@chakra-ui/theme-tools': 2.0.18(@chakra-ui/styled-system@2.9.1)
 
-  /@chakra-ui/toast@6.1.4(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0):
+  /@chakra-ui/toast@6.1.4(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-wAcPHq/N/ar4jQxkUGhnsbp+lx2eKOpHxn1KaWdHXUkqCNUA1z09fvBsoMyzObSiiwbDuQPZG5RxsOhzfPZX4Q==}
     peerDependencies:
       '@chakra-ui/system': 2.5.8
@@ -5127,11 +5128,11 @@ packages:
       '@chakra-ui/styled-system': 2.9.1
       '@chakra-ui/system': 2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
       '@chakra-ui/theme': 3.1.2(@chakra-ui/styled-system@2.9.1)
-      framer-motion: 10.15.1(react-dom@18.2.0)(react@18.2.0)
+      framer-motion: 10.16.15(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
 
-  /@chakra-ui/tooltip@2.2.9(@chakra-ui/system@2.5.8)(framer-motion@10.15.1)(react-dom@18.2.0)(react@18.2.0):
+  /@chakra-ui/tooltip@2.2.9(@chakra-ui/system@2.5.8)(framer-motion@10.16.15)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-ZoksllanqXRUyMDaiogvUVJ+RdFXwZrfrwx3RV22fejYZIQ602hZ3QHtHLB5ZnKFLbvXKMZKM23HxFTSb0Ytqg==}
     peerDependencies:
       '@chakra-ui/system': '>=2.0.0'
@@ -5148,18 +5149,18 @@ packages:
       '@chakra-ui/react-use-merge-refs': 2.0.7(react@18.2.0)
       '@chakra-ui/shared-utils': 2.0.5
       '@chakra-ui/system': 2.5.8(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
-      framer-motion: 10.15.1(react-dom@18.2.0)(react@18.2.0)
+      framer-motion: 10.16.15(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
 
-  /@chakra-ui/transition@2.0.16(framer-motion@10.15.1)(react@18.2.0):
+  /@chakra-ui/transition@2.0.16(framer-motion@10.16.15)(react@18.2.0):
     resolution: {integrity: sha512-E+RkwlPc3H7P1crEXmXwDXMB2lqY2LLia2P5siQ4IEnRWIgZXlIw+8Em+NtHNgusel2N+9yuB0wT9SeZZeZ3CQ==}
     peerDependencies:
       framer-motion: '>=4.0.0'
       react: '>=18'
     dependencies:
       '@chakra-ui/shared-utils': 2.0.5
-      framer-motion: 10.15.1(react-dom@18.2.0)(react@18.2.0)
+      framer-motion: 10.16.15(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
 
   /@chakra-ui/utils@2.0.15:
@@ -5554,6 +5555,14 @@ packages:
     resolution: {integrity: sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==}
     dev: true
 
+  /@emnapi/runtime@0.44.0:
+    resolution: {integrity: sha512-ZX/etZEZw8DR7zAB1eVQT40lNo0jeqpb6dCgOvctB6FIQ5PoXfMuNY8+ayQfu8tNQbAB8gQWSSJupR8NxeiZXw==}
+    requiresBuild: true
+    dependencies:
+      tslib: 2.6.2
+    dev: false
+    optional: true
+
   /@emotion/babel-plugin@11.11.0:
     resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==}
     dependencies:
@@ -5683,6 +5692,7 @@ packages:
     cpu: [arm64]
     os: [android]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/android-arm64@0.18.20:
@@ -5703,12 +5713,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/android-arm64@0.19.8:
+    resolution: {integrity: sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/android-arm@0.17.19:
     resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/android-arm@0.18.20:
@@ -5729,12 +5748,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/android-arm@0.19.8:
+    resolution: {integrity: sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/android-x64@0.17.19:
     resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/android-x64@0.18.20:
@@ -5755,12 +5783,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/android-x64@0.19.8:
+    resolution: {integrity: sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/darwin-arm64@0.17.19:
     resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/darwin-arm64@0.18.20:
@@ -5781,12 +5818,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/darwin-arm64@0.19.8:
+    resolution: {integrity: sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/darwin-x64@0.17.19:
     resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/darwin-x64@0.18.20:
@@ -5807,12 +5853,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/darwin-x64@0.19.8:
+    resolution: {integrity: sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/freebsd-arm64@0.17.19:
     resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/freebsd-arm64@0.18.20:
@@ -5833,12 +5888,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/freebsd-arm64@0.19.8:
+    resolution: {integrity: sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/freebsd-x64@0.17.19:
     resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/freebsd-x64@0.18.20:
@@ -5859,12 +5923,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/freebsd-x64@0.19.8:
+    resolution: {integrity: sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/linux-arm64@0.17.19:
     resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-arm64@0.18.20:
@@ -5885,12 +5958,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-arm64@0.19.8:
+    resolution: {integrity: sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/linux-arm@0.17.19:
     resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-arm@0.18.20:
@@ -5911,12 +5993,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-arm@0.19.8:
+    resolution: {integrity: sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/linux-ia32@0.17.19:
     resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-ia32@0.18.20:
@@ -5937,12 +6028,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-ia32@0.19.8:
+    resolution: {integrity: sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/linux-loong64@0.17.19:
     resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-loong64@0.18.20:
@@ -5963,12 +6063,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-loong64@0.19.8:
+    resolution: {integrity: sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/linux-mips64el@0.17.19:
     resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-mips64el@0.18.20:
@@ -5989,12 +6098,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-mips64el@0.19.8:
+    resolution: {integrity: sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/linux-ppc64@0.17.19:
     resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-ppc64@0.18.20:
@@ -6015,12 +6133,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-ppc64@0.19.8:
+    resolution: {integrity: sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/linux-riscv64@0.17.19:
     resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-riscv64@0.18.20:
@@ -6041,12 +6168,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-riscv64@0.19.8:
+    resolution: {integrity: sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/linux-s390x@0.17.19:
     resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-s390x@0.18.20:
@@ -6067,12 +6203,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-s390x@0.19.8:
+    resolution: {integrity: sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/linux-x64@0.17.19:
     resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-x64@0.18.20:
@@ -6093,12 +6238,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-x64@0.19.8:
+    resolution: {integrity: sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/netbsd-x64@0.17.19:
     resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/netbsd-x64@0.18.20:
@@ -6119,12 +6273,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/netbsd-x64@0.19.8:
+    resolution: {integrity: sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/openbsd-x64@0.17.19:
     resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/openbsd-x64@0.18.20:
@@ -6145,12 +6308,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/openbsd-x64@0.19.8:
+    resolution: {integrity: sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/sunos-x64@0.17.19:
     resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/sunos-x64@0.18.20:
@@ -6171,12 +6343,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/sunos-x64@0.19.8:
+    resolution: {integrity: sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/win32-arm64@0.17.19:
     resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/win32-arm64@0.18.20:
@@ -6197,12 +6378,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/win32-arm64@0.19.8:
+    resolution: {integrity: sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/win32-ia32@0.17.19:
     resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/win32-ia32@0.18.20:
@@ -6223,12 +6413,21 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/win32-ia32@0.19.8:
+    resolution: {integrity: sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
   /@esbuild/win32-x64@0.17.19:
     resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/win32-x64@0.18.20:
@@ -6249,6 +6448,14 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/win32-x64@0.19.8:
+    resolution: {integrity: sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
   /@eslint-community/eslint-utils@4.4.0(eslint@8.42.0):
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -6296,24 +6503,10 @@ packages:
       '@ethersproject/logger': 5.7.0
     dev: false
 
-  /@ethersproject/constants@5.7.0:
-    resolution: {integrity: sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA==}
-    dependencies:
-      '@ethersproject/bignumber': 5.7.0
-    dev: false
-
   /@ethersproject/logger@5.7.0:
     resolution: {integrity: sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig==}
     dev: false
 
-  /@ethersproject/units@5.7.0:
-    resolution: {integrity: sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==}
-    dependencies:
-      '@ethersproject/bignumber': 5.7.0
-      '@ethersproject/constants': 5.7.0
-      '@ethersproject/logger': 5.7.0
-    dev: false
-
   /@extend-chrome/messages@1.2.2:
     resolution: {integrity: sha512-1VyUCT+1jewkm7cVBE5fMrrazxuL5QrmCOg2azmItBpiTqwmV/XxhGDQAtfsT4i24xB4gwL0s7+6PpEPec+1mw==}
     dependencies:
@@ -6380,6 +6573,194 @@ packages:
   /@humanwhocodes/object-schema@1.2.1:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
 
+  /@img/sharp-darwin-arm64@0.33.0:
+    resolution: {integrity: sha512-070tEheekI1LJWTGPC9WlQEa5UoKTXzzlORBHMX4TbfUxMiL336YHR8vBEUNsjse0RJCX8dZ4ZXwT595aEF1ug==}
+    engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-arm64': 1.0.0
+    dev: false
+    optional: true
+
+  /@img/sharp-darwin-x64@0.33.0:
+    resolution: {integrity: sha512-pu/nvn152F3qbPeUkr+4e9zVvEhD3jhwzF473veQfMPkOYo9aoWXSfdZH/E6F+nYC3qvFjbxbvdDbUtEbghLqw==}
+    engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-x64': 1.0.0
+    dev: false
+    optional: true
+
+  /@img/sharp-libvips-darwin-arm64@1.0.0:
+    resolution: {integrity: sha512-VzYd6OwnUR81sInf3alj1wiokY50DjsHz5bvfnsFpxs5tqQxESoHtJO6xyksDs3RIkyhMWq2FufXo6GNSU9BMw==}
+    engines: {macos: '>=11', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@img/sharp-libvips-darwin-x64@1.0.0:
+    resolution: {integrity: sha512-dD9OznTlHD6aovRswaPNEy8dKtSAmNo4++tO7uuR4o5VxbVAOoEQ1uSmN4iFAdQneTHws1lkTZeiXPrcCkh6IA==}
+    engines: {macos: '>=10.13', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@img/sharp-libvips-linux-arm64@1.0.0:
+    resolution: {integrity: sha512-xTYThiqEZEZc0PRU90yVtM3KE7lw1bKdnDQ9kCTHWbqWyHOe4NpPOtMGy27YnN51q0J5dqRrvicfPbALIOeAZA==}
+    engines: {glibc: '>=2.26', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@img/sharp-libvips-linux-arm@1.0.0:
+    resolution: {integrity: sha512-VwgD2eEikDJUk09Mn9Dzi1OW2OJFRQK+XlBTkUNmAWPrtj8Ly0yq05DFgu1VCMx2/DqCGQVi5A1dM9hTmxf3uw==}
+    engines: {glibc: '>=2.28', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@img/sharp-libvips-linux-s390x@1.0.0:
+    resolution: {integrity: sha512-o9E46WWBC6JsBlwU4QyU9578G77HBDT1NInd+aERfxeOPbk0qBZHgoDsQmA2v9TbqJRWzoBPx1aLOhprBMgPjw==}
+    engines: {glibc: '>=2.28', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@img/sharp-libvips-linux-x64@1.0.0:
+    resolution: {integrity: sha512-naldaJy4hSVhWBgEjfdBY85CAa4UO+W1nx6a1sWStHZ7EUfNiuBTTN2KUYT5dH1+p/xij1t2QSXfCiFJoC5S/Q==}
+    engines: {glibc: '>=2.26', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@img/sharp-libvips-linuxmusl-arm64@1.0.0:
+    resolution: {integrity: sha512-OdorplCyvmSAPsoJLldtLh3nLxRrkAAAOHsGWGDYfN0kh730gifK+UZb3dWORRa6EusNqCTjfXV4GxvgJ/nPDQ==}
+    engines: {musl: '>=1.2.2', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@img/sharp-libvips-linuxmusl-x64@1.0.0:
+    resolution: {integrity: sha512-FW8iK6rJrg+X2jKD0Ajhjv6y74lToIBEvkZhl42nZt563FfxkCYacrXZtd+q/sRQDypQLzY5WdLkVTbJoPyqNg==}
+    engines: {musl: '>=1.2.2', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@img/sharp-linux-arm64@0.33.0:
+    resolution: {integrity: sha512-dcomVSrtgF70SyOr8RCOCQ8XGVThXwe71A1d8MGA+mXEVRJ/J6/TrCbBEJh9ddcEIIsrnrkolaEvYSHqVhswQw==}
+    engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm64': 1.0.0
+    dev: false
+    optional: true
+
+  /@img/sharp-linux-arm@0.33.0:
+    resolution: {integrity: sha512-4horD3wMFd5a0ddbDY8/dXU9CaOgHjEHALAddXgafoR5oWq5s8X61PDgsSeh4Qupsdo6ycfPPSSNBrfVQnwwrg==}
+    engines: {glibc: '>=2.28', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm': 1.0.0
+    dev: false
+    optional: true
+
+  /@img/sharp-linux-s390x@0.33.0:
+    resolution: {integrity: sha512-TiVJbx38J2rNVfA309ffSOB+3/7wOsZYQEOlKqOUdWD/nqkjNGrX+YQGz7nzcf5oy2lC+d37+w183iNXRZNngQ==}
+    engines: {glibc: '>=2.28', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    optionalDependencies:
+      '@img/sharp-libvips-linux-s390x': 1.0.0
+    dev: false
+    optional: true
+
+  /@img/sharp-linux-x64@0.33.0:
+    resolution: {integrity: sha512-PaZM4Zi7/Ek71WgTdvR+KzTZpBqrQOFcPe7/8ZoPRlTYYRe43k6TWsf4GVH6XKRLMYeSp8J89RfAhBrSP4itNA==}
+    engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    optionalDependencies:
+      '@img/sharp-libvips-linux-x64': 1.0.0
+    dev: false
+    optional: true
+
+  /@img/sharp-linuxmusl-arm64@0.33.0:
+    resolution: {integrity: sha512-1QLbbN0zt+32eVrg7bb1lwtvEaZwlhEsY1OrijroMkwAqlHqFj6R33Y47s2XUv7P6Ie1PwCxK/uFnNqMnkd5kg==}
+    engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-arm64': 1.0.0
+    dev: false
+    optional: true
+
+  /@img/sharp-linuxmusl-x64@0.33.0:
+    resolution: {integrity: sha512-CecqgB/CnkvCWFhmfN9ZhPGMLXaEBXl4o7WtA6U3Ztrlh/s7FUKX4vNxpMSYLIrWuuzjiaYdfU3+Tdqh1xaHfw==}
+    engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-x64': 1.0.0
+    dev: false
+    optional: true
+
+  /@img/sharp-wasm32@0.33.0:
+    resolution: {integrity: sha512-Hn4js32gUX9qkISlemZBUPuMs0k/xNJebUNl/L6djnU07B/HAA2KaxRVb3HvbU5fL242hLOcp0+tR+M8dvJUFw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [wasm32]
+    requiresBuild: true
+    dependencies:
+      '@emnapi/runtime': 0.44.0
+    dev: false
+    optional: true
+
+  /@img/sharp-win32-ia32@0.33.0:
+    resolution: {integrity: sha512-5HfcsCZi3l5nPRF2q3bllMVMDXBqEWI3Q8KQONfzl0TferFE5lnsIG0A1YrntMAGqvkzdW6y1Ci1A2uTvxhfzg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@img/sharp-win32-x64@0.33.0:
+    resolution: {integrity: sha512-i3DtP/2ce1yKFj4OzOnOYltOEL/+dp4dc4dJXJBv6god1AFTcmkaA99H/7SwOmkCOBQkbVvA3lCGm3/5nDtf9Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@isaacs/cliui@8.0.2:
     resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
     engines: {node: '>=12'}
@@ -6412,7 +6793,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       chalk: 4.1.2
       jest-message-util: 27.5.1
       jest-util: 27.5.1
@@ -6424,7 +6805,7 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
       '@jest/types': 28.1.3
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       chalk: 4.1.2
       jest-message-util: 28.1.3
       jest-util: 28.1.3
@@ -6445,7 +6826,7 @@ packages:
       '@jest/test-result': 27.5.1
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.8.1
@@ -6482,24 +6863,17 @@ packages:
     dependencies:
       '@jest/fake-timers': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       jest-mock: 27.5.1
     dev: true
 
-  /@jest/expect-utils@29.5.0:
-    resolution: {integrity: sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      jest-get-type: 29.4.3
-    dev: true
-
   /@jest/fake-timers@27.5.1:
     resolution: {integrity: sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/types': 27.5.1
       '@sinonjs/fake-timers': 8.1.0
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       jest-message-util: 27.5.1
       jest-mock: 27.5.1
       jest-util: 27.5.1
@@ -6528,17 +6902,17 @@ packages:
       '@jest/test-result': 27.5.1
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
       glob: 7.2.3
       graceful-fs: 4.2.11
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       istanbul-lib-instrument: 5.2.1
-      istanbul-lib-report: 3.0.0
+      istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.5
+      istanbul-reports: 3.1.6
       jest-haste-map: 27.5.1
       jest-resolve: 27.5.1
       jest-util: 27.5.1
@@ -6559,11 +6933,11 @@ packages:
       '@sinclair/typebox': 0.24.51
     dev: true
 
-  /@jest/schemas@29.4.3:
-    resolution: {integrity: sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==}
+  /@jest/schemas@29.6.3:
+    resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@sinclair/typebox': 0.25.24
+      '@sinclair/typebox': 0.27.8
 
   /@jest/source-map@27.5.1:
     resolution: {integrity: sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==}
@@ -6658,7 +7032,7 @@ packages:
     dependencies:
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       '@types/yargs': 16.0.5
       chalk: 4.1.2
     dev: true
@@ -6670,7 +7044,7 @@ packages:
       '@jest/schemas': 28.1.3
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       '@types/yargs': 17.0.24
       chalk: 4.1.2
     dev: true
@@ -6679,10 +7053,10 @@ packages:
     resolution: {integrity: sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/schemas': 29.4.3
+      '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       '@types/yargs': 17.0.24
       chalk: 4.1.2
     dev: true
@@ -6849,44 +7223,34 @@ packages:
       react: 18.2.0
     dev: true
 
-  /@microsoft/api-extractor-model@7.27.5(@types/node@20.8.10):
+  /@microsoft/api-extractor-model@7.27.5(@types/node@20.10.4):
     resolution: {integrity: sha512-9/tBzYMJitR+o+zkPr1lQh2+e8ClcaTF6eZo7vZGDqRt2O5XmXWPbYJZmxyM3wb5at6lfJNEeGZrQXLjsQ0Nbw==}
     dependencies:
       '@microsoft/tsdoc': 0.14.2
       '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 3.59.6(@types/node@20.8.10)
+      '@rushstack/node-core-library': 3.59.6(@types/node@20.10.4)
     transitivePeerDependencies:
       - '@types/node'
     dev: true
 
-  /@microsoft/api-extractor-model@7.28.1(@types/node@20.8.10):
+  /@microsoft/api-extractor-model@7.28.1(@types/node@20.10.4):
     resolution: {integrity: sha512-1hD9gQRu8VR53/e8GI+aql7MtWXHE/XtpOSgphJ6SB7AswqJT0mRZVufUbg3D57UdrchvLKz9b+zqay0Oq2vgg==}
     dependencies:
       '@microsoft/tsdoc': 0.14.2
       '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 3.60.1(@types/node@20.8.10)
+      '@rushstack/node-core-library': 3.60.1(@types/node@20.10.4)
     transitivePeerDependencies:
       - '@types/node'
     dev: true
 
-  /@microsoft/api-extractor-model@7.28.2(@types/node@20.8.10):
-    resolution: {integrity: sha512-vkojrM2fo3q4n4oPh4uUZdjJ2DxQ2+RnDQL/xhTWSRUNPF6P4QyrvY357HBxbnltKcYu+nNNolVqc6TIGQ73Ig==}
-    dependencies:
-      '@microsoft/tsdoc': 0.14.2
-      '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 3.61.0(@types/node@20.8.10)
-    transitivePeerDependencies:
-      - '@types/node'
-    dev: true
-
-  /@microsoft/api-extractor@7.36.3(@types/node@20.8.10):
+  /@microsoft/api-extractor@7.36.3(@types/node@20.10.4):
     resolution: {integrity: sha512-u0H6362AQq+r55X8drHx4npgkrCfJnMzRRHfQo8PMNKB8TcBnrTLfXhXWi+xnTM6CzlU/netEN8c4bq581Rnrg==}
     hasBin: true
     dependencies:
-      '@microsoft/api-extractor-model': 7.27.5(@types/node@20.8.10)
+      '@microsoft/api-extractor-model': 7.27.5(@types/node@20.10.4)
       '@microsoft/tsdoc': 0.14.2
       '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 3.59.6(@types/node@20.8.10)
+      '@rushstack/node-core-library': 3.59.6(@types/node@20.10.4)
       '@rushstack/rig-package': 0.4.0
       '@rushstack/ts-command-line': 4.15.1
       colors: 1.2.5
@@ -6899,14 +7263,14 @@ packages:
       - '@types/node'
     dev: true
 
-  /@microsoft/api-extractor@7.37.1(@types/node@20.8.10):
+  /@microsoft/api-extractor@7.37.1(@types/node@20.10.4):
     resolution: {integrity: sha512-wbTL7TZG+9SPvYKwk26390ltoP/uR5621dniqhVp+5OHcn7wIKsT7vX9d/wvdAXD3Ft+7pAiCt6y3dBLFfY/0w==}
     hasBin: true
     dependencies:
-      '@microsoft/api-extractor-model': 7.28.1(@types/node@20.8.10)
+      '@microsoft/api-extractor-model': 7.28.1(@types/node@20.10.4)
       '@microsoft/tsdoc': 0.14.2
       '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 3.60.1(@types/node@20.8.10)
+      '@rushstack/node-core-library': 3.60.1(@types/node@20.10.4)
       '@rushstack/rig-package': 0.5.1
       '@rushstack/ts-command-line': 4.16.1
       colors: 1.2.5
@@ -6919,26 +7283,6 @@ packages:
       - '@types/node'
     dev: true
 
-  /@microsoft/api-extractor@7.38.3(@types/node@20.8.10):
-    resolution: {integrity: sha512-xt9iYyC5f39281j77JTA9C3ISJpW1XWkCcnw+2vM78CPnro6KhPfwQdPDfwS5JCPNuq0grm8cMdPUOPvrchDWw==}
-    hasBin: true
-    dependencies:
-      '@microsoft/api-extractor-model': 7.28.2(@types/node@20.8.10)
-      '@microsoft/tsdoc': 0.14.2
-      '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 3.61.0(@types/node@20.8.10)
-      '@rushstack/rig-package': 0.5.1
-      '@rushstack/ts-command-line': 4.17.1
-      colors: 1.2.5
-      lodash: 4.17.21
-      resolve: 1.22.8
-      semver: 7.5.4
-      source-map: 0.6.1
-      typescript: 5.0.4
-    transitivePeerDependencies:
-      - '@types/node'
-    dev: true
-
   /@microsoft/tsdoc-config@0.16.2:
     resolution: {integrity: sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==}
     dependencies:
@@ -7653,7 +7997,7 @@ packages:
     engines: {node: '>=16'}
     hasBin: true
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       playwright-core: 1.37.1
     optionalDependencies:
       fsevents: 2.3.2
@@ -7740,7 +8084,6 @@ packages:
 
   /@polka/url@1.0.0-next.21:
     resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==}
-    dev: true
 
   /@popperjs/core@2.11.8:
     resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
@@ -8434,6 +8777,91 @@ packages:
       estree-walker: 2.0.2
       picomatch: 2.3.1
       rollup: 2.78.0
+    dev: false
+
+  /@rollup/rollup-android-arm-eabi@4.6.1:
+    resolution: {integrity: sha512-0WQ0ouLejaUCRsL93GD4uft3rOmB8qoQMU05Kb8CmMtMBe7XUDLAltxVZI1q6byNqEtU7N1ZX1Vw5lIpgulLQA==}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    optional: true
+
+  /@rollup/rollup-android-arm64@4.6.1:
+    resolution: {integrity: sha512-1TKm25Rn20vr5aTGGZqo6E4mzPicCUD79k17EgTLAsXc1zysyi4xXKACfUbwyANEPAEIxkzwue6JZ+stYzWUTA==}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    optional: true
+
+  /@rollup/rollup-darwin-arm64@4.6.1:
+    resolution: {integrity: sha512-cEXJQY/ZqMACb+nxzDeX9IPLAg7S94xouJJCNVE5BJM8JUEP4HeTF+ti3cmxWeSJo+5D+o8Tc0UAWUkfENdeyw==}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    optional: true
+
+  /@rollup/rollup-darwin-x64@4.6.1:
+    resolution: {integrity: sha512-LoSU9Xu56isrkV2jLldcKspJ7sSXmZWkAxg7sW/RfF7GS4F5/v4EiqKSMCFbZtDu2Nc1gxxFdQdKwkKS4rwxNg==}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    optional: true
+
+  /@rollup/rollup-linux-arm-gnueabihf@4.6.1:
+    resolution: {integrity: sha512-EfI3hzYAy5vFNDqpXsNxXcgRDcFHUWSx5nnRSCKwXuQlI5J9dD84g2Usw81n3FLBNsGCegKGwwTVsSKK9cooSQ==}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@rollup/rollup-linux-arm64-gnu@4.6.1:
+    resolution: {integrity: sha512-9lhc4UZstsegbNLhH0Zu6TqvDfmhGzuCWtcTFXY10VjLLUe4Mr0Ye2L3rrtHaDd/J5+tFMEuo5LTCSCMXWfUKw==}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@rollup/rollup-linux-arm64-musl@4.6.1:
+    resolution: {integrity: sha512-FfoOK1yP5ksX3wwZ4Zk1NgyGHZyuRhf99j64I5oEmirV8EFT7+OhUZEnP+x17lcP/QHJNWGsoJwrz4PJ9fBEXw==}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@rollup/rollup-linux-x64-gnu@4.6.1:
+    resolution: {integrity: sha512-DNGZvZDO5YF7jN5fX8ZqmGLjZEXIJRdJEdTFMhiyXqyXubBa0WVLDWSNlQ5JR2PNgDbEV1VQowhVRUh+74D+RA==}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@rollup/rollup-linux-x64-musl@4.6.1:
+    resolution: {integrity: sha512-RkJVNVRM+piYy87HrKmhbexCHg3A6Z6MU0W9GHnJwBQNBeyhCJG9KDce4SAMdicQnpURggSvtbGo9xAWOfSvIQ==}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@rollup/rollup-win32-arm64-msvc@4.6.1:
+    resolution: {integrity: sha512-v2FVT6xfnnmTe3W9bJXl6r5KwJglMK/iRlkKiIFfO6ysKs0rDgz7Cwwf3tjldxQUrHL9INT/1r4VA0n9L/F1vQ==}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
+  /@rollup/rollup-win32-ia32-msvc@4.6.1:
+    resolution: {integrity: sha512-YEeOjxRyEjqcWphH9dyLbzgkF8wZSKAKUkldRY6dgNR5oKs2LZazqGB41cWJ4Iqqcy9/zqYgmzBkRoVz3Q9MLw==}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
+  /@rollup/rollup-win32-x64-msvc@4.6.1:
+    resolution: {integrity: sha512-0zfTlFAIhgz8V2G8STq8toAjsYYA6eci1hnXuyOTUFnymrtJwnS6uGKiv3v5UrPZkBlamLvrLV2iiaeqCKzb0A==}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    optional: true
 
   /@rushstack/eslint-patch@1.3.2:
     resolution: {integrity: sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw==}
@@ -8443,7 +8871,7 @@ packages:
     resolution: {integrity: sha512-EF3948ckf3f5uPgYbQ6GhyA56Dmv8yg0+ir+BroRjwdxyZJsekhZzawOecC2rOTPCz173t7ZcR1HHZu0dZgOCw==}
     dev: true
 
-  /@rushstack/node-core-library@3.59.6(@types/node@20.8.10):
+  /@rushstack/node-core-library@3.59.6(@types/node@20.10.4):
     resolution: {integrity: sha512-bMYJwNFfWXRNUuHnsE9wMlW/mOB4jIwSUkRKtu02CwZhQdmzMsUbxE0s1xOLwTpNIwlzfW/YT7OnOHgDffLgYg==}
     peerDependencies:
       '@types/node': '*'
@@ -8451,7 +8879,7 @@ packages:
       '@types/node':
         optional: true
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       colors: 1.2.5
       fs-extra: 7.0.1
       import-lazy: 4.0.0
@@ -8461,7 +8889,7 @@ packages:
       z-schema: 5.0.5
     dev: true
 
-  /@rushstack/node-core-library@3.60.1(@types/node@20.8.10):
+  /@rushstack/node-core-library@3.60.1(@types/node@20.10.4):
     resolution: {integrity: sha512-cWKCImfezPvILKu5eUPkz0Mp/cO/zOSJdPD64KHliBcdmbPHg/sF4rEL7WJkWywXT1RQ/U/N8uKdXMe7jDCXNw==}
     peerDependencies:
       '@types/node': '*'
@@ -8469,25 +8897,7 @@ packages:
       '@types/node':
         optional: true
     dependencies:
-      '@types/node': 20.8.10
-      colors: 1.2.5
-      fs-extra: 7.0.1
-      import-lazy: 4.0.0
-      jju: 1.4.0
-      resolve: 1.22.8
-      semver: 7.5.4
-      z-schema: 5.0.5
-    dev: true
-
-  /@rushstack/node-core-library@3.61.0(@types/node@20.8.10):
-    resolution: {integrity: sha512-tdOjdErme+/YOu4gPed3sFS72GhtWCgNV9oDsHDnoLY5oDfwjKUc9Z+JOZZ37uAxcm/OCahDHfuu2ugqrfWAVQ==}
-    peerDependencies:
-      '@types/node': '*'
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-    dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       colors: 1.2.5
       fs-extra: 7.0.1
       import-lazy: 4.0.0
@@ -8529,15 +8939,6 @@ packages:
       string-argv: 0.3.2
     dev: true
 
-  /@rushstack/ts-command-line@4.17.1:
-    resolution: {integrity: sha512-2jweO1O57BYP5qdBGl6apJLB+aRIn5ccIRTPDyULh0KMwVzFqWtw6IZWt1qtUoZD/pD2RNkIOosH6Cq45rIYeg==}
-    dependencies:
-      '@types/argparse': 1.0.38
-      argparse: 1.0.10
-      colors: 1.2.5
-      string-argv: 0.3.2
-    dev: true
-
   /@scure/base@1.1.1:
     resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==}
 
@@ -8872,8 +9273,8 @@ packages:
     resolution: {integrity: sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==}
     dev: true
 
-  /@sinclair/typebox@0.25.24:
-    resolution: {integrity: sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==}
+  /@sinclair/typebox@0.27.8:
+    resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
 
   /@sinonjs/commons@1.8.6:
     resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==}
@@ -8985,48 +9386,42 @@ packages:
       '@stablelib/random': 1.0.2
       '@stablelib/wipe': 1.0.1
 
-  /@starknet-react/chains@0.1.0-next.1:
-    resolution: {integrity: sha512-4/aYmckYXSbmkLJvc5NsM3WBDCH/0zrUGmF0dJMeET+rQv1YfxRY2IMV3u6ulha+19MELsuO0FmYaAWI1L5k2A==}
+  /@starknet-react/chains@0.1.0:
+    resolution: {integrity: sha512-tzhLuNbFLWUGKYDZC2mbWuyO/bohQW1Q9D7Q0dCDDvowXgG1/Z0WykVusuCl0Pe4iVVrjqkiFKJRR717FzsPUQ==}
     dev: false
 
-  /@starknet-react/core@2.0.0-next.5(get-starknet-core@3.1.0)(react@18.2.0)(starknet@5.24.3):
-    resolution: {integrity: sha512-8W1EgVcK5fmB1OI/dj4pVljL09HG73/pGuaGSUI3nB4QPrKQVSxp5DuSNswkm/g6VIu+XSQWvE36rNDm0Q1Acw==}
+  /@starknet-react/core@2.1.1(get-starknet-core@3.1.0)(react@18.2.0)(starknet@5.24.3):
+    resolution: {integrity: sha512-aqHEvNB7WPpIR5Gq3Trk6V/Fs5q8k4RRLdgwVeB0BEiaY+ExeEUoK+OqNbayrQhh0fU/2vYYdcBUObQFa24qvg==}
     peerDependencies:
       get-starknet-core: ^3.2.0
       react: ^18.0
       starknet: ^5.19.0
     dependencies:
-      '@starknet-react/chains': 0.1.0-next.1
-      '@tanstack/react-query': 4.35.3(react-dom@18.2.0)(react@18.2.0)
+      '@starknet-react/chains': 0.1.0
+      '@tanstack/react-query': 5.12.2(react@18.2.0)
       eventemitter3: 5.0.1
       get-starknet-core: 3.1.0(starknet@5.24.3)
       immutable: 4.3.4
       react: 18.2.0
       starknet: 5.24.3
       zod: 3.22.2
-    transitivePeerDependencies:
-      - react-dom
-      - react-native
     dev: false
 
-  /@starknet-react/core@2.0.0-next.6(get-starknet-core@3.2.0)(react-dom@18.2.0)(react@18.2.0)(starknet@5.24.3):
-    resolution: {integrity: sha512-yleXhaklEbcaFsOEEuA97IO+/JlsTLbQ4/G8yx2j2nvOiK8/dHWcJSxUF2T3pZKsZVTai/XqgXSDa+qhaZDISg==}
+  /@starknet-react/core@2.1.1(get-starknet-core@3.2.0)(react@18.2.0)(starknet@5.24.3):
+    resolution: {integrity: sha512-aqHEvNB7WPpIR5Gq3Trk6V/Fs5q8k4RRLdgwVeB0BEiaY+ExeEUoK+OqNbayrQhh0fU/2vYYdcBUObQFa24qvg==}
     peerDependencies:
       get-starknet-core: ^3.2.0
       react: ^18.0
       starknet: ^5.19.0
     dependencies:
-      '@starknet-react/chains': 0.1.0-next.1
-      '@tanstack/react-query': 4.35.3(react-dom@18.2.0)(react@18.2.0)
+      '@starknet-react/chains': 0.1.0
+      '@tanstack/react-query': 5.12.2(react@18.2.0)
       eventemitter3: 5.0.1
       get-starknet-core: 3.2.0(starknet@5.24.3)
       immutable: 4.3.4
       react: 18.2.0
       starknet: 5.24.3
       zod: 3.22.2
-    transitivePeerDependencies:
-      - react-dom
-      - react-native
     dev: false
 
   /@stdlib/array-float32@0.0.6:
@@ -10585,7 +10980,7 @@ packages:
     dependencies:
       '@babel/core': 7.22.10
       '@babel/preset-env': 7.22.10(@babel/core@7.22.10)
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       '@storybook/csf': 0.1.1
       '@storybook/csf-tools': 7.5.0
       '@storybook/node-logger': 7.5.0
@@ -10745,9 +11140,9 @@ packages:
     resolution: {integrity: sha512-KOHbFNSwwc7KTdNz/6yO7S2pxbr7sH6nqfolS6/l+pod45WvRH3VhyqlDIIeX7ESIhfCw87ExC96hNDL3TojCw==}
     dependencies:
       '@babel/generator': 7.22.10
-      '@babel/parser': 7.22.10
+      '@babel/parser': 7.23.5
       '@babel/traverse': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       '@storybook/csf': 0.1.1
       '@storybook/types': 7.5.0
       fs-extra: 11.1.1
@@ -10864,7 +11259,7 @@ packages:
       '@babel/plugin-transform-object-rest-spread': 7.22.15(@babel/core@7.22.10)
       '@babel/plugin-transform-runtime': 7.22.10(@babel/core@7.22.10)
       '@babel/preset-env': 7.22.10(@babel/core@7.22.10)
-      '@babel/preset-react': 7.22.15(@babel/core@7.22.10)
+      '@babel/preset-react': 7.23.3(@babel/core@7.22.10)
       '@babel/preset-typescript': 7.22.5(@babel/core@7.22.10)
       '@babel/runtime': 7.22.10
       '@storybook/addon-actions': 7.5.0(@types/react-dom@18.2.5)(@types/react@18.2.12)(react-dom@18.2.0)(react@18.2.0)
@@ -10945,7 +11340,7 @@ packages:
     dependencies:
       '@babel/core': 7.22.10
       '@babel/preset-flow': 7.22.5(@babel/core@7.22.10)
-      '@babel/preset-react': 7.22.15(@babel/core@7.22.10)
+      '@babel/preset-react': 7.23.3(@babel/core@7.22.10)
       '@pmmmwh/react-refresh-webpack-plugin': 0.5.10(react-refresh@0.11.0)(webpack@5.88.1)
       '@storybook/core-webpack': 7.5.0
       '@storybook/docs-tools': 7.5.0
@@ -11139,7 +11534,7 @@ packages:
       string.prototype.matchall: 4.0.8
     dev: true
 
-  /@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@4.1.1)(vite@4.3.9):
+  /@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@4.1.1)(vite@5.0.6):
     resolution: {integrity: sha512-Cy1dUMcYCnDVV/hPLXa43YZJ2jGKVW5rA0xuNL9dlmYhT0yoS1g7+FOFSRlgk0BXKk/Oc7grs+8BVA5Iz2fr8A==}
     engines: {node: ^14.18.0 || >= 16}
     peerDependencies:
@@ -11147,30 +11542,30 @@ packages:
       svelte: ^3.54.0 || ^4.0.0-next.0
       vite: ^4.0.0
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@4.1.1)(vite@4.3.9)
+      '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@4.1.1)(vite@5.0.6)
       debug: 4.3.4(supports-color@5.5.0)
       svelte: 4.1.1
-      vite: 4.3.9(@types/node@20.8.10)
+      vite: 5.0.6(@types/node@20.10.4)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@sveltejs/vite-plugin-svelte@2.4.1(svelte@4.1.1)(vite@4.3.9):
+  /@sveltejs/vite-plugin-svelte@2.4.1(svelte@4.1.1)(vite@5.0.6):
     resolution: {integrity: sha512-bNNKvoRY89ptY7udeBSCmTdCVwkjmMcZ0j/z9J5MuedT8jPjq0zrknAo/jF1sToAza4NVaAgR9AkZoD9oJJmnA==}
     engines: {node: ^14.18.0 || >= 16}
     peerDependencies:
       svelte: ^3.54.0 || ^4.0.0-next.0
       vite: ^4.0.0
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@4.1.1)(vite@4.3.9)
+      '@sveltejs/vite-plugin-svelte-inspector': 1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@4.1.1)(vite@5.0.6)
       debug: 4.3.4(supports-color@5.5.0)
       deepmerge: 4.3.1
       kleur: 4.1.5
       magic-string: 0.30.0
       svelte: 4.1.1
       svelte-hmr: 0.15.2(svelte@4.1.1)
-      vite: 4.3.9(@types/node@20.8.10)
-      vitefu: 0.2.4(vite@4.3.9)
+      vite: 5.0.6(@types/node@20.10.4)
+      vitefu: 0.2.4(vite@5.0.6)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -11346,7 +11741,7 @@ packages:
     resolution: {integrity: sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==}
     engines: {node: '>=10'}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     dev: true
 
   /@svgr/hast-util-to-babel-ast@8.0.0:
@@ -11423,7 +11818,7 @@ packages:
       '@babel/core': 7.22.10
       '@babel/plugin-transform-react-constant-elements': 7.22.5(@babel/core@7.22.10)
       '@babel/preset-env': 7.22.10(@babel/core@7.22.10)
-      '@babel/preset-react': 7.22.15(@babel/core@7.22.10)
+      '@babel/preset-react': 7.23.3(@babel/core@7.22.10)
       '@svgr/core': 5.5.0
       '@svgr/plugin-jsx': 5.5.0
       '@svgr/plugin-svgo': 5.5.0
@@ -11439,7 +11834,7 @@ packages:
       '@babel/core': 7.22.5
       '@babel/plugin-transform-react-constant-elements': 7.22.5(@babel/core@7.22.5)
       '@babel/preset-env': 7.22.5(@babel/core@7.22.5)
-      '@babel/preset-react': 7.22.15(@babel/core@7.22.5)
+      '@babel/preset-react': 7.23.3(@babel/core@7.22.5)
       '@babel/preset-typescript': 7.22.5(@babel/core@7.22.5)
       '@svgr/core': 8.0.0
       '@svgr/plugin-jsx': 8.0.1(@svgr/core@8.0.0)
@@ -11688,26 +12083,17 @@ packages:
     resolution: {integrity: sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==}
     dev: true
 
-  /@tanstack/query-core@4.35.3:
-    resolution: {integrity: sha512-PS+WEjd9wzKTyNjjQymvcOe1yg8f3wYc6mD+vb6CKyZAKvu4sIJwryfqfBULITKCla7P9C4l5e9RXePHvZOZeQ==}
+  /@tanstack/query-core@5.12.1:
+    resolution: {integrity: sha512-WbZztNmKq0t6QjdNmHzezbi/uifYo9j6e2GLJkodsYaYUlzMbAp91RDyeHkIZrm7EfO4wa6Sm5sxJZm5SPlh6w==}
     dev: false
 
-  /@tanstack/react-query@4.35.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-UgTPioip/rGG3EQilXfA2j4BJkhEQsR+KAbF+KIuvQ7j4MkgnTCJF01SfRpIRNtQTlEfz/+IL7+jP8WA8bFbsw==}
+  /@tanstack/react-query@5.12.2(react@18.2.0):
+    resolution: {integrity: sha512-BeWZu8zVFH20oRc+S/K9ADPgWjEzP/XQCGBNz5IbApUwPQAdwkQYbXODVL5AyAlWiSxhx+P2xlARPBApj2Yrog==}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-native: '*'
-    peerDependenciesMeta:
-      react-dom:
-        optional: true
-      react-native:
-        optional: true
+      react: ^18.0.0
     dependencies:
-      '@tanstack/query-core': 4.35.3
+      '@tanstack/query-core': 5.12.1
       react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      use-sync-external-store: 1.2.0(react@18.2.0)
     dev: false
 
   /@testing-library/dom@9.3.1:
@@ -11724,7 +12110,7 @@ packages:
       pretty-format: 27.5.1
     dev: true
 
-  /@testing-library/jest-dom@6.0.0(vitest@0.33.0):
+  /@testing-library/jest-dom@6.0.0(vitest@1.0.2):
     resolution: {integrity: sha512-Ye2R3+/oM27jir8CzYPmuWdavTaKwNZcu0d22L9pO/vnOYE0wmrtpw79TQJa8H6gV8/i7yd+pLaqeLlA0rTMfg==}
     engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
     peerDependencies:
@@ -11750,7 +12136,7 @@ packages:
       dom-accessibility-api: 0.5.16
       lodash: 4.17.21
       redent: 3.0.0
-      vitest: 0.33.0(happy-dom@12.2.0)(jsdom@22.1.0)
+      vitest: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.10.3)
     dev: true
 
   /@testing-library/react@14.0.0(react-dom@18.2.0)(react@18.2.0):
@@ -11795,6 +12181,7 @@ packages:
   /@tootallnate/once@2.0.0:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
+    dev: true
 
   /@trpc/client@10.30.0(@trpc/server@10.34.0):
     resolution: {integrity: sha512-utz0qRI4eU3QcHvBwcSONEnt5pWR3Dyk4VFJnySHysBT6GQRRpJifWX5+RxDhFK93LxcAmiirFbYXjZ40gbobw==}
@@ -11858,8 +12245,8 @@ packages:
   /@types/babel__core@7.20.1:
     resolution: {integrity: sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==}
     dependencies:
-      '@babel/parser': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/parser': 7.23.5
+      '@babel/types': 7.23.5
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.20.1
@@ -11868,49 +12255,37 @@ packages:
   /@types/babel__generator@7.6.4:
     resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
     dev: true
 
   /@types/babel__template@7.4.1:
     resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
-      '@babel/parser': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/parser': 7.23.5
+      '@babel/types': 7.23.5
     dev: true
 
   /@types/babel__traverse@7.20.1:
     resolution: {integrity: sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==}
     dependencies:
-      '@babel/types': 7.23.0
-    dev: true
-
-  /@types/big.js@6.1.6:
-    resolution: {integrity: sha512-0r9J+Zz9rYm2hOTwiMAVkm3XFQ4u5uTK37xrQMhc9bysn/sf/okzovWMYYIBMFTn/yrEZ11pusgLEaoarTlQbA==}
+      '@babel/types': 7.23.5
     dev: true
 
   /@types/body-parser@1.19.2:
     resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
     dependencies:
       '@types/connect': 3.4.35
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/bonjour@3.5.10:
     resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
-  /@types/chai-subset@1.3.3:
-    resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==}
-    dependencies:
-      '@types/chai': 4.3.5
-
-  /@types/chai@4.3.5:
-    resolution: {integrity: sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==}
-
-  /@types/chrome@0.0.248:
-    resolution: {integrity: sha512-qtBzxZD1v3eWZn8XxH1i07pAhzJDHnxJBBVy7bmntXxXKxjzNXYxD41teqa5yOcX/Yy8brRFGZESEzGoINvBDg==}
+  /@types/chrome@0.0.254:
+    resolution: {integrity: sha512-svkOGKwA+6ZZuk9xtrYun8MYpNY/9hD17rgZ19v3KunhsK1ZOKaMESw12/1AXLh1u3UPA8jQIRi2370DXv9wgw==}
     dependencies:
       '@types/filesystem': 0.0.32
       '@types/har-format': 1.2.11
@@ -11926,13 +12301,13 @@ packages:
     resolution: {integrity: sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==}
     dependencies:
       '@types/express-serve-static-core': 4.17.35
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/connect@3.4.35:
     resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/cookie@0.4.1:
@@ -11942,7 +12317,7 @@ packages:
   /@types/cross-spawn@6.0.2:
     resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/debug@4.1.8:
@@ -11962,7 +12337,7 @@ packages:
   /@types/dotenv-webpack@7.0.4(@swc/core@1.3.64)(esbuild@0.18.20):
     resolution: {integrity: sha512-xRE/v3UmO1qS7wkEDLnISqbfbQFCA+rA+32N1uJbrWbdMK7mo0jNNedM3sW2zOCb4GGbJDxJLal8wu/dMyHxgw==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       tapable: 2.2.1
       webpack: 5.88.1(@swc/core@1.3.64)(esbuild@0.18.20)
     transitivePeerDependencies:
@@ -12012,7 +12387,7 @@ packages:
   /@types/express-serve-static-core@4.17.35:
     resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       '@types/qs': 6.9.7
       '@types/range-parser': 1.2.4
       '@types/send': 0.17.1
@@ -12043,13 +12418,13 @@ packages:
     resolution: {integrity: sha512-MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA==}
     dependencies:
       '@types/jsonfile': 6.1.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/graceful-fs@4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/har-format@1.2.11:
@@ -12069,7 +12444,7 @@ packages:
   /@types/http-proxy@1.17.11:
     resolution: {integrity: sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/is-ci@3.0.0:
@@ -12094,13 +12469,6 @@ packages:
       '@types/istanbul-lib-report': 3.0.0
     dev: true
 
-  /@types/jest@29.5.2:
-    resolution: {integrity: sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg==}
-    dependencies:
-      expect: 29.5.0
-      pretty-format: 29.5.0
-    dev: true
-
   /@types/js-levenshtein@1.1.1:
     resolution: {integrity: sha512-qC4bCqYGy1y/NP7dDVr7KJarn+PbX1nSpwA7JXdu0HxT3QYjO8MJ+cntENtHFVy2dRAyBV23OZ6MxsW1AM1L8g==}
     dev: true
@@ -12116,7 +12484,7 @@ packages:
   /@types/jsonfile@6.1.1:
     resolution: {integrity: sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/lodash-es@4.17.7:
@@ -12170,7 +12538,7 @@ packages:
   /@types/node-fetch@2.6.4:
     resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       form-data: 3.0.1
     dev: true
 
@@ -12185,15 +12553,15 @@ packages:
   /@types/node@18.15.13:
     resolution: {integrity: sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==}
 
+  /@types/node@20.10.4:
+    resolution: {integrity: sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==}
+    dependencies:
+      undici-types: 5.26.5
+
   /@types/node@20.5.7:
     resolution: {integrity: sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==}
     dev: true
 
-  /@types/node@20.8.10:
-    resolution: {integrity: sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==}
-    dependencies:
-      undici-types: 5.26.5
-
   /@types/normalize-package-data@2.4.1:
     resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
     dev: true
@@ -12232,8 +12600,8 @@ packages:
     resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==}
     dev: true
 
-  /@types/react-copy-to-clipboard@5.0.6:
-    resolution: {integrity: sha512-x347Gy+ZG2dCMiWEHRwiIJ4uMlTmxW7yheRMSQbNf0mFkmXhnYE5nvRdt6SbnT6Z2dp7KPIr3CSvBgSiTIr9zw==}
+  /@types/react-copy-to-clipboard@5.0.7:
+    resolution: {integrity: sha512-Gft19D+as4M+9Whq1oglhmK49vqPhcLzk8WfvfLvaYMIPYanyfLy0+CwFucMJfdKoSFyySPmkkWn8/E6voQXjQ==}
     dependencies:
       '@types/react': 18.2.12
     dev: true
@@ -12272,7 +12640,7 @@ packages:
   /@types/resolve@1.17.1:
     resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/resolve@1.20.2:
@@ -12298,7 +12666,7 @@ packages:
     resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==}
     dependencies:
       '@types/mime': 1.3.2
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/serve-index@1.9.1:
@@ -12311,19 +12679,19 @@ packages:
     resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==}
     dependencies:
       '@types/mime': 3.0.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/set-cookie-parser@2.4.2:
     resolution: {integrity: sha512-fBZgytwhYAUkj/jC/FAV4RQ5EerRup1YQsXQCh8rZfiHkc4UahC192oH0smGwsXol3cL3A5oETuAHeQHmhXM4w==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/sockjs@0.3.33:
     resolution: {integrity: sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/stack-utils@2.0.1:
@@ -12355,7 +12723,7 @@ packages:
   /@types/ws@8.5.5:
     resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /@types/yargs-parser@21.0.0:
@@ -12657,18 +13025,38 @@ packages:
       - supports-color
     dev: false
 
-  /@vitejs/plugin-react-swc@3.3.2(vite@4.3.9):
+  /@vitejs/plugin-react-swc@3.3.2(vite@5.0.6):
     resolution: {integrity: sha512-VJFWY5sfoZerQRvJrh518h3AcQt6f/yTuWn4/TRB+dqmYU0NX1qz7qM5Wfd+gOQqUzQW4gxKqKN3KpE/P3+zrA==}
     peerDependencies:
       vite: ^4
     dependencies:
       '@swc/core': 1.3.64
-      vite: 4.3.9(@types/node@20.8.10)
+      vite: 5.0.6(@types/node@20.10.4)
     transitivePeerDependencies:
       - '@swc/helpers'
     dev: true
 
-  /@vitest/coverage-c8@0.33.0(vitest@0.34.6):
+  /@vitest/browser@1.0.2(vitest@1.0.2):
+    resolution: {integrity: sha512-CvHdDtwvYc11kshHWnv+1C2URYIBSBOW3Fvxta9yN6BXbDuQDiyjQQVLNM4uk7JEdnQyS3xAVPxteWTwTzScJg==}
+    peerDependencies:
+      playwright: '*'
+      safaridriver: '*'
+      vitest: ^1.0.0
+      webdriverio: '*'
+    peerDependenciesMeta:
+      playwright:
+        optional: true
+      safaridriver:
+        optional: true
+      webdriverio:
+        optional: true
+    dependencies:
+      estree-walker: 3.0.3
+      magic-string: 0.30.5
+      sirv: 2.0.3
+      vitest: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.10.3)
+
+  /@vitest/coverage-c8@0.33.0(vitest@1.0.2):
     resolution: {integrity: sha512-DaF1zJz4dcOZS4k/neiQJokmOWqsGXwhthfmUdPGorXIQHjdPvV6JQSYhQDI41MyI8c+IieQUdIDs5XAMHtDDw==}
     peerDependencies:
       vitest: '>=0.30.0 <1'
@@ -12678,117 +13066,97 @@ packages:
       magic-string: 0.30.1
       picocolors: 1.0.0
       std-env: 3.3.3
-      vitest: 0.34.6(happy-dom@12.2.0)
+      vitest: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.2.0)
     dev: true
 
-  /@vitest/coverage-istanbul@0.34.5(vitest@0.33.0):
-    resolution: {integrity: sha512-t07VrdRSRKw7QgOZ20i1bmstv9seUm7Fay8wVtswKHBlMmAAW3K5x+0u18O50mLuVl208Lx21tH/6O7W4BWR9Q==}
+  /@vitest/coverage-istanbul@1.0.2(vitest@1.0.2):
+    resolution: {integrity: sha512-HZk0VYYvLrUX/TExxxVT7DwowqjJXmm4LbKGYBLN9HwYZe50nGYU3K/KisnOY7lgt0+Po4MLVa2fXe2ediyr9g==}
     peerDependencies:
-      vitest: '>=0.32.0 <1'
+      vitest: ^1.0.0
     dependencies:
-      istanbul-lib-coverage: 3.2.0
-      istanbul-lib-instrument: 6.0.0
+      debug: 4.3.4(supports-color@5.5.0)
+      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-instrument: 6.0.1
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.5
+      istanbul-reports: 3.1.6
+      magicast: 0.3.2
       picocolors: 1.0.0
       test-exclude: 6.0.0
-      vitest: 0.33.0(happy-dom@12.2.0)(jsdom@22.1.0)
+      vitest: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.10.3)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@vitest/coverage-v8@0.34.5(vitest@0.33.0):
-    resolution: {integrity: sha512-97xjhRTSdmeeHCm2nNHhT3hLsMYkAhHXm/rwj6SZ3voka8xiCJrwgtfIjoZIFEL4OO0KezGmVuHWQXcMunULIA==}
+  /@vitest/coverage-v8@1.0.2(vitest@1.0.2):
+    resolution: {integrity: sha512-WCTbfnvFPqH8TGVPNnPXcLBK/tbMX5GGZ/Lc9EuYvVX4xbO0ULKLzWDbVU37C2Y2YIlNu/VP1kp7QKUZolUDgA==}
     peerDependencies:
-      vitest: '>=0.32.0 <1'
+      vitest: ^1.0.0
     dependencies:
       '@ampproject/remapping': 2.2.1
       '@bcoe/v8-coverage': 0.2.3
-      istanbul-lib-coverage: 3.2.0
+      debug: 4.3.4(supports-color@5.5.0)
+      istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.5
-      magic-string: 0.30.1
+      istanbul-reports: 3.1.6
+      magic-string: 0.30.5
+      magicast: 0.3.2
       picocolors: 1.0.0
-      std-env: 3.3.3
+      std-env: 3.6.0
       test-exclude: 6.0.0
-      v8-to-istanbul: 9.1.0
-      vitest: 0.33.0(happy-dom@12.2.0)(jsdom@22.1.0)
+      v8-to-istanbul: 9.2.0
+      vitest: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.10.3)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@vitest/expect@0.33.0:
-    resolution: {integrity: sha512-sVNf+Gla3mhTCxNJx+wJLDPp/WcstOe0Ksqz4Vec51MmgMth/ia0MGFEkIZmVGeTL5HtjYR4Wl/ZxBxBXZJTzQ==}
+  /@vitest/expect@1.0.2:
+    resolution: {integrity: sha512-mAIo/8uddSWkjQMLFcjqZP3WmkwvvN0OtlyZIu33jFnwme3vZds8m8EDMxtj+Uzni2DwtPfHNjJcTM8zTV1f4A==}
     dependencies:
-      '@vitest/spy': 0.33.0
-      '@vitest/utils': 0.33.0
+      '@vitest/spy': 1.0.2
+      '@vitest/utils': 1.0.2
       chai: 4.3.10
 
-  /@vitest/expect@0.34.6:
-    resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==}
+  /@vitest/runner@1.0.2:
+    resolution: {integrity: sha512-ZcHJXPT2kg/9Hc4fNkCbItlsgZSs3m4vQbxB8LCSdzpbG85bExCmSvu6K9lWpMNdoKfAr1Jn0BwS9SWUcGnbTQ==}
     dependencies:
-      '@vitest/spy': 0.34.6
-      '@vitest/utils': 0.34.6
-      chai: 4.3.10
-    dev: true
-
-  /@vitest/runner@0.33.0:
-    resolution: {integrity: sha512-UPfACnmCB6HKRHTlcgCoBh6ppl6fDn+J/xR8dTufWiKt/74Y9bHci5CKB8tESSV82zKYtkBJo9whU3mNvfaisg==}
-    dependencies:
-      '@vitest/utils': 0.33.0
-      p-limit: 4.0.0
+      '@vitest/utils': 1.0.2
+      p-limit: 5.0.0
       pathe: 1.1.1
 
-  /@vitest/runner@0.34.6:
-    resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==}
+  /@vitest/snapshot@1.0.2:
+    resolution: {integrity: sha512-9ClDz2/aV5TfWA4reV7XR9p+hE0e7bifhwxlURugj3Fw0YXeTFzHmKCNEHd6wOIFMfthbGGwhlq7TOJ2jDO4/g==}
     dependencies:
-      '@vitest/utils': 0.34.6
-      p-limit: 4.0.0
+      magic-string: 0.30.5
       pathe: 1.1.1
-    dev: true
+      pretty-format: 29.7.0
 
-  /@vitest/snapshot@0.33.0:
-    resolution: {integrity: sha512-tJjrl//qAHbyHajpFvr8Wsk8DIOODEebTu7pgBrP07iOepR5jYkLFiqLq2Ltxv+r0uptUb4izv1J8XBOwKkVYA==}
+  /@vitest/spy@1.0.2:
+    resolution: {integrity: sha512-YlnHmDntp+zNV3QoTVFI5EVHV0AXpiThd7+xnDEbWnD6fw0TH/J4/+3GFPClLimR39h6nA5m0W4Bjm5Edg4A/A==}
     dependencies:
-      magic-string: 0.30.1
-      pathe: 1.1.1
-      pretty-format: 29.5.0
+      tinyspy: 2.2.0
 
-  /@vitest/snapshot@0.34.6:
-    resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==}
+  /@vitest/ui@1.0.2(vitest@1.0.2):
+    resolution: {integrity: sha512-8qFmXDsH5IWVA8B+F00G8Iq6jroSVWO/DrEquhB2K/khpdVbq1i2ufBGdNginv6m9x9Hw2y6kIWHltpOFRG+3A==}
+    peerDependencies:
+      vitest: ^1.0.0
     dependencies:
-      magic-string: 0.30.1
+      '@vitest/utils': 1.0.2
+      fast-glob: 3.3.2
+      fflate: 0.8.1
+      flatted: 3.2.9
       pathe: 1.1.1
-      pretty-format: 29.5.0
-    dev: true
-
-  /@vitest/spy@0.33.0:
-    resolution: {integrity: sha512-Kv+yZ4hnH1WdiAkPUQTpRxW8kGtH8VRTnus7ZTGovFYM1ZezJpvGtb9nPIjPnptHbsyIAxYZsEpVPYgtpjGnrg==}
-    dependencies:
-      tinyspy: 2.1.1
-
-  /@vitest/spy@0.34.6:
-    resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==}
-    dependencies:
-      tinyspy: 2.1.1
-    dev: true
+      picocolors: 1.0.0
+      sirv: 2.0.3
+      vitest: 1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.10.3)
 
-  /@vitest/utils@0.33.0:
-    resolution: {integrity: sha512-pF1w22ic965sv+EN6uoePkAOTkAPWM03Ri/jXNyMIKBb/XHLDPfhLvf/Fa9g0YECevAIz56oVYXhodLvLQ/awA==}
+  /@vitest/utils@1.0.2:
+    resolution: {integrity: sha512-GPQkGHAnFAP/+seSbB9pCsj339yRrMgILoI5H2sPevTLCYgBq0VRjF8QSllmnQyvf0EontF6KUIt2t5s2SmqoQ==}
     dependencies:
-      diff-sequences: 29.4.3
-      loupe: 2.3.6
-      pretty-format: 29.5.0
-
-  /@vitest/utils@0.34.6:
-    resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==}
-    dependencies:
-      diff-sequences: 29.4.3
-      loupe: 2.3.6
-      pretty-format: 29.5.0
-    dev: true
+      diff-sequences: 29.6.3
+      loupe: 2.3.7
+      pretty-format: 29.7.0
 
   /@volar/language-core@1.10.0:
     resolution: {integrity: sha512-ddyWwSYqcbEZNFHm+Z3NZd6M7Ihjcwl/9B5cZd8kECdimVXUFdFi60XHWD27nrWtUQIsUYIG7Ca1WBwV2u2LSQ==}
@@ -12796,41 +13164,22 @@ packages:
       '@volar/source-map': 1.10.0
     dev: true
 
-  /@volar/language-core@1.10.10:
-    resolution: {integrity: sha512-nsV1o3AZ5n5jaEAObrS3MWLBWaGwUj/vAsc15FVNIv+DbpizQRISg9wzygsHBr56ELRH8r4K75vkYNMtsSNNWw==}
-    dependencies:
-      '@volar/source-map': 1.10.10
-    dev: true
-
   /@volar/source-map@1.10.0:
     resolution: {integrity: sha512-/ibWdcOzDGiq/GM1JU2eX8fH1bvAhl66hfe8yEgLEzg9txgr6qb5sQ/DEz5PcDL75tF5H5sCRRwn8Eu8ezi9mw==}
     dependencies:
       muggle-string: 0.3.1
     dev: true
 
-  /@volar/source-map@1.10.10:
-    resolution: {integrity: sha512-GVKjLnifV4voJ9F0vhP56p4+F3WGf+gXlRtjFZsv6v3WxBTWU3ZVeaRaEHJmWrcv5LXmoYYpk/SC25BKemPRkg==}
-    dependencies:
-      muggle-string: 0.3.1
-    dev: true
-
   /@volar/typescript@1.10.0:
     resolution: {integrity: sha512-OtqGtFbUKYC0pLNIk3mHQp5xWnvL1CJIUc9VE39VdZ/oqpoBh5jKfb9uJ45Y4/oP/WYTrif/Uxl1k8VTPz66Gg==}
     dependencies:
       '@volar/language-core': 1.10.0
     dev: true
 
-  /@volar/typescript@1.10.10:
-    resolution: {integrity: sha512-4a2r5bdUub2m+mYVnLu2wt59fuoYWe7nf0uXtGHU8QQ5LDNfzAR0wK7NgDiQ9rcl2WT3fxT2AA9AylAwFtj50A==}
-    dependencies:
-      '@volar/language-core': 1.10.10
-      path-browserify: 1.0.1
-    dev: true
-
   /@vue/compiler-core@3.3.4:
     resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==}
     dependencies:
-      '@babel/parser': 7.22.10
+      '@babel/parser': 7.23.5
       '@vue/shared': 3.3.4
       estree-walker: 2.0.2
       source-map-js: 1.0.2
@@ -12843,25 +13192,6 @@ packages:
       '@vue/shared': 3.3.4
     dev: true
 
-  /@vue/language-core@1.8.22(typescript@5.1.3):
-    resolution: {integrity: sha512-bsMoJzCrXZqGsxawtUea1cLjUT9dZnDsy5TuZ+l1fxRMzUGQUG9+Ypq4w//CqpWmrx7nIAJpw2JVF/t258miRw==}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@volar/language-core': 1.10.10
-      '@volar/source-map': 1.10.10
-      '@vue/compiler-dom': 3.3.4
-      '@vue/shared': 3.3.4
-      computeds: 0.0.1
-      minimatch: 9.0.3
-      muggle-string: 0.3.1
-      typescript: 5.1.3
-      vue-template-compiler: 2.7.14
-    dev: true
-
   /@vue/language-core@1.8.8(typescript@5.1.3):
     resolution: {integrity: sha512-i4KMTuPazf48yMdYoebTkgSOJdFraE4pQf0B+FTOFkbB+6hAfjrSou/UmYWRsWyZV6r4Rc6DDZdI39CJwL0rWw==}
     peerDependencies:
@@ -13488,6 +13818,7 @@ packages:
 
   /abab@2.0.6:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
+    dev: true
 
   /abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
@@ -13531,12 +13862,12 @@ packages:
       acorn: 7.4.1
     dev: true
 
-  /acorn-jsx@5.3.2(acorn@8.9.0):
+  /acorn-jsx@5.3.2(acorn@8.11.2):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.9.0
+      acorn: 8.11.2
 
   /acorn-walk@7.2.0:
     resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
@@ -13547,12 +13878,21 @@ packages:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
 
+  /acorn-walk@8.3.1:
+    resolution: {integrity: sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==}
+    engines: {node: '>=0.4.0'}
+
   /acorn@7.4.1:
     resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
 
+  /acorn@8.11.2:
+    resolution: {integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   /acorn@8.9.0:
     resolution: {integrity: sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==}
     engines: {node: '>=0.4.0'}
@@ -13938,6 +14278,7 @@ packages:
 
   /asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+    dev: true
 
   /at-least-node@1.0.0:
     resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
@@ -14010,10 +14351,6 @@ packages:
       dequal: 2.0.3
     dev: true
 
-  /b4a@1.6.4:
-    resolution: {integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==}
-    dev: false
-
   /babel-core@7.0.0-bridge.0(@babel/core@7.22.10):
     resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}
     peerDependencies:
@@ -14110,7 +14447,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@babel/template': 7.22.5
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       '@types/babel__core': 7.20.1
       '@types/babel__traverse': 7.20.1
     dev: true
@@ -14234,11 +14571,6 @@ packages:
     resolution: {integrity: sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==}
     dev: false
 
-  /babel-plugin-transform-jsbi-to-bigint@1.4.0:
-    resolution: {integrity: sha512-59f6ClwQBY/SKMVwKV/xoAqH/gnyZ6C5gSSPsEUCLPvvZULCDSE5Y3T62wjNTbpBcFzh0ReYz2mIe3u44mW9UQ==}
-    engines: {node: '>=8'}
-    dev: true
-
   /babel-plugin-transform-react-remove-prop-types@0.4.24:
     resolution: {integrity: sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==}
     dev: true
@@ -14320,7 +14652,7 @@ packages:
       '@babel/plugin-transform-react-display-name': 7.22.5(@babel/core@7.22.10)
       '@babel/plugin-transform-runtime': 7.22.5(@babel/core@7.22.10)
       '@babel/preset-env': 7.22.10(@babel/core@7.22.10)
-      '@babel/preset-react': 7.22.15(@babel/core@7.22.10)
+      '@babel/preset-react': 7.23.3(@babel/core@7.22.10)
       '@babel/preset-typescript': 7.22.5(@babel/core@7.22.10)
       '@babel/runtime': 7.22.10
       babel-plugin-macros: 3.1.0
@@ -14375,10 +14707,6 @@ packages:
     resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
     dev: true
 
-  /big.js@6.2.1:
-    resolution: {integrity: sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ==}
-    dev: false
-
   /bignumber.js@9.1.2:
     resolution: {integrity: sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==}
     dev: false
@@ -14787,7 +15115,7 @@ packages:
       check-error: 1.0.3
       deep-eql: 4.1.3
       get-func-name: 2.0.2
-      loupe: 2.3.6
+      loupe: 2.3.7
       pathval: 1.1.1
       type-detect: 4.0.8
 
@@ -14864,10 +15192,11 @@ packages:
       normalize-path: 3.0.0
       readdirp: 3.6.0
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
 
   /chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
+    dev: true
 
   /chownr@2.0.0:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
@@ -15129,6 +15458,7 @@ packages:
     engines: {node: '>= 0.8'}
     dependencies:
       delayed-stream: 1.0.0
+    dev: true
 
   /commander@10.0.1:
     resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
@@ -15212,10 +15542,6 @@ packages:
   /compute-scroll-into-view@1.0.20:
     resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
 
-  /computeds@0.0.1:
-    resolution: {integrity: sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==}
-    dev: true
-
   /concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
@@ -15303,6 +15629,13 @@ packages:
     engines: {node: '>= 0.6'}
     dev: false
 
+  /copy-anything@3.0.5:
+    resolution: {integrity: sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==}
+    engines: {node: '>=12.13'}
+    dependencies:
+      is-what: 4.1.16
+    dev: false
+
   /copy-to-clipboard@3.3.3:
     resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}
     dependencies:
@@ -15489,13 +15822,13 @@ packages:
     engines: {node: '>=4'}
     dev: false
 
-  /css-declaration-sorter@6.4.0(postcss@8.4.24):
+  /css-declaration-sorter@6.4.0(postcss@8.4.32):
     resolution: {integrity: sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==}
     engines: {node: ^10 || ^12 || >=14}
     peerDependencies:
       postcss: ^8.0.9
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
     dev: true
 
   /css-has-pseudo@3.0.4(postcss@8.4.24):
@@ -15515,12 +15848,12 @@ packages:
     peerDependencies:
       webpack: ^5.0.0
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.24)
-      postcss: 8.4.24
-      postcss-modules-extract-imports: 3.0.0(postcss@8.4.24)
-      postcss-modules-local-by-default: 4.0.3(postcss@8.4.24)
-      postcss-modules-scope: 3.0.0(postcss@8.4.24)
-      postcss-modules-values: 4.0.0(postcss@8.4.24)
+      icss-utils: 5.1.0(postcss@8.4.32)
+      postcss: 8.4.32
+      postcss-modules-extract-imports: 3.0.0(postcss@8.4.32)
+      postcss-modules-local-by-default: 4.0.3(postcss@8.4.32)
+      postcss-modules-scope: 3.0.0(postcss@8.4.32)
+      postcss-modules-values: 4.0.0(postcss@8.4.32)
       postcss-value-parser: 4.2.0
       semver: 7.5.4
       webpack: 5.88.1(webpack-cli@5.1.4)
@@ -15545,9 +15878,9 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      cssnano: 5.1.15(postcss@8.4.24)
+      cssnano: 5.1.15(postcss@8.4.32)
       jest-worker: 27.5.1
-      postcss: 8.4.24
+      postcss: 8.4.32
       schema-utils: 4.2.0
       serialize-javascript: 6.0.1
       source-map: 0.6.1
@@ -15660,62 +15993,62 @@ packages:
     hasBin: true
     dev: true
 
-  /cssnano-preset-default@5.2.14(postcss@8.4.24):
+  /cssnano-preset-default@5.2.14(postcss@8.4.32):
     resolution: {integrity: sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      css-declaration-sorter: 6.4.0(postcss@8.4.24)
-      cssnano-utils: 3.1.0(postcss@8.4.24)
-      postcss: 8.4.24
-      postcss-calc: 8.2.4(postcss@8.4.24)
-      postcss-colormin: 5.3.1(postcss@8.4.24)
-      postcss-convert-values: 5.1.3(postcss@8.4.24)
-      postcss-discard-comments: 5.1.2(postcss@8.4.24)
-      postcss-discard-duplicates: 5.1.0(postcss@8.4.24)
-      postcss-discard-empty: 5.1.1(postcss@8.4.24)
-      postcss-discard-overridden: 5.1.0(postcss@8.4.24)
-      postcss-merge-longhand: 5.1.7(postcss@8.4.24)
-      postcss-merge-rules: 5.1.4(postcss@8.4.24)
-      postcss-minify-font-values: 5.1.0(postcss@8.4.24)
-      postcss-minify-gradients: 5.1.1(postcss@8.4.24)
-      postcss-minify-params: 5.1.4(postcss@8.4.24)
-      postcss-minify-selectors: 5.2.1(postcss@8.4.24)
-      postcss-normalize-charset: 5.1.0(postcss@8.4.24)
-      postcss-normalize-display-values: 5.1.0(postcss@8.4.24)
-      postcss-normalize-positions: 5.1.1(postcss@8.4.24)
-      postcss-normalize-repeat-style: 5.1.1(postcss@8.4.24)
-      postcss-normalize-string: 5.1.0(postcss@8.4.24)
-      postcss-normalize-timing-functions: 5.1.0(postcss@8.4.24)
-      postcss-normalize-unicode: 5.1.1(postcss@8.4.24)
-      postcss-normalize-url: 5.1.0(postcss@8.4.24)
-      postcss-normalize-whitespace: 5.1.1(postcss@8.4.24)
-      postcss-ordered-values: 5.1.3(postcss@8.4.24)
-      postcss-reduce-initial: 5.1.2(postcss@8.4.24)
-      postcss-reduce-transforms: 5.1.0(postcss@8.4.24)
-      postcss-svgo: 5.1.0(postcss@8.4.24)
-      postcss-unique-selectors: 5.1.1(postcss@8.4.24)
-    dev: true
-
-  /cssnano-utils@3.1.0(postcss@8.4.24):
+      css-declaration-sorter: 6.4.0(postcss@8.4.32)
+      cssnano-utils: 3.1.0(postcss@8.4.32)
+      postcss: 8.4.32
+      postcss-calc: 8.2.4(postcss@8.4.32)
+      postcss-colormin: 5.3.1(postcss@8.4.32)
+      postcss-convert-values: 5.1.3(postcss@8.4.32)
+      postcss-discard-comments: 5.1.2(postcss@8.4.32)
+      postcss-discard-duplicates: 5.1.0(postcss@8.4.32)
+      postcss-discard-empty: 5.1.1(postcss@8.4.32)
+      postcss-discard-overridden: 5.1.0(postcss@8.4.32)
+      postcss-merge-longhand: 5.1.7(postcss@8.4.32)
+      postcss-merge-rules: 5.1.4(postcss@8.4.32)
+      postcss-minify-font-values: 5.1.0(postcss@8.4.32)
+      postcss-minify-gradients: 5.1.1(postcss@8.4.32)
+      postcss-minify-params: 5.1.4(postcss@8.4.32)
+      postcss-minify-selectors: 5.2.1(postcss@8.4.32)
+      postcss-normalize-charset: 5.1.0(postcss@8.4.32)
+      postcss-normalize-display-values: 5.1.0(postcss@8.4.32)
+      postcss-normalize-positions: 5.1.1(postcss@8.4.32)
+      postcss-normalize-repeat-style: 5.1.1(postcss@8.4.32)
+      postcss-normalize-string: 5.1.0(postcss@8.4.32)
+      postcss-normalize-timing-functions: 5.1.0(postcss@8.4.32)
+      postcss-normalize-unicode: 5.1.1(postcss@8.4.32)
+      postcss-normalize-url: 5.1.0(postcss@8.4.32)
+      postcss-normalize-whitespace: 5.1.1(postcss@8.4.32)
+      postcss-ordered-values: 5.1.3(postcss@8.4.32)
+      postcss-reduce-initial: 5.1.2(postcss@8.4.32)
+      postcss-reduce-transforms: 5.1.0(postcss@8.4.32)
+      postcss-svgo: 5.1.0(postcss@8.4.32)
+      postcss-unique-selectors: 5.1.1(postcss@8.4.32)
+    dev: true
+
+  /cssnano-utils@3.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
     dev: true
 
-  /cssnano@5.1.15(postcss@8.4.24):
+  /cssnano@5.1.15(postcss@8.4.32):
     resolution: {integrity: sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      cssnano-preset-default: 5.2.14(postcss@8.4.24)
+      cssnano-preset-default: 5.2.14(postcss@8.4.32)
       lilconfig: 2.1.0
-      postcss: 8.4.24
+      postcss: 8.4.32
       yaml: 1.10.2
     dev: true
 
@@ -15748,12 +16081,6 @@ packages:
       cssom: 0.3.8
     dev: true
 
-  /cssstyle@3.0.0:
-    resolution: {integrity: sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==}
-    engines: {node: '>=14'}
-    dependencies:
-      rrweb-cssom: 0.6.0
-
   /csstype@3.1.2:
     resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
 
@@ -15792,14 +16119,6 @@ packages:
       whatwg-url: 8.7.0
     dev: true
 
-  /data-urls@4.0.0:
-    resolution: {integrity: sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==}
-    engines: {node: '>=14'}
-    dependencies:
-      abab: 2.0.6
-      whatwg-mimetype: 3.0.0
-      whatwg-url: 12.0.1
-
   /dataloader@2.2.2:
     resolution: {integrity: sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==}
 
@@ -15860,12 +16179,9 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /decimal.js-light@2.5.1:
-    resolution: {integrity: sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==}
-    dev: false
-
   /decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
+    dev: true
 
   /decode-named-character-reference@1.0.2:
     resolution: {integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==}
@@ -15877,13 +16193,6 @@ packages:
     resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
     engines: {node: '>=0.10'}
 
-  /decompress-response@6.0.0:
-    resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      mimic-response: 3.1.0
-    dev: false
-
   /dedent@0.7.0:
     resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
     dev: true
@@ -15917,11 +16226,6 @@ packages:
       which-typed-array: 1.1.11
     dev: true
 
-  /deep-extend@0.6.0:
-    resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
-    engines: {node: '>=4.0.0'}
-    dev: false
-
   /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
@@ -16014,6 +16318,7 @@ packages:
   /delayed-stream@1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
+    dev: true
 
   /delegates@1.0.0:
     resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
@@ -16130,8 +16435,8 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dev: true
 
-  /diff-sequences@29.4.3:
-    resolution: {integrity: sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==}
+  /diff-sequences@29.6.3:
+    resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
   /diff@4.0.2:
@@ -16244,12 +16549,6 @@ packages:
       webidl-conversions: 5.0.0
     dev: true
 
-  /domexception@4.0.0:
-    resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==}
-    engines: {node: '>=12'}
-    dependencies:
-      webidl-conversions: 7.0.0
-
   /domhandler@4.3.1:
     resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
     engines: {node: '>= 4'}
@@ -16727,6 +17026,7 @@ packages:
       '@esbuild/win32-arm64': 0.17.19
       '@esbuild/win32-ia32': 0.17.19
       '@esbuild/win32-x64': 0.17.19
+    dev: true
 
   /esbuild@0.18.20:
     resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==}
@@ -16788,6 +17088,35 @@ packages:
       '@esbuild/win32-x64': 0.19.2
     dev: true
 
+  /esbuild@0.19.8:
+    resolution: {integrity: sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/android-arm': 0.19.8
+      '@esbuild/android-arm64': 0.19.8
+      '@esbuild/android-x64': 0.19.8
+      '@esbuild/darwin-arm64': 0.19.8
+      '@esbuild/darwin-x64': 0.19.8
+      '@esbuild/freebsd-arm64': 0.19.8
+      '@esbuild/freebsd-x64': 0.19.8
+      '@esbuild/linux-arm': 0.19.8
+      '@esbuild/linux-arm64': 0.19.8
+      '@esbuild/linux-ia32': 0.19.8
+      '@esbuild/linux-loong64': 0.19.8
+      '@esbuild/linux-mips64el': 0.19.8
+      '@esbuild/linux-ppc64': 0.19.8
+      '@esbuild/linux-riscv64': 0.19.8
+      '@esbuild/linux-s390x': 0.19.8
+      '@esbuild/linux-x64': 0.19.8
+      '@esbuild/netbsd-x64': 0.19.8
+      '@esbuild/openbsd-x64': 0.19.8
+      '@esbuild/sunos-x64': 0.19.8
+      '@esbuild/win32-arm64': 0.19.8
+      '@esbuild/win32-ia32': 0.19.8
+      '@esbuild/win32-x64': 0.19.8
+
   /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
@@ -16885,7 +17214,7 @@ packages:
       eslint: 8.42.0
     dev: false
 
-  /eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.42.0)(jest@27.5.1)(typescript@5.1.3):
+  /eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.42.0)(jest@27.5.1)(typescript@5.1.3):
     resolution: {integrity: sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -16903,7 +17232,7 @@ packages:
       babel-preset-react-app: 10.0.1
       confusing-browser-globals: 1.0.11
       eslint: 8.42.0
-      eslint-plugin-flowtype: 8.0.3(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.42.0)
+      eslint-plugin-flowtype: 8.0.3(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.42.0)
       eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.59.11)(eslint@8.42.0)
       eslint-plugin-jest: 25.7.0(@typescript-eslint/eslint-plugin@5.59.11)(eslint@8.42.0)(jest@27.5.1)(typescript@5.1.3)
       eslint-plugin-jsx-a11y: 6.7.1(eslint@8.42.0)
@@ -17038,16 +17367,16 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-flowtype@8.0.3(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.42.0):
+  /eslint-plugin-flowtype@8.0.3(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.42.0):
     resolution: {integrity: sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       '@babel/plugin-syntax-flow': ^7.14.5
-      '@babel/plugin-transform-react-jsx': 7.22.15
+      '@babel/plugin-transform-react-jsx': 7.23.4
       eslint: ^8.1.0
     dependencies:
       '@babel/plugin-syntax-flow': 7.22.5(@babel/core@7.22.10)
-      '@babel/plugin-transform-react-jsx': 7.22.15(@babel/core@7.22.10)
+      '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.22.10)
       eslint: 8.42.0
       lodash: 4.17.21
       string-natural-compare: 3.0.1
@@ -17409,8 +17738,8 @@ packages:
     resolution: {integrity: sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.9.0
-      acorn-jsx: 5.3.2(acorn@8.9.0)
+      acorn: 8.11.2
+      acorn-jsx: 5.3.2(acorn@8.11.2)
       eslint-visitor-keys: 3.4.1
 
   /esprima@4.0.1:
@@ -17445,7 +17774,7 @@ packages:
     engines: {node: '>=8.3.0'}
     dependencies:
       '@babel/traverse': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       c8: 7.14.0
     transitivePeerDependencies:
       - supports-color
@@ -17462,7 +17791,6 @@ packages:
     resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
     dependencies:
       '@types/estree': 1.0.1
-    dev: true
 
   /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
@@ -17562,18 +17890,12 @@ packages:
       onetime: 6.0.0
       signal-exit: 4.1.0
       strip-final-newline: 3.0.0
-    dev: true
 
   /exit@0.1.2:
     resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /expand-template@2.0.3:
-    resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
-    engines: {node: '>=6'}
-    dev: false
-
   /expect@27.5.1:
     resolution: {integrity: sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -17584,17 +17906,6 @@ packages:
       jest-message-util: 27.5.1
     dev: true
 
-  /expect@29.5.0:
-    resolution: {integrity: sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/expect-utils': 29.5.0
-      jest-get-type: 29.4.3
-      jest-matcher-utils: 29.5.0
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
-    dev: true
-
   /exponential-backoff@3.1.1:
     resolution: {integrity: sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==}
     dev: true
@@ -17673,10 +17984,6 @@ packages:
     resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
     dev: false
 
-  /fast-fifo@1.3.0:
-    resolution: {integrity: sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw==}
-    dev: false
-
   /fast-glob@3.2.12:
     resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
     engines: {node: '>=8.6.0'}
@@ -17687,6 +17994,16 @@ packages:
       merge2: 1.4.1
       micromatch: 4.0.5
 
+  /fast-glob@3.3.2:
+    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
+    engines: {node: '>=8.6.0'}
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.5
+
   /fast-json-parse@1.0.3:
     resolution: {integrity: sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==}
     dev: true
@@ -17738,6 +18055,9 @@ packages:
     resolution: {integrity: sha512-3yurQZ2hD9VISAhJJP9bpYFNQrHHBXE2JxxjY5aLEcDi46RmAzJE2OC9FAde0yis5ElW0jTTzs0zfg/Cca4XqQ==}
     dev: true
 
+  /fflate@0.8.1:
+    resolution: {integrity: sha512-/exOvEuc+/iaUm105QIiOt4LpBdMTWsXxqR0HDF35vx3fmaKzw7354gTilCh5rkzEt8WYyG//ku3h3nRmd7CHQ==}
+
   /figures@3.2.0:
     resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
     engines: {node: '>=8'}
@@ -17880,7 +18200,7 @@ packages:
     resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
     engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
-      flatted: 3.2.7
+      flatted: 3.2.9
       rimraf: 3.0.2
 
   /flat@5.0.2:
@@ -17888,8 +18208,8 @@ packages:
     hasBin: true
     dev: true
 
-  /flatted@3.2.7:
-    resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
+  /flatted@3.2.9:
+    resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==}
 
   /flow-parser@0.209.0:
     resolution: {integrity: sha512-uD7Du+9xC/gGnOyk3kANQmtgWWKANWcKGJ84Wu0NSjTaVING3GqUAsywUPAl3fEYKLVVIcDWiaQ8+R6qzghwmA==}
@@ -18028,6 +18348,7 @@ packages:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       mime-types: 2.1.35
+    dev: true
 
   /forwarded@0.2.0:
     resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
@@ -18038,8 +18359,8 @@ packages:
     resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==}
     dev: true
 
-  /framer-motion@10.15.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-6avJj/Uftblw0fMmo6jDHkKRH4TBdkMX/FiyR3G/hFe3hQHE4BUNJCqlMPKg9EzfI5jyqDOwO5oDnU+bW5y0eg==}
+  /framer-motion@10.16.15(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-BapW1EKc/Sgph1rKEwL9bFt2B79z7bu7jN4Up1jGUaTE78WBsVO+6eCmoUZsQH0hHtRUDnnTqjjBbM7dk9Kp8A==}
     peerDependencies:
       react: ^18.0.0
       react-dom: ^18.0.0
@@ -18051,7 +18372,7 @@ packages:
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      tslib: 2.5.3
+      tslib: 2.6.2
     optionalDependencies:
       '@emotion/is-prop-valid': 0.8.8
 
@@ -18067,6 +18388,7 @@ packages:
 
   /fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+    dev: true
 
   /fs-extra@10.1.0:
     resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
@@ -18138,6 +18460,14 @@ packages:
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+    requiresBuild: true
     optional: true
 
   /function-bind@1.1.1:
@@ -18240,7 +18570,6 @@ packages:
   /get-stream@8.0.1:
     resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
     engines: {node: '>=16'}
-    dev: true
 
   /get-symbol-description@1.0.0:
     resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
@@ -18271,10 +18600,6 @@ packages:
       - supports-color
     dev: true
 
-  /github-from-package@0.0.0:
-    resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
-    dev: false
-
   /github-slugger@1.5.0:
     resolution: {integrity: sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw==}
     dev: true
@@ -18399,7 +18724,7 @@ packages:
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
-      fast-glob: 3.2.12
+      fast-glob: 3.3.2
       ignore: 5.2.4
       merge2: 1.4.1
       slash: 3.0.0
@@ -18472,6 +18797,16 @@ packages:
       uglify-js: 3.17.4
     dev: true
 
+  /happy-dom@12.10.3:
+    resolution: {integrity: sha512-JzUXOh0wdNGY54oKng5hliuBkq/+aT1V3YpTM+lrN/GoLQTANZsMaIvmHiHe612rauHvPJnDZkZ+5GZR++1Abg==}
+    dependencies:
+      css.escape: 1.5.1
+      entities: 4.5.0
+      iconv-lite: 0.6.3
+      webidl-conversions: 7.0.0
+      whatwg-encoding: 2.0.0
+      whatwg-mimetype: 3.0.0
+
   /happy-dom@12.2.0:
     resolution: {integrity: sha512-n9MwvjBUhkNplw74hTCTUOqR67JWgJllnVAgB8c7U+AI+EQp7PdUYFOOfrjEeOmEqsRPUT6lwwM7NjCj6vEZ4g==}
     dependencies:
@@ -18481,6 +18816,7 @@ packages:
       webidl-conversions: 7.0.0
       whatwg-encoding: 2.0.0
       whatwg-mimetype: 3.0.0
+    dev: true
 
   /hard-rejection@2.1.0:
     resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
@@ -18607,12 +18943,6 @@ packages:
       whatwg-encoding: 1.0.5
     dev: true
 
-  /html-encoding-sniffer@3.0.0:
-    resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
-    engines: {node: '>=12'}
-    dependencies:
-      whatwg-encoding: 2.0.0
-
   /html-entities@2.3.6:
     resolution: {integrity: sha512-9o0+dcpIw2/HxkNuYKxSJUF/MMRZQECK4GnF+oQOmJ83yCVHTWgCH5aOXxK5bozNRmM8wtgryjHD3uloPBDEGw==}
     dev: true
@@ -18715,6 +19045,7 @@ packages:
       debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /http-proxy-middleware@2.0.6(@types/express@4.17.17):
     resolution: {integrity: sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==}
@@ -18784,7 +19115,6 @@ packages:
   /human-signals@5.0.0:
     resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
     engines: {node: '>=16.17.0'}
-    dev: true
 
   /humanize-ms@1.2.1:
     resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
@@ -18810,13 +19140,13 @@ packages:
     dependencies:
       safer-buffer: 2.1.2
 
-  /icss-utils@5.1.0(postcss@8.4.24):
+  /icss-utils@5.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
     dev: true
 
   /idb@7.1.1:
@@ -18899,9 +19229,9 @@ packages:
     resolution: {integrity: sha512-NyShTiNhTh4Vy7kJUVe6CuvOaQAzzfSIT72wtp3CzGjz8bHjNj59DCAjncuviicmDOgVAgmLuSh1WMcLYAMWGg==}
     dependencies:
       '@babel/core': 7.22.5
-      '@babel/parser': 7.22.10
+      '@babel/parser': 7.23.5
       '@babel/traverse': 7.22.5(supports-color@5.5.0)
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       find-line-column: 0.5.2
     transitivePeerDependencies:
       - supports-color
@@ -18958,6 +19288,7 @@ packages:
 
   /ini@1.3.8:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+    dev: true
 
   /inquirer@8.2.5:
     resolution: {integrity: sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==}
@@ -19275,6 +19606,7 @@ packages:
 
   /is-potential-custom-element-name@1.0.1:
     resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+    dev: true
 
   /is-promise@4.0.0:
     resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
@@ -19381,6 +19713,11 @@ packages:
       get-intrinsic: 1.2.1
     dev: true
 
+  /is-what@4.1.16:
+    resolution: {integrity: sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==}
+    engines: {node: '>=12.13'}
+    dev: false
+
   /is-windows@1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
@@ -19419,28 +19756,33 @@ packages:
   /istanbul-lib-coverage@3.2.0:
     resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
     engines: {node: '>=8'}
+    dev: true
+
+  /istanbul-lib-coverage@3.2.2:
+    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
+    engines: {node: '>=8'}
 
   /istanbul-lib-instrument@5.2.1:
     resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
     engines: {node: '>=8'}
     dependencies:
       '@babel/core': 7.22.10
-      '@babel/parser': 7.22.10
+      '@babel/parser': 7.23.5
       '@istanbuljs/schema': 0.1.3
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /istanbul-lib-instrument@6.0.0:
-    resolution: {integrity: sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw==}
+  /istanbul-lib-instrument@6.0.1:
+    resolution: {integrity: sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==}
     engines: {node: '>=10'}
     dependencies:
       '@babel/core': 7.22.10
-      '@babel/parser': 7.22.10
+      '@babel/parser': 7.23.5
       '@istanbuljs/schema': 0.1.3
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
@@ -19450,7 +19792,7 @@ packages:
     resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
     engines: {node: '>=8'}
     dependencies:
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       make-dir: 3.1.0
       supports-color: 7.2.0
     dev: true
@@ -19459,7 +19801,7 @@ packages:
     resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
     engines: {node: '>=10'}
     dependencies:
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       make-dir: 4.0.0
       supports-color: 7.2.0
 
@@ -19468,7 +19810,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       debug: 4.3.4(supports-color@5.5.0)
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
       - supports-color
@@ -19479,6 +19821,14 @@ packages:
     dependencies:
       html-escaper: 2.0.2
       istanbul-lib-report: 3.0.1
+    dev: true
+
+  /istanbul-reports@3.1.6:
+    resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==}
+    engines: {node: '>=8'}
+    dependencies:
+      html-escaper: 2.0.2
+      istanbul-lib-report: 3.0.1
 
   /iterator.prototype@1.1.2:
     resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==}
@@ -19526,7 +19876,7 @@ packages:
       '@jest/environment': 27.5.1
       '@jest/test-result': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       chalk: 4.1.2
       co: 4.6.0
       dedent: 0.7.0
@@ -19609,7 +19959,7 @@ packages:
       pretty-format: 27.5.1
       slash: 3.0.0
       strip-json-comments: 3.1.1
-      ts-node: 10.9.1(@types/node@20.8.10)(typescript@5.1.3)
+      ts-node: 10.9.1(@types/node@20.10.4)(typescript@5.1.3)
     transitivePeerDependencies:
       - bufferutil
       - canvas
@@ -19632,9 +19982,9 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
-      diff-sequences: 29.4.3
+      diff-sequences: 29.6.3
       jest-get-type: 29.4.3
-      pretty-format: 29.5.0
+      pretty-format: 29.7.0
     dev: true
 
   /jest-docblock@27.5.1:
@@ -19662,7 +20012,7 @@ packages:
       '@jest/environment': 27.5.1
       '@jest/fake-timers': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       jest-mock: 27.5.1
       jest-util: 27.5.1
       jsdom: 16.7.0
@@ -19680,7 +20030,7 @@ packages:
       '@jest/environment': 27.5.1
       '@jest/fake-timers': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       jest-mock: 27.5.1
       jest-util: 27.5.1
     dev: true
@@ -19701,7 +20051,7 @@ packages:
     dependencies:
       '@jest/types': 27.5.1
       '@types/graceful-fs': 4.1.6
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -19712,7 +20062,7 @@ packages:
       micromatch: 4.0.5
       walker: 1.0.8
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     dev: true
 
   /jest-haste-map@29.5.0:
@@ -19721,7 +20071,7 @@ packages:
     dependencies:
       '@jest/types': 29.5.0
       '@types/graceful-fs': 4.1.6
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -19731,7 +20081,7 @@ packages:
       micromatch: 4.0.5
       walker: 1.0.8
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     dev: true
 
   /jest-jasmine2@27.5.1:
@@ -19742,7 +20092,7 @@ packages:
       '@jest/source-map': 27.5.1
       '@jest/test-result': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       chalk: 4.1.2
       co: 4.6.0
       expect: 27.5.1
@@ -19777,16 +20127,6 @@ packages:
       pretty-format: 27.5.1
     dev: true
 
-  /jest-matcher-utils@29.5.0:
-    resolution: {integrity: sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      chalk: 4.1.2
-      jest-diff: 29.5.0
-      jest-get-type: 29.4.3
-      pretty-format: 29.5.0
-    dev: true
-
   /jest-message-util@27.5.1:
     resolution: {integrity: sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -19817,27 +20157,12 @@ packages:
       stack-utils: 2.0.6
     dev: true
 
-  /jest-message-util@29.5.0:
-    resolution: {integrity: sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@babel/code-frame': 7.22.10
-      '@jest/types': 29.5.0
-      '@types/stack-utils': 2.0.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      micromatch: 4.0.5
-      pretty-format: 29.5.0
-      slash: 3.0.0
-      stack-utils: 2.0.6
-    dev: true
-
   /jest-mock@27.5.1:
     resolution: {integrity: sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
     dev: true
 
   /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1):
@@ -19903,7 +20228,7 @@ packages:
       '@jest/test-result': 27.5.1
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       chalk: 4.1.2
       emittery: 0.8.1
       graceful-fs: 4.2.11
@@ -19960,7 +20285,7 @@ packages:
     resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       graceful-fs: 4.2.11
     dev: true
 
@@ -19972,7 +20297,7 @@ packages:
       '@babel/generator': 7.22.10
       '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.10)
       '@babel/traverse': 7.22.10
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.5
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
       '@types/babel__traverse': 7.20.1
@@ -19999,7 +20324,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       chalk: 4.1.2
       ci-info: 3.8.0
       graceful-fs: 4.2.11
@@ -20011,7 +20336,7 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
       '@jest/types': 28.1.3
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       chalk: 4.1.2
       ci-info: 3.8.0
       graceful-fs: 4.2.11
@@ -20023,7 +20348,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.5.0
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       chalk: 4.1.2
       ci-info: 3.8.0
       graceful-fs: 4.2.11
@@ -20064,7 +20389,7 @@ packages:
     dependencies:
       '@jest/test-result': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       jest-util: 27.5.1
@@ -20077,7 +20402,7 @@ packages:
     dependencies:
       '@jest/test-result': 28.1.3
       '@jest/types': 28.1.3
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.10.2
@@ -20089,7 +20414,7 @@ packages:
     resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       merge-stream: 2.0.0
       supports-color: 7.2.0
     dev: true
@@ -20098,7 +20423,7 @@ packages:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
@@ -20107,7 +20432,7 @@ packages:
     resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
@@ -20116,7 +20441,7 @@ packages:
     resolution: {integrity: sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       jest-util: 29.5.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
@@ -20195,10 +20520,6 @@ packages:
     dependencies:
       argparse: 2.0.1
 
-  /jsbi@4.3.0:
-    resolution: {integrity: sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==}
-    dev: false
-
   /jscodeshift@0.14.0(@babel/preset-env@7.22.10):
     resolution: {integrity: sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==}
     hasBin: true
@@ -20206,7 +20527,7 @@ packages:
       '@babel/preset-env': ^7.1.6
     dependencies:
       '@babel/core': 7.22.10
-      '@babel/parser': 7.22.10
+      '@babel/parser': 7.23.5
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.22.10)
       '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.22.10)
       '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.22.10)
@@ -20239,7 +20560,7 @@ packages:
         optional: true
     dependencies:
       abab: 2.0.6
-      acorn: 8.9.0
+      acorn: 8.11.2
       acorn-globals: 6.0.0
       cssom: 0.4.4
       cssstyle: 2.3.0
@@ -20271,43 +20592,6 @@ packages:
       - utf-8-validate
     dev: true
 
-  /jsdom@22.1.0:
-    resolution: {integrity: sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==}
-    engines: {node: '>=16'}
-    peerDependencies:
-      canvas: ^2.5.0
-    peerDependenciesMeta:
-      canvas:
-        optional: true
-    dependencies:
-      abab: 2.0.6
-      cssstyle: 3.0.0
-      data-urls: 4.0.0
-      decimal.js: 10.4.3
-      domexception: 4.0.0
-      form-data: 4.0.0
-      html-encoding-sniffer: 3.0.0
-      http-proxy-agent: 5.0.0
-      https-proxy-agent: 5.0.1
-      is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.5
-      parse5: 7.1.2
-      rrweb-cssom: 0.6.0
-      saxes: 6.0.0
-      symbol-tree: 3.2.4
-      tough-cookie: 4.1.3
-      w3c-xmlserializer: 4.0.0
-      webidl-conversions: 7.0.0
-      whatwg-encoding: 2.0.0
-      whatwg-mimetype: 3.0.0
-      whatwg-url: 12.0.1
-      ws: 8.13.0
-      xml-name-validator: 4.0.0
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-
   /jsesc@0.5.0:
     resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
     hasBin: true
@@ -20580,9 +20864,12 @@ packages:
     engines: {node: '>= 12.13.0'}
     dev: true
 
-  /local-pkg@0.4.3:
-    resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
+  /local-pkg@0.5.0:
+    resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
     engines: {node: '>=14'}
+    dependencies:
+      mlly: 1.4.2
+      pkg-types: 1.0.3
 
   /localforage@1.10.0:
     resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}
@@ -20707,8 +20994,8 @@ packages:
     resolution: {integrity: sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg==}
     dev: false
 
-  /loupe@2.3.6:
-    resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==}
+  /loupe@2.3.7:
+    resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
     dependencies:
       get-func-name: 2.0.2
 
@@ -20778,6 +21065,20 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
+    dev: true
+
+  /magic-string@0.30.5:
+    resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.4.15
+
+  /magicast@0.3.2:
+    resolution: {integrity: sha512-Fjwkl6a0syt9TFN0JSYpOybxiMCkYNEeOTnOTNRbjphirLakznZXAqrXgj/7GG3D1dvETONNwrBfinvAbpunDg==}
+    dependencies:
+      '@babel/parser': 7.23.5
+      '@babel/types': 7.23.5
+      source-map-js: 1.0.2
 
   /make-dir@2.1.0:
     resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
@@ -21330,12 +21631,14 @@ packages:
   /mime-db@1.52.0:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
+    dev: true
 
   /mime-types@2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
     dependencies:
       mime-db: 1.52.0
+    dev: true
 
   /mime@1.6.0:
     resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
@@ -21357,11 +21660,6 @@ packages:
     resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
     engines: {node: '>=12'}
 
-  /mimic-response@3.1.0:
-    resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
-    engines: {node: '>=10'}
-    dev: false
-
   /min-indent@1.0.1:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
@@ -21407,13 +21705,6 @@ packages:
       brace-expansion: 2.0.1
     dev: true
 
-  /minimatch@9.0.3:
-    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    dependencies:
-      brace-expansion: 2.0.1
-    dev: true
-
   /minimist-options@4.1.0:
     resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
     engines: {node: '>= 6'}
@@ -21492,6 +21783,7 @@ packages:
 
   /mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
+    dev: true
 
   /mkdirp@0.5.6:
     resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
@@ -21505,13 +21797,13 @@ packages:
     hasBin: true
     dev: true
 
-  /mlly@1.4.0:
-    resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==}
+  /mlly@1.4.2:
+    resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==}
     dependencies:
-      acorn: 8.9.0
+      acorn: 8.11.2
       pathe: 1.1.1
       pkg-types: 1.0.3
-      ufo: 1.1.2
+      ufo: 1.3.2
 
   /mri@1.2.0:
     resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
@@ -21521,7 +21813,6 @@ packages:
   /mrmime@1.0.1:
     resolution: {integrity: sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==}
     engines: {node: '>=10'}
-    dev: true
 
   /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
@@ -21600,16 +21891,17 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  /nanoid@3.3.7:
+    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
   /nanoid@5.0.1:
     resolution: {integrity: sha512-vWeVtV5Cw68aML/QaZvqN/3QQXc6fBfIieAlu05m7FZW2Dgb+3f0xc0TTxuJW+7u30t7iSDTV/j3kVI0oJqIfQ==}
     engines: {node: ^18 || >=20}
     hasBin: true
     dev: false
 
-  /napi-build-utils@1.0.2:
-    resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
-    dev: false
-
   /natural-compare-lite@1.4.0:
     resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
     dev: true
@@ -21691,21 +21983,10 @@ packages:
       tslib: 2.6.2
     dev: true
 
-  /node-abi@3.45.0:
-    resolution: {integrity: sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      semver: 7.5.4
-    dev: false
-
   /node-abort-controller@3.1.1:
     resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==}
     dev: true
 
-  /node-addon-api@6.1.0:
-    resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==}
-    dev: false
-
   /node-dir@0.1.17:
     resolution: {integrity: sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==}
     engines: {node: '>= 0.10.5'}
@@ -21881,6 +22162,7 @@ packages:
 
   /nwsapi@2.2.5:
     resolution: {integrity: sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==}
+    dev: true
 
   /nx@17.1.1:
     resolution: {integrity: sha512-anOPutP3N5sI+yT1+UV24XuFkBFnQAERysSGcMu7ZofyIThzKxT26QtHI3U/Oqqtuug0cNxold2UhTvEhSXBwA==}
@@ -22174,9 +22456,9 @@ packages:
     dependencies:
       yocto-queue: 0.1.0
 
-  /p-limit@4.0.0:
-    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  /p-limit@5.0.0:
+    resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==}
+    engines: {node: '>=18'}
     dependencies:
       yocto-queue: 1.0.0
 
@@ -22280,11 +22562,6 @@ packages:
     resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
     dev: true
 
-  /parse5@7.1.2:
-    resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
-    dependencies:
-      entities: 4.5.0
-
   /parseurl@1.3.3:
     resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
     engines: {node: '>= 0.8'}
@@ -22490,7 +22767,7 @@ packages:
     resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==}
     dependencies:
       jsonc-parser: 3.2.0
-      mlly: 1.4.0
+      mlly: 1.4.2
       pathe: 1.1.1
 
   /pkg-up@3.1.0:
@@ -22552,12 +22829,12 @@ packages:
       postcss: 8.4.24
     dev: true
 
-  /postcss-calc@8.2.4(postcss@8.4.24):
+  /postcss-calc@8.2.4(postcss@8.4.32):
     resolution: {integrity: sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==}
     peerDependencies:
       postcss: ^8.2.2
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
       postcss-value-parser: 4.2.0
     dev: true
@@ -22602,7 +22879,7 @@ packages:
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-colormin@5.3.1(postcss@8.4.24):
+  /postcss-colormin@5.3.1(postcss@8.4.32):
     resolution: {integrity: sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
@@ -22611,18 +22888,18 @@ packages:
       browserslist: 4.21.9
       caniuse-api: 3.0.0
       colord: 2.9.3
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-convert-values@5.1.3(postcss@8.4.24):
+  /postcss-convert-values@5.1.3(postcss@8.4.32):
     resolution: {integrity: sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.9
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -22666,40 +22943,40 @@ packages:
       postcss-selector-parser: 6.0.13
     dev: true
 
-  /postcss-discard-comments@5.1.2(postcss@8.4.24):
+  /postcss-discard-comments@5.1.2(postcss@8.4.32):
     resolution: {integrity: sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
     dev: true
 
-  /postcss-discard-duplicates@5.1.0(postcss@8.4.24):
+  /postcss-discard-duplicates@5.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
     dev: true
 
-  /postcss-discard-empty@5.1.1(postcss@8.4.24):
+  /postcss-discard-empty@5.1.1(postcss@8.4.32):
     resolution: {integrity: sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
     dev: true
 
-  /postcss-discard-overridden@5.1.0(postcss@8.4.24):
+  /postcss-discard-overridden@5.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
     dev: true
 
   /postcss-double-position-gradients@3.1.2(postcss@8.4.24):
@@ -22833,7 +23110,7 @@ packages:
     dependencies:
       lilconfig: 2.1.0
       postcss: 8.4.24
-      ts-node: 10.9.1(@types/node@20.8.10)(typescript@5.1.3)
+      ts-node: 10.9.1(@types/node@20.10.4)(typescript@5.1.3)
       yaml: 2.3.3
     dev: true
 
@@ -22883,18 +23160,18 @@ packages:
       postcss: 8.4.24
     dev: true
 
-  /postcss-merge-longhand@5.1.7(postcss@8.4.24):
+  /postcss-merge-longhand@5.1.7(postcss@8.4.32):
     resolution: {integrity: sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
-      stylehacks: 5.1.1(postcss@8.4.24)
+      stylehacks: 5.1.1(postcss@8.4.32)
     dev: true
 
-  /postcss-merge-rules@5.1.4(postcss@8.4.24):
+  /postcss-merge-rules@5.1.4(postcss@8.4.32):
     resolution: {integrity: sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
@@ -22902,94 +23179,94 @@ packages:
     dependencies:
       browserslist: 4.21.9
       caniuse-api: 3.0.0
-      cssnano-utils: 3.1.0(postcss@8.4.24)
-      postcss: 8.4.24
+      cssnano-utils: 3.1.0(postcss@8.4.32)
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
     dev: true
 
-  /postcss-minify-font-values@5.1.0(postcss@8.4.24):
+  /postcss-minify-font-values@5.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-minify-gradients@5.1.1(postcss@8.4.24):
+  /postcss-minify-gradients@5.1.1(postcss@8.4.32):
     resolution: {integrity: sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       colord: 2.9.3
-      cssnano-utils: 3.1.0(postcss@8.4.24)
-      postcss: 8.4.24
+      cssnano-utils: 3.1.0(postcss@8.4.32)
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-minify-params@5.1.4(postcss@8.4.24):
+  /postcss-minify-params@5.1.4(postcss@8.4.32):
     resolution: {integrity: sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.9
-      cssnano-utils: 3.1.0(postcss@8.4.24)
-      postcss: 8.4.24
+      cssnano-utils: 3.1.0(postcss@8.4.32)
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-minify-selectors@5.2.1(postcss@8.4.24):
+  /postcss-minify-selectors@5.2.1(postcss@8.4.32):
     resolution: {integrity: sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
     dev: true
 
-  /postcss-modules-extract-imports@3.0.0(postcss@8.4.24):
+  /postcss-modules-extract-imports@3.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
     dev: true
 
-  /postcss-modules-local-by-default@4.0.3(postcss@8.4.24):
+  /postcss-modules-local-by-default@4.0.3(postcss@8.4.32):
     resolution: {integrity: sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.24)
-      postcss: 8.4.24
+      icss-utils: 5.1.0(postcss@8.4.32)
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-modules-scope@3.0.0(postcss@8.4.24):
+  /postcss-modules-scope@3.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
     dev: true
 
-  /postcss-modules-values@4.0.0(postcss@8.4.24):
+  /postcss-modules-values@4.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.24)
-      postcss: 8.4.24
+      icss-utils: 5.1.0(postcss@8.4.32)
+      postcss: 8.4.32
     dev: true
 
   /postcss-nested@6.0.1(postcss@8.4.24):
@@ -23013,94 +23290,94 @@ packages:
       postcss-selector-parser: 6.0.13
     dev: true
 
-  /postcss-normalize-charset@5.1.0(postcss@8.4.24):
+  /postcss-normalize-charset@5.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
     dev: true
 
-  /postcss-normalize-display-values@5.1.0(postcss@8.4.24):
+  /postcss-normalize-display-values@5.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-positions@5.1.1(postcss@8.4.24):
+  /postcss-normalize-positions@5.1.1(postcss@8.4.32):
     resolution: {integrity: sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-repeat-style@5.1.1(postcss@8.4.24):
+  /postcss-normalize-repeat-style@5.1.1(postcss@8.4.32):
     resolution: {integrity: sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-string@5.1.0(postcss@8.4.24):
+  /postcss-normalize-string@5.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-timing-functions@5.1.0(postcss@8.4.24):
+  /postcss-normalize-timing-functions@5.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-unicode@5.1.1(postcss@8.4.24):
+  /postcss-normalize-unicode@5.1.1(postcss@8.4.32):
     resolution: {integrity: sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.9
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-url@5.1.0(postcss@8.4.24):
+  /postcss-normalize-url@5.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       normalize-url: 6.1.0
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-whitespace@5.1.1(postcss@8.4.24):
+  /postcss-normalize-whitespace@5.1.1(postcss@8.4.32):
     resolution: {integrity: sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -23127,14 +23404,14 @@ packages:
       postcss: 8.4.24
     dev: true
 
-  /postcss-ordered-values@5.1.3(postcss@8.4.24):
+  /postcss-ordered-values@5.1.3(postcss@8.4.32):
     resolution: {integrity: sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      cssnano-utils: 3.1.0(postcss@8.4.24)
-      postcss: 8.4.24
+      cssnano-utils: 3.1.0(postcss@8.4.32)
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -23234,7 +23511,7 @@ packages:
       postcss-selector-parser: 6.0.13
     dev: true
 
-  /postcss-reduce-initial@5.1.2(postcss@8.4.24):
+  /postcss-reduce-initial@5.1.2(postcss@8.4.32):
     resolution: {integrity: sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
@@ -23242,16 +23519,16 @@ packages:
     dependencies:
       browserslist: 4.21.9
       caniuse-api: 3.0.0
-      postcss: 8.4.24
+      postcss: 8.4.32
     dev: true
 
-  /postcss-reduce-transforms@5.1.0(postcss@8.4.24):
+  /postcss-reduce-transforms@5.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -23281,24 +23558,24 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /postcss-svgo@5.1.0(postcss@8.4.24):
+  /postcss-svgo@5.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
       svgo: 2.8.0
     dev: true
 
-  /postcss-unique-selectors@5.1.1(postcss@8.4.24):
+  /postcss-unique-selectors@5.1.1(postcss@8.4.32):
     resolution: {integrity: sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
     dev: true
 
@@ -23328,25 +23605,15 @@ packages:
       nanoid: 3.3.6
       picocolors: 1.0.0
       source-map-js: 1.0.2
+    dev: true
 
-  /prebuild-install@7.1.1:
-    resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==}
-    engines: {node: '>=10'}
-    hasBin: true
+  /postcss@8.4.32:
+    resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==}
+    engines: {node: ^10 || ^12 || >=14}
     dependencies:
-      detect-libc: 2.0.2
-      expand-template: 2.0.3
-      github-from-package: 0.0.0
-      minimist: 1.2.8
-      mkdirp-classic: 0.5.3
-      napi-build-utils: 1.0.2
-      node-abi: 3.45.0
-      pump: 3.0.0
-      rc: 1.2.8
-      simple-get: 4.0.1
-      tar-fs: 2.1.1
-      tunnel-agent: 0.6.0
-    dev: false
+      nanoid: 3.3.7
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
 
   /preferred-pm@3.0.3:
     resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==}
@@ -23432,11 +23699,11 @@ packages:
       react-is: 18.2.0
     dev: true
 
-  /pretty-format@29.5.0:
-    resolution: {integrity: sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==}
+  /pretty-format@29.7.0:
+    resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/schemas': 29.4.3
+      '@jest/schemas': 29.6.3
       ansi-styles: 5.2.0
       react-is: 18.2.0
 
@@ -23511,6 +23778,7 @@ packages:
 
   /psl@1.9.0:
     resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
+    dev: true
 
   /public-encrypt@4.0.3:
     resolution: {integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==}
@@ -23535,6 +23803,7 @@ packages:
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
+    dev: true
 
   /pumpify@1.5.1:
     resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}
@@ -23617,14 +23886,11 @@ packages:
 
   /querystringify@2.2.0:
     resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
+    dev: true
 
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
-  /queue-tick@1.0.1:
-    resolution: {integrity: sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==}
-    dev: false
-
   /queue@6.0.2:
     resolution: {integrity: sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==}
     dependencies:
@@ -23688,16 +23954,6 @@ packages:
       webpack: 5.88.1(webpack-cli@5.1.4)
     dev: true
 
-  /rc@1.2.8:
-    resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
-    hasBin: true
-    dependencies:
-      deep-extend: 0.6.0
-      ini: 1.3.8
-      minimist: 1.2.8
-      strip-json-comments: 2.0.1
-    dev: false
-
   /react-app-polyfill@3.0.0:
     resolution: {integrity: sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w==}
     engines: {node: '>=14'}
@@ -23991,7 +24247,7 @@ packages:
       react: 18.2.0
     dev: false
 
-  /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.42.0)(react@18.2.0)(ts-node@10.9.1)(typescript@5.1.3):
+  /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.42.0)(react@18.2.0)(ts-node@10.9.1)(typescript@5.1.3):
     resolution: {integrity: sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==}
     engines: {node: '>=14.0.0'}
     hasBin: true
@@ -24019,7 +24275,7 @@ packages:
       dotenv: 10.0.0
       dotenv-expand: 5.1.0
       eslint: 8.42.0
-      eslint-config-react-app: 7.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.42.0)(jest@27.5.1)(typescript@5.1.3)
+      eslint-config-react-app: 7.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.42.0)(jest@27.5.1)(typescript@5.1.3)
       eslint-webpack-plugin: 3.2.0(eslint@8.42.0)(webpack@5.88.1)
       file-loader: 6.2.0(webpack@5.88.1)
       fs-extra: 10.1.0
@@ -24053,7 +24309,7 @@ packages:
       webpack-manifest-plugin: 4.1.1(webpack@5.88.1)
       workbox-webpack-plugin: 6.6.0(webpack@5.88.1)
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     transitivePeerDependencies:
       - '@babel/plugin-syntax-flow'
       - '@babel/plugin-transform-react-jsx'
@@ -24438,6 +24694,7 @@ packages:
 
   /requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+    dev: true
 
   /resize-observer-polyfill@1.5.1:
     resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}
@@ -24494,7 +24751,7 @@ packages:
       adjust-sourcemap-loader: 4.0.0
       convert-source-map: 1.9.0
       loader-utils: 2.0.4
-      postcss: 8.4.24
+      postcss: 8.4.32
       source-map: 0.6.1
     dev: true
 
@@ -24629,25 +24886,35 @@ packages:
     engines: {node: '>=10.0.0'}
     hasBin: true
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
+    dev: false
 
   /rollup@2.79.1:
     resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==}
     engines: {node: '>=10.0.0'}
     hasBin: true
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     dev: true
 
-  /rollup@3.25.1:
-    resolution: {integrity: sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
+  /rollup@4.6.1:
+    resolution: {integrity: sha512-jZHaZotEHQaHLgKr8JnQiDT1rmatjgKlMekyksz+yk9jt/8z9quNjnKNRoaM0wd9DC2QKXjmWWuDYtM3jfF8pQ==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
-      fsevents: 2.3.2
-
-  /rrweb-cssom@0.6.0:
-    resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==}
+      '@rollup/rollup-android-arm-eabi': 4.6.1
+      '@rollup/rollup-android-arm64': 4.6.1
+      '@rollup/rollup-darwin-arm64': 4.6.1
+      '@rollup/rollup-darwin-x64': 4.6.1
+      '@rollup/rollup-linux-arm-gnueabihf': 4.6.1
+      '@rollup/rollup-linux-arm64-gnu': 4.6.1
+      '@rollup/rollup-linux-arm64-musl': 4.6.1
+      '@rollup/rollup-linux-x64-gnu': 4.6.1
+      '@rollup/rollup-linux-x64-musl': 4.6.1
+      '@rollup/rollup-win32-arm64-msvc': 4.6.1
+      '@rollup/rollup-win32-ia32-msvc': 4.6.1
+      '@rollup/rollup-win32-x64-msvc': 4.6.1
+      fsevents: 2.3.3
 
   /run-applescript@5.0.0:
     resolution: {integrity: sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==}
@@ -24759,12 +25026,6 @@ packages:
       xmlchars: 2.2.0
     dev: true
 
-  /saxes@6.0.0:
-    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
-    engines: {node: '>=v12.22.7'}
-    dependencies:
-      xmlchars: 2.2.0
-
   /scheduler@0.23.0:
     resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==}
     dependencies:
@@ -24961,19 +25222,34 @@ packages:
     resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==}
     dev: false
 
-  /sharp@0.32.4:
-    resolution: {integrity: sha512-exUnZewqVZC6UXqXuQ8fyJJv0M968feBi04jb9GcUHrWtkRoAKnbJt8IfwT4NJs7FskArbJ14JAFGVuooszoGg==}
-    engines: {node: '>=14.15.0'}
+  /sharp@0.33.0:
+    resolution: {integrity: sha512-99DZKudjm/Rmz+M0/26t4DKpXyywAOJaayGS9boEn7FvgtG0RYBi46uPE2c+obcJRtA3AZa0QwJot63gJQ1F0Q==}
+    engines: {libvips: '>=8.15.0', node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     requiresBuild: true
     dependencies:
       color: 4.2.3
       detect-libc: 2.0.2
-      node-addon-api: 6.1.0
-      prebuild-install: 7.1.1
       semver: 7.5.4
-      simple-get: 4.0.1
-      tar-fs: 3.0.4
-      tunnel-agent: 0.6.0
+    optionalDependencies:
+      '@img/sharp-darwin-arm64': 0.33.0
+      '@img/sharp-darwin-x64': 0.33.0
+      '@img/sharp-libvips-darwin-arm64': 1.0.0
+      '@img/sharp-libvips-darwin-x64': 1.0.0
+      '@img/sharp-libvips-linux-arm': 1.0.0
+      '@img/sharp-libvips-linux-arm64': 1.0.0
+      '@img/sharp-libvips-linux-s390x': 1.0.0
+      '@img/sharp-libvips-linux-x64': 1.0.0
+      '@img/sharp-libvips-linuxmusl-arm64': 1.0.0
+      '@img/sharp-libvips-linuxmusl-x64': 1.0.0
+      '@img/sharp-linux-arm': 0.33.0
+      '@img/sharp-linux-arm64': 0.33.0
+      '@img/sharp-linux-s390x': 0.33.0
+      '@img/sharp-linux-x64': 0.33.0
+      '@img/sharp-linuxmusl-arm64': 0.33.0
+      '@img/sharp-linuxmusl-x64': 0.33.0
+      '@img/sharp-wasm32': 0.33.0
+      '@img/sharp-win32-ia32': 0.33.0
+      '@img/sharp-win32-x64': 0.33.0
     dev: false
 
   /shebang-command@1.2.0:
@@ -25019,19 +25295,6 @@ packages:
   /signal-exit@4.1.0:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
-    dev: true
-
-  /simple-concat@1.0.1:
-    resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
-    dev: false
-
-  /simple-get@4.0.1:
-    resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
-    dependencies:
-      decompress-response: 6.0.0
-      once: 1.4.0
-      simple-concat: 1.0.1
-    dev: false
 
   /simple-swizzle@0.2.2:
     resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
@@ -25055,6 +25318,14 @@ packages:
       totalist: 1.1.0
     dev: true
 
+  /sirv@2.0.3:
+    resolution: {integrity: sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==}
+    engines: {node: '>= 10'}
+    dependencies:
+      '@polka/url': 1.0.0-next.21
+      mrmime: 1.0.1
+      totalist: 3.0.1
+
   /sisteransi@1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
     dev: true
@@ -25361,8 +25632,8 @@ packages:
     transitivePeerDependencies:
       - encoding
 
-  /starknetkit@1.0.21(starknet@5.24.3):
-    resolution: {integrity: sha512-gtc0XfNCsfXNq9D7Z0i4L2ruR/SavtG9kY5haFxZwbswT6RyBNXHtyU9eftPPHVGKxvjQAS1fu/Aj+HTXxg+1g==}
+  /starknetkit@1.0.22(starknet@5.24.3):
+    resolution: {integrity: sha512-UnUKXKhmjpDIR2DvTyAuaoAftpL7/LNCJ/p1LL3eXtXQSxsOqI7i5zkiB//wW3EdM+lziA5ZPWbKYkMndq0yuA==}
     peerDependencies:
       starknet: ^5.18.0
     dependencies:
@@ -25397,6 +25668,10 @@ packages:
 
   /std-env@3.3.3:
     resolution: {integrity: sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==}
+    dev: true
+
+  /std-env@3.6.0:
+    resolution: {integrity: sha512-aFZ19IgVmhdB2uX599ve2kE6BIE3YMnQ6Gp6BURhW/oIzpXGKr878TQfAQZn1+i0Flcc/UKUy1gOlcfaUBCryg==}
 
   /stop-iteration-iterator@1.0.0:
     resolution: {integrity: sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==}
@@ -25469,13 +25744,6 @@ packages:
     resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
     engines: {node: '>=10.0.0'}
 
-  /streamx@2.15.0:
-    resolution: {integrity: sha512-HcxY6ncGjjklGs1xsP1aR71INYcsXFJet5CU1CHqihQ2J5nOsbd4OjgjHO42w/4QNv9gZb3BueV+Vxok5pLEXg==}
-    dependencies:
-      fast-fifo: 1.3.0
-      queue-tick: 1.0.1
-    dev: false
-
   /strict-event-emitter@0.2.8:
     resolution: {integrity: sha512-KDf/ujU8Zud3YaLtMCcTI4xkZlZVIYxTLr+XIULexP+77EEVWixeXroLUXQXiVtH4XH2W7jr/3PT1v3zBuvc3A==}
     dependencies:
@@ -25633,19 +25901,14 @@ packages:
       min-indent: 1.0.1
     dev: true
 
-  /strip-json-comments@2.0.1:
-    resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
   /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
 
-  /strip-literal@1.0.1:
-    resolution: {integrity: sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==}
+  /strip-literal@1.3.0:
+    resolution: {integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==}
     dependencies:
-      acorn: 8.9.0
+      acorn: 8.11.2
 
   /strong-log-transformer@2.1.0:
     resolution: {integrity: sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==}
@@ -25739,14 +26002,14 @@ packages:
       styled-components: 5.3.11(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)
     dev: false
 
-  /stylehacks@5.1.1(postcss@8.4.24):
+  /stylehacks@5.1.1(postcss@8.4.32):
     resolution: {integrity: sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.9
-      postcss: 8.4.24
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
     dev: true
 
@@ -25767,6 +26030,13 @@ packages:
       ts-interface-checker: 0.1.13
     dev: true
 
+  /superjson@2.2.1:
+    resolution: {integrity: sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==}
+    engines: {node: '>=16'}
+    dependencies:
+      copy-anything: 3.0.5
+    dev: false
+
   /supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
     engines: {node: '>=4'}
@@ -25990,6 +26260,7 @@ packages:
 
   /symbol-tree@3.2.4:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
+    dev: true
 
   /synchronous-promise@2.0.17:
     resolution: {integrity: sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g==}
@@ -26051,14 +26322,7 @@ packages:
       mkdirp-classic: 0.5.3
       pump: 3.0.0
       tar-stream: 2.2.0
-
-  /tar-fs@3.0.4:
-    resolution: {integrity: sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==}
-    dependencies:
-      mkdirp-classic: 0.5.3
-      pump: 3.0.0
-      tar-stream: 3.1.6
-    dev: false
+    dev: true
 
   /tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
@@ -26069,14 +26333,7 @@ packages:
       fs-constants: 1.0.0
       inherits: 2.0.4
       readable-stream: 3.6.2
-
-  /tar-stream@3.1.6:
-    resolution: {integrity: sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==}
-    dependencies:
-      b4a: 1.6.4
-      fast-fifo: 1.3.0
-      streamx: 2.15.0
-    dev: false
+    dev: true
 
   /tar@6.1.15:
     resolution: {integrity: sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==}
@@ -26224,7 +26481,7 @@ packages:
     hasBin: true
     dependencies:
       '@jridgewell/source-map': 0.3.3
-      acorn: 8.9.0
+      acorn: 8.11.2
       commander: 2.20.3
       source-map-support: 0.5.21
     dev: true
@@ -26311,10 +26568,6 @@ packages:
   /tiny-invariant@1.3.1:
     resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
 
-  /tiny-warning@1.0.3:
-    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
-    dev: false
-
   /tiny-worker@2.3.0:
     resolution: {integrity: sha512-pJ70wq5EAqTAEl9IkGzA+fN0836rycEuz2Cn6yeZ6FRzlVS5IDOkFHpIoEsksPRQV34GDqXm65+OlnZqUSyK2g==}
     requiresBuild: true
@@ -26323,20 +26576,15 @@ packages:
     dev: false
     optional: true
 
-  /tinybench@2.5.0:
-    resolution: {integrity: sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==}
-
-  /tinypool@0.6.0:
-    resolution: {integrity: sha512-FdswUUo5SxRizcBc6b1GSuLpLjisa8N8qMyYoP3rl+bym+QauhtJP5bvZY1ytt8krKGmMLYIRl36HBZfeAoqhQ==}
-    engines: {node: '>=14.0.0'}
+  /tinybench@2.5.1:
+    resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==}
 
-  /tinypool@0.7.0:
-    resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==}
+  /tinypool@0.8.1:
+    resolution: {integrity: sha512-zBTCK0cCgRROxvs9c0CGK838sPkeokNGdQVUUwHAbynHFlmyJYj825f/oRs528HaIJ97lo0pLIlDUzwN+IorWg==}
     engines: {node: '>=14.0.0'}
-    dev: true
 
-  /tinyspy@2.1.1:
-    resolution: {integrity: sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==}
+  /tinyspy@2.2.0:
+    resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==}
     engines: {node: '>=14.0.0'}
 
   /tippy.js@6.3.7:
@@ -26380,10 +26628,6 @@ packages:
     resolution: {integrity: sha512-IfajhBTeg0HlMXu1f+VMbPef05QpDTsZ9X2Yn1+8npdaXsXg/+wrm9Ze1WG5OS1UDC3qJ5EQN/XOZ3gfXjPFCw==}
     dev: true
 
-  /toformat@2.0.0:
-    resolution: {integrity: sha512-03SWBVop6nU8bpyZCx7SodpYznbZF5R4ljwNLBcTQzKOD9xuihRo/psX58llS1BMFhhAI08H3luot5GoXJz2pQ==}
-    dev: false
-
   /toggle-selection@1.0.6:
     resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
 
@@ -26401,6 +26645,10 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /totalist@3.0.1:
+    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
+    engines: {node: '>=6'}
+
   /tough-cookie@4.1.3:
     resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}
     engines: {node: '>=6'}
@@ -26409,6 +26657,7 @@ packages:
       punycode: 2.3.0
       universalify: 0.2.0
       url-parse: 1.5.10
+    dev: true
 
   /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
@@ -26426,12 +26675,6 @@ packages:
       punycode: 2.3.0
     dev: true
 
-  /tr46@4.1.1:
-    resolution: {integrity: sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==}
-    engines: {node: '>=14'}
-    dependencies:
-      punycode: 2.3.0
-
   /tree-kill@1.2.2:
     resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
     hasBin: true
@@ -26446,8 +26689,18 @@ packages:
     resolution: {integrity: sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==}
     dev: true
 
-  /trpc-browser@1.3.6(@trpc/client@10.30.0)(@trpc/server@10.34.0):
+  /trpc-browser@1.3.6(@trpc/client@10.42.0)(@trpc/server@10.42.0):
     resolution: {integrity: sha512-4Z3zEE7ODupQ6OZ7ABZD8PnC9BP4FBi42eH+5OTxua4VRsnkk0fDvSJL3sS7sb5wJTASdsE5lSbqM7xGQjKknA==}
+    peerDependencies:
+      '@trpc/client': ^10.0.0
+      '@trpc/server': ^10.0.0
+    dependencies:
+      '@trpc/client': 10.42.0(@trpc/server@10.42.0)
+      '@trpc/server': 10.42.0
+    dev: false
+
+  /trpc-browser@1.3.7(@trpc/client@10.30.0)(@trpc/server@10.34.0):
+    resolution: {integrity: sha512-I0oMaqBQLLm8YywvvlRlDRKXeYLlFf1PbMfWvbI4refGpjXJMESztwUaJfrGhDqY4n+AzHs/b9t6Mt5n+pg+qA==}
     peerDependencies:
       '@trpc/client': ^10.0.0
       '@trpc/server': ^10.0.0
@@ -26456,8 +26709,8 @@ packages:
       '@trpc/server': 10.34.0
     dev: false
 
-  /trpc-browser@1.3.6(@trpc/client@10.42.0)(@trpc/server@10.42.0):
-    resolution: {integrity: sha512-4Z3zEE7ODupQ6OZ7ABZD8PnC9BP4FBi42eH+5OTxua4VRsnkk0fDvSJL3sS7sb5wJTASdsE5lSbqM7xGQjKknA==}
+  /trpc-browser@1.3.7(@trpc/client@10.42.0)(@trpc/server@10.42.0):
+    resolution: {integrity: sha512-I0oMaqBQLLm8YywvvlRlDRKXeYLlFf1PbMfWvbI4refGpjXJMESztwUaJfrGhDqY4n+AzHs/b9t6Mt5n+pg+qA==}
     peerDependencies:
       '@trpc/client': ^10.0.0
       '@trpc/server': ^10.0.0
@@ -26492,7 +26745,7 @@ packages:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
     dev: true
 
-  /ts-node@10.9.1(@types/node@20.8.10)(typescript@5.1.3):
+  /ts-node@10.9.1(@types/node@20.10.4)(typescript@5.1.3):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
@@ -26511,7 +26764,7 @@ packages:
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 20.8.10
+      '@types/node': 20.10.4
       acorn: 8.9.0
       acorn-walk: 8.2.0
       arg: 4.1.3
@@ -26640,12 +26893,6 @@ packages:
       yargs: 17.7.2
     dev: true
 
-  /tunnel-agent@0.6.0:
-    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
-    dependencies:
-      safe-buffer: 5.2.1
-    dev: false
-
   /type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
@@ -26797,8 +27044,8 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  /ufo@1.1.2:
-    resolution: {integrity: sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==}
+  /ufo@1.3.2:
+    resolution: {integrity: sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==}
 
   /uglify-js@3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
@@ -26946,6 +27193,7 @@ packages:
   /universalify@0.2.0:
     resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
     engines: {node: '>= 4.0.0'}
+    dev: true
 
   /universalify@2.0.0:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
@@ -26959,7 +27207,7 @@ packages:
   /unplugin@1.4.0:
     resolution: {integrity: sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==}
     dependencies:
-      acorn: 8.9.0
+      acorn: 8.11.2
       chokidar: 3.5.3
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.5.0
@@ -27023,6 +27271,7 @@ packages:
     dependencies:
       querystringify: 2.2.0
       requires-port: 1.0.0
+    dev: true
 
   /url@0.11.1:
     resolution: {integrity: sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==}
@@ -27153,6 +27402,7 @@ packages:
   /uuid@9.0.0:
     resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
     hasBin: true
+    dev: true
 
   /uvu@0.5.6:
     resolution: {integrity: sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==}
@@ -27190,6 +27440,15 @@ packages:
       convert-source-map: 1.9.0
     dev: true
 
+  /v8-to-istanbul@9.2.0:
+    resolution: {integrity: sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==}
+    engines: {node: '>=10.12.0'}
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.18
+      '@types/istanbul-lib-coverage': 2.0.4
+      convert-source-map: 2.0.0
+    dev: true
+
   /validate-npm-package-license@3.0.4:
     resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
     dependencies:
@@ -27223,48 +27482,27 @@ packages:
       vfile-message: 3.1.4
     dev: true
 
-  /vite-node@0.33.0(@types/node@20.8.10):
-    resolution: {integrity: sha512-19FpHYbwWWxDr73ruNahC+vtEdza52kA90Qb3La98yZ0xULqV8A5JLNPUff0f5zID4984tW7l3DH2przTJUZSw==}
-    engines: {node: '>=v14.18.0'}
-    hasBin: true
-    dependencies:
-      cac: 6.7.14
-      debug: 4.3.4(supports-color@5.5.0)
-      mlly: 1.4.0
-      pathe: 1.1.1
-      picocolors: 1.0.0
-      vite: 4.3.9(@types/node@20.8.10)
-    transitivePeerDependencies:
-      - '@types/node'
-      - less
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-
-  /vite-node@0.34.6(@types/node@20.8.10):
-    resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==}
-    engines: {node: '>=v14.18.0'}
+  /vite-node@1.0.2(@types/node@20.10.4):
+    resolution: {integrity: sha512-h7BbMJf46fLvFW/9Ygo3snkIBEHFh6fHpB4lge98H5quYrDhPFeI3S0LREz328uqPWSnii2yeJXktQ+Pmqk5BQ==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     dependencies:
       cac: 6.7.14
       debug: 4.3.4(supports-color@5.5.0)
-      mlly: 1.4.0
       pathe: 1.1.1
       picocolors: 1.0.0
-      vite: 4.3.9(@types/node@20.8.10)
+      vite: 5.0.6(@types/node@20.10.4)
     transitivePeerDependencies:
       - '@types/node'
       - less
+      - lightningcss
       - sass
       - stylus
       - sugarss
       - supports-color
       - terser
-    dev: true
 
-  /vite-plugin-dts@3.4.0(@types/node@20.8.10)(rollup@2.79.1)(typescript@5.1.3)(vite@4.3.9):
+  /vite-plugin-dts@3.4.0(@types/node@20.10.4)(rollup@2.79.1)(typescript@5.1.3)(vite@5.0.6):
     resolution: {integrity: sha512-B5UbhiF83hPlJpdri3k2FlseO2qIQfY95XJib7z1s8NTQKgPK+KgeuOQf8FR1hnE/pSU+RA3ra2T18HvymPDyA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -27274,13 +27512,13 @@ packages:
       vite:
         optional: true
     dependencies:
-      '@microsoft/api-extractor': 7.36.3(@types/node@20.8.10)
+      '@microsoft/api-extractor': 7.36.3(@types/node@20.10.4)
       '@rollup/pluginutils': 5.0.2(rollup@2.79.1)
       '@vue/language-core': 1.8.8(typescript@5.1.3)
       debug: 4.3.4(supports-color@5.5.0)
       kolorist: 1.8.0
       typescript: 5.1.3
-      vite: 4.3.9(@types/node@20.8.10)
+      vite: 5.0.6(@types/node@20.10.4)
       vue-tsc: 1.8.8(typescript@5.1.3)
     transitivePeerDependencies:
       - '@types/node'
@@ -27288,7 +27526,7 @@ packages:
       - supports-color
     dev: true
 
-  /vite-plugin-dts@3.6.0(@types/node@20.8.10)(typescript@5.1.3)(vite@4.3.9):
+  /vite-plugin-dts@3.6.0(@types/node@20.10.4)(typescript@5.1.3)(vite@5.0.6):
     resolution: {integrity: sha512-doxhDRFJCZD2sGjIp4V800nm8Y19GvmwckjG5vYPuiqJ7OBjc9NlW1Vp9Gkyh2aXlUs1jTDRH/lxWfcsPLOQHg==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -27298,13 +27536,13 @@ packages:
       vite:
         optional: true
     dependencies:
-      '@microsoft/api-extractor': 7.37.1(@types/node@20.8.10)
+      '@microsoft/api-extractor': 7.37.1(@types/node@20.10.4)
       '@rollup/pluginutils': 5.0.2(rollup@2.79.1)
       '@vue/language-core': 1.8.8(typescript@5.1.3)
       debug: 4.3.4(supports-color@5.5.0)
       kolorist: 1.8.0
       typescript: 5.1.3
-      vite: 4.3.9(@types/node@20.8.10)
+      vite: 5.0.6(@types/node@20.10.4)
       vue-tsc: 1.8.8(typescript@5.1.3)
     transitivePeerDependencies:
       - '@types/node'
@@ -27312,37 +27550,14 @@ packages:
       - supports-color
     dev: true
 
-  /vite-plugin-dts@3.6.3(@types/node@20.8.10)(typescript@5.1.3)(vite@4.3.9):
-    resolution: {integrity: sha512-NyRvgobl15rYj65coi/gH7UAEH+CpSjh539DbGb40DfOTZSvDLNYTzc8CK4460W+LqXuMK7+U3JAxRB3ksrNPw==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-      vite: '*'
-    peerDependenciesMeta:
-      vite:
-        optional: true
-    dependencies:
-      '@microsoft/api-extractor': 7.38.3(@types/node@20.8.10)
-      '@rollup/pluginutils': 5.0.5(rollup@2.78.0)
-      '@vue/language-core': 1.8.22(typescript@5.1.3)
-      debug: 4.3.4(supports-color@5.5.0)
-      kolorist: 1.8.0
-      typescript: 5.1.3
-      vite: 4.3.9(@types/node@20.8.10)
-      vue-tsc: 1.8.22(typescript@5.1.3)
-    transitivePeerDependencies:
-      - '@types/node'
-      - rollup
-      - supports-color
-    dev: true
-
-  /vite@4.3.9(@types/node@20.8.10):
-    resolution: {integrity: sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==}
-    engines: {node: ^14.18.0 || >=16.0.0}
+  /vite@5.0.6(@types/node@20.10.4):
+    resolution: {integrity: sha512-MD3joyAEBtV7QZPl2JVVUai6zHms3YOmLR+BpMzLlX2Yzjfcc4gTgNi09d/Rua3F4EtC8zdwPU8eQYyib4vVMQ==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
-      '@types/node': '>= 14'
+      '@types/node': ^18.0.0 || >=20.0.0
       less: '*'
+      lightningcss: ^1.21.0
       sass: '*'
       stylus: '*'
       sugarss: '*'
@@ -27352,6 +27567,8 @@ packages:
         optional: true
       less:
         optional: true
+      lightningcss:
+        optional: true
       sass:
         optional: true
       stylus:
@@ -27361,14 +27578,14 @@ packages:
       terser:
         optional: true
     dependencies:
-      '@types/node': 20.8.10
-      esbuild: 0.17.19
-      postcss: 8.4.24
-      rollup: 3.25.1
+      '@types/node': 20.10.4
+      esbuild: 0.19.8
+      postcss: 8.4.32
+      rollup: 4.6.1
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
 
-  /vitefu@0.2.4(vite@4.3.9):
+  /vitefu@0.2.4(vite@5.0.6):
     resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==}
     peerDependencies:
       vite: ^3.0.0 || ^4.0.0
@@ -27376,89 +27593,24 @@ packages:
       vite:
         optional: true
     dependencies:
-      vite: 4.3.9(@types/node@20.8.10)
+      vite: 5.0.6(@types/node@20.10.4)
     dev: true
 
-  /vitest@0.33.0(happy-dom@12.2.0)(jsdom@22.1.0):
-    resolution: {integrity: sha512-1CxaugJ50xskkQ0e969R/hW47za4YXDUfWJDxip1hwbnhUjYolpfUn2AMOulqG/Dtd9WYAtkHmM/m3yKVrEejQ==}
-    engines: {node: '>=v14.18.0'}
+  /vitest@1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.10.3):
+    resolution: {integrity: sha512-F3NVwwpXfRSDnJmyv+ALPwSRVt0zDkRRE18pwUHSUPXAlWQ47rY1dc99ziMW5bBHyqwK2ERjMisLNoef64qk9w==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
-      '@vitest/browser': '*'
-      '@vitest/ui': '*'
+      '@types/node': ^18.0.0 || >=20.0.0
+      '@vitest/browser': ^1.0.0
+      '@vitest/ui': ^1.0.0
       happy-dom: '*'
       jsdom: '*'
-      playwright: '*'
-      safaridriver: '*'
-      webdriverio: '*'
     peerDependenciesMeta:
       '@edge-runtime/vm':
         optional: true
-      '@vitest/browser':
-        optional: true
-      '@vitest/ui':
-        optional: true
-      happy-dom:
-        optional: true
-      jsdom:
-        optional: true
-      playwright:
-        optional: true
-      safaridriver:
-        optional: true
-      webdriverio:
-        optional: true
-    dependencies:
-      '@types/chai': 4.3.5
-      '@types/chai-subset': 1.3.3
-      '@types/node': 20.8.10
-      '@vitest/expect': 0.33.0
-      '@vitest/runner': 0.33.0
-      '@vitest/snapshot': 0.33.0
-      '@vitest/spy': 0.33.0
-      '@vitest/utils': 0.33.0
-      acorn: 8.9.0
-      acorn-walk: 8.2.0
-      cac: 6.7.14
-      chai: 4.3.10
-      debug: 4.3.4(supports-color@5.5.0)
-      happy-dom: 12.2.0
-      jsdom: 22.1.0
-      local-pkg: 0.4.3
-      magic-string: 0.30.1
-      pathe: 1.1.1
-      picocolors: 1.0.0
-      std-env: 3.3.3
-      strip-literal: 1.0.1
-      tinybench: 2.5.0
-      tinypool: 0.6.0
-      vite: 4.3.9(@types/node@20.8.10)
-      vite-node: 0.33.0(@types/node@20.8.10)
-      why-is-node-running: 2.2.2
-    transitivePeerDependencies:
-      - less
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-
-  /vitest@0.34.6(happy-dom@12.2.0):
-    resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==}
-    engines: {node: '>=v14.18.0'}
-    hasBin: true
-    peerDependencies:
-      '@edge-runtime/vm': '*'
-      '@vitest/browser': '*'
-      '@vitest/ui': '*'
-      happy-dom: '*'
-      jsdom: '*'
-      playwright: '*'
-      safaridriver: '*'
-      webdriverio: '*'
-    peerDependenciesMeta:
-      '@edge-runtime/vm':
+      '@types/node':
         optional: true
       '@vitest/browser':
         optional: true
@@ -27468,63 +27620,57 @@ packages:
         optional: true
       jsdom:
         optional: true
-      playwright:
-        optional: true
-      safaridriver:
-        optional: true
-      webdriverio:
-        optional: true
     dependencies:
-      '@types/chai': 4.3.5
-      '@types/chai-subset': 1.3.3
-      '@types/node': 20.8.10
-      '@vitest/expect': 0.34.6
-      '@vitest/runner': 0.34.6
-      '@vitest/snapshot': 0.34.6
-      '@vitest/spy': 0.34.6
-      '@vitest/utils': 0.34.6
-      acorn: 8.9.0
-      acorn-walk: 8.2.0
+      '@types/node': 20.10.4
+      '@vitest/browser': 1.0.2(vitest@1.0.2)
+      '@vitest/expect': 1.0.2
+      '@vitest/runner': 1.0.2
+      '@vitest/snapshot': 1.0.2
+      '@vitest/spy': 1.0.2
+      '@vitest/ui': 1.0.2(vitest@1.0.2)
+      '@vitest/utils': 1.0.2
+      acorn-walk: 8.3.1
       cac: 6.7.14
       chai: 4.3.10
       debug: 4.3.4(supports-color@5.5.0)
-      happy-dom: 12.2.0
-      local-pkg: 0.4.3
-      magic-string: 0.30.1
+      execa: 8.0.1
+      happy-dom: 12.10.3
+      local-pkg: 0.5.0
+      magic-string: 0.30.5
       pathe: 1.1.1
       picocolors: 1.0.0
-      std-env: 3.3.3
-      strip-literal: 1.0.1
-      tinybench: 2.5.0
-      tinypool: 0.7.0
-      vite: 4.3.9(@types/node@20.8.10)
-      vite-node: 0.34.6(@types/node@20.8.10)
+      std-env: 3.6.0
+      strip-literal: 1.3.0
+      tinybench: 2.5.1
+      tinypool: 0.8.1
+      vite: 5.0.6(@types/node@20.10.4)
+      vite-node: 1.0.2(@types/node@20.10.4)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
+      - lightningcss
       - sass
       - stylus
       - sugarss
       - supports-color
       - terser
-    dev: true
 
-  /vitest@0.34.6(jsdom@22.1.0):
-    resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==}
-    engines: {node: '>=v14.18.0'}
+  /vitest@1.0.2(@types/node@20.10.4)(@vitest/browser@1.0.2)(@vitest/ui@1.0.2)(happy-dom@12.2.0):
+    resolution: {integrity: sha512-F3NVwwpXfRSDnJmyv+ALPwSRVt0zDkRRE18pwUHSUPXAlWQ47rY1dc99ziMW5bBHyqwK2ERjMisLNoef64qk9w==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
-      '@vitest/browser': '*'
-      '@vitest/ui': '*'
+      '@types/node': ^18.0.0 || >=20.0.0
+      '@vitest/browser': ^1.0.0
+      '@vitest/ui': ^1.0.0
       happy-dom: '*'
       jsdom: '*'
-      playwright: '*'
-      safaridriver: '*'
-      webdriverio: '*'
     peerDependenciesMeta:
       '@edge-runtime/vm':
         optional: true
+      '@types/node':
+        optional: true
       '@vitest/browser':
         optional: true
       '@vitest/ui':
@@ -27533,40 +27679,35 @@ packages:
         optional: true
       jsdom:
         optional: true
-      playwright:
-        optional: true
-      safaridriver:
-        optional: true
-      webdriverio:
-        optional: true
     dependencies:
-      '@types/chai': 4.3.5
-      '@types/chai-subset': 1.3.3
-      '@types/node': 20.8.10
-      '@vitest/expect': 0.34.6
-      '@vitest/runner': 0.34.6
-      '@vitest/snapshot': 0.34.6
-      '@vitest/spy': 0.34.6
-      '@vitest/utils': 0.34.6
-      acorn: 8.9.0
-      acorn-walk: 8.2.0
+      '@types/node': 20.10.4
+      '@vitest/browser': 1.0.2(vitest@1.0.2)
+      '@vitest/expect': 1.0.2
+      '@vitest/runner': 1.0.2
+      '@vitest/snapshot': 1.0.2
+      '@vitest/spy': 1.0.2
+      '@vitest/ui': 1.0.2(vitest@1.0.2)
+      '@vitest/utils': 1.0.2
+      acorn-walk: 8.3.1
       cac: 6.7.14
       chai: 4.3.10
       debug: 4.3.4(supports-color@5.5.0)
-      jsdom: 22.1.0
-      local-pkg: 0.4.3
-      magic-string: 0.30.1
+      execa: 8.0.1
+      happy-dom: 12.2.0
+      local-pkg: 0.5.0
+      magic-string: 0.30.5
       pathe: 1.1.1
       picocolors: 1.0.0
-      std-env: 3.3.3
-      strip-literal: 1.0.1
-      tinybench: 2.5.0
-      tinypool: 0.7.0
-      vite: 4.3.9(@types/node@20.8.10)
-      vite-node: 0.34.6(@types/node@20.8.10)
+      std-env: 3.6.0
+      strip-literal: 1.3.0
+      tinybench: 2.5.1
+      tinypool: 0.8.1
+      vite: 5.0.6(@types/node@20.10.4)
+      vite-node: 1.0.2(@types/node@20.10.4)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
+      - lightningcss
       - sass
       - stylus
       - sugarss
@@ -27626,18 +27767,6 @@ packages:
       he: 1.2.0
     dev: true
 
-  /vue-tsc@1.8.22(typescript@5.1.3):
-    resolution: {integrity: sha512-j9P4kHtW6eEE08aS5McFZE/ivmipXy0JzrnTgbomfABMaVKx37kNBw//irL3+LlE3kOo63XpnRigyPC3w7+z+A==}
-    hasBin: true
-    peerDependencies:
-      typescript: '*'
-    dependencies:
-      '@volar/typescript': 1.10.10
-      '@vue/language-core': 1.8.22(typescript@5.1.3)
-      semver: 7.5.4
-      typescript: 5.1.3
-    dev: true
-
   /vue-tsc@1.8.8(typescript@5.1.3):
     resolution: {integrity: sha512-bSydNFQsF7AMvwWsRXD7cBIXaNs/KSjvzWLymq/UtKE36697sboX4EccSHFVxvgdBlI1frYPc/VMKJNB7DFeDQ==}
     hasBin: true
@@ -27664,12 +27793,6 @@ packages:
       xml-name-validator: 3.0.0
     dev: true
 
-  /w3c-xmlserializer@4.0.0:
-    resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==}
-    engines: {node: '>=14'}
-    dependencies:
-      xml-name-validator: 4.0.0
-
   /wait-for-expect@3.0.2:
     resolution: {integrity: sha512-cfS1+DZxuav1aBYbaO/kE06EOS8yRw7qOFoD3XtjTkYvCvh3zUvNST8DXK/nPaeqIzIv3P3kL3lRJn8iwOiSag==}
     dev: true
@@ -27736,8 +27859,8 @@ packages:
     engines: {node: '>= 10.13.0'}
     hasBin: true
     dependencies:
-      acorn: 8.9.0
-      acorn-walk: 8.2.0
+      acorn: 8.11.2
+      acorn-walk: 8.3.1
       chalk: 4.1.2
       commander: 7.2.0
       gzip-size: 6.0.0
@@ -28073,13 +28196,6 @@ packages:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
     engines: {node: '>=12'}
 
-  /whatwg-url@12.0.1:
-    resolution: {integrity: sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==}
-    engines: {node: '>=14'}
-    dependencies:
-      tr46: 4.1.1
-      webidl-conversions: 7.0.0
-
   /whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
     dependencies:
@@ -28479,6 +28595,7 @@ packages:
         optional: true
       utf-8-validate:
         optional: true
+    dev: true
 
   /ws@8.5.0:
     resolution: {integrity: sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==}
@@ -28497,12 +28614,9 @@ packages:
     resolution: {integrity: sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==}
     dev: true
 
-  /xml-name-validator@4.0.0:
-    resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
-    engines: {node: '>=12'}
-
   /xmlchars@2.2.0:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+    dev: true
 
   /xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
@@ -28666,6 +28780,26 @@ packages:
       use-sync-external-store: 1.2.0(react@18.2.0)
     dev: false
 
+  /zustand@4.4.7(@types/react@18.2.12)(react@18.2.0):
+    resolution: {integrity: sha512-QFJWJMdlETcI69paJwhSMJz7PPWjVP8Sjhclxmxmxv/RYI7ZOvR5BHX+ktH0we9gTWQMxcne8q1OY8xxz604gw==}
+    engines: {node: '>=12.7.0'}
+    peerDependencies:
+      '@types/react': '>=16.8'
+      immer: '>=9.0'
+      react: '>=16.8'
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      immer:
+        optional: true
+      react:
+        optional: true
+    dependencies:
+      '@types/react': 18.2.12
+      react: 18.2.0
+      use-sync-external-store: 1.2.0(react@18.2.0)
+    dev: false
+
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
     dev: true
diff --git a/scripts/calculate-contract-hash/requirements.txt b/scripts/calculate-contract-hash/requirements.txt
index 012f5fb00..e629ad748 100644
--- a/scripts/calculate-contract-hash/requirements.txt
+++ b/scripts/calculate-contract-hash/requirements.txt
@@ -1 +1 @@
-cairo_lang==0.12.2
+cairo_lang==0.12.3