From 214ee4df738f3c7cdc3e972616057acffaa3408a Mon Sep 17 00:00:00 2001
From: Anton Lykhoyda <lykhoyda@gmail.com>
Date: Fri, 6 Dec 2024 17:35:03 +0100
Subject: [PATCH 1/9] add navigation

---
 packages/web-wallet/package.json              |   3 +-
 .../src/assets/icons/arrow-receive.svg        |   3 +
 .../src/assets/icons/arrow-transfer.svg       |   3 +
 .../web-wallet/src/assets/icons/clock.svg     |   3 +
 .../src/assets/icons/shield-divided.svg       |   3 +
 .../web-wallet/src/assets/icons/shield.svg    |   3 +
 .../web-wallet/src/assets/icons/summary.svg   |   3 +
 packages/web-wallet/src/assets/index.ts       |  14 +
 .../src/components/Footer/Footer.tsx          |   8 +-
 .../src/components/Header/Header.tsx          |  23 +-
 .../src/components/Layout/Layout.tsx          |   2 +-
 .../ProtectedRoute/ProtectedRoute.tsx         |  15 ++
 packages/web-wallet/src/main.tsx              |  22 +-
 .../web-wallet/src/pages/AccountSummary.tsx   |   5 +
 packages/web-wallet/src/pages/Dashboard.tsx   |  68 ++++-
 packages/web-wallet/src/pages/Home.tsx        |  13 +-
 packages/web-wallet/src/pages/Receive.tsx     |   5 +
 .../src/pages/TransactionHistory.tsx          |   5 +
 .../web-wallet/src/pages/TransferBalance.tsx  |   5 +
 packages/web-wallet/src/styles/index.css      |  18 ++
 packages/web-wallet/src/types/custom.d.ts     |   6 -
 packages/web-wallet/tailwind.config.js        |   3 +
 packages/web-wallet/vite.config.ts            |  15 +-
 yarn.lock                                     | 250 +++++++++++++++++-
 24 files changed, 456 insertions(+), 42 deletions(-)
 create mode 100644 packages/web-wallet/src/assets/icons/arrow-receive.svg
 create mode 100644 packages/web-wallet/src/assets/icons/arrow-transfer.svg
 create mode 100644 packages/web-wallet/src/assets/icons/clock.svg
 create mode 100644 packages/web-wallet/src/assets/icons/shield-divided.svg
 create mode 100644 packages/web-wallet/src/assets/icons/shield.svg
 create mode 100644 packages/web-wallet/src/assets/icons/summary.svg
 create mode 100644 packages/web-wallet/src/components/ProtectedRoute/ProtectedRoute.tsx
 create mode 100644 packages/web-wallet/src/pages/AccountSummary.tsx
 create mode 100644 packages/web-wallet/src/pages/Receive.tsx
 create mode 100644 packages/web-wallet/src/pages/TransactionHistory.tsx
 create mode 100644 packages/web-wallet/src/pages/TransferBalance.tsx

diff --git a/packages/web-wallet/package.json b/packages/web-wallet/package.json
index 1f700ea..2c6820c 100644
--- a/packages/web-wallet/package.json
+++ b/packages/web-wallet/package.json
@@ -32,6 +32,7 @@
     "tailwindcss": "^3.4.14",
     "typescript": "~5.6.2",
     "typescript-eslint": "^8.11.0",
-    "vite": "^5.4.10"
+    "vite": "^5.4.10",
+    "vite-plugin-svgr": "^4.3.0"
   }
 }
diff --git a/packages/web-wallet/src/assets/icons/arrow-receive.svg b/packages/web-wallet/src/assets/icons/arrow-receive.svg
new file mode 100644
index 0000000..231a32d
--- /dev/null
+++ b/packages/web-wallet/src/assets/icons/arrow-receive.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M10.5 2C8.81886 2 7.17547 2.49852 5.77766 3.43251C4.37984 4.3665 3.29037 5.69402 2.64703 7.24719C2.00368 8.80036 1.83535 10.5094 2.16333 12.1583C2.4913 13.8071 3.30085 15.3217 4.4896 16.5104C5.67834 17.6992 7.1929 18.5087 8.84173 18.8367C10.4906 19.1646 12.1996 18.9963 13.7528 18.353C15.306 17.7096 16.6335 16.6202 17.5675 15.2223C18.5015 13.8245 19 12.1811 19 10.5C18.9976 8.24639 18.1013 6.08576 16.5078 4.49222C14.9142 2.89868 12.7536 2.00238 10.5 2ZM10.5 17.6923C9.0775 17.6923 7.68694 17.2705 6.50417 16.4802C5.3214 15.6899 4.39955 14.5666 3.85518 13.2524C3.31081 11.9382 3.16838 10.492 3.44589 9.09685C3.72341 7.70168 4.40841 6.42013 5.41427 5.41427C6.42014 4.40841 7.70168 3.72341 9.09685 3.44589C10.492 3.16837 11.9382 3.31081 13.2524 3.85517C14.5666 4.39954 15.6899 5.3214 16.4802 6.50417C17.2705 7.68694 17.6923 9.07749 17.6923 10.5C17.6901 12.4069 16.9317 14.235 15.5833 15.5833C14.235 16.9317 12.4069 17.6901 10.5 17.6923ZM13.578 7.42202C13.6388 7.48274 13.687 7.55485 13.7199 7.63423C13.7528 7.71361 13.7697 7.79869 13.7697 7.88461C13.7697 7.97054 13.7528 8.05562 13.7199 8.135C13.687 8.21437 13.6388 8.28649 13.578 8.34721L9.46284 12.4615H11.8077C11.9811 12.4615 12.1474 12.5304 12.27 12.653C12.3927 12.7757 12.4615 12.942 12.4615 13.1154C12.4615 13.2888 12.3927 13.4551 12.27 13.5777C12.1474 13.7003 11.9811 13.7692 11.8077 13.7692H7.88462C7.71121 13.7692 7.5449 13.7003 7.42228 13.5777C7.29966 13.4551 7.23077 13.2888 7.23077 13.1154V9.19231C7.23077 9.0189 7.29966 8.85259 7.42228 8.72997C7.5449 8.60735 7.71121 8.53846 7.88462 8.53846C8.05803 8.53846 8.22434 8.60735 8.34696 8.72997C8.46958 8.85259 8.53846 9.0189 8.53846 9.19231V11.5372L12.6528 7.42202C12.7135 7.36123 12.7856 7.313 12.865 7.28009C12.9444 7.24719 13.0295 7.23025 13.1154 7.23025C13.2013 7.23025 13.2864 7.24719 13.3658 7.28009C13.4451 7.313 13.5173 7.36123 13.578 7.42202Z" fill="#AFAFAF"/>
+</svg>
diff --git a/packages/web-wallet/src/assets/icons/arrow-transfer.svg b/packages/web-wallet/src/assets/icons/arrow-transfer.svg
new file mode 100644
index 0000000..92a4e73
--- /dev/null
+++ b/packages/web-wallet/src/assets/icons/arrow-transfer.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.7692 7.88461V11.8077C13.7692 11.9811 13.7003 12.1474 13.5777 12.27C13.4551 12.3926 13.2888 12.4615 13.1154 12.4615C12.942 12.4615 12.7757 12.3926 12.653 12.27C12.5304 12.1474 12.4615 11.9811 12.4615 11.8077V9.46283L8.34721 13.578C8.28647 13.6387 8.21435 13.6869 8.13497 13.7198C8.0556 13.7527 7.97053 13.7696 7.88462 13.7696C7.79871 13.7696 7.71363 13.7527 7.63426 13.7198C7.55489 13.6869 7.48277 13.6387 7.42202 13.578C7.36127 13.5172 7.31308 13.4451 7.28021 13.3657C7.24733 13.2864 7.23041 13.2013 7.23041 13.1154C7.23041 13.0295 7.24733 12.9444 7.28021 12.865C7.31308 12.7857 7.36127 12.7135 7.42202 12.6528L11.5372 8.53846H9.19231C9.0189 8.53846 8.85259 8.46957 8.72997 8.34695C8.60735 8.22433 8.53846 8.05802 8.53846 7.88461C8.53846 7.7112 8.60735 7.5449 8.72997 7.42228C8.85259 7.29966 9.0189 7.23077 9.19231 7.23077H13.1154C13.2888 7.23077 13.4551 7.29966 13.5777 7.42228C13.7003 7.5449 13.7692 7.7112 13.7692 7.88461ZM19 10.5C19 12.1811 18.5015 13.8245 17.5675 15.2223C16.6335 16.6202 15.306 17.7096 13.7528 18.353C12.1996 18.9963 10.4906 19.1646 8.84173 18.8367C7.1929 18.5087 5.67834 17.6992 4.4896 16.5104C3.30085 15.3217 2.4913 13.8071 2.16333 12.1583C1.83535 10.5094 2.00368 8.80036 2.64703 7.24719C3.29037 5.69402 4.37984 4.3665 5.77766 3.43251C7.17547 2.49852 8.81886 2 10.5 2C12.7536 2.00238 14.9142 2.89868 16.5078 4.49222C18.1013 6.08576 18.9976 8.24639 19 10.5ZM17.6923 10.5C17.6923 9.07749 17.2705 7.68694 16.4802 6.50417C15.6899 5.3214 14.5666 4.39954 13.2524 3.85517C11.9382 3.31081 10.492 3.16837 9.09685 3.44589C7.70168 3.72341 6.42014 4.40841 5.41427 5.41427C4.40841 6.42013 3.72341 7.70168 3.44589 9.09685C3.16838 10.492 3.31081 11.9382 3.85518 13.2524C4.39955 14.5666 5.3214 15.6899 6.50417 16.4802C7.68694 17.2705 9.0775 17.6923 10.5 17.6923C12.4069 17.6901 14.235 16.9317 15.5833 15.5833C16.9317 14.235 17.6901 12.4069 17.6923 10.5Z" fill="#AFAFAF"/>
+</svg>
diff --git a/packages/web-wallet/src/assets/icons/clock.svg b/packages/web-wallet/src/assets/icons/clock.svg
new file mode 100644
index 0000000..524a261
--- /dev/null
+++ b/packages/web-wallet/src/assets/icons/clock.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 10C18 11.4649 17.5711 12.8978 16.7661 14.1217C15.9611 15.3456 14.8153 16.3069 13.4701 16.887C12.125 17.4672 10.6394 17.6407 9.19683 17.3861C7.75421 17.1316 6.41772 16.4602 5.35234 15.4547C5.29263 15.3983 5.24462 15.3307 5.21105 15.2557C5.17748 15.1807 5.15901 15.0998 5.15668 15.0177C5.15436 14.9356 5.16824 14.8538 5.19752 14.7771C5.2268 14.7003 5.27092 14.6301 5.32734 14.5704C5.4413 14.4498 5.5985 14.3794 5.76435 14.3747C5.84648 14.3724 5.92825 14.3863 6.00501 14.4155C6.08177 14.4448 6.15201 14.4889 6.21172 14.5454C7.10527 15.3883 8.22742 15.9493 9.43796 16.1582C10.6485 16.367 11.8938 16.2145 13.0181 15.7197C14.1425 15.2249 15.0961 14.4097 15.7598 13.376C16.4236 12.3424 16.7679 11.136 16.75 9.90769C16.732 8.67939 16.3524 7.48362 15.6587 6.46981C14.965 5.45599 13.988 4.66907 12.8496 4.20739C11.7112 3.7457 10.462 3.62972 9.25812 3.87394C8.0542 4.11815 6.94895 4.71174 6.08047 5.58052C5.80469 5.85942 5.54531 6.13364 5.29297 6.4063L6.56719 7.68286C6.6547 7.77027 6.7143 7.88168 6.73846 8.00298C6.76261 8.12428 6.75023 8.25003 6.70289 8.36429C6.65554 8.47856 6.57536 8.5762 6.47249 8.64487C6.36962 8.71354 6.24869 8.75014 6.125 8.75005H3C2.83424 8.75005 2.67527 8.6842 2.55806 8.56699C2.44085 8.44978 2.375 8.29081 2.375 8.12505V5.00005C2.3749 4.87636 2.41151 4.75543 2.48017 4.65256C2.54884 4.54969 2.64649 4.4695 2.76076 4.42216C2.87502 4.37481 3.00076 4.36243 3.12207 4.38659C3.24337 4.41075 3.35478 4.47035 3.44219 4.55786L4.40625 5.52348C4.65781 5.25083 4.91719 4.97661 5.19219 4.69927C6.24069 3.64897 7.57723 2.93336 9.03262 2.643C10.488 2.35264 11.9968 2.50059 13.3681 3.06811C14.7394 3.63564 15.9114 4.59724 16.736 5.83119C17.5605 7.06514 18.0004 8.51597 18 10ZM10.5 5.62505C10.3342 5.62505 10.1753 5.69089 10.0581 5.8081C9.94085 5.92531 9.875 6.08429 9.875 6.25005V10C9.87497 10.1079 9.90287 10.214 9.95599 10.3079C10.0091 10.4019 10.0856 10.4804 10.1781 10.536L13.3031 12.411C13.3735 12.4533 13.4515 12.4812 13.5327 12.4934C13.6139 12.5055 13.6967 12.5015 13.7764 12.4816C13.856 12.4617 13.931 12.4264 13.997 12.3775C14.063 12.3287 14.1187 12.2673 14.1609 12.1969C14.2032 12.1265 14.2312 12.0485 14.2433 11.9673C14.2554 11.8861 14.2514 11.8033 14.2316 11.7237C14.2117 11.644 14.1763 11.5691 14.1275 11.5031C14.0786 11.4371 14.0173 11.3814 13.9469 11.3391L11.125 9.64614V6.25005C11.125 6.08429 11.0592 5.92531 10.9419 5.8081C10.8247 5.69089 10.6658 5.62505 10.5 5.62505Z" fill="#AFAFAF"/>
+</svg>
diff --git a/packages/web-wallet/src/assets/icons/shield-divided.svg b/packages/web-wallet/src/assets/icons/shield-divided.svg
new file mode 100644
index 0000000..5a8c47d
--- /dev/null
+++ b/packages/web-wallet/src/assets/icons/shield-divided.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+    <path d="M3.72199 0.245634C3.60921 0.121947 3.45829 0.039545 3.29326 0.011545C3.12823 -0.0164549 2.95857 0.0115568 2.8113 0.0911212C2.66403 0.170686 2.54761 0.297229 2.48058 0.450607C2.41354 0.603985 2.39974 0.77538 2.44137 0.937509C2.20681 1.06715 2.01127 1.25727 1.87509 1.4881C1.7389 1.71892 1.66705 1.98201 1.66699 2.25001V7.50001C1.66699 12.4425 4.05949 15.4378 6.06668 17.0803C8.22855 18.8484 10.3792 19.4494 10.4729 19.4738C10.6018 19.5088 10.7378 19.5088 10.8667 19.4738C10.9942 19.4391 13.7982 18.6506 16.2189 16.2188L17.6148 17.7544C17.6807 17.8286 17.7606 17.8891 17.85 17.9322C17.9394 17.9753 18.0365 18.0002 18.1356 18.0056C18.2347 18.0109 18.3338 17.9965 18.4273 17.9632C18.5208 17.93 18.6068 17.8785 18.6803 17.8117C18.7537 17.745 18.8132 17.6643 18.8552 17.5744C18.8973 17.4845 18.9211 17.3871 18.9252 17.288C18.9293 17.1888 18.9138 17.0898 18.8794 16.9967C18.845 16.9036 18.7924 16.8183 18.7248 16.7456L3.72199 0.245634ZM10.6661 17.9644C9.33987 17.5008 8.10501 16.8088 7.0173 15.9197C4.46262 13.8291 3.16699 10.9969 3.16699 7.50001V2.25001H3.5148L15.2054 15.1078C13.9249 16.387 12.3741 17.3631 10.667 17.9644H10.6661ZM19.667 2.25001V7.50001C19.667 9.42938 19.3023 11.2134 18.5832 12.8053C18.5013 12.9866 18.3507 13.1279 18.1646 13.1981C17.9785 13.2683 17.7722 13.2618 17.5909 13.1799C17.4096 13.0979 17.2683 12.9473 17.1981 12.7612C17.1279 12.5751 17.1344 12.3688 17.2164 12.1875C17.8473 10.7916 18.167 9.2147 18.167 7.50001V2.25001H7.90324C7.70433 2.25001 7.51356 2.17099 7.37291 2.03034C7.23226 1.88969 7.15324 1.69892 7.15324 1.50001C7.15324 1.3011 7.23226 1.11033 7.37291 0.969679C7.51356 0.829027 7.70433 0.750009 7.90324 0.750009H18.167C18.5648 0.750009 18.9463 0.908044 19.2277 1.18935C19.509 1.47065 19.667 1.85218 19.667 2.25001Z" fill="#AFAFAF"/>
+</svg>
diff --git a/packages/web-wallet/src/assets/icons/shield.svg b/packages/web-wallet/src/assets/icons/shield.svg
new file mode 100644
index 0000000..199ca56
--- /dev/null
+++ b/packages/web-wallet/src/assets/icons/shield.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M17.5 0.75H2.5C2.10218 0.75 1.72064 0.908035 1.43934 1.18934C1.15804 1.47064 1 1.85218 1 2.25V7.5C1 12.4425 3.3925 15.4378 5.39969 17.0803C7.56156 18.8484 9.71219 19.4484 9.80594 19.4738C9.93484 19.5088 10.0708 19.5088 10.1997 19.4738C10.2934 19.4484 12.4413 18.8484 14.6059 17.0803C16.6075 15.4378 19 12.4425 19 7.5V2.25C19 1.85218 18.842 1.47064 18.5607 1.18934C18.2794 0.908035 17.8978 0.75 17.5 0.75ZM14.2825 7.28063L9.0325 12.5306C8.96285 12.6004 8.88013 12.6557 8.78908 12.6934C8.69803 12.7312 8.60044 12.7506 8.50187 12.7506C8.40331 12.7506 8.30572 12.7312 8.21467 12.6934C8.12362 12.6557 8.0409 12.6004 7.97125 12.5306L5.72125 10.2806C5.58052 10.1399 5.50146 9.94902 5.50146 9.75C5.50146 9.55098 5.58052 9.36011 5.72125 9.21937C5.86198 9.07864 6.05285 8.99958 6.25187 8.99958C6.4509 8.99958 6.64177 9.07864 6.7825 9.21937L8.5 10.9397L13.2194 6.21937C13.2891 6.14969 13.3718 6.09442 13.4628 6.0567C13.5539 6.01899 13.6515 5.99958 13.75 5.99958C13.8485 5.99958 13.9461 6.01899 14.0372 6.0567C14.1282 6.09442 14.2109 6.14969 14.2806 6.21937C14.3503 6.28906 14.4056 6.37178 14.4433 6.46283C14.481 6.55387 14.5004 6.65145 14.5004 6.75C14.5004 6.84855 14.481 6.94613 14.4433 7.03717C14.4056 7.12822 14.3503 7.21094 14.2806 7.28063H14.2825Z" fill="#AFAFAF"/>
+</svg>
diff --git a/packages/web-wallet/src/assets/icons/summary.svg b/packages/web-wallet/src/assets/icons/summary.svg
new file mode 100644
index 0000000..d27232e
--- /dev/null
+++ b/packages/web-wallet/src/assets/icons/summary.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M14.0381 6.96193C13.8362 5.87472 13.3412 4.86331 12.6065 4.0369C11.8717 3.21049 10.9252 2.60048 9.86912 2.27274C8.81301 1.945 7.68744 1.91197 6.61394 2.17723C5.54043 2.4425 4.55979 2.99596 3.77787 3.77787C2.99596 4.55979 2.4425 5.54043 2.17723 6.61394C1.91197 7.68744 1.945 8.81301 2.27274 9.86912C2.60048 10.9252 3.21049 11.8717 4.0369 12.6065C4.86331 13.3412 5.87472 13.8362 6.96193 14.0381C7.16379 15.1253 7.65881 16.1367 8.39354 16.9631C9.12826 17.7895 10.0748 18.3995 11.1309 18.7273C12.187 19.055 13.3126 19.088 14.3861 18.8228C15.4596 18.5575 16.4402 18.004 17.2221 17.2221C18.004 16.4402 18.5575 15.4596 18.8228 14.3861C19.088 13.3126 19.055 12.187 18.7273 11.1309C18.3995 10.0748 17.7895 9.12826 16.9631 8.39354C16.1367 7.65881 15.1253 7.16379 14.0381 6.96193ZM3.21596 8.07198C3.21363 6.88839 3.64365 5.74469 4.42522 4.85584C5.20679 3.96699 6.28608 3.39418 7.46025 3.24508C8.63442 3.09598 9.82262 3.38085 10.8015 4.04615C11.7805 4.71144 12.4827 5.71136 12.7763 6.85798C11.2199 6.89888 9.7386 7.53565 8.63805 8.63691C7.5375 9.73816 6.90167 11.2199 6.86177 12.7763C5.81899 12.5064 4.89527 11.8981 4.23545 11.0468C3.57564 10.1954 3.21706 9.1491 3.21596 8.07198ZM12.928 17.784C11.8514 17.7832 10.8055 17.4251 9.95419 16.766C9.10288 16.107 8.49428 15.1841 8.22374 14.142C9.78077 14.1021 11.263 13.4657 12.3644 12.3644C13.4657 11.263 14.1021 9.78077 14.142 8.22374C15.2886 8.51731 16.2886 9.21954 16.9539 10.1985C17.6192 11.1774 17.904 12.3656 17.7549 13.5398C17.6058 14.7139 17.033 15.7932 16.1442 16.5748C15.2553 17.3563 14.1116 17.7864 12.928 17.784Z" fill="#525866" stroke="#525866" stroke-width="0.25"/>
+</svg>
diff --git a/packages/web-wallet/src/assets/index.ts b/packages/web-wallet/src/assets/index.ts
index e526848..5cf95b6 100644
--- a/packages/web-wallet/src/assets/index.ts
+++ b/packages/web-wallet/src/assets/index.ts
@@ -5,6 +5,14 @@ import MetaMaskSnapsLogoSvg from './metamask-snaps-logo.svg';
 import ZcashSvg from './zcash.svg';
 import ZcashYellowSvg from './zcash-yellow.svg';
 
