diff --git a/package-lock.json b/package-lock.json
index 981aa812..9f3d4d4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,6 @@
       "name": "PowPeg",
       "version": "2.3.0",
       "dependencies": {
-        "@enkryptcom/types": "^0.0.5",
         "@leather.io/rpc": "^2.0.2",
         "@ledgerhq/devices": "6.27.1",
         "@ledgerhq/hw-app-btc": "6.27.1",
@@ -18,8 +17,8 @@
         "@mdi/js": "^6.9.96",
         "@rsksmart/bridges-core-sdk": "^0.3.3",
         "@rsksmart/flyover-sdk": "^1.5.1",
-        "@rsksmart/rlogin": "^1.6.1",
-        "@rsksmart/rlogin-ledger-provider": "^1.0.3",
+        "@rsksmart/rlogin": "^1.5.3-beta.1",
+        "@rsksmart/rlogin-ledger-provider": "^1.0.4",
         "@rsksmart/rlogin-trezor-provider": "^1.0.3",
         "@rsksmart/rsk-precompiled-abis": "^6.0.0-ARROWHEAD",
         "@rsksmart/rsk-utils": "^1.1.0",
@@ -32,7 +31,7 @@
         "@types/trezor-connect": "^7.0.0",
         "@walletconnect/web3-provider": "^1.7.1",
         "assert": "^2.0.0",
-        "axios": "^1.7.7",
+        "axios": "^1.6.3",
         "big.js": "^6.2.1",
         "bip32": "^4.0.0",
         "bitcoinjs-lib": "^5.2.0",
@@ -48,7 +47,6 @@
         "moment": "^2.29.4",
         "os-browserify": "^0.3.0",
         "process": "^0.11.10",
-        "sats-connect": "2.3.x",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
         "text-encoding": "^0.7.0",
@@ -57,7 +55,7 @@
         "vue": "^3.3.4",
         "vue-i18n": "^9.13.1",
         "vue-router": "^4.2.4",
-        "vuetify": "^3.5.17",
+        "vuetify": "^3.7.3",
         "vuex": "^4.1.0",
         "web3": "^4.8.0",
         "web3-eth-contract": "^1.10.0"
@@ -67,12 +65,12 @@
         "@ledgerhq/hw-transport-mocker": "^6.28.5",
         "@mdi/font": "^7.2.96",
         "@types/big.js": "^6.2.0",
-        "@types/chai": "^4.2.11",
+        "@types/chai": "^5.0.0",
         "@types/jest": "^27.5.2",
         "@types/markdown-it": "^14.1.1",
         "@types/node": "^20.4.7",
         "@types/sinon": "^10.0.2",
-        "@types/w3c-web-usb": "^1.0.4",
+        "@types/w3c-web-usb": "^1.0.10",
         "@typescript-eslint/eslint-plugin": "^5.62.0",
         "@typescript-eslint/parser": "^5.62.0",
         "@vue/cli-plugin-babel": "~5.0.0",
@@ -87,7 +85,7 @@
         "@vue/test-utils": "^2.4.1",
         "@vue/vue3-jest": "^27.0.0",
         "babel-jest": "^27.5.1",
-        "chai": "^4.3.4",
+        "chai": "^5.0.0",
         "chromedriver": "^119.0.1",
         "electron": "^24.2.0",
         "eslint": "^7.32.0",
@@ -2192,6 +2190,29 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@chainsafe/as-sha256": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@chainsafe/as-sha256/-/as-sha256-0.4.2.tgz",
+      "integrity": "sha512-HJ8GZBRjLeWtRsAXf3EbNsNzmTGpzTFjfpSf4yHkLYC+E52DhT6hwz+7qpj6I/EmFzSUm5tYYvT9K8GZokLQCQ=="
+    },
+    "node_modules/@chainsafe/persistent-merkle-tree": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.6.1.tgz",
+      "integrity": "sha512-gcENLemRR13+1MED2NeZBMA7FRS0xQPM7L2vhMqvKkjqtFT4YfjSVADq5U0iLuQLhFUJEMVuA8fbv5v+TN6O9A==",
+      "dependencies": {
+        "@chainsafe/as-sha256": "^0.4.1",
+        "@noble/hashes": "^1.3.0"
+      }
+    },
+    "node_modules/@chainsafe/ssz": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/@chainsafe/ssz/-/ssz-0.11.1.tgz",
+      "integrity": "sha512-cB8dBkgGN6ZoeOKuk+rIRHKN0L5i9JLGeC0Lui71QX0TuLcQKwgbfkUexpyJxnGFatWf8yeJxlOjozMn/OTP0g==",
+      "dependencies": {
+        "@chainsafe/as-sha256": "^0.4.1",
+        "@chainsafe/persistent-merkle-tree": "^0.6.1"
+      }
+    },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.5.7",
       "dev": true,
@@ -2250,27 +2271,23 @@
       }
     },
     "node_modules/@emotion/is-prop-valid": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.1.tgz",
-      "integrity": "sha512-/ACwoqx7XQi9knQs/G0qKvv5teDMhD7bXYns9N/wM8ah8iNb8jZ2uNO0YOgiq2o2poIvVtJS2YALasQuMSQ7Kw==",
+      "version": "1.2.1",
+      "license": "MIT",
       "dependencies": {
-        "@emotion/memoize": "^0.9.0"
+        "@emotion/memoize": "^0.8.1"
       }
     },
     "node_modules/@emotion/memoize": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz",
-      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ=="
+      "version": "0.8.1",
+      "license": "MIT"
     },
     "node_modules/@emotion/stylis": {
       "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
+      "license": "MIT"
     },
     "node_modules/@emotion/unitless": {
       "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+      "license": "MIT"
     },
     "node_modules/@emurgo/cardano-serialization-lib-browser": {
       "version": "11.5.0",
@@ -2282,14 +2299,6 @@
       "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.5.0.tgz",
       "integrity": "sha512-IlVABlRgo9XaTR1NunwZpWcxnfEv04ba2l1vkUz4S1W7Jt36F4CtffP+jPeqBZGnAe+fnUwo0XjIJC3ZTNToNQ=="
     },
-    "node_modules/@enkryptcom/types": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@enkryptcom/types/-/types-0.0.5.tgz",
-      "integrity": "sha512-GzSq2pu7LO1iuAcKFUORd+SyGm3907/ZHupAn/49sRbLXfJZ3HzTY65jeHG/EWPL4lyv2xyuhy7JEpo+x0tIUQ==",
-      "engines": {
-        "node": ">=14.15.0"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "dev": true,
@@ -5921,9 +5930,8 @@
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.19",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -5946,11 +5954,13 @@
         "@leather.io/models": "0.10.2"
       }
     },
-    "node_modules/@ledgerhq/cryptoassets": {
-      "version": "9.11.1",
-      "license": "Apache-2.0",
+    "node_modules/@ledgerhq/cryptoassets-evm-signatures": {
+      "version": "13.5.1",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/cryptoassets-evm-signatures/-/cryptoassets-evm-signatures-13.5.1.tgz",
+      "integrity": "sha512-ktyMb4nx6WGzHZPezfiITwZ5NJDa4twRoeGY81Xb/8JQqOtJprfpL89niJZk1teUT5rcwehGRoJJBl4B94Ea8Q==",
       "dependencies": {
-        "invariant": "2"
+        "@ledgerhq/live-env": "^2.4.0",
+        "axios": "1.7.7"
       }
     },
     "node_modules/@ledgerhq/devices": {
@@ -5991,78 +6001,67 @@
       "license": "ISC"
     },
     "node_modules/@ledgerhq/domain-service": {
-      "version": "1.1.8",
-      "license": "Apache-2.0",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/domain-service/-/domain-service-1.2.9.tgz",
+      "integrity": "sha512-65mlt+DBIs4osuUlljLelMCyG+a2VmWQPw5ppV4J50vPnkqfi8KAM+AiLbv9BHOfCTTaYyKjcVIWp/tHi82M3A==",
       "dependencies": {
-        "@ledgerhq/cryptoassets": "^9.11.1",
-        "@ledgerhq/errors": "^6.14.0",
-        "@ledgerhq/logs": "^6.10.1",
-        "@ledgerhq/types-live": "^6.38.1",
-        "axios": "^1.3.4",
+        "@ledgerhq/errors": "^6.19.1",
+        "@ledgerhq/logs": "^6.12.0",
+        "@ledgerhq/types-live": "^6.52.3",
+        "axios": "1.7.7",
         "eip55": "^2.1.1",
-        "react": "^17.0.2",
-        "react-dom": "^17.0.2"
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
       }
     },
     "node_modules/@ledgerhq/domain-service/node_modules/react": {
-      "version": "17.0.2",
-      "license": "MIT",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
+        "loose-envify": "^1.1.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/@ledgerhq/domain-service/node_modules/react-dom": {
-      "version": "17.0.2",
-      "license": "MIT",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "dependencies": {
         "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "scheduler": "^0.20.2"
+        "scheduler": "^0.23.2"
       },
       "peerDependencies": {
-        "react": "17.0.2"
+        "react": "^18.3.1"
       }
     },
     "node_modules/@ledgerhq/domain-service/node_modules/scheduler": {
-      "version": "0.20.2",
-      "license": "MIT",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
+        "loose-envify": "^1.1.0"
       }
     },
     "node_modules/@ledgerhq/errors": {
-      "version": "6.16.3",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.16.3.tgz",
-      "integrity": "sha512-3w7/SJVXOPa9mpzyll7VKoKnGwDD3BzWgN1Nom8byR40DiQvOKjHX+kKQausCedTHVNBn9euzPCNsftZ9+mxfw=="
+      "version": "6.19.1",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.19.1.tgz",
+      "integrity": "sha512-75yK7Nnit/Gp7gdrJAz0ipp31CCgncRp+evWt6QawQEtQKYEDfGo10QywgrrBBixeRxwnMy1DP6g2oCWRf1bjw=="
     },
     "node_modules/@ledgerhq/evm-tools": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/evm-tools/-/evm-tools-1.2.2.tgz",
-      "integrity": "sha512-k/CPk10d5SI2y2rDvmDFCyWq6Ydn4pRnc0vlDCgCw2HwrPtLZRa0xPPeWq/m66EAOfLf+PxkLva7R97X/8NIbw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/evm-tools/-/evm-tools-1.2.4.tgz",
+      "integrity": "sha512-3panbP6OWBvU/K5nyYqMsjNiccEniHC8CcS/cpKY3n2I1wbH0gmJD1tw6+fo75kyrSAwaBEwwr5sZ1M0cU6fsA==",
       "dependencies": {
-        "@ledgerhq/cryptoassets": "^13.5.0",
-        "@ledgerhq/live-env": "^2.3.0",
+        "@ledgerhq/cryptoassets-evm-signatures": "^13.5.1",
+        "@ledgerhq/live-env": "^2.4.0",
         "axios": "1.7.7",
         "crypto-js": "4.2.0",
         "ethers": "5.7.2"
       }
     },
-    "node_modules/@ledgerhq/evm-tools/node_modules/@ledgerhq/cryptoassets": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/cryptoassets/-/cryptoassets-13.5.0.tgz",
-      "integrity": "sha512-kdy40ZgcmGTo6sY/aKBJU6dydfV0luvOB5fi9MbJ1iRdy4qoHzfHUTk/z8B5yJRC4WgR1dbhFhKQcfA3lOE0rw==",
-      "dependencies": {
-        "@ledgerhq/live-env": "^2.3.0",
-        "axios": "1.7.7",
-        "bs58check": "^2.1.2",
-        "invariant": "2"
-      }
-    },
     "node_modules/@ledgerhq/hw-app-btc": {
       "version": "6.27.1",
       "license": "Apache-2.0",
@@ -6108,58 +6107,59 @@
       "license": "ISC"
     },
     "node_modules/@ledgerhq/hw-app-eth": {
-      "version": "6.34.3",
-      "license": "Apache-2.0",
+      "version": "6.40.2",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-app-eth/-/hw-app-eth-6.40.2.tgz",
+      "integrity": "sha512-Wt3czShzSzBpvgttX3Fj9Y6n+zdGbqo4TArSysPQQD42yfOArVGFk1ovNPooBkLWj3qWDhVq4J07NIGlrgF8LQ==",
       "dependencies": {
         "@ethersproject/abi": "^5.5.0",
         "@ethersproject/rlp": "^5.5.0",
-        "@ledgerhq/cryptoassets": "^9.11.1",
-        "@ledgerhq/domain-service": "^1.1.8",
-        "@ledgerhq/errors": "^6.14.0",
-        "@ledgerhq/evm-tools": "^1.0.4",
-        "@ledgerhq/hw-transport": "^6.28.8",
-        "@ledgerhq/hw-transport-mocker": "^6.27.19",
-        "@ledgerhq/logs": "^6.10.1",
-        "@ledgerhq/types-live": "^6.38.1",
-        "axios": "^1.3.4",
-        "bignumber.js": "^9.1.1"
+        "@ledgerhq/cryptoassets-evm-signatures": "^13.5.1",
+        "@ledgerhq/domain-service": "^1.2.9",
+        "@ledgerhq/errors": "^6.19.1",
+        "@ledgerhq/evm-tools": "^1.2.4",
+        "@ledgerhq/hw-transport": "^6.31.4",
+        "@ledgerhq/hw-transport-mocker": "^6.29.4",
+        "@ledgerhq/logs": "^6.12.0",
+        "@ledgerhq/types-live": "^6.52.3",
+        "axios": "1.7.7",
+        "bignumber.js": "^9.1.2",
+        "semver": "^7.3.5"
       }
     },
     "node_modules/@ledgerhq/hw-app-eth/node_modules/@ledgerhq/devices": {
-      "version": "8.0.7",
-      "license": "Apache-2.0",
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.4.4.tgz",
+      "integrity": "sha512-sz/ryhe/R687RHtevIE9RlKaV8kkKykUV4k29e7GAVwzHX1gqG+O75cu1NCJUHLbp3eABV5FdvZejqRUlLis9A==",
       "dependencies": {
-        "@ledgerhq/errors": "^6.14.0",
-        "@ledgerhq/logs": "^6.10.1",
-        "rxjs": "6",
+        "@ledgerhq/errors": "^6.19.1",
+        "@ledgerhq/logs": "^6.12.0",
+        "rxjs": "^7.8.1",
         "semver": "^7.3.5"
       }
     },
     "node_modules/@ledgerhq/hw-app-eth/node_modules/@ledgerhq/hw-transport": {
-      "version": "6.28.8",
-      "license": "Apache-2.0",
+      "version": "6.31.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.31.4.tgz",
+      "integrity": "sha512-6c1ir/cXWJm5dCWdq55NPgCJ3UuKuuxRvf//Xs36Bq9BwkV2YaRQhZITAkads83l07NAdR16hkTWqqpwFMaI6A==",
       "dependencies": {
-        "@ledgerhq/devices": "^8.0.7",
-        "@ledgerhq/errors": "^6.14.0",
+        "@ledgerhq/devices": "^8.4.4",
+        "@ledgerhq/errors": "^6.19.1",
+        "@ledgerhq/logs": "^6.12.0",
         "events": "^3.3.0"
       }
     },
