diff --git a/package.json b/package.json
index 3f8a1a7665d..0b90d217baa 100644
--- a/package.json
+++ b/package.json
@@ -250,6 +250,7 @@
     "@btckit/types": "0.0.19",
     "@chromatic-com/storybook": "1.2.23",
     "@leather-wallet/prettier-config": "0.0.5",
+    "@leather-wallet/types": "0.0.20",
     "@ls-lint/ls-lint": "2.2.3",
     "@mdx-js/loader": "3.0.0",
     "@pandacss/dev": "0.32.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9b370756222..063bf34f70e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -370,6 +370,9 @@ devDependencies:
   '@leather-wallet/prettier-config':
     specifier: 0.0.5
     version: 0.0.5
+  '@leather-wallet/types':
+    specifier: 0.0.20
+    version: 0.0.20(@swc/core@1.4.8)(postcss@8.4.38)(ts-node@10.9.2)(typescript@5.4.4)
   '@ls-lint/ls-lint':
     specifier: 2.2.3
     version: 2.2.3
@@ -3111,6 +3114,15 @@ packages:
     resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==}
     dev: true
 
+  /@esbuild/aix-ppc64@0.19.12:
+    resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/aix-ppc64@0.20.2:
     resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
     engines: {node: '>=12'}
@@ -3119,6 +3131,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/android-arm64@0.19.12:
+    resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-arm64@0.20.2:
     resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==}
     engines: {node: '>=12'}
@@ -3127,6 +3148,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/android-arm@0.19.12:
+    resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-arm@0.20.2:
     resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==}
     engines: {node: '>=12'}
@@ -3135,6 +3165,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/android-x64@0.19.12:
+    resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-x64@0.20.2:
     resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==}
     engines: {node: '>=12'}
@@ -3143,6 +3182,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/darwin-arm64@0.19.12:
+    resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/darwin-arm64@0.20.2:
     resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
     engines: {node: '>=12'}
@@ -3151,6 +3199,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/darwin-x64@0.19.12:
+    resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/darwin-x64@0.20.2:
     resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
     engines: {node: '>=12'}
@@ -3159,6 +3216,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/freebsd-arm64@0.19.12:
+    resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/freebsd-arm64@0.20.2:
     resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==}
     engines: {node: '>=12'}
@@ -3167,6 +3233,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/freebsd-x64@0.19.12:
+    resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/freebsd-x64@0.20.2:
     resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==}
     engines: {node: '>=12'}
@@ -3175,6 +3250,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-arm64@0.19.12:
+    resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-arm64@0.20.2:
     resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==}
     engines: {node: '>=12'}
@@ -3183,6 +3267,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-arm@0.19.12:
+    resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-arm@0.20.2:
     resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==}
     engines: {node: '>=12'}
@@ -3191,6 +3284,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-ia32@0.19.12:
+    resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-ia32@0.20.2:
     resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==}
     engines: {node: '>=12'}
@@ -3199,6 +3301,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-loong64@0.19.12:
+    resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-loong64@0.20.2:
     resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==}
     engines: {node: '>=12'}
@@ -3207,6 +3318,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-mips64el@0.19.12:
+    resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-mips64el@0.20.2:
     resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==}
     engines: {node: '>=12'}
@@ -3215,6 +3335,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-ppc64@0.19.12:
+    resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-ppc64@0.20.2:
     resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==}
     engines: {node: '>=12'}
@@ -3223,6 +3352,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-riscv64@0.19.12:
+    resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-riscv64@0.20.2:
     resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==}
     engines: {node: '>=12'}
@@ -3231,6 +3369,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-s390x@0.19.12:
+    resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-s390x@0.20.2:
     resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==}
     engines: {node: '>=12'}
@@ -3239,6 +3386,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-x64@0.19.12:
+    resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-x64@0.20.2:
     resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==}
     engines: {node: '>=12'}
@@ -3247,6 +3403,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/netbsd-x64@0.19.12:
+    resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/netbsd-x64@0.20.2:
     resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==}
     engines: {node: '>=12'}
@@ -3255,6 +3420,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/openbsd-x64@0.19.12:
+    resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/openbsd-x64@0.20.2:
     resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==}
     engines: {node: '>=12'}
@@ -3263,6 +3437,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/sunos-x64@0.19.12:
+    resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/sunos-x64@0.20.2:
     resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==}
     engines: {node: '>=12'}
@@ -3271,6 +3454,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/win32-arm64@0.19.12:
+    resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-arm64@0.20.2:
     resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==}
     engines: {node: '>=12'}
@@ -3279,6 +3471,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/win32-ia32@0.19.12:
+    resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-ia32@0.20.2:
     resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==}
     engines: {node: '>=12'}
@@ -3287,6 +3488,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/win32-x64@0.19.12:
+    resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-x64@0.20.2:
     resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==}
     engines: {node: '>=12'}
@@ -3574,6 +3784,19 @@ packages:
     resolution: {integrity: sha512-xCg+aIcn8DexmQhfvxYM85IGP2Q1JNfUBq80ZwV4horKw18MxxTdX5FeEthTrO8quRZu7up+IW6m/l3wElnDsA==}
     dev: false
 
+  /@leather-wallet/types@0.0.20(@swc/core@1.4.8)(postcss@8.4.38)(ts-node@10.9.2)(typescript@5.4.4):
+    resolution: {integrity: sha512-cypcCgzjfjzFJ4B+3fIlqZuBVFPGDTxlZJDzpkCVJSRBhVRX6z/YRjN7I6VMoCxaN/gBU9KHU7gzD5MTaoznSg==}
+    dependencies:
+      tsup: 8.0.2(@swc/core@1.4.8)(postcss@8.4.38)(ts-node@10.9.2)(typescript@5.4.4)
+    transitivePeerDependencies:
+      - '@microsoft/api-extractor'
+      - '@swc/core'
+      - postcss
+      - supports-color
+      - ts-node
+      - typescript
+    dev: true
+
   /@ledgerhq/devices@8.2.0:
     resolution: {integrity: sha512-XROTW2gTmmuy+YPPDjdtKKTQ3mfxrPtKtV+a9QFbj8f5MnjVMV0Zpy1BIB4CyIMsVVi4z6+nI67auT7IlsM3SQ==}
     dependencies:
@@ -11599,6 +11822,16 @@ packages:
       run-applescript: 7.0.0
     dev: true
 
+  /bundle-require@4.0.2(esbuild@0.19.12):
+    resolution: {integrity: sha512-jwzPOChofl67PSTW2SGubV9HBQAhhR2i6nskiOThauo9dzwDUgOWQScFVaJkjEfYX+UXiD+LEx8EblQMc2wIag==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    peerDependencies:
+      esbuild: '>=0.17'
+    dependencies:
+      esbuild: 0.19.12
+      load-tsconfig: 0.2.5
+    dev: true
+
   /bunyan@1.8.15:
     resolution: {integrity: sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==}
     engines: {'0': node >=0.10.0}
@@ -12215,6 +12448,11 @@ packages:
       graceful-readlink: 1.0.1
     dev: true
 
+  /commander@4.1.1:
+    resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
+    engines: {node: '>= 6'}
+    dev: true
+
   /commander@6.2.1:
     resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
     engines: {node: '>= 6'}
@@ -14020,6 +14258,37 @@ packages:
       - supports-color
     dev: true
 
+  /esbuild@0.19.12:
+    resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.19.12
+      '@esbuild/android-arm': 0.19.12
+      '@esbuild/android-arm64': 0.19.12
+      '@esbuild/android-x64': 0.19.12
+      '@esbuild/darwin-arm64': 0.19.12
+      '@esbuild/darwin-x64': 0.19.12
+      '@esbuild/freebsd-arm64': 0.19.12
+      '@esbuild/freebsd-x64': 0.19.12
+      '@esbuild/linux-arm': 0.19.12
+      '@esbuild/linux-arm64': 0.19.12
+      '@esbuild/linux-ia32': 0.19.12
+      '@esbuild/linux-loong64': 0.19.12
+      '@esbuild/linux-mips64el': 0.19.12
+      '@esbuild/linux-ppc64': 0.19.12
+      '@esbuild/linux-riscv64': 0.19.12
+      '@esbuild/linux-s390x': 0.19.12
+      '@esbuild/linux-x64': 0.19.12
+      '@esbuild/netbsd-x64': 0.19.12
+      '@esbuild/openbsd-x64': 0.19.12
+      '@esbuild/sunos-x64': 0.19.12
+      '@esbuild/win32-arm64': 0.19.12
+      '@esbuild/win32-ia32': 0.19.12
+      '@esbuild/win32-x64': 0.19.12
+    dev: true
+
   /esbuild@0.20.2:
     resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==}
     engines: {node: '>=12'}
@@ -16821,6 +17090,11 @@ packages:
       react: 18.2.0
     dev: false
 
+  /joycon@3.1.1:
+    resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
+    engines: {node: '>=10'}
+    dev: true
+
   /js-cookie@3.0.1:
     resolution: {integrity: sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==}
     engines: {node: '>=12'}
@@ -17364,6 +17638,11 @@ packages:
       lightningcss-win32-x64-msvc: 1.23.0
     dev: true
 
+  /lilconfig@3.1.1:
+    resolution: {integrity: sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==}
+    engines: {node: '>=14'}
+    dev: true
+
   /lines-and-columns@1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
     dev: true
@@ -17388,6 +17667,11 @@ packages:
       import-meta-resolve: 4.0.0
     dev: true
 
+  /load-tsconfig@0.2.5:
+    resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dev: true
+
   /load-yaml-file@0.2.0:
     resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==}
     engines: {node: '>=6'}