+// Icons
+import ArrowReceiveSvg from './icons/arrow-receive.svg';
+import ArrowTransferSvg from './icons/arrow-transfer.svg';
+import ClockSvg from './icons/clock.svg';
+import ShieldSvg from './icons/shield.svg';
+import ShieldDividedSvg from './icons/shield-divided.svg';
+import SummarySvg from './icons/summary.svg';
+
 export {
   ChainsafeSvg,
   MetaMaskLogoSvg,
@@ -12,4 +20,10 @@ export {
   ZcashSvg,
   ZcashYellowSvg,
   FormTransferSvg,
+  ArrowReceiveSvg,
+  ArrowTransferSvg,
+  ClockSvg,
+  ShieldSvg,
+  ShieldDividedSvg,
+  SummarySvg,
 };
diff --git a/packages/web-wallet/src/components/Footer/Footer.tsx b/packages/web-wallet/src/components/Footer/Footer.tsx
index 04af4a3..8510284 100644
--- a/packages/web-wallet/src/components/Footer/Footer.tsx
+++ b/packages/web-wallet/src/components/Footer/Footer.tsx
@@ -11,11 +11,9 @@ const Footer = (): React.JSX.Element => {
           href="https://chainsafe.io/"
           target="_blank"
         >
-          <img
-            src={ChainsafeSvg}
-            alt="Chainsafe Systems Logo"
-            className="inline-block w-6 h-6 mr-1"
-          />
+          <div className="inline-block w-6 h-6 mr-1">
+            <ChainsafeSvg />
+          </div>
           ChainSafe
         </a>
       </div>
diff --git a/packages/web-wallet/src/components/Header/Header.tsx b/packages/web-wallet/src/components/Header/Header.tsx
index e6df52c..7e293e1 100644
--- a/packages/web-wallet/src/components/Header/Header.tsx
+++ b/packages/web-wallet/src/components/Header/Header.tsx
@@ -1,40 +1,39 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import ZcashSvg from '../../assets/zcash.svg';
-import MetemaskSnap from '../../assets/metamask-snaps-logo.svg';
+import { MetaMaskSnapsLogoSvg, ZcashSvg } from '../../assets';
 
 const Header = (): React.JSX.Element => {
   return (
-    <header className="font-inter w-full px-16 flex items-center justify-between bg-transparent max-h-[3.125rem]">
+    <header className="font-inter w-full px-16 flex items-center justify-between bg-transparent py-3 max-h-[3.125rem]">
       <Link to={'/'}>
         <div className="flex items-center">
-          <img src={ZcashSvg} alt="MetaMask Logo" className="h-6 w-6 mr-3" />
-          <img
-            src={MetemaskSnap}
-            alt="MetaMask Logo"
-            className="h-12 w-full max-w-[200px]"
-          />
+          <div className="h-6 w-6 mr-3">
+            <ZcashSvg />
+          </div>
+          <div className="h-6 w-full max-w-[200px]">
+            <MetaMaskSnapsLogoSvg />
+          </div>
         </div>
       </Link>
       <nav className="flex">
         <a
           target="_blank"
           href="https://chainsafe.github.io/WebZjs/"
-          className="text-gray-600 px-6 relative after:content-['|'] after:absolute after:right-0 after:top-0 after:bottom-0 after:w-px after:bg-[divide-dividerColor] hover:underline"
+          className="px-6 relative after:content-['|'] after:absolute after:right-0 after:top-0 after:bottom-0 after:w-px after:bg-[divide-dividerColor] hover:underline"
         >
           ZCash Docs
         </a>
         <a
           target="_blank"
           href="https://docs.metamask.io/snaps/"
-          className="text-gray-600 px-6 hover:underline"
+          className="px-6 hover:underline"
         >
           Snap Docs
         </a>
         <a
           target="_blank"
           href="https://snaps.metamask.io/"
-          className="text-gray-600 hover:underline"
+          className="hover:underline"
         >
           Snap Registry
         </a>
diff --git a/packages/web-wallet/src/components/Layout/Layout.tsx b/packages/web-wallet/src/components/Layout/Layout.tsx
index c462137..82e5414 100644
--- a/packages/web-wallet/src/components/Layout/Layout.tsx
+++ b/packages/web-wallet/src/components/Layout/Layout.tsx
@@ -7,7 +7,7 @@ const Layout = (): React.JSX.Element => {
   return (
     <div className="flex flex-col min-h-screen">
       <Header />
-      <main className="flex-grow flex items-center justify-center p-6">
+      <main className="flex-grow flex justify-center py-3">
         <Outlet />
       </main>
       <Footer />
diff --git a/packages/web-wallet/src/components/ProtectedRoute/ProtectedRoute.tsx b/packages/web-wallet/src/components/ProtectedRoute/ProtectedRoute.tsx
new file mode 100644
index 0000000..65f42d7
--- /dev/null
+++ b/packages/web-wallet/src/components/ProtectedRoute/ProtectedRoute.tsx
@@ -0,0 +1,15 @@
+import { Navigate, Outlet } from 'react-router-dom';
+import { useMetaMask } from '@hooks/useMetaMask.ts';
+import React from 'react';
+
+const ProtectedRoute: React.FC<{ children?: React.ReactNode }> = ({
+  children,
+}) => {
+  const { installedSnap } = useMetaMask();
+
+  if (!installedSnap) return <Navigate to="/" replace />;
+
+  return children ? <>{children}</> : <Outlet />;
+};
+
+export default ProtectedRoute;
diff --git a/packages/web-wallet/src/main.tsx b/packages/web-wallet/src/main.tsx
index 234a462..1feb2e5 100644
--- a/packages/web-wallet/src/main.tsx
+++ b/packages/web-wallet/src/main.tsx
@@ -1,12 +1,16 @@
 import './styles/index.css';
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
-
 import { createBrowserRouter, RouterProvider } from 'react-router-dom';
 import Home from '@pages/Home';
 import Layout from '@components/Layout/Layout';
 import { MetaMaskProvider } from '@hooks/MetamaskContext';
-import Dashboard from '@pages/Dashboard';
+import Dashboard from '@pages/Dashboard.tsx';
+import AccountSummary from '@pages/AccountSummary';
+import TransferBalance from '@pages/TransferBalance';
+import Receive from '@pages/Receive.tsx';
+import TransactionHistory from '@pages/TransactionHistory';
+import ProtectedRoute from '@components/ProtectedRoute/ProtectedRoute';
 
 const router = createBrowserRouter([
   {
@@ -18,8 +22,18 @@ const router = createBrowserRouter([
         element: <Home />,
       },
       {
-        path: '/dashboard',
-        element: <Dashboard />,
+        path: 'dashboard',
+        element: (
+          <ProtectedRoute>
+            <Dashboard />
+          </ProtectedRoute>
+        ),
+        children: [
+          { path: 'account-summary', element: <AccountSummary /> },
+          { path: 'transfer-balance', element: <TransferBalance /> },
+          { path: 'receive', element: <Receive /> },
+          { path: 'transaction-history', element: <TransactionHistory /> },
+        ],
       },
     ],
   },
diff --git a/packages/web-wallet/src/pages/AccountSummary.tsx b/packages/web-wallet/src/pages/AccountSummary.tsx
new file mode 100644
index 0000000..9a9b5ca
--- /dev/null
+++ b/packages/web-wallet/src/pages/AccountSummary.tsx
@@ -0,0 +1,5 @@
+function AccountSummary() {
+  return <div>TODO: Account Summary</div>;
+}
+
+export default AccountSummary;
diff --git a/packages/web-wallet/src/pages/Dashboard.tsx b/packages/web-wallet/src/pages/Dashboard.tsx
index af0b524..10d634f 100644
--- a/packages/web-wallet/src/pages/Dashboard.tsx
+++ b/packages/web-wallet/src/pages/Dashboard.tsx
@@ -1,9 +1,73 @@
 import React from 'react';
+import { NavLink, Outlet } from 'react-router-dom';
+import {
+  ArrowReceiveSvg,
+  ArrowTransferSvg,
+  ClockSvg,
+  SummarySvg,
+} from '../assets';
+
+interface NavItem {
+  to: string;
+  label: string;
+  icon: React.JSX.Element;
+}
+
+const navItems: NavItem[] = [
+  {
+    to: 'account-summary',
+    label: 'Account Summary',
+    icon: <SummarySvg />,
+  },
+  {
+    to: 'transfer-balance',
+    label: 'Transfer Balance',
+    icon: <ArrowTransferSvg />,
+  },
+  {
+    to: 'receive',
+    label: 'Receive',
+    icon: <ArrowReceiveSvg />,
+  },
+  {
+    to: 'transaction-history',
+    label: 'Transaction History',
+    icon: <ClockSvg />,
+  },
+];
+
+const getClassNames = (isActive: boolean) => {
+  const baseClasses =
+    'text-sm font-medium text-[#0e0e0e] font-inter font-semibold leading-tight';
+  return isActive
+    ? `${baseClasses} pb-3 text-black border-b border-orange-500`
+    : `${baseClasses}`;
+};
 
 const Dashboard: React.FC = () => {
   return (
-    <div className="flex items-start md:items-center justify-center px-4">
-      TODO: Dashbord
+    <div>
+      <nav className="flex space-x-9 mb-3">
+        {navItems.map((item) => (
+          <NavLink
+            key={item.to}
+            to={item.to}
+            className={({ isActive }) => {
+              return getClassNames(isActive);
+            }}
+          >
+            {({ isActive }) => (
+              <span
+                className={`inline-flex items-center hover:text-brand-orange navbar-link ${isActive && 'navbar-link-active'}`}
+              >
+                <span className="text-brand-grey10  mr-2">{item.icon}</span>
+                {item.label}
+              </span>
+            )}
+          </NavLink>
+        ))}
+      </nav>
+      <Outlet />
     </div>
   );
 };
diff --git a/packages/web-wallet/src/pages/Home.tsx b/packages/web-wallet/src/pages/Home.tsx
index c2f80c0..1f483c5 100644
--- a/packages/web-wallet/src/pages/Home.tsx
+++ b/packages/web-wallet/src/pages/Home.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect } from 'react';
-import FormSvg from '../assets/form-transfer.svg';
-import { MetaMaskLogoSvg, ZcashYellowSvg } from '../assets';
+import { MetaMaskLogoSvg, ZcashYellowSvg, FormTransferSvg } from '../assets';
 import { useMetaMask } from '@hooks/useMetaMask.ts';
 import { useRequestSnap } from '@hooks/useRequestSnap.ts';
 import { useNavigate } from 'react-router-dom';
@@ -11,17 +10,17 @@ const Home: React.FC = () => {
   const requestSnap = useRequestSnap();
 
   useEffect(() => {
-    if (installedSnap) navigate('/dashboard');
+    if (installedSnap) navigate('/dashboard/account-summary');
   }, [installedSnap, navigate]);
 
   return (
     <div className="flex items-start md:items-center justify-center px-4">
       <div className="max-w-6xl w-full grid grid-cols-1 md:grid-cols-2 gap-14">
         <div className="hidden md:flex items-end justify-end">
-          <img src={FormSvg} alt="Form transfer image" />
+          <FormTransferSvg />
         </div>
         <div className="flex flex-col items-start space-y-8">
-          <img src={ZcashYellowSvg} alt="Zcash Yellow Logo" />
+          <ZcashYellowSvg />
           <h1 className="font-inter font-semibold text-[5rem] leading-[5rem] we">
             Zcash <br />
             Web Wallet
@@ -36,7 +35,9 @@ const Home: React.FC = () => {
             className="flex items-center bg-buttonBlackGradient hover:bg-buttonBlackGradientHover text-white px-6 py-3 rounded-[2rem]"
           >
             <span>Connect MetaMask Snap</span>
-            <img src={MetaMaskLogoSvg} className="ml-3" alt="MetaMask" />
+            <div className="ml-3">
+              <MetaMaskLogoSvg />
+            </div>
           </button>
           <div className="text-sm">
             <span>Already have an account?</span>{' '}
diff --git a/packages/web-wallet/src/pages/Receive.tsx b/packages/web-wallet/src/pages/Receive.tsx
new file mode 100644
index 0000000..aa2308e
--- /dev/null
+++ b/packages/web-wallet/src/pages/Receive.tsx
@@ -0,0 +1,5 @@
+function Receive(): JSX.Element {
+  return <div>TODO: Receive</div>;
+}
+
+export default Receive;
diff --git a/packages/web-wallet/src/pages/TransactionHistory.tsx b/packages/web-wallet/src/pages/TransactionHistory.tsx
new file mode 100644
index 0000000..1b2218e
--- /dev/null
+++ b/packages/web-wallet/src/pages/TransactionHistory.tsx
@@ -0,0 +1,5 @@
+function TransactionHistory(): JSX.Element {
+  return <div>TODO: Transaction History</div>;
+}
+
+export default TransactionHistory;
diff --git a/packages/web-wallet/src/pages/TransferBalance.tsx b/packages/web-wallet/src/pages/TransferBalance.tsx
new file mode 100644
index 0000000..903fdf6
--- /dev/null
+++ b/packages/web-wallet/src/pages/TransferBalance.tsx
@@ -0,0 +1,5 @@
+function TransferBalance(): JSX.Element {
+  return <div>TODO: Transfer Balance</div>;
+}
+
+export default TransferBalance;
diff --git a/packages/web-wallet/src/styles/index.css b/packages/web-wallet/src/styles/index.css
index 2380cd5..38167e9 100644
--- a/packages/web-wallet/src/styles/index.css
+++ b/packages/web-wallet/src/styles/index.css
@@ -9,6 +9,24 @@
 @tailwind components;
 @tailwind utilities;
 
+
+
+@layer components {
+  .navbar-link {
+    &:hover {
+      svg path {
+        fill: #e27625;
+      }
+    }
+  }
+
+  .navbar-link-active {
+    svg path {
+      fill: #e27625;
+    }
+  }
+}
+
 body {
   position: relative;
   background: linear-gradient(180deg, #fff 0%, #bcefef 187.66%);
diff --git a/packages/web-wallet/src/types/custom.d.ts b/packages/web-wallet/src/types/custom.d.ts
index ff3a737..9fd9559 100644
--- a/packages/web-wallet/src/types/custom.d.ts
+++ b/packages/web-wallet/src/types/custom.d.ts
@@ -1,9 +1,3 @@
-import type {
-  EIP6963AnnounceProviderEvent,
-  EIP6963RequestProviderEvent,
-  MetaMaskInpageProvider,
-} from '@metamask/providers';
-
 /*
  * Window type extension to support ethereum
  */
diff --git a/packages/web-wallet/tailwind.config.js b/packages/web-wallet/tailwind.config.js
index 0ed79e9..3a8d103 100644
--- a/packages/web-wallet/tailwind.config.js
+++ b/packages/web-wallet/tailwind.config.js
@@ -18,6 +18,9 @@ export default {
       colors: {
         dividerColor: '#525866',
         brand: {
+          orange: '#e27625',
+          grey: '#525866',
+          grey10: '#0F0F0F',
           background: '#EFEFEF',
         },
       },
diff --git a/packages/web-wallet/vite.config.ts b/packages/web-wallet/vite.config.ts
index c5aed67..8444e26 100644
--- a/packages/web-wallet/vite.config.ts
+++ b/packages/web-wallet/vite.config.ts
@@ -1,10 +1,23 @@
 import { defineConfig } from 'vite';
 import { resolve } from 'path';
 import react from '@vitejs/plugin-react';
+import svgr from 'vite-plugin-svgr';
 
 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [react()],
+  plugins: [
+    react(),
+    svgr({
+      // svgr options: https://react-svgr.com/docs/options/
+      svgrOptions: {
+        exportType: 'default',
+        ref: true,
+        svgo: false,
+        titleProp: true,
+      },
+      include: '**/*.svg',
+    }),
+  ],
   resolve: {
     alias: {
       '@components': resolve(__dirname, 'src/components'),
diff --git a/yarn.lock b/yarn.lock
index 86627a4..f9f6e2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -40,7 +40,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.23.2, @babel/core@npm:^7.23.9, @babel/core@npm:^7.25.2":
+"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.21.3, @babel/core@npm:^7.23.2, @babel/core@npm:^7.23.9, @babel/core@npm:^7.25.2":
   version: 7.26.0
   resolution: "@babel/core@npm:7.26.0"
   dependencies:
@@ -1373,6 +1373,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.21.3":
+  version: 7.26.3
+  resolution: "@babel/types@npm:7.26.3"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.25.9"
+    "@babel/helper-validator-identifier": "npm:^7.25.9"
+  checksum: 10c0/966c5242c5e55c8704bf7a7418e7be2703a0afa4d19a8480999d5a4ef13d095dd60686615fe5983cb7593b4b06ba3a7de8d6ca501c1d78bdd233a10d90be787b
+  languageName: node
+  linkType: hard
+
 "@bcoe/v8-coverage@npm:^0.2.3":
   version: 0.2.3
   resolution: "@bcoe/v8-coverage@npm:0.2.3"
@@ -4155,6 +4165,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/pluginutils@npm:^5.1.3":
+  version: 5.1.3
+  resolution: "@rollup/pluginutils@npm:5.1.3"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    estree-walker: "npm:^2.0.2"
+    picomatch: "npm:^4.0.2"
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10c0/ba46ad588733fb01d184ee3bc7a127d626158bc840b5874a94c129ff62689d12f16f537530709c54da6f3b71f67d705c4e09235b1dc9542e9d47ee8f2d0b8b9e
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-android-arm-eabi@npm:4.24.3":
   version: 4.24.3
   resolution: "@rollup/rollup-android-arm-eabi@npm:4.24.3"
@@ -4353,6 +4379,133 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/a50bd0baa34faf16bcba712091f94c7f0e230431fe99a9dfc3401fa92823ad3f68495b86ab9bf9044b53839e8c416cfbb37eb3f246ff33f261e0fa9ee1779c5b
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-remove-jsx-attribute@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-remove-jsx-attribute@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/8a98e59bd9971e066815b4129409932f7a4db4866834fe75677ea6d517972fb40b380a69a4413189f20e7947411f9ab1b0f029dd5e8068686a5a0188d3ccd4c7
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-remove-jsx-empty-expression@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-remove-jsx-empty-expression@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/517dcca75223bd05d3f056a8514dbba3031278bea4eadf0842c576d84f4651e7a4e0e7082d3ee4ef42456de0f9c4531d8a1917c04876ca64b014b859ca8f1bde
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-replace-jsx-attribute-value@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/004bd1892053b7e9c1b0bb14acc44e77634ec393722b87b1e4fae53e2c35122a2dd0d5c15e9070dbeec274e22e7693a2b8b48506733a8009ee92b12946fcb10a
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-svg-dynamic-title@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-svg-dynamic-title@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/80e0a7fcf902f984c705051ca5c82ea6050ccbb70b651a8fea6d0eb5809e4dac274b49ea6be2d87f1eb9dfc0e2d6cdfffe1669ec2117f44b67a60a07d4c0b8b8
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-svg-em-dimensions@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-svg-em-dimensions@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/73e92c8277a89279745c0c500f59f083279a8dc30cd552b22981fade2a77628fb2bd2819ee505725fcd2e93f923e3790b52efcff409a159e657b46604a0b9a21
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-transform-react-native-svg@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/babel-plugin-transform-react-native-svg@npm:8.1.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/655ed6bc7a208ceaa4ecff0a54ccc36008c3cb31efa90d11e171cab325ebbb21aa78f09c7b65f9b3ddeda3a85f348c0c862902c48be13c14b4de165c847974e3
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-transform-svg-component@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-transform-svg-component@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/4ac00bb99a3db4ef05e4362f116a3c608ee365a2d26cf7318d8d41a4a5b30a02c80455cce0e62c65b60ed815b5d632bedabac2ccd4b56f998fadef5286e3ded4
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-preset@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/babel-preset@npm:8.1.0"
+  dependencies:
+    "@svgr/babel-plugin-add-jsx-attribute": "npm:8.0.0"
+    "@svgr/babel-plugin-remove-jsx-attribute": "npm:8.0.0"
+    "@svgr/babel-plugin-remove-jsx-empty-expression": "npm:8.0.0"
+    "@svgr/babel-plugin-replace-jsx-attribute-value": "npm:8.0.0"
+    "@svgr/babel-plugin-svg-dynamic-title": "npm:8.0.0"
+    "@svgr/babel-plugin-svg-em-dimensions": "npm:8.0.0"
+    "@svgr/babel-plugin-transform-react-native-svg": "npm:8.1.0"
+    "@svgr/babel-plugin-transform-svg-component": "npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/49367d3ad0831f79b1056871b91766246f449d4d1168623af5e283fbaefce4a01d77ab00de6b045b55e956f9aae27895823198493cd232d88d3435ea4517ffc5
+  languageName: node
+  linkType: hard
+
+"@svgr/core@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/core@npm:8.1.0"
+  dependencies:
+    "@babel/core": "npm:^7.21.3"
+    "@svgr/babel-preset": "npm:8.1.0"
+    camelcase: "npm:^6.2.0"
+    cosmiconfig: "npm:^8.1.3"
+    snake-case: "npm:^3.0.4"
+  checksum: 10c0/6a2f6b1bc79bce39f66f088d468985d518005fc5147ebf4f108570a933818b5951c2cb7da230ddff4b7c8028b5a672b2d33aa2acce012b8b9770073aa5a2d041
+  languageName: node
+  linkType: hard
+
+"@svgr/hast-util-to-babel-ast@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/hast-util-to-babel-ast@npm:8.0.0"
+  dependencies:
+    "@babel/types": "npm:^7.21.3"
+    entities: "npm:^4.4.0"
+  checksum: 10c0/f4165b583ba9eaf6719e598977a7b3ed182f177983e55f9eb55a6a73982d81277510e9eb7ab41f255151fb9ed4edd11ac4bef95dd872f04ed64966d8c85e0f79
+  languageName: node
+  linkType: hard
+
+"@svgr/plugin-jsx@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/plugin-jsx@npm:8.1.0"
+  dependencies:
+    "@babel/core": "npm:^7.21.3"
+    "@svgr/babel-preset": "npm:8.1.0"
+    "@svgr/hast-util-to-babel-ast": "npm:8.0.0"
+    svg-parser: "npm:^2.0.4"
+  peerDependencies:
+    "@svgr/core": "*"
+  checksum: 10c0/07b4d9e00de795540bf70556fa2cc258774d01e97a12a26234c6fdf42b309beb7c10f31ee24d1a71137239347b1547b8bb5587d3a6de10669f95dcfe99cddc56
+  languageName: node
+  linkType: hard
+
 "@swc/core-darwin-arm64@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-darwin-arm64@npm:1.3.78"
@@ -4681,7 +4834,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:1.0.6, @types/estree@npm:^1.0.5, @types/estree@npm:^1.0.6":
+"@types/estree@npm:1.0.6, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5, @types/estree@npm:^1.0.6":
   version: 1.0.6
   resolution: "@types/estree@npm:1.0.6"
   checksum: 10c0/cdfd751f6f9065442cd40957c07fd80361c962869aa853c1c2fd03e101af8b9389d8ff4955a43a6fcfa223dd387a089937f95be0f3eec21ca527039fd2d9859a
@@ -5363,6 +5516,7 @@ __metadata:
     "@types/react-dom": "npm:^18.3.1"
     "@vitejs/plugin-react": "npm:^4.3.3"
     autoprefixer: "npm:^10.4.20"
+    clsx: "npm:^2.1.1"
     eslint: "npm:^9.13.0"
     eslint-plugin-react-hooks: "npm:^5.0.0"
     eslint-plugin-react-refresh: "npm:^0.4.14"
@@ -5376,6 +5530,7 @@ __metadata:
     typescript: "npm:~5.6.2"
     typescript-eslint: "npm:^8.11.0"
     vite: "npm:^5.4.10"
+    vite-plugin-svgr: "npm:^4.3.0"
   languageName: unknown
   linkType: soft
 
@@ -6743,7 +6898,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clsx@npm:^2.1.0":
+"clsx@npm:^2.1.0, clsx@npm:^2.1.1":
   version: 2.1.1
   resolution: "clsx@npm:2.1.1"
   checksum: 10c0/c4c8eb865f8c82baab07e71bfa8897c73454881c4f99d6bc81585aecd7c441746c1399d08363dc096c550cceaf97bd4ce1e8854e1771e9998d9f94c4fe075839
@@ -6976,7 +7131,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:^8.2.0":
+"cosmiconfig@npm:^8.1.3, cosmiconfig@npm:^8.2.0":
   version: 8.3.6
   resolution: "cosmiconfig@npm:8.3.6"
   dependencies:
@@ -7565,6 +7720,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dot-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "dot-case@npm:3.0.4"
+  dependencies:
+    no-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/5b859ea65097a7ea870e2c91b5768b72ddf7fa947223fd29e167bcdff58fe731d941c48e47a38ec8aa8e43044c8fbd15cd8fa21689a526bc34b6548197cd5b05
+  languageName: node
+  linkType: hard
+
 "dotenv-expand@npm:^5.1.0":
   version: 5.1.0
   resolution: "dotenv-expand@npm:5.1.0"
@@ -7713,6 +7878,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"entities@npm:^4.4.0":
+  version: 4.5.0
+  resolution: "entities@npm:4.5.0"
+  checksum: 10c0/5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250
+  languageName: node
+  linkType: hard
+
 "env-paths@npm:^2.2.0, env-paths@npm:^2.2.1":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
@@ -8315,6 +8487,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"estree-walker@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "estree-walker@npm:2.0.2"
+  checksum: 10c0/53a6c54e2019b8c914dc395890153ffdc2322781acf4bd7d1a32d7aedc1710807bdcd866ac133903d5629ec601fbb50abe8c2e5553c7f5a0afdd9b6af6c945af
+  languageName: node
+  linkType: hard
+
 "esutils@npm:^2.0.2":
   version: 2.0.3
   resolution: "esutils@npm:2.0.3"
@@ -10798,6 +10977,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lower-case@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "lower-case@npm:2.0.2"
+  dependencies:
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/3d925e090315cf7dc1caa358e0477e186ffa23947740e4314a7429b6e62d72742e0bbe7536a5ae56d19d7618ce998aba05caca53c2902bd5742fdca5fc57fd7b
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
   version: 10.4.3
   resolution: "lru-cache@npm:10.4.3"
@@ -11317,6 +11505,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"no-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "no-case@npm:3.0.4"
+  dependencies:
+    lower-case: "npm:^2.0.2"
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/8ef545f0b3f8677c848f86ecbd42ca0ff3cd9dd71c158527b344c69ba14710d816d8489c746b6ca225e7b615108938a0bda0a54706f8c255933703ac1cf8e703
+  languageName: node
+  linkType: hard
+
 "node-abort-controller@npm:^3.0.1":
   version: 3.1.1
   resolution: "node-abort-controller@npm:3.1.1"
@@ -11873,6 +12071,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"picomatch@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "picomatch@npm:4.0.2"
+  checksum: 10c0/7c51f3ad2bb42c776f49ebf964c644958158be30d0a510efd5a395e8d49cb5acfed5b82c0c5b365523ce18e6ab85013c9ebe574f60305892ec3fa8eee8304ccc
+  languageName: node
+  linkType: hard
+
 "pify@npm:^2.3.0":
   version: 2.3.0
   resolution: "pify@npm:2.3.0"
@@ -13261,6 +13466,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"snake-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "snake-case@npm:3.0.4"
+  dependencies:
+    dot-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/ab19a913969f58f4474fe9f6e8a026c8a2142a01f40b52b79368068343177f818cdfef0b0c6b9558f298782441d5ca8ed5932eb57822439fad791d866e62cecd
+  languageName: node
+  linkType: hard
+
 "socks-proxy-agent@npm:^8.0.3":
   version: 8.0.4
   resolution: "socks-proxy-agent@npm:8.0.4"
@@ -13687,6 +13902,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"svg-parser@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "svg-parser@npm:2.0.4"
+  checksum: 10c0/02f6cb155dd7b63ebc2f44f36365bc294543bebb81b614b7628f1af3c54ab64f7e1cec20f06e252bf95bdde78441ae295a412c68ad1678f16a6907d924512b7a
+  languageName: node
+  linkType: hard
+
 "svgo@npm:^2.4.0":
   version: 2.8.0
   resolution: "svgo@npm:2.8.0"
@@ -14032,6 +14254,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.0.3":
+  version: 2.8.1
+  resolution: "tslib@npm:2.8.1"
+  checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62
+  languageName: node
+  linkType: hard
+
 "tslib@npm:^2.4.0, tslib@npm:^2.6.2":
   version: 2.8.0
   resolution: "tslib@npm:2.8.0"
@@ -14525,6 +14754,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite-plugin-svgr@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "vite-plugin-svgr@npm:4.3.0"
+  dependencies:
+    "@rollup/pluginutils": "npm:^5.1.3"
+    "@svgr/core": "npm:^8.1.0"
+    "@svgr/plugin-jsx": "npm:^8.1.0"
+  peerDependencies:
+    vite: ">=2.6.0"
+  checksum: 10c0/a73f10d319f72cd8c16bf9701cf18170f2300f98c72c6bf939565de0b1e93916bd70c6f5a446dc034b4405c72d382655c7c16be4bd1cbf35bbcde5febf7aeffc
+  languageName: node
+  linkType: hard
+
 "vite@npm:^5.4.10, vite@npm:^5.4.9":
   version: 5.4.10
   resolution: "vite@npm:5.4.10"

From 36316104c13df484105a04513136a6c1751d8ad8 Mon Sep 17 00:00:00 2001
From: Anton Lykhoyda <lykhoyda@gmail.com>
Date: Mon, 9 Dec 2024 18:30:40 +0100
Subject: [PATCH 2/9] wip

---
 Cargo.lock                                    | 448 +++++++++---------
 Cargo.toml                                    |   8 +-
 packages/snap/snap.manifest.json              |   2 +-
 packages/web-wallet/index.html                |   1 -
 packages/web-wallet/package.json              |  10 +-
 packages/web-wallet/src/App.tsx               |  22 +
 .../ProtectedRoute/ProtectedRoute.tsx         |   2 +-
 packages/web-wallet/src/config/constants.ts   |   4 +
 .../{hooks => context}/MetamaskContext.tsx    |  12 +-
 .../web-wallet/src/context/WebzjsContext.tsx  | 193 ++++++++
 packages/web-wallet/src/hooks/index.ts        |  10 +-
 .../src/hooks/{ => snaps}/useInvokeSnap.ts    |   4 +-
 .../src/hooks/{ => snaps}/useMetaMask.ts      |  10 +-
 .../src/hooks/{ => snaps}/useRequest.ts       |   2 +-
 .../src/hooks/{ => snaps}/useRequestSnap.ts   |   8 +-
 .../web-wallet/src/hooks/useWebzjsActions.ts  |  82 ++++
 packages/web-wallet/src/main.tsx              |  45 +-
 packages/web-wallet/src/pages/Home.tsx        |   4 +-
 packages/web-wallet/src/router/index.tsx      |  38 ++
 packages/web-wallet/tsconfig.app.json         |   1 +
 packages/web-wallet/vite.config.ts            |  18 +
 yarn.lock                                     | 177 ++++++-
 22 files changed, 809 insertions(+), 292 deletions(-)
 create mode 100644 packages/web-wallet/src/App.tsx
 create mode 100644 packages/web-wallet/src/config/constants.ts
 rename packages/web-wallet/src/{hooks => context}/MetamaskContext.tsx (87%)
 create mode 100644 packages/web-wallet/src/context/WebzjsContext.tsx
 rename packages/web-wallet/src/hooks/{ => snaps}/useInvokeSnap.ts (90%)
 rename packages/web-wallet/src/hooks/{ => snaps}/useMetaMask.ts (82%)
 rename packages/web-wallet/src/hooks/{ => snaps}/useRequest.ts (92%)
 rename packages/web-wallet/src/hooks/{ => snaps}/useRequestSnap.ts (80%)
 create mode 100644 packages/web-wallet/src/hooks/useWebzjsActions.ts
 create mode 100644 packages/web-wallet/src/router/index.tsx

diff --git a/Cargo.lock b/Cargo.lock
index 4c517bc..e3e70b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16,9 +16,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
@@ -73,9 +73,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "android-tzdata"
@@ -94,15 +94,15 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.88"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
 
 [[package]]
 name = "arrayref"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
@@ -163,9 +163,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.3.4"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
+checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
 dependencies = [
  "async-lock",
  "cfg-if",
@@ -225,9 +225,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -251,9 +251,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
@@ -438,9 +438,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "cbc"
@@ -453,9 +453,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.18"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
 dependencies = [
  "shlex",
 ]
@@ -492,9 +492,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -553,9 +553,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
@@ -571,9 +571,9 @@ dependencies = [
 
 [[package]]
 name = "critical-section"
-version = "1.1.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64009896348fc5af4222e9cf7d7d82a95a256c634ebcf61c53e4ea461422242"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
 
 [[package]]
 name = "crossbeam-channel"
@@ -755,12 +755,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -782,9 +782,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
 dependencies = [
  "event-listener 5.3.1",
  "pin-project-lite",
@@ -832,9 +832,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "ff"
@@ -855,9 +855,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -891,9 +891,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -906,9 +906,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -916,15 +916,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -933,15 +933,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.3.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -952,9 +952,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -963,21 +963,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1016,9 +1016,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "gloo-timers"
@@ -1046,9 +1046,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1056,7 +1056,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.5.0",
+ "indexmap 2.7.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1128,6 +1128,12 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
 [[package]]
 name = "hashlink"
 version = "0.8.4"
@@ -1195,9 +1201,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1229,15 +1235,15 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1255,9 +1261,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-timeout"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
+checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
 dependencies = [
  "hyper",
  "hyper-util",
@@ -1268,9 +1274,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.8"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1281,7 +1287,6 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
@@ -1362,12 +1367,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1391,16 +1396,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1438,15 +1444,15 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libsqlite3-sys"
@@ -1588,11 +1594,10 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi 0.3.9",
  "libc",
  "wasi",
  "windows-sys 0.52.0",
@@ -1679,18 +1684,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "opaque-debug"
@@ -1830,23 +1835,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.5.0",
+ "indexmap 2.7.0",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1855,9 +1860,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -1878,15 +1883,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "polling"
-version = "3.7.3"
+version = "3.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
@@ -1910,9 +1915,9 @@ dependencies = [
 
 [[package]]
 name = "postcard"
-version = "1.0.10"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e"
+checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8"
 dependencies = [
  "cobs",
  "embedded-io 0.4.0",
@@ -1938,9 +1943,9 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.22"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
  "syn",
@@ -1948,9 +1953,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -1966,9 +1971,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.13.2"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995"
+checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -1976,11 +1981,10 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.13.2"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
+checksum = "d0f3e5beed80eb580c68e2c600937ac2c4eedabdfd5ef1e5b7ea4f3fba84497b"
 dependencies = [
- "bytes",
  "heck",
  "itertools",
  "log",
@@ -1988,7 +1992,7 @@ dependencies = [
  "once_cell",
  "petgraph",
  "prettyplease",
- "prost 0.13.2",
+ "prost 0.13.4",
  "prost-types",
  "regex",
  "syn",
@@ -1997,9 +2001,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.13.2"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
+checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2010,11 +2014,11 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.13.2"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519"
+checksum = "cc2f1e56baa61e93533aebc21af4d2134b70f66275e0fcdf3cbe43d77ff7e8fc"
 dependencies = [
- "prost 0.13.2",
+ "prost 0.13.4",
 ]
 
 [[package]]
@@ -2117,14 +2121,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2138,13 +2142,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2155,9 +2159,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "ring"
@@ -2215,22 +2219,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
  "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
 dependencies = [
  "log",
  "once_cell",
@@ -2243,19 +2247,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-webpki"
@@ -2402,9 +2405,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
@@ -2422,9 +2425,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2433,9 +2436,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
@@ -2445,15 +2448,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
 dependencies = [
  "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2463,9 +2466,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -2539,9 +2542,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2582,9 +2585,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2599,9 +2602,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -2612,18 +2615,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2642,9 +2645,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2664,9 +2667,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2689,9 +2692,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2716,20 +2719,19 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2738,9 +2740,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2751,9 +2753,9 @@ dependencies = [
 
 [[package]]
 name = "tokio_with_wasm"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302f7684e5f0b3c60bf229658f4e2f35e1dad50fa2425043997acdc1e87445aa"
+checksum = "7c33ccdd8192685c79013359bf42e1c2649ed6bf11e8fa05f1f7f2acc7c71368"
 dependencies = [
  "js-sys",
  "tokio",
@@ -2765,9 +2767,9 @@ dependencies = [
 
 [[package]]
 name = "tokio_with_wasm_proc"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fef2e92c3cba6bbf5b7ee3528302c01e21bd7378795bf7cc7eff17da9ecd70"
+checksum = "8ff8fa1b71e329058cc97c093972aeb51dd7e658bd5197f294665639194bbc4c"
 dependencies = [
  "quote",
  "syn",
@@ -2775,9 +2777,9 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
 dependencies = [
  "async-trait",
  "base64",
@@ -2791,7 +2793,7 @@ dependencies = [
  "hyper-util",
  "percent-encoding",
  "pin-project",
- "prost 0.13.2",
+ "prost 0.13.4",
  "rustls-pemfile",
  "tokio",
  "tokio-rustls",
@@ -2805,13 +2807,14 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4ee8877250136bd7e3d2331632810a4df4ea5e004656990d8d66d2f5ee8a67"
+checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11"
 dependencies = [
  "prettyplease",
  "proc-macro2",
  "prost-build",
+ "prost-types",
  "quote",
  "syn",
 ]
@@ -2875,9 +2878,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -2886,9 +2889,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2897,9 +2900,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -2918,9 +2921,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -2973,15 +2976,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
@@ -3004,9 +3007,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom",
  "wasm-bindgen",
@@ -3020,9 +3023,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
+checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
 
 [[package]]
 name = "vcpkg"
@@ -3114,9 +3117,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3125,13 +3128,12 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -3140,21 +3142,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3162,9 +3165,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3186,15 +3189,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -3230,9 +3233,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3240,9 +3243,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -3517,7 +3520,7 @@ dependencies = [
  "orchard 0.9.0",
  "pasta_curves",
  "percent-encoding",
- "prost 0.13.2",
+ "prost 0.13.4",
  "rand_core",
  "rayon",
  "sapling-crypto 0.2.0",
@@ -3564,7 +3567,7 @@ dependencies = [
  "orchard 0.10.0",
  "pasta_curves",
  "percent-encoding",
- "prost 0.13.2",
+ "prost 0.13.4",
  "rand_core",
  "rayon",
  "sapling-crypto 0.3.0",
@@ -3601,7 +3604,7 @@ dependencies = [
  "jubjub",
  "nonempty",
  "orchard 0.10.0",
- "prost 0.13.2",
+ "prost 0.13.4",
  "rayon",
  "sapling-crypto 0.3.0",
  "secrecy",
@@ -3637,7 +3640,7 @@ dependencies = [
  "maybe-rayon",
  "nonempty",
  "orchard 0.9.0",
- "prost 0.13.2",
+ "prost 0.13.4",
  "regex",
  "rusqlite",
  "sapling-crypto 0.2.0",
@@ -3734,9 +3737,9 @@ dependencies = [
 
 [[package]]
 name = "zcash_note_encryption"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b4580cd6cee12e44421dac43169be8d23791650816bdb34e6ddfa70ac89c1c5"
+checksum = "77efec759c3798b6e4d829fcc762070d9b229b0f13338c40bf993b7b609c2272"
 dependencies = [
  "chacha20",
  "chacha20poly1305",
@@ -3864,9 +3867,9 @@ dependencies = [
 
 [[package]]
 name = "zcash_spec"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a3bf58b673cb3dacd8ae09ba345998923a197ab0da70d6239d8e8838949e9b"
+checksum = "9cede95491c2191d3e278cab76e097a44b17fde8d6ca0d4e3a22cf4807b2d857"
 dependencies = [
  "blake2b_simd",
 ]
@@ -3914,12 +3917,13 @@ dependencies = [
 
 [[package]]
 name = "zip32"
-version = "0.1.1"
-source = "git+https://github.com/zcash/zip32.git?branch=diversifier_index_ord#38e39b7086bbd5747dc61a84faf54ec9a58fa535"
+version = "0.1.2"
+source = "git+https://github.com/zcash/zip32.git#f4e1c2fe99ebf2aed6e461769154780da37e33de"
 dependencies = [
  "blake2b_simd",
  "memuse",
  "subtle",
+ "zcash_spec",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 84d2d71..9221896 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,13 +14,13 @@ codegen-units = 1
 
 [workspace.dependencies]
 ## Web dependencies
-wasm-bindgen = "0.2.93"
+wasm-bindgen = "0.2.99"
 js-sys = "0.3.70"
-wasm-bindgen-futures = "0.4.43"
+wasm-bindgen-futures = "0.4.49"
 web-sys = { version = "0.3.70", features = [
     "console",
 ] }
-wasm-bindgen-rayon = { version = "1.2.1" }
+wasm-bindgen-rayon = { version = "1.2.2" }
 
 # WASM specific dependencies
 tracing-web = { version = "0.1.3" }
@@ -79,7 +79,7 @@ byte-unit = { version = "5.1.4", features = ["byte"] }
 
 
 [patch.crates-io]
-zip32 = { git = "https://github.com/zcash/zip32.git", branch = "diversifier_index_ord" }
+zip32 = { git = "https://github.com/zcash/zip32.git" }
 # TODO: See: https://github.com/RReverser/wasm-bindgen-rayon/pull/12
 wasm-bindgen-rayon = { git = "https://github.com/9SMTM6/wasm-bindgen-rayon", rev = "d1816e5bc2bf928ff5442355c04500a381d66a41" }
 # TODO: Remove these once the PRs are merged
diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
index 8420f57..cb9482e 100644
--- a/packages/snap/snap.manifest.json
+++ b/packages/snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/template-snap-monorepo.git"
   },
   "source": {
-    "shasum": "+SKENP/6gsN0rziHiYtTQI27Cu1ssKsp6FUdW/pjriw=",
+    "shasum": "5kG/5tKuPrrpApOlFvFR5gCuTloSUZfJ4QCjtVezHu8=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
diff --git a/packages/web-wallet/index.html b/packages/web-wallet/index.html
index 5fff4b4..45c21b8 100644
--- a/packages/web-wallet/index.html
+++ b/packages/web-wallet/index.html
@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>WebZjs Web Wallet</title>
   </head>
diff --git a/packages/web-wallet/package.json b/packages/web-wallet/package.json
index 2c6820c..c469ea9 100644
--- a/packages/web-wallet/package.json
+++ b/packages/web-wallet/package.json
@@ -11,9 +11,14 @@
   },
   "dependencies": {
     "@metamask/providers": "^18.2.0",
+    "@webzjs/webz-keys": "workspace:^",
+    "@webzjs/webz-wallet": "workspace:^",
+    "idb-keyval": "^6.2.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.27.0"
+    "react-router-dom": "^6.27.0",
+    "usehooks-ts": "^3.1.0",
+    "vite-plugin-top-level-await": "^1.4.4"
   },
   "devDependencies": {
     "@eslint/js": "^9.13.0",
@@ -33,6 +38,7 @@
     "typescript": "~5.6.2",
     "typescript-eslint": "^8.11.0",
     "vite": "^5.4.10",
-    "vite-plugin-svgr": "^4.3.0"
+    "vite-plugin-svgr": "^4.3.0",
+    "vite-plugin-wasm": "^3.3.0"
   }
 }
diff --git a/packages/web-wallet/src/App.tsx b/packages/web-wallet/src/App.tsx
new file mode 100644
index 0000000..1cd8cd4
--- /dev/null
+++ b/packages/web-wallet/src/App.tsx
@@ -0,0 +1,22 @@
+import { useInterval } from 'usehooks-ts';
+import { RESCAN_INTERVAL } from '@webzjs/demo-wallet/src/App/Constants.tsx';
+import { useWebZjsActions } from '@hooks/useWebzjsActions.ts';
+import Layout from '@components/Layout/Layout.tsx';
+import { Outlet } from 'react-router-dom';
+
+function App() {
+  const { triggerRescan } = useWebZjsActions();
+
+  // rescan the wallet periodically
+  useInterval(() => {
+    triggerRescan();
+  }, RESCAN_INTERVAL);
+
+  return (
+    <Layout>
+      <Outlet />
+    </Layout>
+  );
+}
+
+export default App;
diff --git a/packages/web-wallet/src/components/ProtectedRoute/ProtectedRoute.tsx b/packages/web-wallet/src/components/ProtectedRoute/ProtectedRoute.tsx
index 65f42d7..0bbb725 100644
--- a/packages/web-wallet/src/components/ProtectedRoute/ProtectedRoute.tsx
+++ b/packages/web-wallet/src/components/ProtectedRoute/ProtectedRoute.tsx
@@ -1,5 +1,5 @@
 import { Navigate, Outlet } from 'react-router-dom';
-import { useMetaMask } from '@hooks/useMetaMask.ts';
+import { useMetaMask } from '@hooks/snaps/useMetaMask.ts';
 import React from 'react';
 
 const ProtectedRoute: React.FC<{ children?: React.ReactNode }> = ({
diff --git a/packages/web-wallet/src/config/constants.ts b/packages/web-wallet/src/config/constants.ts
new file mode 100644
index 0000000..46c2b0e
--- /dev/null
+++ b/packages/web-wallet/src/config/constants.ts
@@ -0,0 +1,4 @@
+export const MAINNET_LIGHTWALLETD_PROXY = 'https://zcash-mainnet.chainsafe.dev';
+export const ZATOSHI_PER_ZEC = 1e8;
+export const RESCAN_INTERVAL = 20000;
+export const NU5_ACTIVATION = 1687104;
diff --git a/packages/web-wallet/src/hooks/MetamaskContext.tsx b/packages/web-wallet/src/context/MetamaskContext.tsx
similarity index 87%
rename from packages/web-wallet/src/hooks/MetamaskContext.tsx
rename to packages/web-wallet/src/context/MetamaskContext.tsx
index 3ec49ff..baabcd6 100644
--- a/packages/web-wallet/src/hooks/MetamaskContext.tsx
+++ b/packages/web-wallet/src/context/MetamaskContext.tsx
@@ -13,7 +13,7 @@ type MetaMaskContextType = {
   setError: (error: Error) => void;
 };
 
-export const MetaMaskContext = createContext<MetaMaskContextType>({
+const MetaMaskContext = createContext<MetaMaskContextType>({
   provider: null,
   installedSnap: null,
   error: null,
@@ -70,5 +70,13 @@ export const MetaMaskProvider = ({ children }: { children: ReactNode }) => {
  * @returns The MetaMask context.
  */
 export function useMetaMaskContext() {
-  return useContext(MetaMaskContext);
+  const context = useContext(MetaMaskContext);
+
+  if (context === undefined) {
+    throw new Error(
+      'useMetaMaskContext must be called within a MetaMaskProvider',
+    );
+  }
+
+  return context;
 }
diff --git a/packages/web-wallet/src/context/WebzjsContext.tsx b/packages/web-wallet/src/context/WebzjsContext.tsx
new file mode 100644
index 0000000..ac41edd
--- /dev/null
+++ b/packages/web-wallet/src/context/WebzjsContext.tsx
@@ -0,0 +1,193 @@
+import React, { createContext, useReducer, useEffect } from 'react';
+import type { ReactNode } from 'react';
+import type { MetaMaskInpageProvider } from '@metamask/providers';
+import { get, set } from 'idb-keyval';
+
+import initWebzWallet, { initThreadPool, WebWallet } from '@webzjs/webz-wallet';
+import initWebzKeys from '@webzjs/webz-keys';
+
+import type { Snap } from '../types';
+import { getSnapsProvider } from '../utils';
+import { MAINNET_LIGHTWALLETD_PROXY } from '../config/constants.ts';
+
+interface Summary {
+  chain_tip_height: number;
+  fully_scanned_height: number;
+  next_sapling_subtree_index: bigint;
+  next_orchard_subtree_index: bigint;
+  account_balances: [number, number][];
+}
+
+interface State {
+  webWallet: WebWallet | null;
+  provider: MetaMaskInpageProvider | null;
+  installedSnap: Snap | null;
+  error: Error | null;
+  summary: Summary | null;
+  chainHeight: bigint | null;
+  activeAccount: number | null;
+  syncInProgress: boolean;
+  loading: boolean;
+}
+
+type Action =
+  | { type: 'set-web-wallet'; payload: WebWallet }
+  | { type: 'set-provider'; payload: MetaMaskInpageProvider | null }
+  | { type: 'set-error'; payload: Error | null }
+  | { type: 'set-summary'; payload: Summary }
+  | { type: 'set-chain-height'; payload: bigint }
+  | { type: 'set-active-account'; payload: number }
+  | { type: 'set-sync-in-progress'; payload: boolean }
+  | { type: 'set-loading'; payload: boolean };
+
+const initialState: State = {
+  webWallet: null,
+  provider: null,
+  installedSnap: null,
+  error: null,
+  summary: null,
+  chainHeight: null,
+  activeAccount: null,
+  syncInProgress: false,
+  loading: true,
+};
+
+function reducer(state: State, action: Action): State {
+  switch (action.type) {
+    case 'set-web-wallet':
+      return { ...state, webWallet: action.payload };
+    case 'set-provider':
+      return { ...state, provider: action.payload };
+    case 'set-error':
+      return { ...state, error: action.payload };
+    case 'set-summary':
+      return { ...state, summary: action.payload };
+    case 'set-chain-height':
+      return { ...state, chainHeight: action.payload };
+    case 'set-active-account':
+      return { ...state, activeAccount: action.payload };
+    case 'set-sync-in-progress':
+      return { ...state, syncInProgress: action.payload };
+    case 'set-loading':
+      return { ...state, loading: action.payload };
+
+    default:
+      return state;
+  }
+}
+
+interface WebZjsContextType {
+  state: State;
+  dispatch: React.Dispatch<Action>;
+}
+
+const WebZjsContext = createContext<WebZjsContextType>({
+  state: initialState,
+  dispatch: () => {},
+});
+
+export const WebZjsProvider = ({ children }: { children: ReactNode }) => {
+  const [state, dispatch] = useReducer(reducer, initialState);
+
+  // Initialize provider and web wallet
+  useEffect(() => {
+    initAll();
+  }, []);
+
+  async function initAll() {
+    try {
+      await initWebzWallet();
+      await initWebzKeys();
+      try {
+        await initThreadPool(10);
+      } catch (err) {
+        console.error(err);
+        throw Error('Unable to initialize Thread Pool');
+      }
+      const provider = await getSnapsProvider();
+      dispatch({ type: 'set-provider', payload: provider });
+
+      const bytes = await get('wallet');
+      let wallet;
+
+      if (bytes) {
+        console.info('Saved wallet detected. Restoring wallet from storage');
+        wallet = new WebWallet('main', MAINNET_LIGHTWALLETD_PROXY, 1, bytes);
+      } else {
+        console.info('No saved wallet detected. Creating new wallet');
+        wallet = new WebWallet('main', MAINNET_LIGHTWALLETD_PROXY, 1);
+      }
+
+      dispatch({ type: 'set-web-wallet', payload: wallet });
+
+      const summary = await wallet.get_wallet_summary();
+      if (summary) {
+        dispatch({ type: 'set-summary', payload: summary });
+        // Set an active account from summary if available
+        if (summary.account_balances.length > 0) {
+          dispatch({
+            type: 'set-active-account',
+            payload: summary.account_balances[0][0],
+          });
+        }
+      }
+
+      const chainHeight = await wallet.get_latest_block();
+      if (chainHeight) {
+        dispatch({ type: 'set-chain-height', payload: chainHeight });
+      }
+
+      dispatch({ type: 'set-loading', payload: false });
+    } catch (err: never) {
+      console.error('Initialization error:', err);
+      dispatch({ type: 'set-error', payload: err.toString() });
+      dispatch({ type: 'set-loading', payload: false });
+    }
+  }
+
+  // Clear error after 10 seconds if any
+  useEffect(() => {
+    if (state.error) {
+      const timeout = setTimeout(() => {
+        dispatch({ type: 'set-error', payload: null });
+      }, 10000);
+
+      return () => clearTimeout(timeout);
+    }
+  }, [state.error]);
+
+  // Persist changes to IndexedDB whenever relevant parts of state change
+  useEffect(() => {
+    if (!state.webWallet) return;
+
+    async function flushDb() {
+      console.info('Serializing wallet and dumping to IndexedDB store');
+
+      if (state.webWallet instanceof WebWallet) {
+        const bytes = await state.webWallet.db_to_bytes();
+        await set('wallet', bytes);
+        console.info('Wallet saved to storage');
+      }
+    }
+
+    // Flush changes on these triggers:
+    if (!state.loading && !state.syncInProgress && state.webWallet) {
+      flushDb().catch(console.error);
+    }
+  }, [state.webWallet, state.syncInProgress, state.loading]);
+
+  return (
+    <WebZjsContext.Provider value={{ state, dispatch }}>
+      {children}
+    </WebZjsContext.Provider>
+  );
+};
+
+export function useWebZjsContext(): WebZjsContextType {
+  const context = React.useContext(WebZjsContext);
+
+  if (context === undefined) {
+    throw new Error('useWebZjsContext must be used within a WebZjsProvider');
+  }
+  return context;
+}
diff --git a/packages/web-wallet/src/hooks/index.ts b/packages/web-wallet/src/hooks/index.ts
index 7906e81..ac13c71 100644
--- a/packages/web-wallet/src/hooks/index.ts
+++ b/packages/web-wallet/src/hooks/index.ts
@@ -1,5 +1,5 @@
-export * from './MetamaskContext';
-export * from './useMetaMask';
-export * from './useRequest';
-export * from './useRequestSnap';
-export * from './useInvokeSnap';
+export * from './snaps/useMetaMask.ts';
+export * from './snaps/useRequest.ts';
+export * from './snaps/useRequestSnap.ts';
+export * from './snaps/useInvokeSnap.ts';
+export * from './useWebzjsActions.ts';
diff --git a/packages/web-wallet/src/hooks/useInvokeSnap.ts b/packages/web-wallet/src/hooks/snaps/useInvokeSnap.ts
similarity index 90%
rename from packages/web-wallet/src/hooks/useInvokeSnap.ts
rename to packages/web-wallet/src/hooks/snaps/useInvokeSnap.ts
index c02bf6a..59b6217 100644
--- a/packages/web-wallet/src/hooks/useInvokeSnap.ts
+++ b/packages/web-wallet/src/hooks/snaps/useInvokeSnap.ts
@@ -1,5 +1,5 @@
-import { defaultSnapOrigin } from '../config';
-import { useRequest } from './useRequest';
+import { defaultSnapOrigin } from '../../config';
+import { useRequest } from './useRequest.ts';
 
 export type InvokeSnapParams = {
   method: string;
diff --git a/packages/web-wallet/src/hooks/useMetaMask.ts b/packages/web-wallet/src/hooks/snaps/useMetaMask.ts
similarity index 82%
rename from packages/web-wallet/src/hooks/useMetaMask.ts
rename to packages/web-wallet/src/hooks/snaps/useMetaMask.ts
index a40285c..80bf4bc 100644
--- a/packages/web-wallet/src/hooks/useMetaMask.ts
+++ b/packages/web-wallet/src/hooks/snaps/useMetaMask.ts
@@ -1,13 +1,13 @@
 import { useEffect, useState } from 'react';
 
-import { useMetaMaskContext } from './MetamaskContext';
-import { useRequest } from './useRequest';
-import { GetSnapsResponse } from '../types';
-import { defaultSnapOrigin } from '../config';
+import { useMetaMaskContext } from '../../context/MetamaskContext.tsx';
+import { useRequest } from './useRequest.ts';
+import { GetSnapsResponse } from '../../types';
+import { defaultSnapOrigin } from '../../config';
 
 /**
  * A Hook to retrieve useful data from MetaMask.
- * @returns The informations.
+ * @returns The information.
  */
 export const useMetaMask = () => {
   const { provider, setInstalledSnap, installedSnap } = useMetaMaskContext();
diff --git a/packages/web-wallet/src/hooks/useRequest.ts b/packages/web-wallet/src/hooks/snaps/useRequest.ts
similarity index 92%
rename from packages/web-wallet/src/hooks/useRequest.ts
rename to packages/web-wallet/src/hooks/snaps/useRequest.ts
index 68ee255..e7a0f1a 100644
--- a/packages/web-wallet/src/hooks/useRequest.ts
+++ b/packages/web-wallet/src/hooks/snaps/useRequest.ts
@@ -1,6 +1,6 @@
 import type { RequestArguments } from '@metamask/providers';
 
-import { useMetaMaskContext } from './MetamaskContext';
+import { useMetaMaskContext } from '../../context/MetamaskContext.tsx';
 
 export type Request = (params: RequestArguments) => Promise<unknown | null>;
 
diff --git a/packages/web-wallet/src/hooks/useRequestSnap.ts b/packages/web-wallet/src/hooks/snaps/useRequestSnap.ts
similarity index 80%
rename from packages/web-wallet/src/hooks/useRequestSnap.ts
rename to packages/web-wallet/src/hooks/snaps/useRequestSnap.ts
index b35c9a3..dfa211e 100644
--- a/packages/web-wallet/src/hooks/useRequestSnap.ts
+++ b/packages/web-wallet/src/hooks/snaps/useRequestSnap.ts
@@ -1,7 +1,7 @@
-import { defaultSnapOrigin } from '../config';
-import type { Snap } from '../types';
-import { useMetaMaskContext } from './MetamaskContext';
-import { useRequest } from './useRequest';
+import { defaultSnapOrigin } from '../../config';
+import type { Snap } from '../../types';
+import { useMetaMaskContext } from '../../context/MetamaskContext.tsx';
+import { useRequest } from './useRequest.ts';
 
 /**
  * Utility hook to wrap the `wallet_requestSnaps` method.
diff --git a/packages/web-wallet/src/hooks/useWebzjsActions.ts b/packages/web-wallet/src/hooks/useWebzjsActions.ts
new file mode 100644
index 0000000..8ddb5a6
--- /dev/null
+++ b/packages/web-wallet/src/hooks/useWebzjsActions.ts
@@ -0,0 +1,82 @@
+import { set } from 'idb-keyval';
+import { useWebZjsContext } from '../context/WebzjsContext.tsx';
+
+export function useWebZjsActions() {
+  const { state, dispatch } = useWebZjsContext();
+  console.log('state', state);
+
+  async function syncStateWithWallet() {
+    if (!state.webWallet) {
+      dispatch({
+        type: 'set-error',
+        payload: new Error('Wallet not initialized'),
+      });
+      return;
+    }
+    const summary = await state.webWallet.get_wallet_summary();
+    if (summary) {
+      dispatch({ type: 'set-summary', payload: summary });
+    }
+    const chainHeight = await state.webWallet.get_latest_block();
+    if (chainHeight) {
+      dispatch({ type: 'set-chain-height', payload: chainHeight });
+    }
+  }
+
+  async function flushDbToStore() {
+    if (!state.webWallet) {
+      dispatch({
+        type: 'set-error',
+        payload: new Error('Wallet not initialized'),
+      });
+      return;
+    }
+    console.info('Serializing wallet and dumping to IndexedDB store');
+    const bytes = await state.webWallet.db_to_bytes();
+    await set('wallet', bytes);
+    console.info('Wallet saved to storage');
+  }
+
+  async function triggerRescan() {
+    if (state.loading) {
+      dispatch({ type: 'set-error', payload: new Error('App not yet loaded') });
+      return;
+    }
+    if (!state.webWallet) {
+      dispatch({
+        type: 'set-error',
+        payload: new Error('Wallet not initialized'),
+      });
+      return;
+    }
+    if (state.activeAccount == undefined) {
+      dispatch({ type: 'set-error', payload: new Error('No active account') });
+      return;
+    }
+    if (state.syncInProgress) {
+      dispatch({
+        type: 'set-error',
+        payload: new Error('Sync already in progress'),
+      });
+      return;
+    }
+
+    dispatch({ type: 'set-sync-in-progress', payload: true });
+
+    try {
+      await state.webWallet.sync();
+      await syncStateWithWallet();
+      await flushDbToStore();
+    } catch (err: any) {
+      console.error('Error during rescan:', err);
+      dispatch({ type: 'set-error', payload: err });
+    } finally {
+      dispatch({ type: 'set-sync-in-progress', payload: false });
+    }
+  }
+
+  return {
+    triggerRescan,
+    syncStateWithWallet,
+  };
+}
diff --git a/packages/web-wallet/src/main.tsx b/packages/web-wallet/src/main.tsx
index 1feb2e5..788ceec 100644
--- a/packages/web-wallet/src/main.tsx
+++ b/packages/web-wallet/src/main.tsx
@@ -1,48 +1,17 @@
 import './styles/index.css';
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
-import { createBrowserRouter, RouterProvider } from 'react-router-dom';
-import Home from '@pages/Home';
-import Layout from '@components/Layout/Layout';
-import { MetaMaskProvider } from '@hooks/MetamaskContext';
-import Dashboard from '@pages/Dashboard.tsx';
-import AccountSummary from '@pages/AccountSummary';
-import TransferBalance from '@pages/TransferBalance';
-import Receive from '@pages/Receive.tsx';
-import TransactionHistory from '@pages/TransactionHistory';
-import ProtectedRoute from '@components/ProtectedRoute/ProtectedRoute';
-
-const router = createBrowserRouter([
-  {
-    path: '/',
-    element: <Layout />,
-    children: [
-      {
-        index: true,
-        element: <Home />,
-      },
-      {
-        path: 'dashboard',
-        element: (
-          <ProtectedRoute>
-            <Dashboard />
-          </ProtectedRoute>
-        ),
-        children: [
-          { path: 'account-summary', element: <AccountSummary /> },
-          { path: 'transfer-balance', element: <TransferBalance /> },
-          { path: 'receive', element: <Receive /> },
-          { path: 'transaction-history', element: <TransactionHistory /> },
-        ],
-      },
-    ],
-  },
-]);
+import { MetaMaskProvider } from './context/MetamaskContext.tsx';
+import { WebZjsProvider } from './context/WebzjsContext.tsx';
+import { RouterProvider } from 'react-router-dom';
+import { router } from './router';
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <MetaMaskProvider>
-      <RouterProvider router={router} />
+      <WebZjsProvider>
+        <RouterProvider router={router} />;
+      </WebZjsProvider>
     </MetaMaskProvider>
   </StrictMode>,
 );
diff --git a/packages/web-wallet/src/pages/Home.tsx b/packages/web-wallet/src/pages/Home.tsx
index 1f483c5..c7bc0d2 100644
--- a/packages/web-wallet/src/pages/Home.tsx
+++ b/packages/web-wallet/src/pages/Home.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { MetaMaskLogoSvg, ZcashYellowSvg, FormTransferSvg } from '../assets';
-import { useMetaMask } from '@hooks/useMetaMask.ts';
-import { useRequestSnap } from '@hooks/useRequestSnap.ts';
+import { useMetaMask } from '@hooks/snaps/useMetaMask.ts';
+import { useRequestSnap } from '@hooks/snaps/useRequestSnap.ts';
 import { useNavigate } from 'react-router-dom';
 
 const Home: React.FC = () => {
diff --git a/packages/web-wallet/src/router/index.tsx b/packages/web-wallet/src/router/index.tsx
new file mode 100644
index 0000000..fc9d48a
--- /dev/null
+++ b/packages/web-wallet/src/router/index.tsx
@@ -0,0 +1,38 @@
+import { createBrowserRouter } from 'react-router-dom';
+import Home from '@pages/Home.tsx';
+import ProtectedRoute from '@components/ProtectedRoute/ProtectedRoute.tsx';
+import Dashboard from '@pages/Dashboard.tsx';
+import AccountSummary from '@pages/AccountSummary.tsx';
+import TransferBalance from '@pages/TransferBalance.tsx';
+import Receive from '@pages/Receive.tsx';
+import TransactionHistory from '@pages/TransactionHistory.tsx';
+import App from '../App.tsx';
+
+const router = createBrowserRouter([
+  {
+    path: '/',
+    element: <App />,
+    children: [
+      {
+        index: true,
+        element: <Home />,
+      },
+      {
+        path: 'dashboard',
+        element: (
+          <ProtectedRoute>
+            <Dashboard />
+          </ProtectedRoute>
+        ),
+        children: [
+          { path: 'account-summary', element: <AccountSummary /> },
+          { path: 'transfer-balance', element: <TransferBalance /> },
+          { path: 'receive', element: <Receive /> },
+          { path: 'transaction-history', element: <TransactionHistory /> },
+        ],
+      },
+    ],
+  },
+]);
+
+export { router };
diff --git a/packages/web-wallet/tsconfig.app.json b/packages/web-wallet/tsconfig.app.json
index d67ae5f..eb437e7 100644
--- a/packages/web-wallet/tsconfig.app.json
+++ b/packages/web-wallet/tsconfig.app.json
@@ -13,6 +13,7 @@
     "moduleDetection": "force",
     "noEmit": true,
     "jsx": "react-jsx",
+
     /* Linting */
     "strict": true,
     "noUnusedLocals": true,
diff --git a/packages/web-wallet/vite.config.ts b/packages/web-wallet/vite.config.ts
index 8444e26..dacd0c6 100644
--- a/packages/web-wallet/vite.config.ts
+++ b/packages/web-wallet/vite.config.ts
@@ -18,6 +18,24 @@ export default defineConfig({
       include: '**/*.svg',
     }),
   ],
+  server: {
+    headers: {
+      // required to support web-workers spawning web-workers
+      'Cross-Origin-Opener-Policy': 'same-origin',
+      'Cross-Origin-Embedder-Policy': 'require-corp',
+    },
+  },
+  build: {
+    rollupOptions: {
+      input: {
+        main: 'index.html',
+        worker:
+          'node_modules/@webzjs/webz-wallet/snippets/wasm-bindgen-rayon-3e04391371ad0a8e/src/workerHelpers.worker.js',
+      },
+    },
+    manifest: true,
+  },
+
   resolve: {
     alias: {
       '@components': resolve(__dirname, 'src/components'),
diff --git a/yarn.lock b/yarn.lock
index f9f6e2a..2f2bad7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4165,6 +4165,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/plugin-virtual@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@rollup/plugin-virtual@npm:3.0.2"
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10c0/7115edb7989096d1ce334939fcf6e1ba365586b487bf61b2dd4f915386197f350db70904030342c0720fe58f5a52828975c645c4d415c1d432d9b1b6760a22ef
+  languageName: node
+  linkType: hard
+
 "@rollup/pluginutils@npm:^5.1.3":
   version: 5.1.3
   resolution: "@rollup/pluginutils@npm:5.1.3"
@@ -4506,6 +4518,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core-darwin-arm64@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@swc/core-darwin-arm64@npm:1.10.1"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@swc/core-darwin-arm64@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-darwin-arm64@npm:1.3.78"
@@ -4520,6 +4539,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core-darwin-x64@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@swc/core-darwin-x64@npm:1.10.1"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@swc/core-darwin-x64@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-darwin-x64@npm:1.3.78"
@@ -4534,6 +4560,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core-linux-arm-gnueabihf@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.10.1"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@swc/core-linux-arm-gnueabihf@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.78"
@@ -4548,6 +4581,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core-linux-arm64-gnu@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.10.1"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@swc/core-linux-arm64-gnu@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-linux-arm64-gnu@npm:1.3.78"
@@ -4562,6 +4602,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core-linux-arm64-musl@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@swc/core-linux-arm64-musl@npm:1.10.1"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "@swc/core-linux-arm64-musl@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-linux-arm64-musl@npm:1.3.78"
@@ -4576,6 +4623,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core-linux-x64-gnu@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@swc/core-linux-x64-gnu@npm:1.10.1"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@swc/core-linux-x64-gnu@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-linux-x64-gnu@npm:1.3.78"
@@ -4590,6 +4644,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core-linux-x64-musl@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@swc/core-linux-x64-musl@npm:1.10.1"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "@swc/core-linux-x64-musl@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-linux-x64-musl@npm:1.3.78"
@@ -4604,6 +4665,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core-win32-arm64-msvc@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.10.1"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@swc/core-win32-arm64-msvc@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-win32-arm64-msvc@npm:1.3.78"
@@ -4618,6 +4686,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core-win32-ia32-msvc@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.10.1"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "@swc/core-win32-ia32-msvc@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-win32-ia32-msvc@npm:1.3.78"
@@ -4632,6 +4707,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core-win32-x64-msvc@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@swc/core-win32-x64-msvc@npm:1.10.1"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@swc/core-win32-x64-msvc@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-win32-x64-msvc@npm:1.3.78"
@@ -4736,6 +4818,52 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/core@npm:^1.7.0":
+  version: 1.10.1
+  resolution: "@swc/core@npm:1.10.1"
+  dependencies:
+    "@swc/core-darwin-arm64": "npm:1.10.1"
+    "@swc/core-darwin-x64": "npm:1.10.1"
+    "@swc/core-linux-arm-gnueabihf": "npm:1.10.1"
+    "@swc/core-linux-arm64-gnu": "npm:1.10.1"
+    "@swc/core-linux-arm64-musl": "npm:1.10.1"
+    "@swc/core-linux-x64-gnu": "npm:1.10.1"
+    "@swc/core-linux-x64-musl": "npm:1.10.1"
+    "@swc/core-win32-arm64-msvc": "npm:1.10.1"
+    "@swc/core-win32-ia32-msvc": "npm:1.10.1"
+    "@swc/core-win32-x64-msvc": "npm:1.10.1"
+    "@swc/counter": "npm:^0.1.3"
+    "@swc/types": "npm:^0.1.17"
+  peerDependencies:
+    "@swc/helpers": "*"
+  dependenciesMeta:
+    "@swc/core-darwin-arm64":
+      optional: true
+    "@swc/core-darwin-x64":
+      optional: true
+    "@swc/core-linux-arm-gnueabihf":
+      optional: true
+    "@swc/core-linux-arm64-gnu":
+      optional: true
+    "@swc/core-linux-arm64-musl":
+      optional: true
+    "@swc/core-linux-x64-gnu":
+      optional: true
+    "@swc/core-linux-x64-musl":
+      optional: true
+    "@swc/core-win32-arm64-msvc":
+      optional: true
+    "@swc/core-win32-ia32-msvc":
+      optional: true
+    "@swc/core-win32-x64-msvc":
+      optional: true
+  peerDependenciesMeta:
+    "@swc/helpers":
+      optional: true
+  checksum: 10c0/a3d3b17c1abc8f32a7cc5dfaa006fc314e71cc0beb43e71b8b1c6c3d3841412a7e55d9e72009debd48159881e8a045ecd0ea56036e022f1bc87213fe29cd9015
+  languageName: node
+  linkType: hard
+
 "@swc/counter@npm:^0.1.3":
   version: 0.1.3
   resolution: "@swc/counter@npm:0.1.3"
@@ -4761,6 +4889,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/types@npm:^0.1.17":
+  version: 0.1.17
+  resolution: "@swc/types@npm:0.1.17"
+  dependencies:
+    "@swc/counter": "npm:^0.1.3"
+  checksum: 10c0/29f5c8933a16042956f1adb7383e836ed7646cbf679826e78b53fdd0c08e8572cb42152e527b6b530a9bd1052d33d0972f90f589761ccd252c12652c9b7a72fc
+  languageName: node
+  linkType: hard
+
 "@trysound/sax@npm:0.2.0":
   version: 0.2.0
   resolution: "@trysound/sax@npm:0.2.0"
@@ -5515,12 +5652,14 @@ __metadata:
     "@types/react": "npm:^18.3.12"
     "@types/react-dom": "npm:^18.3.1"
     "@vitejs/plugin-react": "npm:^4.3.3"
+    "@webzjs/webz-keys": "workspace:^"
+    "@webzjs/webz-wallet": "workspace:^"
     autoprefixer: "npm:^10.4.20"
-    clsx: "npm:^2.1.1"
     eslint: "npm:^9.13.0"
     eslint-plugin-react-hooks: "npm:^5.0.0"
     eslint-plugin-react-refresh: "npm:^0.4.14"
     globals: "npm:^15.11.0"
+    idb-keyval: "npm:^6.2.1"
     path: "npm:^0.12.7"
     postcss: "npm:^8.4.47"
     react: "npm:^18.3.1"
@@ -5529,8 +5668,11 @@ __metadata:
     tailwindcss: "npm:^3.4.14"
     typescript: "npm:~5.6.2"
     typescript-eslint: "npm:^8.11.0"
+    usehooks-ts: "npm:^3.1.0"
     vite: "npm:^5.4.10"
     vite-plugin-svgr: "npm:^4.3.0"
+    vite-plugin-top-level-await: "npm:^1.4.4"
+    vite-plugin-wasm: "npm:^3.3.0"
   languageName: unknown
   linkType: soft
 
@@ -6898,7 +7040,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clsx@npm:^2.1.0, clsx@npm:^2.1.1":
+"clsx@npm:^2.1.0":
   version: 2.1.1
   resolution: "clsx@npm:2.1.1"
   checksum: 10c0/c4c8eb865f8c82baab07e71bfa8897c73454881c4f99d6bc81585aecd7c441746c1399d08363dc096c550cceaf97bd4ce1e8854e1771e9998d9f94c4fe075839
@@ -14704,6 +14846,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uuid@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "uuid@npm:10.0.0"
+  bin:
+    uuid: dist/bin/uuid
+  checksum: 10c0/eab18c27fe4ab9fb9709a5d5f40119b45f2ec8314f8d4cf12ce27e4c6f4ffa4a6321dc7db6c515068fa373c075b49691ba969f0010bf37f44c37ca40cd6bf7fe
+  languageName: node
+  linkType: hard
+
 "uuid@npm:^8.3.2":
   version: 8.3.2
   resolution: "uuid@npm:8.3.2"
@@ -14767,6 +14918,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite-plugin-top-level-await@npm:^1.4.4":
+  version: 1.4.4
+  resolution: "vite-plugin-top-level-await@npm:1.4.4"
+  dependencies:
+    "@rollup/plugin-virtual": "npm:^3.0.2"
+    "@swc/core": "npm:^1.7.0"
+    uuid: "npm:^10.0.0"
+  peerDependencies:
+    vite: ">=2.8"
+  checksum: 10c0/013e7b2e28632d93d04c4061187198e699064fc208a1657c100354b32da30921fa835879fc17779d5e0b074855237408da2fadd720fa0f4571137427a1efd5e3
+  languageName: node
+  linkType: hard
+
+"vite-plugin-wasm@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "vite-plugin-wasm@npm:3.3.0"
+  peerDependencies:
+    vite: ^2 || ^3 || ^4 || ^5
+  checksum: 10c0/382ba2f2ffef31dde717ad43a69427bc930a6e2ec453d17b700ef7937b48996893a61657fdee3122654e027b1933341548493b35e6469520a8d4ae6c522d1ee2
+  languageName: node
+  linkType: hard
+
 "vite@npm:^5.4.10, vite@npm:^5.4.9":
   version: 5.4.10
   resolution: "vite@npm:5.4.10"

From 8bdd7bab23016d0c8d977b9c05209f389b8f1830 Mon Sep 17 00:00:00 2001
From: Anton Lykhoyda <lykhoyda@gmail.com>
Date: Thu, 12 Dec 2024 17:34:00 +0100
Subject: [PATCH 3/9] add account summary balances

---
 Cargo.toml                                    |   6 +-
 justfile                                      |   2 -
 packages/snap/snap.manifest.json              |   2 +-
 packages/web-wallet/src/App.tsx               |   2 +-
 .../web-wallet/src/assets/icons/coins.svg     |   3 +
 packages/web-wallet/src/assets/index.ts       |   2 +
 .../src/components/Layout/Layout.tsx          |   4 +-
 .../web-wallet/src/context/WebzjsContext.tsx  |  43 +++----
 .../web-wallet/src/hooks/useWebzjsActions.ts  | 112 ++++++++++++++----
 .../web-wallet/src/pages/AccountSummary.tsx   |  84 ++++++++++++-
 packages/web-wallet/src/pages/Dashboard.tsx   |   6 +-
 packages/web-wallet/src/pages/Home.tsx        |  22 +++-
 packages/web-wallet/src/utils/index.ts        |   1 +
 packages/web-wallet/src/utils/zatsToZec.ts    |   3 +
 14 files changed, 231 insertions(+), 61 deletions(-)
 create mode 100644 packages/web-wallet/src/assets/icons/coins.svg
 create mode 100644 packages/web-wallet/src/utils/zatsToZec.ts

diff --git a/Cargo.toml b/Cargo.toml
index 9221896..ab840f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,10 @@
 [workspace]
 resolver = "2"
 
-members = [ "crates/webz-common",
-    "crates/webz-keys", "crates/webz-requests",
+members = [
+    "crates/webz-common",
+    "crates/webz-keys",
+    "crates/webz-requests",
     "crates/webz-wallet",
 ]
 
diff --git a/justfile b/justfile
index 05fcb63..b5b5c69 100644
--- a/justfile
+++ b/justfile
@@ -15,7 +15,6 @@ build-keys *features:
 build-requests *features:
     cd crates/webz-requests && wasm-pack build -t web --release --scope webzjs --out-dir ../../packages/webz-requests --no-default-features --features="{{features}}" -Z build-std="panic_abort,std"
 
-
 # All Wasm Tests
 test-web *features:
     WASM_BINDGEN_TEST_TIMEOUT=99999 wasm-pack test --release --firefox --no-default-features --features "wasm no-bundler {{features}}" -Z build-std="panic_abort,std"
@@ -28,7 +27,6 @@ test-message-board-web *features:
 test-simple-web *features:
     WASM_BINDGEN_TEST_TIMEOUT=99999 wasm-pack test --release --chrome --no-default-features --features "wasm no-bundler {{features}}" -Z build-std="panic_abort,std" --test simple-sync-and-send
 
-
 # simple example: additional args:, sqlite-db
 example-simple *features:
    RUST_LOG="info,zcash_client_backend::sync=debug" cargo run -r --example simple-sync --features "native {{features}}"
diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
index cb9482e..5de5b5f 100644
--- a/packages/snap/snap.manifest.json
+++ b/packages/snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/template-snap-monorepo.git"
   },
   "source": {
-    "shasum": "5kG/5tKuPrrpApOlFvFR5gCuTloSUZfJ4QCjtVezHu8=",
+    "shasum": "trfvzpmDcGt2TqfetqwfKPa8kHXQKGf4cytN7W+dHZU=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
diff --git a/packages/web-wallet/src/App.tsx b/packages/web-wallet/src/App.tsx
index 1cd8cd4..220fe0c 100644
--- a/packages/web-wallet/src/App.tsx
+++ b/packages/web-wallet/src/App.tsx
@@ -1,8 +1,8 @@
 import { useInterval } from 'usehooks-ts';
-import { RESCAN_INTERVAL } from '@webzjs/demo-wallet/src/App/Constants.tsx';
 import { useWebZjsActions } from '@hooks/useWebzjsActions.ts';
 import Layout from '@components/Layout/Layout.tsx';
 import { Outlet } from 'react-router-dom';
+import { RESCAN_INTERVAL } from './config/constants.ts';
 
 function App() {
   const { triggerRescan } = useWebZjsActions();
diff --git a/packages/web-wallet/src/assets/icons/coins.svg b/packages/web-wallet/src/assets/icons/coins.svg
new file mode 100644
index 0000000..bdf26eb
--- /dev/null
+++ b/packages/web-wallet/src/assets/icons/coins.svg
@@ -0,0 +1,3 @@
+<svg width="27" height="20" viewBox="0 0 27 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M19.25 5.79672V5.1875C19.25 2.44438 15.1123 0.375 9.625 0.375C4.13766 0.375 0 2.44438 0 5.1875V9.5625C0 11.8473 2.87109 13.663 7 14.2066V14.8125C7 17.5556 11.1377 19.625 16.625 19.625C22.1123 19.625 26.25 17.5556 26.25 14.8125V10.4375C26.25 8.17344 23.4697 6.35563 19.25 5.79672ZM24.5 10.4375C24.5 11.8834 21.1323 13.5 16.625 13.5C16.217 13.5 15.8123 13.4858 15.4131 13.4595C17.7723 12.5998 19.25 11.2031 19.25 9.5625V7.56531C22.517 8.05203 24.5 9.37328 24.5 10.4375ZM7 12.4336V9.83156C7.87038 9.94497 8.74726 10.0012 9.625 10C10.5027 10.0012 11.3796 9.94497 12.25 9.83156V12.4336C11.3809 12.562 10.5035 12.626 9.625 12.625C8.74648 12.626 7.86909 12.562 7 12.4336ZM17.5 8.02359V9.5625C17.5 10.4802 16.1427 11.4656 14 12.0639V9.50781C15.412 9.16547 16.6075 8.65578 17.5 8.02359ZM9.625 2.125C14.1323 2.125 17.5 3.74156 17.5 5.1875C17.5 6.63344 14.1323 8.25 9.625 8.25C5.11766 8.25 1.75 6.63344 1.75 5.1875C1.75 3.74156 5.11766 2.125 9.625 2.125ZM1.75 9.5625V8.02359C2.6425 8.65578 3.83797 9.16547 5.25 9.50781V12.0639C3.10734 11.4656 1.75 10.4802 1.75 9.5625ZM8.75 14.8125V14.3564C9.03766 14.3673 9.32859 14.375 9.625 14.375C10.0494 14.375 10.4639 14.3608 10.8708 14.3367C11.3228 14.4985 11.7832 14.6358 12.25 14.748V17.3139C10.1073 16.7156 8.75 15.7302 8.75 14.8125ZM14 17.6836V15.075C14.8701 15.192 15.7471 15.2504 16.625 15.25C17.5027 15.2512 18.3796 15.195 19.25 15.0816V17.6836C17.5093 17.9388 15.7407 17.9388 14 17.6836ZM21 17.3139V14.7578C22.412 14.4155 23.6075 13.9058 24.5 13.2736V14.8125C24.5 15.7302 23.1427 16.7156 21 17.3139Z" fill="#0F0F0F"/>
+</svg>
diff --git a/packages/web-wallet/src/assets/index.ts b/packages/web-wallet/src/assets/index.ts
index 5cf95b6..60f4035 100644
--- a/packages/web-wallet/src/assets/index.ts
+++ b/packages/web-wallet/src/assets/index.ts
@@ -12,6 +12,7 @@ import ClockSvg from './icons/clock.svg';
 import ShieldSvg from './icons/shield.svg';
 import ShieldDividedSvg from './icons/shield-divided.svg';
 import SummarySvg from './icons/summary.svg';
+import CoinsSvg from './icons/coins.svg';
 
 export {
   ChainsafeSvg,
@@ -26,4 +27,5 @@ export {
   ShieldSvg,
   ShieldDividedSvg,
   SummarySvg,
+  CoinsSvg,
 };
diff --git a/packages/web-wallet/src/components/Layout/Layout.tsx b/packages/web-wallet/src/components/Layout/Layout.tsx
index 82e5414..83682fa 100644
--- a/packages/web-wallet/src/components/Layout/Layout.tsx
+++ b/packages/web-wallet/src/components/Layout/Layout.tsx
@@ -5,9 +5,9 @@ import Footer from '../Footer/Footer.tsx';
 
 const Layout = (): React.JSX.Element => {
   return (
-    <div className="flex flex-col min-h-screen">
+    <div className="container mx-auto flex flex-col min-h-screen">
       <Header />
-      <main className="flex-grow flex justify-center py-3">
+      <main className="flex-grow flex justify-center py-3 self-stretch w-full">
         <Outlet />
       </main>
       <Footer />
diff --git a/packages/web-wallet/src/context/WebzjsContext.tsx b/packages/web-wallet/src/context/WebzjsContext.tsx
index ac41edd..523feba 100644
--- a/packages/web-wallet/src/context/WebzjsContext.tsx
+++ b/packages/web-wallet/src/context/WebzjsContext.tsx
@@ -1,40 +1,32 @@
 import React, { createContext, useReducer, useEffect } from 'react';
 import type { ReactNode } from 'react';
-import type { MetaMaskInpageProvider } from '@metamask/providers';
 import { get, set } from 'idb-keyval';
 
-import initWebzWallet, { initThreadPool, WebWallet } from '@webzjs/webz-wallet';
+import initWebzWallet, {
+  initThreadPool,
+  WalletSummary,
+  WebWallet,
+} from '@webzjs/webz-wallet';
 import initWebzKeys from '@webzjs/webz-keys';
 
 import type { Snap } from '../types';
-import { getSnapsProvider } from '../utils';
 import { MAINNET_LIGHTWALLETD_PROXY } from '../config/constants.ts';
 
-interface Summary {
-  chain_tip_height: number;
-  fully_scanned_height: number;
-  next_sapling_subtree_index: bigint;
-  next_orchard_subtree_index: bigint;
-  account_balances: [number, number][];
-}
-
 interface State {
   webWallet: WebWallet | null;
-  provider: MetaMaskInpageProvider | null;
   installedSnap: Snap | null;
   error: Error | null;
-  summary: Summary | null;
-  chainHeight: bigint | null;
-  activeAccount: number | null;
+  summary?: WalletSummary;
+  chainHeight?: bigint;
+  activeAccount?: number;
   syncInProgress: boolean;
   loading: boolean;
 }
 
 type Action =
   | { type: 'set-web-wallet'; payload: WebWallet }
-  | { type: 'set-provider'; payload: MetaMaskInpageProvider | null }
   | { type: 'set-error'; payload: Error | null }
-  | { type: 'set-summary'; payload: Summary }
+  | { type: 'set-summary'; payload: WalletSummary }
   | { type: 'set-chain-height'; payload: bigint }
   | { type: 'set-active-account'; payload: number }
   | { type: 'set-sync-in-progress'; payload: boolean }
@@ -42,12 +34,11 @@ type Action =
 
 const initialState: State = {
   webWallet: null,
-  provider: null,
   installedSnap: null,
   error: null,
-  summary: null,
-  chainHeight: null,
-  activeAccount: null,
+  summary: undefined,
+  chainHeight: undefined,
+  activeAccount: undefined,
   syncInProgress: false,
   loading: true,
 };
@@ -56,8 +47,6 @@ function reducer(state: State, action: Action): State {
   switch (action.type) {
     case 'set-web-wallet':
       return { ...state, webWallet: action.payload };
-    case 'set-provider':
-      return { ...state, provider: action.payload };
     case 'set-error':
       return { ...state, error: action.payload };
     case 'set-summary':
@@ -102,10 +91,8 @@ export const WebZjsProvider = ({ children }: { children: ReactNode }) => {
         await initThreadPool(10);
       } catch (err) {
         console.error(err);
-        throw Error('Unable to initialize Thread Pool');
+        return Error('Unable to initialize Thread Pool');
       }
-      const provider = await getSnapsProvider();
-      dispatch({ type: 'set-provider', payload: provider });
 
       const bytes = await get('wallet');
       let wallet;
@@ -138,9 +125,9 @@ export const WebZjsProvider = ({ children }: { children: ReactNode }) => {
       }
 
       dispatch({ type: 'set-loading', payload: false });
-    } catch (err: never) {
+    } catch (err) {
       console.error('Initialization error:', err);
-      dispatch({ type: 'set-error', payload: err.toString() });
+      dispatch({ type: 'set-error', payload: Error(String(err)) });
       dispatch({ type: 'set-loading', payload: false });
     }
   }
diff --git a/packages/web-wallet/src/hooks/useWebzjsActions.ts b/packages/web-wallet/src/hooks/useWebzjsActions.ts
index 8ddb5a6..da00528 100644
--- a/packages/web-wallet/src/hooks/useWebzjsActions.ts
+++ b/packages/web-wallet/src/hooks/useWebzjsActions.ts
@@ -1,11 +1,28 @@
 import { set } from 'idb-keyval';
+import { useCallback } from 'react';
 import { useWebZjsContext } from '../context/WebzjsContext.tsx';
 
-export function useWebZjsActions() {
+export interface AccountBalance {
+  totalShieldedBalance: number;
+  unshieldedBalance: number;
+  totalBalance: number;
+}
+
+interface UseWebzjsActions {
+  addNewAccountFromUfvk: (
+    ufvk: string,
+    birthdayHeight: number,
+  ) => Promise<void>;
+  getBalance: () => AccountBalance;
+  triggerRescan: () => Promise<void>;
+  flushDbToStore: () => Promise<void>;
+  syncStateWithWallet: () => Promise<void>;
+}
+
+export function useWebZjsActions(): UseWebzjsActions {
   const { state, dispatch } = useWebZjsContext();
-  console.log('state', state);
 
-  async function syncStateWithWallet() {
+  const syncStateWithWallet = useCallback(async () => {
     if (!state.webWallet) {
       dispatch({
         type: 'set-error',
@@ -13,17 +30,37 @@ export function useWebZjsActions() {
       });
       return;
     }
-    const summary = await state.webWallet.get_wallet_summary();
-    if (summary) {
-      dispatch({ type: 'set-summary', payload: summary });
-    }
-    const chainHeight = await state.webWallet.get_latest_block();
-    if (chainHeight) {
-      dispatch({ type: 'set-chain-height', payload: chainHeight });
+    try {
+      const summary = await state.webWallet.get_wallet_summary();
+      if (summary) {
+        dispatch({ type: 'set-summary', payload: summary });
+      }
+      const chainHeight = await state.webWallet.get_latest_block();
+      if (chainHeight) {
+        dispatch({ type: 'set-chain-height', payload: chainHeight });
+      }
+    } catch (error) {
+      console.error('Error syncing state with wallet:', error);
+      dispatch({ type: 'set-error', payload: error });
     }
-  }
+  }, [state.webWallet, dispatch]);
+
+  const addNewAccountFromUfvk = useCallback(
+    async (ufvk: string, birthdayHeight: number) => {
+      const account_id =
+        (await state.webWallet?.create_account_ufvk(ufvk, birthdayHeight)) || 0;
+      dispatch({ type: 'set-active-account', payload: account_id });
+
+      if (state.webWallet) {
+        const summary = await state.webWallet.get_wallet_summary();
+        console.log(summary?.account_balances.length);
+      }
+      await syncStateWithWallet();
+    },
+    [dispatch, state.webWallet, syncStateWithWallet],
+  );
 
-  async function flushDbToStore() {
+  const flushDbToStore = useCallback(async () => {
     if (!state.webWallet) {
       dispatch({
         type: 'set-error',
@@ -31,13 +68,18 @@ export function useWebZjsActions() {
       });
       return;
     }
-    console.info('Serializing wallet and dumping to IndexedDB store');
-    const bytes = await state.webWallet.db_to_bytes();
-    await set('wallet', bytes);
-    console.info('Wallet saved to storage');
-  }
+    try {
+      console.info('Serializing wallet and dumping to IndexedDB store');
+      const bytes = await state.webWallet.db_to_bytes();
+      await set('wallet', bytes);
+      console.info('Wallet saved to storage');
+    } catch (error) {
+      console.error('Error flushing DB to store:', error);
+      dispatch({ type: 'set-error', payload: error });
+    }
+  }, [state.webWallet, dispatch]);
 
-  async function triggerRescan() {
+  const triggerRescan = useCallback(async () => {
     if (state.loading) {
       dispatch({ type: 'set-error', payload: new Error('App not yet loaded') });
       return;
@@ -49,7 +91,7 @@ export function useWebZjsActions() {
       });
       return;
     }
-    if (state.activeAccount == undefined) {
+    if (state.activeAccount === undefined) {
       dispatch({ type: 'set-error', payload: new Error('No active account') });
       return;
     }
@@ -73,10 +115,40 @@ export function useWebZjsActions() {
     } finally {
       dispatch({ type: 'set-sync-in-progress', payload: false });
     }
-  }
+  }, [
+    state.loading,
+    state.webWallet,
+    state.activeAccount,
+    state.syncInProgress,
+    dispatch,
+    syncStateWithWallet,
+    flushDbToStore,
+  ]);
+
+  const getBalance = useCallback((): AccountBalance => {
+    const activeBalanceReport = state.summary?.account_balances.find(
+      ([id]) => id === state.activeAccount,
+    );
+
+    const totalShieldedBalance = activeBalanceReport
+      ? activeBalanceReport[1].sapling_balance +
+        activeBalanceReport[1].orchard_balance
+      : 0;
+
+    const unshieldedBalance = activeBalanceReport?.[1]?.unshielded_balance || 0;
+
+    return {
+      totalShieldedBalance,
+      unshieldedBalance,
+      totalBalance: totalShieldedBalance + unshieldedBalance,
+    };
+  }, [state.activeAccount, state.summary?.account_balances]);
 
   return {
+    getBalance,
+    addNewAccountFromUfvk,
     triggerRescan,
+    flushDbToStore,
     syncStateWithWallet,
   };
 }
diff --git a/packages/web-wallet/src/pages/AccountSummary.tsx b/packages/web-wallet/src/pages/AccountSummary.tsx
index 9a9b5ca..70ce9e6 100644
--- a/packages/web-wallet/src/pages/AccountSummary.tsx
+++ b/packages/web-wallet/src/pages/AccountSummary.tsx
@@ -1,5 +1,87 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { useWebZjsActions } from '@hooks/useWebzjsActions.ts';
+import { zatsToZec } from '../utils';
+import { CoinsSvg, ShieldDividedSvg, ShieldSvg } from '../assets';
+
+interface BalanceCard {
+  name: string;
+  icon: React.JSX.Element;
+  balance: number;
+}
+
 function AccountSummary() {
-  return <div>TODO: Account Summary</div>;
+  const [totalBalance, setTotalBalance] = useState<number>(0);
+  const [totalShieldedBalance, setTotalShieldedBalance] = useState<number>(0);
+  const [unshieldedBalance, setUnshieldedBalance] = useState<number>(0);
+  const { getBalance } = useWebZjsActions();
+
+  const BalanceCards: BalanceCard[] = [
+    {
+      name: 'Account Balance',
+      icon: <CoinsSvg />,
+      balance: totalBalance,
+    },
+    {
+      name: 'Shielded Balance',
+      icon: <ShieldSvg />,
+      balance: totalShieldedBalance,
+    },
+    {
+      name: 'Unshielded Balance',
+      icon: <ShieldDividedSvg />,
+      balance: unshieldedBalance,
+    },
+  ];
+
+  const fetchBalances = useCallback(() => {
+    const { totalBalance, unshieldedBalance, totalShieldedBalance } =
+      getBalance();
+
+    setTotalBalance(totalBalance);
+    setTotalShieldedBalance(totalShieldedBalance);
+    setUnshieldedBalance(unshieldedBalance);
+  }, [getBalance]);
+
+  useEffect(() => {
+    fetchBalances();
+  }, [fetchBalances]);
+
+  const renderBalanceCard = ({ name, balance, icon }: BalanceCard) => {
+    return (
+      <div
+        key={name}
+        className="grow shrink basis-0 p-6 bg-white rounded-xl border border-[#afafaf] flex-col justify-start items-start gap-2 inline-flex"
+      >
+        {icon}
+        <div className="self-stretch text-[#595959] text-sm font-semibold font-inter leading-[21px]">
+          {name}
+        </div>
+        <div className="self-stretch justify-start items-center gap-2 inline-flex">
+          <div className="text-black text-2xl font-medium font-['Inter'] leading-9">
+            Available Balance: {zatsToZec(balance)} ZEC
+          </div>
+          <div className="w-7 h-7 relative" />
+        </div>
+      </div>
+    );
+  };
+
+  return (
+    <div className="h-[390px] px-16 pt-12 pb-[72px] flex-col justify-center items-center gap-6 inline-flex">
+      <div className="py-6 self-start  gap-3 inline-flex">
+        <div className="grow shrink basis-0 flex-col justify-start items-start gap-2 inline-flex">
+          <div className="self-stretch text-black text-[44px] font-semibold font-['Inter'] leading-[52.80px]">
+            Account summary
+          </div>
+        </div>
+      </div>
+      <div
+        className={'rounded-2xl justify-start items-center gap-6 inline-flex'}
+      >
+        {BalanceCards.map((card) => renderBalanceCard(card))}
+      </div>
+    </div>
+  );
 }
 
 export default AccountSummary;
diff --git a/packages/web-wallet/src/pages/Dashboard.tsx b/packages/web-wallet/src/pages/Dashboard.tsx
index 10d634f..1087d02 100644
--- a/packages/web-wallet/src/pages/Dashboard.tsx
+++ b/packages/web-wallet/src/pages/Dashboard.tsx
@@ -47,7 +47,7 @@ const getClassNames = (isActive: boolean) => {
 const Dashboard: React.FC = () => {
   return (
     <div>
-      <nav className="flex space-x-9 mb-3">
+      <nav className="flex space-x-9 mb-3 max-w-[720px] items-center align-middle self-center m-auto ">
         {navItems.map((item) => (
           <NavLink
             key={item.to}
@@ -60,7 +60,9 @@ const Dashboard: React.FC = () => {
               <span
                 className={`inline-flex items-center hover:text-brand-orange navbar-link ${isActive && 'navbar-link-active'}`}
               >
-                <span className="text-brand-grey10  mr-2">{item.icon}</span>
+                <span className="text-brand-grey10 text-sm  mr-2">
+                  {item.icon}
+                </span>
                 {item.label}
               </span>
             )}
diff --git a/packages/web-wallet/src/pages/Home.tsx b/packages/web-wallet/src/pages/Home.tsx
index c7bc0d2..0a2eeb6 100644
--- a/packages/web-wallet/src/pages/Home.tsx
+++ b/packages/web-wallet/src/pages/Home.tsx
@@ -1,14 +1,32 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { MetaMaskLogoSvg, ZcashYellowSvg, FormTransferSvg } from '../assets';
 import { useMetaMask } from '@hooks/snaps/useMetaMask.ts';
 import { useRequestSnap } from '@hooks/snaps/useRequestSnap.ts';
 import { useNavigate } from 'react-router-dom';
+import { useInvokeSnap } from '@hooks/snaps/useInvokeSnap.ts';
+import { useWebZjsActions } from '@hooks/useWebzjsActions.ts';
 
 const Home: React.FC = () => {
+  const [birthdayHeight, setBirthdayHeight] = useState(0);
   const navigate = useNavigate();
+  const { flushDbToStore, addNewAccountFromUfvk } = useWebZjsActions();
+  const invokeSnap = useInvokeSnap();
   const { installedSnap, isFlask } = useMetaMask();
   const requestSnap = useRequestSnap();
 
+  const handleRequestSnapAndGetViewingkey = async (e) => {
+    e.preventDefault();
+    await requestSnap();
+
+    const viewKey = (await invokeSnap({ method: 'getViewingKey' })) as string;
+    console.log(viewKey);
+
+    await addNewAccountFromUfvk(viewKey, birthdayHeight);
+    setBirthdayHeight(0);
+
+    await flushDbToStore();
+  };
+
   useEffect(() => {
     if (installedSnap) navigate('/dashboard/account-summary');
   }, [installedSnap, navigate]);
@@ -31,7 +49,7 @@ const Home: React.FC = () => {
           </p>
           <button
             disabled={!isFlask}
-            onClick={requestSnap}
+            onClick={handleRequestSnapAndGetViewingkey}
             className="flex items-center bg-buttonBlackGradient hover:bg-buttonBlackGradientHover text-white px-6 py-3 rounded-[2rem]"
           >
             <span>Connect MetaMask Snap</span>
diff --git a/packages/web-wallet/src/utils/index.ts b/packages/web-wallet/src/utils/index.ts
index 1a54b09..58c4530 100644
--- a/packages/web-wallet/src/utils/index.ts
+++ b/packages/web-wallet/src/utils/index.ts
@@ -1 +1,2 @@
 export * from './metamask';
+export * from './zatsToZec';
diff --git a/packages/web-wallet/src/utils/zatsToZec.ts b/packages/web-wallet/src/utils/zatsToZec.ts
new file mode 100644
index 0000000..e9f4140
--- /dev/null
+++ b/packages/web-wallet/src/utils/zatsToZec.ts
@@ -0,0 +1,3 @@
+export function zatsToZec(zats: number): number {
+  return zats / 100_000_000;
+}

From 5d2ea0f9bca33995e15cfb8722a942d36014e255 Mon Sep 17 00:00:00 2001
From: Anton Lykhoyda <lykhoyda@gmail.com>
Date: Fri, 13 Dec 2024 12:34:41 +0100
Subject: [PATCH 4/9] update deprecated dependency

---
 packages/snap/package.json |   2 +-
 yarn.lock                  | 238 ++++++++++++++++++++++++-------------
 2 files changed, 158 insertions(+), 82 deletions(-)

diff --git a/packages/snap/package.json b/packages/snap/package.json
index 25cffd8..a458652 100644
--- a/packages/snap/package.json
+++ b/packages/snap/package.json
@@ -40,7 +40,7 @@
     "@metamask/eslint-config-nodejs": "^14.0.0",
     "@metamask/eslint-config-typescript": "^14.0.0",
     "@metamask/snaps-cli": "^6.5.2",
-    "@metamask/snaps-jest": "^8.6.0",
+    "@metamask/snaps-jest": "^8.8.1",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^5.42.1",
     "eslint": "^9.14.0",
diff --git a/yarn.lock b/yarn.lock
index 2f2bad7..60da6f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2204,7 +2204,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/approval-controller@npm:^7.0.2":
+"@metamask/approval-controller@npm:^7.1.1":
   version: 7.1.1
   resolution: "@metamask/approval-controller@npm:7.1.1"
   dependencies:
@@ -2392,39 +2392,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-block-tracker@npm:^11.0.1":
-  version: 11.0.2
-  resolution: "@metamask/eth-block-tracker@npm:11.0.2"
+"@metamask/eth-block-tracker@npm:^11.0.3":
+  version: 11.0.3
+  resolution: "@metamask/eth-block-tracker@npm:11.0.3"
   dependencies:
     "@metamask/eth-json-rpc-provider": "npm:^4.1.5"
     "@metamask/safe-event-emitter": "npm:^3.1.1"
     "@metamask/utils": "npm:^9.1.0"
     json-rpc-random-id: "npm:^1.0.1"
     pify: "npm:^5.0.0"
-  checksum: 10c0/27afb0848c436a7ed21c170b2922d48f2da30d5e6a2765c79abc04c9e913156976e18c92d1f9870fa43836510e5e55a0cfd793c2539fa7c054053b6bc4b332fc
+  checksum: 10c0/91e50a326eb1accbc23a4c318297d78476256c25125128a2ad0d2349c09454f5ecc2de4dca769d2f9db3817c043be610ef8fec2855ccfff212c71824520d5bf3
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-middleware@npm:^14.0.0":
-  version: 14.0.2
-  resolution: "@metamask/eth-json-rpc-middleware@npm:14.0.2"
+"@metamask/eth-json-rpc-middleware@npm:^15.0.0":
+  version: 15.0.1
+  resolution: "@metamask/eth-json-rpc-middleware@npm:15.0.1"
   dependencies:
-    "@metamask/eth-block-tracker": "npm:^11.0.1"
-    "@metamask/eth-json-rpc-provider": "npm:^4.1.1"
+    "@metamask/eth-block-tracker": "npm:^11.0.3"
+    "@metamask/eth-json-rpc-provider": "npm:^4.1.5"
     "@metamask/eth-sig-util": "npm:^7.0.3"
-    "@metamask/json-rpc-engine": "npm:^9.0.2"
-    "@metamask/rpc-errors": "npm:^6.3.1"
+    "@metamask/json-rpc-engine": "npm:^10.0.0"
+    "@metamask/rpc-errors": "npm:^7.0.0"
     "@metamask/utils": "npm:^9.1.0"
     "@types/bn.js": "npm:^5.1.5"
     bn.js: "npm:^5.2.1"
     klona: "npm:^2.0.6"
     pify: "npm:^5.0.0"
     safe-stable-stringify: "npm:^2.4.3"
-  checksum: 10c0/ffad394f0d5ffc798a6fe73a3725c180a71b4d4c14b9e89b1e56e47fb2970342d280e6d9249ea1fa93712f45ca2736d359a7db05a2e46116f7e559675fb6aaab
+  checksum: 10c0/c2713cefafea128052d93a010efeacf7299a92651c85d8503fc8375ce9734450e808233fa26542ee4112e7a43187b708fcb82dec88d309cef90743bd591bb659
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-provider@npm:^4.1.1, @metamask/eth-json-rpc-provider@npm:^4.1.5":
+"@metamask/eth-json-rpc-provider@npm:^4.1.5":
   version: 4.1.6
   resolution: "@metamask/eth-json-rpc-provider@npm:4.1.6"
   dependencies:
@@ -2473,7 +2473,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/json-rpc-engine@npm:^10.0.1":
+"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.1":
   version: 10.0.1
   resolution: "@metamask/json-rpc-engine@npm:10.0.1"
   dependencies:
@@ -2484,7 +2484,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/json-rpc-engine@npm:^9.0.1, @metamask/json-rpc-engine@npm:^9.0.2":
+"@metamask/json-rpc-engine@npm:^9.0.1":
   version: 9.0.3
   resolution: "@metamask/json-rpc-engine@npm:9.0.3"
   dependencies:
@@ -2495,7 +2495,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.2, @metamask/json-rpc-middleware-stream@npm:^8.0.5":
+"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.5":
   version: 8.0.5
   resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.5"
   dependencies:
@@ -2507,6 +2507,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/key-tree@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "@metamask/key-tree@npm:10.0.1"
+  dependencies:
+    "@metamask/scure-bip39": "npm:^2.1.1"
+    "@metamask/utils": "npm:^10.0.1"
+    "@noble/curves": "npm:^1.2.0"
+    "@noble/hashes": "npm:^1.3.2"
+    "@scure/base": "npm:^1.0.0"
+  checksum: 10c0/f5f28cd61bb02d8c5c490cc74eff53719db0c63dd507c456f355ad3b90bd51d0672a0b261cec3e34dead0cd234cd239d3b0e85bc14af406b8689aa71381e1edb
+  languageName: node
+  linkType: hard
+
 "@metamask/key-tree@npm:^9.1.2":
   version: 9.1.2
   resolution: "@metamask/key-tree@npm:9.1.2"
@@ -2657,7 +2670,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/rpc-errors@npm:^7.0.1":
+"@metamask/rpc-errors@npm:^7.0.0, @metamask/rpc-errors@npm:^7.0.1":
   version: 7.0.1
   resolution: "@metamask/rpc-errors@npm:7.0.1"
   dependencies:
@@ -2751,24 +2764,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers@npm:^9.11.1":
-  version: 9.11.1
-  resolution: "@metamask/snaps-controllers@npm:9.11.1"
+"@metamask/snaps-controllers@npm:^9.15.0":
+  version: 9.15.0
+  resolution: "@metamask/snaps-controllers@npm:9.15.0"
   dependencies:
-    "@metamask/approval-controller": "npm:^7.0.2"
-    "@metamask/base-controller": "npm:^6.0.2"
-    "@metamask/json-rpc-engine": "npm:^9.0.2"
-    "@metamask/json-rpc-middleware-stream": "npm:^8.0.2"
+    "@metamask/approval-controller": "npm:^7.1.1"
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/json-rpc-engine": "npm:^10.0.1"
+    "@metamask/json-rpc-middleware-stream": "npm:^8.0.5"
+    "@metamask/key-tree": "npm:^10.0.1"
     "@metamask/object-multiplex": "npm:^2.0.0"
-    "@metamask/permission-controller": "npm:^11.0.0"
+    "@metamask/permission-controller": "npm:^11.0.3"
     "@metamask/phishing-controller": "npm:^12.0.2"
     "@metamask/post-message-stream": "npm:^8.1.1"
-    "@metamask/rpc-errors": "npm:^6.3.1"
-    "@metamask/snaps-registry": "npm:^3.2.1"
-    "@metamask/snaps-rpc-methods": "npm:^11.5.0"
-    "@metamask/snaps-sdk": "npm:^6.9.0"
-    "@metamask/snaps-utils": "npm:^8.4.1"
-    "@metamask/utils": "npm:^9.2.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/snaps-registry": "npm:^3.2.2"
+    "@metamask/snaps-rpc-methods": "npm:^11.7.0"
+    "@metamask/snaps-sdk": "npm:^6.13.0"
+    "@metamask/snaps-utils": "npm:^8.6.1"
+    "@metamask/utils": "npm:^10.0.0"
     "@xstate/fsm": "npm:^2.0.0"
     browserify-zlib: "npm:^0.2.0"
     concat-stream: "npm:^2.0.0"
@@ -2778,52 +2792,53 @@ __metadata:
     nanoid: "npm:^3.1.31"
     readable-stream: "npm:^3.6.2"
     readable-web-to-node-stream: "npm:^3.0.2"
+    semver: "npm:^7.5.4"
     tar-stream: "npm:^3.1.7"
   peerDependencies:
-    "@metamask/snaps-execution-environments": ^6.9.1
+    "@metamask/snaps-execution-environments": ^6.10.0
   peerDependenciesMeta:
     "@metamask/snaps-execution-environments":
       optional: true
-  checksum: 10c0/54d3afbf31ed0db07dc3c1d808db2a04a4fc57975de13aeca0d1b53d5ae3be0928264eba67ddfb21983141e37c1dbc9f8a313c62c16bcdeea94bdee261c3069a
+  checksum: 10c0/5c42a754ccccca1f4f0385686a6fc605760a1488bcf453f022fe2a749a091a74ed7f8dea76d0b624a0f243fd97866faae129cdf38226afef43163f1e41f5f9a0
   languageName: node
   linkType: hard
 
-"@metamask/snaps-execution-environments@npm:^6.9.1":
-  version: 6.9.1
-  resolution: "@metamask/snaps-execution-environments@npm:6.9.1"
+"@metamask/snaps-execution-environments@npm:^6.10.0":
+  version: 6.10.0
+  resolution: "@metamask/snaps-execution-environments@npm:6.10.0"
   dependencies:
-    "@metamask/json-rpc-engine": "npm:^9.0.2"
+    "@metamask/json-rpc-engine": "npm:^10.0.1"
     "@metamask/object-multiplex": "npm:^2.0.0"
     "@metamask/post-message-stream": "npm:^8.1.1"
-    "@metamask/providers": "npm:^17.1.2"
-    "@metamask/rpc-errors": "npm:^6.3.1"
-    "@metamask/snaps-sdk": "npm:^6.8.0"
-    "@metamask/snaps-utils": "npm:^8.4.0"
+    "@metamask/providers": "npm:^18.1.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/snaps-sdk": "npm:^6.11.0"
+    "@metamask/snaps-utils": "npm:^8.6.0"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
+    "@metamask/utils": "npm:^10.0.0"
     nanoid: "npm:^3.1.31"
     readable-stream: "npm:^3.6.2"
-  checksum: 10c0/267d027b9d9fa45e048d7b0fc73bbed4eef4ab7ceea8b65e00403d79fbfb62fa1a0abb493da78e256e9ad44511ed34eb87b0f5e26df9ab1a836f11fb086cf1c5
+  checksum: 10c0/e922658e48c4ea48055db4c86cbb7896ea6c1a31f70bf27060486f74b1ab4c80efbf18dec3588ac6bab31f6f184a5cd0e35710414080105c9c11a631a11c76a1
   languageName: node
   linkType: hard
 
-"@metamask/snaps-jest@npm:^8.6.0":
-  version: 8.6.0
-  resolution: "@metamask/snaps-jest@npm:8.6.0"
+"@metamask/snaps-jest@npm:^8.8.1":
+  version: 8.8.1
+  resolution: "@metamask/snaps-jest@npm:8.8.1"
   dependencies:
     "@jest/environment": "npm:^29.5.0"
     "@jest/expect": "npm:^29.5.0"
     "@jest/globals": "npm:^29.5.0"
-    "@metamask/snaps-controllers": "npm:^9.11.1"
-    "@metamask/snaps-sdk": "npm:^6.9.0"
-    "@metamask/snaps-simulation": "npm:^1.2.0"
+    "@metamask/snaps-controllers": "npm:^9.15.0"
+    "@metamask/snaps-sdk": "npm:^6.13.0"
+    "@metamask/snaps-simulation": "npm:^1.4.1"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
+    "@metamask/utils": "npm:^10.0.0"
     express: "npm:^4.18.2"
     jest-environment-node: "npm:^29.5.0"
     jest-matcher-utils: "npm:^29.5.0"
     redux: "npm:^4.2.1"
-  checksum: 10c0/cdbb8aa3c0fa3022062d60ef795365d61c56bb9bf3417fefbff3ce587bd34f78008b4dc186e62052a15104ac85e3c8489f00b9f11ca7d8354975f5777e114535
+  checksum: 10c0/d794ceb0df8f019965867226322377d2ad7a69d96c5dadf09250d36e80aafe6cd4102025a8af75c3999016e254678241a928250eaef9b1b85ab1bb23688e4e78
   languageName: node
   linkType: hard
 
@@ -2851,19 +2866,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-rpc-methods@npm:^11.5.0":
-  version: 11.5.0
-  resolution: "@metamask/snaps-rpc-methods@npm:11.5.0"
+"@metamask/snaps-rpc-methods@npm:^11.7.0":
+  version: 11.7.0
+  resolution: "@metamask/snaps-rpc-methods@npm:11.7.0"
   dependencies:
-    "@metamask/key-tree": "npm:^9.1.2"
-    "@metamask/permission-controller": "npm:^11.0.0"
-    "@metamask/rpc-errors": "npm:^6.3.1"
-    "@metamask/snaps-sdk": "npm:^6.9.0"
-    "@metamask/snaps-utils": "npm:^8.4.1"
+    "@metamask/key-tree": "npm:^10.0.1"
+    "@metamask/permission-controller": "npm:^11.0.3"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/snaps-sdk": "npm:^6.13.0"
+    "@metamask/snaps-utils": "npm:^8.6.1"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
+    "@metamask/utils": "npm:^10.0.0"
     "@noble/hashes": "npm:^1.3.1"
-  checksum: 10c0/36bfd87fc6d7ea43f75866f4f730a916917e9b855ce12ee4cbba58156a343a68f36badb51928285f410e11ea2784abfab37f1351cd3c64e953fc8deecf30a652
+  checksum: 10c0/fe5fc3c77670f0e57d81d57c05b803be64a3953481fa2dbf9ca6272b92b22c97bb837de5ca1518df012efee1e5f23abd93cb428c71a6ae4a5e3538e4d3c9989e
   languageName: node
   linkType: hard
 
@@ -2880,7 +2895,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-sdk@npm:^6.5.0, @metamask/snaps-sdk@npm:^6.8.0, @metamask/snaps-sdk@npm:^6.9.0":
+"@metamask/snaps-sdk@npm:^6.11.0, @metamask/snaps-sdk@npm:^6.13.0":
+  version: 6.13.0
+  resolution: "@metamask/snaps-sdk@npm:6.13.0"
+  dependencies:
+    "@metamask/key-tree": "npm:^10.0.1"
+    "@metamask/providers": "npm:^18.1.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@metamask/utils": "npm:^10.0.0"
+  checksum: 10c0/b8b1655f906f238ff3fb0cb394c6b068edf4ea9df3308902d71d7111215b7cb684743f640342ca84665e8d45e99f7ceed69be235192b2194ca6298c72acfc24d
+  languageName: node
+  linkType: hard
+
+"@metamask/snaps-sdk@npm:^6.5.0, @metamask/snaps-sdk@npm:^6.9.0":
   version: 6.9.0
   resolution: "@metamask/snaps-sdk@npm:6.9.0"
   dependencies:
@@ -2893,33 +2921,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-simulation@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@metamask/snaps-simulation@npm:1.2.0"
+"@metamask/snaps-simulation@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "@metamask/snaps-simulation@npm:1.4.1"
   dependencies:
-    "@metamask/base-controller": "npm:^6.0.2"
-    "@metamask/eth-json-rpc-middleware": "npm:^14.0.0"
-    "@metamask/json-rpc-engine": "npm:^9.0.2"
-    "@metamask/json-rpc-middleware-stream": "npm:^8.0.2"
-    "@metamask/key-tree": "npm:^9.1.2"
-    "@metamask/permission-controller": "npm:^11.0.0"
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/eth-json-rpc-middleware": "npm:^15.0.0"
+    "@metamask/json-rpc-engine": "npm:^10.0.1"
+    "@metamask/json-rpc-middleware-stream": "npm:^8.0.5"
+    "@metamask/key-tree": "npm:^10.0.1"
+    "@metamask/permission-controller": "npm:^11.0.3"
     "@metamask/phishing-controller": "npm:^12.0.2"
-    "@metamask/snaps-controllers": "npm:^9.11.1"
-    "@metamask/snaps-execution-environments": "npm:^6.9.1"
-    "@metamask/snaps-rpc-methods": "npm:^11.5.0"
-    "@metamask/snaps-sdk": "npm:^6.9.0"
-    "@metamask/snaps-utils": "npm:^8.4.1"
+    "@metamask/snaps-controllers": "npm:^9.15.0"
+    "@metamask/snaps-execution-environments": "npm:^6.10.0"
+    "@metamask/snaps-rpc-methods": "npm:^11.7.0"
+    "@metamask/snaps-sdk": "npm:^6.13.0"
+    "@metamask/snaps-utils": "npm:^8.6.1"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
+    "@metamask/utils": "npm:^10.0.0"
     "@reduxjs/toolkit": "npm:^1.9.5"
     mime: "npm:^3.0.0"
     readable-stream: "npm:^3.6.2"
     redux-saga: "npm:^1.2.3"
-  checksum: 10c0/eec0459e14ce91d3993f38b6c655d52ee64e363bb80a20ab628bcb45755629d040a3719e3dcbf5c0ad713b77c80187c824a3c73788284bc95ee28a485cdb4620
+  checksum: 10c0/9ed56549707fc73cf761ef7db6852359d03d7809e2d7efd906951c45e634ba9ca1379fc08b2a57c2cbcd54cc4269d0fe3b62c182287e0c6073e0a0ddc4d00bb0
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^8.1.1, @metamask/snaps-utils@npm:^8.4.0, @metamask/snaps-utils@npm:^8.4.1":
+"@metamask/snaps-utils@npm:^8.1.1":
   version: 8.4.1
   resolution: "@metamask/snaps-utils@npm:8.4.1"
   dependencies:
@@ -2981,6 +3009,37 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/snaps-utils@npm:^8.6.0, @metamask/snaps-utils@npm:^8.6.1":
+  version: 8.6.1
+  resolution: "@metamask/snaps-utils@npm:8.6.1"
+  dependencies:
+    "@babel/core": "npm:^7.23.2"
+    "@babel/types": "npm:^7.23.0"
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/key-tree": "npm:^10.0.1"
+    "@metamask/permission-controller": "npm:^11.0.3"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/slip44": "npm:^4.0.0"
+    "@metamask/snaps-registry": "npm:^3.2.2"
+    "@metamask/snaps-sdk": "npm:^6.13.0"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@metamask/utils": "npm:^10.0.0"
+    "@noble/hashes": "npm:^1.3.1"
+    "@scure/base": "npm:^1.1.1"
+    chalk: "npm:^4.1.2"
+    cron-parser: "npm:^4.5.0"
+    fast-deep-equal: "npm:^3.1.3"
+    fast-json-stable-stringify: "npm:^2.1.0"
+    fast-xml-parser: "npm:^4.4.1"
+    marked: "npm:^12.0.1"
+    rfdc: "npm:^1.3.0"
+    semver: "npm:^7.5.4"
+    ses: "npm:^1.1.0"
+    validate-npm-package-name: "npm:^5.0.0"
+  checksum: 10c0/582a118a8339ce479ff9d359465fe0aa6b27b250717bbf7054b0296bb61a01fc2e4884a458f130f3bcd79e30872617f0b9ad2277f5fe4f411b5e940bb3d23d62
+  languageName: node
+  linkType: hard
+
 "@metamask/snaps-webpack-plugin@npm:^4.1.2":
   version: 4.1.2
   resolution: "@metamask/snaps-webpack-plugin@npm:4.1.2"
@@ -3017,6 +3076,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/utils@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "@metamask/utils@npm:10.0.1"
+  dependencies:
+    "@ethereumjs/tx": "npm:^4.2.0"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@noble/hashes": "npm:^1.3.1"
+    "@scure/base": "npm:^1.1.3"
+    "@types/debug": "npm:^4.1.7"
+    debug: "npm:^4.3.4"
+    pony-cause: "npm:^2.1.10"
+    semver: "npm:^7.5.4"
+    uuid: "npm:^9.0.1"
+  checksum: 10c0/762416f4b86014380a63243b6070c34da17c2a7cad19fb88105b73201679f1b6a7f540cc8d059f63854b6f434ccb0dd2f5c546bb1970146cde23e98f43027d9e
+  languageName: node
+  linkType: hard
+
 "@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0, @metamask/utils@npm:^9.2.1":
   version: 9.3.0
   resolution: "@metamask/utils@npm:9.3.0"
@@ -5711,7 +5787,7 @@ __metadata:
     "@metamask/eslint-config-nodejs": "npm:^14.0.0"
     "@metamask/eslint-config-typescript": "npm:^14.0.0"
     "@metamask/snaps-cli": "npm:^6.5.2"
-    "@metamask/snaps-jest": "npm:^8.6.0"
+    "@metamask/snaps-jest": "npm:^8.8.1"
     "@metamask/snaps-sdk": "npm:^6.9.0"
     "@typescript-eslint/eslint-plugin": "npm:^6.21.0"
     "@typescript-eslint/parser": "npm:^5.42.1"

From f83727fcad531da5cb10ab2e10150cb05ed42577 Mon Sep 17 00:00:00 2001
From: Anton Lykhoyda <lykhoyda@gmail.com>
Date: Fri, 13 Dec 2024 17:59:05 +0100
Subject: [PATCH 5/9] revert lib versions

---
 Cargo.lock                      | 24 ++++++++++++------------
 Cargo.toml                      |  8 ++++----
 packages/e2e-tests/src/index.js | 23 +++++++++--------------
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e3e70b0..7ffeacc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -453,9 +453,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.3"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
+checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
 dependencies = [
  "shlex",
 ]
@@ -2232,9 +2232,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.19"
+version = "0.23.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
+checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
 dependencies = [
  "log",
  "once_cell",
@@ -2256,9 +2256,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
 
 [[package]]
 name = "rustls-webpki"
@@ -2399,15 +2399,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
 dependencies = [
  "serde_derive",
 ]
@@ -2425,9 +2425,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index ab840f5..25f04b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,13 +16,13 @@ codegen-units = 1
 
 [workspace.dependencies]
 ## Web dependencies
-wasm-bindgen = "0.2.99"
+wasm-bindgen = "0.2.93"
 js-sys = "0.3.70"
-wasm-bindgen-futures = "0.4.49"
+wasm-bindgen-futures = "0.4.43"
 web-sys = { version = "0.3.70", features = [
     "console",
 ] }
-wasm-bindgen-rayon = { version = "1.2.2" }
+wasm-bindgen-rayon = { version = "1.2.1" }
 
 # WASM specific dependencies
 tracing-web = { version = "0.1.3" }
@@ -81,7 +81,7 @@ byte-unit = { version = "5.1.4", features = ["byte"] }
 
 
 [patch.crates-io]
-zip32 = { git = "https://github.com/zcash/zip32.git" }
+zip32 = { git = "https://github.com/zcash/zip32.git"}
 # TODO: See: https://github.com/RReverser/wasm-bindgen-rayon/pull/12
 wasm-bindgen-rayon = { git = "https://github.com/9SMTM6/wasm-bindgen-rayon", rev = "d1816e5bc2bf928ff5442355c04500a381d66a41" }
 # TODO: Remove these once the PRs are merged
diff --git a/packages/e2e-tests/src/index.js b/packages/e2e-tests/src/index.js
index b61ea10..2d9e8a2 100644
--- a/packages/e2e-tests/src/index.js
+++ b/packages/e2e-tests/src/index.js
@@ -1,19 +1,18 @@
-import initWasm, { initThreadPool, WebWallet } from "@webzjs/webz-wallet";
-
-import initWasm, * as WebZWallet from "@webzjs/webz-wallet";
-import initKeys, * as WebZKeys from "@webzjs/webz-keys";
-import initRequests, * as WebZRequests from "@webzjs/webz-requests";
+import initWasm, * as WebZWallet from '@webzjs/webz-wallet';
+import { initThreadPool, WebWallet } from '@webzjs/webz-wallet';
+import initKeys, * as WebZKeys from '@webzjs/webz-keys';
+import initRequests, * as WebZRequests from '@webzjs/webz-requests';
 
 window.WebZWallet = WebZWallet;
 window.WebZKeys = WebZKeys;
 window.WebZRequests = WebZRequests;
 
 const N_THREADS = 10;
-const MAINNET_LIGHTWALLETD_PROXY = "https://zcash-mainnet.chainsafe.dev";
+const MAINNET_LIGHTWALLETD_PROXY = 'https://zcash-mainnet.chainsafe.dev';
 
 async function loadPage() {
   await new Promise((resolve) => {
-    window.addEventListener("load", resolve);
+    window.addEventListener('load', resolve);
   });
 
   // Code to executed once the page has loaded
@@ -22,14 +21,10 @@ async function loadPage() {
   await initRequests();
   await initThreadPool(N_THREADS);
 
-  window.webWallet = new WebWallet(
-    "main",
-    MAINNET_LIGHTWALLETD_PROXY,
-    1
-  );
+  window.webWallet = new WebWallet('main', MAINNET_LIGHTWALLETD_PROXY, 1);
   window.initialized = true;
-  console.log("WebWallet initialized");
+  console.log('WebWallet initialized');
   console.log(webWallet);
 }
 
-loadPage();
\ No newline at end of file
+loadPage();

From d7ba84aff0c07850866b1a2fac2081d841ba6238 Mon Sep 17 00:00:00 2001
From: Anton Lykhoyda <lykhoyda@gmail.com>
Date: Fri, 13 Dec 2024 18:08:01 +0100
Subject: [PATCH 6/9] WIP

---
 Cargo.lock | 11 +++++++----
 Cargo.toml | 10 +---------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7ffeacc..e4d113a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1323,7 +1323,8 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 [[package]]
 name = "incrementalmerkletree"
 version = "0.6.0"
-source = "git+https://github.com/ec2/incrementalmerkletree.git?rev=16eff253ad2575d48feec04f7387e6507a7dd698#16eff253ad2575d48feec04f7387e6507a7dd698"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75346da3bd8e3d8891d02508245ed2df34447ca6637e343829f8d08986e9cde2"
 dependencies = [
  "either",
 ]
@@ -2499,7 +2500,8 @@ dependencies = [
 [[package]]
 name = "shardtree"
 version = "0.4.0"
-source = "git+https://github.com/ec2/incrementalmerkletree.git?rev=16eff253ad2575d48feec04f7387e6507a7dd698#16eff253ad2575d48feec04f7387e6507a7dd698"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78222845cd8bbe5eb95687407648ff17693a35de5e8abaa39a4681fb21e033f9"
 dependencies = [
  "bitflags",
  "either",
@@ -3178,8 +3180,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-rayon"
-version = "1.2.1"
-source = "git+https://github.com/9SMTM6/wasm-bindgen-rayon?rev=d1816e5bc2bf928ff5442355c04500a381d66a41#d1816e5bc2bf928ff5442355c04500a381d66a41"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d560adf232b44f860ada9759435f24c7446732aac10a7c17f64937c8014b1c7e"
 dependencies = [
  "crossbeam-channel",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 25f04b2..f31771a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ wasm-bindgen-futures = "0.4.43"
 web-sys = { version = "0.3.70", features = [
     "console",
 ] }
-wasm-bindgen-rayon = { version = "1.2.1" }
+wasm-bindgen-rayon = { version = "1.2" }
 
 # WASM specific dependencies
 tracing-web = { version = "0.1.3" }
@@ -82,14 +82,6 @@ byte-unit = { version = "5.1.4", features = ["byte"] }
 
 [patch.crates-io]
 zip32 = { git = "https://github.com/zcash/zip32.git"}
-# TODO: See: https://github.com/RReverser/wasm-bindgen-rayon/pull/12
-wasm-bindgen-rayon = { git = "https://github.com/9SMTM6/wasm-bindgen-rayon", rev = "d1816e5bc2bf928ff5442355c04500a381d66a41" }
-# TODO: Remove these once the PRs are merged
-shardtree = { git = "https://github.com/ec2/incrementalmerkletree.git", rev = "16eff253ad2575d48feec04f7387e6507a7dd698" }
-incrementalmerkletree = { git = "https://github.com/ec2/incrementalmerkletree.git", rev = "16eff253ad2575d48feec04f7387e6507a7dd698" }
-
-# [patch.'https://github.com/WilsonGramer/wasm_thread']
-# wasm_thread = { git = "https://github.com/ec2/wasm_thread", rev = "9e432077948d927d49373d1d039c23447d3648df" }
 
 #[patch.'https://github.com/chainsafe/librustzcash']
 #zcash_address = { path = "../librustzcash/components/zcash_address" }

From 417806fd5f0d7e009504adf90c9fcee70c8672b4 Mon Sep 17 00:00:00 2001
From: Anton Lykhoyda <lykhoyda@gmail.com>
Date: Mon, 16 Dec 2024 18:31:26 +0100
Subject: [PATCH 7/9] update dependencies

---
 Cargo.lock                       | 90 ++++++++++++++++----------------
 Cargo.toml                       |  6 +--
 crates/webz-wallet/Cargo.toml    |  2 +-
 packages/snap/snap.manifest.json |  2 +-
 4 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e4d113a..a3175e1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -577,18 +577,18 @@ checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.13"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -605,9 +605,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
@@ -1192,11 +1192,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1241,9 +1241,9 @@ checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "hyper"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
+checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1331,9 +1331,9 @@ dependencies = [
 
 [[package]]
 name = "incrementalmerkletree"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d45063fbc4b0a37837f6bfe0445f269d13d730ad0aa3b5a7f74aa7bf27a0f4df"
+checksum = "216c71634ac6f6ed13c2102d64354c0a04dcbdc30e31692c5972d3974d8b6d97"
 dependencies = [
  "either",
 ]
@@ -1403,11 +1403,10 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
- "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1571,9 +1570,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memuse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2145869435ace5ea6ea3d35f59be559317ec9a0d04e1812d5f185a87b6d36f1a"
+checksum = "3d97bbf43eb4f088f8ca469930cde17fa036207c9a5e02ccc5107c4e8b17c964"
 dependencies = [
  "nonempty",
 ]
@@ -1750,7 +1749,7 @@ dependencies = [
  "halo2_gadgets",
  "halo2_proofs",
  "hex",
- "incrementalmerkletree 0.7.0",
+ "incrementalmerkletree 0.7.1",
  "lazy_static",
  "memuse",
  "nonempty",
@@ -2328,7 +2327,7 @@ dependencies = [
  "fpe",
  "group",
  "hex",
- "incrementalmerkletree 0.7.0",
+ "incrementalmerkletree 0.7.1",
  "jubjub",
  "lazy_static",
  "memuse",
@@ -2517,7 +2516,7 @@ checksum = "b5f2390975ebfe8838f9e861f7a588123d49a7a7a0a08568ea831d8ad53fc9b4"
 dependencies = [
  "bitflags",
  "either",
- "incrementalmerkletree 0.7.0",
+ "incrementalmerkletree 0.7.1",
  "tracing",
 ]
 
@@ -2755,9 +2754,9 @@ dependencies = [
 
 [[package]]
 name = "tokio_with_wasm"
-version = "0.7.4"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c33ccdd8192685c79013359bf42e1c2649ed6bf11e8fa05f1f7f2acc7c71368"
+checksum = "302f7684e5f0b3c60bf229658f4e2f35e1dad50fa2425043997acdc1e87445aa"
 dependencies = [
  "js-sys",
  "tokio",
@@ -3119,9 +3118,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.99"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3130,12 +3129,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -3144,22 +3144,21 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.49"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3167,9 +3166,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3192,15 +3191,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
+checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -3236,9 +3235,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.76"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3563,7 +3562,7 @@ dependencies = [
  "group",
  "hex",
  "hyper-util",
- "incrementalmerkletree 0.7.0",
+ "incrementalmerkletree 0.7.1",
  "memuse",
  "nom",
  "nonempty",
@@ -3603,7 +3602,7 @@ dependencies = [
  "bs58",
  "byteorder",
  "group",
- "incrementalmerkletree 0.7.0",
+ "incrementalmerkletree 0.7.1",
  "jubjub",
  "nonempty",
  "orchard 0.10.0",
@@ -3803,7 +3802,7 @@ dependencies = [
  "fpe",
  "group",
  "hex",
- "incrementalmerkletree 0.7.0",
+ "incrementalmerkletree 0.7.1",
  "jubjub",
  "memuse",
  "nonempty",
@@ -3920,8 +3919,9 @@ dependencies = [
 
 [[package]]
 name = "zip32"
-version = "0.1.2"
-source = "git+https://github.com/zcash/zip32.git#f4e1c2fe99ebf2aed6e461769154780da37e33de"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e9943793abf9060b68e1889012dafbd5523ab5b125c0fcc24802d69182f2ac9"
 dependencies = [
  "blake2b_simd",
  "memuse",
diff --git a/Cargo.toml b/Cargo.toml
index f31771a..4025b19 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ codegen-units = 1
 
 [workspace.dependencies]
 ## Web dependencies
-wasm-bindgen = "0.2.93"
+wasm-bindgen = "=0.2.93"
 js-sys = "0.3.70"
 wasm-bindgen-futures = "0.4.43"
 web-sys = { version = "0.3.70", features = [
@@ -81,7 +81,7 @@ byte-unit = { version = "5.1.4", features = ["byte"] }
 
 
 [patch.crates-io]
-zip32 = { git = "https://github.com/zcash/zip32.git"}
+
 
 #[patch.'https://github.com/chainsafe/librustzcash']
 #zcash_address = { path = "../librustzcash/components/zcash_address" }
@@ -91,4 +91,4 @@ zip32 = { git = "https://github.com/zcash/zip32.git"}
 #zcash_keys = { path = "../librustzcash/zcash_keys" }
 #zcash_primitives = { path = "../librustzcash/zcash_primitives" }
 #zcash_proofs = { path = "../librustzcash/zcash_proofs" }
-#zcash_protocol = { path = "../librustzcash/components/zcash_protocol" }
+#zcash_protocol = { path = "../librustzcash/components/zcash_protocol" }
\ No newline at end of file
diff --git a/crates/webz-wallet/Cargo.toml b/crates/webz-wallet/Cargo.toml
index f12b080..78e3462 100644
--- a/crates/webz-wallet/Cargo.toml
+++ b/crates/webz-wallet/Cargo.toml
@@ -36,7 +36,7 @@ js-sys.workspace = true
 web-sys.workspace = true
 
 wasm-bindgen-futures = "0.4.43"
-wasm-bindgen-rayon = { version = "1.2.1", optional = true }
+wasm-bindgen-rayon = { version = "1.2", optional = true }
 
 # WASM specific dependencies
 tracing-web = { version = "0.1.3", optional = true }
diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
index 5de5b5f..3c3c8d2 100644
--- a/packages/snap/snap.manifest.json
+++ b/packages/snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/template-snap-monorepo.git"
   },
   "source": {
-    "shasum": "trfvzpmDcGt2TqfetqwfKPa8kHXQKGf4cytN7W+dHZU=",
+    "shasum": "eVu5qo/GyDuSN79X+zdfjQ7aj4+GzQlmTeNKNCVMMI4=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

From 11a857ca8a188eb416a564faf9b67953020c642a Mon Sep 17 00:00:00 2001
From: Anton Lykhoyda <lykhoyda@gmail.com>
Date: Mon, 16 Dec 2024 19:02:09 +0100
Subject: [PATCH 8/9] update dependencies

---
 Cargo.lock                      |  4 ++--
 Cargo.toml                      |  4 ++--
 crates/webz-wallet/Cargo.toml   |  2 +-
 packages/e2e-tests/package.json |  2 +-
 yarn.lock                       | 30 +++++++++++++++---------------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a3175e1..df0f06e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3179,9 +3179,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-rayon"
-version = "1.2.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d560adf232b44f860ada9759435f24c7446732aac10a7c17f64937c8014b1c7e"
+checksum = "c9e02b7785fe15de188657b7d3a234ef042bfd8da10822016915e06d4e29cba7"
 dependencies = [
  "crossbeam-channel",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 4025b19..e7d3709 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,13 +16,13 @@ codegen-units = 1
 
 [workspace.dependencies]
 ## Web dependencies
-wasm-bindgen = "=0.2.93"
+wasm-bindgen = "=0.2.93" # higher versions has an issues with attachment of the file: webz-wallet/snippets/wasm-bindgen-rayon-3e04391371ad0a8e/src/workerHelpers.worker.js
 js-sys = "0.3.70"
 wasm-bindgen-futures = "0.4.43"
 web-sys = { version = "0.3.70", features = [
     "console",
 ] }
-wasm-bindgen-rayon = { version = "1.2" }
+wasm-bindgen-rayon = { version = "=1.2.1" } # Update to higher version cause playwright test in chtomium fail
 
 # WASM specific dependencies
 tracing-web = { version = "0.1.3" }
diff --git a/crates/webz-wallet/Cargo.toml b/crates/webz-wallet/Cargo.toml
index 78e3462..8334c30 100644
--- a/crates/webz-wallet/Cargo.toml
+++ b/crates/webz-wallet/Cargo.toml
@@ -36,7 +36,7 @@ js-sys.workspace = true
 web-sys.workspace = true
 
 wasm-bindgen-futures = "0.4.43"
-wasm-bindgen-rayon = { version = "1.2", optional = true }
+wasm-bindgen-rayon = { version = "=1.2.1", optional = true }
 
 # WASM specific dependencies
 tracing-web = { version = "0.1.3", optional = true }
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 5c10ca9..4cb7878 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -12,7 +12,7 @@
   "license": "ISC",
   "devDependencies": {
     "@parcel/core": "^2.12.0",
-    "@playwright/test": "^1.47.2",
+    "@playwright/test": "^1.49.1",
     "@types/node": "^22.7.4",
     "@webzjs/webz-keys": "workspace:^",
     "@webzjs/webz-requests": "workspace:^",
diff --git a/yarn.lock b/yarn.lock
index 60da6f0..4f6abbe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4099,14 +4099,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@playwright/test@npm:^1.47.2":
-  version: 1.48.2
-  resolution: "@playwright/test@npm:1.48.2"
+"@playwright/test@npm:^1.49.1":
+  version: 1.49.1
+  resolution: "@playwright/test@npm:1.49.1"
   dependencies:
-    playwright: "npm:1.48.2"
+    playwright: "npm:1.49.1"
   bin:
     playwright: cli.js
-  checksum: 10c0/68bab3bee8d716111e9a166785e6c3c406b6a184fc46d03b5468fcbb92b6242e5628f6a75f9d286e2491ec0e9e59af67542a1f114b6659d790b5a1f41e4d305b
+  checksum: 10c0/2fca0bb7b334f7a23c7c5dfa5dbe37b47794c56f39b747c8d74a2f95c339e7902a296f2f1dd32c47bdd723cfa92cee05219f1a5876725dc89a1871b9137a286d
   languageName: node
   linkType: hard
 
@@ -5707,7 +5707,7 @@ __metadata:
   resolution: "@webzjs/e2e-tests@workspace:packages/e2e-tests"
   dependencies:
     "@parcel/core": "npm:^2.12.0"
-    "@playwright/test": "npm:^1.47.2"
+    "@playwright/test": "npm:^1.49.1"
     "@types/node": "npm:^22.7.4"
     "@webzjs/webz-keys": "workspace:^"
     "@webzjs/webz-requests": "workspace:^"
@@ -12326,27 +12326,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.48.2":
-  version: 1.48.2
-  resolution: "playwright-core@npm:1.48.2"
+"playwright-core@npm:1.49.1":
+  version: 1.49.1
+  resolution: "playwright-core@npm:1.49.1"
   bin:
     playwright-core: cli.js
-  checksum: 10c0/511da53d9df01fec5e5798915c68e7d1574890a504d1aae05430bf538d0080efa8db86e3dafdcd450f084ce7622f6bbede23ca52e798bfc4c3b3ea8da52a51f5
+  checksum: 10c0/990b619c75715cd98b2c10c1180a126e3a454b247063b8352bc67792fe01183ec07f31d30c8714c3768cefed12886d1d64ac06da701f2baafc2cad9b439e3919
   languageName: node
   linkType: hard
 
-"playwright@npm:1.48.2":
-  version: 1.48.2
-  resolution: "playwright@npm:1.48.2"
+"playwright@npm:1.49.1":
+  version: 1.49.1
+  resolution: "playwright@npm:1.49.1"
   dependencies:
     fsevents: "npm:2.3.2"
-    playwright-core: "npm:1.48.2"
+    playwright-core: "npm:1.49.1"
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     playwright: cli.js
-  checksum: 10c0/ecde4ee4767556868b24d7700f3502692a3cb14c8ef127052b51b48833ffcce80942954fb188a9b72505122b48b1b625d1bb486721e1c4f2e980215328ba1ad5
+  checksum: 10c0/2368762c898920d4a0a5788b153dead45f9c36c3f5cf4d2af5228d0b8ea65823e3bbe998877950a2b9bb23a211e4633996f854c6188769dc81a25543ac818ab5
   languageName: node
   linkType: hard
 

From 37a759f8605ee45b2febc14d174c8d3ff599224e Mon Sep 17 00:00:00 2001
From: Anton Lykhoyda <lykhoyda@gmail.com>
Date: Wed, 18 Dec 2024 12:19:27 +0100
Subject: [PATCH 9/9] update dependencies

---
 packages/snap/snap.manifest.json |   2 +-
 packages/web-wallet/package.json |   6 +-
 yarn.lock                        | 170 -------------------------------
 3 files changed, 3 insertions(+), 175 deletions(-)

diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
index 3c3c8d2..ec73b06 100644
--- a/packages/snap/snap.manifest.json
+++ b/packages/snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/template-snap-monorepo.git"
   },
   "source": {
-    "shasum": "eVu5qo/GyDuSN79X+zdfjQ7aj4+GzQlmTeNKNCVMMI4=",
+    "shasum": "I0Yfshe6Y+9LqO6LuUhPC0gUMpbHmm6yzzVLPI86hps=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
diff --git a/packages/web-wallet/package.json b/packages/web-wallet/package.json
index c469ea9..5adf30c 100644
--- a/packages/web-wallet/package.json
+++ b/packages/web-wallet/package.json
@@ -17,8 +17,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.27.0",
-    "usehooks-ts": "^3.1.0",
-    "vite-plugin-top-level-await": "^1.4.4"
+    "usehooks-ts": "^3.1.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.13.0",
@@ -38,7 +37,6 @@
     "typescript": "~5.6.2",
     "typescript-eslint": "^8.11.0",
     "vite": "^5.4.10",
-    "vite-plugin-svgr": "^4.3.0",
-    "vite-plugin-wasm": "^3.3.0"
+    "vite-plugin-svgr": "^4.3.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 4f6abbe..2a99c8f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4241,18 +4241,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/plugin-virtual@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@rollup/plugin-virtual@npm:3.0.2"
-  peerDependencies:
-    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
-  peerDependenciesMeta:
-    rollup:
-      optional: true
-  checksum: 10c0/7115edb7989096d1ce334939fcf6e1ba365586b487bf61b2dd4f915386197f350db70904030342c0720fe58f5a52828975c645c4d415c1d432d9b1b6760a22ef
-  languageName: node
-  linkType: hard
-
 "@rollup/pluginutils@npm:^5.1.3":
   version: 5.1.3
   resolution: "@rollup/pluginutils@npm:5.1.3"
@@ -4594,13 +4582,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.10.1":
-  version: 1.10.1
-  resolution: "@swc/core-darwin-arm64@npm:1.10.1"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@swc/core-darwin-arm64@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-darwin-arm64@npm:1.3.78"
@@ -4615,13 +4596,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.10.1":
-  version: 1.10.1
-  resolution: "@swc/core-darwin-x64@npm:1.10.1"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@swc/core-darwin-x64@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-darwin-x64@npm:1.3.78"
@@ -4636,13 +4610,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.10.1":
-  version: 1.10.1
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.10.1"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
 "@swc/core-linux-arm-gnueabihf@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.78"
@@ -4657,13 +4624,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.10.1":
-  version: 1.10.1
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.10.1"
-  conditions: os=linux & cpu=arm64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@swc/core-linux-arm64-gnu@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-linux-arm64-gnu@npm:1.3.78"
@@ -4678,13 +4638,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.10.1":
-  version: 1.10.1
-  resolution: "@swc/core-linux-arm64-musl@npm:1.10.1"
-  conditions: os=linux & cpu=arm64 & libc=musl
-  languageName: node
-  linkType: hard
-
 "@swc/core-linux-arm64-musl@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-linux-arm64-musl@npm:1.3.78"
@@ -4699,13 +4652,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.10.1":
-  version: 1.10.1
-  resolution: "@swc/core-linux-x64-gnu@npm:1.10.1"
-  conditions: os=linux & cpu=x64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@swc/core-linux-x64-gnu@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-linux-x64-gnu@npm:1.3.78"
@@ -4720,13 +4666,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.10.1":
-  version: 1.10.1
-  resolution: "@swc/core-linux-x64-musl@npm:1.10.1"
-  conditions: os=linux & cpu=x64 & libc=musl
-  languageName: node
-  linkType: hard
-
 "@swc/core-linux-x64-musl@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-linux-x64-musl@npm:1.3.78"
@@ -4741,13 +4680,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.10.1":
-  version: 1.10.1
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.10.1"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@swc/core-win32-arm64-msvc@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-win32-arm64-msvc@npm:1.3.78"
@@ -4762,13 +4694,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.10.1":
-  version: 1.10.1
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.10.1"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
 "@swc/core-win32-ia32-msvc@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-win32-ia32-msvc@npm:1.3.78"
@@ -4783,13 +4708,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.10.1":
-  version: 1.10.1
-  resolution: "@swc/core-win32-x64-msvc@npm:1.10.1"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@swc/core-win32-x64-msvc@npm:1.3.78":
   version: 1.3.78
   resolution: "@swc/core-win32-x64-msvc@npm:1.3.78"
@@ -4894,52 +4812,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core@npm:^1.7.0":
-  version: 1.10.1
-  resolution: "@swc/core@npm:1.10.1"
-  dependencies:
-    "@swc/core-darwin-arm64": "npm:1.10.1"
-    "@swc/core-darwin-x64": "npm:1.10.1"
-    "@swc/core-linux-arm-gnueabihf": "npm:1.10.1"
-    "@swc/core-linux-arm64-gnu": "npm:1.10.1"
-    "@swc/core-linux-arm64-musl": "npm:1.10.1"
-    "@swc/core-linux-x64-gnu": "npm:1.10.1"
-    "@swc/core-linux-x64-musl": "npm:1.10.1"
-    "@swc/core-win32-arm64-msvc": "npm:1.10.1"
-    "@swc/core-win32-ia32-msvc": "npm:1.10.1"
-    "@swc/core-win32-x64-msvc": "npm:1.10.1"
-    "@swc/counter": "npm:^0.1.3"
-    "@swc/types": "npm:^0.1.17"
-  peerDependencies:
-    "@swc/helpers": "*"
-  dependenciesMeta:
-    "@swc/core-darwin-arm64":
-      optional: true
-    "@swc/core-darwin-x64":
-      optional: true
-    "@swc/core-linux-arm-gnueabihf":
-      optional: true
-    "@swc/core-linux-arm64-gnu":
-      optional: true
-    "@swc/core-linux-arm64-musl":
-      optional: true
-    "@swc/core-linux-x64-gnu":
-      optional: true
-    "@swc/core-linux-x64-musl":
-      optional: true
-    "@swc/core-win32-arm64-msvc":
-      optional: true
-    "@swc/core-win32-ia32-msvc":
-      optional: true
-    "@swc/core-win32-x64-msvc":
-      optional: true
-  peerDependenciesMeta:
-    "@swc/helpers":
-      optional: true
-  checksum: 10c0/a3d3b17c1abc8f32a7cc5dfaa006fc314e71cc0beb43e71b8b1c6c3d3841412a7e55d9e72009debd48159881e8a045ecd0ea56036e022f1bc87213fe29cd9015
-  languageName: node
-  linkType: hard
-
 "@swc/counter@npm:^0.1.3":
   version: 0.1.3
   resolution: "@swc/counter@npm:0.1.3"
@@ -4965,15 +4837,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/types@npm:^0.1.17":
-  version: 0.1.17
-  resolution: "@swc/types@npm:0.1.17"
-  dependencies:
-    "@swc/counter": "npm:^0.1.3"
-  checksum: 10c0/29f5c8933a16042956f1adb7383e836ed7646cbf679826e78b53fdd0c08e8572cb42152e527b6b530a9bd1052d33d0972f90f589761ccd252c12652c9b7a72fc
-  languageName: node
-  linkType: hard
-
 "@trysound/sax@npm:0.2.0":
   version: 0.2.0
   resolution: "@trysound/sax@npm:0.2.0"
@@ -5747,8 +5610,6 @@ __metadata:
     usehooks-ts: "npm:^3.1.0"
     vite: "npm:^5.4.10"
     vite-plugin-svgr: "npm:^4.3.0"
-    vite-plugin-top-level-await: "npm:^1.4.4"
-    vite-plugin-wasm: "npm:^3.3.0"
   languageName: unknown
   linkType: soft
 
@@ -14922,15 +14783,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "uuid@npm:10.0.0"
-  bin:
-    uuid: dist/bin/uuid
-  checksum: 10c0/eab18c27fe4ab9fb9709a5d5f40119b45f2ec8314f8d4cf12ce27e4c6f4ffa4a6321dc7db6c515068fa373c075b49691ba969f0010bf37f44c37ca40cd6bf7fe
-  languageName: node
-  linkType: hard
-
 "uuid@npm:^8.3.2":
   version: 8.3.2
   resolution: "uuid@npm:8.3.2"
@@ -14994,28 +14846,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-plugin-top-level-await@npm:^1.4.4":
-  version: 1.4.4
-  resolution: "vite-plugin-top-level-await@npm:1.4.4"
-  dependencies:
-    "@rollup/plugin-virtual": "npm:^3.0.2"
-    "@swc/core": "npm:^1.7.0"
-    uuid: "npm:^10.0.0"
-  peerDependencies:
-    vite: ">=2.8"
-  checksum: 10c0/013e7b2e28632d93d04c4061187198e699064fc208a1657c100354b32da30921fa835879fc17779d5e0b074855237408da2fadd720fa0f4571137427a1efd5e3
-  languageName: node
-  linkType: hard
-
-"vite-plugin-wasm@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "vite-plugin-wasm@npm:3.3.0"
-  peerDependencies:
-    vite: ^2 || ^3 || ^4 || ^5
-  checksum: 10c0/382ba2f2ffef31dde717ad43a69427bc930a6e2ec453d17b700ef7937b48996893a61657fdee3122654e027b1933341548493b35e6469520a8d4ae6c522d1ee2
-  languageName: node
-  linkType: hard
-
 "vite@npm:^5.4.10, vite@npm:^5.4.9":
   version: 5.4.10
   resolution: "vite@npm:5.4.10"