diff --git a/package-lock.json b/package-lock.json index 245ea3df6..89524be68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3380,6 +3380,17 @@ "color-convert": "^2.0.1" } }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -3435,12 +3446,31 @@ "universalify": "^0.1.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "locate-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", @@ -3523,6 +3553,16 @@ "strip-ansi": "^6.0.0" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "terser-webpack-plugin": { "version": "1.4.5", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", @@ -3564,6 +3604,18 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.2.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz", + "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -3950,14 +4002,12 @@ "bs58check": "^2.1.1", "ed2curve": "^0.3.0", "joi-browser": "^13.4.0", - "libsodium-wrappers-sumo": "0.7.6", "ramda": "^0.27.0", "rlp": "2.2.5", "sha.js": "^2.4.11", "tweetnacl": "^1.0.0", "tweetnacl-auth": "^1.0.1", - "uuid": "^8.0.0", - "websocket": "^1.0.26" + "uuid": "^8.0.0" } }, "axios": { @@ -17449,10 +17499,7 @@ "aeproject-lib": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/aeproject-lib/-/aeproject-lib-2.2.0.tgz", - "integrity": "sha512-M4Dfh7ypiw7904c331BYR+6/YqfZwNI3RUk7mvZZcsq8Erde1pbwJsRQwpz84qiWzg1/xRInzcFpWeOGlC/Z0A==", - "requires": { - "typescript": "^3.5.2" - } + "integrity": "sha512-M4Dfh7ypiw7904c331BYR+6/YqfZwNI3RUk7mvZZcsq8Erde1pbwJsRQwpz84qiWzg1/xRInzcFpWeOGlC/Z0A==" }, "axios": { "version": "0.19.2", @@ -19210,10 +19257,7 @@ "aeproject-lib": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/aeproject-lib/-/aeproject-lib-2.2.0.tgz", - "integrity": "sha512-M4Dfh7ypiw7904c331BYR+6/YqfZwNI3RUk7mvZZcsq8Erde1pbwJsRQwpz84qiWzg1/xRInzcFpWeOGlC/Z0A==", - "requires": { - "typescript": "^3.5.2" - } + "integrity": "sha512-M4Dfh7ypiw7904c331BYR+6/YqfZwNI3RUk7mvZZcsq8Erde1pbwJsRQwpz84qiWzg1/xRInzcFpWeOGlC/Z0A==" }, "axios": { "version": "0.19.2", @@ -20103,87 +20147,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.2.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz", - "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-meta": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/vue-meta/-/vue-meta-2.4.0.tgz", @@ -21002,10 +20965,7 @@ "aeproject-lib": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/aeproject-lib/-/aeproject-lib-2.2.0.tgz", - "integrity": "sha512-M4Dfh7ypiw7904c331BYR+6/YqfZwNI3RUk7mvZZcsq8Erde1pbwJsRQwpz84qiWzg1/xRInzcFpWeOGlC/Z0A==", - "requires": { - "typescript": "^3.5.2" - } + "integrity": "sha512-M4Dfh7ypiw7904c331BYR+6/YqfZwNI3RUk7mvZZcsq8Erde1pbwJsRQwpz84qiWzg1/xRInzcFpWeOGlC/Z0A==" }, "aeternity-fungible-token": { "version": "github:mradkov/aeternity-fungible-token#edd903221db2516ebf9a2d6584db1dab261a06b8", @@ -21018,13 +20978,7 @@ "aeproject-lib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/aeproject-lib/-/aeproject-lib-2.1.0.tgz", - "integrity": "sha512-9JfAEpxMVn+XiFtL7ftXXjSR6RxzE+IUm0QmtwI8PLMaUva+ZBu6yxiVbm3rMXI5dfj3+vBY7jcwrVgOyj4/tA==", - "requires": { - "aeproject-config": "^2.1.0", - "aeproject-logger": "^2.1.0", - "aeproject-utils": "^2.1.0", - "typescript": "^3.5.2" - } + "integrity": "sha512-9JfAEpxMVn+XiFtL7ftXXjSR6RxzE+IUm0QmtwI8PLMaUva+ZBu6yxiVbm3rMXI5dfj3+vBY7jcwrVgOyj4/tA==" } } }, diff --git a/src/App.vue b/src/App.vue index 9d1a2bed1..ff6859645 100644 --- a/src/App.vue +++ b/src/App.vue @@ -101,7 +101,6 @@ export default { } else { this.setAddress(address); } - await this.$store.dispatch('initMiddleware'); await this.$store.dispatch('fetchUserInfo'); }, }, diff --git a/src/store/index.js b/src/store/index.js index ee391cac6..42456ee70 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -13,7 +13,7 @@ import backend from './modules/backend'; import aeternity from './modules/aeternity'; // eslint-disable-next-line import/no-cycle import Backend from '../utils/backend'; -import { handleUnknownError, atomsToAe } from '../utils'; +import { handleUnknownError } from '../utils'; Vue.use(Vuex); @@ -54,7 +54,7 @@ export default new Vuex.Store({ const result = await middleware.getAex9Balance(contractAddress, address); return new BigNumber(result.amount || 0).toFixed(); }, - async updateTokensBalanceAndPrice({ state: { address }, commit, dispatch }) { + async updateTokensBalanceAndPrice({ state: { address, middleware }, commit, dispatch }) { const tokens = await Backend.getTokenBalances(address); let knownTokens; try { @@ -63,6 +63,7 @@ export default new Vuex.Store({ handleUnknownError(error); return; } + if (!middleware) await dispatch('initMiddleware'); await Promise.all(Object.entries(tokens).map(async ([token]) => { commit('addTokenBalance', { token, @@ -119,7 +120,7 @@ export default new Vuex.Store({ dispatch('updateUserProfile'), (async () => { const balance = await sdk.balance(address).catch(() => 0); - commit('updateBalance', atomsToAe(balance).toFixed(2)); + commit('updateBalance', balance); })(), dispatch('updateTokensBalanceAndPrice'), ]);