From a458c3ace7ec748d62c4c0e6fc0c000b420c4456 Mon Sep 17 00:00:00 2001
From: Igor Shadurin <igor.shadurin@gmail.com>
Date: Fri, 15 Dec 2023 13:49:10 +0300
Subject: [PATCH 01/11] feat: display text status of invites

---
 src/components/Invites/Invites.tsx | 15 +++++++--------
 src/locales/ch-CH.json             |  5 +++++
 src/locales/de-DE.json             |  5 +++++
 src/locales/en-US.json             |  5 +++++
 src/locales/es-ES.json             |  5 +++++
 src/locales/fr-FR.json             |  5 +++++
 src/locales/hu-HU.json             |  5 +++++
 src/locales/it-IT.json             |  5 +++++
 src/locales/jp-JP.json             |  5 +++++
 src/locales/pt-PT.json             |  5 +++++
 src/locales/rs-RS.json             |  5 +++++
 src/locales/sl-SI.json             |  5 +++++
 src/locales/tr-TR.json             |  5 +++++
 13 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/src/components/Invites/Invites.tsx b/src/components/Invites/Invites.tsx
index 5291459e..532c8dac 100644
--- a/src/components/Invites/Invites.tsx
+++ b/src/components/Invites/Invites.tsx
@@ -14,7 +14,6 @@ import BackImage from '@media/UI/invite/back.png';
 import EditImage from '@media/UI/invite/pencil.png';
 import SaveImage from '@media/UI/invite/check-mark.png';
 import DeleteImage from '@media/UI/invite/delete.png';
-import DollarImage from '@media/UI/invite/dollar-sign.png';
 import EmptyImage from '@media/UI/invite/empty.png';
 import copy from 'copy-to-clipboard';
 import { ConfirmDeleteModal } from '@components/Modals';
@@ -167,11 +166,15 @@ const Invites: FC<AllInvitesProps> = ({
     }
 
     const inviteStatusText = intl.get(InviteStatusText[status]);
+    const inviteStatusTextShort = intl.get(`${InviteStatusText[status]}_SHORT`);
     return {
       inviteStatusClass: classes[status],
       inviteStatusText: inviteStatusText
         ? inviteStatusText
         : intl.get('STATUS_IS_NOT_AVAILABLE'),
+      inviteStatusTextShort: inviteStatusTextShort
+        ? inviteStatusTextShort
+        : intl.get('STATUS_IS_NOT_AVAILABLE_SHORT'),
     };
   };
 
@@ -287,13 +290,9 @@ const Invites: FC<AllInvitesProps> = ({
                           setInviteAction(invite, InviteMode.Delete)
                         }
                       />
-                      {/*<img*/}
-                      {/*  className={getActionClasses(invite)}*/}
-                      {/*  width={18}*/}
-                      {/*  src={DollarImage.src}*/}
-                      {/*  alt="Top Up the invite"*/}
-                      {/*  onClick={() => onTopUpInvite && onTopUpInvite(invite)}*/}
-                      {/*/>*/}
+                      <button className="ml-auto text-sm font-medium bg-green-200 text-green-700 py-0.5 px-2 rounded-full shadow-md hover:bg-green-300 focus:outline-none focus:ring-green-400 focus:ring-opacity-75 flex items-center whitespace-nowrap mb-1">
+                        {inviteStatus.inviteStatusTextShort}
+                      </button>
                     </div>
                   )}
                   <div
diff --git a/src/locales/ch-CH.json b/src/locales/ch-CH.json
index 9f399648..6232f551 100644
--- a/src/locales/ch-CH.json
+++ b/src/locales/ch-CH.json
@@ -96,6 +96,11 @@
   "INVITE_NOT_USED_YET": "邀请尚未使用",
   "INVITE_IS_PRIVATE": "邀请是私密的",
   "STATUS_IS_NOT_AVAILABLE": "状态不可用",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "已注册",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "通过MetaMask登录",
+  "INVITE_NOT_USED_YET_SHORT": "未使用",
+  "INVITE_IS_PRIVATE_SHORT": "私有",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "不可用",
   "NO_INVITES_HERE": "这里没有邀请",
   "COPY_INVITE": "点击复制邀请",
   "URL_COPIED": "URL 已复制",
diff --git a/src/locales/de-DE.json b/src/locales/de-DE.json
index 37f877fc..24869503 100644
--- a/src/locales/de-DE.json
+++ b/src/locales/de-DE.json
@@ -97,6 +97,11 @@
   "INVITE_NOT_USED_YET": "Einladung noch nicht verwendet",
   "INVITE_IS_PRIVATE": "Einladung ist privat",
   "STATUS_IS_NOT_AVAILABLE": "Status ist nicht verfügbar",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "Registriert",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "Eingeloggt",
+  "INVITE_NOT_USED_YET_SHORT": "Noch nicht verwendet",
+  "INVITE_IS_PRIVATE_SHORT": "Privat",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "Nicht verfügbar",
   "NO_INVITES_HERE": "Keine Einladungen hier",
   "COPY_INVITE": "Klicken, um die Einladung zu kopieren",
   "URL_COPIED": "URL kopiert",
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 37092efc..0b3141c6 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -97,6 +97,11 @@
   "INVITE_NOT_USED_YET": "Invite not used yet",
   "INVITE_IS_PRIVATE": "Invite is private",
   "STATUS_IS_NOT_AVAILABLE": "Status is not available",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "Registered",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "Logged in",
+  "INVITE_NOT_USED_YET_SHORT": "Not used",
+  "INVITE_IS_PRIVATE_SHORT": "Private",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "N/A",
   "NO_INVITES_HERE": "No invites here",
   "COPY_INVITE": "Click to copy the invite",
   "URL_COPIED": "URL copied",
diff --git a/src/locales/es-ES.json b/src/locales/es-ES.json
index efe330d1..5031ec66 100644
--- a/src/locales/es-ES.json
+++ b/src/locales/es-ES.json
@@ -97,6 +97,11 @@
   "INVITE_NOT_USED_YET": "La invitación aún no ha sido utilizada",
   "INVITE_IS_PRIVATE": "La invitación es privada",
   "STATUS_IS_NOT_AVAILABLE": "El estado no está disponible",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "Registrado",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "Conectado",
+  "INVITE_NOT_USED_YET_SHORT": "No utilizado",
+  "INVITE_IS_PRIVATE_SHORT": "Privado",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "No disponible",
   "NO_INVITES_HERE": "No hay invitaciones aquí",
   "COPY_INVITE": "Haga clic para copiar la invitación",
   "URL_COPIED": "URL copiada",
diff --git a/src/locales/fr-FR.json b/src/locales/fr-FR.json
index 07f87c42..786f0420 100644
--- a/src/locales/fr-FR.json
+++ b/src/locales/fr-FR.json
@@ -97,6 +97,11 @@
   "INVITE_NOT_USED_YET": "L'invitation n'a pas encore été utilisée",
   "INVITE_IS_PRIVATE": "L'invitation est privée",
   "STATUS_IS_NOT_AVAILABLE": "Le statut n'est pas disponible",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "Enregistré",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "Connecté",
+  "INVITE_NOT_USED_YET_SHORT": "Pas encore utilisé",
+  "INVITE_IS_PRIVATE_SHORT": "Privé",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "Indisponible",
   "NO_INVITES_HERE": "Aucune invitation ici",
   "COPY_INVITE": "Cliquez pour copier l'invitation",
   "URL_COPIED": "URL copiée",
diff --git a/src/locales/hu-HU.json b/src/locales/hu-HU.json
index 80709093..71bc79d0 100644
--- a/src/locales/hu-HU.json
+++ b/src/locales/hu-HU.json
@@ -97,6 +97,11 @@
   "INVITE_NOT_USED_YET": "A meghívó még nem lett használva",
   "INVITE_IS_PRIVATE": "A meghívó privát",
   "STATUS_IS_NOT_AVAILABLE": "Az állapot nem érhető el",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "Regisztrált",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "Bejelentkezett",
+  "INVITE_NOT_USED_YET_SHORT": "Még nem használt",
+  "INVITE_IS_PRIVATE_SHORT": "Privát",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "Nem elérhető",
   "NO_INVITES_HERE": "Nincsenek meghívók itt",
   "COPY_INVITE": "Kattints a meghívó másolásához",
   "URL_COPIED": "URL másolva",
diff --git a/src/locales/it-IT.json b/src/locales/it-IT.json
index ae2f6156..59de2c21 100644
--- a/src/locales/it-IT.json
+++ b/src/locales/it-IT.json
@@ -97,6 +97,11 @@
   "INVITE_NOT_USED_YET": "Invito non ancora utilizzato",
   "INVITE_IS_PRIVATE": "L'invito è privato",
   "STATUS_IS_NOT_AVAILABLE": "Lo stato non è disponibile",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "Registrato",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "Connesso",
+  "INVITE_NOT_USED_YET_SHORT": "Non utilizzato",
+  "INVITE_IS_PRIVATE_SHORT": "Privato",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "Non disponibile",
   "NO_INVITES_HERE": "Nessun invito qui",
   "COPY_INVITE": "Fai clic per copiare l'invito",
   "URL_COPIED": "URL copiato",
diff --git a/src/locales/jp-JP.json b/src/locales/jp-JP.json
index 689edbc2..9f857170 100644
--- a/src/locales/jp-JP.json
+++ b/src/locales/jp-JP.json
@@ -97,6 +97,11 @@
   "INVITE_NOT_USED_YET": "招待はまだ使用されていません",
   "INVITE_IS_PRIVATE": "招待はプライベートです",
   "STATUS_IS_NOT_AVAILABLE": "ステータスは利用できません",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "登録済み",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "MetaMask経由でログイン",
+  "INVITE_NOT_USED_YET_SHORT": "未使用",
+  "INVITE_IS_PRIVATE_SHORT": "非公開",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "利用不可",
   "NO_INVITES_HERE": "ここには招待がありません",
   "COPY_INVITE": "クリックして招待をコピー",
   "URL_COPIED": "コピーしました！",
diff --git a/src/locales/pt-PT.json b/src/locales/pt-PT.json
index b5384b75..06e82e34 100644
--- a/src/locales/pt-PT.json
+++ b/src/locales/pt-PT.json
@@ -97,6 +97,11 @@
   "INVITE_NOT_USED_YET": "Convite ainda não utilizado",
   "INVITE_IS_PRIVATE": "Convite é privado",
   "STATUS_IS_NOT_AVAILABLE": "Status não disponível",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "Registrado",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "Logado",
+  "INVITE_NOT_USED_YET_SHORT": "Não utilizado",
+  "INVITE_IS_PRIVATE_SHORT": "Privado",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "Indisponível",
   "NO_INVITES_HERE": "Nenhum convite aqui",
   "COPY_INVITE": "Clique para copiar o convite",
   "URL_COPIED": "URL copiada",
diff --git a/src/locales/rs-RS.json b/src/locales/rs-RS.json
index 0069a114..1f7fa485 100644
--- a/src/locales/rs-RS.json
+++ b/src/locales/rs-RS.json
@@ -97,6 +97,11 @@
   "INVITE_NOT_USED_YET": "Pozivnica još nije korišćena",
   "INVITE_IS_PRIVATE": "Pozivnica je privatna",
   "STATUS_IS_NOT_AVAILABLE": "Status nije dostupan",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "Registrovan",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "Ulogovan preko MetaMask-a",
+  "INVITE_NOT_USED_YET_SHORT": "Još nije iskorišćen",
+  "INVITE_IS_PRIVATE_SHORT": "Privatan",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "Nije dostupno",
   "NO_INVITES_HERE": "Nema pozivnica ovde",
   "COPY_INVITE": "Kliknite da kopirate pozivnicu",
   "URL_COPIED": "URL kopiran",
diff --git a/src/locales/sl-SI.json b/src/locales/sl-SI.json
index dd1e47aa..74b9b9f6 100644
--- a/src/locales/sl-SI.json
+++ b/src/locales/sl-SI.json
@@ -97,6 +97,11 @@
   "INVITE_NOT_USED_YET": "Povabilo še ni uporabljeno",
   "INVITE_IS_PRIVATE": "Povabilo je zasebno",
   "STATUS_IS_NOT_AVAILABLE": "Status ni na voljo",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "Registriran",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "Prijavljen",
+  "INVITE_NOT_USED_YET_SHORT": "Še ni uporabljeno",
+  "INVITE_IS_PRIVATE_SHORT": "Zasebno",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "Ni na voljo",
   "NO_INVITES_HERE": "Tukaj ni povabil",
   "COPY_INVITE": "Kliknite za kopiranje povabila",
   "URL_COPIED": "URL kopiran",
diff --git a/src/locales/tr-TR.json b/src/locales/tr-TR.json
index adc954c4..4a136de4 100644
--- a/src/locales/tr-TR.json
+++ b/src/locales/tr-TR.json
@@ -97,6 +97,11 @@
   "INVITE_NOT_USED_YET": "Davet henüz kullanılmadı",
   "INVITE_IS_PRIVATE": "Davet özeldir",
   "STATUS_IS_NOT_AVAILABLE": "Durum mevcut değil",
+  "FDS_ACCOUNT_REGISTERED_SHORT": "Kayıtlı",
+  "USER_LOGGED_IN_VIA_METAMASK_SHORT": "MetaMask ile giriş yapıldı",
+  "INVITE_NOT_USED_YET_SHORT": "Henüz kullanılmadı",
+  "INVITE_IS_PRIVATE_SHORT": "Özel",
+  "STATUS_IS_NOT_AVAILABLE_SHORT": "Mevcut değil",
   "NO_INVITES_HERE": "Burada davet yok",
   "COPY_INVITE": "Daveti kopyalamak için tıklayın",
   "URL_COPIED": "Kopyalandı!",

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 02/11] 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 03/11] 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 1feae7564d8284e10e1c4addcad7ad8acac7dc41 Mon Sep 17 00:00:00 2001
From: Vladan <tomic.vladan.mail@gmail.com>
Date: Mon, 4 Mar 2024 17:06:35 +0100
Subject: [PATCH 04/11] feat: subscription pods

---
 package-lock.json                             | 75 +++++++++-----
 package.json                                  |  2 +-
 src/api/files.ts                              | 23 +++--
 src/api/pod.ts                                | 43 +++++++-
 .../Buttons/DriveToggle/DriveToggle.tsx       | 53 ++++++----
 .../Connect/Metamask/MetamaskConnect.tsx      |  2 +-
 .../MetamaskUsernamePassword.tsx              |  2 +-
 .../DirectoryPath/DirectoryPath.tsx           |  9 +-
 .../DriveItemDropdown/DriveItemMenu.tsx       | 35 ++++---
 .../Dropdowns/PodDropdown/PodDropdownMenu.tsx | 47 ++++++---
 .../PodDropdown/PodDropdownToggle.tsx         | 12 ++-
 src/components/Forms/LoginForm/LoginForm.tsx  |  2 +-
 src/components/Inputs/SearchBar/SearchBar.tsx |  4 +-
 .../CreateFolderModal/CreateFolderModal.tsx   |  6 +-
 .../ImportFileModal/ImportFileModal.tsx       |  4 +-
 .../PreviewFileModal/PreviewFileModal.tsx     | 12 ++-
 .../UploadFileModal/UploadFileModal.tsx       | 16 +--
 .../DriveActionBar/DriveActionBar.tsx         |  6 +-
 .../DriveActionBar/DriveActionBarMobile.tsx   | 52 +++++-----
 .../DriveActionHeaderMobile.tsx               |  3 +
 .../DriveSideBar/DriveSideBar.tsx             | 98 +++++++++++++++----
 .../MainNavigationBar/MainNavigationBar.tsx   |  4 +-
 src/context/FdpStorageContext.tsx             | 30 +++---
 src/context/LocalesContext.tsx                | 18 ++--
 src/context/PodContext.tsx                    | 26 ++++-
 src/data/networks.ts                          | 24 +++--
 src/data/subscription.ts                      | 21 ++++
 src/locales/de-DE.json                        |  8 +-
 src/locales/en-US.json                        |  6 +-
 src/locales/es-ES.json                        |  6 +-
 src/locales/fr-FR.json                        |  6 +-
 src/locales/hu-HU.json                        |  8 +-
 src/locales/it-IT.json                        |  6 +-
 src/locales/{jp-JP.json => ja-JP.json}        |  6 +-
 src/locales/pt-PT.json                        |  6 +-
 src/locales/sl-SI.json                        |  6 +-
 src/locales/{rs-RS.json => sr-LATN.json}      |  6 +-
 src/locales/tr-TR.json                        |  6 +-
 src/locales/{ch-CH.json => zh.json}           |  6 +-
 src/pages/drive/index.tsx                     | 50 ++++++----
 src/utils/ens.ts                              | 14 ++-
 src/utils/pod.ts                              | 17 ++++
 42 files changed, 567 insertions(+), 219 deletions(-)
 create mode 100644 src/data/subscription.ts
 rename src/locales/{jp-JP.json => ja-JP.json} (99%)
 rename src/locales/{rs-RS.json => sr-LATN.json} (99%)
 rename src/locales/{ch-CH.json => zh.json} (99%)
 create mode 100644 src/utils/pod.ts

diff --git a/package-lock.json b/package-lock.json
index 73874493..77d6de1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
         "@fairdatasociety/blossom": "^0.5.0",
-        "@fairdatasociety/fdp-storage": "^0.13.0",
+        "@fairdatasociety/fdp-storage": "^0.18.0",
         "@headlessui/react": "^1.7.14",
         "@metamask/sdk": "^0.5.6",
         "@types/react-blockies": "^1.4.1",
@@ -3072,29 +3072,41 @@
       }
     },
     "node_modules/@fairdatasociety/fdp-contracts-js": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.8.0.tgz",
-      "integrity": "sha512-Lfr/kxCBZ4IYWwAkeRa2fSi9suYd5DxTG5xunfuwMm32FeB99fL7tI19sb5tjPyRj6bphJPaRWmFCdPJ+yfZsg==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.10.1.tgz",
+      "integrity": "sha512-letk0QcHlv2nNrM7ZF0iazT07IWseM+T0iC9Ax61/dHeR0j/aLkGFv/IiFbMTEXs6xc2iFp+Thoa4x5bmd51Jw==",
       "peerDependencies": {
         "ethers": ">=5.6.4"
       }
     },
     "node_modules/@fairdatasociety/fdp-storage": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.13.0.tgz",
