Merge branch 'dev' of https://github.com/forbole/forbole-portal into dev

forbole · Feb 10, 2022 · 4389c99 · 4389c99
2 parents 30bc4e8 + 74d5ef8
commit 4389c99
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/components/Layout/LeftMenu.tsx b/components/Layout/LeftMenu.tsx
@@ -123,7 +123,7 @@ const LeftMenu: React.FC<LeftMenuProps> = ({ activeItem, isMenuExpanded, setIsMe
           {items.map((item) => {
             const selected = item.href === activeItem
             return (
-              <Link key={item.title} href={item.href} passHref>
+              <Link key={item.title} href={item.href} as={`${item.href}`} passHref>
                 <ListItem
                   selected={selected}
                   className={classes.menuItem}

diff --git a/locales/en/common.json b/locales/en/common.json
@@ -38,7 +38,7 @@
   "unlock password description": "Enter password to unlock your application",
   "unlock pasword helper text": "* Require after 15 minutes",
   "incorrect password": "Incorrect password",
-  "security password title": "Wallet Security Password",
+  "security password title": "Wallet Password",
   "security password description": "Create a password to access your wallet",
   "import wallet title": "Import Wallet",
   "password security level 0": "Weak",
@@ -76,15 +76,15 @@
   "by validators": "by validators",
   "accounts": "Accounts",
   "change wallet moniker": "Change wallet moniker",
-  "change security password": "Change wallet security password",
+  "change security password": "Change wallet password",
   "view secret recovery phrase": "View secret recovery phrase",
   "add account to wallet": "Add account to wallet",
   "delete wallet": "Delete Wallet",
   "wallet moniker": "Wallet Moniker",
   "current password": "Current Password",
   "new password": "New Password",
   "save": "Save",
-  "enter security password": "Please enter wallet security password",
+  "enter security password": "Please enter wallet password",
   "backup password title": "Export Mnemonic",
   "export secret recovery phrase title": "Export Secret Recovery Phrase",
   "backup password description": "In oder to export your secret recovery phrase properly, we need a password with it will be encrypted for security reasons. Please insert below passwords that you will also be required later when importing it.",

diff --git a/locales/zh/common.json b/locales/zh/common.json
@@ -37,7 +37,7 @@
   "unlock password title": "[zh] Unlock Password",
   "unlock password description": "[zh] Enter password to unlock your application",
   "incorrect password": "[zh] Incorrect password",
-  "security password title": "[zh] Wallet Security Password",
+  "security password title": "[zh] Wallet Password",
   "security password description": "[zh] Create a password to access your wallet",
   "import wallet title": "[zh] Import Wallet",
   "password security level 0": "[zh] Weak",