Merge branch 'develop'

bradleySuira · bradleySuira · commit 76a08e61ba55 · 2023-01-23T07:11:50.000-05:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liquality-wallet",
-  "version": "0.83.3",
+  "version": "0.83.4",
   "private": true,
   "author": "Liquality <info@liquality.io>",
   "scripts": {
diff --git a/src/components/CustomRpcSettingsForm.vue b/src/components/CustomRpcSettingsForm.vue
@@ -92,8 +92,8 @@ export default {
         walletId: this.activeWalletId,
         chainId,
         chanifyNetwork: {
-          custom: true,
           ...network,
+          custom: true,
           explorerUrl: this.formData.explorerUrl,
           rpcUrl: this.formData.newRpcUrl
         }
@@ -102,9 +102,7 @@ export default {
       await this.saveCustomChainSettings(payload)
     },
     getBaseUrl(url, custom = true) {
-      if (custom === true) {
-        return url
-      }
+      if (custom) return url
 
       const pathArray = url.split('/'),
         protocol = pathArray[0],
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
@@ -115,6 +115,9 @@ export default {
     ...mapState(['experiments', 'activeNetwork']),
     ...mapGetters('app', ['isSettingsModalOpen']),
     ...mapGetters(['accountItem']),
+    currentRoutePath() {
+      return this.$route.path
+    },
     account() {
       if (this.$route.params.accountId) {
         return this.accountItem(this.$route.params.accountId)
@@ -219,7 +222,7 @@ export default {
         }
       })
       this.showMenuList = false
-      this.$router.replace('/accounts/management')
+      this.$router.replace({ name: 'ManageAccounts', params: { from: this.currentRoutePath } })
     },
     ledger() {
       this.trackAnalytics({
diff --git a/src/locales/cb/pages.json b/src/locales/cb/pages.json
@@ -87,7 +87,9 @@
       "blockExplorerUrl": "Block explorer URL (optional)",
       "save": "Save",
       "default": "Default"
-    }
+    },
+    "manageAccounts": "Manage Accounts",
+    "manageAccountsSub": "Create more addresses for each network and edit their names."
   },
   "experiments": {
     "experiments": "Experiments",
diff --git a/src/locales/cb/whats_new.json b/src/locales/cb/whats_new.json
@@ -3,9 +3,7 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for send NFT on Solana and Arbitrum",
-      "Fix for Polygon's new minimum miner tip / priority fee",
-      "Fix for Optimism chainId error"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
     ]
   },
   {
diff --git a/src/locales/en/pages.json b/src/locales/en/pages.json
@@ -87,7 +87,9 @@
       "blockExplorerUrl": "Block explorer URL (optional)",
       "save": "Save",
       "default": "Default"
-    }
+    },
+    "manageAccounts": "Manage Accounts",
+    "manageAccountsSub": "Create more addresses for each network and edit their names."
   },
   "experiments": {
     "experiments": "Experiments",
diff --git a/src/locales/en/whats_new.json b/src/locales/en/whats_new.json
@@ -3,9 +3,7 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for send NFT on Solana and Arbitrum",
-      "Fix for Polygon's new minimum miner tip / priority fee",
-      "Fix for Optimism chainId error"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
     ]
   },
   {
diff --git a/src/locales/es/pages.json b/src/locales/es/pages.json
@@ -87,7 +87,9 @@
       "blockExplorerUrl": "Block explorer URL (optional)",
       "save": "Save",
       "default": "Default"
-    }
+    },
+    "manageAccounts": "Manage Accounts",
+    "manageAccountsSub": "Create more addresses for each network and edit their names."
   },
   "experiments": {
     "experiments": "Experimentos",
diff --git a/src/locales/es/whats_new.json b/src/locales/es/whats_new.json
@@ -3,9 +3,7 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for send NFT on Solana and Arbitrum",
-      "Fix for Polygon's new minimum miner tip / priority fee",
-      "Fix for Optimism chainId error"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
     ]
   },
   {
diff --git a/src/locales/ph/pages.json b/src/locales/ph/pages.json
@@ -87,7 +87,9 @@
       "blockExplorerUrl": "Block explorer URL (optional)",
       "save": "Save",
       "default": "Default"
-    }
+    },
+    "manageAccounts": "Manage Accounts",
+    "manageAccountsSub": "Create more addresses for each network and edit their names."
   },
   "experiments": {
     "experiments": "Mga eksperimento",
diff --git a/src/locales/ph/whats_new.json b/src/locales/ph/whats_new.json
@@ -3,9 +3,7 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for send NFT on Solana and Arbitrum",
-      "Fix for Polygon's new minimum miner tip / priority fee",
-      "Fix for Optimism chainId error"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
     ]
   },
   {
diff --git a/src/locales/pt/pages.json b/src/locales/pt/pages.json
@@ -87,7 +87,9 @@
       "blockExplorerUrl": "Block explorer URL (optional)",
       "save": "Save",
       "default": "Default"
-    }
+    },
+    "manageAccounts": "Manage Accounts",
+    "manageAccountsSub": "Create more addresses for each network and edit their names."
   },
   "experiments": {
     "experiments": "Experimental",
diff --git a/src/locales/pt/whats_new.json b/src/locales/pt/whats_new.json
@@ -3,9 +3,7 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for send NFT on Solana and Arbitrum",
-      "Fix for Polygon's new minimum miner tip / priority fee",
-      "Fix for Optimism chainId error"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
     ]
   },
   {
diff --git a/src/locales/zh/pages.json b/src/locales/zh/pages.json
@@ -87,7 +87,9 @@
       "blockExplorerUrl": "Block explorer URL (optional)",
       "save": "Save",
       "default": "Default"
-    }
+    },
+    "manageAccounts": "Manage Accounts",
+    "manageAccountsSub": "Create more addresses for each network and edit their names."
   },
   "experiments": {
     "experiments": "实验功能",
diff --git a/src/locales/zh/whats_new.json b/src/locales/zh/whats_new.json
@@ -3,9 +3,7 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for send NFT on Solana and Arbitrum",
-      "Fix for Polygon's new minimum miner tip / priority fee",
-      "Fix for Optimism chainId error"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
     ]
   },
   {
diff --git a/src/manifest.json b/src/manifest.json
@@ -1,6 +1,6 @@
 {
   "manifest_version": 2,
-  "version": "0.83.3",
+  "version": "0.83.4",
   "name": "__MSG_appName__",
   "description": "__MSG_appDesc__",
   "default_locale": "en",
diff --git a/src/views/Accounts/Manage.vue b/src/views/Accounts/Manage.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="manage-accounts">
-    <NavBar showMenu="false" showBack="true" backPath="/wallet" :backLabel="$t('common.back')">
+    <NavBar
+      showMenu="false"
+      showBack="true"
+      :backPath="routeBackRoutePath || '/wallet'"
+      :backLabel="$t('common.back')"
+    >
       <span class="wallet_header">
         <strong>{{ $t('pages.accounts.manageAccounts') }}</strong>
       </span>
@@ -39,6 +44,9 @@ export default {
           accounts: this.getChainAccounts(chainId)
         }
       })