-      "integrity": "sha512-7AWAC/enq1SQCisMuD3wT5cKSOxe8KdC5f3nolWcruCUpdWcwe65YtjDeL88m/E/kcituQGAl2IgWGkqoysB/g==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.18.0.tgz",
+      "integrity": "sha512-WfBU/IFTcCvJGL6g7V7fW6XX2ZVZ6VUTAMPwH+Gkg7qcA+ra6LHGIidFKWjINNbzs/gHP1DI9oxxTC6XzAlnBQ==",
       "dependencies": {
         "@ethersphere/bee-js": "^6.2.0",
-        "@fairdatasociety/fdp-contracts-js": "^3.8.0",
-        "crypto-js": "^4.1.1",
+        "@fairdatasociety/fdp-contracts-js": "^3.10.0",
+        "crypto-js": "^4.2.0",
+        "elliptic": "^6.5.4",
         "ethers": "^5.5.2",
-        "js-sha3": "^0.8.0"
+        "js-sha3": "^0.9.2",
+        "pako": "^2.1.0"
       },
       "engines": {
         "node": ">=16.0.0",
-        "npm": ">=8.0.0"
+        "npm": ">=9.0.0"
       }
     },
+    "node_modules/@fairdatasociety/fdp-storage/node_modules/js-sha3": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.9.3.tgz",
+      "integrity": "sha512-BcJPCQeLg6WjEx3FE591wVAevlli8lxsxm9/FzV4HXkV49TmBH38Yvrpce6fjbADGMKFrBMGTqrVz3qPIZ88Gg=="
+    },
+    "node_modules/@fairdatasociety/fdp-storage/node_modules/pako": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
+      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug=="
+    },
     "node_modules/@formatjs/intl-unified-numberformat": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.7.tgz",
@@ -9819,8 +9831,9 @@
       }
     },
     "node_modules/crypto-js": {
-      "version": "4.1.1",
-      "license": "MIT"
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
     },
     "node_modules/crypto-random-string": {
       "version": "2.0.0",
@@ -25002,21 +25015,35 @@
       }
     },
     "@fairdatasociety/fdp-contracts-js": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.8.0.tgz",
-      "integrity": "sha512-Lfr/kxCBZ4IYWwAkeRa2fSi9suYd5DxTG5xunfuwMm32FeB99fL7tI19sb5tjPyRj6bphJPaRWmFCdPJ+yfZsg==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.10.1.tgz",
+      "integrity": "sha512-letk0QcHlv2nNrM7ZF0iazT07IWseM+T0iC9Ax61/dHeR0j/aLkGFv/IiFbMTEXs6xc2iFp+Thoa4x5bmd51Jw==",
       "requires": {}
     },
     "@fairdatasociety/fdp-storage": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.13.0.tgz",