@@ -19940,6 +20224,24 @@ packages:
       postcss: 8.4.38
     dev: false
 
+  /postcss-load-config@4.0.2(postcss@8.4.38)(ts-node@10.9.2):
+    resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}
+    engines: {node: '>= 14'}
+    peerDependencies:
+      postcss: '>=8.0.9'
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      postcss:
+        optional: true
+      ts-node:
+        optional: true
+    dependencies:
+      lilconfig: 3.1.1
+      postcss: 8.4.38
+      ts-node: 10.9.2(@swc/core@1.4.8)(@types/node@20.12.4)(typescript@5.4.4)
+      yaml: 2.3.4
+    dev: true
+
   /postcss-loader@8.1.1(postcss@8.4.38)(typescript@5.4.4)(webpack@5.91.0):
     resolution: {integrity: sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==}
     engines: {node: '>= 18.12.0'}
@@ -22189,6 +22491,13 @@ packages:
     engines: {node: '>= 8'}
     dev: true
 
+  /source-map@0.8.0-beta.0:
+    resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
+    engines: {node: '>= 8'}
+    dependencies:
+      whatwg-url: 7.1.0
+    dev: true
+
   /space-separated-tokens@2.0.2:
     resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
     dev: true
@@ -22643,6 +22952,20 @@ packages:
     resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==}
     dev: true
 
+  /sucrase@3.35.0:
+    resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    hasBin: true
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.5
+      commander: 4.1.1
+      glob: 10.3.10
+      lines-and-columns: 1.2.4
+      mz: 2.7.0
+      pirates: 4.0.6
+      ts-interface-checker: 0.1.13
+    dev: true
+
   /sumchecker@3.0.1:
     resolution: {integrity: sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==}
     engines: {node: '>= 8.0'}
@@ -22977,6 +23300,12 @@ packages:
   /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
+  /tr46@1.0.1:
+    resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
+    dependencies:
+      punycode: 2.3.1
+    dev: true
+
   /tr46@4.1.1:
     resolution: {integrity: sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==}
     engines: {node: '>=14'}
@@ -23056,6 +23385,10 @@ packages:
       typescript: 5.4.4
     dev: true
 
+  /ts-interface-checker@0.1.13:
+    resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
+    dev: true
+
   /ts-morph@21.0.1:
     resolution: {integrity: sha512-dbDtVdEAncKctzrVZ+Nr7kHpHkv+0JDJb2MjjpBaj8bFeCkePU9rHfMklmhuLFnpeq/EJZk2IhStY6NzqgjOkg==}
     dependencies:
@@ -23157,6 +23490,47 @@ packages:
   /tslib@2.6.2:
     resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
 
+  /tsup@8.0.2(@swc/core@1.4.8)(postcss@8.4.38)(ts-node@10.9.2)(typescript@5.4.4):
+    resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==}
+    engines: {node: '>=18'}
+    hasBin: true
+    peerDependencies:
+      '@microsoft/api-extractor': ^7.36.0
+      '@swc/core': ^1
+      postcss: ^8.4.12
+      typescript: '>=4.5.0'
+    peerDependenciesMeta:
+      '@microsoft/api-extractor':
+        optional: true
+      '@swc/core':
+        optional: true
+      postcss:
+        optional: true
+      typescript:
+        optional: true
+    dependencies:
+      '@swc/core': 1.4.8
+      bundle-require: 4.0.2(esbuild@0.19.12)
+      cac: 6.7.14
+      chokidar: 3.6.0
+      debug: 4.3.4(supports-color@5.5.0)
+      esbuild: 0.19.12
+      execa: 5.1.1
+      globby: 11.1.0
+      joycon: 3.1.1
+      postcss: 8.4.38
+      postcss-load-config: 4.0.2(postcss@8.4.38)(ts-node@10.9.2)
+      resolve-from: 5.0.0
+      rollup: 4.14.0
+      source-map: 0.8.0-beta.0
+      sucrase: 3.35.0
+      tree-kill: 1.2.2
+      typescript: 5.4.4
+    transitivePeerDependencies:
+      - supports-color
+      - ts-node
+    dev: true
+
   /tsutils@3.21.0(typescript@5.4.4):
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -24124,6 +24498,10 @@ packages:
   /webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
+  /webidl-conversions@4.0.2:
+    resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
+    dev: true
+
   /webidl-conversions@7.0.0:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
     engines: {node: '>=12'}
@@ -24370,6 +24748,14 @@ packages:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
 
+  /whatwg-url@7.1.0:
+    resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}
+    dependencies:
+      lodash.sortby: 4.7.0
+      tr46: 1.0.1
+      webidl-conversions: 4.0.2
+    dev: true
+
   /when@3.7.7:
     resolution: {integrity: sha512-9lFZp/KHoqH6bPKjbWqa+3Dg/K/r2v0X/3/G2x4DBGchVS2QX2VXL3cZV994WQVnTM1/PD71Az25nAzryEUugw==}
     dev: true
diff --git a/src/app/common/asset-utils.ts b/src/app/common/asset-utils.ts
index 12a2534e89d..0ef0152f635 100644
--- a/src/app/common/asset-utils.ts
+++ b/src/app/common/asset-utils.ts
@@ -1,5 +1,5 @@
 import type { MarketData } from '@shared/models/market.model';
-import type { Money } from '@shared/models/money.model';
+import { type Money } from '@shared/models/money.model';
 
 import { baseCurrencyAmountInQuote } from './money/calculate-money';
 import { i18nFormatCurrency } from './money/format-money';
diff --git a/src/app/common/hooks/analytics/use-analytics.ts b/src/app/common/hooks/analytics/use-analytics.ts
index 88b2213fb29..558d79eb5ce 100644
--- a/src/app/common/hooks/analytics/use-analytics.ts
+++ b/src/app/common/hooks/analytics/use-analytics.ts
@@ -14,7 +14,6 @@ import { analytics, initAnalytics } from '@shared/utils/analytics';
 import { flow, origin } from '@app/common/initial-search-params';
 import { useWalletType } from '@app/common/use-wallet-type';
 import { useCurrentNetworkState } from '@app/store/networks/networks.hooks';
-import { useHasUserExplicitlyDeclinedAnalytics } from '@app/store/settings/settings.selectors';
 
 const IGNORED_PATH_REGEXPS = [/^\/$/];
 
