Merge branch 'develop'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "liquality-wallet",
-  "version": "0.83.0",
+  "version": "0.83.2",
   "private": true,
   "author": "Liquality <[email protected]>",
   "scripts": {
@@ -29,7 +29,7 @@
     "@liquality/ethereum-utils": "^1.13.12",
     "@liquality/terra-networks": "^1.13.12",
     "@liquality/types": "^1.13.12",
-    "@liquality/wallet-core": "4.6.0",
+    "@liquality/wallet-core": "4.8.0",
     "@terra-money/terra.js": "^3.1.6",
     "@testing-library/vue": "^5.8.2",
     "amplitude-js": "8.18.2",

src/locales/cb/pages.json

@@ -163,6 +163,7 @@
     "eyeInstructions": "Ipahilayo kini gikan sa mga mata sa uban!",
     "exportLedger": "Dili ma-export gikan sa usa ka Ledger account",
     "createAccount": "Paghimo og Account",
+    "editAccount": "Edit Account",
     "selectNetwork": "Pili ug Network",
     "chooseAccountName": "Pilia ang Ngalan sa Account",
     "accountAliasErrorFiveChars": "Ang ngalan kinahanglan adunay 5 o labaw pa nga mga karakter",

src/locales/en/pages.json

@@ -163,6 +163,7 @@
     "eyeInstructions": "Keep this away from prying eyes!",
     "exportLedger": "Cannot export from a Ledger account",
     "createAccount": "Create Account",
+    "editAccount": "Edit Account",
     "selectNetwork": "Select Network",
     "chooseAccountName": "Choose Account Name",
     "accountAliasErrorFiveChars": "Name should have 5 or more characters",

src/locales/es/pages.json

@@ -163,6 +163,7 @@
     "eyeInstructions": "¡Mantén esto alejado de miradas indiscretas!",
     "exportLedger": "No se puede exportar de una cuenta de Ledger",
     "createAccount": "Crear Cuenta",
+    "editAccount": "Editar Cuenta",
     "selectNetwork": "Selecionar Red",
     "chooseAccountName": "Elige un Nombre de Cuenta",
     "accountAliasErrorFiveChars": "El nombre debe tener 5 o más caracteres",

src/locales/ph/pages.json

@@ -163,6 +163,7 @@
     "eyeInstructions": "Maging mapagmatyag sa mga nanunuod sa paligid",
     "exportLedger": "Hindi ma-export mula sa isang Ledger account",
     "createAccount": "Gumawa ng Account",
+    "editAccount": "Edit Account",
     "selectNetwork": "Pumili ng Network",
     "chooseAccountName": "Pumili ng Account Name",
     "accountAliasErrorFiveChars": "Dapat may 5 o higit pang character ang pangalan",

src/locales/pt/pages.json

@@ -163,6 +163,7 @@
     "eyeInstructions": "Mantenha a salvo!",
     "exportLedger": "Não é possível exportar de uma conta Ledger",
     "createAccount": "Criar Conta",
+    "editAccount": "Edit Account",
     "selectNetwork": "Selecionar Rede",
     "chooseAccountName": "Escolha o Nome da Conta",
     "accountAliasErrorFiveChars": "O nome deve ter 5 ou mais caracteres",

src/locales/zh/pages.json

@@ -163,6 +163,7 @@
     "eyeInstructions": "别让他人看到",
     "exportLedger": "不能从Ledger账户导出",
     "createAccount": "创建新账户",
+    "editAccount": "Edit Account",
     "selectNetwork": "选择网络",
     "chooseAccountName": "选择账户名称",
     "accountAliasErrorFiveChars": "名称至少5位字符",

src/manifest.json

@@ -1,6 +1,6 @@
 {
   "manifest_version": 2,
-  "version": "0.83.0",
+  "version": "0.83.2",
   "name": "__MSG_appName__",
   "description": "__MSG_appDesc__",
   "default_locale": "en",

src/router/index.js

@@ -172,6 +172,13 @@ const routes = [
     props: true,
     meta: { protect: true }
   },
+  {
+    path: '/accounts/edit/:accountId?',
+    component: () => import('@/views/Accounts/Edit.vue'),
+    name: 'EditAccount',
+    props: true,
+    meta: { protect: true }
+  },
   {
     path: '/accounts/hardware-wallet',
     component: () => import('@/views/Accounts/HardwareWallet/HardwareWallet.vue'),

src/views/Accounts/ChainAccounts.vue

@@ -48,13 +48,23 @@
           {{ formatFiatUI(formatFiat(account.totalFiatBalance)) }}
         </template>
         <template #detail>
-          <toggle-button
-            :css-colors="true"
-            :value="account.enabled"
-            :sync="true"
-            :disabled="!isChainEnabled(chain.id)"
-            @change="(e) => toggleAccount([account.id], e.value)"
-          />
+          <div class="d-flex">
+            <router-link
+              :to="{ name: 'EditAccount', params: { accountId: account.id } }"
+              class="edit-link"
+              :id="'edit-account-plus-icon-' + account.id"
+              v-tooltip="$t('pages.accounts.editAccount')"
+            >
+              <EditIcon />
+            </router-link>
+            <toggle-button
+              :css-colors="true"
+              :value="account.enabled"
+              :sync="true"
+              :disabled="!isChainEnabled(chain.id)"
+              @change="(e) => toggleAccount([account.id], e.value)"
+            />
+          </div>
         </template>
       </ListItem>
     </div>
@@ -65,6 +75,7 @@
 import { mapState, mapGetters, mapActions } from 'vuex'
 import cryptoassets from '@liquality/wallet-core/dist/src/utils/cryptoassets'
 import PlusIcon from '@/assets/icons/plus_circle.svg'
+import EditIcon from '@/assets/icons/edit_icon.svg'
 import { formatFiat, formatFiatUI } from '@liquality/wallet-core/dist/src/utils/coinFormatter'
 import { getAccountIcon } from '@/utils/accounts'
 import { getChainIcon } from '@/utils/accounts'
@@ -73,7 +84,8 @@ import ListItem from '@/components/ListItem'
 export default {
   components: {
     PlusIcon,
-    ListItem
+    ListItem,
+    EditIcon
   },
   props: {
     chain: Object
@@ -171,15 +183,16 @@ export default {
       font-size: $font-size-tiny;
       color: $text-muted;
     }
+  }
+}
 
-    .create-link {
-      width: 20px;
-      height: 20px;
-      margin-right: 20px;
-      svg {
-        width: 20px;
-      }
-    }
+.create-link,
+.edit-link {
+  width: 20px;
+  height: 20px;
+  margin-right: 20px;
+  svg {
+    width: 20px;
   }
 }