-    "node_modules/@ledgerhq/hw-app-eth/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "license": "ISC",
+    "node_modules/@ledgerhq/hw-app-eth/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "tslib": "^2.1.0"
       }
     },
     "node_modules/@ledgerhq/hw-app-eth/node_modules/semver": {
-      "version": "7.5.4",
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -6167,10 +6167,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@ledgerhq/hw-app-eth/node_modules/yallist": {
-      "version": "4.0.0",
-      "license": "ISC"
-    },
     "node_modules/@ledgerhq/hw-transport": {
       "version": "6.27.1",
       "license": "Apache-2.0",
@@ -6181,48 +6177,37 @@
       }
     },
     "node_modules/@ledgerhq/hw-transport-mocker": {
-      "version": "6.28.5",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-mocker/-/hw-transport-mocker-6.28.5.tgz",
-      "integrity": "sha512-NrOoonR5pIQgzCC9HhKaomUtMCDoz42wWP4bjB2v8vh9KKYXQG9T4R5A+I+KGUqYVSCgyI1YW0RM7V2ZhuWdCA==",
+      "version": "6.29.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-mocker/-/hw-transport-mocker-6.29.4.tgz",
+      "integrity": "sha512-CLDIpQ/eqU8qrCYGY9MyHa+oMgqs6PuNkWtqbcaS4AzNx8L/9bv7y8CZwCjxX6oB/2ZEq42RlL6oZ6Ou3oHnoQ==",
       "dependencies": {
-        "@ledgerhq/hw-transport": "^6.30.5",
+        "@ledgerhq/hw-transport": "^6.31.4",
         "@ledgerhq/logs": "^6.12.0",
         "rxjs": "^7.8.1"
       }
     },
     "node_modules/@ledgerhq/hw-transport-mocker/node_modules/@ledgerhq/devices": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.2.2.tgz",
-      "integrity": "sha512-SKahGA4p0mZ3ovypOJ2wa5mUvUkArE3HBrwWKYf+cRs+t/Licp3OJfhj+DHIxP3AfyH2xR6CFFWECYHeKwGsDQ==",
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.4.4.tgz",
+      "integrity": "sha512-sz/ryhe/R687RHtevIE9RlKaV8kkKykUV4k29e7GAVwzHX1gqG+O75cu1NCJUHLbp3eABV5FdvZejqRUlLis9A==",
       "dependencies": {
-        "@ledgerhq/errors": "^6.16.3",
+        "@ledgerhq/errors": "^6.19.1",
         "@ledgerhq/logs": "^6.12.0",
         "rxjs": "^7.8.1",
         "semver": "^7.3.5"
       }
     },
     "node_modules/@ledgerhq/hw-transport-mocker/node_modules/@ledgerhq/hw-transport": {
-      "version": "6.30.5",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.30.5.tgz",
-      "integrity": "sha512-JMl//7BgPBvWxrWyMu82jj6JEYtsQyOyhYtonWNgtxn6KUZWht3gU4gxmLpeIRr+DiS7e50mW7m3GA+EudZmmA==",
+      "version": "6.31.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.31.4.tgz",
+      "integrity": "sha512-6c1ir/cXWJm5dCWdq55NPgCJ3UuKuuxRvf//Xs36Bq9BwkV2YaRQhZITAkads83l07NAdR16hkTWqqpwFMaI6A==",
       "dependencies": {
-        "@ledgerhq/devices": "^8.2.2",
-        "@ledgerhq/errors": "^6.16.3",
+        "@ledgerhq/devices": "^8.4.4",
+        "@ledgerhq/errors": "^6.19.1",
         "@ledgerhq/logs": "^6.12.0",
         "events": "^3.3.0"
       }
     },
-    "node_modules/@ledgerhq/hw-transport-mocker/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@ledgerhq/hw-transport-mocker/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -6232,12 +6217,9 @@
       }
     },
     "node_modules/@ledgerhq/hw-transport-mocker/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -6245,56 +6227,51 @@
         "node": ">=10"
       }
     },
-    "node_modules/@ledgerhq/hw-transport-mocker/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/@ledgerhq/hw-transport-webhid": {
-      "version": "6.27.19",
-      "license": "Apache-2.0",
+      "version": "6.29.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webhid/-/hw-transport-webhid-6.29.4.tgz",
+      "integrity": "sha512-XkF37lcuyg9zVExMyfDQathWly8rRcGac13wgZATBa3nZ+hUzzWr5QVKg1pKCw10izVHGErW/9a4tbb72rUEmQ==",
       "dependencies": {
-        "@ledgerhq/devices": "^8.0.7",
-        "@ledgerhq/errors": "^6.14.0",
-        "@ledgerhq/hw-transport": "^6.28.8",
-        "@ledgerhq/logs": "^6.10.1"
+        "@ledgerhq/devices": "^8.4.4",
+        "@ledgerhq/errors": "^6.19.1",
+        "@ledgerhq/hw-transport": "^6.31.4",
+        "@ledgerhq/logs": "^6.12.0"
       }
     },
     "node_modules/@ledgerhq/hw-transport-webhid/node_modules/@ledgerhq/devices": {
-      "version": "8.0.7",
-      "license": "Apache-2.0",
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.4.4.tgz",
+      "integrity": "sha512-sz/ryhe/R687RHtevIE9RlKaV8kkKykUV4k29e7GAVwzHX1gqG+O75cu1NCJUHLbp3eABV5FdvZejqRUlLis9A==",
       "dependencies": {
-        "@ledgerhq/errors": "^6.14.0",
-        "@ledgerhq/logs": "^6.10.1",
-        "rxjs": "6",
+        "@ledgerhq/errors": "^6.19.1",
+        "@ledgerhq/logs": "^6.12.0",
+        "rxjs": "^7.8.1",
         "semver": "^7.3.5"
       }
     },
     "node_modules/@ledgerhq/hw-transport-webhid/node_modules/@ledgerhq/hw-transport": {
-      "version": "6.28.8",
-      "license": "Apache-2.0",
+      "version": "6.31.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.31.4.tgz",
+      "integrity": "sha512-6c1ir/cXWJm5dCWdq55NPgCJ3UuKuuxRvf//Xs36Bq9BwkV2YaRQhZITAkads83l07NAdR16hkTWqqpwFMaI6A==",
       "dependencies": {
-        "@ledgerhq/devices": "^8.0.7",
-        "@ledgerhq/errors": "^6.14.0",
+        "@ledgerhq/devices": "^8.4.4",
+        "@ledgerhq/errors": "^6.19.1",
+        "@ledgerhq/logs": "^6.12.0",
         "events": "^3.3.0"
       }
     },
-    "node_modules/@ledgerhq/hw-transport-webhid/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "license": "ISC",
+    "node_modules/@ledgerhq/hw-transport-webhid/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "tslib": "^2.1.0"
       }
     },
     "node_modules/@ledgerhq/hw-transport-webhid/node_modules/semver": {
-      "version": "7.5.4",
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -6302,10 +6279,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@ledgerhq/hw-transport-webhid/node_modules/yallist": {
-      "version": "4.0.0",
-      "license": "ISC"
-    },
     "node_modules/@ledgerhq/hw-transport-webusb": {
       "version": "6.27.1",
       "license": "Apache-2.0",
@@ -6317,9 +6290,9 @@
       }
     },
     "node_modules/@ledgerhq/live-env": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/live-env/-/live-env-2.3.0.tgz",
-      "integrity": "sha512-VWZso7/LdxxlaQqJ1tI44yrAadiJ78VUyQomlg7YY1eNI12+3xzWK8Rfs/aZEIQYp5q6ZBgbbDe7hmTtcAd4KQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/live-env/-/live-env-2.4.0.tgz",
+      "integrity": "sha512-hXkaGPdMZUHbbjfezMKfqUa8LA5gnXfYsnGdQcXorRhdRBqc7w5xtYSlc53Vos88mbDij7iL7NrhDXF//IFd5Q==",
       "dependencies": {
         "rxjs": "^7.8.1",
         "utility-types": "^3.10.0"
@@ -6339,11 +6312,20 @@
       "integrity": "sha512-ExDoj1QV5eC6TEbMdLUMMk9cfvNKhhv5gXol4SmULRVCx/3iyCPhJ74nsb3S0Vb+/f+XujBEj3vQn5+cwS0fNA=="
     },
     "node_modules/@ledgerhq/types-live": {
-      "version": "6.38.1",
-      "license": "Apache-2.0",
+      "version": "6.52.3",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/types-live/-/types-live-6.52.3.tgz",
+      "integrity": "sha512-llIY2MPNedMFb+sm5T7o5ffbpR+avucVpksWMY6NcArKja9pwK24rJeZyJXP7HDzS7rcTQjBNFLqrjX2hnaZyA==",
+      "dependencies": {
+        "bignumber.js": "^9.1.2",
+        "rxjs": "^7.8.1"
+      }
+    },
+    "node_modules/@ledgerhq/types-live/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dependencies": {
-        "bignumber.js": "^9.1.1",
-        "rxjs": "6"
+        "tslib": "^2.1.0"
       }
     },
     "node_modules/@leichtgewicht/ip-codec": {
@@ -6990,22 +6972,19 @@
       "dependencies": {
         "@rsksmart/ipfs-cpinner-client-types": "^0.1.3",
         "@rsksmart/mock-web3-provider": "^1.0.1",
-        "@rsksmart/rlogin-dpath": "^1.0.3",
-        "@rsksmart/vc-json-schemas-parser": "^1.0.1",
-        "@types/styled-components": "5.1.30",
-        "assert": "^2.1.0",
-        "axios": "^1.6.8",
-        "bignumber.js": "^9.1.2",
+        "@rsksmart/rlogin-dpath": "^1.0.1",
+        "@rsksmart/vc-json-schemas-parser": "^1.0.0",
+        "@types/styled-components": "^5.1.3",
+        "assert": "^2.0.0",
+        "axios": "^0.21.1",
         "buffer": "^6.0.3",
-        "did-resolver": "^4.1.0",
-        "ethr-did-resolver": "^10.1.5",
+        "ethr-did-resolver": "^3.0.2",
         "i18next": "^20.3.5",
         "i18next-browser-languagedetector": "^6.1.2",
         "react-i18next": "^11.11.4",
         "stream-browserify": "^3.0.0",
-        "styled-components": "^5.3.11",
-        "web3-utils": "^1.5.3",
-        "web3modal": "1.9.5"
+        "web3-eth-personal": "^1.3.0",
+        "web3modal": "^1.9.1"
       }
     },
     "node_modules/@rsksmart/rlogin-dpath": {
@@ -7022,22 +7001,168 @@
       }
     },
     "node_modules/@rsksmart/rlogin-ledger-provider": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rsksmart/rlogin-ledger-provider/-/rlogin-ledger-provider-1.0.3.tgz",