-      "integrity": "sha512-7AWAC/enq1SQCisMuD3wT5cKSOxe8KdC5f3nolWcruCUpdWcwe65YtjDeL88m/E/kcituQGAl2IgWGkqoysB/g==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.18.0.tgz",
+      "integrity": "sha512-WfBU/IFTcCvJGL6g7V7fW6XX2ZVZ6VUTAMPwH+Gkg7qcA+ra6LHGIidFKWjINNbzs/gHP1DI9oxxTC6XzAlnBQ==",
       "requires": {
         "@ethersphere/bee-js": "^6.2.0",
-        "@fairdatasociety/fdp-contracts-js": "^3.8.0",
-        "crypto-js": "^4.1.1",
+        "@fairdatasociety/fdp-contracts-js": "^3.10.0",
+        "crypto-js": "^4.2.0",
+        "elliptic": "^6.5.4",
         "ethers": "^5.5.2",
-        "js-sha3": "^0.8.0"
+        "js-sha3": "^0.9.2",
+        "pako": "^2.1.0"
+      },
+      "dependencies": {
+        "js-sha3": {
+          "version": "0.9.3",
+          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.9.3.tgz",
+          "integrity": "sha512-BcJPCQeLg6WjEx3FE591wVAevlli8lxsxm9/FzV4HXkV49TmBH38Yvrpce6fjbADGMKFrBMGTqrVz3qPIZ88Gg=="
+        },
+        "pako": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
+          "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug=="
+        }
       }
     },
     "@formatjs/intl-unified-numberformat": {
@@ -29926,7 +29953,9 @@
       }
     },
     "crypto-js": {
-      "version": "4.1.1"
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
     },
     "crypto-random-string": {
       "version": "2.0.0"
diff --git a/package.json b/package.json
index f1cd9020..640e9c80 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
     "@fairdatasociety/blossom": "^0.5.0",
-    "@fairdatasociety/fdp-storage": "^0.13.0",
+    "@fairdatasociety/fdp-storage": "^0.18.0",
     "@headlessui/react": "^1.7.14",
     "@metamask/sdk": "^0.5.6",
     "@types/react-blockies": "^1.4.1",
diff --git a/src/api/files.ts b/src/api/files.ts
index 99ace5d3..19a08816 100644
--- a/src/api/files.ts
+++ b/src/api/files.ts
@@ -3,12 +3,14 @@ import {
   FileItem,
   UploadProgressInfo,
 } from '@fairdatasociety/fdp-storage';
+import { PodShareInfo } from '@fairdatasociety/fdp-storage/dist/pod/types';
+import { isSharedPod } from '@utils/pod';
 import { formatUrl } from '@utils/url';
 
 interface DownloadFileData {
   filename: string;
   directory: string;
-  podName: string;
+  pod: string | PodShareInfo;
 }
 
 interface ShareFileData {
@@ -54,12 +56,21 @@ export async function downloadFile(
   fdp: FdpStorage,
   data: DownloadFileData
 ): Promise<Blob> {
+  const { pod, directory, filename } = data;
   const writePath =
-    data.directory === 'root' ? '/' : '/' + formatUrl(data.directory) + '/';
-  const downloadFile = await fdp.file.downloadData(
-    data.podName,
-    `${writePath}${data.filename}`
-  );
+    data.directory === 'root' ? '/' : '/' + formatUrl(directory) + '/';
+  const path = `${writePath}${filename}`;
+  let downloadFile: Uint8Array;
+
+  if (isSharedPod(pod)) {
+    downloadFile = await fdp.file.downloadArbitraryPodData(
+      pod.podAddress,
+      pod.password,
+      path
+    );
+  } else {
+    downloadFile = await fdp.file.downloadData(pod, path);
+  }
 
   return new Blob([downloadFile]);
 }
diff --git a/src/api/pod.ts b/src/api/pod.ts
index 3e0cb8a9..162feb2c 100644
--- a/src/api/pod.ts
+++ b/src/api/pod.ts
@@ -1,4 +1,7 @@
+import { SubItem } from '@data/subscription';
 import { DirectoryItem, FdpStorage } from '@fairdatasociety/fdp-storage';
+import { PodShareInfo } from '@fairdatasociety/fdp-storage/dist/pod/types';
+import { isSharedPod } from '@utils/pod';
 
 export interface GetPodResponse {
   pod_name: string[];
@@ -16,6 +19,35 @@ export async function getPods(fdp: FdpStorage): Promise<GetPodResponse> {
   return response as GetPodResponse;
 }
 
+export async function getUsersSubItems(
+  fdp: FdpStorage,
+  address: string
+): Promise<SubItem[]> {
+  return fdp.dataHub.getAllSubItems(address);
+}
+
+export async function getSubscriptionPods(
+  fdp: FdpStorage,
+  subItems: SubItem[]
+): Promise<PodShareInfo[]> {
+  const subs: PodShareInfo[] = [];
+
+  for (const subItem of subItems) {
+    try {
+      const sub = await fdp.personalStorage.openSubscribedPod(
+        subItem.subHash,
+        subItem.unlockKeyLocation
+      );
+
+      subs.push(sub);
+    } catch (error) {
+      console.warn(String(error));
+    }
+  }
+
+  return subs;
+}
+
 export async function createPod(fdp: FdpStorage, pod_name: string) {
   return await fdp.personalStorage.create(pod_name);
 }
@@ -38,8 +70,15 @@ export function getFdpPathByDirectory(directory: string): string {
 
 export async function getFilesAndDirectories(
   fdp: FdpStorage,
-  podName: string,
+  pod: string | PodShareInfo,
   directory: string
 ): Promise<DirectoryItem> {
-  return fdp.directory.read(podName, getFdpPathByDirectory(directory), false);
+  if (isSharedPod(pod)) {
+    return fdp.directory.readFromShared(
+      pod,
+      getFdpPathByDirectory(directory),
+      false
+    );
+  }
+  return fdp.directory.read(pod, getFdpPathByDirectory(directory), false);
 }
diff --git a/src/components/Buttons/DriveToggle/DriveToggle.tsx b/src/components/Buttons/DriveToggle/DriveToggle.tsx
index 7f9a3bd7..ac34e1cb 100644
--- a/src/components/Buttons/DriveToggle/DriveToggle.tsx
+++ b/src/components/Buttons/DriveToggle/DriveToggle.tsx
@@ -3,10 +3,15 @@ import { FC } from 'react';
 
 interface DriveToggleProps {
   activeTab: string;
+  showSubscribed: boolean;
   setActiveTab: (tab: string) => void;
 }
 
-const DriveToggle: FC<DriveToggleProps> = ({ activeTab, setActiveTab }) => {
+const DriveToggle: FC<DriveToggleProps> = ({
+  activeTab,
+  showSubscribed,
+  setActiveTab,
+}) => {
   const { intl } = useLocales();
 
   const activeClass =
@@ -16,24 +21,36 @@ const DriveToggle: FC<DriveToggleProps> = ({ activeTab, setActiveTab }) => {
     'font-normal text-color-accents-plum-black dark:text-color-accents-grey-cloud bg-color-shade-dark-4-day dark:bg-color-shade-dark-3-night effect-style-small-button-drop-shadow';
 
   return (
-    <div className="flex justify-center items-center w-full text-center">
-      <button
-        className={`${
-          activeTab === 'private' ? activeClass : inactiveClass
-        } flex-grow py-2 px-3 rounded-l`}
-        onClick={() => setActiveTab('private')}
-      >
-        {intl.get('PRIVATE')}
-      </button>
+    <div className="flex flex-col justify-center items-center w-full text-center">
+      <div className="flex">
+        <button
+          className={`${
+            activeTab === 'private' ? activeClass : inactiveClass
+          } flex-grow py-2 px-3 rounded-l`}
+          onClick={() => setActiveTab('private')}
+        >
+          {intl.get('PRIVATE')}
+        </button>
 
-      <button
-        className={`${
-          activeTab === 'shared' ? activeClass : inactiveClass
-        } flex-grow py-2 px-3 rounded-r`}
-        onClick={() => setActiveTab('shared')}
-      >
-        {intl.get('SHARED')}
-      </button>
+        <button
+          className={`${
+            activeTab === 'shared' ? activeClass : inactiveClass
+          } flex-grow py-2 px-3 rounded-r`}
+          onClick={() => setActiveTab('shared')}
+        >
+          {intl.get('SHARED')}
+        </button>
+      </div>
+      {showSubscribed && (
+        <button
+          className={`${
+            activeTab === 'subscribed' ? activeClass : inactiveClass
+          } flex-grow py-2 px-3 rounded-r`}
+          onClick={() => setActiveTab('subscribed')}
+        >
+          {intl.get('SUBSCRIBED')}
+        </button>
+      )}
     </div>
   );
 };
diff --git a/src/components/Connect/Metamask/MetamaskConnect.tsx b/src/components/Connect/Metamask/MetamaskConnect.tsx
index 9917e233..4a9eef7f 100644
--- a/src/components/Connect/Metamask/MetamaskConnect.tsx
+++ b/src/components/Connect/Metamask/MetamaskConnect.tsx
@@ -65,7 +65,7 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => {
       const wallet = await decryptWallet(localBasicWallet, password);
       const mnemonic = wallet.mnemonic.phrase;
       markInviteAsParticipated();
-      setFdpStorageType('native', network.config);
+      setFdpStorageType('native', network.ensConfig, network.datahubConfig);
       fdpClientRef.current.account.setAccountFromMnemonic(mnemonic);
       setIsLoggedIn(true);
       setLoginType('metamask');
diff --git a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskUsernamePassword.tsx b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskUsernamePassword.tsx
index d23cc3df..f8a087be 100644
--- a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskUsernamePassword.tsx
+++ b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskUsernamePassword.tsx
@@ -40,7 +40,7 @@ export default function MetamaskUsernamePassword({
       setLoading(true);
       setErrorMessage(null);
 
-      setFdpStorageConfig(network.config);
+      setFdpStorageConfig(network.ensConfig, network.datahubConfig);
 
       const usernameAvailable =
         await fdpClientRef.current.account.ens.isUsernameAvailable(username);
diff --git a/src/components/DirectoryPath/DirectoryPath.tsx b/src/components/DirectoryPath/DirectoryPath.tsx
index a8908fae..8a1667e6 100644
--- a/src/components/DirectoryPath/DirectoryPath.tsx
+++ b/src/components/DirectoryPath/DirectoryPath.tsx
@@ -3,9 +3,11 @@ import PageDownLight from '@media/UI/page-down-light.svg';
 import PageDownDark from '@media/UI/page-down-dark.svg';
 import { Button } from '@components/Buttons';
 import ThemeContext from '@context/ThemeContext';
+import { useLocales } from '@context/LocalesContext';
 
 interface DirectoryPathProps {
   podName: string;
+  subscribedPod: boolean;
   directory: string;
   onDirectorySelect: (newDirectory: string) => void;
   onBackToDrive: () => void;
@@ -19,6 +21,7 @@ const selectableClasses = 'cursor-pointer hover:bg-color-shade-dark-3-day';
 
 const DirectoryPath = ({
   podName,
+  subscribedPod,
   directory,
   onDirectorySelect,
   onBackToDrive,
@@ -29,6 +32,7 @@ const DirectoryPath = ({
     const folders = (directory === 'root' ? '' : directory).split('/');
     return [folders, folders.slice(-MAX_FOLDERS)];
   }, [directory]);
+  const { intl } = useLocales();
 
   const offset = folders.length - displayedFolders.length;
 
@@ -54,10 +58,13 @@ const DirectoryPath = ({
       )}
 
       <span
-        className={`hidden md:inline ${folderClasses} ${selectableClasses}`}
+        className={`relative hidden md:inline ${folderClasses} ${selectableClasses}`}
         onClick={() => onDirectorySelect('root')}
       >
         {podName}
+        {subscribedPod && (
+          <div className="text-xs">({intl.get('SUBSCRIBED')})</div>
+        )}
       </span>
       {offset > 0 && <span className={folderClasses}>&nbsp;/ ...</span>}
       {displayedFolders.map((folder, index) => (
diff --git a/src/components/Dropdowns/DriveItemDropdown/DriveItemMenu.tsx b/src/components/Dropdowns/DriveItemDropdown/DriveItemMenu.tsx
index f039a7a9..4cafffd6 100644
--- a/src/components/Dropdowns/DriveItemDropdown/DriveItemMenu.tsx
+++ b/src/components/Dropdowns/DriveItemDropdown/DriveItemMenu.tsx
@@ -17,6 +17,7 @@ import { getFdpPathByDirectory } from '@api/pod';
 import { UpdateDriveProps } from '@interfaces/handlers';
 import DropdownTransition from '../DropdownTransition';
 import { useLocales } from '@context/LocalesContext';
+import { getPodName, isSharedPod } from '@utils/pod';
 
 interface DriveItemMenuProps extends UpdateDriveProps {
   type: 'folder' | 'file';
@@ -41,13 +42,15 @@ const DriveItemMenu: FC<DriveItemMenuProps> = ({
   const [showConfirmDeleteModal, setShowConfirmDeleteModal] = useState(false);
   const { intl } = useLocales();
   const previewLabel = intl.get(type === 'file' ? 'PREVIEW' : 'OPEN');
+  const podName = getPodName(activePod);
+  const canEdit = !isSharedPod(activePod);
 
   const handleDownloadClick = async () => {
     try {
       const response = await downloadFile(fdpClientRef.current, {
         filename: data?.name,
         directory: directoryName,
-        podName: activePod,
+        pod: activePod,
       });
 
       FileSaver.saveAs(response, data?.name);
@@ -80,7 +83,7 @@ const DriveItemMenu: FC<DriveItemMenuProps> = ({
     try {
       await deleteFile(fdpClientRef.current, {
         file_name: itemName,
-        podName: activePod,
+        podName,
         path: formatDirectory(directoryName),
       });
 
@@ -95,7 +98,7 @@ const DriveItemMenu: FC<DriveItemMenuProps> = ({
       setShowConfirmDeleteModal(false);
       removeItemFromCache(
         userAddress,
-        activePod,
+        podName,
         fdpPath,
         itemName,
         ContentType.FILE
@@ -118,7 +121,7 @@ const DriveItemMenu: FC<DriveItemMenuProps> = ({
 
     try {
       await deleteDirectory(fdpClientRef.current, {
-        podName: activePod,
+        podName,
         path: deletePath,
       });
 
@@ -133,7 +136,7 @@ const DriveItemMenu: FC<DriveItemMenuProps> = ({
       setShowConfirmDeleteModal(false);
       removeItemFromCache(
         userAddress,
-        activePod,
+        podName,
         fdpPath,
         itemName,
         ContentType.DIRECTORY
@@ -162,7 +165,7 @@ const DriveItemMenu: FC<DriveItemMenuProps> = ({
           </Menu.Item>
 
           <div className="space-y-4">
-            {type === 'file' ? (
+            {type === 'file' && canEdit ? (
               <Menu.Item
                 as="span"
                 className="block w-auto font-normal text-color-shade-white-day dark:text-color-shade-white-night text-base cursor-pointer"
@@ -172,7 +175,7 @@ const DriveItemMenu: FC<DriveItemMenuProps> = ({
               </Menu.Item>
             ) : null}
 
-            {type === 'file' ? (
+            {type === 'file' && canEdit ? (
               <Menu.Item
                 as="span"
                 className="block w-auto font-normal text-color-shade-white-day dark:text-color-shade-white-night text-base cursor-pointer"
@@ -182,13 +185,15 @@ const DriveItemMenu: FC<DriveItemMenuProps> = ({
               </Menu.Item>
             ) : null}
 
-            <Menu.Item
-              as="span"
-              className="block w-auto font-normal text-color-shade-white-day dark:text-color-shade-white-night text-base cursor-pointer"
-              onClick={handleDeleteClick}
-            >
-              {intl.get('DELETE')}
-            </Menu.Item>
+            {canEdit && (
+              <Menu.Item
+                as="span"
+                className="block w-auto font-normal text-color-shade-white-day dark:text-color-shade-white-night text-base cursor-pointer"
+                onClick={handleDeleteClick}
+              >
+                {intl.get('DELETE')}
+              </Menu.Item>
+            )}
           </div>
         </Menu.Items>
       </DropdownTransition>
@@ -198,7 +203,7 @@ const DriveItemMenu: FC<DriveItemMenuProps> = ({
           showModal={showShareFileModal}
           closeModal={() => setShowShareFileModal(false)}
           fileName={data?.name}
-          podName={activePod}
+          podName={podName}
           path={formatDirectory(directoryName)}
         />
       ) : null}
diff --git a/src/components/Dropdowns/PodDropdown/PodDropdownMenu.tsx b/src/components/Dropdowns/PodDropdown/PodDropdownMenu.tsx
index 4aedf1c7..013b8871 100644
--- a/src/components/Dropdowns/PodDropdown/PodDropdownMenu.tsx
+++ b/src/components/Dropdowns/PodDropdown/PodDropdownMenu.tsx
@@ -5,32 +5,43 @@ import PodContext from '@context/PodContext';
 import sortAlphabetically from '@utils/sortAlphabetically';
 import DropdownTransition from '../DropdownTransition';
 import { useLocales } from '@context/LocalesContext';
+import { getPodName } from '@utils/pod';
+import { PodShareInfo } from '@fairdatasociety/fdp-storage/dist/pod/types';
 
 const PodItem = ({
-  podName,
+  pod,
   onPodSelect,
 }: {
-  podName: string;
-  onPodSelect: (podName: string) => void;
+  pod: string | PodShareInfo;
+  onPodSelect: (podName: string | PodShareInfo) => void;
 }) => {
   return (
     <Menu.Item
       as="span"
       className="block w-auto py-2 font-normal text-color-shade-white-day dark:text-color-shade-white-night text-base cursor-pointer"
-      onClick={() => onPodSelect(podName)}
+      onClick={() => onPodSelect(pod)}
     >
-      {podName}
+      {getPodName(pod)}
     </Menu.Item>
   );
 };
 
 const PodDropdownMenu = () => {
-  const { activePod, pods, setActivePod, setDirectoryName, directoryName } =
-    useContext(PodContext);
+  const {
+    activePod,
+    pods,
+    subscribedPods,
+    setActivePod,
+    setDirectoryName,
+    directoryName,
+  } = useContext(PodContext);
   const { intl } = useLocales();
+  const podName = getPodName(activePod);
 
-  const onPodSelect = (podName: string) => {
-    setActivePod(podName);
+  const onPodSelect = (pod: string | PodShareInfo) => {
+    console.log(pod);
+
+    setActivePod(pod);
     setDirectoryName('root');
   };
 
@@ -39,9 +50,9 @@ const PodDropdownMenu = () => {
       <Menu.Items className="absolute top-12 w-48 p-5 max-h-96 overflow-y-auto bg-color-shade-dark-1-day dark:bg-color-shade-dark-3-night text-left rounded-md shadow z-30">
         <div className="mb-3 pb-3 border-b-2 border-color-shade-light-1-day dark:border-color-shade-light-1-night">
           <h4 className="mb-1 font-semibold text-color-shade-white-day dark:text-color-shade-white-night text-base">
-            {activePod || intl.get('SELECT_A_POD')}
+            {podName || intl.get('SELECT_A_POD')}
           </h4>
-          {activePod && directoryName !== 'root' && (
+          {podName && directoryName !== 'root' && (
             <Menu.Item
               as="span"
               className="block w-auto py-2 font-normal text-color-shade-white-day dark:text-color-shade-white-night text-base cursor-pointer"
@@ -53,13 +64,23 @@ const PodDropdownMenu = () => {
         </div>
 
         {sortAlphabetically(pods?.pod_name).map((podName) => (
-          <PodItem key={podName} podName={podName} onPodSelect={onPodSelect} />
+          <PodItem key={podName} pod={podName} onPodSelect={onPodSelect} />
         ))}
 
         <span className="border-b-2 border-color-shade-light-1-day dark:border-color-shade-light-1-night"></span>
 
         {sortAlphabetically(pods?.shared_pod_name).map((podName) => (
-          <PodItem key={podName} podName={podName} onPodSelect={onPodSelect} />
+          <PodItem key={podName} pod={podName} onPodSelect={onPodSelect} />
+        ))}
+
+        {subscribedPods?.length > 0 && (
+          <h5 className="my-1 font-semibold text-color-shade-white-day dark:text-color-shade-white-night text-base">
+            {intl.get('SUBSCRIBED')}:
+          </h5>
+        )}
+
+        {subscribedPods?.map((pod) => (
+          <PodItem key={pod.podAddress} pod={pod} onPodSelect={onPodSelect} />
         ))}
       </Menu.Items>
     </DropdownTransition>
diff --git a/src/components/Dropdowns/PodDropdown/PodDropdownToggle.tsx b/src/components/Dropdowns/PodDropdown/PodDropdownToggle.tsx
index 2c30dde3..037085a2 100644
--- a/src/components/Dropdowns/PodDropdown/PodDropdownToggle.tsx
+++ b/src/components/Dropdowns/PodDropdown/PodDropdownToggle.tsx
@@ -8,12 +8,14 @@ import { Button } from '@components/Buttons';
 
 import PageDownLight from '@media/UI/page-down-light.svg';
 import PageDownDark from '@media/UI/page-down-dark.svg';
+import { getPodName, isSharedPod } from '@utils/pod';
 
 const PodDropdownToggele = () => {
   const { theme } = useContext(ThemeContext);
   const { loading, activePod, setActivePod, setDirectoryName } =
     useContext(PodContext);
   const { intl } = useLocales();
+  const podName = getPodName(activePod);
 
   const onBackToDrive = () => {
     setActivePod('');
@@ -22,7 +24,7 @@ const PodDropdownToggele = () => {
 
   return (
     <>
-      {activePod && (
+      {podName && (
         <Button
           variant="tertiary"
           onClick={onBackToDrive}
@@ -39,11 +41,15 @@ const PodDropdownToggele = () => {
       <Menu.Button
         disabled={loading}
         className={`flex items-center w-full cursor-pointer ${
-          activePod ? '' : 'pl-4'
+          podName ? '' : 'pl-4'
         }`}
       >
         <span className="font-semibold text-lg cursor-pointer hover:bg-color-shade-dark-3-day text-color-accents-purple-heavy dark:text-color-accents-grey-lavendar">
-          {activePod || intl.get('SELECT_A_POD')}
+          {podName || intl.get('SELECT_A_POD')}
+
+          {isSharedPod(activePod) && (
+            <div className="text-xs">({intl.get('SUBSCRIBED')})</div>
+          )}
         </span>
       </Menu.Button>
     </>
diff --git a/src/components/Forms/LoginForm/LoginForm.tsx b/src/components/Forms/LoginForm/LoginForm.tsx
index 3443a668..766f7cf5 100644
--- a/src/components/Forms/LoginForm/LoginForm.tsx
+++ b/src/components/Forms/LoginForm/LoginForm.tsx
@@ -57,7 +57,7 @@ const LoginForm: FC = () => {
       setLoading(true);
       setErrorMessage(null);
       const { user_name, password } = data;
-      setFdpStorageType('native', network.config);
+      setFdpStorageType('native', network.ensConfig, network.datahubConfig);
       setEnabled(allowTracking);
       const wallet = await fdpClientRef.current.account.login(
         user_name,
diff --git a/src/components/Inputs/SearchBar/SearchBar.tsx b/src/components/Inputs/SearchBar/SearchBar.tsx
index af193210..3d382fe6 100644
--- a/src/components/Inputs/SearchBar/SearchBar.tsx
+++ b/src/components/Inputs/SearchBar/SearchBar.tsx
@@ -12,6 +12,7 @@ import classes from './SearchBar.module.scss';
 import { useLocales } from '@context/LocalesContext';
 import { useForm } from 'react-hook-form';
 import PodContext from '@context/PodContext';
+import { getPodName } from '@utils/pod';
 
 interface SearchBarProps {}
 
@@ -21,6 +22,7 @@ const SearchBar: FC<SearchBarProps> = () => {
   const { activePod, loading } = useContext(PodContext);
   const { intl } = useLocales();
   const { register, handleSubmit, reset } = useForm<{ search: '' }>();
+  const podName = getPodName(activePod);
 
   const onSubmitInternal = ({ search }) => updateSearch(search);
 
@@ -41,7 +43,7 @@ const SearchBar: FC<SearchBarProps> = () => {
         type="text"
         id="search"
         name="search"
-        disabled={!activePod || loading || searchDisabled}
+        disabled={!podName || loading || searchDisabled}
         placeholder={intl.get('SEARCH')}
         className={`${classes.searchBar} ${
           theme === 'light' ? classes.searchBarLight : classes.searchBarDark
diff --git a/src/components/Modals/CreateFolderModal/CreateFolderModal.tsx b/src/components/Modals/CreateFolderModal/CreateFolderModal.tsx
index 9ea52aa5..e0b33606 100644
--- a/src/components/Modals/CreateFolderModal/CreateFolderModal.tsx
+++ b/src/components/Modals/CreateFolderModal/CreateFolderModal.tsx
@@ -14,6 +14,7 @@ import { CreatorModalProps } from '@interfaces/handlers';
 import { addItemToCache, ContentType } from '@utils/cache';
 import { getFdpPathByDirectory } from '@api/pod';
 import { useLocales } from '@context/LocalesContext';
+import { getPodName } from '@utils/pod';
 
 const CreateFolderModal: FC<CreatorModalProps> = ({
   showModal,
@@ -28,6 +29,7 @@ const CreateFolderModal: FC<CreatorModalProps> = ({
   const [newFolderName, setNewFolderName] = useState('');
   const [errorMessage, setErrorMessage] = useState('');
   const { intl } = useLocales();
+  const podName = getPodName(activePod);
 
   const handleCreateNewFolder = async () => {
     setLoading(true);
@@ -38,7 +40,7 @@ const CreateFolderModal: FC<CreatorModalProps> = ({
 
       const item = await createDirectory(
         fdpClientRef.current,
-        activePod,
+        podName,
         fdpPath,
         newFolderName
       );
@@ -53,7 +55,7 @@ const CreateFolderModal: FC<CreatorModalProps> = ({
 
       addItemToCache(
         userAddress,
-        activePod,
+        podName,
         fdpPath,
         item,
         ContentType.DIRECTORY
diff --git a/src/components/Modals/ImportFileModal/ImportFileModal.tsx b/src/components/Modals/ImportFileModal/ImportFileModal.tsx
index 48f60b86..2870f272 100644
--- a/src/components/Modals/ImportFileModal/ImportFileModal.tsx
+++ b/src/components/Modals/ImportFileModal/ImportFileModal.tsx
@@ -11,6 +11,7 @@ import { Button } from '@components/Buttons';
 import FeedbackMessage from '@components/FeedbackMessage/FeedbackMessage';
 import { CreatorModalProps } from '@interfaces/handlers';
 import { useLocales } from '@context/LocalesContext';
+import { getPodName } from '@utils/pod';
 
 const ImportFileModal: FC<CreatorModalProps> = ({
   showModal,
@@ -23,6 +24,7 @@ const ImportFileModal: FC<CreatorModalProps> = ({
   const [loading, setLoading] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
   const { intl } = useLocales();
+  const podName = getPodName(activePod);
 
   const handleImportFile = async () => {
     try {
@@ -30,7 +32,7 @@ const ImportFileModal: FC<CreatorModalProps> = ({
       await receiveFile(
         fdpClientRef.current,
         importCode,
-        activePod,
+        podName,
         directoryName
       );
       updateDrive();
diff --git a/src/components/Modals/PreviewFileModal/PreviewFileModal.tsx b/src/components/Modals/PreviewFileModal/PreviewFileModal.tsx
index 5d1c56e2..ca8ca14a 100644
--- a/src/components/Modals/PreviewFileModal/PreviewFileModal.tsx
+++ b/src/components/Modals/PreviewFileModal/PreviewFileModal.tsx
@@ -36,6 +36,7 @@ import FilePreview, {
 import { FileItem } from '@fairdatasociety/fdp-storage';
 import { extractFileExtension, rootPathToRelative } from '@utils/filename';
 import { useLocales } from '@context/LocalesContext';
+import { getPodName } from '@utils/pod';
 
 interface PreviewModalProps {
   showModal: boolean;
@@ -61,6 +62,7 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
   const [showShareFileModal, setShowShareFileModal] = useState(false);
   const [showConfirmDeleteModal, setShowConfirmDeleteModal] = useState(false);
   const { intl } = useLocales();
+  const podName = getPodName(activePod);
 
   const directory = rootPathToRelative(previewFile.path || directoryName);
 
@@ -73,7 +75,7 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
     downloadFile(fdpClientRef.current, {
       filename: previewFile?.name,
       directory,
-      podName: activePod,
+      pod: activePod,
     })
       .then(async (response) => {
         const blob = await response.arrayBuffer();
@@ -95,7 +97,7 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
     downloadFile(fdpClientRef.current, {
       filename: previewFile?.name,
       directory,
-      podName: activePod,
+      pod: activePod,
     })
       .then((response) => {
         FileSaver.saveAs(response, previewFile?.name);
@@ -120,7 +122,7 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
 
     deleteFile(fdpClientRef.current, {
       file_name: previewFile?.name,
-      podName: activePod,
+      podName,
       path: formatDirectory(directory),
     })
       .then(() => {
@@ -159,7 +161,7 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
           <FilePreview
             file={previewFile}
             source={fileContent}
-            pod={activePod}
+            pod={podName}
             directory={directory}
             onError={() => setErrorMessage(intl.get('FILE_PREVIEW_ERROR'))}
           />
@@ -255,7 +257,7 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
         showModal={showShareFileModal}
         closeModal={() => setShowShareFileModal(false)}
         fileName={previewFile?.name}
-        podName={activePod}
+        podName={podName}
         path={formatDirectory(directory)}
       />
 
diff --git a/src/components/Modals/UploadFileModal/UploadFileModal.tsx b/src/components/Modals/UploadFileModal/UploadFileModal.tsx
index c077b9be..ccf0b652 100644
--- a/src/components/Modals/UploadFileModal/UploadFileModal.tsx
+++ b/src/components/Modals/UploadFileModal/UploadFileModal.tsx
@@ -23,6 +23,7 @@ import { getFdpPathByDirectory } from '@api/pod';
 import { useLocales } from '@context/LocalesContext';
 import { FileItem, UploadProgressInfo } from '@fairdatasociety/fdp-storage';
 import ProgressBar from '@components/ProgressBar/ProgressBar';
+import { getPodName } from '@utils/pod';
 
 const UploadFileModal: FC<CreatorModalProps> = ({
   showModal,
@@ -41,12 +42,13 @@ const UploadFileModal: FC<CreatorModalProps> = ({
   const [uploadPercentage, setUploadPercentage] = useState<number>(0);
   const [errorMessage, setErrorMessage] = useState('');
   const { fdpClientRef, getAccountAddress } = useFdpStorage();
+  const podName = getPodName(activePod);
   const { getRootProps, getInputProps } = useDropzone({
     onDrop: (acceptedFiles: File[]) => {
       uploadedItemsRef.current = [];
       setFailedUplods([]);
       setErrorMessage('');
-      if (activePod) {
+      if (podName) {
         setFilesToUpload(acceptedFiles);
       }
     },
@@ -62,7 +64,7 @@ const UploadFileModal: FC<CreatorModalProps> = ({
       setMessage(intl.get('SUCCESSFULLY_UPLOADED'));
 
       uploadedItemsRef.current.forEach((item) =>
-        addItemToCache(userAddress, activePod, fdpPath, item, ContentType.FILE)
+        addItemToCache(userAddress, podName, fdpPath, item, ContentType.FILE)
       );
 
       trackEvent({
@@ -94,7 +96,7 @@ const UploadFileModal: FC<CreatorModalProps> = ({
   const handleUpload = async () => {
     setErrorMessage('');
 
-    if (loading || !(filesToUpload && activePod)) {
+    if (loading || !(filesToUpload && podName)) {
       return;
     }
 
@@ -117,17 +119,17 @@ const UploadFileModal: FC<CreatorModalProps> = ({
             {
               file,
               directory: directoryName,
-              podName: activePod,
+              podName,
             },
             (event: UploadProgressInfo) => {
-              const { uploadPercentage } = event.data || {};
+              const { percentage } = event.data || {};
 
-              if (uploadPercentage) {
+              if (percentage) {
                 setUploadPercentage(
                   calculateUploadPercentage(
                     uploadedItemsRef.current.length + failedUplods.length,
                     filesToUpload.length,
-                    uploadPercentage
+                    percentage
                   )
                 );
               }
diff --git a/src/components/NavigationBars/DriveActionBar/DriveActionBar.tsx b/src/components/NavigationBars/DriveActionBar/DriveActionBar.tsx
index bbc23206..0adad008 100644
--- a/src/components/NavigationBars/DriveActionBar/DriveActionBar.tsx
+++ b/src/components/NavigationBars/DriveActionBar/DriveActionBar.tsx
@@ -16,6 +16,7 @@ import CreateFolderDarkIcon from '@media/UI/create-folder-dark.svg';
 import PodContext from '@context/PodContext';
 import { UpdateDriveProps } from '@interfaces/handlers';
 import { useLocales } from '@context/LocalesContext';
+import { getPodName, isSharedPod } from '@utils/pod';
 
 export interface DriveActionBarProps extends UpdateDriveProps {
   onFileUploadClick: () => void;
@@ -32,17 +33,18 @@ const DriveActionBar = ({
   const [showCreateFolderModal, setShowCreateFolderModal] = useState(false);
 
   const { intl } = useLocales();
+  const podName = getPodName(activePod);
 
   return (
     <div className="w-full hidden md:block mt-4 mb-6">
       <div className="flex justify-between items-center w-full">
-        {activePod && (
+        {podName && !isSharedPod(activePod) && (
           <div className="flex justify-center items-stretch mt-5">
             <Button
               type="button"
               variant="primary"
               className="mx-1 p-0"
-              disabled={!activePod}
+              disabled={!podName}
               onClick={onFileUploadClick}
             >
               <span className="mr-2">
diff --git a/src/components/NavigationBars/DriveActionBar/DriveActionBarMobile.tsx b/src/components/NavigationBars/DriveActionBar/DriveActionBarMobile.tsx
index 39340fe9..9bbecf76 100644
--- a/src/components/NavigationBars/DriveActionBar/DriveActionBarMobile.tsx
+++ b/src/components/NavigationBars/DriveActionBar/DriveActionBarMobile.tsx
@@ -23,6 +23,7 @@ import CreateFolderDarkIcon from '@media/UI/create-folder-dark.svg';
 import { UpdateDriveProps } from '@interfaces/handlers';
 import { useLocales } from '@context/LocalesContext';
 import PodContext from '@context/PodContext';
+import { getPodName, isSharedPod } from '@utils/pod';
 
 export interface DriveActionBarMobileProps extends UpdateDriveProps {
   refreshPods?: () => void;
@@ -65,6 +66,8 @@ const DriveActionBarMobile: FC<DriveActionBarMobileProps> = ({
   const [showCreateFolderModal, setShowCreateFolderModal] = useState(false);
 
   const { intl } = useLocales();
+  const podName = getPodName(activePod);
+  const canEdit = !isSharedPod(activePod);
 
   return (
     <>
@@ -75,29 +78,32 @@ const DriveActionBarMobile: FC<DriveActionBarMobileProps> = ({
         <DriveActiveDarkIcon height="22" />,
         () => setShowCreatePodModal(true)
       )}
-      {DriveActionBarItem(
-        theme,
-        intl.get('UPLOAD'),
-        <UploadLightIcon height="22" />,
-        <UploadDarkIcon height="22" />,
-        () => setShowUploadFileModal(true),
-        !activePod
-      )}
-      {DriveActionBarItem(
-        theme,
-        intl.get('IMPORT'),
-        <ImportLightIcon height="22" />,
-        <ImportDarkIcon height="22" />,
-        () => setShowImportFileModal(true)
-      )}
-      {DriveActionBarItem(
-        theme,
-        intl.get('NEW_FOLDER'),
-        <CreateFolderLightIcon height="22" />,
-        <CreateFolderDarkIcon height="22" />,
-        () => setShowCreateFolderModal(true),
-        !activePod
-      )}
+      {canEdit &&
+        DriveActionBarItem(
+          theme,
+          intl.get('UPLOAD'),
+          <UploadLightIcon height="22" />,
+          <UploadDarkIcon height="22" />,
+          () => setShowUploadFileModal(true),
+          !podName
+        )}
+      {canEdit &&
+        DriveActionBarItem(
+          theme,
+          intl.get('IMPORT'),
+          <ImportLightIcon height="22" />,
+          <ImportDarkIcon height="22" />,
+          () => setShowImportFileModal(true)
+        )}
+      {canEdit &&
+        DriveActionBarItem(
+          theme,
+          intl.get('NEW_FOLDER'),
+          <CreateFolderLightIcon height="22" />,
+          <CreateFolderDarkIcon height="22" />,
+          () => setShowCreateFolderModal(true),
+          !podName
+        )}
       {showCreatePodModal ? (
         <CreatePodModal
           showModal={showCreatePodModal}
diff --git a/src/components/NavigationBars/DriveActionBar/DriveActionHeaderMobile.tsx b/src/components/NavigationBars/DriveActionBar/DriveActionHeaderMobile.tsx
index 6f4a180e..eaf19b27 100644
--- a/src/components/NavigationBars/DriveActionBar/DriveActionHeaderMobile.tsx
+++ b/src/components/NavigationBars/DriveActionBar/DriveActionHeaderMobile.tsx
@@ -14,6 +14,7 @@ import SortDark from '@media/UI/sort-dark.svg';
 
 interface DriveActionHeaderMobileProps {
   podName: string;
+  subscribedPod: boolean;
   driveView: 'grid' | 'list';
   directory: string;
   onDirectorySelect: (newDirectory: string) => void;
@@ -24,6 +25,7 @@ interface DriveActionHeaderMobileProps {
 
 const DriveActionHeaderMobile = ({
   podName,
+  subscribedPod,
   driveView,
   directory,
   onDirectorySelect,
@@ -38,6 +40,7 @@ const DriveActionHeaderMobile = ({
       <PodDropdown />
       <DirectoryPath
         podName={podName}
+        subscribedPod={subscribedPod}
         directory={directory}
         onDirectorySelect={onDirectorySelect}
         onBackToDrive={onBackToDrive}
diff --git a/src/components/NavigationBars/DriveSideBar/DriveSideBar.tsx b/src/components/NavigationBars/DriveSideBar/DriveSideBar.tsx
index dc921cd2..cc8d16c7 100644
--- a/src/components/NavigationBars/DriveSideBar/DriveSideBar.tsx
+++ b/src/components/NavigationBars/DriveSideBar/DriveSideBar.tsx
@@ -5,7 +5,7 @@ import { FC, useContext, useState, useEffect } from 'react';
 import ThemeContext from '@context/ThemeContext';
 import PodContext from '@context/PodContext';
 
-import { getPods } from '@api/pod';
+import { getPods, getSubscriptionPods } from '@api/pod';
 import { useFdpStorage } from '@context/FdpStorageContext';
 
 import { DriveToggle } from '@components/Buttons';
@@ -22,6 +22,10 @@ import ArrowRightDark from '@media/UI/arrow-right-dark.svg';
 import sortAlphabetically from 'src/utils/sortAlphabetically';
 import Spinner from '@components/Spinner/Spinner';
 import { useLocales } from '@context/LocalesContext';
+import { PodShareInfo } from '@fairdatasociety/fdp-storage/dist/pod/types';
+import { getPodName, isSharedPod } from '@utils/pod';
+import UserContext from '@context/UserContext';
+import { hashUsername } from '@utils/ens';
 
 const DriveSideBar: FC = () => {
   const { theme } = useContext(ThemeContext);
@@ -29,14 +33,23 @@ const DriveSideBar: FC = () => {
     loading: podLoading,
     pods,
     setPods,
+    allSubItems,
+    setAllSubItems,
+    subscribedPods,
+    setSubscribedPods,
     activePod,
     setActivePod,
     setDirectoryName,
   } = useContext(PodContext);
   const { fdpClientRef } = useFdpStorage();
+  const { user } = useContext(UserContext);
   const [loading, setLoading] = useState(false);
 
-  const [activeTab, setActiveTab] = useState('private');
+  const podName = getPodName(activePod);
+
+  const [activeTab, setActiveTab] = useState(
+    isSharedPod(activePod) ? 'subscribed' : 'private'
+  );
   const [showCreatePodModal, setShowCreatePodModal] = useState(false);
   const [showImportPodModal, setShowImportPodModal] = useState(false);
 
@@ -51,8 +64,23 @@ const DriveSideBar: FC = () => {
   const handleFetchPods = async () => {
     setLoading(true);
     try {
-      const response = await getPods(fdpClientRef.current);
-      setPods(response);
+      const [pods, subItems] = await Promise.all([
+        getPods(fdpClientRef.current),
+        user
+          ? fdpClientRef.current.dataHub.getAllSubItemsForNameHash(
+              hashUsername(user)
+            )
+          : Promise.resolve([]),
+      ]);
+
+      const subscribedPods = await getSubscriptionPods(
+        fdpClientRef.current,
+        subItems.slice(0, 5)
+      );
+
+      setPods(pods);
+      setAllSubItems(subItems);
+      setSubscribedPods(subscribedPods);
     } catch (error) {
       console.log('Error: Pods could not be fetched (DriveSideBar)!', error);
     } finally {
@@ -60,11 +88,11 @@ const DriveSideBar: FC = () => {
     }
   };
 
-  const handleOpenPod = (podName: string) => {
+  const handleOpenPod = (pod: string | PodShareInfo) => {
     if (podLoading) {
       return;
     }
-    setActivePod(podName);
+    setActivePod(pod);
     setDirectoryName('root');
   };
 
@@ -74,7 +102,11 @@ const DriveSideBar: FC = () => {
         <div className="mb-2">
           <Spinner isLoading={loading} />
         </div>
-        <DriveToggle activeTab={activeTab} setActiveTab={setActiveTab} />
+        <DriveToggle
+          activeTab={activeTab}
+          showSubscribed={Boolean(user)}
+          setActiveTab={setActiveTab}
+        />
         <div className="flex justify-between items-center w-full mt-8">
           <span className="block -ml-1 mr-3">
             {theme === 'light' ? <InfoLightIcon /> : <InfoDarkIcon />}
@@ -126,23 +158,49 @@ const DriveSideBar: FC = () => {
 
       <div className="text-center">
         <div className="mt-5">
-          {activeTab === 'private'
-            ? sortAlphabetically(pods?.pod_name).map((pod: string) => (
+          {activeTab === 'private' &&
+            sortAlphabetically(pods?.pod_name).map((pod: string) => (
+              <PodItem
+                podName={pod}
+                key={pod}
+                isActivePod={!isSharedPod(activePod) && pod === podName}
+                onClick={() => handleOpenPod(pod)}
+              />
+            ))}
+          {activeTab === 'shared' &&
+            sortAlphabetically(pods?.shared_pod_name).map((pod: string) => (
+              <PodItem
+                podName={pod}
+                key={pod}
+                isActivePod={pod === podName}
+                onClick={() => handleOpenPod(pod)}
+              />
+            ))}
+          {activeTab === 'subscribed' && (
+            <>
+              {subscribedPods.map((pod) => (
                 <PodItem
-                  podName={pod}
-                  key={pod}
-                  isActivePod={pod === activePod}
-                  onClick={() => handleOpenPod(pod)}
-                />
-              ))
-            : sortAlphabetically(pods?.shared_pod_name).map((pod: string) => (
-                <PodItem
-                  podName={pod}
-                  key={pod}
-                  isActivePod={pod === activePod}
+                  podName={pod.podName}
+                  key={pod.podAddress}
+                  isActivePod={
+                    isSharedPod(activePod) &&
+                    pod.podAddress === activePod.podAddress
+                  }
                   onClick={() => handleOpenPod(pod)}
                 />
               ))}
+              {allSubItems.length < subscribedPods.length && (
+                <Button
+                  type="button"
+                  variant="secondary"
+                  label={intl.get('LOAD_MORE')}
+                  onClick={() => {
+                    setShowImportPodModal(true);
+                  }}
+                />
+              )}
+            </>
+          )}
         </div>
       </div>
 
diff --git a/src/components/NavigationBars/MainNavigationBar/MainNavigationBar.tsx b/src/components/NavigationBars/MainNavigationBar/MainNavigationBar.tsx
index 0678c37c..e7f344e0 100644
--- a/src/components/NavigationBars/MainNavigationBar/MainNavigationBar.tsx
+++ b/src/components/NavigationBars/MainNavigationBar/MainNavigationBar.tsx
@@ -16,6 +16,7 @@ import NavigationMenuDark from '@media/UI/drive-view-list-dark.svg';
 import ThemeContext from '@context/ThemeContext';
 import PodContext from '@context/PodContext';
 import { Transition } from '@headlessui/react';
+import { getPodName } from '@utils/pod';
 
 // import ActivityDropdown from './ActivityDropdown/ActivityDropdown';
 
@@ -26,6 +27,7 @@ const MainNavigationBar: FC<Record<string, never>> = () => {
   const { metamaskMigrationNotification } = useContext(UserContext);
   const { setMobileNavigationOpen } = useDialogs();
   const { activePod } = useContext(PodContext);
+  const podName = getPodName(activePod);
 
   return (
     <nav>
@@ -49,7 +51,7 @@ const MainNavigationBar: FC<Record<string, never>> = () => {
         <div className="flex justify-between items-center">
           <div className="hidden sm:block mr-16">
             <Transition
-              show={Boolean(activePod)}
+              show={Boolean(podName)}
               enter="transition ease duration-700 transform"
               enterFrom="opacity-0 -translate-y-full"
               enterTo="opacity-100 translate-y-0"
diff --git a/src/context/FdpStorageContext.tsx b/src/context/FdpStorageContext.tsx
index 59d8ab16..1081169c 100644
--- a/src/context/FdpStorageContext.tsx
+++ b/src/context/FdpStorageContext.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import { FdpStorage } from '@fairdatasociety/fdp-storage/dist/index.browser.min';
+import { FdpStorage } from '@fairdatasociety/fdp-storage';
 import { Wallet } from 'ethers';
 import { CacheType, saveCache } from '@utils/cache';
 import {
@@ -22,13 +22,15 @@ export const BLOSSOM_DEFAULT_ADDRESS = `BLOSSOM_USER`;
 export type LoginType = 'username' | 'blossom' | 'metamask';
 
 const createFdpStorage = (
-  ensOptions: FdpContracts.EnsEnvironment
+  ensOptions: FdpContracts.EnsEnvironment,
+  dataHubOptions: FdpContracts.DataHubEnvironment
 ): FdpStorage => {
   return new FdpStorage(
     process.env.NEXT_PUBLIC_BEE_URL,
     (process.env.NEXT_PUBLIC_GLOBAL_BATCH_ID || null) as any,
     {
       ensOptions,
+      dataHubOptions,
       ensDomain: 'fds',
       cacheOptions: {
         isUseCache: true,
@@ -70,9 +72,13 @@ interface FdpStorageContext {
   setWallet: (wallet: Wallet) => void;
   setFdpStorageType: (
     type: FDP_STORAGE_TYPE,
-    config?: FdpContracts.EnsEnvironment
+    ensConfig?: FdpContracts.EnsEnvironment,
+    datahubConfig?: FdpContracts.DataHubEnvironment
+  ) => void;
+  setFdpStorageConfig: (
+    config: FdpContracts.EnsEnvironment,
+    datahubConfig: FdpContracts.DataHubEnvironment
   ) => void;
-  setFdpStorageConfig: (config: FdpContracts.EnsEnvironment) => void;
   setUsername: (username: string) => void;
   setPassword: (password: string) => void;
   isUsernameAvailable: (username: string) => Promise<boolean | string>;
@@ -108,9 +114,7 @@ function FdpStorageProvider(props: FdpStorageContextProps) {
   const [isLoggedIn, setIsLoggedIn] = useState<boolean>(false);
   const [loginType, setLoginType] = useState<LoginType | null>(null);
   const [storageType, setStorageType] = useState<FDP_STORAGE_TYPE>(null);
-  const fdpClientRef = useRef<FdpStorage>(
-    createFdpStorage(getDefaultNetwork().config)
-  );
+  const fdpClientRef = useRef<FdpStorage>(null);
   const { intl } = useLocales();
 
   const isUsernameAvailable = async (
@@ -140,12 +144,15 @@ function FdpStorageProvider(props: FdpStorageContextProps) {
     }
   };
 
-  const setFdpStorageConfig = (config: FdpContracts.EnsEnvironment) => {
+  const setFdpStorageConfig = (
+    ensConfig: FdpContracts.EnsEnvironment,
+    datahubConfig?: FdpContracts.DataHubEnvironment
+  ) => {
     if (storageType !== 'native') {
       throw new Error('Invalid storage type');
     }
 
-    fdpClientRef.current = createFdpStorage(config);
+    fdpClientRef.current = createFdpStorage(ensConfig, datahubConfig);
   };
 
   /**
@@ -153,10 +160,11 @@ function FdpStorageProvider(props: FdpStorageContextProps) {
    */
   const setFdpStorageType = (
     type: FDP_STORAGE_TYPE,
-    config?: FdpContracts.EnsEnvironment
+    ensConfig?: FdpContracts.EnsEnvironment,
+    datahubConfig?: FdpContracts.DataHubEnvironment
   ) => {
     if (type === 'native') {
-      fdpClientRef.current = createFdpStorage(config);
+      fdpClientRef.current = createFdpStorage(ensConfig, datahubConfig);
     } else if (type === 'blossom') {
       fdpClientRef.current = blossom.fdpStorage;
     } else {
diff --git a/src/context/LocalesContext.tsx b/src/context/LocalesContext.tsx
index a5a2b3a1..0d15837a 100644
--- a/src/context/LocalesContext.tsx
+++ b/src/context/LocalesContext.tsx
@@ -2,16 +2,16 @@
 import React, { useMemo, useState } from 'react';
 import { createContext, useContext } from 'react';
 import intl from 'react-intl-universal';
-import cnCnLocales from '../locales/ch-CH.json';
+import cnCnLocales from '../locales/zh.json';
 import deDeLocales from '../locales/de-DE.json';
 import enUsLocales from '../locales/en-US.json';
 import esEsLocales from '../locales/es-ES.json';
 import frFrLocales from '../locales/fr-FR.json';
 import huHuLocales from '../locales/hu-HU.json';
 import itItLocales from '../locales/it-IT.json';
-import jpJpLocales from '../locales/jp-JP.json';
+import jpJpLocales from '../locales/ja-JP.json';
 import prPtLocales from '../locales/pt-PT.json';
-import rsSrLocales from '../locales/rs-RS.json';
+import rsSrLocales from '../locales/sr-LATN.json';
 import slSiLocales from '../locales/sl-SI.json';
 import trTrLocales from '../locales/tr-TR.json';
 
@@ -32,16 +32,16 @@ import { StaticImageData } from 'next/image';
 const LOCAL_STORAGE_LOCALES_KEY = 'lang';
 
 const flagMap: Record<string, StaticImageData> = {
-  'ch-CH': cnFlag,
+  zh: cnFlag,
   'de-DE': deFlag,
   'en-US': enFlag,
   'es-ES': esFlag,
   'fr-FR': frFlag,
   'hu-HU': huFlag,
   'it-IT': itFlag,
-  'jp-JP': jpFlag,
+  'ja-JP': jpFlag,
   'pt-PT': ptFlag,
-  'rs-RS': rsFlag,
+  'sr-LATN': rsFlag,
   'sl-SI': slFlag,
   'tr-TR': trFlag,
 };
@@ -80,16 +80,16 @@ function setLanguage(language: string) {
   intl.init({
     currentLocale: language,
     locales: {
-      'ch-CH': cnCnLocales,
+      zh: cnCnLocales,
       'de-DE': deDeLocales,
       'en-US': enUsLocales,
       'es-ES': esEsLocales,
       'fr-FR': frFrLocales,
       'hu-HU': huHuLocales,
       'it-IT': itItLocales,
-      'jp-JP': jpJpLocales,
+      'ja-JP': jpJpLocales,
       'pt-PT': prPtLocales,
-      'rs-RS': rsSrLocales,
+      'sr-LATN': rsSrLocales,
       'sl-SI': slSiLocales,
       'tr-TR': trTrLocales,
     },
diff --git a/src/context/PodContext.tsx b/src/context/PodContext.tsx
index a3da577b..1f20123a 100644
--- a/src/context/PodContext.tsx
+++ b/src/context/PodContext.tsx
@@ -2,14 +2,20 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 import { GetPodResponse } from '@api/pod';
 import { FC, ReactNode, createContext, useState } from 'react';
+import { PodShareInfo } from '@fairdatasociety/fdp-storage/dist/pod/types';
+import { SubItem } from '@data/subscription';
 
 interface PodContext {
   loading: boolean;
   setLoading: (loading: boolean) => void;
   pods: GetPodResponse;
   setPods: (pods: GetPodResponse) => void;
-  activePod: string;
-  setActivePod: (pod: string) => void;
+  allSubItems: SubItem[];
+  setAllSubItems: (subItems: SubItem[]) => void;
+  subscribedPods: PodShareInfo[];
+  setSubscribedPods: (subscribedPods: PodShareInfo[]) => void;
+  activePod: string | PodShareInfo;
+  setActivePod: (pod: string | PodShareInfo) => void;
   openPods: string[];
   setOpenPods: (openPods: string[]) => void;
   directoryName: string;
@@ -26,8 +32,12 @@ const podContextDefaultValues: PodContext = {
   setLoading: () => {},
   pods: { pod_name: [], shared_pod_name: [] },
   setPods: (pods: GetPodResponse) => {},
-  activePod: '',
-  setActivePod: (pod: string) => {},
+  allSubItems: [],
+  setAllSubItems: (subItems: SubItem[]) => {},
+  subscribedPods: [],
+  setSubscribedPods: (subscribedPods: PodShareInfo[]) => {},
+  activePod: null,
+  setActivePod: (pod: string | PodShareInfo) => {},
   openPods: [],
   setOpenPods: (openPods: string[]) => {},
   directoryName: '',
@@ -40,7 +50,9 @@ const PodContext = createContext<PodContext>(podContextDefaultValues);
 const PodProvider: FC<PodContextProps> = ({ children }) => {
   const [loading, setLoading] = useState<boolean>(false);
   const [pods, setPods] = useState(null);
-  const [activePod, setActivePod] = useState('');
+  const [allSubItems, setAllSubItems] = useState(null);
+  const [subscribedPods, setSubscribedPods] = useState(null);
+  const [activePod, setActivePod] = useState<string | PodShareInfo>('');
   const [openPods, setOpenPods] = useState([]);
   const [directoryName, setDirectoryName] = useState('');
 
@@ -59,6 +71,10 @@ const PodProvider: FC<PodContextProps> = ({ children }) => {
         setLoading,
         pods,
         setPods,
+        allSubItems,
+        setAllSubItems,
+        subscribedPods,
+        setSubscribedPods,
         activePod,
         setActivePod,
         openPods,
diff --git a/src/data/networks.ts b/src/data/networks.ts
index 6dcc8215..69c1927e 100644
--- a/src/data/networks.ts
+++ b/src/data/networks.ts
@@ -1,12 +1,14 @@
 import { FdpContracts } from '@fairdatasociety/fdp-storage';
 
-const { getEnsEnvironmentConfig, Environments } = FdpContracts;
+const { getEnsEnvironmentConfig, getDataHubEnvironmentConfig, Environments } =
+  FdpContracts;
 
 export interface Network {
   name: string;
   id: FdpContracts.Environments;
   chainId: number;
-  config: FdpContracts.EnsEnvironment;
+  ensConfig: FdpContracts.EnsEnvironment;
+  datahubConfig: FdpContracts.DataHubEnvironment;
 }
 
 export const networks: Network[] = [
@@ -14,25 +16,32 @@ export const networks: Network[] = [
     name: 'Sepolia',
     id: Environments.SEPOLIA,
     chainId: 11155111,
-    config: getEnsEnvironmentConfig(Environments.SEPOLIA),
+    ensConfig: getEnsEnvironmentConfig(Environments.SEPOLIA),
+    datahubConfig: {
+      ...getDataHubEnvironmentConfig(Environments.SEPOLIA),
+      dataHubAddress: '0xBE41b272e3cDe3aeC8fE4a144C5b7cE71D9e6498',
+    },
   },
   {
     name: 'Görli',
     id: Environments.GOERLI,
     chainId: 5,
-    config: getEnsEnvironmentConfig(Environments.GOERLI),
+    ensConfig: getEnsEnvironmentConfig(Environments.GOERLI),
+    datahubConfig: getDataHubEnvironmentConfig(Environments.GOERLI),
   },
   {
     name: 'Optimism Goerli',
     id: Environments.OPTIMISM_GOERLI,
     chainId: 420,
-    config: getEnsEnvironmentConfig(Environments.OPTIMISM_GOERLI),
+    ensConfig: getEnsEnvironmentConfig(Environments.OPTIMISM_GOERLI),
+    datahubConfig: getDataHubEnvironmentConfig(Environments.OPTIMISM_GOERLI),
   },
   {
     name: 'Arbitrum Goerli',
     id: Environments.ARBITRUM_GOERLI,
     chainId: 421613,
-    config: getEnsEnvironmentConfig(Environments.ARBITRUM_GOERLI),
+    ensConfig: getEnsEnvironmentConfig(Environments.ARBITRUM_GOERLI),
+    datahubConfig: getDataHubEnvironmentConfig(Environments.ARBITRUM_GOERLI),
   },
 ];
 
@@ -41,6 +50,7 @@ if (process.env.NEXT_PUBLIC_ENVIRONMENT !== 'PRODUCTION') {
     name: 'FDP Play',
     id: Environments.LOCALHOST,
     chainId: 4020,
-    config: getEnsEnvironmentConfig(Environments.LOCALHOST),
+    ensConfig: getEnsEnvironmentConfig(Environments.LOCALHOST),
+    datahubConfig: getDataHubEnvironmentConfig(Environments.LOCALHOST),
   });
 }
diff --git a/src/data/subscription.ts b/src/data/subscription.ts
new file mode 100644
index 00000000..2a16baa5
--- /dev/null
+++ b/src/data/subscription.ts
@@ -0,0 +1,21 @@
+import { BigNumber } from 'ethers';
+
+export interface SubItem {
+  subHash: string;
+  unlockKeyLocation: string;
+  validTill: BigNumber;
+}
+
+export interface Subscription {
+  subHash: string;
+  fdpSellerNameHash: string;
+  seller: string;
+  swarmLocation: string;
+  price: BigNumber;
+  active: boolean;
+  earned: BigNumber;
+  bids: number;
+  sells: number;
+  reports: number;
+  daysValid: number;
+}
diff --git a/src/locales/de-DE.json b/src/locales/de-DE.json
index 37f877fc..85d7cde3 100644
--- a/src/locales/de-DE.json
+++ b/src/locales/de-DE.json
@@ -225,5 +225,9 @@
   "INVITES_TOOLTIP": "Einladungen erleichtern den Einstieg! Teile einen Einladungslink, um Freunden sofortigen Zugang zu einem vorgefundenen Wallet zu geben.",
   "INVITES_DESCRIPTION": "Unser Einladungssystem ist darauf ausgelegt, den Einstieg für neue Benutzer nahtlos zu gestalten. Wenn Sie eine Einladung erstellen, generieren Sie im Wesentlichen einen Empfehlungslink, der mit einem privaten Schlüssel zu einer vorgefundenen Brieftasche versehen ist. Durch das Teilen dieses Links mit Freunden oder Kollegen ermöglichen Sie ihnen den sofortigen Zugang und die sofortige Nutzung unseres Dienstes mit bereits vorhandenen Mitteln. Dies erleichtert nicht nur die Erstkonfiguration, sondern fördert auch die schnellere Nutzung unserer Plattform.",
   "NEW_FOLDER": "Neuer Ordner",
-  "ALLOW_TRACKING": "Erlauben Sie der App, Ihre Aktivitäten in anonymer Weise zu verfolgen."
-}
+  "ALLOW_TRACKING": "Erlauben Sie der App, Ihre Aktivitäten in anonymer Weise zu verfolgen.",
+  "MARKET": "Markt",
+  "PUBLISHERS": "Verlage",
+  "SUBSCRIBED": "Abonniert",
+  "LOAD_MORE": "Mehr laden"
+}
\ No newline at end of file
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 37092efc..fc8eb74d 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -225,5 +225,9 @@
   "INVITES_TOOLTIP": "Invites simplify onboarding! Share an invite link to give friends instant access to a pre-funded wallet.",
   "INVITES_DESCRIPTION": "Our invitation system is designed to make the onboarding process seamless for new users. When you create an invite, you're essentially generating a referral link embedded with a private key to a pre-funded wallet. By sharing this link with friends or colleagues, you give them immediate access to start using the service with funds already in place. This not only helps them bypass the initial setup hassles but also encourages quicker adoption and usage of our platform.",
   "NEW_FOLDER": "New Folder",
-  "ALLOW_TRACKING": "Allow the app to track your activities in an anonymous manner."
+  "ALLOW_TRACKING": "Allow the app to track your activities in an anonymous manner.",
+  "MARKET": "Market",
+  "PUBLISHERS": "Publishers",
+  "SUBSCRIBED": "Subscribed",
+  "LOAD_MORE": "Load More"
 }
diff --git a/src/locales/es-ES.json b/src/locales/es-ES.json
index efe330d1..c1b41ae6 100644
--- a/src/locales/es-ES.json
+++ b/src/locales/es-ES.json
@@ -225,5 +225,9 @@
   "INVITES_TOOLTIP": "¡Las invitaciones simplifican el proceso de incorporación! Comparte un enlace de invitación para dar a tus amigos acceso instantáneo a una billetera prefinanciada.",
   "INVITES_DESCRIPTION": "Nuestro sistema de invitación está diseñado para hacer que el proceso de incorporación sea fluido para los nuevos usuarios. Al crear una invitación, esencialmente estás generando un enlace de referencia incrustado con una clave privada para una billetera prefinanciada. Al compartir este enlace con amigos o colegas, les das acceso inmediato para empezar a usar el servicio con fondos ya establecidos. Esto no solo les ayuda a evitar las complicaciones de la configuración inicial, sino que también fomenta una adopción y uso más rápidos de nuestra plataforma.",
   "NEW_FOLDER": "Nueva Carpeta",
-  "ALLOW_TRACKING": "Permita que la aplicación rastree sus actividades de manera anónima."
+  "ALLOW_TRACKING": "Permita que la aplicación rastree sus actividades de manera anónima.",
+  "MARKET": "Mercado",
+  "PUBLISHERS": "Editores",
+  "SUBSCRIBED": "Suscrito",
+  "LOAD_MORE": "Cargar más"
 }
diff --git a/src/locales/fr-FR.json b/src/locales/fr-FR.json
index 07f87c42..aebdc75e 100644
--- a/src/locales/fr-FR.json
+++ b/src/locales/fr-FR.json
@@ -225,5 +225,9 @@
   "INVITES_TOOLTIP": "Les invitations simplifient l'intégration ! Partagez un lien d'invitation pour offrir à vos amis un accès instantané à un portefeuille préfinancé.",
   "INVITES_DESCRIPTION": "Notre système d'invitation est conçu pour faciliter l'intégration des nouveaux utilisateurs. Lorsque vous créez une invitation, vous générez essentiellement un lien de parrainage intégré avec une clé privée pour un portefeuille préfinancé. En partageant ce lien avec des amis ou des collègues, vous leur donnez un accès immédiat pour commencer à utiliser le service avec des fonds déjà en place. Cela les aide non seulement à éviter les tracas de la configuration initiale, mais encourage également une adoption et une utilisation plus rapides de notre plateforme.",
   "NEW_FOLDER": "Nouveau Dossier",
-  "ALLOW_TRACKING": "Autorisez l'application à suivre vos activités de manière anonyme."
+  "ALLOW_TRACKING": "Autorisez l'application à suivre vos activités de manière anonyme.",
+  "MARKET": "Marché",
+  "PUBLISHERS": "Éditeurs",
+  "SUBSCRIBED": "Abonné",
+  "LOAD_MORE": "Charger plus"
 }
diff --git a/src/locales/hu-HU.json b/src/locales/hu-HU.json
index 80709093..f8f0d651 100644
--- a/src/locales/hu-HU.json
+++ b/src/locales/hu-HU.json
@@ -225,5 +225,9 @@
   "INVITES_TOOLTIP": "Az meghívók egyszerűsítik a bekapcsolódást! Ossz meg egy meghívó linket, hogy barátaid azonnal hozzáférjenek egy előre finanszírozott tárcához.",
   "INVITES_DESCRIPTION": "A meghívó rendszerünk arra lett tervezve, hogy az új felhasználók számára gördülékenyebbé tegye az első lépéseket. Egy meghívó létrehozásakor lényegében egy olyan hivatkozási linket generálsz, amely egy előre finanszírozott tárcához tartozó privát kulccsal van ellátva. Ennek a linknek a megosztásával azonnali hozzáférést és a már meglévő alapokkal történő szolgáltatás használatát teszed lehetővé barátaid vagy kollégáid számára. Ez nem csak az első beállításokkal járó bonyodalmakat hárítja el, de gyorsabbá is teszi platformunk elfogadását és használatát.",
   "NEW_FOLDER": "Új Mappa",
-  "ALLOW_TRACKING": "Engedélyezze az alkalmazásnak, hogy anonim módon kövesse nyomon tevékenységeit."
-}
+  "ALLOW_TRACKING": "Engedélyezze az alkalmazásnak, hogy anonim módon kövesse nyomon tevékenységeit.",
+  "MARKET": "Piac",
+  "PUBLISHERS": "Kiadók",
+  "SUBSCRIBED": "Feliratkozva",
+  "LOAD_MORE": "Több betöltése"
+}
\ No newline at end of file
diff --git a/src/locales/it-IT.json b/src/locales/it-IT.json
index ae2f6156..24d249d0 100644
--- a/src/locales/it-IT.json
+++ b/src/locales/it-IT.json
@@ -225,5 +225,9 @@
   "INVITES_TOOLTIP": "Gli inviti semplificano l'accesso! Condividi un link di invito per fornire agli amici un accesso immediato a un portafoglio prefinanziato.",
   "INVITES_DESCRIPTION": "Il nostro sistema di inviti è progettato per rendere fluido il processo di integrazione per i nuovi utenti. Creando un invito, stai essenzialmente generando un link di riferimento incastonato con una chiave privata per un portafoglio prefinanziato. Condividendo questo link con amici o colleghi, dai loro accesso immediato per iniziare a utilizzare il servizio con fondi già presenti. Questo non solo aiuta a evitare i problemi della configurazione iniziale, ma incoraggia anche una più rapida adozione e utilizzo della nostra piattaforma.",
   "NEW_FOLDER": "Nuova Cartella",
-  "ALLOW_TRACKING": "Permetti all'app di tracciare le tue attività in modo anonimo."
+  "ALLOW_TRACKING": "Permetti all'app di tracciare le tue attività in modo anonimo.",
+  "MARKET": "Mercato",
+  "PUBLISHERS": "Editori",
+  "SUBSCRIBED": "Iscritto",
+  "LOAD_MORE": "Carica altro"
 }
diff --git a/src/locales/jp-JP.json b/src/locales/ja-JP.json
similarity index 99%
rename from src/locales/jp-JP.json
rename to src/locales/ja-JP.json
index 689edbc2..dc880e9c 100644
--- a/src/locales/jp-JP.json
+++ b/src/locales/ja-JP.json
@@ -225,5 +225,9 @@
   "INVITES_TOOLTIP": "招待はオンボーディングを簡単にします！招待リンクを共有して、友達にプレファンデッドのウォレットへの瞬時のアクセスを提供します。",
   "INVITES_DESCRIPTION": "当社の招待制度は、新規ユーザーのオンボーディングプロセスをスムーズにするよう設計されています。招待を作成すると、基本的にはプレファンデッドウォレットへのプライベートキーが埋め込まれた紹介リンクを生成します。このリンクを友達や同僚と共有することで、既に用意されている資金でサービスをすぐに利用できるようになります。これは初期設定の手間を省くだけでなく、当社のプラットフォームのより迅速な採用と利用を促進します。",
   "NEW_FOLDER": "新しいフォルダ",
-  "ALLOW_TRACKING": "アプリが匿名であなたの活動を追跡することを許可します。"
+  "ALLOW_TRACKING": "アプリが匿名であなたの活動を追跡することを許可します。",
+  "MARKET": "市場",
+  "PUBLISHERS": "出版社",
+  "SUBSCRIBED": "購読済み",
+  "LOAD_MORE": "さらに読み込む"
 }
diff --git a/src/locales/pt-PT.json b/src/locales/pt-PT.json
index b5384b75..0f7493ed 100644
--- a/src/locales/pt-PT.json
+++ b/src/locales/pt-PT.json
@@ -225,5 +225,9 @@
   "INVITES_TOOLTIP": "Convites simplificam a integração! Compartilhe um link de convite para dar aos seus amigos acesso imediato a uma carteira pré-financiada.",
   "INVITES_DESCRIPTION": "O nosso sistema de convites foi projetado para tornar o processo de integração transparente para novos usuários. Ao criar um convite, você está essencialmente gerando um link de referência embutido com uma chave privada para uma carteira pré-financiada. Ao compartilhar este link com amigos ou colegas, você lhes dá acesso imediato para começar a usar o serviço com fundos já estabelecidos. Isso não só ajuda a evitar as complicações da configuração inicial, como também incentiva uma adoção e uso mais rápidos da nossa plataforma.",
   "NEW_FOLDER": "Nova Pasta",
-  "ALLOW_TRACKING": "Permita que o aplicativo rastreie suas atividades de forma anônima."
+  "ALLOW_TRACKING": "Permita que o aplicativo rastreie suas atividades de forma anônima.",
+  "MARKET": "Mercado",
+  "PUBLISHERS": "Editores",
+  "SUBSCRIBED": "Inscrito",
+  "LOAD_MORE": "Carregar mais"
 }
diff --git a/src/locales/sl-SI.json b/src/locales/sl-SI.json
index dd1e47aa..1694b4a0 100644
--- a/src/locales/sl-SI.json
+++ b/src/locales/sl-SI.json
@@ -225,5 +225,9 @@
   "INVITES_TOOLTIP": "Vabila poenostavijo postopek vključevanja! Delite povezavo za vabilo, da svojim prijateljem omogočite takojšen dostop do prednaložene denarnice.",
   "INVITES_DESCRIPTION": "Naš sistem vabil je zasnovan tako, da novim uporabnikom olajša postopek vključevanja. Ko ustvarite vabilo, v bistvu generirate napotnično povezavo, vgrajeno s privatnim ključem za predhodno financirano denarnico. Z deljenjem te povezave s prijatelji ali kolegi jim omogočate takojšen dostop in začetek uporabe storitve z že obstoječimi sredstvi. To ne le olajša začetne težave z nastavitvami, ampak tudi spodbuja hitrejše sprejetje in uporabo naše platforme.",
   "NEW_FOLDER": "Nova mapa",
-  "ALLOW_TRACKING": "Dovolite aplikaciji, da sledi vašim dejavnostim na anonimen način."
+  "ALLOW_TRACKING": "Dovolite aplikaciji, da sledi vašim dejavnostim na anonimen način.",
+  "MARKET": "Trg",
+  "PUBLISHERS": "Založniki",
+  "SUBSCRIBED": "Naročen",
+  "LOAD_MORE": "Naloži več"
 }
diff --git a/src/locales/rs-RS.json b/src/locales/sr-LATN.json
similarity index 99%
rename from src/locales/rs-RS.json
rename to src/locales/sr-LATN.json
index 0069a114..27556561 100644
--- a/src/locales/rs-RS.json
+++ b/src/locales/sr-LATN.json
@@ -225,5 +225,9 @@
   "INVITES_TOOLTIP": "Pozivi olakšavaju početni pristup! Podelite pozivnički link da biste prijateljima omogućili trenutan pristup prethodno finansiranom novčaniku.",
   "INVITES_DESCRIPTION": "Naš sistem pozivnica je dizajniran da novim korisnicima olakša proces uključivanja. Kada kreirate pozivnicu, u suštini generišete referalni link sa ugrađenim privatnim ključem za unapred finansiran novčanik. Deljenjem ovog linka sa prijateljima ili kolegama, omogućavate im trenutan pristup i početak korišćenja servisa sa već postojećim sredstvima. Ovo ne samo da im pomaže da izbegnu komplikacije početnog podešavanja, već i podstiče bržu usvajanje i korišćenje naše platforme.",
   "NEW_FOLDER": "Novi direktorijum",
-  "ALLOW_TRACKING": "Dozvolite aplikaciji da prati vaše aktivnosti na anoniman način."
+  "ALLOW_TRACKING": "Dozvolite aplikaciji da prati vaše aktivnosti na anoniman način.",
+  "MARKET": "Tržište",
+  "PUBLISHERS": "Izdavači",
+  "SUBSCRIBED": "Pretplaćen",
+  "LOAD_MORE": "Učitaj još"
 }
diff --git a/src/locales/tr-TR.json b/src/locales/tr-TR.json
index adc954c4..2bb1e203 100644
--- a/src/locales/tr-TR.json
+++ b/src/locales/tr-TR.json
@@ -225,5 +225,9 @@
   "INVITES_TOOLTIP": "Davetiyeler katılım sürecini kolaylaştırır! Arkadaşlarınıza önceden finanse edilmiş bir cüzdana anında erişim sağlamak için bir davet bağlantısı paylaşın.",
   "INVITES_DESCRIPTION": "Davet sistemimiz, yeni kullanıcıların hızlı bir şekilde sisteme dahil olmalarını sağlamak amacıyla tasarlanmıştır. Bir davet oluşturduğunuzda, esasen önceden finanse edilmiş bir cüzdana özel anahtar ile kodlanmış bir referans bağlantısı oluşturmuş olursunuz. Bu bağlantıyı arkadaşlarınızla veya meslektaşlarınızla paylaşarak, hemen kullanmaya başlayabilecekleri ve zaten var olan fonlarla hizmetimizi kullanmalarını sağlarsınız. Bu, sadece ilk kurulumun karmaşıklığını ortadan kaldırmakla kalmaz, aynı zamanda platformumuzu daha hızlı benimsemelerini ve kullanmalarını teşvik eder.",
   "NEW_FOLDER": "Yeni Klasör",
-  "ALLOW_TRACKING": "Uygulamanın etkinliklerinizi anonim bir şekilde izlemesine izin verin."
+  "ALLOW_TRACKING": "Uygulamanın etkinliklerinizi anonim bir şekilde izlemesine izin verin.",
+  "MARKET": "Pazar",
+  "PUBLISHERS": "Yayıncılar",
+  "SUBSCRIBED": "Abone",
+  "LOAD_MORE": "Daha Fazla Yükle"
 }
diff --git a/src/locales/ch-CH.json b/src/locales/zh.json
similarity index 99%
rename from src/locales/ch-CH.json
rename to src/locales/zh.json
index 9f399648..467e0b9c 100644
--- a/src/locales/ch-CH.json
+++ b/src/locales/zh.json
@@ -224,5 +224,9 @@
   "INVITES_TOOLTIP": "邀请简化了入门过程！分享邀请链接，让朋友们即时访问预先充值的钱包。",
   "INVITES_DESCRIPTION": "我们的邀请制度旨在使新用户的入门过程变得无缝。当您创建邀请时，您实际上是生成了一个嵌入预先充值钱包的私钥的推荐链接。通过与朋友或同事共享此链接，您可以让他们立即访问并开始使用已配置好的服务。这不仅可以帮助他们避免初次设置的麻烦，还可以更快地推动他们使用我们的平台。",
   "NEW_FOLDER": "新建文件夹",
-  "ALLOW_TRACKING": "允许该应用以匿名方式跟踪您的活动。"
+  "ALLOW_TRACKING": "允许该应用以匿名方式跟踪您的活动。",
+  "MARKET": "市场",
+  "PUBLISHERS": "出版商",
+  "SUBSCRIBED": "已订阅",
+  "LOAD_MORE": "加载更多"
 }
diff --git a/src/pages/drive/index.tsx b/src/pages/drive/index.tsx
index 9d9db7ed..9c6b40e4 100644
--- a/src/pages/drive/index.tsx
+++ b/src/pages/drive/index.tsx
@@ -42,6 +42,7 @@ import {
 import PodList from '@components/Views/PodList/PodList';
 import FeedbackMessage from '@components/FeedbackMessage/FeedbackMessage';
 import { constructPath, rootPathToRelative } from '@utils/filename';
+import { getPodName, isSharedPod } from '@utils/pod';
 
 const Drive: FC = () => {
   const { trackPageView } = useMatomo();
@@ -71,6 +72,7 @@ const Drive: FC = () => {
   const { fdpClientRef, getAccountAddress } = useFdpStorage();
   const [error, setError] = useState<string | null>(null);
   const searchControllerRef = useRef<AbortController | null>(null);
+  const podName = getPodName(activePod);
 
   useEffect(() => {
     trackPageView({
@@ -89,7 +91,7 @@ const Drive: FC = () => {
   }, [activePod, directoryName, openPods]);
 
   const handleUpdateDrive = async (props?: RefreshDriveOptions) => {
-    if (!activePod) {
+    if (!podName) {
       return;
     }
     setError(null);
@@ -99,15 +101,17 @@ const Drive: FC = () => {
     const directory = directoryName || 'root';
     const fdpPath = getFdpPathByDirectory(directory);
 
-    const cachedItems = getContentItemsCache(
-      userAddress,
-      activePod,
-      fdpPath
-    ).contentItems;
-    setFiles(cachedItems.files || []);
-    setDirectories(cachedItems.directories || []);
-    if (props?.isUseCacheOnly) {
-      return;
+    if (!isSharedPod(activePod)) {
+      const cachedItems = getContentItemsCache(
+        userAddress,
+        activePod,
+        fdpPath
+      ).contentItems;
+      setFiles(cachedItems.files || []);
+      setDirectories(cachedItems.directories || []);
+      if (props?.isUseCacheOnly) {
+        return;
+      }
     }
 
     setLoading(true);
@@ -120,12 +124,14 @@ const Drive: FC = () => {
       );
       setFiles(response.files);
       setDirectories(response.directories);
-      saveContentItemsCache(
-        userAddress,
-        activePod,
-        fdpPath,
-        JSON.stringify(response)
-      );
+      if (!isSharedPod(activePod)) {
+        saveContentItemsCache(
+          userAddress,
+          activePod,
+          fdpPath,
+          JSON.stringify(response)
+        );
+      }
     } catch (e) {
       console.log('Error: Could not fetch directories & files!', e);
       if (isDataNotFoundError(e) || isJsonParsingError(e)) {
@@ -249,7 +255,7 @@ const Drive: FC = () => {
 
   const handleSearch = async () => {
     try {
-      if (loading || !activePod) {
+      if (loading || !podName) {
         return;
       }
 
@@ -342,7 +348,8 @@ const Drive: FC = () => {
       <div className="flex flex-col">
         <div className="flex md:hidden">
           <DriveActionHeaderMobile
-            podName={activePod}
+            podName={podName}
+            subscribedPod={isSharedPod(activePod)}
             driveView={driveView}
             directory={directoryName}
             onDirectorySelect={handleDirectoryPathChange}
@@ -355,13 +362,14 @@ const Drive: FC = () => {
           title={
             <DirectoryPath
               className="hidden md:flex"
-              podName={activePod}
+              podName={podName}
+              subscribedPod={isSharedPod(activePod)}
               directory={directoryName}
               onDirectorySelect={handleDirectoryPathChange}
               onBackToDrive={onBackToDrive}
             />
           }
-          activePod={activePod}
+          activePod={podName}
           driveView={driveView}
           toggleView={handleToggleView}
           toggleSort={handleToggleSort}
@@ -392,7 +400,7 @@ const Drive: FC = () => {
 
         {!loading && (
           <div style={{ marginTop: 15 }}>
-            {activePod ? (
+            {podName ? (
               directories?.length || files?.length ? (
                 <div>
                   {driveView === 'grid' ? (
diff --git a/src/utils/ens.ts b/src/utils/ens.ts
index c54aa1d1..91ad05ec 100644
--- a/src/utils/ens.ts
+++ b/src/utils/ens.ts
@@ -1,14 +1,14 @@
 import { Network } from '@data/networks';
-import { ENS, Environments } from '@fairdatasociety/fdp-contracts-js';
-import { BigNumber, providers } from 'ethers';
+import { ENS } from '@fairdatasociety/fdp-contracts-js';
+import { BigNumber, providers, utils } from 'ethers';
 
 const FDS_DOMAIN = 'fds';
 
 export async function estimateRegistrationPrice(
   network: Network
 ): Promise<BigNumber> {
-  const provider = new providers.JsonRpcProvider(network.config.rpcUrl);
-  const ens = new ENS(network.config, provider, FDS_DOMAIN);
+  const provider = new providers.JsonRpcProvider(network.ensConfig.rpcUrl);
+  const ens = new ENS(network.ensConfig, provider, FDS_DOMAIN);
   return ens.registerUsernameApproximatePrice();
 }
 
@@ -16,7 +16,11 @@ export function getAccountBalance(
   address: string,
   network: Network
 ): Promise<BigNumber> {
-  return new providers.JsonRpcProvider(network.config.rpcUrl).getBalance(
+  return new providers.JsonRpcProvider(network.ensConfig.rpcUrl).getBalance(
     address
   );
 }
+
+export function hashUsername(username: string): string {
+  return utils.namehash(`${username}.fds`);
+}
diff --git a/src/utils/pod.ts b/src/utils/pod.ts
new file mode 100644
index 00000000..b589deb3
--- /dev/null
+++ b/src/utils/pod.ts
@@ -0,0 +1,17 @@
+import { PodShareInfo } from '@fairdatasociety/fdp-storage/dist/pod/types';
+
+export function isSharedPod(pod: unknown): pod is PodShareInfo {
+  const { podName, podAddress, userAddress, password } = (pod ||
+    {}) as PodShareInfo;
+
+  return (
+    typeof podName === 'string' &&
+    typeof podAddress === 'string' &&
+    typeof userAddress === 'string' &&
+    typeof password === 'string'
+  );
+}
+
+export function getPodName(pod: string | PodShareInfo): string {
+  return typeof pod === 'string' ? pod : (pod as PodShareInfo).podName;
+}

From ee7c0df39389677ad77237158616bd296f5ae0e9 Mon Sep 17 00:00:00 2001
From: Vladan <tomic.vladan.mail@gmail.com>
Date: Tue, 5 Mar 2024 10:43:20 +0100
Subject: [PATCH 05/11] feat: subscription pods improvements

---
 src/components/Cards/PodCard/PodCard.tsx      | 12 ++++----
 .../Dropdowns/PodDropdown/PodDropdownMenu.tsx |  2 --
 .../DriveSideBar/DriveSideBar.tsx             | 14 ++--------
 src/components/Views/PodList/PodList.tsx      |  4 +--
 .../Views/PodList/SubscribedPodList.tsx       | 28 +++++++++++++++++++
 src/locales/de-DE.json                        |  5 ++--
 src/locales/en-US.json                        |  3 +-
 src/locales/es-ES.json                        |  3 +-
 src/locales/fr-FR.json                        |  3 +-
 src/locales/hu-HU.json                        |  5 ++--
 src/locales/it-IT.json                        |  3 +-
 src/locales/ja-JP.json                        |  3 +-
 src/locales/pt-PT.json                        |  3 +-
 src/locales/sl-SI.json                        |  3 +-
 src/locales/sr-LATN.json                      |  3 +-
 src/locales/tr-TR.json                        |  3 +-
 src/locales/zh.json                           |  3 +-
 src/pages/drive/index.tsx                     | 13 +++++++--
 18 files changed, 64 insertions(+), 49 deletions(-)
 create mode 100644 src/components/Views/PodList/SubscribedPodList.tsx

diff --git a/src/components/Cards/PodCard/PodCard.tsx b/src/components/Cards/PodCard/PodCard.tsx
index 3fb6edd5..c88bc689 100644
--- a/src/components/Cards/PodCard/PodCard.tsx
+++ b/src/components/Cards/PodCard/PodCard.tsx
@@ -3,19 +3,21 @@ import { useContext } from 'react';
 import DriveLightIcon from '@media/UI/drive-active-light.svg';
 import DriveDarkIcon from '@media/UI/drive-active-dark.svg';
 import shortenString from '@utils/shortenString';
+import { PodShareInfo } from '@fairdatasociety/fdp-storage/dist/pod/types';
+import { getPodName } from '@utils/pod';
 
 interface PodCardProps {
-  podName: string;
-  onClick: (podName: string) => void;
+  pod: string | PodShareInfo;
+  onClick: (podName: string | PodShareInfo) => void;
 }
 
-export default function PodCard({ podName, onClick }: PodCardProps) {
+export default function PodCard({ pod, onClick }: PodCardProps) {
   const { theme } = useContext(ThemeContext);
 
   return (
     <div
       className="w-32 mb-2 py-2 py-8 flex-column cursor-pointer dark:hover:shadow-soft-purple hover:shadow-soft-purple"
-      onClick={() => onClick(podName)}
+      onClick={() => onClick(pod)}
     >
       <span className="flex text-color-accents-grey-lavendar dark:text-color-shade-dark-1-night">
         <div className="mx-auto">
@@ -24,7 +26,7 @@ export default function PodCard({ podName, onClick }: PodCardProps) {
       </span>
 
       <h4 className="text-sm px-1 mt-2 overflow-x-hidden font-medium text-center text-color-shade-light-1-day dark:text-color-shade-light-1-night">
-        {shortenString(podName, 24)}
+        {shortenString(getPodName(pod), 24)}
       </h4>
     </div>
   );
diff --git a/src/components/Dropdowns/PodDropdown/PodDropdownMenu.tsx b/src/components/Dropdowns/PodDropdown/PodDropdownMenu.tsx
index 013b8871..f1d5999e 100644
--- a/src/components/Dropdowns/PodDropdown/PodDropdownMenu.tsx
+++ b/src/components/Dropdowns/PodDropdown/PodDropdownMenu.tsx
@@ -39,8 +39,6 @@ const PodDropdownMenu = () => {
   const podName = getPodName(activePod);
 
   const onPodSelect = (pod: string | PodShareInfo) => {
-    console.log(pod);
-
     setActivePod(pod);
     setDirectoryName('root');
   };
diff --git a/src/components/NavigationBars/DriveSideBar/DriveSideBar.tsx b/src/components/NavigationBars/DriveSideBar/DriveSideBar.tsx
index cc8d16c7..399d62fb 100644
--- a/src/components/NavigationBars/DriveSideBar/DriveSideBar.tsx
+++ b/src/components/NavigationBars/DriveSideBar/DriveSideBar.tsx
@@ -33,7 +33,6 @@ const DriveSideBar: FC = () => {
     loading: podLoading,
     pods,
     setPods,
-    allSubItems,
     setAllSubItems,
     subscribedPods,
     setSubscribedPods,
@@ -75,7 +74,8 @@ const DriveSideBar: FC = () => {
 
       const subscribedPods = await getSubscriptionPods(
         fdpClientRef.current,
-        subItems.slice(0, 5)
+        // TODO pods might be loaded in batches
+        subItems
       );
 
       setPods(pods);
@@ -189,16 +189,6 @@ const DriveSideBar: FC = () => {
                   onClick={() => handleOpenPod(pod)}
                 />
               ))}
-              {allSubItems.length < subscribedPods.length && (
-                <Button
-                  type="button"
-                  variant="secondary"
-                  label={intl.get('LOAD_MORE')}
-                  onClick={() => {
-                    setShowImportPodModal(true);
-                  }}
-                />
-              )}
             </>
           )}
         </div>
diff --git a/src/components/Views/PodList/PodList.tsx b/src/components/Views/PodList/PodList.tsx
index 81409a13..c1a61a61 100644
--- a/src/components/Views/PodList/PodList.tsx
+++ b/src/components/Views/PodList/PodList.tsx
@@ -10,10 +10,10 @@ export default function PodList({ pods, onPodSelect }: PodListProps) {
   return (
     <div className="flex justify-center sm:justify-start flex-wrap h-full">
       {(pods?.pod_name || []).map((pod) => (
-        <PodCard key={pod} podName={pod} onClick={onPodSelect} />
+        <PodCard key={pod} pod={pod} onClick={onPodSelect} />
       ))}
       {(pods?.shared_pod_name || []).map((pod) => (
-        <PodCard key={pod} podName={pod} onClick={onPodSelect} />
+        <PodCard key={pod} pod={pod} onClick={onPodSelect} />
       ))}
     </div>
   );
diff --git a/src/components/Views/PodList/SubscribedPodList.tsx b/src/components/Views/PodList/SubscribedPodList.tsx
new file mode 100644
index 00000000..17b1d270
--- /dev/null
+++ b/src/components/Views/PodList/SubscribedPodList.tsx
@@ -0,0 +1,28 @@
+import PodCard from '@components/Cards/PodCard/PodCard';
+import { useLocales } from '@context/LocalesContext';
+import { PodShareInfo } from '@fairdatasociety/fdp-storage/dist/pod/types';
+
+interface SubscribedPodListProps {
+  pods: PodShareInfo[];
+  onPodSelect: (podName: PodShareInfo) => void;
+}
+
+export default function SubscribedPodList({
+  pods,
+  onPodSelect,
+}: SubscribedPodListProps) {
+  const { intl } = useLocales();
+  if (!pods || pods.length === 0) {
+    return null;
+  }
+  return (
+    <div>
+      <h5 className="text-center font-bold">{intl.get('SUBSCRIBED')}:</h5>
+      <div className="flex justify-center sm:justify-start flex-wrap h-full">
+        {pods.map((pod) => (
+          <PodCard key={pod.podAddress} pod={pod} onClick={onPodSelect} />
+        ))}
+      </div>
+    </div>
+  );
+}
diff --git a/src/locales/de-DE.json b/src/locales/de-DE.json
index 85d7cde3..67e7cc0d 100644
--- a/src/locales/de-DE.json
+++ b/src/locales/de-DE.json
@@ -228,6 +228,5 @@
   "ALLOW_TRACKING": "Erlauben Sie der App, Ihre Aktivitäten in anonymer Weise zu verfolgen.",
   "MARKET": "Markt",
   "PUBLISHERS": "Verlage",
-  "SUBSCRIBED": "Abonniert",
-  "LOAD_MORE": "Mehr laden"
-}
\ No newline at end of file
+  "SUBSCRIBED": "Abonniert"
+}
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index fc8eb74d..423dfe06 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -228,6 +228,5 @@
   "ALLOW_TRACKING": "Allow the app to track your activities in an anonymous manner.",
   "MARKET": "Market",
   "PUBLISHERS": "Publishers",
-  "SUBSCRIBED": "Subscribed",
-  "LOAD_MORE": "Load More"
+  "SUBSCRIBED": "Subscribed"
 }
diff --git a/src/locales/es-ES.json b/src/locales/es-ES.json
index c1b41ae6..4a7b88b3 100644
--- a/src/locales/es-ES.json
+++ b/src/locales/es-ES.json
@@ -228,6 +228,5 @@
   "ALLOW_TRACKING": "Permita que la aplicación rastree sus actividades de manera anónima.",
   "MARKET": "Mercado",
   "PUBLISHERS": "Editores",
-  "SUBSCRIBED": "Suscrito",
-  "LOAD_MORE": "Cargar más"
+  "SUBSCRIBED": "Suscrito"
 }
diff --git a/src/locales/fr-FR.json b/src/locales/fr-FR.json
index aebdc75e..e2c36b86 100644
--- a/src/locales/fr-FR.json
+++ b/src/locales/fr-FR.json
@@ -228,6 +228,5 @@
   "ALLOW_TRACKING": "Autorisez l'application à suivre vos activités de manière anonyme.",
   "MARKET": "Marché",
   "PUBLISHERS": "Éditeurs",
-  "SUBSCRIBED": "Abonné",
-  "LOAD_MORE": "Charger plus"
+  "SUBSCRIBED": "Abonné"
 }
diff --git a/src/locales/hu-HU.json b/src/locales/hu-HU.json
index f8f0d651..f6436283 100644
--- a/src/locales/hu-HU.json
+++ b/src/locales/hu-HU.json
@@ -228,6 +228,5 @@
   "ALLOW_TRACKING": "Engedélyezze az alkalmazásnak, hogy anonim módon kövesse nyomon tevékenységeit.",
   "MARKET": "Piac",
   "PUBLISHERS": "Kiadók",
-  "SUBSCRIBED": "Feliratkozva",
-  "LOAD_MORE": "Több betöltése"
-}
\ No newline at end of file
+  "SUBSCRIBED": "Feliratkozva"
+}
diff --git a/src/locales/it-IT.json b/src/locales/it-IT.json
index 24d249d0..a498689a 100644
--- a/src/locales/it-IT.json
+++ b/src/locales/it-IT.json
@@ -228,6 +228,5 @@
   "ALLOW_TRACKING": "Permetti all'app di tracciare le tue attività in modo anonimo.",
   "MARKET": "Mercato",
   "PUBLISHERS": "Editori",
-  "SUBSCRIBED": "Iscritto",
-  "LOAD_MORE": "Carica altro"
+  "SUBSCRIBED": "Iscritto"
 }
diff --git a/src/locales/ja-JP.json b/src/locales/ja-JP.json
index dc880e9c..e82ecd3a 100644
--- a/src/locales/ja-JP.json
+++ b/src/locales/ja-JP.json
@@ -228,6 +228,5 @@
   "ALLOW_TRACKING": "アプリが匿名であなたの活動を追跡することを許可します。",
   "MARKET": "市場",
   "PUBLISHERS": "出版社",
-  "SUBSCRIBED": "購読済み",
-  "LOAD_MORE": "さらに読み込む"
+  "SUBSCRIBED": "購読済み"
 }
diff --git a/src/locales/pt-PT.json b/src/locales/pt-PT.json
index 0f7493ed..31273517 100644
--- a/src/locales/pt-PT.json
+++ b/src/locales/pt-PT.json
@@ -228,6 +228,5 @@
   "ALLOW_TRACKING": "Permita que o aplicativo rastreie suas atividades de forma anônima.",
   "MARKET": "Mercado",
   "PUBLISHERS": "Editores",
-  "SUBSCRIBED": "Inscrito",
-  "LOAD_MORE": "Carregar mais"
+  "SUBSCRIBED": "Inscrito"
 }
diff --git a/src/locales/sl-SI.json b/src/locales/sl-SI.json
index 1694b4a0..dd28b9f5 100644
--- a/src/locales/sl-SI.json
+++ b/src/locales/sl-SI.json
@@ -228,6 +228,5 @@
   "ALLOW_TRACKING": "Dovolite aplikaciji, da sledi vašim dejavnostim na anonimen način.",
   "MARKET": "Trg",
   "PUBLISHERS": "Založniki",
-  "SUBSCRIBED": "Naročen",
-  "LOAD_MORE": "Naloži več"
+  "SUBSCRIBED": "Naročen"
 }
diff --git a/src/locales/sr-LATN.json b/src/locales/sr-LATN.json
index 27556561..cfbdf4ce 100644
--- a/src/locales/sr-LATN.json
+++ b/src/locales/sr-LATN.json
@@ -228,6 +228,5 @@
   "ALLOW_TRACKING": "Dozvolite aplikaciji da prati vaše aktivnosti na anoniman način.",
   "MARKET": "Tržište",
   "PUBLISHERS": "Izdavači",
-  "SUBSCRIBED": "Pretplaćen",
-  "LOAD_MORE": "Učitaj još"
+  "SUBSCRIBED": "Pretplaćen"
 }
diff --git a/src/locales/tr-TR.json b/src/locales/tr-TR.json
index 2bb1e203..b2058bb1 100644
--- a/src/locales/tr-TR.json
+++ b/src/locales/tr-TR.json
@@ -228,6 +228,5 @@
   "ALLOW_TRACKING": "Uygulamanın etkinliklerinizi anonim bir şekilde izlemesine izin verin.",
   "MARKET": "Pazar",
   "PUBLISHERS": "Yayıncılar",
-  "SUBSCRIBED": "Abone",
-  "LOAD_MORE": "Daha Fazla Yükle"
+  "SUBSCRIBED": "Abone"
 }
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 467e0b9c..9f6757af 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -227,6 +227,5 @@
   "ALLOW_TRACKING": "允许该应用以匿名方式跟踪您的活动。",
   "MARKET": "市场",
   "PUBLISHERS": "出版商",
-  "SUBSCRIBED": "已订阅",
-  "LOAD_MORE": "加载更多"
+  "SUBSCRIBED": "已订阅"
 }
diff --git a/src/pages/drive/index.tsx b/src/pages/drive/index.tsx
index 9c6b40e4..42fd842c 100644
--- a/src/pages/drive/index.tsx
+++ b/src/pages/drive/index.tsx
@@ -43,6 +43,8 @@ import PodList from '@components/Views/PodList/PodList';
 import FeedbackMessage from '@components/FeedbackMessage/FeedbackMessage';
 import { constructPath, rootPathToRelative } from '@utils/filename';
 import { getPodName, isSharedPod } from '@utils/pod';
+import SubscribedPodList from '@components/Views/PodList/SubscribedPodList';
+import { PodShareInfo } from '@fairdatasociety/fdp-storage/dist/pod/types';
 
 const Drive: FC = () => {
   const { trackPageView } = useMatomo();
@@ -51,6 +53,7 @@ const Drive: FC = () => {
     loading,
     setLoading,
     pods,
+    subscribedPods,
     activePod,
     setActivePod,
     openPods,
@@ -238,7 +241,7 @@ const Drive: FC = () => {
     setShowPreviewModal(true);
   };
 
-  const handlePodSelect = (pod: string) => {
+  const handlePodSelect = (pod: string | PodShareInfo) => {
     setError(null);
     setActivePod(pod);
     setDirectoryName('root');
@@ -429,7 +432,13 @@ const Drive: FC = () => {
                 />
               )
             ) : (
-              <PodList pods={pods} onPodSelect={handlePodSelect} />
+              <>
+                <PodList pods={pods} onPodSelect={handlePodSelect} />
+                <SubscribedPodList
+                  pods={subscribedPods}
+                  onPodSelect={handlePodSelect}
+                />
+              </>
             )}
           </div>
         )}

From 94e3baf70f7f18aefa5cba1ff026153dfa51523b Mon Sep 17 00:00:00 2001
From: Vladan <tomic.vladan.mail@gmail.com>
Date: Tue, 19 Mar 2024 13:18:03 +0100
Subject: [PATCH 06/11] fix: subscription pods

---
 package-lock.json                             | 692 ++++++++++++------
 package.json                                  |   2 +-
 .../EmptyDirectoryCard/EmptyDirectoryCard.tsx |  28 +-
 3 files changed, 469 insertions(+), 253 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 77d6de1b..9c65401f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
         "@fairdatasociety/blossom": "^0.5.0",
-        "@fairdatasociety/fdp-storage": "^0.18.0",
+        "@fairdatasociety/fdp-storage": "^0.19.0",
         "@headlessui/react": "^1.7.14",
         "@metamask/sdk": "^0.5.6",
         "@types/react-blockies": "^1.4.1",
@@ -77,9 +77,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.3",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz",
+      "integrity": "sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==",
       "dev": true
     },
     "node_modules/@ampproject/remapping": {
@@ -94,11 +94,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.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.1.tgz",
+      "integrity": "sha512-bC49z4spJQR3j8vFtJBLqzyzFV0ciuL5HYX7qfSl3KEqeMVV+eTquRvmXxpvB0AMubRrvv7y5DILiLLPi57Ewg==",
       "dependencies": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.24.1",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -142,13 +143,13 @@
       }
     },
     "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.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.1.tgz",
+      "integrity": "sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==",
       "dependencies": {
-        "@babel/types": "^7.21.5",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
+        "@babel/types": "^7.24.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       },
       "engines": {
@@ -156,12 +157,13 @@
       }
     },
     "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "license": "MIT",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
@@ -270,9 +272,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 +290,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 +426,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.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
+      "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==",
       "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,21 +488,23 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "license": "MIT",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.1.tgz",
+      "integrity": "sha512-EPmDPxidWe/Ex+HTFINpvXdPHRmgSF3T8hGvzondYjmgzTQ/0EbLpSxyt+w3zzlYSk9cNBQNF9k0dT5Z2NiBjw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "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.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz",
+      "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==",
       "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.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
+      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
       "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.23.5",
+        "@babel/parser": "^7.24.0",
+        "@babel/types": "^7.24.0"
       },
       "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.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
+      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.1",
+        "@babel/generator": "^7.24.1",
+        "@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.24.1",
+        "@babel/types": "^7.24.0",
+        "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.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
+      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
       "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,11 +2350,11 @@
       }
     },
     "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.8",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
+      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
       "dependencies": {
-        "follow-redirects": "^1.15.0",
+        "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -3072,20 +3078,20 @@
       }
     },
     "node_modules/@fairdatasociety/fdp-contracts-js": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.10.1.tgz",
-      "integrity": "sha512-letk0QcHlv2nNrM7ZF0iazT07IWseM+T0iC9Ax61/dHeR0j/aLkGFv/IiFbMTEXs6xc2iFp+Thoa4x5bmd51Jw==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.11.0.tgz",
+      "integrity": "sha512-TomzmqKlKYetmzwbGtPp20XAvHzP6Td1r8pouAPe8uCmnW4Fu7OT06z2VEhy9WuApleUx++jqFxTyzfIqFPhrA==",
       "peerDependencies": {
         "ethers": ">=5.6.4"
       }
     },
     "node_modules/@fairdatasociety/fdp-storage": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.18.0.tgz",
-      "integrity": "sha512-WfBU/IFTcCvJGL6g7V7fW6XX2ZVZ6VUTAMPwH+Gkg7qcA+ra6LHGIidFKWjINNbzs/gHP1DI9oxxTC6XzAlnBQ==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.19.0.tgz",
+      "integrity": "sha512-tN1mosanu4nAxLx+uxuRSdbSV+/HSgAIsakR1jsgJ2Lneycc4i9Yd7but2LFyOQ5okNh6TM5P6S4hlPUpWk/jQ==",
       "dependencies": {
         "@ethersphere/bee-js": "^6.2.0",
-        "@fairdatasociety/fdp-contracts-js": "^3.10.0",
+        "@fairdatasociety/fdp-contracts-js": "^3.11.0",
         "crypto-js": "^4.2.0",
         "elliptic": "^6.5.4",
         "ethers": "^5.5.2",
@@ -4068,8 +4074,9 @@
       }
     },
     "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "license": "MIT",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -4099,12 +4106,12 @@
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@metamask/object-multiplex": {
@@ -8244,18 +8251,19 @@
       "peer": true
     },
     "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "license": "MIT",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dependencies": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "node_modules/asn1.js/node_modules/bn.js": {
       "version": "4.12.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
     },
     "node_modules/assert": {
       "version": "2.0.0",
@@ -8884,20 +8892,88 @@
       }
     },
     "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "license": "ISC",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz",
+      "integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==",
       "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.5",
+        "hash-base": "~3.0",
         "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
+        "parse-asn1": "^5.1.7",
+        "readable-stream": "^2.3.8",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.12"
       }
     },
+    "node_modules/browserify-sign/node_modules/elliptic": {
+      "version": "6.5.5",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz",
+      "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==",
+      "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/browserify-sign/node_modules/elliptic/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/browserify-sign/node_modules/hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/browserify-sign/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
     "node_modules/browserify-zlib": {
       "version": "0.2.0",
       "license": "MIT",
@@ -12319,14 +12395,15 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -13143,9 +13220,9 @@
       }
     },
     "node_modules/ip": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
+      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
       "peer": true
     },
     "node_modules/is-accessor-descriptor": {
@@ -17623,8 +17700,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"
       },
@@ -18521,14 +18605,31 @@
       }
     },
     "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "license": "ISC",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz",
+      "integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==",
       "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
+        "asn1.js": "^4.10.1",
+        "browserify-aes": "^1.2.0",
+        "evp_bytestokey": "^1.0.3",
+        "hash-base": "~3.0",
+        "pbkdf2": "^3.1.2",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/parse-asn1/node_modules/hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/parse-json": {
@@ -18723,7 +18824,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.17",
+      "version": "8.4.36",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.36.tgz",
+      "integrity": "sha512-/n7eumA6ZjFHAsbX30yhHup/IMkOmlmvtEi7P+6RMYf+bGJSUHc3geH4a0NSZxAz/RJfiS9tooCTs9LAVYUZKw==",
       "dev": true,
       "funding": [
         {
@@ -18733,13 +18836,16 @@
         {
           "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"
+        "source-map-js": "^1.1.0"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -19278,9 +19384,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",
@@ -20110,10 +20216,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "license": "MIT"
-    },
     "node_modules/sass": {
       "version": "1.55.0",
       "devOptional": true,
@@ -20743,8 +20845,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "license": "BSD-3-Clause",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.1.0.tgz",
+      "integrity": "sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -23135,9 +23238,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.3",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz",
+      "integrity": "sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==",
       "dev": true
     },
     "@ampproject/remapping": {
@@ -23148,11 +23251,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.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.1.tgz",
+      "integrity": "sha512-bC49z4spJQR3j8vFtJBLqzyzFV0ciuL5HYX7qfSl3KEqeMVV+eTquRvmXxpvB0AMubRrvv7y5DILiLLPi57Ewg==",
       "requires": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.24.1",
+        "picocolors": "^1.0.0"
       }
     },
     "@babel/compat-data": {
@@ -23183,22 +23287,24 @@
       }
     },
     "@babel/generator": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz",
-      "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.1.tgz",
+      "integrity": "sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==",
       "requires": {
-        "@babel/types": "^7.21.5",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
+        "@babel/types": "^7.24.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       },
       "dependencies": {
         "@jridgewell/gen-mapping": {
-          "version": "0.3.2",
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+          "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
           "requires": {
-            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/set-array": "^1.2.1",
             "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.9"
+            "@jridgewell/trace-mapping": "^0.3.24"
           }
         }
       }
@@ -23281,9 +23387,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",
@@ -23292,18 +23398,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": {
@@ -23389,20 +23497,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.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
+      "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ=="
     },
     "@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",
@@ -23431,17 +23541,20 @@
       }
     },
     "@babel/highlight": {
-      "version": "7.18.6",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.1.tgz",
+      "integrity": "sha512-EPmDPxidWe/Ex+HTFINpvXdPHRmgSF3T8hGvzondYjmgzTQ/0EbLpSxyt+w3zzlYSk9cNBQNF9k0dT5Z2NiBjw==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.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.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz",
+      "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.18.6",
@@ -24367,39 +24480,39 @@
       }
     },
     "@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
+      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
       "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.23.5",
+        "@babel/parser": "^7.24.0",
+        "@babel/types": "^7.24.0"
       }
     },
     "@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.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
+      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
+      "requires": {
+        "@babel/code-frame": "^7.24.1",
+        "@babel/generator": "^7.24.1",
+        "@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.24.1",
+        "@babel/types": "^7.24.0",
+        "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.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
+      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
       "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"
       }
     },
@@ -24643,11 +24756,11 @@
       },
       "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.8",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
+          "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
           "requires": {
-            "follow-redirects": "^1.15.0",
+            "follow-redirects": "^1.15.6",
             "form-data": "^4.0.0",
             "proxy-from-env": "^1.1.0"
           }
@@ -25015,18 +25128,18 @@
       }
     },
     "@fairdatasociety/fdp-contracts-js": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.10.1.tgz",
-      "integrity": "sha512-letk0QcHlv2nNrM7ZF0iazT07IWseM+T0iC9Ax61/dHeR0j/aLkGFv/IiFbMTEXs6xc2iFp+Thoa4x5bmd51Jw==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.11.0.tgz",
+      "integrity": "sha512-TomzmqKlKYetmzwbGtPp20XAvHzP6Td1r8pouAPe8uCmnW4Fu7OT06z2VEhy9WuApleUx++jqFxTyzfIqFPhrA==",
       "requires": {}
     },
     "@fairdatasociety/fdp-storage": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.18.0.tgz",
-      "integrity": "sha512-WfBU/IFTcCvJGL6g7V7fW6XX2ZVZ6VUTAMPwH+Gkg7qcA+ra6LHGIidFKWjINNbzs/gHP1DI9oxxTC6XzAlnBQ==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.19.0.tgz",
+      "integrity": "sha512-tN1mosanu4nAxLx+uxuRSdbSV+/HSgAIsakR1jsgJ2Lneycc4i9Yd7but2LFyOQ5okNh6TM5P6S4hlPUpWk/jQ==",
       "requires": {
         "@ethersphere/bee-js": "^6.2.0",
-        "@fairdatasociety/fdp-contracts-js": "^3.10.0",
+        "@fairdatasociety/fdp-contracts-js": "^3.11.0",
         "crypto-js": "^4.2.0",
         "elliptic": "^6.5.4",
         "ethers": "^5.5.2",
@@ -25764,7 +25877,9 @@
       "version": "3.1.0"
     },
     "@jridgewell/set-array": {
-      "version": "1.1.2"
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="
     },
     "@jridgewell/source-map": {
       "version": "0.3.2",
@@ -25787,12 +25902,12 @@
       "version": "1.4.14"
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "requires": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "@metamask/object-multiplex": {
@@ -28840,16 +28955,19 @@
       "peer": true
     },
     "asn1.js": {
-      "version": "5.4.1",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "requires": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
+        "minimalistic-assert": "^1.0.0"
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.12.0"
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
         }
       }
     },
@@ -29285,17 +29403,88 @@
       }
     },
     "browserify-sign": {
-      "version": "4.2.1",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz",
+      "integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==",
       "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.5",
+        "hash-base": "~3.0",
         "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
+        "parse-asn1": "^5.1.7",
+        "readable-stream": "^2.3.8",
+        "safe-buffer": "^5.2.1"
+      },
+      "dependencies": {
+        "elliptic": {
+          "version": "6.5.5",
+          "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz",
+          "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==",
+          "requires": {
+            "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"
+          },
+          "dependencies": {
+            "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=="
+            }
+          }
+        },
+        "hash-base": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+          "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.8",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+          "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          },
+          "dependencies": {
+            "safe-buffer": {
+              "version": "5.1.2",
+              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          },
+          "dependencies": {
+            "safe-buffer": {
+              "version": "5.1.2",
+              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+            }
+          }
+        }
       }
     },
     "browserify-zlib": {
@@ -31687,7 +31876,9 @@
       "peer": true
     },
     "follow-redirects": {
-      "version": "1.15.2"
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
     },
     "for-each": {
       "version": "0.3.3",
@@ -32220,9 +32411,9 @@
       }
     },
     "ip": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
+      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
       "peer": true
     },
     "is-accessor-descriptor": {
@@ -35499,7 +35690,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",
@@ -36080,13 +36273,27 @@
       }
     },
     "parse-asn1": {
-      "version": "5.1.6",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz",
+      "integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==",
       "requires": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
+        "asn1.js": "^4.10.1",
+        "browserify-aes": "^1.2.0",
+        "evp_bytestokey": "^1.0.3",
+        "hash-base": "~3.0",
+        "pbkdf2": "^3.1.2",
+        "safe-buffer": "^5.2.1"
+      },
+      "dependencies": {
+        "hash-base": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+          "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        }
       }
     },
     "parse-json": {
@@ -36205,12 +36412,14 @@
       "peer": true
     },
     "postcss": {
-      "version": "8.4.17",
+      "version": "8.4.36",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.36.tgz",
+      "integrity": "sha512-/n7eumA6ZjFHAsbX30yhHup/IMkOmlmvtEi7P+6RMYf+bGJSUHc3geH4a0NSZxAz/RJfiS9tooCTs9LAVYUZKw==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "source-map-js": "^1.1.0"
       }
     },
     "postcss-js": {
@@ -36546,9 +36755,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",
@@ -37122,9 +37331,6 @@
         "is-regex": "^1.1.4"
       }
     },
-    "safer-buffer": {
-      "version": "2.1.2"
-    },
     "sass": {
       "version": "1.55.0",
       "devOptional": true,
@@ -37609,7 +37815,9 @@
       "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
     },
     "source-map-js": {
-      "version": "1.0.2"
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.1.0.tgz",
+      "integrity": "sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw=="
     },
     "source-map-resolve": {
       "version": "0.5.3",
diff --git a/package.json b/package.json
index 640e9c80..588a3457 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
     "@fairdatasociety/blossom": "^0.5.0",
-    "@fairdatasociety/fdp-storage": "^0.18.0",
+    "@fairdatasociety/fdp-storage": "^0.19.0",
     "@headlessui/react": "^1.7.14",
     "@metamask/sdk": "^0.5.6",
     "@types/react-blockies": "^1.4.1",
diff --git a/src/components/Cards/EmptyDirectoryCard/EmptyDirectoryCard.tsx b/src/components/Cards/EmptyDirectoryCard/EmptyDirectoryCard.tsx
index 85fa8590..31524fb2 100644
--- a/src/components/Cards/EmptyDirectoryCard/EmptyDirectoryCard.tsx
+++ b/src/components/Cards/EmptyDirectoryCard/EmptyDirectoryCard.tsx
@@ -1,6 +1,9 @@
 import InfoDarkIcon from '@media/UI/info-dark.svg';
 import { useLocales } from '@context/LocalesContext';
 import { Button } from '@components/Buttons';
+import { useContext } from 'react';
+import PodContext from '@context/PodContext';
+import { isSharedPod } from '@utils/pod';
 
 export interface EmptyDirectoryCardProps {
   onUploadClick: () => void;
@@ -8,6 +11,7 @@ export interface EmptyDirectoryCardProps {
 
 const EmptyDirectoryCard = ({ onUploadClick }: EmptyDirectoryCardProps) => {
   const { intl } = useLocales();
+  const { activePod } = useContext(PodContext);
 
   return (
     <div className="flex justify-center items-center w-full pt-10">
@@ -21,17 +25,21 @@ const EmptyDirectoryCard = ({ onUploadClick }: EmptyDirectoryCardProps) => {
             {intl.get('NO_ITEMS')}
           </h2>
 
-          <p className="mt-2 font-normal text-xs text-color-accents-plum-black dark:text-color-shade-light-2-night text-center">
-            {intl.get('START_UPLOADING_OR_CREATING_FOLDERS')}
-          </p>
+          {!isSharedPod(activePod) && (
+            <>
+              <p className="mt-2 font-normal text-xs text-color-accents-plum-black dark:text-color-shade-light-2-night text-center">
+                {intl.get('START_UPLOADING_OR_CREATING_FOLDERS')}
+              </p>
 
-          <Button
-            className="mt-4"
-            variant="tertiary-outlined"
-            onClick={onUploadClick}
-          >
-            {intl.get('UPLOAD')}
-          </Button>
+              <Button
+                className="mt-4"
+                variant="tertiary-outlined"
+                onClick={onUploadClick}
+              >
+                {intl.get('UPLOAD')}
+              </Button>
+            </>
+          )}
         </div>
       </div>
     </div>

From f7dcd5fdf79e2d380a561c66ca3efc0a17066d95 Mon Sep 17 00:00:00 2001
From: Vladan <tomic.vladan.mail@gmail.com>
Date: Tue, 19 Mar 2024 13:45:06 +0100
Subject: [PATCH 07/11] fix: metamask wallet

---
 .../MetamaskMigrationDialog/MetamaskCreateAccount.tsx        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx
index 444301d1..fcf8f147 100644
--- a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx
+++ b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx
@@ -6,7 +6,7 @@ import UserContext from '@context/UserContext';
 import { Network } from '@data/networks';
 import { estimateRegistrationPrice, getAccountBalance } from '@utils/ens';
 import { sendAmount, switchToNetwork } from '@utils/metamask';
-import { BigNumber, utils } from 'ethers';
+import { BigNumber, Wallet, utils } from 'ethers';
 import { useContext, useEffect, useRef, useState } from 'react';
 import InfoLight from '@media/UI/info-light.svg';
 import InfoDark from '@media/UI/info-dark.svg';
@@ -96,7 +96,8 @@ export default function MetamaskCreateAccount({
       }
 
       await fdpClientRef.current.account.register(request);
-      setWallet(fdpClientRef.current.account.wallet);
+      const wallet = new Wallet(fdpClientRef.current.account.wallet.privateKey);
+      setWallet(wallet);
       setFdpStorageType('native');
       setIsLoggedIn(true);
       setLoginType('username');

From a6ddbc322d3e3e7c276e9c51d9d4830cb9b14c3f Mon Sep 17 00:00:00 2001
From: Vladan <tomic.vladan.mail@gmail.com>
Date: Tue, 19 Mar 2024 13:57:01 +0100
Subject: [PATCH 08/11] fix: blossom type

---
 src/context/FdpStorageContext.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/context/FdpStorageContext.tsx b/src/context/FdpStorageContext.tsx
index 1081169c..905244a4 100644
--- a/src/context/FdpStorageContext.tsx
+++ b/src/context/FdpStorageContext.tsx
@@ -166,7 +166,8 @@ function FdpStorageProvider(props: FdpStorageContextProps) {
     if (type === 'native') {
       fdpClientRef.current = createFdpStorage(ensConfig, datahubConfig);
     } else if (type === 'blossom') {
-      fdpClientRef.current = blossom.fdpStorage;
+      // TODO Blossom doesn't support dataHub
+      fdpClientRef.current = blossom.fdpStorage as unknown as FdpStorage;
     } else {
       throw new Error('Unknown FDP storage type');
     }

From 6a1dcf7414801640d5ab49279cdf621cc8a6e209 Mon Sep 17 00:00:00 2001
From: Vladan <tomic.vladan.mail@gmail.com>
Date: Wed, 27 Mar 2024 13:22:38 +0100
Subject: [PATCH 09/11] fix: network config

---
 src/data/networks.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/data/networks.ts b/src/data/networks.ts
index 491ce408..d986c4ee 100644
--- a/src/data/networks.ts
+++ b/src/data/networks.ts
@@ -47,7 +47,8 @@ export const networks: Network[] = [
     name: 'zkEVM Testnet',
     id: Environments.ZKEVM_TESTNET,
     chainId: 1442,
-    config: getEnsEnvironmentConfig(Environments.ZKEVM_TESTNET),
+    ensConfig: getEnsEnvironmentConfig(Environments.ZKEVM_TESTNET),
+    datahubConfig: getDataHubEnvironmentConfig(Environments.ZKEVM_TESTNET),
   },
 ];
 

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 10/11] 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');

From c675354792bba2cfd25b025474824a19860af7d9 Mon Sep 17 00:00:00 2001
From: Vladan <tomic.vladan.mail@gmail.com>
Date: Wed, 27 Mar 2024 14:26:08 +0100
Subject: [PATCH 11/11] fix: missing label

---
 src/locales/de-DE.json   | 3 ++-
 src/locales/en-US.json   | 3 ++-
 src/locales/es-ES.json   | 3 ++-
 src/locales/fr-FR.json   | 3 ++-
 src/locales/hu-HU.json   | 3 ++-
 src/locales/it-IT.json   | 3 ++-
 src/locales/ja-JP.json   | 3 ++-
 src/locales/pt-PT.json   | 3 ++-
 src/locales/sl-SI.json   | 3 ++-
 src/locales/sr-LATN.json | 3 ++-
 src/locales/tr-TR.json   | 3 ++-
 src/locales/zh.json      | 4 +++-
 12 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/locales/de-DE.json b/src/locales/de-DE.json
index f81dd918..be47f921 100644
--- a/src/locales/de-DE.json
+++ b/src/locales/de-DE.json
@@ -228,5 +228,6 @@
   "ALLOW_TRACKING": "Erlauben Sie der App, Ihre Aktivitäten in anonymer Weise zu verfolgen.",
   "MARKET": "Markt",
   "PUBLISHERS": "Verlage",
-  "SUBSCRIBED": "Abonniert"
+  "SUBSCRIBED": "Abonniert",
+  "REMEMBER_ME": "Automatische Anmeldung"
 }
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 6dba813b..f21d3d4d 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -228,5 +228,6 @@
   "ALLOW_TRACKING": "Allow the app to track your activities in an anonymous manner.",
   "MARKET": "Market",
   "PUBLISHERS": "Publishers",
-  "SUBSCRIBED": "Subscribed"
+  "SUBSCRIBED": "Subscribed",
+  "REMEMBER_ME": "Auto login"
 }
diff --git a/src/locales/es-ES.json b/src/locales/es-ES.json
index 9b2fb76e..2b53468a 100644
--- a/src/locales/es-ES.json
+++ b/src/locales/es-ES.json
@@ -228,5 +228,6 @@
   "ALLOW_TRACKING": "Permita que la aplicación rastree sus actividades de manera anónima.",
   "MARKET": "Mercado",
   "PUBLISHERS": "Editores",
-  "SUBSCRIBED": "Suscrito"
+  "SUBSCRIBED": "Suscrito",
+  "REMEMBER_ME": "Inicio de sesión automático"
 }
diff --git a/src/locales/fr-FR.json b/src/locales/fr-FR.json
index 47667eff..60bbe224 100644
--- a/src/locales/fr-FR.json
+++ b/src/locales/fr-FR.json
@@ -228,5 +228,6 @@
   "ALLOW_TRACKING": "Autorisez l'application à suivre vos activités de manière anonyme.",
   "MARKET": "Marché",
   "PUBLISHERS": "Éditeurs",
-  "SUBSCRIBED": "Abonné"
+  "SUBSCRIBED": "Abonné",
+  "REMEMBER_ME": "Connexion automatique"
 }
diff --git a/src/locales/hu-HU.json b/src/locales/hu-HU.json
index 863e7f44..d365b9f8 100644
--- a/src/locales/hu-HU.json
+++ b/src/locales/hu-HU.json
@@ -228,5 +228,6 @@
   "ALLOW_TRACKING": "Engedélyezze az alkalmazásnak, hogy anonim módon kövesse nyomon tevékenységeit.",
   "MARKET": "Piac",
   "PUBLISHERS": "Kiadók",
-  "SUBSCRIBED": "Feliratkozva"
+  "SUBSCRIBED": "Feliratkozva",
+  "REMEMBER_ME": "Automatikus bejelentkezés"
 }
diff --git a/src/locales/it-IT.json b/src/locales/it-IT.json
index e03bb202..c6063f19 100644
--- a/src/locales/it-IT.json
+++ b/src/locales/it-IT.json
@@ -228,5 +228,6 @@
   "ALLOW_TRACKING": "Permetti all'app di tracciare le tue attività in modo anonimo.",
   "MARKET": "Mercato",
   "PUBLISHERS": "Editori",
-  "SUBSCRIBED": "Iscritto"
+  "SUBSCRIBED": "Iscritto",
+  "REMEMBER_ME": "Accesso automatico"
 }
diff --git a/src/locales/ja-JP.json b/src/locales/ja-JP.json
index 9f531625..70026b2c 100644
--- a/src/locales/ja-JP.json
+++ b/src/locales/ja-JP.json
@@ -228,5 +228,6 @@
   "ALLOW_TRACKING": "アプリが匿名であなたの活動を追跡することを許可します。",
   "MARKET": "市場",
   "PUBLISHERS": "出版社",
-  "SUBSCRIBED": "購読済み"
+  "SUBSCRIBED": "購読済み",
+  "REMEMBER_ME": "自動ログイン"
 }
diff --git a/src/locales/pt-PT.json b/src/locales/pt-PT.json
index 3905d299..57128b89 100644
--- a/src/locales/pt-PT.json
+++ b/src/locales/pt-PT.json
@@ -228,5 +228,6 @@
   "ALLOW_TRACKING": "Permita que o aplicativo rastreie suas atividades de forma anônima.",
   "MARKET": "Mercado",
   "PUBLISHERS": "Editores",
-  "SUBSCRIBED": "Inscrito"
+  "SUBSCRIBED": "Inscrito",
+  "REMEMBER_ME": "Login automático"
 }
diff --git a/src/locales/sl-SI.json b/src/locales/sl-SI.json
index d6cacf8b..a9179abc 100644
--- a/src/locales/sl-SI.json
+++ b/src/locales/sl-SI.json
@@ -228,5 +228,6 @@
   "ALLOW_TRACKING": "Dovolite aplikaciji, da sledi vašim dejavnostim na anonimen način.",
   "MARKET": "Trg",
   "PUBLISHERS": "Založniki",
-  "SUBSCRIBED": "Naročen"
+  "SUBSCRIBED": "Naročen",
+  "REMEMBER_ME": "Samodejna prijava"
 }
diff --git a/src/locales/sr-LATN.json b/src/locales/sr-LATN.json
index 5a138be6..f0e54cc8 100644
--- a/src/locales/sr-LATN.json
+++ b/src/locales/sr-LATN.json
@@ -228,5 +228,6 @@
   "ALLOW_TRACKING": "Dozvolite aplikaciji da prati vaše aktivnosti na anoniman način.",
   "MARKET": "Tržište",
   "PUBLISHERS": "Izdavači",
-  "SUBSCRIBED": "Pretplaćen"
+  "SUBSCRIBED": "Pretplaćen",
+  "REMEMBER_ME": "Automatska prijava"
 }
diff --git a/src/locales/tr-TR.json b/src/locales/tr-TR.json
index b3aabc17..40195fa9 100644
--- a/src/locales/tr-TR.json
+++ b/src/locales/tr-TR.json
@@ -228,5 +228,6 @@
   "ALLOW_TRACKING": "Uygulamanın etkinliklerinizi anonim bir şekilde izlemesine izin verin.",
   "MARKET": "Pazar",
   "PUBLISHERS": "Yayıncılar",
-  "SUBSCRIBED": "Abone"
+  "SUBSCRIBED": "Abone",
+  "REMEMBER_ME": "Otomatik giriş"
 }
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 11e25df6..baef84fb 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -67,6 +67,7 @@
   "USERNAME_OR_EMAIL_IS_REQUIRED": "需要用户名或电子邮件",
   "SUBMIT": "提交",
   "DISCLAIMER": "Fairdrive 处于测试阶段，仅供评估使用！文件完整性持久性和安全性未得到保证！请预期 Fairdrive 中的数据随时可能被删除。",
+  "DISCLAIMER_DEV": "此版本默认配置为在测试网上运行。",
   "WELCOME_BACK": "欢迎回来",
   "LOG_IN_TO_GET_ACCESS": "请登录以访问您的 Fairdrive。",
   "CHOOSE_NETWORK": "选择网络",
@@ -227,5 +228,6 @@
   "ALLOW_TRACKING": "允许该应用以匿名方式跟踪您的活动。",
   "MARKET": "市场",
   "PUBLISHERS": "出版商",
-  "SUBSCRIBED": "已订阅"
+  "SUBSCRIBED": "已订阅",
+  "REMEMBER_ME": "自动登录"
 }