From 6c62091a5022fdc02a7dc7984b36a2354745427c Mon Sep 17 00:00:00 2001 From: Petar Baykov Date: Thu, 26 Mar 2020 09:11:23 +0200 Subject: [PATCH 01/12] Notification for new extension version in store --- src/popup/App.vue | 8 ++++++++ src/popup/locales/en.json | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/popup/App.vue b/src/popup/App.vue index 2a401a8b6..cf85a20db 100644 --- a/src/popup/App.vue +++ b/src/popup/App.vue @@ -57,6 +57,14 @@ export default { this.checkSdkReady(); this.getCurrencies(); + const [update] = await browser.runtime.requestUpdateCheck(); + if (update === 'update_available' && !process.env.RUNNING_IN_TESTS) { + this.$store.commit('ADD_NOTIFICATION', { + title: '', + content: this.$t('pages.account.updateAvailable'), + route: '', + }); + } if ((await this.$store.dispatch('checkExtensionUpdate')) && !process.env.RUNNING_IN_TESTS) { this.$store.commit('ADD_NOTIFICATION', { title: '', diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json index 0ca1ec187..080977933 100644 --- a/src/popup/locales/en.json +++ b/src/popup/locales/en.json @@ -91,7 +91,8 @@ "youNeedTo": "You need to", "backup": "backup", "yourSeedPhrase": "your seed phrase", - "updateExtension": "New verison available! Please update your extension!" + "updateExtension": "New verison available! Please update your extension!", + "updateAvailable": "New verison in store avaible!" }, "accountPassword": { "heading": "", From 592adeb571722a6f6c210470af6d1019afd40fa4 Mon Sep 17 00:00:00 2001 From: Petar Baykov Date: Thu, 26 Mar 2020 09:26:11 +0200 Subject: [PATCH 02/12] Remove duplicated seed page link Fix #89 --- src/popup/router/components/SidebarMenu.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/popup/router/components/SidebarMenu.vue b/src/popup/router/components/SidebarMenu.vue index 10d4f1122..26c4114c6 100644 --- a/src/popup/router/components/SidebarMenu.vue +++ b/src/popup/router/components/SidebarMenu.vue @@ -49,11 +49,6 @@ {{ $t('pages.appVUE.security') }} -
  • - - {{ $t('pages.appVUE.seedPhrase') }} - -
  • {{ $t('pages.appVUE.language') }} From 0eea1496738a1871cda0f060e136a0eb0c6816fc Mon Sep 17 00:00:00 2001 From: Petar Baykov Date: Thu, 26 Mar 2020 09:28:46 +0200 Subject: [PATCH 03/12] Add networks to menu test --- tests/e2e/integration/menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/integration/menu.js b/tests/e2e/integration/menu.js index d5eabae00..7630c404d 100644 --- a/tests/e2e/integration/menu.js +++ b/tests/e2e/integration/menu.js @@ -1,6 +1,6 @@ const links = ['receive', 'send', 'transactions', 'names', 'aboutSettings']; -const dropdownLinks = ['securitySettings', 'generalSettings']; +const dropdownLinks = ['securitySettings', 'generalSettings', 'networks']; describe('Test cases for menu sidebar component', () => { beforeEach(() => { From 94afe3cac6508fe6f1f2730505194b1f4fb2c4a7 Mon Sep 17 00:00:00 2001 From: Petar Baykov Date: Thu, 26 Mar 2020 09:51:12 +0200 Subject: [PATCH 04/12] Check if update available only if extension --- src/popup/App.vue | 16 +++++++++------- src/popup/router/pages/Transactions.vue | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/popup/App.vue b/src/popup/App.vue index cf85a20db..2103a19cb 100644 --- a/src/popup/App.vue +++ b/src/popup/App.vue @@ -57,13 +57,15 @@ export default { this.checkSdkReady(); this.getCurrencies(); - const [update] = await browser.runtime.requestUpdateCheck(); - if (update === 'update_available' && !process.env.RUNNING_IN_TESTS) { - this.$store.commit('ADD_NOTIFICATION', { - title: '', - content: this.$t('pages.account.updateAvailable'), - route: '', - }); + if (process.env.IS_EXTENSION) { + const [update] = await browser.runtime.requestUpdateCheck(); + if (update === 'update_available' && !process.env.RUNNING_IN_TESTS) { + this.$store.commit('ADD_NOTIFICATION', { + title: '', + content: this.$t('pages.account.updateAvailable'), + route: '', + }); + } } if ((await this.$store.dispatch('checkExtensionUpdate')) && !process.env.RUNNING_IN_TESTS) { this.$store.commit('ADD_NOTIFICATION', { diff --git a/src/popup/router/pages/Transactions.vue b/src/popup/router/pages/Transactions.vue index 80080030b..7b92455b5 100644 --- a/src/popup/router/pages/Transactions.vue +++ b/src/popup/router/pages/Transactions.vue @@ -82,7 +82,7 @@ export default { const checkLoadMore = () => { const { scrollHeight, clientHeight } = document.documentElement; if (scrollHeight - window.scrollY === clientHeight) { - this.loadMore(); + setTimeout(() => this.loadMore(), 1500); } }; window.addEventListener('scroll', checkLoadMore); From f01952016a7632f7ad98f1ca73c3a37f3480fbe1 Mon Sep 17 00:00:00 2001 From: Petar Baykov Date: Thu, 26 Mar 2020 09:55:16 +0200 Subject: [PATCH 05/12] Add missing selector which causing tests fail --- src/popup/router/components/SidebarMenu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/popup/router/components/SidebarMenu.vue b/src/popup/router/components/SidebarMenu.vue index 26c4114c6..0aa479611 100644 --- a/src/popup/router/components/SidebarMenu.vue +++ b/src/popup/router/components/SidebarMenu.vue @@ -45,7 +45,7 @@
    • -->
  • - + {{ $t('pages.appVUE.security') }}
    • From 4418e004d836a41dea3b8cbc90bc5895df655b29 Mon Sep 17 00:00:00 2001 From: Valentin Angelov <43376240+vmangelovv@users.noreply.github.com> Date: Thu, 26 Mar 2020 15:54:49 +0200 Subject: [PATCH 06/12] check for amount and hash to avoid transaction shown as NaN --- src/popup/router/components/PendingTxs.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/popup/router/components/PendingTxs.vue b/src/popup/router/components/PendingTxs.vue index dfaf5540b..96da34df8 100644 --- a/src/popup/router/components/PendingTxs.vue +++ b/src/popup/router/components/PendingTxs.vue @@ -1,6 +1,6 @@