+    },
+    routeBackRoutePath() {
+      return this.$route.params.from
     }
   },
   methods: {
diff --git a/src/views/Receive.vue b/src/views/Receive.vue
@@ -137,7 +137,7 @@ export default {
     },
     faucet() {
       const asset = cryptoassets[this.asset]
-      const chain = getChain(this.activeNetwork, asset.chain)
+      const chain = getChain(this.activeNetwork, asset?.chain)
 
       if (chain.faucetUrl) {
         return {
@@ -168,7 +168,6 @@ export default {
     }
 
     const uri = this.chainName === 'terra' ? this.address : [this.chainName, this.address].join(':')
-
     QRCode.toString(
       uri,
       {
diff --git a/src/views/Send/Send.vue b/src/views/Send/Send.vue
@@ -353,7 +353,7 @@ export default {
     ...mapGetters('app', ['ledgerBridgeReady']),
     ...mapGetters(['accountItem', 'client', 'suggestedFeePrices']),
     accountUrl() {
-      return `/accounts/${this.accountId}/${this.nativeAsset}/receive`
+      return `/accounts/${this.accountId}/${this.assetChain}/receive`
     },
     account() {
       return this.accountItem(this.accountId)
diff --git a/src/views/SettingItems.vue b/src/views/SettingItems.vue
@@ -103,6 +103,19 @@
         <ChevronRightIcon class="list-item-chevron" />
       </router-link>
     </div>
+    <div class="setting-item" id="settings_item_wallet_logs">
+      <router-link :to="{ name: 'ManageAccounts', params: { from: currentRoutePath } }">
+        <div class="setting-item_title flex-fill mb-2">
+          <div class="setting-item_title_accounts">
+            {{ $t('pages.settings.manageAccounts') }}
+          </div>
+          <span class="setting-item_sub">
+            {{ $t('pages.settings.manageAccountsSub') }}
+          </span>
+        </div>
+        <ChevronRightIcon class="list-item-chevron" />
+      </router-link>
+    </div>
   </div>
 </template>
 <script>
@@ -130,6 +143,10 @@ export default {
     ...mapState(['activeNetwork', 'activeWalletId', 'injectEthereum']),
     ...mapGetters(['analyticsEnabled']),
 
+    currentRoutePath() {
+      return this.$route.path
+    },
+
     localeOptions() {
       return (this.locales?.filter((i) => i !== this.currentLocale) || [])
         .map((l) => ({

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "liquality-wallet",`
`3`		`- "version": "0.83.3",`
	`3`	`+ "version": "0.83.4",`
`4`	`4`	`"private": true,`
`5`	`5`	`"author": "Liquality <info@liquality.io>",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@`
`3`	`3`	`"page": "1",`
`4`	`4`	`"title": "What's New?",`
`5`	`5`	`"content": [`
`6`		`- "Fixes for send NFT on Solana and Arbitrum",`
`7`		`- "Fix for Polygon's new minimum miner tip / priority fee",`
`8`		`- "Fix for Optimism chainId error"`
	`6`	`+ "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"`
`9`	`7`	`]`
`10`	`8`	`},`
`11`	`9`	`{`