diff --git a/package.json b/package.json
index e59a103cc..c26e24a93 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "liquality-wallet",
- "version": "0.81.1",
+ "version": "0.81.2",
"private": true,
"author": "Liquality ",
"scripts": {
diff --git a/src/App.vue b/src/App.vue
index 01fd50cbd..3100879b3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,9 +5,7 @@
-
-
-
+
diff --git a/src/main.js b/src/main.js
index 1668c5f02..628a87f21 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,6 +20,6 @@ new Vue({
render: (h) => h(App)
}).$mount('#app')
-if (process.env.NODE_ENV === 'development') {
+if (process.env.NODE_ENV === 'development' && process.env.VUE_APP_USE_VUE_DEV_TOOLS === true) {
devtools.connect()
}
diff --git a/src/manifest.json b/src/manifest.json
index b8e411970..9a663890c 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
{
"manifest_version": 2,
- "version": "0.81.1",
+ "version": "0.81.2",
"name": "__MSG_appName__",
"description": "__MSG_appDesc__",
"default_locale": "en",
diff --git a/src/router/index.js b/src/router/index.js
index bae670276..b7f9a62d2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3,9 +3,15 @@ import VueRouter from 'vue-router'
import store, { broker } from '../store'
import Splash from '@/views/Splash.vue'
+import ManageAssets from '@/views/ManageAssets'
+import OpenWallet from '@/views/Open.vue'
+import WalletAssets from '@/views/Wallet/WalletAssets.vue'
+import Wallet from '@/views/Wallet/Wallet.vue'
-const Warning = () => import('@/views/Onboarding/SeedPhrase/Warning.vue')
-const LoginPhrase = () => import('@/views/Onboarding/SeedPhrase/LoginPhrase.vue')
+const Warning = () =>
+ import(/* webpackPrefetch: true */ '@/views/Onboarding/SeedPhrase/Warning.vue')
+const LoginPhrase = () =>
+ import(/* webpackPrefetch: true */ '@/views/Onboarding/SeedPhrase/LoginPhrase.vue')
Vue.use(VueRouter)
@@ -19,25 +25,25 @@ const routes = [
},
{
path: '/onboarding/import',
- component: () => import('@/views/Onboarding/ImportWallet.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Onboarding/ImportWallet.vue'),
meta: { protect: false }
},
{
path: '/open',
name: 'OpenWallet',
- component: () => import('@/views/Open.vue'),
+ component: OpenWallet,
meta: { protect: false }
},
{
path: '/onboarding/setup/:seedphrase?',
- component: () => import('@/views/Onboarding/OnboardingSetup.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Onboarding/OnboardingSetup.vue'),
name: 'OnboardingSetup',
props: true,
meta: { protect: false }
},
{
path: '/onboarding/home',
- component: () => import('@/views/Onboarding/OnboardingHome.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Onboarding/OnboardingHome.vue'),
name: 'OnboardingHome',
meta: { protect: false }
},
@@ -46,25 +52,25 @@ const routes = [
// Settings
{
path: '/settings',
- component: () => import('@/views/Settings'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Settings'),
name: 'Settings',
meta: { protect: true }
},
{
path: '/settings/experiments',
- component: () => import('@/views/Experiments'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Experiments'),
name: 'Experiments',
meta: { protect: true }
},
{
path: '/settings/manage-assets',
- component: () => import('@/views/ManageAssets'),
+ component: ManageAssets,
name: 'ManageAssets',
meta: { protect: true }
},
{
path: '/settings/manage-assets/custom-token',
- component: () => import('@/views/CustomToken'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/CustomToken'),
name: 'CustomToken',
meta: { protect: true }
},
@@ -74,12 +80,12 @@ const routes = [
{
path: '/wallet',
name: 'Wallet',
- component: () => import(/* webpackPrefetch: true */ '@/views/Wallet/Wallet.vue'),
+ component: Wallet,
meta: { protect: true },
children: [
{
path: 'assets',
- component: () => import(/* webpackPrefetch: true */ '@/views/Wallet/WalletAssets.vue'),
+ component: WalletAssets,
name: 'WalletAssets'
},
{
@@ -100,45 +106,46 @@ const routes = [
},
{
path: '/wallet/nfts/activity/:id',
- component: () => import('@/views/Wallet/NFTActivity.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Wallet/NFTActivity.vue'),
name: 'NFTActivity',
props: true
},
{
path: '/wallet/nfts/send',
- component: () => import('@/views/Send/SendNFT.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Send/SendNFT.vue'),
name: 'SendNFT'
},
{
path: '/details/nft-transaction/:id',
- component: () => import('@/views/Details/NFTTransactionDetails.vue'),
+ component: () =>
+ import(/* webpackPrefetch: true */ '@/views/Details/NFTTransactionDetails.vue'),
name: 'NFTTransactionDetails',
props: true
},
// Details
{
path: '/details/swap/:id',
- component: () => import('@/views/Details/SwapDetails.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Details/SwapDetails.vue'),
name: 'SwapDetails',
props: true,
meta: { protect: true }
},
{
path: '/details/transaction/:id',
- component: () => import('@/views/Details/TransactionDetails.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Details/TransactionDetails.vue'),
name: 'TransactionDetails',
props: true,
meta: { protect: true }
},
{
path: '/details/nft-collection/:id',
- component: () => import('@/views/Details/NFTCollectionList.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Details/NFTCollectionList.vue'),
name: 'NFTCollectionList',
props: true
},
{
path: '/details/nft-asset/:id',
- component: () => import('@/views/Details/NFTAssetDetails.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Details/NFTAssetDetails.vue'),
name: 'NFTAssetDetails',
props: true
},
@@ -146,21 +153,22 @@ const routes = [
// Accounts
{
path: '/accounts/management',
- component: () => import('@/views/Accounts/Manage.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Accounts/Manage.vue'),
name: 'ManageAccounts',
props: true,
meta: { protect: true }
},
{
path: '/accounts/create/:chainId?',
- component: () => import('@/views/Accounts/Create.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Accounts/Create.vue'),
name: 'CreateAccount',
props: true,
meta: { protect: true }
},
{
path: '/accounts/hardware-wallet',
- component: () => import('@/views/Accounts/HardwareWallet/HardwareWallet.vue'),
+ component: () =>
+ import(/* webpackPrefetch: true */ '@/views/Accounts/HardwareWallet/HardwareWallet.vue'),
props: true,
name: 'HardwareWallet',
meta: { protect: true }
@@ -168,28 +176,28 @@ const routes = [
{
name: 'Account',
path: '/accounts/:accountId/:asset',
- component: () => import('@/views/Account.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Account.vue'),
props: true,
meta: { protect: true }
},
{
name: 'Send',
path: '/accounts/:accountId/:asset/send',
- component: () => import('@/views/Send/Send.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Send/Send.vue'),
props: true,
meta: { protect: true }
},
{
name: 'Receive',
path: '/accounts/:accountId/:asset/receive',
- component: () => import('@/views/Receive.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Receive.vue'),
props: true,
meta: { protect: true }
},
{
name: 'Swap',
path: '/accounts/:accountId/:routeAsset/swap',
- component: () => import('@/views/Swap/Swap.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Swap/Swap.vue'),
props: true,
meta: { protect: true }
},
@@ -197,7 +205,7 @@ const routes = [
// Assets list
{
path: '/assets/:action',
- component: () => import('@/views/AssetList.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/AssetList.vue'),
props: true,
meta: { protect: true }
},
@@ -205,37 +213,37 @@ const routes = [
// Injection
{
path: '/request-unlock',
- component: () => import('@/views/RequestUnlockWallet.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/RequestUnlockWallet.vue'),
meta: { protect: false }
},
{
path: '/enable',
- component: () => import('@/views/Enable.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Enable.vue'),
meta: { protect: false }
},
{
path: '/permission/send',
- component: () => import('@/views/PermissionSend.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/PermissionSend.vue'),
meta: { protect: false }
},
{
path: '/permission/terra',
- component: () => import('@/views/PermissionTerra.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/PermissionTerra.vue'),
meta: { protect: false }
},
{
path: '/permission/sign',
- component: () => import('@/views/PermissionSign.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/PermissionSign.vue'),
meta: { protect: false }
},
{
path: '/permission/signPsbt',
- component: () => import('@/views/PermissionSignPsbt.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/PermissionSignPsbt.vue'),
meta: { protect: false }
},
{
path: '/permission/default',
- component: () => import('@/views/Permission.vue'),
+ component: () => import(/* webpackPrefetch: true */ '@/views/Permission.vue'),
meta: { protect: false }
},
// Injection
@@ -253,7 +261,8 @@ const routes = [
},
{
path: '/seedreveal',
- component: () => import('@/views/Onboarding/SeedPhrase/PhraseReveal'),
+ component: () =>
+ import(/* webpackPrefetch: true */ '@/views/Onboarding/SeedPhrase/PhraseReveal'),
meta: { protect: true }
},
diff --git a/src/views/Wallet/Wallet.vue b/src/views/Wallet/Wallet.vue
index 92783c5f6..d6c96beb9 100644
--- a/src/views/Wallet/Wallet.vue
+++ b/src/views/Wallet/Wallet.vue
@@ -35,8 +35,20 @@ export default {
InfoNotification: () => import('@/components/InfoNotification.vue'),
LedgerRequestMessage: () => import('@/components/LedgerRequestMessage.vue')
},
- created() {
- this.getNFTs()
+ async mounted() {
+ try {
+ await Promise.all([
+ this.updateBalances({
+ network: this.activeNetwork,
+ walletId: this.activeWalletId,
+ loadingInitialBalance: true
+ }),
+ this.getNFTs()
+ ])
+ } catch (error) {
+ // TODO: manage error
+ reportLiqualityError(error)
+ }
},
computed: {
...mapState(['activeNetwork', 'activeWalletId', 'history']),