From dbb29ebc147d49a69751dcf4e449b9872613d04c Mon Sep 17 00:00:00 2001
From: Vladan <tomic.vladan.mail@gmail.com>
Date: Wed, 20 Dec 2023 17:23:45 +0100
Subject: [PATCH 1/3] feat: metamask auto login

---
 package-lock.json                             | 368 ++++++++++--------
 package.json                                  |   2 +
 .../Connect/Metamask/MetamaskConnect.tsx      |  62 +--
 .../Modals/PasswordModal/PasswordModal.tsx    |  16 +-
 src/context/MetamaskContext.tsx               |  71 +++-
 src/pages/_app.tsx                            |  12 +-
 src/utils/encryption.ts                       |  58 +++
 src/utils/localStorage.ts                     |   9 +
 src/utils/metamask.ts                         |  24 +-
 9 files changed, 414 insertions(+), 208 deletions(-)
 create mode 100644 src/utils/encryption.ts

diff --git a/package-lock.json b/package-lock.json
index b9d5d7c5..eabae424 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,6 +19,7 @@
         "axios": "^0.21.1",
         "copy-to-clipboard": "^3.3.3",
         "cross-blob": "^3.0.1",
+        "crypto-js": "^4.2.0",
         "ethers": "^5.6.9",
         "file-saver": "^2.0.5",
         "framer-motion": "^10.12.18",
@@ -46,6 +47,7 @@
         "@tailwindcss/aspect-ratio": "^0.2.1",
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^13.4.0",
+        "@types/crypto-js": "^4.2.1",
         "@types/file-saver": "^2.0.5",
         "@types/jest": "^29.5.1",
         "@types/node": "^17.0.9",
@@ -77,9 +79,9 @@
       }
     },
     "node_modules/@adobe/css-tools": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz",
-      "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz",
+      "integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==",
       "dev": true
     },
     "node_modules/@ampproject/remapping": {
@@ -94,11 +96,12 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
-      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
       "dependencies": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.23.4",
+        "chalk": "^2.4.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -142,11 +145,11 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz",
-      "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
       "dependencies": {
-        "@babel/types": "^7.21.5",
+        "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -270,9 +273,9 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz",
-      "integrity": "sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -288,22 +291,23 @@
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "license": "MIT",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -423,27 +427,28 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "license": "MIT",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -484,11 +489,12 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "license": "MIT",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -496,9 +502,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.21.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
-      "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1994,32 +2000,32 @@
       "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
     },
     "node_modules/@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz",
-      "integrity": "sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==",
-      "dependencies": {
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.5",
-        "@babel/helper-environment-visitor": "^7.21.5",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.5",
-        "@babel/types": "^7.21.5",
-        "debug": "^4.1.0",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.6.tgz",
+      "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==",
+      "dependencies": {
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.6",
+        "@babel/types": "^7.23.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -2027,12 +2033,12 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
-      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -2344,9 +2350,9 @@
       }
     },
     "node_modules/@ethersphere/bee-js/node_modules/axios": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
-      "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -7281,6 +7287,12 @@
         "@types/har-format": "*"
       }
     },
+    "node_modules/@types/crypto-js": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.2.1.tgz",
+      "integrity": "sha512-FSPGd9+OcSok3RsM0UZ/9fcvMOXJ1ENE/ZbLfOPlBWj7BgXtEAM8VYfTtT760GiLbQIMoVozwVuisjvsVwqYWw==",
+      "dev": true
+    },
     "node_modules/@types/debug": {
       "version": "4.1.8",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.8.tgz",
@@ -8872,18 +8884,22 @@
       }
     },
     "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "license": "ISC",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
       "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
         "create-hash": "^1.2.0",
         "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