-      "integrity": "sha512-BJzxY8LJRVmFACPwjvf3XKUzRaWtN2qTKutj2m5nENxq6ZftkHWkq0QQ+ZszCHaN5zVF3o4MvOmNDNNHvfSGzw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@rsksmart/rlogin-ledger-provider/-/rlogin-ledger-provider-1.0.4.tgz",
+      "integrity": "sha512-HrZjUXpEvBIomJO/IEeLmEU54IJB2Tgs5f/MtRSgRs98+Xhf7jrBLKSsISEiwOdZblDCV5+X0mf6eiJgVMrqcg==",
       "dependencies": {
-        "@ethereumjs/tx": "^3.3.0",
-        "@ledgerhq/hw-app-eth": "^6.2.0",
-        "@ledgerhq/hw-transport-webhid": "^6.4.1",
-        "@ledgerhq/hw-transport-webusb": "^6.3.0",
+        "@ethereumjs/tx": "4.1",
+        "@ledgerhq/hw-app-eth": "^6.35.5",
+        "@ledgerhq/hw-transport-webhid": "^6.28.4",
+        "@ledgerhq/hw-transport-webusb": "^6.28.4",
         "@rsksmart/rlogin-dpath": "^1.0.3",
         "@rsksmart/rlogin-eip1193-proxy-subprovider": "^1.0.2",
         "@rsksmart/rlogin-transactions": "^1.0.2",
         "@rsksmart/rsk-utils": "^1.1.0",
-        "assert": "^2.0.0",
-        "bn.js": "^5.2.0",
+        "assert": "^2.1.0",
+        "bn.js": "^5.2.1",
+        "browserify-zlib": "^0.2.0",
         "buffer": "^6.0.3",
-        "stream-browserify": "^3.0.0"
+        "https-browserify": "^1.0.0",
+        "stream-browserify": "^3.0.0",
+        "stream-http": "^3.2.0",
+        "url": "^0.11.3"
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/@ethereumjs/common": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-3.2.0.tgz",
+      "integrity": "sha512-pksvzI0VyLgmuEF2FA/JR/4/y6hcPq8OUail3/AvycBaW1d5VSauOZzqGvJ3RTmR4MU35lWE8KseKOsEhrFRBA==",
+      "dependencies": {
+        "@ethereumjs/util": "^8.1.0",
+        "crc-32": "^1.2.0"
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/@ethereumjs/tx": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-4.1.2.tgz",
+      "integrity": "sha512-PWWyO9lAFOiLwk7nB9OQisoJUsuvMz2PN2v4/ILbBpzamC5Ug79OddVq9r4rKvIDLPY+bn4NFerxBJg29+sjaA==",
+      "dependencies": {
+        "@chainsafe/ssz": "^0.11.1",
+        "@ethereumjs/common": "^3.1.2",
+        "@ethereumjs/rlp": "^4.0.1",
+        "@ethereumjs/util": "^8.0.6",
+        "ethereum-cryptography": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "c-kzg": "^1.0.8"
+      },
+      "peerDependenciesMeta": {
+        "c-kzg": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/@ledgerhq/devices": {
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.4.4.tgz",
+      "integrity": "sha512-sz/ryhe/R687RHtevIE9RlKaV8kkKykUV4k29e7GAVwzHX1gqG+O75cu1NCJUHLbp3eABV5FdvZejqRUlLis9A==",
+      "dependencies": {
+        "@ledgerhq/errors": "^6.19.1",
+        "@ledgerhq/logs": "^6.12.0",
+        "rxjs": "^7.8.1",
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/@ledgerhq/hw-transport": {
+      "version": "6.31.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.31.4.tgz",
+      "integrity": "sha512-6c1ir/cXWJm5dCWdq55NPgCJ3UuKuuxRvf//Xs36Bq9BwkV2YaRQhZITAkads83l07NAdR16hkTWqqpwFMaI6A==",
+      "dependencies": {
+        "@ledgerhq/devices": "^8.4.4",
+        "@ledgerhq/errors": "^6.19.1",
+        "@ledgerhq/logs": "^6.12.0",
+        "events": "^3.3.0"
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/@ledgerhq/hw-transport-webusb": {
+      "version": "6.29.4",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.29.4.tgz",
+      "integrity": "sha512-HoGF1LlBT9HEGBQy2XeCHrFdv/FEOZU0+J+yfKcgAQIAiASr2MLvdzwoJbUS8h6Gn+vc+/BjzBSO3JNn7Loqbg==",
+      "dependencies": {
+        "@ledgerhq/devices": "^8.4.4",
+        "@ledgerhq/errors": "^6.19.1",
+        "@ledgerhq/hw-transport": "^6.31.4",
+        "@ledgerhq/logs": "^6.12.0"
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/@noble/curves": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
+      "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
+      "dependencies": {
+        "@noble/hashes": "1.4.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/@noble/hashes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/@scure/bip32": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz",
+      "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==",
+      "dependencies": {
+        "@noble/curves": "~1.4.0",
+        "@noble/hashes": "~1.4.0",
+        "@scure/base": "~1.1.6"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/@scure/bip39": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz",
+      "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==",
+      "dependencies": {
+        "@noble/hashes": "~1.4.0",
+        "@scure/base": "~1.1.6"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/ethereum-cryptography": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz",
+      "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==",
+      "dependencies": {
+        "@noble/curves": "1.4.2",
+        "@noble/hashes": "1.4.0",
+        "@scure/bip32": "1.4.0",
+        "@scure/bip39": "1.3.0"
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@rsksmart/rlogin-ledger-provider/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/@rsksmart/rlogin-transactions": {
@@ -7063,6 +7188,13 @@
         "stream-browserify": "^3.0.0"
       }
     },
+    "node_modules/@rsksmart/rlogin/node_modules/axios": {
+      "version": "0.21.4",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.14.0"
+      }
+    },
     "node_modules/@rsksmart/rsk-precompiled-abis": {
       "version": "6.0.0-ARROWHEAD",
       "resolved": "https://registry.npmjs.org/@rsksmart/rsk-precompiled-abis/-/rsk-precompiled-abis-6.0.0-ARROWHEAD.tgz",
@@ -7080,48 +7212,6 @@
       "version": "1.0.1",
       "license": "ISC"
     },
-    "node_modules/@sats-connect/core": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.8.tgz",
-      "integrity": "sha512-vb7drnd8lFfO4ahCzaVAFkX1eHF1J7jheJl2V/JuuJd5f1sy6nHeNzKMp1zmiuql8uNwe0Sx1WrK1I+4tUmDHg==",
-      "dependencies": {
-        "axios": "1.6.8",
-        "bitcoin-address-validation": "2.2.3",
-        "buffer": "6.0.3",
-        "jsontokens": "4.0.1",
-        "lodash.omit": "4.5.0"
-      }
-    },
-    "node_modules/@sats-connect/core/node_modules/axios": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
-      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
-    "node_modules/@sats-connect/core/node_modules/bech32": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz",
-      "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="
-    },
-    "node_modules/@sats-connect/core/node_modules/bitcoin-address-validation": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/bitcoin-address-validation/-/bitcoin-address-validation-2.2.3.tgz",
-      "integrity": "sha512-1uGCGl26Ye8JG5qcExtFLQfuib6qEZWNDo1ZlLlwp/z7ygUFby3IxolgEfgMGaC+LG9csbVASLcH8fRLv7DIOg==",
-      "dependencies": {
-        "base58-js": "^1.0.0",
-        "bech32": "^2.0.0",
-        "sha256-uint8array": "^0.10.3"
-      }
-    },
-    "node_modules/@sats-connect/ui": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/@sats-connect/ui/-/ui-0.0.6.tgz",
-      "integrity": "sha512-H3bFFhr9CcY1oNosNi/QJszmMHSht4U19bUWfM3vzayAKgV4ebY6iUnRK5g3p2rVLLWVzlpaw1J9m+7JWwyBfA=="
-    },
     "node_modules/@scure/base": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.6.tgz",
@@ -8105,9 +8195,10 @@
       }
     },
     "node_modules/@types/chai": {
-      "version": "4.3.5",
-      "dev": true,
-      "license": "MIT"
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.0.0.tgz",
+      "integrity": "sha512-+DwhEHAaFPPdJ2ral3kNHFQXnTfscEEFsUxzD+d7nlcLrFK23JtNjH71RGasTcHb88b4vVi4mTyfpf8u2L8bdA==",
+      "dev": true
     },
     "node_modules/@types/connect": {
       "version": "3.4.35",
@@ -8127,18 +8218,26 @@
     },
     "node_modules/@types/eslint": {
       "version": "8.44.2",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.4",
+      "devOptional": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-      "devOptional": true
+      "version": "1.0.1",
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/@types/express": {
       "version": "4.17.17",
@@ -8171,9 +8270,8 @@
       }
     },
     "node_modules/@types/hoist-non-react-statics": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
-      "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==",
+      "version": "3.3.1",
+      "license": "MIT",
       "dependencies": {
         "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
@@ -8333,9 +8431,8 @@
       "license": "MIT"
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.13",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz",
-      "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA=="
+      "version": "15.7.5",
+      "license": "MIT"
     },
     "node_modules/@types/qs": {
       "version": "6.9.7",
@@ -8348,11 +8445,11 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "18.3.10",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.10.tgz",
-      "integrity": "sha512-02sAAlBnP39JgXwkAq3PeU9DVaaGpZyF3MGcC0MKgQVkZor5IiiDAipVaxQHtDJAmO4GIy/rVBy/LzVj76Cyqg==",
+      "version": "18.2.21",
+      "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
+        "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
@@ -8369,6 +8466,10 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/scheduler": {
+      "version": "0.16.3",
+      "license": "MIT"
+    },
     "node_modules/@types/secp256k1": {
       "version": "4.0.3",
       "license": "MIT",
@@ -8444,9 +8545,8 @@
       "license": "MIT"
     },
     "node_modules/@types/styled-components": {
-      "version": "5.1.30",
-      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.30.tgz",
-      "integrity": "sha512-xxJqw0s1myRTgrzHgG5tKHS9hK+KNhjbKMXDWlHRo9eDNVVUqf147QUGYUqwyCDkFyGr2pi1qJKFMEy0ACZb0A==",
+      "version": "5.1.26",
+      "license": "MIT",
       "dependencies": {
         "@types/hoist-non-react-statics": "*",
         "@types/react": "*",
@@ -8458,8 +8558,9 @@
       "license": "MIT"
     },
     "node_modules/@types/w3c-web-usb": {
-      "version": "1.0.6",
-      "license": "MIT"
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@types/w3c-web-usb/-/w3c-web-usb-1.0.10.tgz",
+      "integrity": "sha512-CHgUI5kTc/QLMP8hODUHhge0D4vx+9UiAwIGiT0sTy/B2XpdX1U5rJt6JSISgr6ikRT7vxV9EVAFeYZqUnl1gQ=="
     },
     "node_modules/@types/web": {
       "version": "0.0.138",
@@ -10009,10 +10110,9 @@
       }
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "version": "1.11.6",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
@@ -10020,27 +10120,23 @@
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
-      "devOptional": true
+      "version": "1.11.6",
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.6",
         "@webassemblyjs/helper-api-error": "1.11.6",
@@ -10049,69 +10145,62 @@
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "version": "1.11.6",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
+        "@webassemblyjs/wasm-gen": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "devOptional": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "version": "1.11.6",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "version": "1.11.6",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
         "@webassemblyjs/ieee754": "1.11.6",
         "@webassemblyjs/leb128": "1.11.6",
@@ -10119,24 +10208,22 @@
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "version": "1.11.6",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "version": "1.11.6",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-api-error": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
         "@webassemblyjs/ieee754": "1.11.6",
@@ -10145,12 +10232,11 @@
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "version": "1.11.6",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -10164,15 +10250,13 @@
     },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "Apache-2.0"
     },
     "node_modules/abab": {
       "version": "2.0.6",
@@ -10255,11 +10339,10 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/acorn-import-attributes": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+    "node_modules/acorn-import-assertions": {
+      "version": "1.9.0",
       "devOptional": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^8"
       }
@@ -10674,11 +10757,12 @@
       }
     },
     "node_modules/assertion-error": {
-      "version": "1.1.0",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">=12"
       }
     },
     "node_modules/ast-types": {
@@ -11025,8 +11109,7 @@
     },
     "node_modules/babel-plugin-styled-components": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz",
-      "integrity": "sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-module-imports": "^7.22.5",
@@ -11185,14 +11268,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/base58-js": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/base58-js/-/base58-js-1.0.5.tgz",
-      "integrity": "sha512-LkkAPP8Zu+c0SVNRTRVDyMfKVORThX+rCViget00xdgLRrKkClCTz1T7cIrpr69ShwV5XJuuoZvMvJ43yURwkA==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "funding": [
@@ -11465,9 +11540,9 @@
       "license": "MIT"
     },
     "node_modules/body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
       "dev": true,
       "dependencies": {
         "bytes": "3.1.2",
@@ -11478,7 +11553,7 @@
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.13.0",
+        "qs": "6.11.0",
         "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
@@ -11503,6 +11578,21 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/body-parser/node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/bonjour-service": {
       "version": "1.1.1",
       "dev": true,
@@ -11649,6 +11739,14 @@
         "node": ">= 4"
       }
     },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
     "node_modules/browserslist": {
       "version": "4.21.10",
       "funding": [
@@ -11808,9 +11906,8 @@
     },
     "node_modules/bytes": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -11987,8 +12084,7 @@
     },
     "node_modules/camelize": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
-      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -12044,20 +12140,19 @@
       }
     },
     "node_modules/chai": {
-      "version": "4.3.8",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.2.tgz",
+      "integrity": "sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^4.1.2",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
       }
     },
     "node_modules/chalk": {
@@ -12090,11 +12185,12 @@
       }
     },
     "node_modules/check-error": {
-      "version": "1.0.2",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">= 16"
       }
     },
     "node_modules/checkpoint-store": {
@@ -12693,9 +12789,8 @@
     },
     "node_modules/content-type": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -12705,9 +12800,9 @@
       "license": "MIT"
     },
     "node_modules/cookie": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -12917,8 +13012,7 @@
     },
     "node_modules/css-color-keywords": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
+      "license": "ISC",
       "engines": {
         "node": ">=4"
       }
@@ -13092,8 +13186,7 @@
     },
     "node_modules/css-to-react-native": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
-      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
+      "license": "MIT",
       "dependencies": {
         "camelize": "^1.0.0",
         "css-color-keywords": "^1.0.0",
@@ -13549,12 +13642,10 @@
       "license": "MIT"
     },
     "node_modules/deep-eql": {
-      "version": "4.1.3",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
       "engines": {
         "node": ">=6"
       }
@@ -13812,9 +13903,8 @@
       "license": "MIT"
     },
     "node_modules/did-resolver": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-4.1.0.tgz",
