chore: 76.0 into master

.env

@@ -11,4 +11,5 @@ VUE_APP_ONRAMPER_WIDGET_URL=https://widget.onramper.com/
 VUE_APP_ONRAMPER_API_KEY=
 VUE_APP_SUPPORTED_LOCALES=en,es,zh,pt,ph,cb
 VUE_APP_DEFAULT_LOCALE=en
+VUE_APP_SOLANA_MAINNET_URL=https://red-sleek-rain.solana-mainnet.discover.quiknode.pro/fc112deb1e0228d09d0d8c12b8de5a601d251d80
 

.github/workflows/release.yml

@@ -123,12 +123,12 @@ jobs:
           asset_content_type: application/zip
 
 #      Run tests against Prod mainnet
-      - name: Regression tests against Mainnet (PROD Agent)
-        uses: beemi/puppeteer-headful@v1.0.12
-        env:
-          CI: 'true'
-          DISPLAY: :99
-          SEED_WORDS: ${{ secrets.TEST_NET_SEED_WORDS }}
-          TWENTY_FOUR_SEEDS: ${{ secrets.TWENTY_FOUR_SEEDS }}
-        with:
-          args: yarn test:mainnet:prodagent:release
+#      - name: Regression tests against Mainnet (PROD Agent)
+#        uses: beemi/puppeteer-headful@v1.0.12
+#        env:
+#          CI: 'true'
+#          DISPLAY: :99
+#          SEED_WORDS: ${{ secrets.TEST_NET_SEED_WORDS }}
+#          TWENTY_FOUR_SEEDS: ${{ secrets.TWENTY_FOUR_SEEDS }}
+#        with:
+#          args: yarn test:mainnet:prodagent:release

package.json