+        "elliptic": "^6.5.4",
         "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 4"
       }
     },
     "node_modules/browserify-zlib": {
@@ -17611,8 +17627,15 @@
       "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="
     },
     "node_modules/nanoid": {
-      "version": "3.3.4",
-      "license": "MIT",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -18711,7 +18734,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.17",
+      "version": "8.4.32",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
+      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
       "dev": true,
       "funding": [
         {
@@ -18721,11 +18746,14 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
@@ -19266,9 +19294,9 @@
       }
     },
     "node_modules/react-devtools-core": {
-      "version": "4.28.0",
-      "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.0.tgz",
-      "integrity": "sha512-E3C3X1skWBdBzwpOUbmXG8SgH6BtsluSMe+s6rRcujNKG1DGi8uIfhdhszkgDpAsMoE55hwqRUzeXCmETDBpTg==",
+      "version": "4.28.5",
+      "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.5.tgz",
+      "integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==",
       "peer": true,
       "dependencies": {
         "shell-quote": "^1.6.1",
@@ -19615,8 +19643,9 @@
       }
     },
     "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "license": "MIT",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -23123,9 +23152,9 @@
   },
   "dependencies": {
     "@adobe/css-tools": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz",
-      "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz",
+      "integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==",
       "dev": true
     },
     "@ampproject/remapping": {
@@ -23136,11 +23165,12 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
-      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
       "requires": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.23.4",
+        "chalk": "^2.4.2"
       }
     },
     "@babel/compat-data": {
@@ -23171,11 +23201,11 @@
       }
     },
     "@babel/generator": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz",
-      "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
       "requires": {
-        "@babel/types": "^7.21.5",
+        "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -23269,9 +23299,9 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz",
-      "integrity": "sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ=="
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
     },
     "@babel/helper-explode-assignable-expression": {
       "version": "7.18.6",
@@ -23280,18 +23310,20 @@
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "requires": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.18.6",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-member-expression-to-functions": {
@@ -23377,20 +23409,22 @@
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
     },
     "@babel/helper-validator-option": {
       "version": "7.22.5",
@@ -23419,17 +23453,19 @@
       }
     },
     "@babel/highlight": {
-      "version": "7.18.6",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.21.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
-      "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.18.6",
@@ -24355,39 +24391,39 @@
       }
     },
     "@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/traverse": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz",