-      "integrity": "sha512-S6fWHvCXkZg2IhS4RcVHxwuyVejPR7c+a4Go0xbQ9ps5kILa8viiYQgrM4gfTyeTjJ0ekgJH9gk/BawTpmkbZA=="
+      "version": "2.1.2",
+      "license": "Apache-2.0"
     },
     "node_modules/diff": {
       "version": "5.1.0",
@@ -14136,15 +14226,17 @@
     },
     "node_modules/eip55": {
       "version": "2.1.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/eip55/-/eip55-2.1.1.tgz",
+      "integrity": "sha512-WcagVAmNu2Ww2cDUfzuWVntYwFxbvZ5MvIyLZpMjTTkjD6sCvkGOiS86jTppzu9/gWsc8isLHAeMBWK02OnZmA==",
       "dependencies": {
         "keccak": "^3.0.3"
       }
     },
     "node_modules/eip55/node_modules/keccak": {
-      "version": "3.0.3",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.4.tgz",
+      "integrity": "sha512-3vKuW0jV8J3XNTzvfyicFR5qvxrSAGl7KIhvgOu5cmWwM7tZRj3fMbj/pfIf4be7aznbc+prBWGjywox/g2Y6Q==",
       "hasInstallScript": true,
-      "license": "MIT",
       "dependencies": {
         "node-addon-api": "^2.0.0",
         "node-gyp-build": "^4.2.0",
@@ -14230,7 +14322,6 @@
     "node_modules/encodeurl": {
       "version": "1.0.2",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -15882,6 +15973,71 @@
         "@ethersproject/wordlists": "5.7.0"
       }
     },
+    "node_modules/ethjs-abi": {
+      "version": "0.2.1",
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "4.11.6",
+        "js-sha3": "0.5.5",
+        "number-to-bn": "1.7.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/ethjs-abi/node_modules/bn.js": {
+      "version": "4.11.6",
+      "license": "MIT"
+    },
+    "node_modules/ethjs-abi/node_modules/js-sha3": {
+      "version": "0.5.5",
+      "license": "MIT"
+    },
+    "node_modules/ethjs-contract": {
+      "version": "0.2.3",
+      "license": "MIT",
+      "dependencies": {
+        "babel-runtime": "^6.26.0",
+        "ethjs-abi": "0.2.0",
+        "ethjs-filter": "0.1.8",
+        "ethjs-util": "0.1.3",
+        "js-sha3": "0.5.5"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/ethjs-contract/node_modules/bn.js": {
+      "version": "4.11.6",
+      "license": "MIT"
+    },
+    "node_modules/ethjs-contract/node_modules/ethjs-abi": {
+      "version": "0.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "4.11.6",
+        "js-sha3": "0.5.5",
+        "number-to-bn": "1.7.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/ethjs-contract/node_modules/js-sha3": {
+      "version": "0.5.5",
+      "license": "MIT"
+    },
+    "node_modules/ethjs-filter": {
+      "version": "0.1.8",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
     "node_modules/ethjs-format": {
       "version": "0.2.7",
       "license": "MIT",
@@ -15970,97 +16126,23 @@
         "npm": ">=3"
       }
     },
-    "node_modules/ethr-did-resolver": {
-      "version": "10.1.10",
-      "resolved": "https://registry.npmjs.org/ethr-did-resolver/-/ethr-did-resolver-10.1.10.tgz",
-      "integrity": "sha512-4o1h2I1zMzLTTAhg03z30ZJzJ33LaXZMel9X5/Avrq1ByAvnXUBShrPXeaHYWBP7qR9SY2QEAdhozXVs0cWUbg==",
-      "dependencies": {
-        "did-resolver": "^4.1.0",
-        "ethers": "^6.8.1"
-      }
-    },
-    "node_modules/ethr-did-resolver/node_modules/@noble/curves": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz",
-      "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==",
-      "dependencies": {
-        "@noble/hashes": "1.3.2"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/ethr-did-resolver/node_modules/@noble/hashes": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz",
-      "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==",
-      "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/ethr-did-resolver/node_modules/@types/node": {
-      "version": "18.15.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz",
-      "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q=="
-    },
-    "node_modules/ethr-did-resolver/node_modules/aes-js": {
-      "version": "4.0.0-beta.5",
-      "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz",
-      "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q=="
+    "node_modules/ethr-did-registry": {
+      "version": "0.0.3",
+      "license": "Apache-2.0"
     },
-    "node_modules/ethr-did-resolver/node_modules/ethers": {
-      "version": "6.13.2",
-      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.13.2.tgz",
-      "integrity": "sha512-9VkriTTed+/27BGuY1s0hf441kqwHJ1wtN2edksEtiRvXx+soxRX3iSXTfFqq2+YwrOqbDoTHjIhQnjJRlzKmg==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/ethers-io/"
-        },
-        {
-          "type": "individual",
-          "url": "https://www.buymeacoffee.com/ricmoo"
-        }
-      ],
+    "node_modules/ethr-did-resolver": {
+      "version": "3.0.3",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@adraffy/ens-normalize": "1.10.1",
-        "@noble/curves": "1.2.0",
-        "@noble/hashes": "1.3.2",
-        "@types/node": "18.15.13",
-        "aes-js": "4.0.0-beta.5",
-        "tslib": "2.4.0",
-        "ws": "8.17.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/ethr-did-resolver/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
-    "node_modules/ethr-did-resolver/node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+        "buffer": "^6.0.0",
+        "did-resolver": "2.1.2",
+        "elliptic": "^6.5.3",
+        "ethjs-abi": "^0.2.1",
+        "ethjs-contract": "^0.2.0",
+        "ethjs-provider-http": "^0.1.6",
+        "ethjs-query": "^0.3.5",
+        "ethr-did-registry": "^0.0.3",
+        "js-sha3": "^0.8.0"
       }
     },
     "node_modules/event-emitter": {
@@ -16682,37 +16764,37 @@
       }
     },
     "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.3",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.7.1",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.3.1",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.3",
+        "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.13.0",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.19.0",
-        "serve-static": "1.16.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -16732,15 +16814,6 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/express/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -16748,50 +16821,25 @@
       "dev": true
     },
     "node_modules/express/node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
-      "dev": true
+      "version": "0.1.7",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/express/node_modules/send": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+    "node_modules/express/node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
       "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
+        "side-channel": "^1.0.4"
       },
       "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/express/node_modules/send/node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/express/node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
     "node_modules/ext": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
@@ -17139,13 +17187,12 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+      "version": "1.2.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -17158,27 +17205,16 @@
     },
     "node_modules/finalhandler/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
-    "node_modules/finalhandler/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/find-cache-dir": {
       "version": "3.3.2",
@@ -17747,15 +17783,6 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/get-func-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -18214,8 +18241,7 @@
     },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "react-is": "^16.7.0"
       }
@@ -22586,11 +22612,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.omit": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
-      "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg=="
-    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "dev": true,
@@ -22829,12 +22850,10 @@
       }
     },
     "node_modules/loupe": {
-      "version": "2.3.6",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-func-name": "^2.0.0"
-      }
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.2.tgz",
+      "integrity": "sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==",
+      "dev": true
     },
     "node_modules/lower-case": {
       "version": "2.0.2",
@@ -23015,9 +23034,8 @@
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -23068,13 +23086,9 @@
       "license": "MIT"
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "version": "1.0.1",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "license": "MIT"
     },
     "node_modules/merge-source-map": {
       "version": "1.1.0",
@@ -23176,11 +23190,10 @@
       "license": "MIT"
     },
     "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "version": "4.0.5",
+      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.3",
+        "braces": "^3.0.2",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -24357,6 +24370,11 @@
         "node": ">=6"
       }
     },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+    },
     "node_modules/param-case": {
       "version": "3.0.4",
       "dev": true,
@@ -24491,10 +24509,9 @@
       "license": "MIT"
     },
     "node_modules/path-to-regexp": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
-      "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
+      "version": "1.8.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isarray": "0.0.1"
       }
@@ -24512,11 +24529,12 @@
       }
     },
     "node_modules/pathval": {
-      "version": "1.1.1",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">= 14.16"
       }
     },
     "node_modules/pbkdf2": {
@@ -25807,28 +25825,28 @@
       }
     },
     "node_modules/react": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
-      "peer": true,
+      "version": "16.14.0",
+      "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
-      "peer": true,
+      "version": "16.14.0",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.19.1"
       },
       "peerDependencies": {
-        "react": "^18.3.1"
+        "react": "^16.14.0"
       }
     },
     "node_modules/react-i18next": {
@@ -26608,84 +26626,6 @@
         }
       }
     },
-    "node_modules/sats-connect": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/sats-connect/-/sats-connect-2.3.1.tgz",
-      "integrity": "sha512-3KzqRO5KVBlge7Q4a/L828SfCkFD+M4MVdtgJZS+L+oHiDYoXlLkvnu3almh9Ynhcm0HnsGmVH1pKVL0lonjyQ==",
-      "dependencies": {
-        "@sats-connect/core": "0.0.8",
-        "@sats-connect/make-default-provider-config": "0.0.4",
-        "@sats-connect/ui": "0.0.6"
-      }
-    },
-    "node_modules/sats-connect/node_modules/@sats-connect/make-default-provider-config": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/@sats-connect/make-default-provider-config/-/make-default-provider-config-0.0.4.tgz",
-      "integrity": "sha512-PsLzg1hV3FxMXUp9XrOUmDJgbuyR4VDHq/7mh1O1CtC3dDZQnJFa+Ue43duPMmUaRGinuVKtS2hnMhPLyURdGA==",
-      "dependencies": {
-        "@sats-connect/core": "0.0.7",
-        "@sats-connect/ui": "0.0.5-c661c02",
-        "bowser": "2.11.0"
-      },
-      "peerDependencies": {
-        "typescript": "5.4.4"
-      }
-    },
-    "node_modules/sats-connect/node_modules/@sats-connect/make-default-provider-config/node_modules/@sats-connect/core": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.7.tgz",
-      "integrity": "sha512-4m5amq+orHDbqLqCRWojvDQigKAys33Ntwc7U5xNtFeib4j+DpYz6lVAL/s3cay1kq03WUZ+Gil3l5rv+5bQWQ==",
-      "dependencies": {
-        "axios": "1.6.8",
-        "bitcoin-address-validation": "2.2.3",
-        "buffer": "6.0.3",
-        "jsontokens": "4.0.1",
-        "lodash.omit": "4.5.0"
-      }
-    },
-    "node_modules/sats-connect/node_modules/@sats-connect/make-default-provider-config/node_modules/@sats-connect/ui": {
-      "version": "0.0.5-c661c02",
-      "resolved": "https://registry.npmjs.org/@sats-connect/ui/-/ui-0.0.5-c661c02.tgz",
-      "integrity": "sha512-6MUXFDGTapBhZAxb6deAdqKuB64GOe6k927gGww5JYwVnOUCaHGDcfaZ/lwexzYL45u8RJof12I4np7MgS+Bwg=="
-    },
-    "node_modules/sats-connect/node_modules/axios": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
-      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
-    "node_modules/sats-connect/node_modules/bech32": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz",
-      "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="
-    },
-    "node_modules/sats-connect/node_modules/bitcoin-address-validation": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/bitcoin-address-validation/-/bitcoin-address-validation-2.2.3.tgz",
-      "integrity": "sha512-1uGCGl26Ye8JG5qcExtFLQfuib6qEZWNDo1ZlLlwp/z7ygUFby3IxolgEfgMGaC+LG9csbVASLcH8fRLv7DIOg==",
-      "dependencies": {
-        "base58-js": "^1.0.0",
-        "bech32": "^2.0.0",
-        "sha256-uint8array": "^0.10.3"
-      }
-    },
-    "node_modules/sats-connect/node_modules/typescript": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.4.tgz",
-      "integrity": "sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==",
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
     "node_modules/sax": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
@@ -26702,12 +26642,11 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "peer": true,
+      "version": "0.19.1",
+      "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
       }
     },
     "node_modules/schema-inspector": {
@@ -26740,18 +26679,44 @@
       "license": "MIT"
     },
     "node_modules/secp256k1": {
-      "version": "4.0.3",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.4.tgz",
+      "integrity": "sha512-6JfvwvjUOn8F/jUoBY2Q1v5WY5XS+rj8qSe0v8Y4ezH4InLgTEeOOPQsRll9OV429Pvo6BCHGavIyJfr3TAhsw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "elliptic": "^6.5.4",
-        "node-addon-api": "^2.0.0",
+        "elliptic": "^6.5.7",
+        "node-addon-api": "^5.0.0",
         "node-gyp-build": "^4.2.0"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/secp256k1/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/secp256k1/node_modules/elliptic": {
+      "version": "6.5.7",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
+      "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==",
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       }
     },
+    "node_modules/secp256k1/node_modules/node-addon-api": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
+      "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA=="
+    },
     "node_modules/seek-bzip": {
       "version": "1.0.6",
       "dev": true,
@@ -26808,7 +26773,6 @@
     "node_modules/send": {
       "version": "0.18.0",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -26831,20 +26795,17 @@
     "node_modules/send/node_modules/debug": {
       "version": "2.6.9",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.3",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/serialize-error": {
       "version": "7.0.1",
@@ -26952,76 +26913,18 @@
       }
     },
     "node_modules/serve-static": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
-      "dependencies": {
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.19.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-static/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/serve-static/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/serve-static/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/serve-static/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/serve-static/node_modules/send": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "version": "1.15.0",
+      "license": "MIT",
       "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/serve-static/node_modules/send/node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "license": "ISC"
@@ -27082,11 +26985,6 @@
         "sha.js": "bin.js"
       }
     },
-    "node_modules/sha256-uint8array": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/sha256-uint8array/-/sha256-uint8array-0.10.7.tgz",
-      "integrity": "sha512-1Q6JQU4tX9NqsDGodej6pkrUVQVNapLZnvkwIhddH/JqzBZF1fSaxSWNY6sziXBE8aEa2twtGkXUrwzGeZCMpQ=="
-    },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
       "license": "MIT",
@@ -27106,8 +27004,7 @@
     },
     "node_modules/shallowequal": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
+      "license": "MIT"
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
@@ -27781,8 +27678,7 @@
     },
     "node_modules/styled-components": {
       "version": "5.3.11",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.11.tgz",
-      "integrity": "sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/traverse": "^7.4.5",
@@ -28280,10 +28176,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.34.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.34.0.tgz",
-      "integrity": "sha512-y5NUX+U9HhVsK/zihZwoq4r9dICLyV2jXGOriDAVOeKhq3LKVjgJbGO90FisozXLlJfvjHqgckGmJFBb9KYoWQ==",
+      "version": "5.19.2",
       "devOptional": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -28298,16 +28193,15 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
-      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "version": "5.3.9",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.20",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.1",
-        "terser": "^5.26.0"
+        "terser": "^5.16.8"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -28944,9 +28838,8 @@
     },
     "node_modules/type-is": {
       "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
@@ -29369,11 +29262,15 @@
       }
     },
     "node_modules/url": {
-      "version": "0.11.1",
-      "license": "MIT",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
+      "integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
       "dependencies": {
         "punycode": "^1.4.1",
-        "qs": "^6.11.0"
+        "qs": "^6.12.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/url-join": {
@@ -29870,9 +29767,9 @@
       "license": "ISC"
     },
     "node_modules/vuetify": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.5.17.tgz",
-      "integrity": "sha512-/Veklxxyu/l63q7QQOqJZeZukIKI2sBxY7FKMDcNup2KSGMjyjT+oYXy1DOdl7wlU3c3fKGQMFHqVWb0HDsyDw==",
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.7.3.tgz",
+      "integrity": "sha512-bpuvBpZl1/+nLlXDgdVXekvMNR6W/ciaoa8CYlpeAzAARbY8zUFSoBq05JlLhkIHI58AnzKVy4c09d0OtfYAPg==",
       "engines": {
         "node": "^12.20 || >=14.13"
       },
@@ -29884,7 +29781,6 @@
         "typescript": ">=4.7",
         "vite-plugin-vuetify": ">=1.0.0",
         "vue": "^3.3.0",
-        "vue-i18n": "^9.0.0",
         "webpack-plugin-vuetify": ">=2.0.0"
       },
       "peerDependenciesMeta": {
@@ -29894,9 +29790,6 @@
         "vite-plugin-vuetify": {
           "optional": true
         },
-        "vue-i18n": {
-          "optional": true
-        },
         "webpack-plugin-vuetify": {
           "optional": true
         }
@@ -29938,10 +29831,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+      "version": "2.4.0",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -30517,6 +30409,26 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/web3-eth-personal": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.10.3.tgz",
+      "integrity": "sha512-avrQ6yWdADIvuNQcFZXmGLCEzulQa76hUOuVywN7O3cklB4nFc/Gp3yTvD3bOAaE7DhjLQfhUTCzXL7WMxVTsw==",
+      "dependencies": {
+        "@types/node": "^12.12.6",
+        "web3-core": "1.10.3",
+        "web3-core-helpers": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-net": "1.10.3",
+        "web3-utils": "1.10.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-personal/node_modules/@types/node": {
+      "version": "12.20.55",
+      "license": "MIT"
+    },
     "node_modules/web3-eth/node_modules/@noble/curves": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz",
@@ -30736,6 +30648,19 @@
         }
       }
     },
