From eb7a7fb58e31166289ceb9b65d76ed7228d5c687 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 04:01:28 +0000
Subject: [PATCH 1/8] chore(deps-dev): bump svelte-loader from 3.2.0 to 3.2.3
 in /packages/shared (#2690)

* chore(deps-dev): bump svelte-loader in /packages/shared

Bumps [svelte-loader](https://github.com/sveltejs/svelte-loader) from 3.2.0 to 3.2.3.
- [Changelog](https://github.com/sveltejs/svelte-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/svelte-loader/compare/v3.2.0...v3.2.3)

---
updated-dependencies:
- dependency-name: svelte-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: updates yarn.lock

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jean Ribeiro <contact@jeanribeiro.dev>
---
 packages/shared/package.json | 2 +-
 yarn.lock                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/shared/package.json b/packages/shared/package.json
index df7b9006ef..168867a921 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -46,7 +46,7 @@
         "lokijs": "1.5.12",
         "postcss": "8.4.38",
         "postcss-cli": "11.0.0",
-        "svelte-loader": "3.2.0",
+        "svelte-loader": "3.2.3",
         "tailwindcss": "3.4.3",
         "tslib": "2.6.2",
         "valid-url": "1.0.9",
diff --git a/yarn.lock b/yarn.lock
index b1b2500116..c12114c6f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10228,10 +10228,10 @@ svelte-json-tree@2.1.0:
   resolved "https://registry.yarnpkg.com/svelte-json-tree/-/svelte-json-tree-2.1.0.tgz#616cadae86326881a80bcdb04b451ed57bef7898"
   integrity sha512-IAU//hE5bIA0SoM9AuP7xOoD9PUcMh4fio0oI52r0XJ7iNDytW7AnBdkIn1QSYLUyWzvQX3tp59JfLYfhd7lTw==
 
-svelte-loader@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/svelte-loader/-/svelte-loader-3.2.0.tgz#3a84b281ea629ae9d2567ae41a53f0770270e296"
-  integrity sha512-pxsNMC/1JHdQ63M0Zw5cS8dN299nvMiU2ze8yWPLlov/xBNXElEEM22so2q/vJDUyP0ZCrCVMV1d/tlWwxMRLA==
+svelte-loader@3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/svelte-loader/-/svelte-loader-3.2.3.tgz#d452ac982c6652edcfe438628b0e72ac9e24d65a"
+  integrity sha512-ntitVuO0EneIlw5Zsn/GNnxu8+KkqbfrsjEGvk7qrd67IA24OBVqY9p0NjUGlpewPxGL3iD4z/8VA+hM9AsZxA==
   dependencies:
     loader-utils "^2.0.4"
     svelte-dev-helper "^1.1.9"

From 3739454f8936a5b0a301eecdbe7ca82a03863ca8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 04:20:53 +0000
Subject: [PATCH 2/8] chore(deps-dev): bump tslib from 2.6.2 to 2.6.3 in
 /packages/shared (#2689)

Bumps [tslib](https://github.com/Microsoft/tslib) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/Microsoft/tslib/releases)
- [Commits](https://github.com/Microsoft/tslib/compare/v2.6.2...v2.6.3)

---
updated-dependencies:
- dependency-name: tslib
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jean Ribeiro <contact@jeanribeiro.dev>
---
 packages/shared/package.json | 2 +-
 yarn.lock                    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/shared/package.json b/packages/shared/package.json
index 168867a921..cbf0588ef3 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -48,7 +48,7 @@
         "postcss-cli": "11.0.0",
         "svelte-loader": "3.2.3",
         "tailwindcss": "3.4.3",
-        "tslib": "2.6.2",
+        "tslib": "2.6.3",
         "valid-url": "1.0.9",
         "zxcvbn": "4.4.2"
     }
diff --git a/yarn.lock b/yarn.lock
index c12114c6f6..b2f357da90 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10555,7 +10555,12 @@ tslib@1.14.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@2.6.2, tslib@^2.0.0, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.4.1:
+tslib@2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
+
+tslib@^2.0.0, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.4.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==

From f90fe583c574ed3529eaaccabdc98ec41d9d1041 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 01:39:26 -0300
Subject: [PATCH 3/8] chore(deps-dev): bump @swc/core from 1.5.24 to 1.6.6
 (#2687)

Bumps [@swc/core](https://github.com/swc-project/swc) from 1.5.24 to 1.6.6.
- [Release notes](https://github.com/swc-project/swc/releases)
- [Changelog](https://github.com/swc-project/swc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/swc-project/swc/compare/v1.5.24...v1.6.6)

---
updated-dependencies:
- dependency-name: "@swc/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jean Ribeiro <contact@jeanribeiro.dev>
---
 packages/shared/package.json |   2 +-
 yarn.lock                    | 169 ++++++++++++++++++++---------------
 2 files changed, 98 insertions(+), 73 deletions(-)

diff --git a/packages/shared/package.json b/packages/shared/package.json
index cbf0588ef3..0015653dc7 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -36,7 +36,7 @@
         "test": "jest"
     },
     "devDependencies": {
-        "@swc/core": "1.5.24",
+        "@swc/core": "1.6.6",
         "@swc/jest": "0.2.36",
         "@types/jest": "29.5.12",
         "@types/sanitize-html": "2.11.0",
diff --git a/yarn.lock b/yarn.lock
index b2f357da90..f02a919a20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2178,74 +2178,74 @@
   resolved "https://registry.yarnpkg.com/@sveltejs/svelte-virtual-list/-/svelte-virtual-list-3.0.1.tgz#3784d6426508836b4471bba8ba293430e73717d8"
   integrity sha512-aF9TptS7NKKS7/TqpsxQBSDJ9Q0XBYzBehCeIC5DzdMEgrJZpIYao9LRLnyyo6SVodpapm2B7FE/Lj+FSA5/SQ==
 
-"@swc/core-darwin-arm64@1.5.24":
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.5.24.tgz#71875695bc617e57c2d93352f48317b4c41e0240"
-  integrity sha512-M7oLOcC0sw+UTyAuL/9uyB9GeO4ZpaBbH76JSH6g1m0/yg7LYJZGRmplhDmwVSDAR5Fq4Sjoi1CksmmGkgihGA==
-
-"@swc/core-darwin-x64@1.5.24":
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.5.24.tgz#6b4c3eb9b21ab50b7324a82c9497ffeb2e8e0a57"
-  integrity sha512-MfcFjGGYognpSBSos2pYUNYJSmqEhuw5ceGr6qAdME7ddbjGXliza4W6FggsM+JnWwpqa31+e7/R+GetW4WkaQ==
-
-"@swc/core-linux-arm-gnueabihf@1.5.24":
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.5.24.tgz#5730ed6ad86afe4ee8df04ee6f21430daead186c"
-  integrity sha512-amI2pwtcWV3E/m/nf+AQtn1LWDzKLZyjCmWd3ms7QjEueWYrY8cU1Y4Wp7wNNsxIoPOi8zek1Uj2wwFD/pttNQ==
-
-"@swc/core-linux-arm64-gnu@1.5.24":
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.5.24.tgz#0a2478e8601391aa88f82bfece1dbc60d27cbcfd"
-  integrity sha512-sTSvmqMmgT1ynH/nP75Pc51s+iT4crZagHBiDOf5cq+kudUYjda9lWMs7xkXB/TUKFHPCRK0HGunl8bkwiIbuw==
-
-"@swc/core-linux-arm64-musl@1.5.24":
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.5.24.tgz#e0199092dc611ca75f8a92dcea17de44e38f3fbf"
-  integrity sha512-vd2/hfOBGbrX21FxsFdXCUaffjkHvlZkeE2UMRajdXifwv79jqOHIJg3jXG1F3ZrhCghCzirFts4tAZgcG8XWg==
-
-"@swc/core-linux-x64-gnu@1.5.24":
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.5.24.tgz#1fe347c9f28457c593f2fda5b0d4904a2b105ecd"
-  integrity sha512-Zrdzi7NqzQxm2BvAG5KyOSBEggQ7ayrxh599AqqevJmsUXJ8o2nMiWQOBvgCGp7ye+Biz3pvZn1EnRzAp+TpUg==
-
-"@swc/core-linux-x64-musl@1.5.24":
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.5.24.tgz#bf6ac583fac211d704d2d78cfd0b7bf751268f5e"
-  integrity sha512-1F8z9NRi52jdZQCGc5sflwYSctL6omxiVmIFVp8TC9nngjQKc00TtX/JC2Eo2HwvgupkFVl5YQJidAck9YtmJw==
-
-"@swc/core-win32-arm64-msvc@1.5.24":
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.5.24.tgz#41b9faf4db69cc08a43c3a176df2a7b94d765637"
-  integrity sha512-cKpP7KvS6Xr0jFSTBXY53HZX/YfomK5EMQYpCVDOvfsZeYHN20sQSKXfpVLvA/q2igVt1zzy1XJcOhpJcgiKLg==
-
-"@swc/core-win32-ia32-msvc@1.5.24":
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.5.24.tgz#e123ad00e3b28d567d3851a86697fb3c54ed817a"
-  integrity sha512-IoPWfi0iwqjZuf7gE223+B97/ZwkKbu7qL5KzGP7g3hJrGSKAvv7eC5Y9r2iKKtLKyv5R/T6Ho0kFR/usi7rHw==
-
-"@swc/core-win32-x64-msvc@1.5.24":
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.5.24.tgz#21fb87b1981253039e6d45255e31a875f446e397"
-  integrity sha512-zHgF2k1uVJL8KIW+PnVz1To4a3Cz9THbh2z2lbehaF/gKHugH4c3djBozU4das1v35KOqf5jWIEviBLql2wDLQ==
-
-"@swc/core@1.5.24":
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.5.24.tgz#9ecb4601cb6a4fb19f227ec5fb59d07e23347dca"
-  integrity sha512-Eph9zvO4xvqWZGVzTdtdEJ0Vqf0VIML/o/e4Qd2RLOqtfgnlRi7avmMu5C0oqciJ0tk+hqdUKVUZ4JPoPaiGvQ==
+"@swc/core-darwin-arm64@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.6.6.tgz#9488d50394cb08713c4321a940b48599c1c5e153"
+  integrity sha512-5DA8NUGECcbcK1YLKJwNDKqdtTYDVnkfDU1WvQSXq/rU+bjYCLtn5gCe8/yzL7ISXA6rwqPU1RDejhbNt4ARLQ==
+
+"@swc/core-darwin-x64@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.6.6.tgz#0b13ae43e1821fd447acfb789979c59bec2d0081"
+  integrity sha512-2nbh/RHpweNRsJiYDFk1KcX7UtaKgzzTNUjwtvK5cp0wWrpbXmPvdlWOx3yzwoiSASDFx78242JHHXCIOlEdsw==
+
+"@swc/core-linux-arm-gnueabihf@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.6.6.tgz#8dd3e76b887478cedd38d34f1de3c0b8f853d1b8"
+  integrity sha512-YgytuyUfR7b0z0SRHKV+ylr83HmgnROgeT7xryEkth6JGpAEHooCspQ4RrWTU8+WKJ7aXiZlGXPgybQ4TiS+TA==
+
+"@swc/core-linux-arm64-gnu@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.6.6.tgz#4d6369975d8a077f01cf9f6cee60402529ef67a6"
+  integrity sha512-yGwx9fddzEE0iURqRVwKBQ4IwRHE6hNhl15WliHpi/PcYhzmYkUIpcbRXjr0dssubXAVPVnx6+jZVDSbutvnfg==
+
+"@swc/core-linux-arm64-musl@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.6.6.tgz#5f0ec779e465242796277d07a3100bd5ccaec6ef"
+  integrity sha512-a6fMbqzSAsS5KCxFJyg1mD5kwN3ZFO8qQLyJ75R/htZP/eCt05jrhmOI7h2n+1HjiG332jLnZ9S8lkVE5O8Nqw==
+
+"@swc/core-linux-x64-gnu@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.6.6.tgz#30a92064e016f29b8fe85500fa4e71050c60ae74"
+  integrity sha512-hRGsUKNzzZle28YF0dYIpN0bt9PceR9LaVBq7x8+l9TAaDLFbgksSxcnU/ubTtsy+WsYSYGn+A83w3xWC0O8CQ==
+
+"@swc/core-linux-x64-musl@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.6.6.tgz#59a14e4a90644142b8c90972f5d29cfdde88de78"
+  integrity sha512-NokIUtFxJDVv3LzGeEtYMTV3j2dnGKLac59luTeq36DQLZdJQawQIdTbzzWl2jE7lxxTZme+dhsVOH9LxE3ceg==
+
+"@swc/core-win32-arm64-msvc@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.6.6.tgz#c81f6e9be1df76273100a422ceec887781244b5d"
+  integrity sha512-lzYdI4qb4k1dFG26yv+9Jaq/bUMAhgs/2JsrLncGjLof86+uj74wKYCQnbzKAsq2hDtS5DqnHnl+//J+miZfGA==
+
+"@swc/core-win32-ia32-msvc@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.6.6.tgz#0381e95282fdcf5f5f9731b56dad5c5e4da870ce"
+  integrity sha512-bvl7FMaXIJQ76WZU0ER4+RyfKIMGb6S2MgRkBhJOOp0i7VFx4WLOnrmMzaeoPJaJSkityVKAftfNh7NBzTIydQ==
+
+"@swc/core-win32-x64-msvc@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.6.6.tgz#e511013aa3f71125d6385123469cdd30db141070"
+  integrity sha512-WAP0JoCTfgeYKgOeYJoJV4ZS0sQUmU3OwvXa2dYYtMLF7zsNqOiW4niU7QlThBHgUv/qNZm2p6ITEgh3w1cltw==
+
+"@swc/core@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.6.6.tgz#fefaa3a6bdd1c6991a9ed67648bc058a0d29d4b8"
+  integrity sha512-sHfmIUPUXNrQTwFMVCY5V5Ena2GTOeaWjS2GFUpjLhAgVfP90OP67DWow7+cYrfFtqBdILHuWnjkTcd0+uPKlg==
   dependencies:
     "@swc/counter" "^0.1.3"
-    "@swc/types" "^0.1.7"
+    "@swc/types" "^0.1.9"
   optionalDependencies:
-    "@swc/core-darwin-arm64" "1.5.24"
-    "@swc/core-darwin-x64" "1.5.24"
-    "@swc/core-linux-arm-gnueabihf" "1.5.24"
-    "@swc/core-linux-arm64-gnu" "1.5.24"
-    "@swc/core-linux-arm64-musl" "1.5.24"
-    "@swc/core-linux-x64-gnu" "1.5.24"
-    "@swc/core-linux-x64-musl" "1.5.24"
-    "@swc/core-win32-arm64-msvc" "1.5.24"
-    "@swc/core-win32-ia32-msvc" "1.5.24"
-    "@swc/core-win32-x64-msvc" "1.5.24"
+    "@swc/core-darwin-arm64" "1.6.6"
+    "@swc/core-darwin-x64" "1.6.6"
+    "@swc/core-linux-arm-gnueabihf" "1.6.6"
+    "@swc/core-linux-arm64-gnu" "1.6.6"
+    "@swc/core-linux-arm64-musl" "1.6.6"
+    "@swc/core-linux-x64-gnu" "1.6.6"
+    "@swc/core-linux-x64-musl" "1.6.6"
+    "@swc/core-win32-arm64-msvc" "1.6.6"
+    "@swc/core-win32-ia32-msvc" "1.6.6"
+    "@swc/core-win32-x64-msvc" "1.6.6"
 
 "@swc/counter@^0.1.3":
   version "0.1.3"
@@ -2261,10 +2261,10 @@
     "@swc/counter" "^0.1.3"
     jsonc-parser "^3.2.0"
 
-"@swc/types@^0.1.7":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.7.tgz#ea5d658cf460abff51507ca8d26e2d391bafb15e"
-  integrity sha512-scHWahbHF0eyj3JsxG9CFJgFdFNaVQCNAimBlT6PzS3n/HptxqREjsm4OH6AN3lYcffZYSPxXW8ua2BEHp0lJQ==
+"@swc/types@^0.1.9":
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.9.tgz#e67cdcc2e4dd74a3cef4474b465eb398e7ae83e2"
+  integrity sha512-qKnCno++jzcJ4lM4NTfYifm1EFSCeIfKiAHAfkENZAV5Kl9PjJIyd2yeeVv6c/2CckuLyv2NmRC5pv6pm2WQBg==
   dependencies:
     "@swc/counter" "^0.1.3"
 
@@ -9996,7 +9996,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10073,7 +10082,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11440,7 +11456,16 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

From 7c8f42bbe843dc5db82a6c84281099d11f22b646 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Wed, 3 Jul 2024 06:42:23 +0200
Subject: [PATCH 4/8] fix: pass correct props to sign-typed-data popup (#2701)

Co-authored-by: Jean Ribeiro <contact@jeanribeiro.dev>
---
 .../popup/popups/SignTypedDataPopup.svelte    | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/packages/desktop/components/popup/popups/SignTypedDataPopup.svelte b/packages/desktop/components/popup/popups/SignTypedDataPopup.svelte
index 3f259fece2..7b2850c2b3 100644
--- a/packages/desktop/components/popup/popups/SignTypedDataPopup.svelte
+++ b/packages/desktop/components/popup/popups/SignTypedDataPopup.svelte
@@ -1,27 +1,28 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
     import { PopupId, closePopup, openPopup } from '@desktop/auxiliary/popup'
-    import { IConnectedDapp } from '@auxiliary/wallet-connect/interface'
-    import { CallbackParameters } from '@auxiliary/wallet-connect/types'
+    import { WCRequestInfo } from '@auxiliary/wallet-connect/types'
     import { Alert, JsonTree, Table, Text } from '@bloomwalletio/ui'
     import { IAccountState } from '@core/account'
-    import { IEvmNetwork } from '@core/network'
     import { AccountLabel, DappInfo } from '@ui'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { LedgerAppName } from '@core/ledger'
     import PopupTemplate from '../PopupTemplate.svelte'
     import { SignTypedDataVersion } from '@metamask/eth-sig-util'
     import { signEip712Message } from '@core/wallet/actions/signEip712Message'
-    import { DappVerification } from '@auxiliary/wallet-connect/enums'
     import { handleError } from '@core/error/handlers'
+    import { MILLISECONDS_PER_SECOND } from '@core/utils'
+    import { time } from '@core/app/stores'
+    import { RequestExpirationAlert } from '@views/dashboard/drawers/dapp-config/components'
 
     export let data: string
     export let version: SignTypedDataVersion.V3 | SignTypedDataVersion.V4
     export let account: IAccountState
-    export let evmNetwork: IEvmNetwork
-    export let dapp: IConnectedDapp
-    export let verifiedState: DappVerification
-    export let callback: (params: CallbackParameters) => void
+    export let requestInfo: WCRequestInfo
+
+    const { dapp, responseCallback, verifiedState, evmNetwork, expiryTimestamp } = requestInfo
+    $: hasExpired =
+        expiryTimestamp === undefined ? false : expiryTimestamp * MILLISECONDS_PER_SECOND - $time.getTime() <= 0
 
     let isBusy = false
 
@@ -37,7 +38,7 @@
             const result = await signEip712Message(data, version, evmNetwork.coinType, account)
             closePopup({ forceClose: true })
 
-            callback({ result })
+            responseCallback({ result })
             openPopup({
                 id: PopupId.SuccessfulDappInteraction,
                 props: {
@@ -66,16 +67,22 @@
     continueButton={{
         text: localize('popups.signMessage.action'),
         onClick: onConfirmClick,
+        disabled: hasExpired,
     }}
     busy={isBusy}
 >
-    <DappInfo
-        slot="banner"
-        metadata={dapp.metadata}
-        {verifiedState}
-        showLink={false}
-        classes="bg-surface-1 dark:bg-surface-1-dark pb-4"
-    />
+    <svelte:fragment slot="banner">
+        {#if dapp}
+            <DappInfo
+                slot="banner"
+                metadata={dapp.metadata}
+                {verifiedState}
+                showLink={false}
+                classes="bg-surface-1 dark:bg-surface-1-dark pb-4"
+            />
+            <RequestExpirationAlert {expiryTimestamp} />
+        {/if}
+    </svelte:fragment>
 
     <div class="space-y-5">
         <div>

From eb0eee50690d370a9de1377dbeb6229bbb483967 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Wed, 3 Jul 2024 06:47:57 +0200
Subject: [PATCH 5/8] feat: update wallet connect session when new accounts 
 addresses are created (#2699)

* update session on account creation

* fix dapp reload

---------

Co-authored-by: Jean Ribeiro <contact@jeanribeiro.dev>
---
 .../actions/addAccountToAllDappSessions.ts    | 46 +++++++++++++++++++
 .../auxiliary/wallet-connect/actions/index.ts |  1 +
 .../actions/tryCreateAdditionalAccount.ts     | 12 +++--
 3 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/actions/addAccountToAllDappSessions.ts

diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/addAccountToAllDappSessions.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/addAccountToAllDappSessions.ts
new file mode 100644
index 0000000000..4cd381155c
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/addAccountToAllDappSessions.ts
@@ -0,0 +1,46 @@
+import { IAccountState, getAddressFromAccountForNetwork } from '@core/account'
+import { get } from 'svelte/store'
+import { ISupportedNamespace } from '../types'
+import { getWalletClient, walletClient } from '../stores'
+import { EvmNetworkId } from '@core/network/types'
+import { buildCaip10Address } from '../utils'
+import { connectedDapps } from '../stores'
+
+export async function addAccountToAllDappSessions(account: IAccountState): Promise<void> {
+    const dapps = get(connectedDapps)
+    for (const dapp of dapps) {
+        if (dapp.sessionTopic && dapp.namespaces) {
+            await addAccountForDappSession(dapp.sessionTopic, dapp.namespaces, account)
+        }
+    }
+}
+
+export async function addAccountForDappSession(
+    sessionTopic: string,
+    namespaces: Record<string, ISupportedNamespace>,
+    account: IAccountState
+): Promise<void> {
+    const walletConnectClient = get(walletClient)
+    if (!walletConnectClient) {
+        return
+    }
+
+    const protocols = Object.keys(namespaces ?? {})
+    for (const protocol of protocols) {
+        if (!namespaces[protocol]) {
+            continue
+        }
+
+        const chainsForSession = (namespaces[protocol].chains ?? []) as EvmNetworkId[]
+        const addressOfAccountForEachChain = chainsForSession
+            .map((chainId) => {
+                const address = getAddressFromAccountForNetwork(account, chainId)
+                return address ? buildCaip10Address(address, chainId) : undefined
+            })
+            .filter(Boolean) as string[]
+
+        namespaces[protocol].accounts = [...addressOfAccountForEachChain, ...namespaces[protocol].accounts]
+    }
+
+    await getWalletClient()?.updateSession({ topic: sessionTopic, namespaces })
+}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts
index 2969f8bb30..beaf1289f1 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts
@@ -1,3 +1,4 @@
+export * from './addAccountToAllDappSessions'
 export * from './approveSession'
 export * from './approveSessionAuthenticate'
 export * from './buildSupportedNamespaceFromSelections'
diff --git a/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts b/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
index 03126be33f..eff9a0ee56 100644
--- a/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
+++ b/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
@@ -7,8 +7,9 @@ import { setSelectedAccount } from './setSelectedAccount'
 import { getActiveProfile } from '@core/profile/stores'
 import { ProfileType } from '@core/profile'
 import { generateAndStoreEvmAddressForAccounts, pollEvmBalancesForAccount } from '@core/layer-2/actions'
-import { getEvmNetworks } from '@core/network/stores'
 import { IError } from '@core/error/interfaces'
+import { DEFAULT_COIN_TYPE, SupportedNetworkId } from '@core/network/constants'
+import { addAccountToAllDappSessions, updateAccountForConnectedDapps } from '@auxiliary/wallet-connect/actions'
 
 export async function tryCreateAdditionalAccount(alias: string, color: string): Promise<void> {
     try {
@@ -21,11 +22,12 @@ export async function tryCreateAdditionalAccount(alias: string, color: string):
 
         const activeProfile = getActiveProfile()
         if (activeProfile.type === ProfileType.Software) {
-            const coinType = getEvmNetworks()[0]?.coinType
-            if (coinType !== undefined) {
-                void generateAndStoreEvmAddressForAccounts(activeProfile.type, coinType, account)
+            const coinType = DEFAULT_COIN_TYPE[SupportedNetworkId.Ethereum]
+            generateAndStoreEvmAddressForAccounts(activeProfile.type, coinType, account).then(async () => {
                 void pollEvmBalancesForAccount(activeProfile.id, account)
-            }
+                await addAccountToAllDappSessions(account)
+                await updateAccountForConnectedDapps(account)
+            })
         }
 
         return Promise.resolve()

From 64dd41f3a2bf366c22f95a00c0ad423874dd5001 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 05:34:41 +0000
Subject: [PATCH 6/8] chore(deps-dev): bump eslint from 9.3.0 to 9.6.0 (#2684)

Bumps [eslint](https://github.com/eslint/eslint) from 9.3.0 to 9.6.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.3.0...v9.6.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jean Ribeiro <contact@jeanribeiro.dev>
---
 package.json |  2 +-
 yarn.lock    | 80 +++++++++++++++++++++++++---------------------------
 2 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index 3235bee12e..0025a930e6 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
         "@types/node": "18.15.11",
         "@typescript-eslint/eslint-plugin": "7.11.0",
         "@typescript-eslint/parser": "7.11.0",
-        "eslint": "9.3.0",
+        "eslint": "9.6.0",
         "eslint-plugin-security": "3.0.0",
         "eslint-plugin-svelte": "2.39.0",
         "globals": "^15.3.0",
diff --git a/yarn.lock b/yarn.lock
index f02a919a20..3e69ebc6dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -793,6 +793,15 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
+"@eslint/config-array@^0.17.0":
+  version "0.17.0"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.17.0.tgz#ff305e1ee618a00e6e5d0485454c8d92d94a860d"
+  integrity sha512-A68TBu6/1mHHuc5YJL0U0VVeGNiklLAL6rRmhTCP2B5XjWLMnrX+HkO+IAXyHvks5cyyY1jjK5ITPQ1HGS2EVA==
+  dependencies:
+    "@eslint/object-schema" "^2.1.4"
+    debug "^4.3.1"
+    minimatch "^3.1.2"
+
 "@eslint/eslintrc@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6"
@@ -808,10 +817,15 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@9.3.0":
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.3.0.tgz#2e8f65c9c55227abc4845b1513c69c32c679d8fe"
-  integrity sha512-niBqk8iwv96+yuTwjM6bWg8ovzAPF9qkICsGtcoa5/dmqcEMfdwNAX7+/OHcJHc7wj7XqPxH98oAHytFYlw6Sw==
+"@eslint/js@9.6.0":
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.6.0.tgz#5b0cb058cc13d9c92d4e561d3538807fa5127c95"
+  integrity sha512-D9B0/3vNg44ZeWbYMpBoXqNP4j6eQD5vNwIlGAuFRRzK/WtT/jvDQW3Bi9kkf3PMDMlM7Yi+73VLUsn5bJcl8A==
+
+"@eslint/object-schema@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843"
+  integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==
 
 "@ethereumjs/common@4.3.0", "@ethereumjs/common@^4.3.0":
   version "4.3.0"
@@ -1283,25 +1297,11 @@
   dependencies:
     tslib "^2.4.0"
 
-"@humanwhocodes/config-array@^0.13.0":
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
-  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
-  dependencies:
-    "@humanwhocodes/object-schema" "^2.0.3"
-    debug "^4.3.1"
-    minimatch "^3.0.5"
-
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
-  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
-
 "@humanwhocodes/retry@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570"
@@ -3382,6 +3382,11 @@ acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.3, acorn@^8.7.1, acorn@^8.8.1, acorn@^8
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
+acorn@^8.12.0:
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.0.tgz#1627bfa2e058148036133b8d9b51a700663c294c"
+  integrity sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==
+
 aes-js@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
@@ -5413,16 +5418,16 @@ eslint-visitor-keys@^4.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
   integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
 
-eslint@9.3.0:
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.3.0.tgz#36a96db84592618d6ed9074d677e92f4e58c08b9"
-  integrity sha512-5Iv4CsZW030lpUqHBapdPo3MJetAPtejVW8B84GIcIIv8+ohFaddXsrn1Gn8uD9ijDb+kcYKFUVmC8qG8B2ORQ==
+eslint@9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.6.0.tgz#9f54373afa15e1ba356656a8d96233182027fb49"
+  integrity sha512-ElQkdLMEEqQNM9Njff+2Y4q2afHk7JpkPvrd7Xh7xefwgQynqPxwf55J7di9+MEibWUGdNjFF9ITG9Pck5M84w==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/config-array" "^0.17.0"
     "@eslint/eslintrc" "^3.1.0"
-    "@eslint/js" "9.3.0"
-    "@humanwhocodes/config-array" "^0.13.0"
+    "@eslint/js" "9.6.0"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@humanwhocodes/retry" "^0.3.0"
     "@nodelib/fs.walk" "^1.2.8"
@@ -5433,8 +5438,8 @@ eslint@9.3.0:
     escape-string-regexp "^4.0.0"
     eslint-scope "^8.0.1"
     eslint-visitor-keys "^4.0.0"
-    espree "^10.0.1"
-    esquery "^1.4.2"
+    espree "^10.1.0"
+    esquery "^1.5.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^8.0.0"
@@ -5463,12 +5468,12 @@ esniff@^2.0.1:
     event-emitter "^0.3.5"
     type "^2.7.2"
 
-espree@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f"
-  integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==
+espree@^10.0.1, espree@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.1.0.tgz#8788dae611574c0f070691f522e4116c5a11fc56"
+  integrity sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==
   dependencies:
-    acorn "^8.11.3"
+    acorn "^8.12.0"
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^4.0.0"
 
@@ -5486,7 +5491,7 @@ esprima@^4.0.0, esprima@^4.0.1:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.2:
+esquery@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
@@ -8027,7 +8032,7 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
-minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -8041,14 +8046,7 @@ minimatch@^5.0.1, minimatch@^5.1.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.1:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^9.0.4:
+minimatch@^9.0.1, minimatch@^9.0.4:
   version "9.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
   integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==

From 76017cd95b20426a2a4c44a041ca5985d8f92946 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 05:42:49 +0000
Subject: [PATCH 7/8] chore(deps-dev): bump globals from 15.3.0 to 15.7.0
 (#2685)

Bumps [globals](https://github.com/sindresorhus/globals) from 15.3.0 to 15.7.0.
- [Release notes](https://github.com/sindresorhus/globals/releases)
- [Commits](https://github.com/sindresorhus/globals/compare/v15.3.0...v15.7.0)

---
updated-dependencies:
- dependency-name: globals
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jean Ribeiro <contact@jeanribeiro.dev>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0025a930e6..08bbe32ff8 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
         "eslint": "9.6.0",
         "eslint-plugin-security": "3.0.0",
         "eslint-plugin-svelte": "2.39.0",
-        "globals": "^15.3.0",
+        "globals": "^15.7.0",
         "husky": "7.0.4",
         "lint-staged": "15.2.5",
         "patch-package": "8.0.0",
diff --git a/yarn.lock b/yarn.lock
index 3e69ebc6dc..e0838c9603 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6140,10 +6140,10 @@ globals@^14.0.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
   integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
-globals@^15.3.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-15.3.0.tgz#619db01f88d8fb91b0ed841a820cd980299575e5"
-  integrity sha512-cCdyVjIUVTtX8ZsPkq1oCsOsLmGIswqnjZYMJJTGaNApj1yHtLSymKhwH51ttirREn75z3p4k051clwg7rvNKA==
+globals@^15.7.0:
+  version "15.7.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-15.7.0.tgz#d9ca65edad684c438b179749fc57def027557f93"
+  integrity sha512-ivatRXWwKC6ImcdKO7dOwXuXR5XFrdwo45qFwD7D0qOkEPzzJdLXC3BHceBdyrPOD3p1suPaWi4Y4NMm2D++AQ==
 
 globalthis@^1.0.1, globalthis@^1.0.3:
   version "1.0.3"

From ca31adb52d0318c41eea0bf0a845fb966e7c8044 Mon Sep 17 00:00:00 2001
From: Jean Ribeiro <contact@jeanribeiro.dev>
Date: Wed, 3 Jul 2024 04:10:18 -0300
Subject: [PATCH 8/8] refactor: MarketCurrency to FiatCurrency & CryptoCurrency
 (#2702)

* refactor: MarketCurrency to FiatCurrency & CryptoCurrency

* chore: adds profile migration

* fix: mark suggestions
---
 .../lib/electron/managers/transak.manager.ts  |  4 +-
 .../buy-sell/views/BuySellMainView.svelte     | 13 ++--
 .../settings/views/profile/Currency.svelte    |  4 +-
 ...edProfileFromThirdPartyPersistedProfile.ts |  4 +-
 .../transak-window-data.interface.ts          |  2 +-
 .../src/lib/core/i18n/utils/formatCurrency.ts | 10 ++++
 .../core/i18n/utils/getDecimalSeparator.ts    |  3 +-
 .../lib/core/i18n/utils/getGroupSeparator.ts  |  3 +-
 .../actions/getAndUpdateMarketPrices.ts       |  4 +-
 .../src/lib/core/market/apis/coingecko.api.ts |  4 +-
 .../default-market-currency.constant.ts       |  4 +-
 .../core/market/enums/crypto-currency.enum.ts | 16 +++++
 .../core/market/enums/fiat-currency.enum.ts   | 35 +++++++++++
 .../shared/src/lib/core/market/enums/index.ts |  3 +-
 .../core/market/enums/market-currency.enum.ts | 60 -------------------
 .../shared/src/lib/core/market/types/index.ts |  1 +
 .../core/market/types/market-currency.type.ts |  3 +
 .../core/market/types/market-prices.type.ts   |  2 +-
 .../constants/profile-version.constant.ts     |  4 +-
 .../alpha/alpha-profile-migration-22-to-23.ts | 13 ++++
 .../alpha/alpha-profile-migration-map.ts      |  3 +
 .../prod/prod-profile-migration-12-to-13.ts   | 13 ++++
 .../prod/prod-profile-migration-map.ts        |  3 +
 23 files changed, 126 insertions(+), 85 deletions(-)
 create mode 100644 packages/shared/src/lib/core/market/enums/crypto-currency.enum.ts
 create mode 100644 packages/shared/src/lib/core/market/enums/fiat-currency.enum.ts
 delete mode 100644 packages/shared/src/lib/core/market/enums/market-currency.enum.ts
 create mode 100644 packages/shared/src/lib/core/market/types/market-currency.type.ts
 create mode 100644 packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-22-to-23.ts
 create mode 100644 packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-12-to-13.ts

diff --git a/packages/desktop/lib/electron/managers/transak.manager.ts b/packages/desktop/lib/electron/managers/transak.manager.ts
index cc4f3b2d1e..8bd5498e19 100644
--- a/packages/desktop/lib/electron/managers/transak.manager.ts
+++ b/packages/desktop/lib/electron/managers/transak.manager.ts
@@ -5,7 +5,7 @@ import { ITransakManager, ITransakWindowData } from '@core/app'
 import path from 'path'
 import { TRANSAK_WIDGET_URL } from '@auxiliary/transak/constants'
 import { buildUrl } from '@core/utils/url'
-import { MarketCurrency } from '@core/market/enums/market-currency.enum'
+import { FiatCurrency } from '@core/market/enums/fiat-currency.enum'
 import fs from 'fs'
 import { IError } from '@core/error'
 import { QueryParameters } from '@core/utils'
@@ -226,7 +226,7 @@ export default class TransakManager implements ITransakManager {
             throw new Error('Undefined Transak API key')
         }
 
-        if (!Object.values(MarketCurrency).includes(currency as MarketCurrency)) {
+        if (!Object.values(FiatCurrency).includes(currency as FiatCurrency)) {
             throw new Error('Invalid Transak currency')
         }
 
diff --git a/packages/desktop/views/dashboard/buy-sell/views/BuySellMainView.svelte b/packages/desktop/views/dashboard/buy-sell/views/BuySellMainView.svelte
index 5de044821d..b86b78b1ba 100644
--- a/packages/desktop/views/dashboard/buy-sell/views/BuySellMainView.svelte
+++ b/packages/desktop/views/dashboard/buy-sell/views/BuySellMainView.svelte
@@ -12,7 +12,8 @@
         TransakWindowPlaceholder,
     } from '../components'
     import { isDashboardSideBarExpanded } from '@core/ui'
-    import { MarketCoinId, MarketCurrency } from '@core/market/enums'
+    import { FiatCurrency, MarketCoinId } from '@core/market/enums'
+    import { MarketCurrency } from '@core/market/types'
     import { marketCoinPrices } from '@core/market/stores'
     import { DrawerState } from '@desktop/auxiliary/drawer/types'
     import { drawerState } from '@desktop/auxiliary/drawer/stores'
@@ -67,14 +68,14 @@
     function getDefaultFiatAmount(currency: MarketCurrency): number {
         const DEFAULT_FIAT_AMOUNT = 1000
         switch (currency) {
-            case MarketCurrency.Usd:
-            case MarketCurrency.Eur:
-            case MarketCurrency.Gbp:
+            case FiatCurrency.USD:
+            case FiatCurrency.EUR:
+            case FiatCurrency.GBP:
                 return DEFAULT_FIAT_AMOUNT
             default: {
                 const conversionRate =
                     $marketCoinPrices[MarketCoinId.Iota]?.[currency] /
-                    $marketCoinPrices[MarketCoinId.Iota]?.[MarketCurrency.Usd]
+                    $marketCoinPrices[MarketCoinId.Iota]?.[FiatCurrency.USD]
                 const fiatAmount = DEFAULT_FIAT_AMOUNT * conversionRate
                 const roundedAmount = customRound(fiatAmount)
                 return roundedAmount
@@ -97,7 +98,7 @@
             currency: $activeProfile?.settings.marketCurrency,
             address: $selectedAccount.depositAddress,
             service: 'BUY',
-            amount: getDefaultFiatAmount($activeProfile?.settings.marketCurrency ?? MarketCurrency.Usd),
+            amount: getDefaultFiatAmount($activeProfile?.settings.marketCurrency ?? FiatCurrency.USD),
         })
         isTransakOpen = true
         await updateTransakBounds()
diff --git a/packages/desktop/views/settings/views/profile/Currency.svelte b/packages/desktop/views/settings/views/profile/Currency.svelte
index 835bebb6d8..6262a4e2d6 100644
--- a/packages/desktop/views/settings/views/profile/Currency.svelte
+++ b/packages/desktop/views/settings/views/profile/Currency.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
     import { IOption, SelectInput } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
-    import { MarketCurrency } from '@core/market'
+    import { CryptoCurrency, FiatCurrency, MarketCurrency } from '@core/market'
     import { activeProfile, updateActiveProfileSettings } from '@core/profile/stores'
     import SettingsSection from '../SettingsSection.svelte'
 
-    const options: IOption[] = Object.values(MarketCurrency)
+    const options: IOption[] = [...Object.values(FiatCurrency), ...Object.values(CryptoCurrency)]
         .map((currency) => ({ value: currency, label: currency.toUpperCase() }))
         .sort()
 
diff --git a/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts b/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts
index 7a14ddb124..98263cf47e 100644
--- a/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts
+++ b/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts
@@ -1,6 +1,6 @@
 import { IPersistedAccountData } from '@core/account'
 import { APP_STAGE } from '@core/app'
-import { MarketCurrency } from '@core/market'
+import { FiatCurrency } from '@core/market'
 import {
     DEFAULT_EVM_NETWORK_CONFIGURATIONS_FOR_STARDUST_NETWORK,
     DEFAULT_EXPLORER_URLS,
@@ -111,7 +111,7 @@ function buildEvmNetworksFromThirdPartyPersistedNetwork(
 
 function buildSettingsFromThirdPartyPersistedSettings(settings: IThirdPartyPersistedSettings): IProfileSettings {
     return {
-        marketCurrency: settings.marketCurrency ?? MarketCurrency.Usd,
+        marketCurrency: settings.marketCurrency ?? FiatCurrency.USD,
         lockScreenTimeoutInMinutes: settings.lockScreenTimeoutInMinutes ?? DEFAULT_LOCK_SCREEN_TIMEOUT_IN_MINUTES,
         strongholdPasswordTimeoutInMinutes:
             settings.strongholdPasswordTimeoutInMinutes ?? DEFAULT_STRONGHOLD_PASSWORD_TIMEOUT_IN_MINUTES,
diff --git a/packages/shared/src/lib/core/app/interfaces/transak-window-data.interface.ts b/packages/shared/src/lib/core/app/interfaces/transak-window-data.interface.ts
index 572ae53fd0..858cf83e7d 100644
--- a/packages/shared/src/lib/core/app/interfaces/transak-window-data.interface.ts
+++ b/packages/shared/src/lib/core/app/interfaces/transak-window-data.interface.ts
@@ -1,4 +1,4 @@
-import { MarketCurrency } from '@core/market/enums/market-currency.enum'
+import { MarketCurrency } from '@core/market/types'
 
 export interface ITransakWindowData {
     currency: MarketCurrency
diff --git a/packages/shared/src/lib/core/i18n/utils/formatCurrency.ts b/packages/shared/src/lib/core/i18n/utils/formatCurrency.ts
index 91c4961c43..c5476fda04 100644
--- a/packages/shared/src/lib/core/i18n/utils/formatCurrency.ts
+++ b/packages/shared/src/lib/core/i18n/utils/formatCurrency.ts
@@ -27,6 +27,16 @@ export function formatCurrency(
         convertedValue = Number(value.toFixed(2))
     }
 
+    const isCurrencyNotSupported = currency?.length > 3
+    if (isCurrencyNotSupported) {
+        const formattedValue = convertedValue.toLocaleString(appLanguage, {
+            minimumFractionDigits: 2,
+            maximumFractionDigits: 20,
+            useGrouping: grouped,
+        })
+        return `${formattedValue} ${currency.toUpperCase()}`
+    }
+
     const formatter = Intl.NumberFormat(appLanguage, {
         style: 'currency',
         currency: currency ?? 'USD',
diff --git a/packages/shared/src/lib/core/i18n/utils/getDecimalSeparator.ts b/packages/shared/src/lib/core/i18n/utils/getDecimalSeparator.ts
index b990293917..28ea56ea6a 100644
--- a/packages/shared/src/lib/core/i18n/utils/getDecimalSeparator.ts
+++ b/packages/shared/src/lib/core/i18n/utils/getDecimalSeparator.ts
@@ -9,10 +9,11 @@ export function getDecimalSeparator(currency: string | undefined = undefined): s
         currency = get(activeProfile)?.settings?.marketCurrency
     }
 
+    const isCurrencySupportedByIntl = currency?.length <= 3
     return (
         Intl.NumberFormat(appLanguage, {
             style: 'currency',
-            currency: currency ?? 'USD',
+            currency: isCurrencySupportedByIntl ? currency : 'USD',
         })
             .formatToParts(1.1)
             .find((part) => part.type === 'decimal')?.value ?? '.'
diff --git a/packages/shared/src/lib/core/i18n/utils/getGroupSeparator.ts b/packages/shared/src/lib/core/i18n/utils/getGroupSeparator.ts
index 155dce7c5d..bd3ee7973b 100644
--- a/packages/shared/src/lib/core/i18n/utils/getGroupSeparator.ts
+++ b/packages/shared/src/lib/core/i18n/utils/getGroupSeparator.ts
@@ -9,10 +9,11 @@ export function getGroupSeparator(currency: string | undefined = undefined): str
         currency = get(activeProfile)?.settings?.marketCurrency
     }
 
+    const isCurrencySupportedByIntl = currency?.length <= 3
     return (
         Intl.NumberFormat(appLanguage, {
             style: 'currency',
-            currency: currency ?? 'USD',
+            currency: isCurrencySupportedByIntl ? currency : 'USD',
         })
             .formatToParts(1111111)
             .find((part) => part.type === 'group')?.value ?? ','
diff --git a/packages/shared/src/lib/core/market/actions/getAndUpdateMarketPrices.ts b/packages/shared/src/lib/core/market/actions/getAndUpdateMarketPrices.ts
index fb57612c94..e474581e92 100644
--- a/packages/shared/src/lib/core/market/actions/getAndUpdateMarketPrices.ts
+++ b/packages/shared/src/lib/core/market/actions/getAndUpdateMarketPrices.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 import { CoinGeckoApi } from '../apis'
-import { MarketCoinId, MarketCurrency } from '../enums'
+import { CryptoCurrency, FiatCurrency, MarketCoinId } from '../enums'
 import { CoinGeckoCoin } from '../interfaces'
 import { coinGeckoTokensMetadata, updateMarketCoinPrices } from '../stores'
 
@@ -12,7 +12,7 @@ export async function getAndUpdateMarketPrices(): Promise<void> {
 
         const marketPricesResponse = await CoinGeckoApi.getSimplePrices(
             [MarketCoinId.Iota, MarketCoinId.Shimmer, MarketCoinId.Ethereum, ...storedTokenIds],
-            Object.values(MarketCurrency)
+            [...Object.values(FiatCurrency), ...Object.values(CryptoCurrency)]
         )
         updateMarketCoinPrices(marketPricesResponse)
     } catch (err) {
diff --git a/packages/shared/src/lib/core/market/apis/coingecko.api.ts b/packages/shared/src/lib/core/market/apis/coingecko.api.ts
index 3f6bd8b9f3..2a443f28be 100644
--- a/packages/shared/src/lib/core/market/apis/coingecko.api.ts
+++ b/packages/shared/src/lib/core/market/apis/coingecko.api.ts
@@ -1,7 +1,7 @@
 import { DEFAULT_APPLICATION_JSON_REQUEST_OPTIONS, QueryParameters, buildUrl } from '@core/utils'
 import { MARKET_API_BASE_URL } from '../constants'
-import { CoinGeckoApiEndpoint, CoinGeckoNetworkId, MarketCoinId, MarketCurrency } from '../enums'
-import { MarketCoinPrices } from '../types'
+import { CoinGeckoApiEndpoint, CoinGeckoNetworkId, MarketCoinId } from '../enums'
+import { MarketCoinPrices, MarketCurrency } from '../types'
 import { CoinGeckoCoin } from '../interfaces'
 import { localize } from '@core/i18n'
 
diff --git a/packages/shared/src/lib/core/market/constants/default-market-currency.constant.ts b/packages/shared/src/lib/core/market/constants/default-market-currency.constant.ts
index 18f7c6c75d..76e1461ef9 100644
--- a/packages/shared/src/lib/core/market/constants/default-market-currency.constant.ts
+++ b/packages/shared/src/lib/core/market/constants/default-market-currency.constant.ts
@@ -1,3 +1,3 @@
-import { MarketCurrency } from '../enums'
+import { FiatCurrency } from '../enums'
 
-export const DEFAULT_MARKET_CURRENCY = MarketCurrency.Usd
+export const DEFAULT_MARKET_CURRENCY = FiatCurrency.USD
diff --git a/packages/shared/src/lib/core/market/enums/crypto-currency.enum.ts b/packages/shared/src/lib/core/market/enums/crypto-currency.enum.ts
new file mode 100644
index 0000000000..bb4f85ba90
--- /dev/null
+++ b/packages/shared/src/lib/core/market/enums/crypto-currency.enum.ts
@@ -0,0 +1,16 @@
+// Coingecko supported crypto currencies prices
+export enum CryptoCurrency {
+    BTC = 'btc',
+    ETH = 'eth',
+    LTC = 'ltc',
+    BCH = 'bch',
+    BNB = 'bnb',
+    EOS = 'eos',
+    XRP = 'xrp',
+    XLM = 'xlm',
+    LINK = 'link',
+    DOT = 'dot',
+    YFI = 'yfi',
+    BITS = 'bits',
+    SATS = 'sats',
+}
diff --git a/packages/shared/src/lib/core/market/enums/fiat-currency.enum.ts b/packages/shared/src/lib/core/market/enums/fiat-currency.enum.ts
new file mode 100644
index 0000000000..cf9805be6f
--- /dev/null
+++ b/packages/shared/src/lib/core/market/enums/fiat-currency.enum.ts
@@ -0,0 +1,35 @@
+// Transak and Coingecko supported fiat currencies intersection
+export enum FiatCurrency {
+    USD = 'usd',
+    EUR = 'eur',
+    GBP = 'gbp',
+    AED = 'aed',
+    ARS = 'ars',
+    AUD = 'aud',
+    BHD = 'bhd',
+    BMD = 'bmd',
+    BRL = 'brl',
+    CAD = 'cad',
+    CHF = 'chf',
+    CLP = 'clp',
+    CZK = 'czk',
+    DKK = 'dkk',
+    GEL = 'gel',
+    HKD = 'hkd',
+    HUF = 'huf',
+    IDR = 'idr',
+    ILS = 'ils',
+    INR = 'inr',
+    JPY = 'jpy',
+    KRW = 'krw',
+    KWD = 'kwd',
+    MXN = 'mxn',
+    MYR = 'myr',
+    NOK = 'nok',
+    NZD = 'nzd',
+    PHP = 'php',
+    PLN = 'pln',
+    SEK = 'sek',
+    SGD = 'sgd',
+    TWD = 'twd',
+}
diff --git a/packages/shared/src/lib/core/market/enums/index.ts b/packages/shared/src/lib/core/market/enums/index.ts
index 11a97258d9..40a890aa8c 100644
--- a/packages/shared/src/lib/core/market/enums/index.ts
+++ b/packages/shared/src/lib/core/market/enums/index.ts
@@ -1,4 +1,5 @@
 export * from './coingecko-api-endpoint.enum'
 export * from './coingecko-network-id.enum'
+export * from './crypto-currency.enum'
+export * from './fiat-currency.enum'
 export * from './market-coin-id.enum'
-export * from './market-currency.enum'
diff --git a/packages/shared/src/lib/core/market/enums/market-currency.enum.ts b/packages/shared/src/lib/core/market/enums/market-currency.enum.ts
deleted file mode 100644
index eb4ff99bce..0000000000
--- a/packages/shared/src/lib/core/market/enums/market-currency.enum.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-export enum MarketCurrency {
-    Btc = 'btc',
-    Eth = 'eth',
-    Ltc = 'ltc',
-    Bch = 'bch',
-    Bnb = 'bnb',
-    Eos = 'eos',
-    Xrp = 'xrp',
-    Xlm = 'xlm',
-    Dot = 'dot',
-    Yfi = 'yfi',
-    Usd = 'usd',
-    Aed = 'aed',
-    Ars = 'ars',
-    Aud = 'aud',
-    Bdt = 'bdt',
-    Bhd = 'bhd',
-    Bmd = 'bmd',
-    Brl = 'brl',
-    Cad = 'cad',
-    Chf = 'chf',
-    Clp = 'clp',
-    Cny = 'cny',
-    Czk = 'czk',
-    Dkk = 'dkk',
-    Eur = 'eur',
-    Gbp = 'gbp',
-    Hkd = 'hkd',
-    Huf = 'huf',
-    Idr = 'idr',
-    Ils = 'ils',
-    Inr = 'inr',
-    Jpy = 'jpy',
-    Krw = 'krw',
-    Kwd = 'kwd',
-    Lkr = 'lkr',
-    Mmk = 'mmk',
-    Mxn = 'mxn',
-    Myr = 'myr',
-    Ngn = 'ngn',
-    Nok = 'nok',
-    Nzd = 'nzd',
-    Php = 'php',
-    Pkr = 'pkr',
-    Pln = 'pln',
-    Rub = 'rub',
-    Sar = 'sar',
-    Sek = 'sek',
-    Sgd = 'sgd',
-    Thb = 'thb',
-    Try = 'try',
-    Twd = 'twd',
-    Uah = 'uah',
-    Vef = 'vef',
-    Vnd = 'vnd',
-    Zar = 'zar',
-    Xdr = 'xdr',
-    Xag = 'xag',
-    Xau = 'xau',
-}
diff --git a/packages/shared/src/lib/core/market/types/index.ts b/packages/shared/src/lib/core/market/types/index.ts
index 367ccacd98..5014b77612 100644
--- a/packages/shared/src/lib/core/market/types/index.ts
+++ b/packages/shared/src/lib/core/market/types/index.ts
@@ -1,2 +1,3 @@
+export * from './market-currency.type'
 export * from './market-prices.type'
 export * from './market-coin-prices.type'
diff --git a/packages/shared/src/lib/core/market/types/market-currency.type.ts b/packages/shared/src/lib/core/market/types/market-currency.type.ts
new file mode 100644
index 0000000000..b5f7288e8e
--- /dev/null
+++ b/packages/shared/src/lib/core/market/types/market-currency.type.ts
@@ -0,0 +1,3 @@
+import { CryptoCurrency, FiatCurrency } from '../enums'
+
+export type MarketCurrency = CryptoCurrency | FiatCurrency
diff --git a/packages/shared/src/lib/core/market/types/market-prices.type.ts b/packages/shared/src/lib/core/market/types/market-prices.type.ts
index a35f2c10c3..a82ff22200 100644
--- a/packages/shared/src/lib/core/market/types/market-prices.type.ts
+++ b/packages/shared/src/lib/core/market/types/market-prices.type.ts
@@ -1,3 +1,3 @@
-import { MarketCurrency } from '../enums'
+import { MarketCurrency } from './market-currency.type'
 
 export type MarketPrices = { [key in MarketCurrency]?: number }
diff --git a/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts b/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts
index c401f50226..0c1f60063e 100644
--- a/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts
+++ b/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts
@@ -1,7 +1,7 @@
 import { AppStage } from '@core/app/enums'
 
 export const PROFILE_VERSION: Record<AppStage, number> = {
-    [AppStage.ALPHA]: 22,
+    [AppStage.ALPHA]: 23,
     [AppStage.BETA]: 1,
-    [AppStage.PROD]: 12,
+    [AppStage.PROD]: 13,
 }
diff --git a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-22-to-23.ts b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-22-to-23.ts
new file mode 100644
index 0000000000..7be0910670
--- /dev/null
+++ b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-22-to-23.ts
@@ -0,0 +1,13 @@
+import { CryptoCurrency, FiatCurrency } from '@core/market'
+import { IPersistedProfile } from '@core/profile/interfaces'
+
+export function alphaProfileMigration22To23(existingProfile: unknown): Promise<void> {
+    const profile = existingProfile as IPersistedProfile
+    const marketCurrencies = [...Object.values(FiatCurrency), ...Object.values(CryptoCurrency)]
+
+    if (!marketCurrencies.includes(profile?.settings?.marketCurrency)) {
+        profile.settings.marketCurrency = FiatCurrency.USD
+    }
+
+    return Promise.resolve()
+}
diff --git a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts
index ae0fc54a75..67b29f18e2 100644
--- a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts
+++ b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts
@@ -14,6 +14,7 @@ import { alphaProfileMigration19To20 } from './alpha-profile-migration-19-to-20'
 import { alphaProfileMigration2To3 } from './alpha-profile-migration-2-to-3'
 import { alphaProfileMigration20To21 } from './alpha-profile-migration-20-to-21'
 import { alphaProfileMigration21To22 } from './alpha-profile-migration-21-to-22'
+import { alphaProfileMigration22To23 } from './alpha-profile-migration-22-to-23'
 import { alphaProfileMigration3To4 } from './alpha-profile-migration-3-to-4'
 import { alphaProfileMigration4To5 } from './alpha-profile-migration-4-to-5'
 import { alphaProfileMigration5To6 } from './alpha-profile-migration-5-to-6'
@@ -49,4 +50,6 @@ export const ALPHA_PROFILE_MIGRATION_MAP: ProfileMigrationMap = {
     // ^^^ release 1.0.4 ^^^
     21: alphaProfileMigration21To22,
     // ^^^ release 1.0.8 ^^^
+    22: alphaProfileMigration22To23,
+    // ^^^ release 1.1.2 ^^^
 }
diff --git a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-12-to-13.ts b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-12-to-13.ts
new file mode 100644
index 0000000000..978755684c
--- /dev/null
+++ b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-12-to-13.ts
@@ -0,0 +1,13 @@
+import { CryptoCurrency, FiatCurrency } from '@core/market'
+import { IPersistedProfile } from '@core/profile/interfaces'
+
+export function prodProfileMigration12To13(existingProfile: unknown): Promise<void> {
+    const profile = existingProfile as IPersistedProfile
+    const marketCurrencies = [...Object.values(FiatCurrency), ...Object.values(CryptoCurrency)]
+
+    if (!marketCurrencies.includes(profile?.settings?.marketCurrency)) {
+        profile.settings.marketCurrency = FiatCurrency.USD
+    }
+
+    return Promise.resolve()
+}
diff --git a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts
index a714993fd6..36b8377ed7 100644
--- a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts
+++ b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts
@@ -12,6 +12,7 @@ import { prodProfileMigration9To10 } from './prod-profile-migration-9-to-10'
 import { prodProfileMigration8To9 } from './prod-profile-migration-8-to-9'
 import { prodProfileMigration10To11 } from './prod-profile-migration-10-to-11'
 import { prodProfileMigration11To12 } from './prod-profile-migration-11-to-12'
+import { prodProfileMigration12To13 } from './prod-profile-migration-12-to-13'
 
 export const PROD_PROFILE_MIGRATION_MAP: ProfileMigrationMap = {
     0: prodProfileMigration0To1,
@@ -30,4 +31,6 @@ export const PROD_PROFILE_MIGRATION_MAP: ProfileMigrationMap = {
     // ^^^ release 1.0.4 ^^^
     11: prodProfileMigration11To12,
     // ^^^ release 1.0.8 ^^^
+    12: prodProfileMigration12To13,
+    // ^^^ release 1.1.2 ^^^
 }