Use settingsStorage from wallet (#929)

* Use settingsStorage from wallet * Update wallet version * Hide switch on Explore page for !isLoggedIn * Update lokalise Co-authored-by: Stefan Popov <17688105+stefashkaa@users.noreply.github.com>
sora-xor · Jan 27, 2023 · 880f138 · 880f138
1 parent 5338829
commit 880f138
Show file tree

Hide file tree

Showing 24 changed files with 71 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@metamask/detect-provider": "^2.0.0",
-    "@soramitsu/soraneo-wallet-web": "1.13.7",
+    "@soramitsu/soraneo-wallet-web": "1.13.9",
     "@walletconnect/web3-provider": "^1.8.0",
     "base-64": "^1.0.0",
     "core-js": "^3.26.0",

diff --git a/src/lang/cs.json b/src/lang/cs.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Vyberte peněženku, se kterou chcete pracovat",
         "wallet": {
-            "install": "Nainstalujte"
+            "install": "Nainstalujte",
+            "connected": "Připojeno",
+            "notConnected": "Nepřipojený"
         }
     },
     "wallet": {

diff --git a/src/lang/de.json b/src/lang/de.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Wähle eine Wallet zum Arbeiten aus",
         "wallet": {
-            "install": "Installieren"
+            "install": "Installieren",
+            "connected": "In Verbindung gebracht",
+            "notConnected": "Nicht verbunden"
         }
     },
     "wallet": {

diff --git a/src/lang/en.json b/src/lang/en.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Select a wallet to work with",
         "wallet": {
-            "install": "Install"
+            "install": "Install",
+            "connected": "Connected",
+            "notConnected": "Not connected"
         }
     },
     "wallet": {

diff --git a/src/lang/es.json b/src/lang/es.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Seleccione una billetera con la que trabajar",
         "wallet": {
-            "install": "Instalar"
+            "install": "Instalar",
+            "connected": "Conectado",
+            "notConnected": "No conectado"
         }
     },
     "wallet": {

diff --git a/src/lang/fr.json b/src/lang/fr.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Sélectionnez un portefeuille avec lequel travailler",
         "wallet": {
-            "install": "Installer"
+            "install": "Installer",
+            "connected": "Connecté",
+            "notConnected": "Pas connecté"
         }
     },
     "wallet": {

diff --git a/src/lang/hr.json b/src/lang/hr.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Odaberite novčanik s kojim ćete raditi",
         "wallet": {
-            "install": "Instalirati"
+            "install": "Instalirati",
+            "connected": "Povezan",
+            "notConnected": "Nije povezano"
         }
     },
     "wallet": {

diff --git a/src/lang/hu.json b/src/lang/hu.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Válasszon egy pénztárcát, amellyel dolgozni szeretne",
         "wallet": {
-            "install": "Telepítés"
+            "install": "Telepítés",
+            "connected": "csatlakoztatva",
+            "notConnected": "Nem kapcsolódik"
         }
     },
     "wallet": {

diff --git a/src/lang/hy.json b/src/lang/hy.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Ընտրեք դրամապանակ՝ աշխատելու համար",
         "wallet": {
-            "install": "Տեղադրեք"
+            "install": "Տեղադրեք",
+            "connected": "Միացված է",
+            "notConnected": "Միացված չէ"
         }
     },
     "wallet": {

diff --git a/src/lang/id.json b/src/lang/id.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Pilih dompet untuk digunakan",
         "wallet": {
-            "install": "Install"
+            "install": "Install",
+            "connected": "Terhubung",
+            "notConnected": "Tidak terhubung"
         }
     },
     "wallet": {

diff --git a/src/lang/it.json b/src/lang/it.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Seleziona un portafoglio con cui lavorare",
         "wallet": {
-            "install": "Installare"
+            "install": "Installare",
+            "connected": "Collegato",
+            "notConnected": "Non connesso"
         }
     },
     "wallet": {

diff --git a/src/lang/nl.json b/src/lang/nl.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Selecteer een portemonnee om mee te werken",
         "wallet": {
-            "install": "Installeren"
+            "install": "Installeren",
+            "connected": "Verbonden",
+            "notConnected": "Niet verbonden"
         }
     },
     "wallet": {

diff --git a/src/lang/no.json b/src/lang/no.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Velg en lommebok du vil jobbe med",
         "wallet": {
-            "install": "Installere"
+            "install": "Installere",
+            "connected": "Tilkoblet",
+            "notConnected": "Ikke tilkoblet"
         }
     },
     "wallet": {

diff --git a/src/lang/pl.json b/src/lang/pl.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Wybierz portfel do pracy",
         "wallet": {
-            "install": "zainstalować"
+            "install": "zainstalować",
+            "connected": "Połączony",
+            "notConnected": "Nie połączony"
         }
     },
     "wallet": {

diff --git a/src/lang/ru.json b/src/lang/ru.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Выберите кошелек для работы",
         "wallet": {
-            "install": "Установить"
+            "install": "Установить",
+            "connected": "Подключено",
+            "notConnected": "Не подключен"
         }
     },
     "wallet": {

diff --git a/src/lang/sk.json b/src/lang/sk.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Vyberte peňaženku, s ktorou chcete pracovať",
         "wallet": {
-            "install": "Inštalácia"
+            "install": "Inštalácia",
+            "connected": "Pripojené",
+            "notConnected": "Nepripojený"
         }
     },
     "wallet": {

diff --git a/src/lang/sr.json b/src/lang/sr.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Изаберите новчаник са којим ћете радити",
         "wallet": {
-            "install": "Инсталирај"
+            "install": "Инсталирај",
+            "connected": "Повезан",
+            "notConnected": "Није повезан"
         }
     },
     "wallet": {

diff --git a/src/lang/sv.json b/src/lang/sv.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Välj en plånbok att arbeta med",
         "wallet": {
-            "install": "Installera"
+            "install": "Installera",
+            "connected": "Ansluten",
+            "notConnected": "Ej ansluten"
         }
     },
     "wallet": {

diff --git a/src/lang/vi.json b/src/lang/vi.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Chọn một ví để kết nối",
         "wallet": {
-            "install": "Cài đặt"
+            "install": "Cài đặt",
+            "connected": "kết nối",
+            "notConnected": "Không kết nối"
         }
     },
     "wallet": {

diff --git a/src/lang/yo.json b/src/lang/yo.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "Yan apamọwọ kan lati ṣiṣẹ pẹlu",
         "wallet": {
-            "install": "Fi sori ẹrọ"
+            "install": "Fi sori ẹrọ",
+            "connected": "Ti sopọ",
+            "notConnected": "Ko ti sopọ"
         }
     },
     "wallet": {

diff --git a/src/lang/zh_CN.json b/src/lang/zh_CN.json
@@ -102,7 +102,9 @@
         },
         "selectWallet": "选择要使用的钱包",
         "wallet": {
-            "install": "安装"
+            "install": "安装",
+            "connected": "连接的",
+            "notConnected": "未连接"
         }
     },
     "wallet": {

diff --git a/src/utils/storage.ts b/src/utils/storage.ts
@@ -1,6 +1,4 @@
-import { Storage } from '@sora-substrate/util';
 import { storage as soraStorage } from '@soramitsu/soraneo-wallet-web';
 
-export const settingsStorage = new Storage('dexSettings');
-
+export { settingsStorage } from '@soramitsu/soraneo-wallet-web';
 export default soraStorage;
diff --git a/src/views/Explore/Container.vue b/src/views/Explore/Container.vue
@@ -43,6 +43,7 @@ import TranslationMixin from '@/components/mixins/TranslationMixin';
 import storage from '@/utils/storage';
 import router, { lazyComponent } from '@/router';
 import { PageNames, Components } from '@/consts';
+import { getter } from '@/store/decorators';
 
 const storageKey = 'exploreAccountItems';
 
@@ -53,6 +54,8 @@ const storageKey = 'exploreAccountItems';
   },
 })
 export default class ExploreContainer extends Mixins(mixins.LoadingMixin, TranslationMixin) {
+  @getter.wallet.account.isLoggedIn private isLoggedIn!: boolean;
+
   exploreQuery = '';
   isAccountItems = Boolean(storage.get(storageKey as any));
 
@@ -82,8 +85,9 @@ export default class ExploreContainer extends Mixins(mixins.LoadingMixin, Transl
     return this.t(`pageTitle.${this.pageName}`);
   }
 
+  /** Shown only for logged in users and for any tab on page except Tokens */
   get switcherAvailable(): boolean {
-    return this.pageName !== PageNames.ExploreTokens;
+    return this.pageName !== PageNames.ExploreTokens && this.isLoggedIn;
   }
 
   handleTabChange(name: string): void {

diff --git a/yarn.lock b/yarn.lock
@@ -2597,10 +2597,10 @@
     vue-property-decorator "^9.1.2"
     vuex "^3.6.2"
 
-"@soramitsu/soraneo-wallet-web@1.13.7":
-  version "1.13.7"
-  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.13.7.tgz#dfdb2d216804ede4d1df024b3cb5c585bc752fb3"
-  integrity sha512-9+toLZE8TQxrt8McJys18maGLJFiXeGX1IkvdC7Z8eBPCrvcUZFdXPixZOHWOkz3ucnsHfK7nK68R9PBlT30qQ==
+"@soramitsu/soraneo-wallet-web@1.13.9":
+  version "1.13.9"
+  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.13.9.tgz#45aa647ad9be3be6394d74efb2d9310d97dacbea"
+  integrity sha512-m0txbc9ZktGiTmEALO08jsc3BqzDqlofvy0tuU1v52jcNCsip4HF5lvNd3yyWz5qoZudV43q2m/bPplQ0LiOLg==
   dependencies:
     "@polkadot/vue-identicon" "2.9.14"
     "@sora-substrate/util" "1.13.12"