+    "node_modules/web3-net": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.10.3.tgz",
+      "integrity": "sha512-IoSr33235qVoI1vtKssPUigJU9Fc/Ph0T9CgRi15sx+itysmvtlmXMNoyd6Xrgm9LuM4CIhxz7yDzH93B79IFg==",
+      "dependencies": {
+        "web3-core": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-utils": "1.10.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/web3-provider-engine": {
       "version": "16.0.1",
       "license": "MIT",
@@ -31464,10 +31389,8 @@
       }
     },
     "node_modules/web3modal": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/web3modal/-/web3modal-1.9.5.tgz",
-      "integrity": "sha512-L5ME6zgoaCDa+T66skW9WpxGOJX6vU9v+7aLacoQJhU3AMTk784ionpX+Pg4UdhdM+UQW+odge32GkwEX11czQ==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+      "version": "1.9.12",
+      "license": "MIT",
       "dependencies": {
         "detect-browser": "^5.1.0",
         "prop-types": "^15.7.2",
@@ -31477,42 +31400,6 @@
         "tslib": "^1.10.0"
       }
     },
-    "node_modules/web3modal/node_modules/react": {
-      "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
-      "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/web3modal/node_modules/react-dom": {
-      "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
-      "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.19.1"
-      },
-      "peerDependencies": {
-        "react": "^16.14.0"
-      }
-    },
-    "node_modules/web3modal/node_modules/scheduler": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
-      "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      }
-    },
     "node_modules/web3modal/node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -31526,33 +31413,33 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.95.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
-      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
+      "version": "5.88.2",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^1.0.0",
+        "@webassemblyjs/ast": "^1.11.5",
+        "@webassemblyjs/wasm-edit": "^1.11.5",
+        "@webassemblyjs/wasm-parser": "^1.11.5",
         "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+        "acorn-import-assertions": "^1.9.0",
+        "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.17.1",
+        "enhanced-resolve": "^5.15.0",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.11",
+        "graceful-fs": "^4.2.9",
         "json-parse-even-better-errors": "^2.3.1",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
         "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.10",
-        "watchpack": "^2.4.1",
+        "terser-webpack-plugin": "^5.3.7",
+        "watchpack": "^2.4.0",
         "webpack-sources": "^3.2.3"
       },
       "bin": {
@@ -31978,10 +31865,9 @@
       "license": "MIT"
     },
     "node_modules/webpack/node_modules/enhanced-resolve": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
-      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "version": "5.15.0",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -32009,9 +31895,8 @@
     },
     "node_modules/webpack/node_modules/tapable": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