-      "integrity": "sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==",
-      "requires": {
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.5",
-        "@babel/helper-environment-visitor": "^7.21.5",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.5",
-        "@babel/types": "^7.21.5",
-        "debug": "^4.1.0",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.6.tgz",
+      "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==",
+      "requires": {
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.6",
+        "@babel/types": "^7.23.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
-      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
       "requires": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -24631,9 +24667,9 @@
       },
       "dependencies": {
         "axios": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
-          "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
+          "version": "1.6.2",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+          "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
           "requires": {
             "follow-redirects": "^1.15.0",
             "form-data": "^4.0.0",
@@ -28091,6 +28127,12 @@
         "@types/har-format": "*"
       }
     },
+    "@types/crypto-js": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.2.1.tgz",
+      "integrity": "sha512-FSPGd9+OcSok3RsM0UZ/9fcvMOXJ1ENE/ZbLfOPlBWj7BgXtEAM8VYfTtT760GiLbQIMoVozwVuisjvsVwqYWw==",
+      "dev": true
+    },
     "@types/debug": {
       "version": "4.1.8",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.8.tgz",
@@ -29259,17 +29301,19 @@
       }
     },
     "browserify-sign": {
-      "version": "4.2.1",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
       "requires": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
         "create-hash": "^1.2.0",
         "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
+        "elliptic": "^6.5.4",
         "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
       }
     },
     "browserify-zlib": {
@@ -35473,7 +35517,9 @@
       "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="
     },
     "nanoid": {
-      "version": "3.3.4"
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -36179,10 +36225,12 @@
       "peer": true
     },
     "postcss": {
-      "version": "8.4.17",
+      "version": "8.4.32",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
+      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       }
@@ -36520,9 +36568,9 @@
       }
     },
     "react-devtools-core": {
-      "version": "4.28.0",
-      "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.0.tgz",
-      "integrity": "sha512-E3C3X1skWBdBzwpOUbmXG8SgH6BtsluSMe+s6rRcujNKG1DGi8uIfhdhszkgDpAsMoE55hwqRUzeXCmETDBpTg==",
+      "version": "4.28.5",
+      "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.5.tgz",
+      "integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==",
       "peer": true,
       "requires": {
         "shell-quote": "^1.6.1",
@@ -36782,7 +36830,9 @@
       }
     },
     "readable-stream": {
-      "version": "3.6.0",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "requires": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
diff --git a/package.json b/package.json
index 186b57df..9e89eaba 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "axios": "^0.21.1",
     "copy-to-clipboard": "^3.3.3",
     "cross-blob": "^3.0.1",
+    "crypto-js": "^4.2.0",
     "ethers": "^5.6.9",
     "file-saver": "^2.0.5",
     "framer-motion": "^10.12.18",
@@ -59,6 +60,7 @@
     "@tailwindcss/aspect-ratio": "^0.2.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
+    "@types/crypto-js": "^4.2.1",
     "@types/file-saver": "^2.0.5",
     "@types/jest": "^29.5.1",
     "@types/node": "^17.0.9",
diff --git a/src/components/Connect/Metamask/MetamaskConnect.tsx b/src/components/Connect/Metamask/MetamaskConnect.tsx
index 6a1c4ccf..d83fd83b 100644
--- a/src/components/Connect/Metamask/MetamaskConnect.tsx
+++ b/src/components/Connect/Metamask/MetamaskConnect.tsx
@@ -2,6 +2,8 @@ import { Button } from '@components/Buttons';
 import MetamaskIcon from '@media/UI/metamask.svg';
 import {
   decryptWallet,
+  encryptMnemonic,
+  getBasicSignature,
   getBasicSignatureWallet,
   getMetamaskDeeplinkUrl,
   isMetamaskAvailable,
@@ -9,7 +11,7 @@ import {
 import { useRouter } from 'next/router';
 import { getDefaultNetwork, useFdpStorage } from '@context/FdpStorageContext';
 import MetamaskNotFoundModal from '@components/Modals/MetamaskNotFoundModal/MetamaskNotFoundModal';
-import { useContext, useEffect, useState } from 'react';
+import { useContext, useState } from 'react';
 import UserContext from '@context/UserContext';
 import Spinner from '@components/Spinner/Spinner';
 import { getInvite, login } from '@utils/invite';
@@ -17,6 +19,7 @@ import PasswordModal from '@components/Modals/PasswordModal/PasswordModal';
 import { isMobile } from 'react-device-detect';
 import { useMetamask } from '@context/MetamaskContext';
 import { Network } from '@data/networks';
+import { setMetamaskMnemonic } from '@utils/localStorage';
 
 interface MetamaskConnectProps {
   onConnect: () => void;
@@ -37,8 +40,12 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => {
   } = useFdpStorage();
   const { setErrorMessage, setAddress, setMnemonic } = useContext(UserContext);
   const router = useRouter();
-  const { connectMetamask, metamaskProvider, metamaskWalletAddress } =
-    useMetamask();
+  const {
+    loading: metamaskLoading,
+    connectMetamask,
+    metamaskProvider,
+    metamaskWalletAddress,
+  } = useMetamask();
   const [network] = useState<Network>(getDefaultNetwork());
 
   /**
@@ -60,7 +67,10 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => {
    *
    * @param password Password from modal input
    */
-  const handlePassword = async (password: string): Promise<void> => {
+  const handlePassword = async (
+    password: string,
+    saveMnemonic: boolean
+  ): Promise<void> => {
     try {
       const wallet = await decryptWallet(localBasicWallet, password);
       const mnemonic = wallet.mnemonic.phrase;
@@ -74,6 +84,17 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => {
       setAddress(wallet.address);
       setMnemonic(mnemonic);
 
+      if (saveMnemonic) {
+        const signature = await getBasicSignature(
+          metamaskProvider,
+          metamaskWalletAddress
+        );
+
+        setMetamaskMnemonic(encryptMnemonic(mnemonic, signature));
+      } else {
+        setMetamaskMnemonic('');
+      }
+
       router.push('/drive');
     } catch (error) {
       console.error(error);
@@ -99,45 +120,28 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => {
 
     try {
       setLoading(true);
-      await connectMetamask();
+      const { provider, account } = await connectMetamask();
+
+      setLocalBasicWallet(await getBasicSignatureWallet(provider, account));
+
+      setShowPasswordModal(true);
     } catch (error) {
       console.error(error);
       setErrorMessage(String(error.message || error));
+    } finally {
       setLoading(false);
     }
   };
 
-  useEffect(() => {
-    async function run() {
-      if (!(metamaskProvider && metamaskWalletAddress)) {
-        return;
-      }
-
-      try {
-        setLocalBasicWallet(
-          await getBasicSignatureWallet(metamaskProvider, metamaskWalletAddress)
-        );
-
-        setShowPasswordModal(true);
-      } catch (e) {
-        console.error(e);
-      } finally {
-        setLoading(false);
-      }
-    }
-
-    run();
-  }, [metamaskProvider, metamaskWalletAddress]);
-
   return (
     <>
       <Button
         variant="tertiary-outlined"
         className="w-28 h-10 relative text-color-accents-purple-black dark:text-color-accents-grey-lavendar"
         label="Metamask"
-        disabled={loading}
+        disabled={loading || metamaskLoading}
         icon={
-          loading ? (
+          loading || metamaskLoading ? (
             <Spinner className="absolute top-3 left-6" />
           ) : (
             <MetamaskIcon className="inline-block ml-2" />
diff --git a/src/components/Modals/PasswordModal/PasswordModal.tsx b/src/components/Modals/PasswordModal/PasswordModal.tsx
index e41f0a8e..6d7ca43b 100644
--- a/src/components/Modals/PasswordModal/PasswordModal.tsx
+++ b/src/components/Modals/PasswordModal/PasswordModal.tsx
@@ -12,11 +12,12 @@ import {
   getMetamaskPassphraseExplanation,
   setMetamaskPassphraseExplanation,
 } from '@utils/localStorage';
+import CustomCheckbox from '@components/Inputs/CustomCheckbox/CustomCheckbox';
 
 interface PasswordModalProps {
   showModal: boolean;
   closeModal: () => void;
-  handleSubmitForm: (password: string) => Promise<void>;
+  handleSubmitForm: (password: string, save: boolean) => Promise<void>;
 }
 
 const PasswordModal: FC<PasswordModalProps> = ({
@@ -30,12 +31,13 @@ const PasswordModal: FC<PasswordModalProps> = ({
   const { errors } = formState;
   const [loading, setLoading] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
+  const [saveMnemonic, setSaveMnemonic] = useState(true);
   const { intl } = useLocales();
 
   const handleSubmitButton = async (data) => {
     setLoading(true);
     try {
-      await handleSubmitForm(data.password);
+      await handleSubmitForm(data.password, saveMnemonic);
       setMetamaskPassphraseExplanation(false);
       closeModal();
     } catch (e) {
@@ -73,6 +75,16 @@ const PasswordModal: FC<PasswordModalProps> = ({
 
         <p className="text-sm mb-5">{intl.get('PASSPHRASE_EXPLANATION')}</p>
 
+        <div className="flex">
+          <CustomCheckbox
+            className="m-auto mb-8"
+            name="save"
+            checked={saveMnemonic}
+            onChange={() => setSaveMnemonic(!saveMnemonic)}
+          >
+            {intl.get('REMEMBER_ME')}
+          </CustomCheckbox>
+        </div>
         <div className="text-center">
           <Button
             type="submit"
diff --git a/src/context/MetamaskContext.tsx b/src/context/MetamaskContext.tsx
index c1ef3950..4c25cc38 100644
--- a/src/context/MetamaskContext.tsx
+++ b/src/context/MetamaskContext.tsx
@@ -1,24 +1,43 @@
-import React, { createContext, useContext, useState } from 'react';
-import { MetaMaskSDK } from '@metamask/sdk';
+import React, { createContext, useContext, useEffect, useState } from 'react';
+import { MetaMaskSDK, SDKProvider } from '@metamask/sdk';
+import { getMetamaskMnemonic } from '@utils/localStorage';
+import { getDefaultNetwork, useFdpStorage } from './FdpStorageContext';
+import UserContext from './UserContext';
+import { decryptMnemonic, getBasicSignature } from '@utils/metamask';
+import { Wallet } from 'ethers';
+import { useRouter } from 'next/router';
 
 /**
  * Metamask context props
  */
 interface MetamaskContextProps {
-  connectMetamask: () => Promise<void>;
+  connectMetamask: () => Promise<{ provider: SDKProvider; account: string }>;
   reset: () => void;
   metamaskWalletAddress: string;
   metamaskProvider: any;
+  loading: boolean;
 }
 
 const MetamaskContext = createContext<MetamaskContextProps | null>(null);
 
 export const MetamaskProvider: React.FC = ({ children }) => {
+  const {
+    fdpClientRef,
+    setIsLoggedIn,
+    setWallet,
+    setFdpStorageType,
+    setLoginType,
+  } = useFdpStorage();
+  const { setAddress, setMnemonic } = useContext(UserContext);
   const [metamaskWalletAddress, setMetamaskWalletAddress] =
     useState<string>('');
   const [metamaskProvider, setMetamaskProvider] = useState<any>(null);
+  const [loading, setLoading] = useState(false);
+  const router = useRouter();
 
-  const connectMetamask = async (name = 'Fairdrive'): Promise<void> => {
+  const connectMetamask = async (
+    name = 'Fairdrive'
+  ): Promise<{ provider: SDKProvider; account: string }> => {
     setMetamaskProvider(null);
     setMetamaskWalletAddress('');
 
@@ -44,10 +63,14 @@ export const MetamaskProvider: React.FC = ({ children }) => {
       throw new Error('No accounts available');
     }
 
-    setMetamaskProvider(
-      window?.ethereum?.isMetaMask ? window?.ethereum : MMSDK.getProvider()
-    );
+    const provider = window?.ethereum?.isMetaMask
+      ? window?.ethereum
+      : MMSDK.getProvider();
+
+    setMetamaskProvider(provider);
     setMetamaskWalletAddress(accounts[0]);
+
+    return { provider, account: accounts[0] };
   };
 
   const reset = () => {
@@ -55,6 +78,39 @@ export const MetamaskProvider: React.FC = ({ children }) => {
     setMetamaskProvider(null);
   };
 
+  const autoLogin = async () => {
+    try {
+      setLoading(true);
+      const { provider, account } = await connectMetamask();
+      const network = getDefaultNetwork();
+      const signature = await getBasicSignature(provider, account);
+      const mnemonic = decryptMnemonic(getMetamaskMnemonic(), signature);
+
+      const wallet = Wallet.fromMnemonic(mnemonic);
+
+      setFdpStorageType('native', network.config);
+      fdpClientRef.current.account.setAccountFromMnemonic(mnemonic);
+      setIsLoggedIn(true);
+      setLoginType('metamask');
+      setWallet(wallet);
+      setAddress(wallet.address);
+      setMnemonic(mnemonic);
+
+      router.push('/drive');
+    } catch (error) {
+      console.error(error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    console.log('MetamaskContext');
+    if (getMetamaskMnemonic()) {
+      autoLogin();
+    }
+  }, []);
+
   return (
     <MetamaskContext.Provider
       value={{
@@ -62,6 +118,7 @@ export const MetamaskProvider: React.FC = ({ children }) => {
         reset,
         metamaskWalletAddress,
         metamaskProvider,
+        loading,
       }}
     >
       {children}
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index b61ee807..ff62c2ca 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -44,9 +44,9 @@ import { MetamaskProvider } from '@context/MetamaskContext';
 
 function MyApp({ Component, pageProps, router }: AppProps) {
   return (
-    <MetamaskProvider>
-      <LocalesProvider>
-        <FdpStorageProvider>
+    <LocalesProvider>
+      <FdpStorageProvider>
+        <MetamaskProvider>
           <MatomoProvider>
             <ThemeProvider>
               <UserProvider>
@@ -66,9 +66,9 @@ function MyApp({ Component, pageProps, router }: AppProps) {
               </UserProvider>
             </ThemeProvider>
           </MatomoProvider>
-        </FdpStorageProvider>
-      </LocalesProvider>
-    </MetamaskProvider>
+        </MetamaskProvider>
+      </FdpStorageProvider>
+    </LocalesProvider>
   );
 }
 
diff --git a/src/utils/encryption.ts b/src/utils/encryption.ts
new file mode 100644
index 00000000..a8a6b678
--- /dev/null
+++ b/src/utils/encryption.ts
@@ -0,0 +1,58 @@
+import CryptoJS from 'crypto-js';
+
+const IV_LENGTH = 16;
+
+/**
+ * Encrypt WordArray with password
+ *
+ * @param password string for text encryption
+ * @param data WordArray to be encrypted
+ * @param customIv initial vector for AES. In case of absence, a random vector will be created
+ */
+export function encrypt(
+  password: string,
+  data: CryptoJS.lib.WordArray | string,
+  customIv?: CryptoJS.lib.WordArray
+): CryptoJS.lib.WordArray {
+  const iv = customIv || CryptoJS.lib.WordArray.random(IV_LENGTH);
+  const key = CryptoJS.SHA256(password);
+
+  const cipherParams = CryptoJS.AES.encrypt(data, key, {
+    iv,
+    mode: CryptoJS.mode.CFB,
+    padding: CryptoJS.pad.NoPadding,
+  });
+
+  return iv.concat(cipherParams.ciphertext);
+}
+
+/**
+ * Decrypts WordsArray with password
+ *
+ * @param password string to decrypt bytes
+ * @param data WordsArray to be decrypted
+ */
+export function decrypt(
+  password: string,
+  data: CryptoJS.lib.WordArray
+): CryptoJS.lib.WordArray {
+  const wordSize = 4;
+  const key = CryptoJS.SHA256(password);
+  const iv = CryptoJS.lib.WordArray.create(
+    data.words.slice(0, IV_LENGTH),
+    IV_LENGTH
+  );
+  const textBytes = CryptoJS.lib.WordArray.create(
+    data.words.slice(IV_LENGTH / wordSize),
+    data.sigBytes - IV_LENGTH
+  );
+  const cipherParams = CryptoJS.lib.CipherParams.create({
+    ciphertext: textBytes,
+  });
+
+  return CryptoJS.AES.decrypt(cipherParams, key, {
+    iv,
+    mode: CryptoJS.mode.CFB,
+    padding: CryptoJS.pad.NoPadding,
+  });
+}
diff --git a/src/utils/localStorage.ts b/src/utils/localStorage.ts
index aa380836..c1c571c0 100644
--- a/src/utils/localStorage.ts
+++ b/src/utils/localStorage.ts
@@ -2,6 +2,7 @@ export enum LocalStorageKeys {
   NETWORK = 'network',
   METAMASK_MIGRATION_DIALOG = 'metamask-migration-dialog',
   METAMASK_PASSPHRASE_EXPLANATION_HIDE = 'metamask-migration-explanation-hide',
+  METAMASK_MNEMONIC = 'metamask-mnemonic',
 }
 
 /**
@@ -38,3 +39,11 @@ export function getMetamaskPassphraseExplanation(): boolean {
     localStorage.getItem(LocalStorageKeys.METAMASK_PASSPHRASE_EXPLANATION_HIDE)
   );
 }
+
+export function setMetamaskMnemonic(mnemonic: string) {
+  localStorage.setItem(LocalStorageKeys.METAMASK_MNEMONIC, mnemonic);
+}
+
+export function getMetamaskMnemonic(): string {
+  return localStorage.getItem(LocalStorageKeys.METAMASK_MNEMONIC);
+}
diff --git a/src/utils/metamask.ts b/src/utils/metamask.ts
index 8f4056c2..69088c33 100644
--- a/src/utils/metamask.ts
+++ b/src/utils/metamask.ts
@@ -1,6 +1,9 @@
+import { enc } from 'crypto-js';
 import { WindowWithEthereum } from '@interfaces/window';
 import { utils, Wallet } from 'ethers';
 import { extractDeeplinkURL } from '@utils/url';
+import { SDKProvider } from '@metamask/sdk';
+import { decrypt, encrypt } from './encryption';
 
 declare const window: WindowWithEthereum;
 
@@ -59,6 +62,13 @@ export const signatureToWallet = (signature: string): Wallet => {
   return Wallet.fromMnemonic(mnemonic);
 };
 
+export function getBasicSignature(
+  provider: SDKProvider,
+  address: string
+): Promise<string> {
+  return getSignature(provider, address, getSignWalletData(address));
+}
+
 /**
  * Creates a basic wallet using Metamask signature
  *
@@ -71,11 +81,7 @@ export const getBasicSignatureWallet = async (
   address: string,
   password = ''
 ): Promise<Wallet> => {
-  const signature = await getSignature(
-    provider,
-    address,
-    getSignWalletData(address)
-  );
+  const signature = await getBasicSignature(provider, address);
   const wallet = signatureToWallet(signature);
   if (password) {
     return decryptWallet(wallet, password);
@@ -98,6 +104,14 @@ export const decryptWallet = async (wallet: Wallet, password: string) => {
   return signatureToWallet(signature);
 };
 
+export function encryptMnemonic(mnemonic: string, signature: string): string {
+  return enc.Base64.stringify(encrypt(signature, enc.Utf8.parse(mnemonic)));
+}
+
+export function decryptMnemonic(mnemonic: string, signature: string): string {
+  return enc.Utf8.stringify(decrypt(signature, enc.Base64.parse(mnemonic)));
+}
+
 /**
  * Gets a chain ID
  *

From a4ffe77cdbbddad5403a9aaa08f75ddef88d87a3 Mon Sep 17 00:00:00 2001
From: Vladan <tomic.vladan.mail@gmail.com>
Date: Thu, 21 Dec 2023 13:21:35 +0100
Subject: [PATCH 2/3] fix: provider order

---
 src/pages/_app.tsx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index ff62c2ca..b6190b91 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -45,11 +45,11 @@ import { MetamaskProvider } from '@context/MetamaskContext';
 function MyApp({ Component, pageProps, router }: AppProps) {
   return (
     <LocalesProvider>
-      <FdpStorageProvider>
-        <MetamaskProvider>
-          <MatomoProvider>
-            <ThemeProvider>
-              <UserProvider>
+      <UserProvider>
+        <FdpStorageProvider>
+          <MetamaskProvider>
+            <MatomoProvider>
+              <ThemeProvider>
                 <SearchProvider>
                   <PodProvider>
                     <DialogProvider>
@@ -63,11 +63,11 @@ function MyApp({ Component, pageProps, router }: AppProps) {
                     </DialogProvider>
                   </PodProvider>
                 </SearchProvider>
-              </UserProvider>
-            </ThemeProvider>
-          </MatomoProvider>
-        </MetamaskProvider>
-      </FdpStorageProvider>
+              </ThemeProvider>
+            </MatomoProvider>
+          </MetamaskProvider>
+        </FdpStorageProvider>
+      </UserProvider>
     </LocalesProvider>
   );
 }

From 03df584151ba96b1bd60b846a5ffdf7690a63d3e Mon Sep 17 00:00:00 2001
From: Vladan <tomic.vladan.mail@gmail.com>
Date: Wed, 27 Mar 2024 14:09:14 +0100
Subject: [PATCH 3/3] fix: metamask context

---
 src/context/MetamaskContext.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/context/MetamaskContext.tsx b/src/context/MetamaskContext.tsx
index 4c25cc38..865de9d9 100644
--- a/src/context/MetamaskContext.tsx
+++ b/src/context/MetamaskContext.tsx
@@ -88,7 +88,7 @@ export const MetamaskProvider: React.FC = ({ children }) => {
 
       const wallet = Wallet.fromMnemonic(mnemonic);
 
-      setFdpStorageType('native', network.config);
+      setFdpStorageType('native', network.ensConfig, network.datahubConfig);
       fdpClientRef.current.account.setAccountFromMnemonic(mnemonic);
       setIsLoggedIn(true);
       setLoginType('metamask');