@@ -27,12 +26,10 @@ function isHiroApiUrl(url: string) {
 }
 
 export function useInitalizeAnalytics() {
-  const hasUserDeclinedAnalytics = useHasUserExplicitlyDeclinedAnalytics();
-
   useEffect(() => {
-    if (hasUserDeclinedAnalytics || !SEGMENT_WRITE_KEY || IS_TEST_ENV) return;
+    if (!SEGMENT_WRITE_KEY || IS_TEST_ENV) return;
     initAnalytics();
-  }, [hasUserDeclinedAnalytics]);
+  }, []);
 }
 
 export function useAnalytics() {
diff --git a/src/app/common/hooks/use-key-actions.ts b/src/app/common/hooks/use-key-actions.ts
index 27fb30289e1..576ddf1d067 100644
--- a/src/app/common/hooks/use-key-actions.ts
+++ b/src/app/common/hooks/use-key-actions.ts
@@ -13,6 +13,7 @@ import { useBitcoinClient, useStacksClient } from '@app/store/common/api-clients
 import { inMemoryKeyActions } from '@app/store/in-memory-key/in-memory-key.actions';
 import { bitcoinKeysSlice } from '@app/store/ledger/bitcoin/bitcoin-key.slice';
 import { stacksKeysSlice } from '@app/store/ledger/stacks/stacks-key.slice';
+import { networksSlice } from '@app/store/networks/networks.slice';
 import { clearWalletSession } from '@app/store/session-restore';
 import { keyActions } from '@app/store/software-keys/software-key.actions';
 import { useCurrentKeyDetails } from '@app/store/software-keys/software-key.selectors';
@@ -55,6 +56,7 @@ export function useKeyActions() {
 
       async signOut() {
         await clearWalletSession();
+        dispatch(networksSlice.actions.changeNetwork('mainnet'));
         dispatch(keyActions.signOut());
         dispatch(bitcoinKeysSlice.actions.signOut());
         dispatch(stacksKeysSlice.actions.signOut());
diff --git a/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-item.layout.tsx b/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-item.layout.tsx
index b2f15ced399..e83635a03c3 100644
--- a/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-item.layout.tsx
+++ b/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-item.layout.tsx
@@ -15,17 +15,15 @@ interface Brc20TokenAssetItemLayoutProps {
   onClick?(): void;
 }
 export function Brc20TokenAssetItemLayout({ onClick, token }: Brc20TokenAssetItemLayoutProps) {
-  const balanceAsString = token.balance?.amount.toString();
-  const formattedBalance = formatBalance(
-    convertAmountToBaseUnit(token.balance ?? new BigNumber(0)).toString()
-  );
+  const balanceAsString = convertAmountToBaseUnit(token.balance ?? new BigNumber(0)).toString();
+  const formattedBalance = formatBalance(balanceAsString);
   const balanceAsFiat = convertAssetBalanceToFiat(token);
 
   return (
     <Pressable onClick={onClick} my="space.02">
       <ItemLayout
         flagImg={<Brc20AvatarIcon />}
-        titleLeft={token.ticker}
+        titleLeft={token.tokenData.ticker}
         captionLeft="BRC-20"
         titleRight={
           <BasicTooltip
@@ -33,7 +31,7 @@ export function Brc20TokenAssetItemLayout({ onClick, token }: Brc20TokenAssetIte
             label={formattedBalance?.isAbbreviated ? balanceAsString : undefined}
             side="left"
           >
-            <styled.span data-testid={token.ticker} textStyle="label.02">
+            <styled.span data-testid={token.tokenData.ticker} textStyle="label.02">
               {formattedBalance.value}
             </styled.span>
           </BasicTooltip>
diff --git a/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-list.tsx b/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-list.tsx
index 62046fc2291..e63cfd9a422 100644
--- a/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-list.tsx
+++ b/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-list.tsx
@@ -12,10 +12,10 @@ import { useCurrentAccountNativeSegwitAddressIndexZero } from '@app/store/accoun
 import { Brc20TokenAssetItemLayout } from './brc20-token-asset-item.layout';
 
 interface Brc20TokenAssetListProps {
-  brc20Tokens: Brc20Token[];
+  tokens: Brc20Token[];
   variant?: string;
 }
-export function Brc20TokenAssetList({ brc20Tokens, variant }: Brc20TokenAssetListProps) {
+export function Brc20TokenAssetList({ tokens, variant }: Brc20TokenAssetListProps) {
   const navigate = useNavigate();
   const currentAccountBtcAddress = useCurrentAccountNativeSegwitAddressIndexZero();
   const { btcBalance: btcCryptoCurrencyAssetBalance } =
@@ -25,17 +25,17 @@ export function Brc20TokenAssetList({ brc20Tokens, variant }: Brc20TokenAssetLis
     variant === 'send' && btcCryptoCurrencyAssetBalance.balance.amount.isGreaterThan(0);
 
   function navigateToBrc20SendForm(token: Brc20Token) {
-    const { ticker, balance, holderAddress, marketData } = token;
-    navigate(RouteUrls.SendBrc20SendForm.replace(':ticker', ticker), {
-      state: { balance, ticker, holderAddress, marketData },
+    const { balance, holderAddress, marketData, tokenData } = token;
+    navigate(RouteUrls.SendBrc20SendForm.replace(':ticker', tokenData.ticker), {
+      state: { balance, ticker: tokenData.ticker, holderAddress, marketData },
     });
   }
 
   return (
     <Stack data-testid={CryptoAssetSelectors.CryptoAssetList}>
-      {brc20Tokens.map(token => (
+      {tokens.map(token => (
         <Brc20TokenAssetItemLayout
-          key={token.ticker}
+          key={token.tokenData.ticker}
           token={token}
           onClick={hasPositiveBtcBalanceForFees ? () => navigateToBrc20SendForm(token) : undefined}
         />
diff --git a/src/app/components/crypto-assets/bitcoin/runes-asset-list/runes-asset-item.layout.tsx b/src/app/components/crypto-assets/bitcoin/runes-asset-list/runes-asset-item.layout.tsx
index 130885b777d..09780d9adf4 100644
--- a/src/app/components/crypto-assets/bitcoin/runes-asset-list/runes-asset-item.layout.tsx
+++ b/src/app/components/crypto-assets/bitcoin/runes-asset-list/runes-asset-item.layout.tsx
@@ -1,6 +1,7 @@
 import { styled } from 'leather-styles/jsx';
 
 import { formatBalance } from '@app/common/format-balance';
+import { convertAmountToBaseUnit } from '@app/common/money/calculate-money';
 import type { RuneToken } from '@app/query/bitcoin/bitcoin-client';
 import { RunesAvatarIcon } from '@app/ui/components/avatar/runes-avatar-icon';
 import { ItemLayout } from '@app/ui/components/item-layout/item-layout';
@@ -11,23 +12,24 @@ interface RunesAssetItemLayoutProps {
   rune: RuneToken;
 }
 export function RunesAssetItemLayout({ rune }: RunesAssetItemLayoutProps) {
-  const balance = rune.balance.amount.toString();
-  const formattedBalance = formatBalance(balance);
+  const { balance, tokenData } = rune;
+  const balanceAsString = convertAmountToBaseUnit(balance).toString();
+  const formattedBalance = formatBalance(balanceAsString);
 
   return (
     <Pressable my="space.02">
       <ItemLayout
         flagImg={<RunesAvatarIcon />}
-        titleLeft={rune.spaced_rune_name ?? rune.rune_name}
+        titleLeft={tokenData.spaced_rune_name ?? tokenData.rune_name}
         captionLeft="Runes"
         titleRight={
           <BasicTooltip
             asChild
-            label={formattedBalance.isAbbreviated ? balance : undefined}
+            label={formattedBalance.isAbbreviated ? balanceAsString : undefined}
             side="left"
           >
-            <styled.span data-testid={rune.rune_name} fontWeight={500} textStyle="label.02">
-              {formattedBalance.value} {rune.symbol}
+            <styled.span data-testid={tokenData.rune_name} fontWeight={500} textStyle="label.02">
+              {formattedBalance.value} {tokenData.symbol}
             </styled.span>
           </BasicTooltip>
         }
diff --git a/src/app/components/crypto-assets/bitcoin/runes-asset-list/runes-asset-list.tsx b/src/app/components/crypto-assets/bitcoin/runes-asset-list/runes-asset-list.tsx
index deaebbcbe66..d89fb52692d 100644
--- a/src/app/components/crypto-assets/bitcoin/runes-asset-list/runes-asset-list.tsx
+++ b/src/app/components/crypto-assets/bitcoin/runes-asset-list/runes-asset-list.tsx
@@ -6,5 +6,7 @@ interface RunesAssetListProps {
   runes: RuneToken[];
 }
 export function RunesAssetList({ runes }: RunesAssetListProps) {
-  return runes.map((rune, i) => <RunesAssetItemLayout key={`${rune.rune_id}${i}`} rune={rune} />);
+  return runes.map((rune, i) => (
+    <RunesAssetItemLayout key={`${rune.tokenData.rune_id}${i}`} rune={rune} />
+  ));
 }
diff --git a/src/app/components/crypto-assets/choose-crypto-asset/crypto-asset-list.tsx b/src/app/components/crypto-assets/choose-crypto-asset/crypto-asset-list.tsx
index e1778a5d097..a6bdb402f4e 100644
--- a/src/app/components/crypto-assets/choose-crypto-asset/crypto-asset-list.tsx
+++ b/src/app/components/crypto-assets/choose-crypto-asset/crypto-asset-list.tsx
@@ -58,7 +58,7 @@ export function CryptoAssetList({
             <BitcoinNativeSegwitAccountLoader current>
               {() => (
                 <Brc20TokensLoader>
-                  {brc20Tokens => <Brc20TokenAssetList brc20Tokens={brc20Tokens} variant="send" />}
+                  {brc20Tokens => <Brc20TokenAssetList tokens={brc20Tokens} variant="send" />}
                 </Brc20TokensLoader>
               )}
             </BitcoinNativeSegwitAccountLoader>
diff --git a/src/app/components/request-password.tsx b/src/app/components/request-password.tsx
index f1a3f30a70b..614cdb7e492 100644
--- a/src/app/components/request-password.tsx
+++ b/src/app/components/request-password.tsx
@@ -104,11 +104,6 @@ export function RequestPassword({ onSuccess }: RequestPasswordProps) {
           />
           {error && <ErrorLabel width="100%">{error}</ErrorLabel>}
         </Stack>
-
-        {/*  TODO: #4735 implement forgot password flow */}
-        {/* <Link>
-          Forgot password?
-        </Link> */}
       </Card>
     </Page>
   );
diff --git a/src/app/features/asset-list/components/bitcoin-fungible-tokens-asset-list.tsx b/src/app/features/asset-list/components/bitcoin-fungible-tokens-asset-list.tsx
index 4acf6b79c35..ceacfafe001 100644
--- a/src/app/features/asset-list/components/bitcoin-fungible-tokens-asset-list.tsx
+++ b/src/app/features/asset-list/components/bitcoin-fungible-tokens-asset-list.tsx
@@ -16,7 +16,7 @@ export function BitcoinFungibleTokenAssetList({
   return (
     <>
       <Brc20TokensLoader>
-        {brc20Tokens => <Brc20TokenAssetList brc20Tokens={brc20Tokens} />}
+        {brc20Tokens => <Brc20TokenAssetList tokens={brc20Tokens} />}
       </Brc20TokensLoader>
       <Src20TokensLoader address={btcAddressNativeSegwit}>
         {src20Tokens => <Src20TokenAssetList src20Tokens={src20Tokens} />}
diff --git a/src/app/features/container/utils/route-helpers.ts b/src/app/features/container/utils/route-helpers.ts
index 868bea018dd..7e7f66f31fa 100644
--- a/src/app/features/container/utils/route-helpers.ts
+++ b/src/app/features/container/utils/route-helpers.ts
@@ -12,7 +12,7 @@ function isHomePage(pathname: RouteUrls) {
 }
 
 export function isLandingPage(pathname: RouteUrls) {
-  return pathname === RouteUrls.RequestDiagnostics || pathname.match(RouteUrls.Onboarding); // need to match get-started/ledger
+  return pathname.match(RouteUrls.Onboarding); // need to match get-started/ledger
 }
 
 function isOnboardingPage(pathname: RouteUrls) {
diff --git a/src/app/features/settings/network/network.tsx b/src/app/features/settings/network/network.tsx
index a390bad5a7f..d8afaf4d1b9 100644
--- a/src/app/features/settings/network/network.tsx
+++ b/src/app/features/settings/network/network.tsx
@@ -10,19 +10,22 @@ import { NetworkListItem } from '@app/features/settings/network/network-list-ite
 import { useCurrentNetworkState, useNetworksActions } from '@app/store/networks/networks.hooks';
 import { useNetworks } from '@app/store/networks/networks.selectors';
 import { Button } from '@app/ui/components/button/button';
-import { Dialog, DialogProps } from '@app/ui/components/containers/dialog/dialog';
+import { Dialog } from '@app/ui/components/containers/dialog/dialog';
 import { Footer } from '@app/ui/components/containers/footers/footer';
 import { Header } from '@app/ui/components/containers/headers/header';
 
 const defaultNetworkIds = Object.values(WalletDefaultNetworkConfigurationIds) as string[];
 
-export function NetworkDialog({ isShowing, onClose }: DialogProps) {
+interface NetworkDialogProps {
+  onClose(): void;
+}
+
+export function NetworkDialog({ onClose }: NetworkDialogProps) {
   const navigate = useNavigate();
   const networks = useNetworks();
   const analytics = useAnalytics();
   const networksActions = useNetworksActions();
   const currentNetwork = useCurrentNetworkState();
-
   function addNetwork() {
     void analytics.track('add_network');
     navigate(RouteUrls.AddNetwork);
@@ -41,7 +44,7 @@ export function NetworkDialog({ isShowing, onClose }: DialogProps) {
   return (
     <Dialog
       header={<Header variant="dialog" title="Change network" />}
-      isShowing={isShowing}
+      isShowing
       onClose={onClose}
       footer={
         <Footer>
diff --git a/src/app/features/settings/settings.tsx b/src/app/features/settings/settings.tsx
index b1d51062872..848c8d0edd9 100644
--- a/src/app/features/settings/settings.tsx
+++ b/src/app/features/settings/settings.tsx
@@ -200,15 +200,11 @@ export function Settings({ triggerButton, toggleSwitchAccount }: SettingsProps)
           </DropdownMenu.Content>
         </DropdownMenu.Portal>
       </DropdownMenu.Root>
-      <SignOut isShowing={showSignOut} onClose={() => setShowSignOut(!showSignOut)} />
-      <ThemeDialog
-        isShowing={showChangeTheme}
-        onClose={() => setShowChangeTheme(!showChangeTheme)}
-      />
-      <NetworkDialog
-        isShowing={showChangeNetwork}
-        onClose={() => setShowChangeNetwork(!showChangeNetwork)}
-      />
+      {showSignOut && <SignOut onClose={() => setShowSignOut(!showSignOut)} />}
+      {showChangeTheme && <ThemeDialog onClose={() => setShowChangeTheme(!showChangeTheme)} />}
+      {showChangeNetwork && (
+        <NetworkDialog onClose={() => setShowChangeNetwork(!showChangeNetwork)} />
+      )}
     </>
   );
 }
diff --git a/src/app/features/settings/sign-out/sign-out-confirm.tsx b/src/app/features/settings/sign-out/sign-out-confirm.tsx
index f4e15f1308a..9e2e0c7b3a4 100644
--- a/src/app/features/settings/sign-out/sign-out-confirm.tsx
+++ b/src/app/features/settings/sign-out/sign-out-confirm.tsx
@@ -1,30 +1,22 @@
-import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import { RouteUrls } from '@shared/route-urls';
 
-import { useAnalytics } from '@app/common/hooks/analytics/use-analytics';
 import { useKeyActions } from '@app/common/hooks/use-key-actions';
 
 import { SignOutDialog } from './sign-out';
 
 interface SignOutProps {
-  isShowing: boolean;
   onClose(): void;
 }
 
-export function SignOut({ isShowing = false, onClose }: SignOutProps) {
-  const analytics = useAnalytics();
-
-  useEffect(() => void analytics.track('sign-out'), [analytics]);
+export function SignOut({ onClose }: SignOutProps) {
   const { signOut } = useKeyActions();
   const navigate = useNavigate();
-  // #4370 SMELL without this early return the wallet crashes on new install with
-  // : Wallet is neither of type `ledger` nor `software`
-  if (!isShowing) return null;
+
   return (
     <SignOutDialog
-      isShowing={isShowing}
+      isShowing
       onUserDeleteWallet={() => {
         void signOut().finally(() => {
           navigate(RouteUrls.Onboarding);
diff --git a/src/app/features/settings/theme/theme-dialog.tsx b/src/app/features/settings/theme/theme-dialog.tsx
index ac2217059ab..2e1739f6b6b 100644
--- a/src/app/features/settings/theme/theme-dialog.tsx
+++ b/src/app/features/settings/theme/theme-dialog.tsx
@@ -2,12 +2,16 @@ import { useCallback } from 'react';
 
 import { useAnalytics } from '@app/common/hooks/analytics/use-analytics';
 import { UserSelectedTheme, themeLabelMap, useThemeSwitcher } from '@app/common/theme-provider';
-import { Dialog, DialogProps } from '@app/ui/components/containers/dialog/dialog';
+import { Dialog } from '@app/ui/components/containers/dialog/dialog';
 import { Header } from '@app/ui/components/containers/headers/header';
 
 import { ThemeListItem } from './theme-list-item';
 
-export function ThemeDialog({ isShowing, onClose }: DialogProps) {
+interface ThemeDialogProps {
+  onClose(): void;
+}
+
+export function ThemeDialog({ onClose }: ThemeDialogProps) {
   const themes = Object.keys(themeLabelMap) as UserSelectedTheme[];
   const analytics = useAnalytics();
   const { setUserSelectedTheme } = useThemeSwitcher();
@@ -25,11 +29,7 @@ export function ThemeDialog({ isShowing, onClose }: DialogProps) {
   const { userSelectedTheme } = useThemeSwitcher();
 
   return (
-    <Dialog
-      header={<Header variant="dialog" title="Change theme" />}
-      isShowing={isShowing}
-      onClose={onClose}
-    >
+    <Dialog header={<Header variant="dialog" title="Change theme" />} isShowing onClose={onClose}>
       {themes.map(theme => (
         <ThemeListItem
           key={theme}
diff --git a/src/app/pages/onboarding/allow-diagnostics/allow-diagnostics-layout.tsx b/src/app/pages/onboarding/allow-diagnostics/allow-diagnostics-layout.tsx
deleted file mode 100644
index ce7e6ddf6a4..00000000000
--- a/src/app/pages/onboarding/allow-diagnostics/allow-diagnostics-layout.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { OnboardingSelectors } from '@tests/selectors/onboarding.selectors';
-import { Box, Flex, Stack, styled } from 'leather-styles/jsx';
-
-import { Button } from '@app/ui/components/button/button';
-import { Dialog } from '@app/ui/components/containers/dialog/dialog';
-import { Footer } from '@app/ui/components/containers/footers/footer';
-import { Flag } from '@app/ui/components/flag/flag';
-import { CheckmarkIcon } from '@app/ui/icons/';
-import { LogomarkIcon } from '@app/ui/icons/logomark-icon';
-
-interface ReasonToAllowDiagnosticsProps {
-  text: string;
-}
-function ReasonToAllowDiagnostics({ text }: ReasonToAllowDiagnosticsProps) {
-  return (
-    <Flag align="top" img={<CheckmarkIcon variant="small" />}>
-      <styled.span textStyle="body.02">{text}</styled.span>
-    </Flag>
-  );
-}
-
-interface AllowDiagnosticsLayoutProps {
-  onUserAllowDiagnostics(): void;
-  onUserDenyDiagnostics(): void;
-}
-export function AllowDiagnosticsLayout({
-  onUserAllowDiagnostics,
-  onUserDenyDiagnostics,
-}: AllowDiagnosticsLayoutProps) {
-  // this dialog cannot close without a footer action has no header
-  return (
-    <Dialog
-      isShowing
-      onClose={() => null}
-      footer={
-        <Footer>
-          <Flex flexDirection="row" gap="space.04">
-            <Button
-              flexGrow={1}
-              variant="outline"
-              onClick={() => onUserDenyDiagnostics()}
-              data-testid={OnboardingSelectors.DenyAnalyticsBtn}
-            >
-              Deny
-            </Button>
-            <Button
-              autoFocus
-              flexGrow={1}
-              data-testid={OnboardingSelectors.AllowAnalyticsBtn}
-              onClick={onUserAllowDiagnostics}
-            >
-              Allow
-            </Button>
-          </Flex>
-        </Footer>
-      }
-    >
-      <styled.header padding="space.04">
-        <Box p="space.02">
-          <LogomarkIcon />
-        </Box>
-      </styled.header>
-      <Stack p="space.05" gap="space.05">
-        <styled.h1 textStyle="heading.03">Help us improve</styled.h1>
-        <styled.p textStyle="heading.05">
-          Leather would like to gather deidentified service usage data to help improve the
-          experience of the wallet.
-        </styled.p>
-
-        <Stack gap="space.03">
-          <ReasonToAllowDiagnostics text="Send data about page views, clicks, and errors" />
-          <ReasonToAllowDiagnostics text="This data is tied to randomly-generated IDs, and not personal data such as your Stacks address, keys, balances or IP address" />
-          <ReasonToAllowDiagnostics text="This data is used to generate and send crash reports, help fix errors, and analyze statistics" />
-        </Stack>
-      </Stack>
-    </Dialog>
-  );
-}
diff --git a/src/app/pages/onboarding/allow-diagnostics/allow-diagnostics.tsx b/src/app/pages/onboarding/allow-diagnostics/allow-diagnostics.tsx
deleted file mode 100644
index 4d1dd6e5263..00000000000
--- a/src/app/pages/onboarding/allow-diagnostics/allow-diagnostics.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { useCallback, useEffect } from 'react';
-import { useDispatch } from 'react-redux';
-import { useLocation, useNavigate } from 'react-router-dom';
-
-import { RouteUrls } from '@shared/route-urls';
-
-import { useAnalytics } from '@app/common/hooks/analytics/use-analytics';
-import { settingsActions } from '@app/store/settings/settings.actions';
-
-import { AllowDiagnosticsLayout } from './allow-diagnostics-layout';
-
-export function AllowDiagnosticsModal() {
-  const navigate = useNavigate();
-  const dispatch = useDispatch();
-  const analytics = useAnalytics();
-  const { pathname } = useLocation();
-
-  useEffect(() => void analytics.page('view', `${pathname}`), [analytics, pathname]);
-
-  const setDiagnosticsPermissionsAndGoToOnboarding = useCallback(
-    (areDiagnosticsAllowed: boolean) => {
-      dispatch(settingsActions.setHasAllowedAnalytics(areDiagnosticsAllowed));
-
-      navigate(RouteUrls.Onboarding);
-    },
-    [navigate, dispatch]
-  );
-
-  return (
-    <AllowDiagnosticsLayout
-      onUserDenyDiagnostics={() => {
-        void analytics.track('respond_diagnostics_consent', {
-          areDiagnosticsAllowed: false,
-        });
-        setDiagnosticsPermissionsAndGoToOnboarding(false);
-      }}
-      onUserAllowDiagnostics={() => {
-        void analytics.track('respond_diagnostics_consent', {
-          areDiagnosticsAllowed: true,
-        });
-        setDiagnosticsPermissionsAndGoToOnboarding(true);
-      }}
-    />
-  );
-}
diff --git a/src/app/pages/onboarding/welcome/welcome.tsx b/src/app/pages/onboarding/welcome/welcome.tsx
index ae3a1d54166..b9431d15d6d 100644
--- a/src/app/pages/onboarding/welcome/welcome.tsx
+++ b/src/app/pages/onboarding/welcome/welcome.tsx
@@ -9,11 +9,9 @@ import { useOnboardingState } from '@app/common/hooks/auth/use-onboarding-state'
 import { useKeyActions } from '@app/common/hooks/use-key-actions';
 import { doesBrowserSupportWebUsbApi, isPopupMode, whenPageMode } from '@app/common/utils';
 import { openIndexPageInNewTab } from '@app/common/utils/open-in-new-tab';
-import { useHasUserRespondedToAnalyticsConsent } from '@app/store/settings/settings.selectors';
 import { WelcomeLayout } from '@app/ui/pages/welcome.layout';
 
 export function WelcomePage() {
-  const hasResponded = useHasUserRespondedToAnalyticsConsent();
   const navigate = useNavigate();
   const { decodedAuthRequest } = useOnboardingState();
   const analytics = useAnalytics();
@@ -39,7 +37,6 @@ export function WelcomePage() {
   }, [keyActions, analytics, decodedAuthRequest, navigate]);
 
   useEffect(() => {
-    if (!hasResponded) navigate(RouteUrls.RequestDiagnostics);
     return () => setIsGeneratingWallet(false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
diff --git a/src/app/pages/unlock.tsx b/src/app/pages/unlock.tsx
index 8906f5f5b98..da4ad908c1a 100644
--- a/src/app/pages/unlock.tsx
+++ b/src/app/pages/unlock.tsx
@@ -1,17 +1,17 @@
 import { Outlet, useNavigate } from 'react-router-dom';
 
-import { RouteUrls } from '@shared/route-urls';
-
 import { RequestPassword } from '@app/components/request-password';
 
 export function Unlock() {
   const navigate = useNavigate();
 
-  const handleSuccess = () => navigate(RouteUrls.Home);
+  // Here we want to return to the previous route. The user could land on any
+  // page when the wallet is locked, so we can't assume as single route.
+  const returnToPreviousRoute = () => navigate(-1);
 
   return (
     <>
-      <RequestPassword onSuccess={handleSuccess} />
+      <RequestPassword onSuccess={returnToPreviousRoute} />
       <Outlet />
     </>
   );
diff --git a/src/app/query/bitcoin/address/transactions-by-address.query.ts b/src/app/query/bitcoin/address/transactions-by-address.query.ts
index 794a6b80687..8f13efe7b6e 100644
--- a/src/app/query/bitcoin/address/transactions-by-address.query.ts
+++ b/src/app/query/bitcoin/address/transactions-by-address.query.ts
@@ -7,7 +7,7 @@ import { useBitcoinClient } from '@app/store/common/api-clients.hooks';
 
 const staleTime = 10 * 1000;
 
-const queryOptions = { staleTime, refetchInterval: staleTime };
+const queryOptions = { staleTime, cacheTime: Infinity, refetchInterval: staleTime };
 
 export function useGetBitcoinTransactionsByAddressQuery<T extends unknown = BitcoinTx[]>(
   address: string,
diff --git a/src/app/query/bitcoin/bitcoin-client.ts b/src/app/query/bitcoin/bitcoin-client.ts
index fa5ea9c7019..5882888ac1c 100644
--- a/src/app/query/bitcoin/bitcoin-client.ts
+++ b/src/app/query/bitcoin/bitcoin-client.ts
@@ -98,10 +98,11 @@ interface Brc20WalletBalancesResponse {
   data: Brc20Balance[];
 }
 
-export interface Brc20Token extends Brc20Balance, Brc20TickerInfo {
+export interface Brc20Token {
   balance: Money | null;
   holderAddress: string;
   marketData: MarketData | null;
+  tokenData: Brc20Balance & Brc20TickerInfo;
 }
 
 /* RUNES */
@@ -149,8 +150,9 @@ interface RunesTickerInfoResponse {
   data: RuneTickerInfo;
 }
 
-export interface RuneToken extends RuneBalance, RuneTickerInfo {
+export interface RuneToken {
   balance: Money;
+  tokenData: RuneBalance & RuneTickerInfo;
 }
 
 export interface RunesOutputsByAddress {
diff --git a/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.hooks.ts b/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.hooks.ts
index c2db9af9c99..cb3e43ddab9 100644
--- a/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.hooks.ts
+++ b/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.hooks.ts
@@ -1,10 +1,11 @@
 import BigNumber from 'bignumber.js';
 
 import { createMarketData, createMarketPair } from '@shared/models/market.model';
-import { createMoney } from '@shared/models/money.model';
+import { type Money, createMoney } from '@shared/models/money.model';
 
 import { unitToFractionalUnit } from '@app/common/money/unit-conversion';
 import { useGetBrc20TokensQuery } from '@app/query/bitcoin/ordinals/brc20/brc20-tokens.query';
+import { useCalculateBitcoinFiatValue } from '@app/query/common/market-data/market-data.hooks';
 import { useConfigOrdinalsbot } from '@app/query/common/remote-config/remote-config.query';
 import { useAppDispatch } from '@app/store';
 import { useCurrentAccountIndex } from '@app/store/accounts/account';
@@ -81,29 +82,40 @@ export function useBrc20Transfers(holderAddress: string) {
   };
 }
 
-function makeBrc20Token(token: Brc20Token) {
+function makeBrc20Token(priceAsFiat: Money, token: Brc20Token) {
   return {
     ...token,
     balance: createMoney(
-      unitToFractionalUnit(token.decimals)(new BigNumber(token.overall_balance)),
-      token.ticker,
-      token.decimals
+      unitToFractionalUnit(token.tokenData.decimals)(
+        new BigNumber(token.tokenData.overall_balance)
+      ),
+      token.tokenData.ticker,
+      token.tokenData.decimals
     ),
-    marketData: token.min_listed_unit_price
+    marketData: token.tokenData.min_listed_unit_price
       ? createMarketData(
-          createMarketPair(token.ticker, 'USD'),
-          createMoney(new BigNumber(token.min_listed_unit_price), 'USD')
+          createMarketPair(token.tokenData.ticker, 'USD'),
+          createMoney(priceAsFiat.amount, 'USD')
         )
       : null,
   };
 }
 
 export function useBrc20Tokens() {
+  const calculateBitcoinFiatValue = useCalculateBitcoinFiatValue();
   const { data: allBrc20TokensResponse } = useGetBrc20TokensQuery();
-  const brc20Tokens = allBrc20TokensResponse?.pages
+
+  const tokens = allBrc20TokensResponse?.pages
     .flatMap(page => page.brc20Tokens)
     .filter(token => token.length > 0)
     .flatMap(token => token);
 
-  return brc20Tokens?.map(token => makeBrc20Token(token)) ?? [];
+  return (
+    tokens?.map(token => {
+      const priceAsFiat = calculateBitcoinFiatValue(
+        createMoney(new BigNumber(token.tokenData.min_listed_unit_price ?? 0), 'BTC')
+      );
+      return makeBrc20Token(priceAsFiat, token);
+    }) ?? []
+  );
 }
diff --git a/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.query.ts b/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.query.ts
index a4a7ff2feb0..c5a294cc309 100644
--- a/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.query.ts
+++ b/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.query.ts
@@ -59,14 +59,13 @@ export function useGetBrc20TokensQuery() {
           })
         );
 
-        // Initialize token with ticker data
+        // Initialize token with token data
         return brc20Tokens.data.map((token, index) => {
           return {
-            ...token,
-            ...tickerPromises[index].data,
             balance: null,
             holderAddress: address,
             marketData: null,
+            tokenData: { ...token, ...tickerPromises[index].data },
           };
         });
       });
diff --git a/src/app/query/bitcoin/runes/runes-outputs-by-address.query.ts b/src/app/query/bitcoin/runes/runes-outputs-by-address.query.ts
index 9d7fe7928d4..5d92ffb56df 100644
--- a/src/app/query/bitcoin/runes/runes-outputs-by-address.query.ts
+++ b/src/app/query/bitcoin/runes/runes-outputs-by-address.query.ts
@@ -7,6 +7,8 @@ import { useCurrentNetwork } from '@app/store/networks/networks.selectors';
 import type { RunesOutputsByAddress } from '../bitcoin-client';
 import { useRunesEnabled } from './runes.hooks';
 
+const queryOptions = { staleTime: 5 * 60 * 1000 };
+
 export function useGetRunesOutputsByAddressQuery<T extends unknown = RunesOutputsByAddress[]>(
   address: string,
   options?: AppUseQueryConfig<RunesOutputsByAddress[], T>
@@ -16,14 +18,14 @@ export function useGetRunesOutputsByAddressQuery<T extends unknown = RunesOutput
   const network = useCurrentNetwork();
 
   return useQuery({
+    enabled: !!address && runesEnabled,
     queryKey: ['runes-outputs-by-address', address],
     queryFn: () =>
       client.BestinslotApi.getRunesOutputsByAddress({
         address,
         network: network.chain.bitcoin.bitcoinNetwork,
       }),
-    staleTime: 1000 * 60,
-    enabled: !!address && runesEnabled,
+    ...queryOptions,
     ...options,
   });
 }
diff --git a/src/app/query/bitcoin/runes/runes-ticker-info.query.ts b/src/app/query/bitcoin/runes/runes-ticker-info.query.ts
index 9f5a3b2ebc0..36223438ced 100644
--- a/src/app/query/bitcoin/runes/runes-ticker-info.query.ts
+++ b/src/app/query/bitcoin/runes/runes-ticker-info.query.ts
@@ -6,6 +6,8 @@ import { useCurrentNetwork } from '@app/store/networks/networks.selectors';
 
 import type { RuneTickerInfo } from '../bitcoin-client';
 
+const queryOptions = { staleTime: 5 * 60 * 1000 };
+
 export function useGetRunesTickerInfoQuery(runeNames: string[]): UseQueryResult<RuneTickerInfo>[] {
   const client = useBitcoinClient();
   const network = useCurrentNetwork();
@@ -18,6 +20,7 @@ export function useGetRunesTickerInfoQuery(runeNames: string[]): UseQueryResult<
         queryKey: ['runes-ticker-info', runeName],
         queryFn: () =>
           client.BestinslotApi.getRunesTickerInfo(runeName, network.chain.bitcoin.bitcoinNetwork),
+        ...queryOptions,
       };
     }),
   });
diff --git a/src/app/query/bitcoin/runes/runes-wallet-balances.query.ts b/src/app/query/bitcoin/runes/runes-wallet-balances.query.ts
index c501100df88..16e8177c169 100644
--- a/src/app/query/bitcoin/runes/runes-wallet-balances.query.ts
+++ b/src/app/query/bitcoin/runes/runes-wallet-balances.query.ts
@@ -7,6 +7,8 @@ import { useCurrentNetwork } from '@app/store/networks/networks.selectors';
 
 import type { RuneBalance } from '../bitcoin-client';
 
+const queryOptions = { staleTime: 5 * 60 * 1000 };
+
 export function useGetRunesWalletBalancesByAddressesQuery<T extends unknown = RuneBalance[]>(
   addresses: string[],
   options?: AppUseQueryConfig<RuneBalance[], T>
@@ -25,6 +27,7 @@ export function useGetRunesWalletBalancesByAddressesQuery<T extends unknown = Ru
             address,
             network.chain.bitcoin.bitcoinNetwork
           ),
+        ...queryOptions,
         ...options,
       };
     }),
diff --git a/src/app/query/bitcoin/runes/runes.hooks.ts b/src/app/query/bitcoin/runes/runes.hooks.ts
index 7e1cff6e0d8..68ae4966d9e 100644
--- a/src/app/query/bitcoin/runes/runes.hooks.ts
+++ b/src/app/query/bitcoin/runes/runes.hooks.ts
@@ -13,14 +13,16 @@ const defaultRunesSymbol = '¤';
 
 function makeRuneToken(runeBalance: RuneBalance, tickerInfo: RuneTickerInfo): RuneToken {
   return {
-    ...runeBalance,
-    ...tickerInfo,
-    symbol: tickerInfo.symbol ?? defaultRunesSymbol,
     balance: createMoney(
       Number(runeBalance.total_balance),
       tickerInfo.rune_name,
       tickerInfo.decimals
     ),
+    tokenData: {
+      ...runeBalance,
+      ...tickerInfo,
+      symbol: tickerInfo.symbol ?? defaultRunesSymbol,
+    },
   };
 }
 
diff --git a/src/app/routes/app-routes.tsx b/src/app/routes/app-routes.tsx
index efb89d692c2..564cba2a437 100644
--- a/src/app/routes/app-routes.tsx
+++ b/src/app/routes/app-routes.tsx
@@ -33,7 +33,6 @@ import { ChooseAccount } from '@app/pages/choose-account/choose-account';
 import { ChooseCryptoAssetToFund } from '@app/pages/fund/choose-asset-to-fund/choose-asset-to-fund';
 import { FundPage } from '@app/pages/fund/fund';
 import { Home } from '@app/pages/home/home';
-import { AllowDiagnosticsModal } from '@app/pages/onboarding/allow-diagnostics/allow-diagnostics';
 import { BackUpSecretKeyPage } from '@app/pages/onboarding/back-up-secret-key/back-up-secret-key';
 import { SignIn } from '@app/pages/onboarding/sign-in/sign-in';
 import { WelcomePage } from '@app/pages/onboarding/welcome/welcome';
@@ -129,7 +128,6 @@ function useAppRoutes() {
             </OnboardingGate>
           }
         >
-          <Route path={RouteUrls.RequestDiagnostics} element={<AllowDiagnosticsModal />} />
           <Route path={RouteUrls.ConnectLedgerStart} element={<ConnectLedgerStart />} />
           <Route path={RouteUrls.LedgerUnsupportedBrowser} element={<UnsupportedBrowserLayout />} />
 
diff --git a/src/app/store/settings/settings.selectors.ts b/src/app/store/settings/settings.selectors.ts
index 4103be10dda..dbb64f30d64 100644
--- a/src/app/store/settings/settings.selectors.ts
+++ b/src/app/store/settings/settings.selectors.ts
@@ -12,24 +12,6 @@ export function useUserSelectedTheme() {
   return useSelector(selectUserSelectedTheme);
 }
 
-const selectHasUserExplicitlyDeclinedAnalytics = createSelector(
-  selectSettings,
-  state => state.hasAllowedAnalytics === false
-);
-
-export function useHasUserExplicitlyDeclinedAnalytics() {
-  return useSelector(selectHasUserExplicitlyDeclinedAnalytics);
-}
-
-const selectHasUserRespondedToAnalyticsConsent = createSelector(
-  selectSettings,
-  state => state.hasAllowedAnalytics !== null
-);
-
-export function useHasUserRespondedToAnalyticsConsent() {
-  return useSelector(selectHasUserRespondedToAnalyticsConsent);
-}
-
 const selectDismissedMessageIds = createSelector(
   selectSettings,
   state => state.dismissedMessages ?? []
diff --git a/src/app/store/settings/settings.slice.ts b/src/app/store/settings/settings.slice.ts
index 36105a6b890..edce40b7e0c 100644
--- a/src/app/store/settings/settings.slice.ts
+++ b/src/app/store/settings/settings.slice.ts
@@ -2,16 +2,13 @@ import { PayloadAction, createSlice } from '@reduxjs/toolkit';
 
 import { UserSelectedTheme } from '@app/common/theme-provider';
 
-type HasAcceptedAnalytics = null | boolean;
 interface InitialState {
   userSelectedTheme: UserSelectedTheme;
-  hasAllowedAnalytics: HasAcceptedAnalytics;
   dismissedMessages: string[];
 }
 
 const initialState: InitialState = {
   userSelectedTheme: 'system',
-  hasAllowedAnalytics: null,
   dismissedMessages: [],
 };
 
@@ -22,9 +19,6 @@ export const settingsSlice = createSlice({
     setUserSelectedTheme(state, action: PayloadAction<UserSelectedTheme>) {
       state.userSelectedTheme = action.payload;
     },
-    setHasAllowedAnalytics(state, action: PayloadAction<boolean>) {
-      state.hasAllowedAnalytics = action.payload;
-    },
     messageDismissed(state, action: PayloadAction<string>) {
       if (!Array.isArray(state.dismissedMessages)) state.dismissedMessages = [];
       state.dismissedMessages = [...state.dismissedMessages, action.payload];
diff --git a/src/app/ui/components/containers/dialog/dialog.stories.tsx b/src/app/ui/components/containers/dialog/dialog.stories.tsx
index dbbb86e3770..fc746780938 100644
--- a/src/app/ui/components/containers/dialog/dialog.stories.tsx
+++ b/src/app/ui/components/containers/dialog/dialog.stories.tsx
@@ -18,7 +18,11 @@ export function Dialog() {
   return (
     <>
       <Button onClick={() => setIsShowing(!isShowing)}>Open</Button>
-      <Component isShowing={isShowing} onClose={() => setIsShowing(false)}>
+      <Component
+        header={<h1>Some Header</h1>}
+        isShowing={isShowing}
+        onClose={() => setIsShowing(false)}
+      >
         <h1>Some Dialog</h1>
       </Component>
     </>
diff --git a/src/app/ui/components/containers/dialog/dialog.tsx b/src/app/ui/components/containers/dialog/dialog.tsx
index be96b35cc7f..84ec243ac56 100644
--- a/src/app/ui/components/containers/dialog/dialog.tsx
+++ b/src/app/ui/components/containers/dialog/dialog.tsx
@@ -14,7 +14,7 @@ export interface DialogProps {
 interface RadixDialogProps extends DialogProps {
   children: ReactNode;
   footer?: ReactNode;
-  header?: ReactElement<any, string | JSXElementConstructor<any>>;
+  header: ReactElement<any, string | JSXElementConstructor<any>>;
   onGoBack?(): void;
   wrapChildren?: boolean;
 }
diff --git a/src/background/background.ts b/src/background/background.ts
index d2a78af40bd..81e9d6ec221 100755
--- a/src/background/background.ts
+++ b/src/background/background.ts
@@ -3,7 +3,6 @@
 // https://developer.chrome.com/docs/extensions/mv3/architecture-overview/#background_script
 import { logger } from '@shared/logger';
 import { CONTENT_SCRIPT_PORT, type LegacyMessageFromContentScript } from '@shared/message-types';
-import { RouteUrls } from '@shared/route-urls';
 import { WalletRequests } from '@shared/rpc/rpc-methods';
 import { warnUsersAboutDevToolsDangers } from '@shared/utils/dev-tools-warning-log';
 
@@ -21,7 +20,7 @@ warnUsersAboutDevToolsDangers();
 chrome.runtime.onInstalled.addListener(async details => {
   if (details.reason === 'install' && process.env.WALLET_ENVIRONMENT !== 'testing') {
     await chrome.tabs.create({
-      url: chrome.runtime.getURL(`index.html#${RouteUrls.RequestDiagnostics}`),
+      url: chrome.runtime.getURL(`index.html`),
     });
   }
 });
diff --git a/src/background/messaging/rpc-methods/get-addresses.ts b/src/background/messaging/rpc-methods/get-addresses.ts
index ca72c570bf1..396478563a2 100644
--- a/src/background/messaging/rpc-methods/get-addresses.ts
+++ b/src/background/messaging/rpc-methods/get-addresses.ts
@@ -15,15 +15,12 @@ export async function rpcGetAddresses(message: GetAddressesRequest, port: chrome
   listenForPopupClose({
     tabId,
     id,
-    response: {
+    response: makeRpcErrorResponse('getAddresses', {
       id: message.id,
-      result: makeRpcErrorResponse('getAddresses', {
-        id: message.id,
-        error: {
-          code: RpcErrorCode.USER_REJECTION,
-          message: 'User rejected request to get addresses',
-        },
-      }),
-    },
+      error: {
+        code: RpcErrorCode.USER_REJECTION,
+        message: 'User rejected request to get addresses',
+      },
+    }),
   });
 }
diff --git a/src/shared/route-urls.ts b/src/shared/route-urls.ts
index d9bffa73381..92141e0e63f 100644
--- a/src/shared/route-urls.ts
+++ b/src/shared/route-urls.ts
@@ -1,6 +1,5 @@
 export enum RouteUrls {
   // Onboarding routes
-  RequestDiagnostics = '/get-started/request-diagnostics',
   Onboarding = '/get-started',
   BackUpSecretKey = '/back-up-secret-key',
   SetPassword = '/set-password',
diff --git a/src/shared/utils/analytics.ts b/src/shared/utils/analytics.ts
index 8f074d38806..ecaec8413fa 100644
--- a/src/shared/utils/analytics.ts
+++ b/src/shared/utils/analytics.ts
@@ -12,7 +12,6 @@ import { base58 } from '@scure/base';
 import { AnalyticsBrowser } from '@segment/analytics-next';
 import * as Sentry from '@sentry/react';
 import { token } from 'leather-styles/tokens';
-import { getStoredState } from 'redux-persist';
 
 import {
   IS_TEST_ENV,
@@ -20,9 +19,6 @@ import {
   SENTRY_DSN,
   WALLET_ENVIRONMENT,
 } from '@shared/environment';
-import { persistConfig } from '@shared/storage/redux-pesist';
-
-import type { RootState } from '@app/store';
 
 export const analytics = new AnalyticsBrowser();
 
@@ -110,11 +106,6 @@ export function initSentry() {
     environment: WALLET_ENVIRONMENT,
     autoSessionTracking: false,
     async beforeSend(event) {
-      const state = (await getStoredState(persistConfig)) as RootState;
-      const hasAllowedAnalytics = state.settings.hasAllowedAnalytics;
-
-      if (!hasAllowedAnalytics) return null;
-
       delete event.user?.ip_address;
       delete event.extra?.ip_address;
 
diff --git a/tests/fixtures/fixtures.ts b/tests/fixtures/fixtures.ts
index ba1b6cf0457..f775b73fed9 100644
--- a/tests/fixtures/fixtures.ts
+++ b/tests/fixtures/fixtures.ts
@@ -44,6 +44,7 @@ export const test = base.extend<TestFixtures>({
       ],
     });
     await use(context);
+    await context.close();
   },
   extensionId: async ({ context }, use) => {
     let [background] = context.serviceWorkers();
diff --git a/tests/page-object-models/onboarding.page.ts b/tests/page-object-models/onboarding.page.ts
index e1d17fd4010..9f47fbe13e1 100644
--- a/tests/page-object-models/onboarding.page.ts
+++ b/tests/page-object-models/onboarding.page.ts
@@ -6,6 +6,8 @@ import { OnboardingSelectors } from '@tests/selectors/onboarding.selectors';
 import type { SupportedBlockchains } from '@shared/constants';
 import { RouteUrls } from '@shared/route-urls';
 
+import { test } from '../fixtures/fixtures';
+
 const TEST_ACCOUNT_SECRET_KEY = process.env.TEST_ACCOUNT_SECRET_KEY ?? '';
 
 // If default wallet state changes, we'll need to update this
@@ -40,7 +42,6 @@ export const testSoftwareAccountDefaultWalletState = {
   },
   settings: {
     userSelectedTheme: 'system',
-    hasAllowedAnalytics: false,
     dismissedMessages: [],
   },
   _persist: { version: 2, rehydrated: true },
@@ -225,18 +226,13 @@ export function makeLedgerTestAccountWalletState(keysToInclude: SupportedBlockch
         'Explore apps': 0,
       },
     },
-    settings: { dismissedMessages: [], hasAllowedAnalytics: false, userSelectedTheme: 'system' },
+    settings: { dismissedMessages: [], userSelectedTheme: 'system' },
   };
 }
 
 export class OnboardingPage {
   constructor(readonly page: Page) {}
 
-  async denyAnalytics() {
-    await this.page.getByTestId(OnboardingSelectors.DenyAnalyticsBtn).click();
-    await this.page.waitForURL('**' + RouteUrls.Onboarding);
-  }
-
   async setPassword() {
     await this.page.waitForURL('**' + RouteUrls.SetPassword);
     await this.page.getByTestId(OnboardingSelectors.NewPasswordInput).fill(TEST_PASSWORD);
@@ -245,14 +241,12 @@ export class OnboardingPage {
   }
 
   async signUpNewUser() {
-    await this.denyAnalytics();
     await this.page.getByTestId(OnboardingSelectors.SignUpBtn).click();
     await this.page.waitForURL('**' + RouteUrls.BackUpSecretKey);
     await this.page.getByTestId(OnboardingSelectors.BackUpSecretKeyBtn).click();
     await this.setPassword();
   }
   async initiateSignIn() {
-    await this.denyAnalytics();
     await this.page.getByTestId(OnboardingSelectors.SignInLink).click();
   }
 
@@ -287,11 +281,15 @@ export class OnboardingPage {
    * account
    */
   async signInWithTestAccount(id: string) {
-    await this.page.evaluate(
-      walletState => chrome.storage.local.set({ 'persist:root': walletState }),
-      testSoftwareAccountDefaultWalletState
-    );
-    await this.page.goto(`chrome-extension://${id}/index.html`);
+    const isUnlockPage = async () => await this.page.getByText('Enter your password').isVisible();
+    while (!(await isUnlockPage())) {
+      await this.page.evaluate(
+        async walletState => await chrome.storage.local.set({ 'persist:root': walletState }),
+        testSoftwareAccountDefaultWalletState
+      );
+      await this.page.goto(`chrome-extension://${id}/index.html`);
+    }
+    await test.expect(this.page.getByText('Enter your password')).toBeVisible();
     await this.page.getByRole('textbox').fill(TEST_PASSWORD);
     await this.page.getByRole('button', { name: 'Continue' }).click();
     await this.page.waitForURL('**' + RouteUrls.Home);
diff --git a/tests/selectors/onboarding.selectors.ts b/tests/selectors/onboarding.selectors.ts
index fa4e8cb66f7..c644c4b4b3b 100644
--- a/tests/selectors/onboarding.selectors.ts
+++ b/tests/selectors/onboarding.selectors.ts
@@ -1,7 +1,5 @@
 export enum OnboardingSelectors {
-  AllowAnalyticsBtn = 'allow-analytics-btn',
   BackUpSecretKeyBtn = 'back-up-secret-key-btn',
-  DenyAnalyticsBtn = 'deny-analytics-btn',
   LogoRouteToHome = 'logo-route-to-home',
   NewPasswordInput = 'set-or-enter-password-input',
   NoAssetsFundAccountLink = 'no-assets-fund-account-link',
diff --git a/tests/specs/rpc-get-addresses/get-addresses.spec.ts b/tests/specs/rpc-get-addresses/get-addresses.spec.ts
new file mode 100644
index 00000000000..99da32356a8
--- /dev/null
+++ b/tests/specs/rpc-get-addresses/get-addresses.spec.ts
@@ -0,0 +1,139 @@
+import '@leather-wallet/types';
+import type { BrowserContext, Page } from '@playwright/test';
+import { TEST_PASSWORD } from '@tests/mocks/constants';
+import { makeLedgerTestAccountWalletState } from '@tests/page-object-models/onboarding.page';
+
+import type { SupportedBlockchains } from '@shared/constants';
+
+import { test } from '../../fixtures/fixtures';
+
+function softwareBeforeEach() {
+  return () =>
+    test.beforeEach(
+      async ({ extensionId, onboardingPage }) =>
+        await onboardingPage.signInWithTestAccount(extensionId)
+    );
+}
+
+function ledgerBeforeEach(state: object) {
+  return () =>
+    test.beforeEach(
+      async ({ extensionId, onboardingPage }) =>
+        await onboardingPage.signInWithLedgerAccount(extensionId, state)
+    );
+}
+
+function getExpectedResponseForKeys(keys: SupportedBlockchains[]) {
+  const bitcoinKeys = [
+    {
+      symbol: 'BTC',
+      type: 'p2wpkh',
+      address: 'bc1q530dz4h80kwlzywlhx2qn0k6vdtftd93c499yq',
+      publicKey: '030347be500a8b2707a00e7576c0c527a247cddc6e8363ee51147b8e43b590baa9',
+      derivationPath: "m/84'/0'/0'/0/0",
+    },
+    {
+      symbol: 'BTC',
+      type: 'p2tr',
+      address: 'bc1putuzj9lyfcm8fef9jpy85nmh33cxuq9u6wyuk536t9kemdk37yjqmkc0pg',
+      publicKey: '0347b913aed4ee088b6fea3e9537836a1c8f1b72111cf010af5589d93f3a433f02',
+      tweakedPublicKey: '47b913aed4ee088b6fea3e9537836a1c8f1b72111cf010af5589d93f3a433f02',
+      derivationPath: "m/86'/0'/0'/0/0",
+    },
+  ];
+  const stacksKeys = [{ symbol: 'STX', address: 'SPS8CKF63P16J28AYF7PXW9E5AACH0NZNTEFWSFE' }];
+  return {
+    jsonrpc: '2.0',
+    result: {
+      addresses: [
+        ...(keys.includes('bitcoin') ? bitcoinKeys : []),
+        ...(keys.includes('stacks') ? stacksKeys : []),
+      ],
+    },
+  };
+}
+
+async function interceptRequestPopup(context: BrowserContext) {
+  return context.waitForEvent('page');
+}
+
+async function initiateGetAddresses(page: Page) {
+  return page.evaluate(async () => window.LeatherProvider?.request('getAddresses'));
+}
+
+async function clickConnectLeatherButton(popup: Page) {
+  const button = popup.getByText('Connect Leather');
+  await test.expect(button).toBeVisible();
+  await button.click();
+}
+
+test.describe('Rpc: GetAddresses', () => {
+  test.beforeEach(
+    async ({ extensionId, globalPage }) => await globalPage.setupAndUseApiCalls(extensionId)
+  );
+
+  const specs = {
+    softwareWallet: {
+      beforeEach: softwareBeforeEach(),
+      expectedResult: getExpectedResponseForKeys(['bitcoin', 'stacks']),
+    },
+    ledgerWithBitcoinAndStacksKey: {
+      beforeEach: ledgerBeforeEach(makeLedgerTestAccountWalletState(['bitcoin', 'stacks'])),
+      expectedResult: getExpectedResponseForKeys(['bitcoin', 'stacks']),
+    },
+    ledgerWithStacksKeysOnly: {
+      beforeEach: ledgerBeforeEach(makeLedgerTestAccountWalletState(['stacks'])),
+      expectedResult: getExpectedResponseForKeys(['stacks']),
+    },
+    ledgerWithBitcoinKeysOnly: {
+      beforeEach: ledgerBeforeEach(makeLedgerTestAccountWalletState(['bitcoin'])),
+      expectedResult: getExpectedResponseForKeys(['bitcoin']),
+    },
+  } as const;
+
+  for (const [walletPreset, { beforeEach, expectedResult }] of Object.entries(specs)) {
+    test.describe(`${walletPreset} `, () => {
+      beforeEach();
+
+      test('the promise resolves with addresses successfully', async ({ page, context }) => {
+        await page.goto('localhost:3000');
+        const getAddressesPromise = initiateGetAddresses(page);
+
+        const popup = await interceptRequestPopup(context);
+        await clickConnectLeatherButton(popup);
+
+        const result = await getAddressesPromise;
+        if (!result) throw new Error('Expected result');
+        const { id, ...payloadWithoutId } = result;
+
+        test.expect(payloadWithoutId).toEqual(expectedResult);
+      });
+
+      test('the promise rejects when user closes popup window', async ({ page, context }) => {
+        await page.goto('localhost:3000');
+        const getAddressesPromise = initiateGetAddresses(page);
+        const popup = await interceptRequestPopup(context);
+        await popup.close();
+        await test.expect(getAddressesPromise).rejects.toThrow();
+      });
+
+      if (walletPreset === 'softwareWallet') {
+        test('it redirects back to get addresses flow when wallet is locked', async ({
+          homePage,
+          page,
+          context,
+        }) => {
+          await homePage.lock();
+          await page.goto('localhost:3000');
+          const getAddressesPromise = initiateGetAddresses(page);
+          const popup = await interceptRequestPopup(context);
+          await popup.getByRole('textbox').fill(TEST_PASSWORD);
+          await popup.getByRole('button', { name: 'Continue' }).click();
+          await test.expect(popup.getByText('Connect Leather')).toBeVisible();
+          await clickConnectLeatherButton(popup);
+          await test.expect(getAddressesPromise).resolves.toMatchObject(expectedResult);
+        });
+      }
+    });
+  }
+});
diff --git a/tests/specs/settings/settings.spec.ts b/tests/specs/settings/settings.spec.ts
index 1ed4296a0c0..5afe444075b 100644
--- a/tests/specs/settings/settings.spec.ts
+++ b/tests/specs/settings/settings.spec.ts
@@ -25,7 +25,7 @@ test.describe('Settings menu', () => {
 
   test('that menu item can perform sign out', async ({ homePage, onboardingPage }) => {
     await homePage.signOut();
-    const button = onboardingPage.page.getByTestId(OnboardingSelectors.DenyAnalyticsBtn);
+    const button = onboardingPage.page.getByTestId(OnboardingSelectors.SignUpBtn);
     test.expect(button).toBeTruthy();
   });
 
diff --git a/tests/specs/store-migrations/store-migrations.spec.ts b/tests/specs/store-migrations/store-migrations.spec.ts
index a159bec5787..1295e1944b6 100644
--- a/tests/specs/store-migrations/store-migrations.spec.ts
+++ b/tests/specs/store-migrations/store-migrations.spec.ts
@@ -10,7 +10,7 @@ test.describe('Store migrations', () => {
 
   test.describe('Migration 0 --> 2', () => {
     const previousSerializedState =
-      '{"analytics":"{\\"hasStxDeposits\\":{\\"1\\":true,\\"2147483648\\":true}}","chains":"{\\"stx\\":{\\"default\\":{\\"highestAccountIndex\\":16,\\"currentAccountIndex\\":0}}}","keys":"{\\"ids\\":[\\"default\\"],\\"entities\\":{\\"default\\":{\\"type\\":\\"software\\",\\"id\\":\\"default\\",\\"salt\\":\\"c4cccf33166051f7704cd877a2f03f93\\",\\"encryptedSecretKey\\":\\"b7f516798e7160eca15c50b62e588698937f8ecf3930efc42baa690ddc0c7a51b74e3e4b129859274ed272652bc47651c6b6effbddf4d72a3eb9d2ea657b64a833c9bdccb562e45d94f0cc1366154072f12d35290566a99a6f952cd234ca9259\\"}}}","networks":"{\\"ids\\":[],\\"entities\\":{},\\"currentNetworkId\\":\\"mainnet\\"}","onboarding":"{\\"hideSteps\\":true,\\"stepsStatus\\":{\\"Back up secret key\\":1,\\"Add some funds\\":0,\\"Explore apps\\":0,\\"Buy an NFT\\":0}}","settings":"{\\"userSelectedTheme\\":\\"system\\",\\"hasAllowedAnalytics\\":false,\\"dismissedMessages\\":[]}","_persist":"{\\"version\\":1,\\"rehydrated\\":true}"}';
+      '{"analytics":"{\\"hasStxDeposits\\":{\\"1\\":true,\\"2147483648\\":true}}","chains":"{\\"stx\\":{\\"default\\":{\\"highestAccountIndex\\":16,\\"currentAccountIndex\\":0}}}","keys":"{\\"ids\\":[\\"default\\"],\\"entities\\":{\\"default\\":{\\"type\\":\\"software\\",\\"id\\":\\"default\\",\\"salt\\":\\"c4cccf33166051f7704cd877a2f03f93\\",\\"encryptedSecretKey\\":\\"b7f516798e7160eca15c50b62e588698937f8ecf3930efc42baa690ddc0c7a51b74e3e4b129859274ed272652bc47651c6b6effbddf4d72a3eb9d2ea657b64a833c9bdccb562e45d94f0cc1366154072f12d35290566a99a6f952cd234ca9259\\"}}}","networks":"{\\"ids\\":[],\\"entities\\":{},\\"currentNetworkId\\":\\"mainnet\\"}","onboarding":"{\\"hideSteps\\":true,\\"stepsStatus\\":{\\"Back up secret key\\":1,\\"Add some funds\\":0,\\"Explore apps\\":0,\\"Buy an NFT\\":0}}","settings":"{\\"userSelectedTheme\\":\\"system\\",\\"dismissedMessages\\":[]}","_persist":"{\\"version\\":1,\\"rehydrated\\":true}"}';
 
     test('that the app detects old store format', async ({ extensionId, globalPage }) => {
       const { page } = globalPage;