diff --git a/src/common/components/exchange/SelectBitcoinWallet.vue b/src/common/components/exchange/SelectBitcoinWallet.vue
index 44fc3dfa..73803668 100644
--- a/src/common/components/exchange/SelectBitcoinWallet.vue
+++ b/src/common/components/exchange/SelectBitcoinWallet.vue
@@ -66,7 +66,7 @@ export default {
     const wallets = computed(() => walletConf.wallets.filter((wallet) => {
       const walletConfJsonConstant = wallet.constant as BtcWallet;
       const flag = getFeature.value(FeatureNames[walletConfJsonConstant]);
-      return flag?.value === 'enabled';
+      return flag?.value === constants.ENABLED;
     }));
 
     const bitcoinWallet = useStateAttribute<BtcWallet>('pegInTx', 'bitcoinWallet');
diff --git a/src/common/components/status/StatusSummary.vue b/src/common/components/status/StatusSummary.vue
index 177ee49d..81f27d98 100644
--- a/src/common/components/status/StatusSummary.vue
+++ b/src/common/components/status/StatusSummary.vue
@@ -1,8 +1,8 @@
 <template>
-  <v-row>
-    <h2 class="mt-4 mb-2 w-100 text-center">Summary</h2>
+  <v-row class="ml-2">
+    <span class="mt-4 mb-2 w-100 text-left">Summary</span>
   </v-row>
-  <v-row class="rounded-lg py-8 px-4 border-md">
+  <v-row class="rounded-lg py-8 px-4 border-md ml-2">
     <v-col :order="columnOrder.btc" cols="6" class="d-flex flex-column ga-4">
       <div class="pb-4">
         <h3 class="text-h3 pa-1 pb-2 bg-orange d-inline-block">
@@ -10,9 +10,9 @@
         </h3>
       </div>
       <div v-for="({title, value, ticker, link}) in btcSide" :key="title"
-        class="d-flex flex-column ga-1">
+        class="d-flex flex-column ga-1 custom-input">
         <span>{{ title }}</span>
-        <div class="d-flex align-center bg-surface py-2 px-4 rounded-lg border">
+        <div class="d-flex align-center py-2 px-4 rounded-lg border-md">
           <span class="text-h4">{{ value?.length > 18 ? truncateString(value) : value }}</span>
           <v-spacer />
           <v-chip v-if="ticker" :prepend-icon="mdiBitcoin" class="btc-icon">
@@ -37,10 +37,9 @@
         </h3>
       </div>
       <div v-for="({title, value, ticker, link}) in rskSide" :key="title"
-        class="d-flex flex-column ga-1">
+        class="d-flex flex-column ga-1 custom-input">
         <span>{{ title }}</span>
-        <div class="d-flex align-center bg-surface py-2 px-4
-          rounded-lg border">
+        <div class="d-flex align-center py-2 px-4 rounded-lg border-md">
           <span class="text-h4">{{ value?.length > 18 ? truncateString(value) : value }}</span>
           <v-spacer />
           <v-chip v-if="ticker" class="pl-2 pr-3">
@@ -110,6 +109,16 @@ export default defineComponent({
       if (props.type === TxStatusType.PEGOUT || props.type === TxStatusType.FLYOVER_PEGOUT) {
         const fee = props.details.fee === 0 ? props.details.estimatedFee : props.details.fee;
         return [
+          {
+            title: 'You receive',
+            value: props.txWithError ? '-' : props.details.amountReceivedString,
+            ticker: true,
+          },
+          {
+            title: props.details.fee === 0 ? 'Estimated Fee' : 'Fee',
+            value: status.value.type === TxStatusType.FLYOVER_PEGOUT || props.txWithError ? '-' : fee,
+            ticker: true,
+          },
           {
             title: 'Recipient Address',
             value: props.details.recipientAddress && !props.txWithError
@@ -122,29 +131,14 @@ export default defineComponent({
               ? props.details.btcTxId : '-',
             link: getBtcTxExplorerUrl(props.details.btcTxId),
           },
-          {
-            title: props.details.fee === 0 ? 'Estimated Fee' : 'Fee',
-            value: status.value.type === TxStatusType.FLYOVER_PEGOUT || props.txWithError ? '-' : fee,
-            ticker: true,
-          },
-          {
-            title: 'You receive',
-            value: props.txWithError ? '-' : props.details.amountReceivedString,
-            ticker: true,
-          },
         ];
       }
       return [
         {
-          title: 'Sender Address',
-          value: props.details.senderAddress || '-',
-          link: getBtcAddressExplorerUrl(props.details.senderAddress),
+          title: 'You send',
+          value: props.details.total,
+          ticker: true,
         },
-        ...(props.withTxIds ? [{
-          title: 'Transaction ID',
-          value: props.details.txId || '-',
-          link: getBtcTxExplorerUrl(props.details.txId),
-        }] : []),
         {
           title: props.details && props.type === TxStatusType.FLYOVER_PEGIN
             ? 'Fee (includes provider and network fees)' : 'Fee',
@@ -152,10 +146,15 @@ export default defineComponent({
           ticker: true,
         },
         {
-          title: 'You send',
-          value: props.details.total,
-          ticker: true,
+          title: 'Sender Address',
+          value: props.details.senderAddress || '-',
+          link: getBtcAddressExplorerUrl(props.details.senderAddress),
         },
+        ...(props.withTxIds ? [{
+          title: 'Transaction ID',
+          value: props.details.txId || '-',
+          link: getBtcTxExplorerUrl(props.details.txId),
+        }] : []),
       ];
     });
 
@@ -164,14 +163,9 @@ export default defineComponent({
         const gasFee = props.details.gas?.gt(0) ? props.details.gas.toRBTCTrimmedString() : '-';
         return [
           {
-            title: 'Sender Address',
-            value: props.details.senderAddress || '-',
-            link: getRskAddressExplorerUrl(props.details.senderAddress),
-          },
-          {
-            title: 'Transaction ID',
-            value: props.details.txId || '-',
-            link: getRskTxExplorerUrl(props.details.txId),
+            title: 'You send',
+            value: props.details.amountFromString,
+            ticker: true,
           },
           {
             title: props.type === TxStatusType.FLYOVER_PEGOUT
@@ -182,12 +176,28 @@ export default defineComponent({
             ticker: true,
           },
           {
-            title: 'You send',
-            value: props.details.amountFromString,
-            ticker: true,
+            title: 'Sender Address',
+            value: props.details.senderAddress || '-',
+            link: getRskAddressExplorerUrl(props.details.senderAddress),
+          },
+          {
+            title: 'Transaction ID',
+            value: props.details.txId || '-',
+            link: getRskTxExplorerUrl(props.details.txId),
           }];
       }
       return [
+        {
+          title: 'You receive',
+          value: props.details.amountReceivedString && !props.txWithError
+            ? props.details.amountReceivedString : '-',
+          ticker: true,
+        },
+        {
+          title: 'Fee',
+          value: '-',
+          ticker: true,
+        },
         {
           title: 'Recipient Address',
           value: props.details.recipientAddress && !props.txWithError
@@ -200,17 +210,6 @@ export default defineComponent({
             ? props.details.rskTxId : '-',
           link: getRskTxExplorerUrl(props.details.rskTxId),
         }] : []),
-        {
-          title: 'Fee',
-          value: '-',
-          ticker: true,
-        },
-        {
-          title: 'You receive',
-          value: props.details.amountReceivedString && !props.txWithError
-            ? props.details.amountReceivedString : '-',
-          ticker: true,
-        },
       ];
     });
 
@@ -238,4 +237,9 @@ export default defineComponent({
 .v-col.order-1 {
   padding-right: 20px;
 }
+.custom-input {
+  .border-md {
+    border-color: rgb(var(--v-theme-bw-500)) !important;
+  }
+}
 </style>
diff --git a/src/common/components/status/TxPegin.vue b/src/common/components/status/TxPegin.vue
index e21b3601..994c4c76 100644
--- a/src/common/components/status/TxPegin.vue
+++ b/src/common/components/status/TxPegin.vue
@@ -10,7 +10,7 @@
         <span class="text-center text-bw-400 text-body-2">Confirmations</span>
       </v-row>
     </template>
-    <v-row>
+    <v-row class="mb-4">
       <status-progress-bar :isFlyover="isFlyover" :txWithErrorType="txWithErrorType"
                            :txWithError="txWithError" />
     </v-row>
diff --git a/src/common/components/status/TxPegout.vue b/src/common/components/status/TxPegout.vue
index 0266fc2a..3c3661dc 100644
--- a/src/common/components/status/TxPegout.vue
+++ b/src/common/components/status/TxPegout.vue
@@ -1,6 +1,6 @@
 <template>
   <v-container>
-    <v-row>
+    <v-row class="mb-4">
       <status-progress-bar :isFlyover="isFlyover" :txWithErrorType="txWithErrorType"
                            :txWithError="txWithError"/>
     </v-row>
diff --git a/src/common/services/FlyoverService.ts b/src/common/services/FlyoverService.ts
index ca0745dc..de405d7a 100644
--- a/src/common/services/FlyoverService.ts
+++ b/src/common/services/FlyoverService.ts
@@ -17,7 +17,7 @@ import { isValidSiteKey, ServiceError } from '../utils';
 export default class FlyoverService {
   flyover?: Flyover;
 
-  flyovernetwork: Network;
+  flyoverNetwork: Network;
 
   private lbcAddress = EnvironmentAccessorService.getEnvironmentVariables().lbcAddress;
 
@@ -40,13 +40,13 @@ export default class FlyoverService {
     const appNetwork = EnvironmentAccessorService.getEnvironmentVariables().vueAppCoin;
     switch (appNetwork) {
       case constants.BTC_NETWORK_MAINNET:
-        this.flyovernetwork = 'Mainnet';
+        this.flyoverNetwork = 'Mainnet';
         break;
       case constants.BTC_NETWORK_TESTNET:
-        this.flyovernetwork = 'Testnet';
+        this.flyoverNetwork = 'Testnet';
         break;
       default:
-        this.flyovernetwork = 'Regtest';
+        this.flyoverNetwork = 'Regtest';
         break;
     }
   }
@@ -58,7 +58,7 @@ export default class FlyoverService {
       BlockchainConnection.createUsingStandard(provider)
         .then((connection: BlockchainConnection) => {
           this.flyover = new Flyover({
-            network: this.flyovernetwork,
+            network: this.flyoverNetwork,
             rskConnection: connection,
             captchaTokenResolver: this.tokenResolver.bind(this),
             disableChecksum: true,
diff --git a/src/common/store/constants.ts b/src/common/store/constants.ts
index 44cf33ca..bf824c09 100644
--- a/src/common/store/constants.ts
+++ b/src/common/store/constants.ts
@@ -160,6 +160,7 @@ export const FLYOVER_PEGOUT_SET_BTC_ADDRESS = 'FLYOVER_PEGOUT_SET_BTC_ADDRESS';
 export const FLYOVER_PEGOUT_SET_TX_HASH = 'FLYOVER_PEGOUT_SET_TX_HASH';
 export const FLYOVER_PEGOUT_SET_SELECTED_QUOTE = 'FLYOVER_PEGOUT_SET_SELECTED_QUOTE';
 export const FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCES = 'FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCES';
+export const FLYOVER_PEGOUT_SET_RESPONDING = 'FLYOVER_PEGOUT_SET_RESPONDING';
 
 // Flyover PegIn mutations
 export const FLYOVER_PEGIN_SET_PROVIDERS = 'FLYOVER_PEGIN_SET_PROVIDERS';
@@ -345,11 +346,19 @@ export const POWPEG_RSKT_HEADER = '52534b5401';
 export const PEGIN_OUTPUTS = 3;
 export const COOKIE_EXPIRATION_HOURS = 12;
 
+export const ENABLED = 'enabled';
+export const DISABLED = 'disabled';
+
 export enum peginType {
   POWPEG = 'POWPEG',
   FLYOVER = 'FLYOVER'
 }
 
+export enum pegoutType {
+  POWPEG = 'POWPEG',
+  FLYOVER = 'FLYOVER'
+}
+
 export const BTC_AVG_BLOCK_TIME_IN_SECONDS = 600;
 export const RSK_AVG_BLOCK_TIME_IN_SECONDS = 30;
 export const FULFILLED = 'fulfilled';
diff --git a/src/common/styles/_cards.scss b/src/common/styles/_cards.scss
index 26a07caf..a7a5918b 100644
--- a/src/common/styles/_cards.scss
+++ b/src/common/styles/_cards.scss
@@ -14,11 +14,11 @@
 .not-available {
   position: relative;
   .not-available-text {
-  position: absolute;
-  inset: 0;
-  background-color: rgba(var(--v-theme-background), 0.5);
-  backdrop-filter: blur(4px);
-  opacity: 1;
-  z-index: 1;
+    position: absolute;
+    inset: 0;
+    background-color: rgba(var(--v-theme-background), 0.5);
+    backdrop-filter: blur(4px);
+    opacity: 1;
+    z-index: 1;
   }
-}
\ No newline at end of file
+}
diff --git a/src/common/styles/_home.scss b/src/common/styles/_home.scss
index e29a2333..7112b226 100644
--- a/src/common/styles/_home.scss
+++ b/src/common/styles/_home.scss
@@ -1,6 +1,6 @@
 .home {
   input[type="checkbox"] {
-    accent-color: rgb(var(--v-theme-on-background));
+    accent-color: rgb(var(--v-theme-green));
   }
   .border-box {
     color: rgb(var(--v-theme-background));
diff --git a/src/common/types/Flyover/FlyoverPegout.ts b/src/common/types/Flyover/FlyoverPegout.ts
index 2527edad..ca46a21e 100644
--- a/src/common/types/Flyover/FlyoverPegout.ts
+++ b/src/common/types/Flyover/FlyoverPegout.ts
@@ -14,4 +14,5 @@ export interface FlyoverPegoutState {
     flyoverService: FlyoverService;
     txHash?: string;
     selectedQuoteHash: string;
+    isResponding: boolean;
 }
diff --git a/src/common/utils/common.ts b/src/common/utils/common.ts
index a672ed62..8f7e5dd6 100644
--- a/src/common/utils/common.ts
+++ b/src/common/utils/common.ts
@@ -108,6 +108,7 @@ export const getClearFlyoverPegoutState = (): FlyoverPegoutState => ({
   flyoverService: markRaw(new FlyoverService()),
   selectedQuoteHash: '',
   differences: [],
+  isResponding: false,
 });
 
 export const getClearFlyoverPeginState = (): FlyoverPeginState => ({
diff --git a/src/common/views/Home.vue b/src/common/views/Home.vue
index 063d3ab0..25c189a0 100644
--- a/src/common/views/Home.vue
+++ b/src/common/views/Home.vue
@@ -12,25 +12,25 @@
           <span class="mx-1 my-2 pa-4 bg-green">Rootstock</span>
         </div>
       </v-col>
-      <v-col lg="4" xl="3" xxl="2" class="d-flex flex-column ga-6">
+      <v-col lg="4" xl="3" xxl="2" class="d-flex flex-column">
         <template v-if="termsAndConditionsEnabled">
-          <v-row class="d-flex justify-center">
+          <v-row class="d-flex justify-center mb-6">
             <label for="termscheck" class="pa-0 d-flex align-center mx-3">
               {{ '' }}
               <input id="termscheck" type="checkbox"
                      :checked="areTermsAccepted" @click="setTermsAccepted">
             </label>
             <span>I acknowledge and accept
-              <a href="#" rel="noopener" @key-press="toggleCheck" class="px-1 text-bw-500"
+              <a href="#" rel="noopener" @key-press="toggleCheck" class="px-1 text-orange"
                  @click.prevent="$emit('update:showDialog', true)">
-                terms and conditions
+                Terms and conditions
               </a>
             </span>
           </v-row>
         </template>
         <v-btn @click="selectConversion(constants.PEG_IN_TRANSACTION_TYPE)"
           :disabled="!isAllowedBrowser || (!areTermsAccepted && !!termsAndConditionsEnabled)"
-          class="border-box d-block pa-6 rounded-lg h-auto">
+          class="border-box d-block pa-6 rounded-lg h-auto mb-6">
           <v-row no-gutters align="center" justify="space-between">
             <v-col cols="4">
               <div class="d-flex text-h3 ga-1 flex-wrap">
@@ -46,7 +46,7 @@
         </v-btn>
         <v-btn @click="selectConversion(constants.PEG_OUT_TRANSACTION_TYPE)"
           :disabled="!areTermsAccepted && !!termsAndConditionsEnabled"
-          class="border-box d-block pa-6 rounded-lg h-auto">
+          class="border-box d-block pa-6 rounded-lg h-auto mb-6">
           <v-row no-gutters align="center" justify="space-between">
             <v-col cols="4">
               <div class="d-flex text-h3 ga-1 flex-wrap">
@@ -60,18 +60,19 @@
             </v-col>
           </v-row>
         </v-btn>
-        <div class="d-flex justify-center gc-2 align-baseline flex-wrap">
-          <span>Already made a transaction?</span>
-          <v-btn variant="text" color="orange" density="compact" class="pa-0 text-body-1"
+        <div class="d-flex justify-start align-baseline flex-wrap ml-6">
+          <span class="text-body-1">Already made a transaction?</span>
+          <v-btn variant="text" color="orange" density="compact"
+            class="pa-0 text-body-1 ml-2"
             @click="toStatusSearch">
             Transaction Status
           </v-btn>
         </div>
-        <div class="d-flex justify-center gc-2 align-baseline flex-wrap">
-          <span class="text-center">To learn about the various RBTC access methods, visit</span>
-          <v-btn variant="text" color="orange" density="compact" class="pa-0 text-body-1"
+        <div class="d-flex justify-start align-baseline flex-wrap ml-6">
+          <span class="text-body-1">To learn about the various RBTC access methods, visit </span>
+          <v-btn variant="text" color="orange" density="compact" class="pa-0 text-body-1 mr-2"
              href="https://rootstock.io/rbtc/" target="_blank">
-            RBTC Webpage
+              RBTC Webpage
           </v-btn>
         </div>
       </v-col>
diff --git a/src/common/views/SuccessTx.vue b/src/common/views/SuccessTx.vue
index c561394a..76503e72 100644
--- a/src/common/views/SuccessTx.vue
+++ b/src/common/views/SuccessTx.vue
@@ -5,12 +5,15 @@
         <v-row no-gutters>
           <div class="text-h1 mb-2 pa-4 bg-teal">You are</div>
         </v-row>
-        <v-row no-gutters>
+        <v-row no-gutters class="mb-8">
           <div class="text-h1 pa-4 bg-yellow">Done!</div>
         </v-row>
         <v-row no-gutters>
-          <div class="pt-4">
-            <span>{{ willReceiveText }}</span>
+          <div>
+            <span>{{ amountToReceive }}</span><br>
+            on your address
+            <span v-if="estimatedTime">within the next</span><br>
+            <span>{{ estimatedTime }}</span>
           </div>
         </v-row>
       </v-col>
@@ -18,7 +21,7 @@
         <v-row no-gutters>
           <p class="text-subtitle-1">Transaction ID</p>
         </v-row>
-        <v-row no-gutters class="mb-4">
+        <v-row no-gutters class="mb-8">
           <v-text-field
             density="comfortable"
             variant="outlined"
@@ -30,7 +33,7 @@
             </template>
           </v-text-field>
         </v-row>
-        <v-row no-gutters class="my-4">
+        <v-row no-gutters class="my-4 mt-8">
           <v-btn-rsk block @click="toTxStatus">See Transaction</v-btn-rsk>
         </v-row>
         <v-row no-gutters>
@@ -48,9 +51,10 @@ import { useAction, useGetter, useState } from '@/common/store/helper';
 import * as constants from '@/common/store/constants';
 import { useRouter } from 'vue-router';
 import {
-  PegInTxState, PegOutTxState, SatoshiBig, TxStatusType,
+  PegInTxState, PegOutTxState, SatoshiBig, TxStatusType, PeginQuote, QuotePegOut2WP,
 } from '@/common/types';
 import EnvironmentContextProviderService from '@/common/providers/EnvironmentContextProvider';
+import { blockConfirmationsToTimeString } from '@/common/utils';
 
 export default defineComponent({
   name: 'SuccessTx',
@@ -71,15 +75,46 @@ export default defineComponent({
     const pegOutTxState = useState<PegOutTxState>('pegOutTx');
     const environmentContext = EnvironmentContextProviderService.getEnvironmentContext();
     const estimatedBtcToReceive = useGetter<SatoshiBig>('pegOutTx', constants.PEGOUT_TX_GET_ESTIMATED_BTC_TO_RECEIVE);
+    const peginSelectedQuote = useGetter<PeginQuote>('flyoverPegin', constants.FLYOVER_PEGIN_GET_SELECTED_QUOTE);
+    const pegoutSelectedQuote = useGetter<QuotePegOut2WP>('flyoverPegout', constants.FLYOVER_PEGOUT_GET_SELECTED_QUOTE);
+
+    const amountToReceive = computed(() => {
+      let amountText;
+      switch (props.type.toUpperCase()) {
+        case TxStatusType.PEGIN:
+          amountText = `${pegInTxState.value.amountToTransfer.toBTCTrimmedString()}
+            ${environmentContext.getBtcTicker()}`;
+          break;
+        case TxStatusType.PEGOUT:
+          amountText = `${estimatedBtcToReceive.value.toBTCTrimmedString()}
+            ${environmentContext.getBtcTicker()}`;
+          break;
+        case TxStatusType.FLYOVER_PEGIN:
+          amountText = `${pegOutTxState.value.amountToTransfer.toRBTCTrimmedString()}
+            ${environmentContext.getBtcTicker()}`;
+          break;
+        case TxStatusType.FLYOVER_PEGOUT:
+          amountText = `${pegOutTxState.value.amountToTransfer.toRBTCTrimmedString()}
+            ${environmentContext.getBtcTicker()}`;
+          break;
+        default:
+          amountText = '';
+      }
+      return `You will receive ${amountText}`;
+    });
 
-    const willReceiveText = computed(() => {
+    const estimatedTime = computed(() => {
       switch (props.type.toUpperCase()) {
-        case TxStatusType.PEGIN || TxStatusType.FLYOVER_PEGIN:
-          return `You will receive ${pegInTxState.value.amountToTransfer.toBTCTrimmedString()} ${environmentContext.getRbtcTicker()}`;
+        case TxStatusType.PEGIN:
+          return '17 hours';
         case TxStatusType.PEGOUT:
-          return `You will receive approximately ${estimatedBtcToReceive.value.toBTCTrimmedString()} ${environmentContext.getBtcTicker()}`;
+          return '34 hours';
+        case TxStatusType.FLYOVER_PEGIN:
+          return `${blockConfirmationsToTimeString(peginSelectedQuote
+            .value.quote.confirmations ?? 0, 'btc')}`;
         case TxStatusType.FLYOVER_PEGOUT:
-          return `You will receive ${pegOutTxState.value.amountToTransfer.toRBTCTrimmedString()} ${environmentContext.getBtcTicker()}`;
+          return `${blockConfirmationsToTimeString(pegoutSelectedQuote
+            .value.quote.depositConfirmations ?? 0, 'btc')}`;
         default:
           return '';
       }
@@ -100,7 +135,8 @@ export default defineComponent({
 
     return {
       mdiContentCopy,
-      willReceiveText,
+      amountToReceive,
+      estimatedTime,
       pegInTxState,
       copyToClipboard,
       goHome,
diff --git a/src/pegin/components/create/SendBitcoin.vue b/src/pegin/components/create/SendBitcoin.vue
index 14f948f4..20984139 100644
--- a/src/pegin/components/create/SendBitcoin.vue
+++ b/src/pegin/components/create/SendBitcoin.vue
@@ -38,7 +38,8 @@ import PegInForm from '@/pegin/components/create/PegInForm.vue';
 import ConfirmTx from '@/pegin/components/create/ConfirmTx.vue';
 import * as constants from '@/common/store/constants';
 import {
-  SendBitcoinState, SatoshiBig, BtcWallet, Utxo, TxStatusType,
+  SendBitcoinState, SatoshiBig, BtcWallet, Utxo,
+  TxStatusType,
 } from '@/common/types';
 import { Machine, getClearPeginTxState } from '@/common/utils';
 import { useAction, useGetter, useStateAttribute } from '@/common/store/helper';
@@ -98,6 +99,7 @@ export default defineComponent({
     const getChangeAddress = useGetter<string>('pegInTx', constants.PEGIN_TX_GET_CHANGE_ADDRESS);
     const selectedUtxoList = useGetter<Utxo[]>('pegInTx', constants.PEGIN_TX_GET_SELECTED_UTXO_LIST);
     const selectedFee = useGetter<SatoshiBig>('pegInTx', constants.PEGIN_TX_GET_SAFE_TX_FEE);
+    const type = useStateAttribute<string>('pegInTx', 'peginType');
 
     async function toConfirmTx({
       amountToTransferInSatoshi,
@@ -144,7 +146,12 @@ export default defineComponent({
       } else if (txHash) {
         router.push({
           name: 'SuccessTx',
-          params: { txId: txHash, type: (TxStatusType.PEGIN).toLowerCase() },
+          params: {
+            txId: txHash,
+            type: type.value === constants.peginType.FLYOVER
+              ? TxStatusType.FLYOVER_PEGIN
+              : TxStatusType.PEGIN,
+          },
         });
       }
     }
diff --git a/src/pegout/components/PegoutForm.vue b/src/pegout/components/PegoutForm.vue
index a529a962..122b4408 100644
--- a/src/pegout/components/PegoutForm.vue
+++ b/src/pegout/components/PegoutForm.vue
@@ -15,19 +15,47 @@
           :willReceive="amountToReceive" />
       </v-col>
     </v-row>
-    <v-row v-if="showStep && !loadingQuotes">
+    <template v-if="showStep && !loadingQuotes">
+      <v-row>
+        <span class="text-bold ma-4 mb-2
+        ">Select Mode</span>
+      </v-row>
+      <v-row>
+        <v-col cols="6" v-if="pegoutQuotes.length === 0" >
+        <pegout-option class="mr-2" flyover-not-available
+          :option-type="pegoutType.FLYOVER">
+        <template v-slot>
+          <h4>
+            <span class="text-orange">Fast Mode</span> is unavailable at this time.
+          </h4>
+        </template>
+        </pegout-option>
+      </v-col>
       <v-col cols="6" v-for="(quote, index) in pegoutQuotes" :key="index" >
         <pegout-option
-        :class="index === 0 ? 'mr-2' : 'ml-2'"
-        :quote="quote"
-        :isWalletAuthorizedToSign="isWalletAuthorizedToSign"
-        @openAddressDialog="showAddressDialog = true"
-        @changeSelectedOption="changeSelectedOption"
-        :selectedOption="selectedOption === quote.quoteHash"
-        :quote-differences="quoteDifferences"
-        />
+          :option-type="pegoutType.FLYOVER"
+          :class="index === 0 ? 'mr-2' : 'ml-2'"
+          :quote="quote"
+          :isWalletAuthorizedToSign="isWalletAuthorizedToSign"
+          @openAddressDialog="showAddressDialog = true"
+          @changeSelectedOption="changeSelectedOption"
+          :selectedOption="selectedOption === quote.quoteHash"
+          :quote-differences="quoteDifferences"
+          />
       </v-col>
-    </v-row>
+      <v-col cols="6">
+        <pegout-option class="ml-2"
+          :option-type="pegoutType.POWPEG"
+          :quote="nativeQuote"
+          :isWalletAuthorizedToSign="isWalletAuthorizedToSign"
+          @openAddressDialog="showAddressDialog = true"
+          @changeSelectedOption="changeSelectedOption"
+          :selectedOption="selectedOption === ''"
+          :quote-differences="quoteDifferences"
+          />
+      </v-col>
+      </v-row>
+    </template>
     <v-row v-else-if="loadingQuotes" class="pt-4 justify-center">
       <v-progress-circular
         :size="250"
@@ -41,8 +69,7 @@
         <v-col cols="auto">
             <v-btn-rsk v-if="!pegOutFormState.matches(['loading'])"
             @click="executeRecaptcha"
-            :disabled="!isReadyToCreate
-              || !isFlyoverReady
+            :disabled="!isValid
               || pegOutFormState.matches(['goingHome'])"
             >
             <template #append>
@@ -151,6 +178,7 @@ export default defineComponent({
     const flyoverPegoutState = useState<FlyoverPegoutState>('flyoverPegout');
     const flyoverService = useStateAttribute<FlyoverService>('flyoverPegout', 'flyoverService');
     const account = useStateAttribute<string>('web3Session', 'account');
+    const balance = useStateAttribute<WeiBig>('web3Session', 'balance');
     const sendTx = useAction('pegOutTx', constants.PEGOUT_TX_SEND);
     const sendFlyoverTx = useAction('flyoverPegout', constants.FLYOVER_PEGOUT_ACCEPT_AND_SEND_QUOTE);
     const initFlyoverTx = useAction('flyoverPegout', constants.FLYOVER_PEGOUT_INIT);
@@ -161,6 +189,7 @@ export default defineComponent({
     const getFlyoverProviders = useAction('flyoverPegout', constants.FLYOVER_PEGOUT_GET_PROVIDERS);
     const quotes = useStateAttribute<Record<number, QuotePegOut2WP[]>>('flyoverPegout', 'quotes');
     const quoteDifferences = useStateAttribute<Array<ObjectDifference>>('flyoverPegout', 'differences');
+    const isFlyoverResponding = useStateAttribute<boolean>('flyoverPegout', 'isResponding');
     const selectedQuote = useGetter<QuotePegOut2WP>('flyoverPegout', constants.FLYOVER_PEGOUT_GET_SELECTED_QUOTE);
     const estimatedBtcToReceive = useGetter<SatoshiBig>('pegOutTx', constants.PEGOUT_TX_GET_ESTIMATED_BTC_TO_RECEIVE);
     const isEnoughBalance = useGetter<boolean>('pegOutTx', constants.PEGOUT_TX_IS_ENOUGH_BALANCE);
@@ -180,33 +209,6 @@ export default defineComponent({
         });
       });
 
-      quoteList.push({
-        quote: {
-          agreementTimestamp: 0,
-          btcRefundAddress: '',
-          callFee: new WeiBig(0, 'wei'),
-          depositAddr: '', // Must be derived
-          depositConfirmations: 0,
-          depositDateLimit: 0,
-          expireBlocks: 0,
-          expireDate: 0,
-          gasFee: pegOutTxState.value.calculatedFee,
-          lbcAddress: '',
-          liquidityProviderRskAddress: '',
-          lpBtcAddr: '',
-          nonce: 0n,
-          penaltyFee: new WeiBig(0, 'wei'),
-          productFeeAmount: new WeiBig(pegOutTxState.value.btcEstimatedFee.toBTCString(), 'rbtc'),
-          rskRefundAddress: account.value ?? '',
-          transferConfirmations: 0,
-          transferTime: 0,
-          value: pegOutTxState.value.amountToTransfer,
-        },
-        quoteHash: '',
-      });
-
-      quoteList.sort((q1, q2) => q1.quote.depositConfirmations - q2.quote.depositConfirmations);
-
       return quoteList;
     });
 
@@ -233,13 +235,18 @@ export default defineComponent({
         && selectedOption.value !== undefined);
 
     const isFlyoverReady = computed(() => {
-      if (selectedOption.value) {
+      if (selectedOption.value && selectedQuote.value) {
         const { btcRecipientAddress } = flyoverPegoutState.value;
         const { bridgeContractAddress } = pegOutTxState.value.pegoutConfiguration;
         const { valid, addressType } = validateAddress(btcRecipientAddress);
         const allowedAdressType = (addressType === constants.BITCOIN_LEGACY_ADDRESS
           || addressType === constants.BITCOIN_SEGWIT_ADDRESS);
-        return valid
+        const amountPlusFees = selectedQuote.value.quote.value
+          .plus(selectedQuote.value.quote.gasFee)
+          .plus(selectedQuote.value.quote.productFeeAmount)
+          .plus(selectedQuote.value.quote.callFee);
+        const enoughBalance = balance.value.gt(amountPlusFees);
+        return valid && enoughBalance
           && btcRecipientAddress !== bridgeContractAddress
           && allowedAdressType;
       }
@@ -248,6 +255,36 @@ export default defineComponent({
 
     const sendingPegout = computed(():boolean => pegOutFormState.value.matches(['loading']));
 
+    const nativeQuote = computed(() => ({
+      quote: {
+        agreementTimestamp: 0,
+        btcRefundAddress: '',
+        callFee: new WeiBig(0, 'wei'),
+        depositAddr: '', // Must be derived
+        depositConfirmations: 0,
+        depositDateLimit: 0,
+        expireBlocks: 0,
+        expireDate: 0,
+        gasFee: pegOutTxState.value.calculatedFee,
+        lbcAddress: '',
+        liquidityProviderRskAddress: '',
+        lpBtcAddr: '',
+        nonce: 0n,
+        penaltyFee: new WeiBig(0, 'wei'),
+        productFeeAmount: new WeiBig(pegOutTxState.value.btcEstimatedFee.toBTCString(), 'rbtc'),
+        rskRefundAddress: account.value ?? '',
+        transferConfirmations: 0,
+        transferTime: 0,
+        value: pegOutTxState.value.amountToTransfer,
+      },
+      quoteHash: '',
+    }));
+
+    const isValid = computed(() => {
+      if (selectedOption.value === '') return isReadyToCreate.value;
+      return isFlyoverReady.value;
+    });
+
     function handlePegoutError(error: ServiceError) {
       txError.value = error;
       showTxErrorDialog.value = true;
@@ -426,6 +463,10 @@ export default defineComponent({
       continueHandler,
       flyoverService,
       executeRecaptcha,
+      nativeQuote,
+      isFlyoverResponding,
+      pegoutType: constants.pegoutType,
+      isValid,
     };
   },
 });
diff --git a/src/pegout/components/PegoutOption.vue b/src/pegout/components/PegoutOption.vue
index 66c81ec8..009bdf2e 100644
--- a/src/pegout/components/PegoutOption.vue
+++ b/src/pegout/components/PegoutOption.vue
@@ -1,8 +1,12 @@
 <template>
   <v-card :ripple="false" rounded="lg" flat variant="outlined"
-    @click="selectOption"
-    :class="selectedOption && 'selected'"
-    class="d-flex flex-column ga-4 pa-8 fill-height">
+    @click="selectOption" height="450px" :disabled="flyoverNotAvailable"
+    :class="{ 'selected': selectedOption, 'not-available': flyoverNotAvailable }"
+    class="d-flex flex-column ga-4 pa-8">
+    <div v-if="flyoverNotAvailable"
+      class="not-available-text d-flex align-center justify-center pa-8 text-center">
+      <slot />
+    </div>
     <v-row no-gutters class="my-2">
       <div class='text-h3'>
         <span :class='`pa-1 bg-${header.subtitleBgColor}`'>
@@ -10,7 +14,7 @@
         </span>
       </div>
     </v-row>
-    <v-row no-gutters>
+    <v-row  no-gutters>
       <v-col cols="auto">
         <span class="text-right"> {{ header.label }}</span>
       </v-col>
@@ -19,9 +23,54 @@
             <v-icon :icon="mdiOpenInNew"></v-icon>
         </v-btn>
       </v-col>
+      <v-spacer />
+      <v-col class="d-flex justify-end ml-0" :style='`color: ${header.color}`'>
+        <v-tooltip :text="tooltipText" location="top" max-width="200">
+        <template v-slot:activator="{ props }">
+            <div v-bind="props" class="d-flex align-center ga-1">
+              <v-icon :icon="mdiClockTimeThreeOutline" />
+              <span :class='`ml-2 ${header.subtitleBgColor}`'>
+                {{ estimatedTimeToReceive }}
+              </span>
+            </div>
+        </template>
+      </v-tooltip>
+      </v-col>
+    </v-row>
+    <v-divider thickness="1" :style='`color: ${header.color}; opacity: 1;`' />
+    <v-row>
+      <v-col>
+        <div class="d-flex flex-column">
+          <span>
+            {{ isFlyover ? 'Value to receive' : 'Estimated value to receive' }}
+          </span>
+          <span class="text-bw-400">
+            {{ estimatedValueToReceive }}
+            {{ environmentContext.getBtcTicker() }}
+          </span>
+          <span class="text-bw-400" :class="{ 'font-weight-bold': hasChanged(['gasFee'])}">
+            USD {{ toUSD(estimatedValueToReceive) }}
+          </span>
+        </div>
+      </v-col>
+      <v-col>
+        <div class="d-flex flex-column">
+          <span>
+            {{ isFlyover ? 'Total Fee (Network & Provider)' : 'Total Fee (Network)' }}
+          </span>
+          <span class="text-bw-400"
+                :class="{ 'font-weight-bold': hasChanged(['productFeeAmount', 'callFee'])}">
+            {{ totalFee }}
+            {{ environmentContext.getBtcTicker() }}
+          </span>
+          <span class="text-bw-400" :class="{ 'font-weight-bold': hasChanged(['gasFee'])}">
+            USD {{ toUSD(totalFee) }}
+          </span>
+        </div>
+      </v-col>
     </v-row>
-    <div class="d-flex flex-column ga-2 py-4">
-      <span>Destination Address</span>
+    <div class="ga-2 pt-4">
+      <div class="mb-4">Destination Bitcoin Address</div>
       <div v-if="isFlyover">
         <v-text-field
           v-model="btcAddress"
@@ -32,97 +81,47 @@
           variant="solo"
           :class="showAddressWarning && 'input-error'"
           :placeholder="btcAddressPlaceholder"
-          @update:model-value="updateStore"/>
+          @update:model-value="updateStore"
+          class="pb-0"/>
         <v-alert v-show="showAddressWarning"
-          variant="text" type="warning" density="compact" class="text-body-1 px-0" prominent>
+          variant="text" type="warning" density="compact"
+          class="text-body-1 px-0 pt-1 mb-0" prominent>
           <template #prepend>
             <v-icon size="small" :icon="mdiInformationOutline" />
           </template>
           Invalid address. Please note that native segwit is not supported at this time.
         </v-alert>
       </div>
-      <div v-else>
-        <div class="d-flex align-center justify-space-between
-          bg-surface py-2 px-4 rounded-lg border">
-          <p class="text-bw-400">
-            {{ session.btcDerivedAddress || 'Address needs to be generated' }}
-          </p>
-          <v-chip v-if="isWalletAuthorizedToSign && !session.btcDerivedAddress" variant="outlined"
-            @click="$emit('openAddressDialog')">
+      <template v-else>
+        <v-text-field
+          :v-model="session.btcDerivedAddress || 'Address needs to be generated'"
+          flat
+          hide-details
+          density="compact"
+          rounded="lg"
+          variant="solo"
+          :placeholder="session.btcDerivedAddress || 'Address needs to be generated'">
+          <template v-slot:append-inner>
+            <v-chip v-if="isWalletAuthorizedToSign && !session.btcDerivedAddress"
+            variant="outlined" @click="$emit('openAddressDialog')">
             Generate
           </v-chip>
-        </div>
+          </template>
+        </v-text-field>
         <v-alert
-          variant="text" type="warning" density="compact" class="text-body-1 px-0" prominent>
+          variant="text" type="warning" density="compact" class="text-body-1 px-0 pt-1" prominent>
           <template #prepend>
             <v-icon size="small" :icon="mdiInformationOutline" />
           </template>
-          <p>Follow
-            <span>
-              <a :href=constants.DERIVE_BTC_ADDRESS_DOCUMENTATION_URL
-                class="d-inline a" target='_blank'>this documentation</a>
-            </span>
-            to get the destination address.
-          </p>
+          <span>Follow
+            <a :href=constants.DERIVE_BTC_ADDRESS_DOCUMENTATION_URL
+              class="d-inline a" target='_blank'>
+              this steps
+            </a>
+            to view and access your {{ environmentContext.getBtcTicker() }} funds.
+          </span>
         </v-alert>
-      </div>
-    </div>
-    <v-spacer class="fill-height" />
-    <span class="text-h4">Features</span>
-
-    <div class="d-flex flex-column">
-      <span>Estimated Time to Receive</span>
-      <span class="text-bw-400">
-        {{ estimatedTimeToReceive }}
-      </span>
-    </div>
-
-    <div class="d-flex flex-column">
-      <span >Gas</span>
-      <span :class="{ 'font-weight-bold': hasChanged(['gasFee'])}" class="text-bw-400">
-        {{ quote.quote.gasFee.toRBTCTrimmedString() }}
-        {{ environmentContext.getRbtcTicker() }}
-      </span>
-      <span class="text-bw-400" :class="{ 'font-weight-bold': hasChanged(['gasFee'])}">
-        USD {{ toUSD(quote.quote.gasFee.toRBTCString()) }}
-      </span>
-    </div>
-
-    <div class="d-flex flex-column">
-      <span>
-        {{ isFlyover ? 'Provider fee' : 'Estimated BTC network fee' }}
-      </span>
-      <span class="text-bw-400"
-            :class="{ 'font-weight-bold': hasChanged(['productFeeAmount', 'callFee'])}">
-        {{ quote.quote.callFee.plus(quote.quote.productFeeAmount).toRBTCTrimmedString() }}
-        {{ environmentContext.getBtcTicker() }}
-      </span>
-      <span class="text-bw-400"
-            :class="{ 'font-weight-bold': hasChanged(['productFeeAmount', 'callFee'])}">
-        USD {{ toUSD(quote.quote.callFee.plus(quote.quote.productFeeAmount).toRBTCString()) }}
-      </span>
-    </div>
-
-    <div class="d-flex flex-column">
-      <span>Amount to send</span>
-      <span class="text-bw-400"
-      :class="{ 'font-weight-bold': hasChanged(['gasFee', 'productFeeAmount', 'callFee'])}">
-        {{ amountToSend }} {{ environmentContext.getBtcTicker() }}
-      </span>
-      <span class="text-bw-400"
-      :class="{ 'font-weight-bold': hasChanged(['gasFee', 'productFeeAmount', 'callFee'])}">
-        USD {{ toUSD(amountToSend) }}
-      </span>
-    </div>
-
-    <div class="d-flex flex-column">
-      <span>
-        {{ isFlyover ? 'Value to receive' : 'Estimated value to receive' }}
-      </span>
-      <span class="text-bw-400">
-        {{ estimatedValueToReceive }} {{ environmentContext.getBtcTicker() }}
-      </span>
-      <span class="text-bw-400">USD {{ toUSD(estimatedValueToReceive) }}</span>
+      </template>
     </div>
   </v-card>
 </template>
@@ -131,7 +130,12 @@
 import {
   computed, defineComponent, PropType, ref,
 } from 'vue';
-import { mdiSendOutline, mdiInformationOutline, mdiOpenInNew } from '@mdi/js';
+import {
+  mdiSendOutline,
+  mdiInformationOutline,
+  mdiOpenInNew,
+  mdiClockTimeThreeOutline,
+} from '@mdi/js';
 import EnvironmentContextProviderService from '@/common/providers/EnvironmentContextProvider';
 import { useAction, useState, useStateAttribute } from '@/common/store/helper';
 import {
@@ -143,13 +147,21 @@ import { blockConfirmationsToTimeString, validateAddress } from '@/common/utils'
 export default defineComponent({
   name: 'PegoutOption',
   props: {
+    optionType: {
+      type: String as PropType<constants.pegoutType>,
+      required: true,
+    },
+    flyoverNotAvailable: {
+      type: Boolean,
+      required: false,
+    },
     quote: {
       type: Object as PropType<QuotePegOut2WP>,
-      required: true,
+      required: false,
     },
     isWalletAuthorizedToSign: {
       type: Boolean,
-      required: true,
+      required: false,
     },
     selectedOption: {
       type: Boolean,
@@ -157,7 +169,7 @@ export default defineComponent({
     },
     quoteDifferences: {
       type: Array<ObjectDifference>,
-      required: true,
+      required: false,
     },
   },
   setup(props, context) {
@@ -167,43 +179,36 @@ export default defineComponent({
     const setBtcAddress = useAction('flyoverPegout', constants.FLYOVER_PEGOUT_ADD_BTC_ADDRESS);
     const fixedUSDDecimals = 2;
     const btcAddress = ref('');
-    const isFlyover = computed(() => props.quote.quoteHash.length > 0);
-
-    const amountToSend = computed(() => {
-      if (isFlyover.value) {
-        return new SatoshiBig(props.quote.quote.value
-          .plus(props.quote.quote.productFeeAmount)
-          .plus(props.quote.quote.gasFee)
-          .plus(props.quote.quote.callFee)
-          .toRBTCTrimmedString(), 'btc')
-          .toBTCTrimmedString();
-      }
-
-      return new SatoshiBig(props.quote.quote.value
-        .toRBTCTrimmedString(), 'btc')
-        .toBTCTrimmedString();
-    });
+    const isFlyover = computed(() => props.optionType === constants.pegoutType.FLYOVER);
+    const tooltipText = 'Time is approximate and may vary due to block confirmation times and network congestion.';
 
     const estimatedValueToReceive = computed(() => {
-      if (isFlyover.value) {
+      if (props.quote) {
+        if (isFlyover.value) {
+          return new SatoshiBig(props.quote.quote.value
+            .toRBTCTrimmedString(), 'btc')
+            .toBTCTrimmedString();
+        }
+
+        // TODO: SHOW THE AMOUNT WITHOUT FEES AFTER TESTNET GAS GOES DOWN
         return new SatoshiBig(props.quote.quote.value
+          // .minus(props.quote.quote.gasFee)
+          // .minus(props.quote.quote.productFeeAmount)
           .toRBTCTrimmedString(), 'btc')
           .toBTCTrimmedString();
       }
-
-      return new SatoshiBig(props.quote.quote.value
-        .minus(props.quote.quote.productFeeAmount)
-        .minus(props.quote.quote.gasFee)
-        .toRBTCTrimmedString(), 'btc')
-        .toBTCTrimmedString();
+      return '';
     });
 
     const estimatedTimeToReceive = computed(() => {
-      const { depositConfirmations } = props.quote.quote;
-      if (depositConfirmations === 0) {
-        return '33 hours';
+      if (props.quote) {
+        const { depositConfirmations } = props.quote.quote;
+        if (depositConfirmations === 0) {
+          return '34 hours';
+        }
+        return blockConfirmationsToTimeString(depositConfirmations);
       }
-      return blockConfirmationsToTimeString(depositConfirmations);
+      return '';
     });
 
     const header = computed(() => {
@@ -213,6 +218,7 @@ export default defineComponent({
           label: 'Powered by PowPeg + Flyover',
           subtitleBgColor: 'orange',
           link: 'https://dev.rootstock.io/concepts/rif-suite/#meet-the-suite',
+          color: '#FF9100',
         };
       }
       return {
@@ -220,9 +226,26 @@ export default defineComponent({
         label: 'Powered by PowPeg',
         subtitleBgColor: 'purple',
         link: 'https://dev.rootstock.io/rsk/architecture/powpeg/',
+        color: '#9E75FF',
       };
     });
 
+    const totalFee = computed(() => {
+      if (props.quote) {
+        let fee;
+        if (isFlyover.value) {
+          fee = props.quote.quote.callFee
+            .plus(props.quote.quote.gasFee)
+            .plus(props.quote.quote.productFeeAmount);
+        } else {
+          fee = props.quote.quote.gasFee
+            .plus(props.quote.quote.productFeeAmount);
+        }
+        return fee.toRBTCTrimmedString();
+      }
+      return '';
+    });
+
     const btcAddressPlaceholder = `Paste your (Legacy or Segwit) ${environmentContext.getBtcTicker()} address`;
 
     const isValidBtcAddress = computed(() => {
@@ -245,7 +268,7 @@ export default defineComponent({
     }
 
     function selectOption() {
-      context.emit('change-selected-option', props.quote.quoteHash);
+      context.emit('change-selected-option', props.quote ? props.quote.quoteHash : '');
     }
 
     function hasChanged(keys: string[]): boolean {
@@ -253,7 +276,7 @@ export default defineComponent({
       if (!isFlyover.value) {
         return false;
       }
-      props.quoteDifferences.forEach((diff) => {
+      props.quoteDifferences?.forEach((diff) => {
         if (keys.includes(diff.key)) {
           changed = true;
         }
@@ -272,7 +295,6 @@ export default defineComponent({
       constants,
       toUSD,
       blockConfirmationsToTimeString,
-      amountToSend,
       estimatedValueToReceive,
       isFlyover,
       header,
@@ -287,6 +309,9 @@ export default defineComponent({
       mdiOpenInNew,
       openLink,
       btcAddressPlaceholder,
+      mdiClockTimeThreeOutline,
+      totalFee,
+      tooltipText,
     };
   },
 });
diff --git a/src/pegout/components/RbtcInputAmount.vue b/src/pegout/components/RbtcInputAmount.vue
index 315eabaa..dc200b52 100644
--- a/src/pegout/components/RbtcInputAmount.vue
+++ b/src/pegout/components/RbtcInputAmount.vue
@@ -1,18 +1,10 @@
 <template>
   <v-row no-gutters>
-  <v-col>
     <span class="d-inline-block font-weight-bold my-3">
-      I will send
+      Amount to send
     </span>
-  </v-col>
-  <v-col>
-    <span class="d-inline-block font-weight-bold my-3 ml-6">
-      I will receive
-    </span>
-  </v-col>
-</v-row>
-<v-row no-gutters align="center">
-  <v-col>
+  </v-row>
+  <v-row no-gutters align="center">
     <v-text-field
       hide-details
       hide-spin-buttons
@@ -47,29 +39,14 @@
           </div>
         </template>
     </v-text-field>
-  </v-col>
-  <v-icon class="mx-2" :icon="mdiArrowRight" color="bw-600" />
-  <v-col>
-    <div class="d-flex justify-space-between align-center flex-grow-1
-      bg-surface pa-3 rounded-lg border">
-    <div class="d-flex ga-2 align-center">
-      <v-chip :prepend-icon="mdiBitcoin" class="btc-icon">
-        {{ environmentContext.getBtcTicker() }}
-      </v-chip>
-      <span class="text-h4">
-        {{ stepState === 'valid' ? willReceive : '' }}
-      </span>
-    </div>
-  </div>
-  </v-col>
-</v-row>
-<v-row class="my-0" v-if="stepState === 'error'">
-  <v-col cols="6" align-self="start">
-    <v-alert :text="amountErrorMessage" class="pa-2 mr-2"
-        type="warning" color="orange">
-      </v-alert>
-  </v-col>
-</v-row>
+  </v-row>
+  <v-row class="my-0" v-if="stepState === 'error'">
+    <v-col cols="6" align-self="start">
+      <v-alert :text="amountErrorMessage" class="pa-2 mr-2"
+          type="warning" color="orange">
+        </v-alert>
+    </v-col>
+  </v-row>
 </template>
 
 <script lang="ts">
diff --git a/src/pegout/store/FlyoverPegout/actions.ts b/src/pegout/store/FlyoverPegout/actions.ts
index 93e76c15..107ed55f 100644
--- a/src/pegout/store/FlyoverPegout/actions.ts
+++ b/src/pegout/store/FlyoverPegout/actions.ts
@@ -23,8 +23,10 @@ export const actions: ActionTree<FlyoverPegoutState, RootState> = {
       const providers: LiquidityProvider2WP[] = await state.flyoverService.getProviders();
       commit(constants.FLYOVER_PEGOUT_SET_PROVIDERS, providers);
       result = constants.FlyoverCallResult.SUCCESS;
+      commit(constants.FLYOVER_PEGOUT_SET_RESPONDING, true);
     } catch (e) {
       console.error(`Error getting flyover providers: ${e}`);
+      commit(constants.FLYOVER_PEGOUT_SET_RESPONDING, false);
     } finally {
       try {
         await ApiService.registerFlyoverCall({ ...flyoverCallPayload, result } as FlyoverCall);
@@ -79,8 +81,10 @@ export const actions: ActionTree<FlyoverPegoutState, RootState> = {
           });
           result = constants.FlyoverCallResult.SUCCESS;
           commit(constants.FLYOVER_PEGOUT_SET_QUOTES, quotesByProvider);
+          commit(constants.FLYOVER_PEGOUT_SET_RESPONDING, true);
           resolve();
         } catch (e) {
+          commit(constants.FLYOVER_PEGOUT_SET_RESPONDING, false);
           reject();
         } finally {
           try {
diff --git a/src/pegout/store/FlyoverPegout/mutations.ts b/src/pegout/store/FlyoverPegout/mutations.ts
index a9344471..e9ed2fff 100644
--- a/src/pegout/store/FlyoverPegout/mutations.ts
+++ b/src/pegout/store/FlyoverPegout/mutations.ts
@@ -32,4 +32,7 @@ export const mutations: MutationTree<FlyoverPegoutState> = {
   [constants.FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCES]: (state, differences) => {
     state.differences = differences;
   },
+  [constants.FLYOVER_PEGOUT_SET_RESPONDING]: (state, isResponding) => {
+    state.isResponding = isResponding;
+  },
 };
diff --git a/src/status/views/Status.vue b/src/status/views/Status.vue
index 1edf6c62..b2c219bc 100644
--- a/src/status/views/Status.vue
+++ b/src/status/views/Status.vue
@@ -23,7 +23,7 @@
                 :txWithErrorType="txWithErrorType" :txWithError="txWithError" />
       <tx-pegout v-if="isPegOut" :txId="txId" :isFlyover="isFlyover"
                 :txWithErrorType="txWithErrorType" :txWithError="txWithError" />
-      <status-progress-bar v-if="txWithErrorType" :isFlyover="isFlyover"
+      <status-progress-bar class="mt-4" v-if="txWithErrorType" :isFlyover="isFlyover"
                 :txWithErrorType="txWithErrorType" :txWithError="txWithError" />
     </v-row>
     <v-row v-else>