@@ -1,6 +1,6 @@
 {
   "name": "liquality-wallet",
-  "version": "0.74.0",
+  "version": "0.76.0",
   "private": true,
   "author": "Liquality <info@liquality.io>",
   "scripts": {
@@ -21,15 +21,15 @@
     "test-full-regression": "node_modules/mocha/bin/mocha"
   },
   "dependencies": {
-    "@liquality/cryptoassets": "1.14.18",
+    "@liquality/cryptoassets": "1.16.1",
     "@liquality/ethereum-utils": "^1.13.12",
     "@liquality/terra-networks": "^1.13.12",
     "@liquality/types": "^1.13.12",
-    "@liquality/wallet-core": "1.29.23",
-    "@terra-money/terra.js": "^3.1.6",
+    "@liquality/wallet-core": "1.31.1",
+    "@terra-money/terra.js": "3.1.3",
     "@testing-library/vue": "^5.8.2",
     "amplitude-js": "8.18.2",
-    "bignumber.js": "9.0.2",
+    "bignumber.js": "9.1.0",
     "bip39": "^3.0.2",
     "bitcoinjs-lib": "6.0.2",
     "bluebird": "^3.7.2",
@@ -39,7 +39,7 @@
     "crypto-js": "^4.0.0",
     "cryptocurrency-icons": "0.18.0",
     "date-fns": "2.28.0",
-    "ethers": "5.5.4",
+    "ethers": "5.7.0",
     "extension-port-stream": "^2.0.1",
     "human-standard-token-abi": "^2.0.0",
     "i18n-js": "^4.1.1",
@@ -53,7 +53,7 @@
     "qrcode": "1.5.0",
     "qs": "6.10.3",
     "setimmediate": "^1.0.5",
-    "socket.io-client": "4.5.1",
+    "socket.io-client": "4.5.2",
     "svg-url-loader": "7.1.1",
     "uuid": "^8.1.0",
     "v-tooltip": "^2.0.3",

src/broker/Background.js

@@ -1,7 +1,6 @@
-import { ChainNetworks } from '@liquality/wallet-core/dist/src/utils/networks'
 import { buildConfig } from '@liquality/wallet-core'
 import { BG_PREFIX, handleConnection, removeConnectId, getRootURL } from './utils'
-import { getAsset } from '@liquality/cryptoassets'
+import { getChain } from '@liquality/cryptoassets'
 import { connectRemote } from './terra-injection'
 
 function attemptOrWarn(func, message) {
@@ -54,7 +53,7 @@ class Background {
   getChainIds(network) {
     return buildConfig.chains.reduce((chainIds, chain) => {
       return Object.assign({}, chainIds, {
-        [chain]: ChainNetworks[chain][network].chainId
+        [chain]: getChain(network, chain).network.chainId
       })
     }, {})
   }
@@ -183,13 +182,12 @@ class Background {
   onExternalMessage(connection, { id, type, data }) {
     const { url } = connection.sender
     const { origin } = new URL(url)
-    const { externalConnections, activeWalletId, injectEthereumChain, activeNetwork } =
-      this.store.state
+    const { externalConnections, activeWalletId, injectEthereumChain } = this.store.state
 
     let setDefaultEthereum = false
     let { chain, asset } = data
     if (asset) {
-      chain = getAsset(activeNetwork, asset).chain
+      chain = this.store.getters.cryptoassets[asset].chain
     }
     if (!chain) {
       const defaultAccountId = (externalConnections[activeWalletId]?.[origin] || {}).defaultEthereum

src/components/AccountTooltip.vue

@@ -13,7 +13,8 @@
             {{ address ? shortenAddress(address) : '' }}
           </p>
           <p class="text-muted my-0 text-left" v-if="isChainEvmCompatible(asset)">
-            {{ $t('components.accountTooltip.availableGas') }} {{ nativeAssetBalance }} {{ nativeAsset }}
+            {{ $t('components.accountTooltip.availableGas') }} {{ nativeAssetBalance }}
+            {{ nativeAsset }}
           </p>
         </div>
       </div>

src/components/CustomFees.vue

@@ -159,13 +159,8 @@ export default {
         {
           bitcoin: 1,
           ethereum: 1,
-          rsk: 0.001,
-          bsc: 0.001,
-          polygon: 0.001,
           near: 0.00001,
-          solana: 0.00001,
-          terra: 0.001,
-          fuse: 0.001
+          solana: 0.00001
         }[chainId] || 0.001
       )
     }

src/components/CustomFeesEIP1559.vue

@@ -81,9 +81,8 @@
         <div class="custom-fee-inputs">
           <div class="input-wrapper">
             <p>
-              <strong>
-                {{ $t('components.customFees.minerTip') }}
-              </strong>{{ ' ' + $t('components.customFees.toSpeedUp') }}
+              <strong> {{ $t('components.customFees.minerTip') }} </strong
+              >{{ ' ' + $t('components.customFees.toSpeedUp') }}
             </p>
             <span>${{ minerTipFiat }}</span>
             <div class="custom-fee-details-item">
@@ -114,7 +113,8 @@
             <p>
               <strong>
                 {{ $t('components.customFees.maxFee') }}
-              </strong> {{ $t('components.customFees.perGas') }}
+              </strong>
+              {{ $t('components.customFees.perGas') }}
             </p>
             <span>${{ maxFiat }}</span>
             <div class="custom-fee-details-item">
@@ -202,15 +202,15 @@
             id="custom_fee_cancel_button"
             @click="cancel"
           >
-          {{ $t('common.cancel') }}
+            {{ $t('common.cancel') }}
           </button>
           <button
             class="btn btn-primary btn-lg btn-block"
             id="custom_fee_apply_button"
             @click="apply"
             :disabled="!tipFee || !maxFee"
           >
-          {{ $t('common.apply') }}
+            {{ $t('common.apply') }}
           </button>
         </div>
       </div>

src/components/FeeSelector.vue

@@ -33,7 +33,9 @@ import { getChain } from '@liquality/cryptoassets'
 import { mapState } from 'vuex'
 
 export default {
-  ...mapState(['activeNetwork']),
+  computed: {
+    ...mapState(['activeNetwork'])
+  },
   props: ['asset', 'value', 'fees', 'totalFees', 'fiatRates', 'swap'],
   methods: {
     getTooltip(name) {

src/components/NFT/NFTAsset.vue

@@ -56,7 +56,8 @@ export default {
         this.$router.push({
           path: `/details/nft-asset/${this.nftAsset.token_id}`,
           query: {
-            nftAsset: this.nftAsset,
+            collection: this.nftAsset.collection?.name,
+            nftAsset: this.nftAsset.id,
             accountId: this.accountId,
             source: this.$route.fullPath
           }

src/components/NFT/NFTAssets.vue

@@ -19,7 +19,8 @@
                 isAccount: isAccount,
                 chain: chain
               }
-            }">
+            }"
+          >
             {{ $t('components.nft.seeAll') }}
           </router-link>
         </span>
@@ -28,9 +29,13 @@
         class="nft-assets__container__images"
         :class="{ 'nft-assets__container__images--is-account': isAccount }"
       >
-        <template v-for="nft in isAccount ? assets : firstThreeAssets">
-          <NFTAsset :nftAsset="nft" :accountId="accountId" :mode="'thumbnail'" :key="nft.id" />
-        </template>
+        <NFTAsset
+          v-for="nft in isAccount ? assets : firstThreeAssets"
+          :nftAsset="nft"
+          :accountId="accountId"
+          :mode="'thumbnail'"
+          :key="nft.id"
+        />
       </div>
     </div>
   </div>

src/components/NavBar.vue

@@ -39,9 +39,7 @@
           <AccountsIcon />
           {{ $t('components.navbar.manageAccounts') }}
         </li>
-        <li id="export_privkey" 
-            v-if="showExportPrivateKey" 
-            @click="exportPrivateKey">
+        <li id="export_privkey" v-if="showExportPrivateKey" @click="exportPrivateKey">
           <KeyIcon />
           {{ $t('components.navbar.exportPrivateKey') }}
         </li>

src/components/WhatsNewModal.vue

@@ -10,9 +10,10 @@
             <ChartIcon />
           </div>
           <div class="item-content">
-            <pre class="text-wrap">
-Localization for Chinese, Spanish, Portuguese, Filipino and Cebuano</pre
-            >
+            <pre class="text-wrap">Integration with LI.FI as a swap provider</pre>
+            <pre class="text-wrap">Integration with deBridge as a swap provider</pre>
+            <pre class="text-wrap">Move to Goerli Testnet</pre>
+            <pre class="text-wrap">Solana Endpoint Change to Quicknode</pre>
           </div>
         </div>
       </div>
@@ -27,7 +28,12 @@ Localization for Chinese, Spanish, Portuguese, Filipino and Cebuano</pre
             <ChartIcon />
           </div>
           <div class="item-content">
-            <pre class="text-wrap">Change the language by going to settings?</pre>
+            <pre class="text-wrap">
+Use LI.FI and deBridge with more than 100 different swap paths</pre
+            >
+            <pre class="text-wrap">
+Use LI.FI and deBridge to swap between almost all EVM chains our wallet currently supports</pre
+            >
           </div>
         </div>
       </div>

src/contentScript.js

@@ -1,8 +1,7 @@
 import { inject } from './broker/utils'
 import Script from './broker/Script'
 import { buildConfig } from '@liquality/wallet-core'
-import { ChainNetworks } from '@liquality/wallet-core/dist/src/utils/networks'
-import { getNativeAssetCode, isEvmChain } from '@liquality/cryptoassets'
+import { getChain, getNativeAssetCode, isEvmChain } from '@liquality/cryptoassets'
 import PortStream from 'extension-port-stream'
 import LocalMessageDuplexStream from 'post-message-stream'
 new Script().start()
@@ -21,27 +20,21 @@ async function setupTerraStreams() {
 
   extensionStream.pipe(pageStream)
   pageStream.pipe(extensionStream)
-  console.log('Stream setup successfully')
 }
 
 function injectProviders(state) {
-  const { injectEthereumChain, activeNetwork } = state
+  const { injectEthereum, activeNetwork } = state
   const evmChains = buildConfig.chains
     .filter((chain) => isEvmChain(activeNetwork, chain))
     .map((chain) => {
-      const network = ChainNetworks[chain][activeNetwork]
+      const network = getChain(activeNetwork, chain).network
       const asset = getNativeAssetCode(activeNetwork, chain)
       return { chain, asset, network }
     })
 
-  let globalEthereum = {
-    inject: !!injectEthereumChain
-  }
-  if (globalEthereum.inject) {
-    globalEthereum = {
-      ...globalEthereum,
-      ...injectGlobalEthereum(state, true)
-    }
+  const globalEthereum = {
+    override: injectEthereum,
+    ethereumChain: getGlobalEthereumChain(state)
   }
 
   const injectConfig = {
@@ -55,7 +48,7 @@ function injectProviders(state) {
   inject('#PAGEPROVIDER#')
 }
 
-function injectGlobalEthereum(state, override) {
+function getGlobalEthereumChain(state) {
   const { externalConnections, activeWalletId, activeNetwork } = state
 
   let ethereumChain = state.injectEthereumChain
@@ -71,7 +64,7 @@ function injectGlobalEthereum(state, override) {
     }
   }
 
-  return { override, ethereumChain }
+  return ethereumChain
 }
 
 chrome.storage.local.get(['liquality-wallet'], (storage) => {

src/locales/cb/common.json

@@ -14,7 +14,6 @@
     "received": "Nadawat",
     "completed": "Nakompleto",
     "advanced": "Advanced",
-    "address": "Address",
     "tokenID": "Token ID",
     "tokenStandard": "Token Standard",
     "transactionId": "Transaction ID",

src/locales/en/common.json

@@ -88,10 +88,10 @@
     "provider": "Provider",
     "localesLabels": {
         "en": "English",
-        "es": "Spanish",
-        "zh": "Chinese (Simplified)",
-        "pt": "Portuguese",
-        "ph": "Filipino",
-        "cb": "Bisaya (Cebuano)"
+        "es": "Español",
+        "zh": "中文（简体）",
+        "pt": "Português",
+        "ph": "Tagalog",
+        "cb": "Cebuano"
     }
-}
+}

src/locales/en/pages.json

@@ -98,7 +98,7 @@
         "tokenSymbol": "Token Symbol",
         "decimals": "Decimals",
         "addToken": "Add Token",
-        "addCustomToken": "Add Custom Token"
+        "addCustomToken": "Add Token"
     },
     "wallet": {
         "assets": "Assets",
@@ -232,4 +232,4 @@
         "cons": "Cons",
         "feeStructure": "Fee Structure"
     }
-}
+}