From fb1582d398253ec5ad576715c2f3ee342d68287d Mon Sep 17 00:00:00 2001 From: Petar Baykov Date: Fri, 24 Apr 2020 10:07:28 +0300 Subject: [PATCH 1/3] Tip URL field editable by default * Tip URL field editable by default * Adjust tests to changes --- src/popup/locales/en.json | 2 +- .../router/components/TransactionItem.vue | 2 +- src/popup/router/pages/Retip.vue | 4 +--- src/popup/router/pages/TipPage.vue | 22 +++++++++---------- tests/e2e/integration/tip.js | 17 +++++--------- tests/e2e/support/commands.js | 3 +-- 6 files changed, 19 insertions(+), 31 deletions(-) diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json index 2d69656d8..0621b975a 100644 --- a/src/popup/locales/en.json +++ b/src/popup/locales/en.json @@ -644,7 +644,7 @@ "edit": "Edit Tip Details", "whatIsVerifieddUrl": "What is \"Verified\" URL?", "whatIsNotVerifiedUrl": "What is \"Not verified\" URL?", - "enterUrl": "Enter tip url", + "enterUrl": "Type the URL you want to tip", "notClaimableUrlInfo": "Third party issues prevent us to ensure that tips will be directly delivered to the URL owner. You are sending the tip at your own risk.", "notVerifiedUrlInfo": "This URL has not yet been verified. The owner of the URL has to create account to claim their tokens.", "verifiedUrlInfo": "If a URL is marked as verified, it means the owner of this URL is already a fellow Superhero — and that is awesome! An AE address has been included in the URL and tips can be claimed." diff --git a/src/popup/router/components/TransactionItem.vue b/src/popup/router/components/TransactionItem.vue index e8e84ce68..160d80869 100644 --- a/src/popup/router/components/TransactionItem.vue +++ b/src/popup/router/components/TransactionItem.vue @@ -6,7 +6,7 @@ {{ txAmount }} {{ $t('pages.appVUE.aeid') }} - ( {{ txAmountToCurrency }} {{ current.currency.toUpperCase() }} ) + ({{ txAmountToCurrency }} {{ current.currency.toUpperCase() }}) {{ status }} diff --git a/src/popup/router/pages/Retip.vue b/src/popup/router/pages/Retip.vue index 4983fda70..81892993a 100644 --- a/src/popup/router/pages/Retip.vue +++ b/src/popup/router/pages/Retip.vue @@ -2,9 +2,7 @@
- {{ $t('pages.tipPage.heading') }} - {{ $t('pages.appVUE.aeid') }} - {{ $t('pages.tipPage.to') }} + {{ $t('pages.tipPage.url') }}
diff --git a/src/popup/router/pages/TipPage.vue b/src/popup/router/pages/TipPage.vue index 617e16621..78b3673e8 100644 --- a/src/popup/router/pages/TipPage.vue +++ b/src/popup/router/pages/TipPage.vue @@ -10,9 +10,9 @@

@@ -25,14 +25,11 @@ -
@@ -59,7 +56,7 @@ - @@ -79,7 +76,6 @@ import { getTwitterAccountUrl, validateUrl, } from '../../utils/helper'; -import EditIcon from '../../../icons/edit-icon.svg?vue-component'; import AmountSend from '../components/AmountSend'; import Textarea from '../components/Textarea'; import Input from '../components/Input'; @@ -89,7 +85,6 @@ export default { components: { AmountSend, Textarea, - EditIcon, Input, UrlBadge, }, @@ -103,7 +98,7 @@ export default { noteError: false, loading: false, minCallFee: null, - editUrl: false, + editUrl: true, verifiedUrls: [], IS_EXTENSION: process.env.IS_EXTENSION, RUNNING_IN_TESTS: process.env.RUNNING_IN_TESTS, @@ -170,7 +165,6 @@ export default { // if mobile if (!this.IS_EXTENSION && !this.RUNNING_IN_TESTS) { this.url = ''; - this.editUrl = true; } try { this.verifiedUrls = (await axios.get(`${BACKEND_URL}/verified`)).data; @@ -248,6 +242,10 @@ export default { this.loading = false; } }, + toEdit() { + this.confirmMode = false; + this.editUrl = true; + }, }, }; diff --git a/tests/e2e/integration/tip.js b/tests/e2e/integration/tip.js index 62a0e6929..de55fc344 100644 --- a/tests/e2e/integration/tip.js +++ b/tests/e2e/integration/tip.js @@ -1,5 +1,5 @@ -const tip = { amount: 0.01, note: '#test', url: 'example.com', edit: true }; -const tip2 = { amount: 0.01, note: '#test1234', url: 'example.com', onTip: true, edit: true }; +const tip = { amount: 0.01, note: '#test', url: 'example.com' }; +const tip2 = { amount: 0.01, note: '#test1234', url: 'example.com', onTip: true }; describe('Test cases for tip page', () => { beforeEach(() => { @@ -21,7 +21,7 @@ describe('Test cases for tip page', () => { cy.openTip() .get('[data-cy=send-tip]') .should('be.visible') - .get('[data-cy=tip-url]') + .get('.url-bar') .should('exist') .get('[data-cy=textarea]') .should('be.visible') @@ -35,7 +35,7 @@ describe('Test cases for tip page', () => { it('Validate tip details', () => { cy.openTip() .buttonShouldBeDisabled('[data-cy=send-tip]') - .enterTipDetails({ url: tip.url, edit: true }) + .enterTipDetails({ url: tip.url }) .buttonShouldBeDisabled('[data-cy=send-tip]') .enterTipDetails({ amount: tip.amount }) .buttonShouldBeDisabled('[data-cy=send-tip]') @@ -49,7 +49,7 @@ describe('Test cases for tip page', () => { .buttonShouldBeDisabled('[data-cy=send-tip]') .enterTipDetails({ amount: 0, note: tip.note }) .buttonShouldBeDisabled('[data-cy=send-tip]') - .enterTipDetails({ ...tip, edit: false }) + .enterTipDetails({ ...tip }) .buttonShouldNotBeDisabled('[data-cy=send-tip]'); }); @@ -64,13 +64,6 @@ describe('Test cases for tip page', () => { .should('have.value', tip.note); }); - it('Edit url disable button', () => { - cy.openTip() - .get('[data-cy=edit-url]') - .click() - .buttonShouldBeDisabled('[data-cy=send-tip]'); - }); - it('Valid tip details open confirm', () => { cy.toConfirmTip({ ...tip }); }); diff --git a/tests/e2e/support/commands.js b/tests/e2e/support/commands.js index 3f4263075..20f31220a 100644 --- a/tests/e2e/support/commands.js +++ b/tests/e2e/support/commands.js @@ -182,7 +182,7 @@ Cypress.Commands.add('openWithdraw', () => { .click(); }); -Cypress.Commands.add('enterTipDetails', ({ url = '', amount = null, note = '', edit = false }) => { +Cypress.Commands.add('enterTipDetails', ({ url = '', amount = null, note = '' }) => { cy.get('[data-cy=input-number]').clear(); if (amount || amount === 0) { cy.get('[data-cy=input-number]').type(amount); @@ -191,7 +191,6 @@ Cypress.Commands.add('enterTipDetails', ({ url = '', amount = null, note = '', e cy.get('[data-cy=textarea]').clear(); if (note) cy.get('[data-cy=textarea]').type(note); - if (edit) cy.get('[data-cy=edit-url]').click(); if (url) { cy.get('[data-cy=input]') .clear() From f78ccf175be36a2c7557e1662ddcc41f50341212 Mon Sep 17 00:00:00 2001 From: Petar Baykov Date: Fri, 24 Apr 2020 10:57:03 +0300 Subject: [PATCH 2/3] UI fixes * Fix paragraph font size problem in Firefox * Fix #174 * Fix start tour button z-index --- src/popup/router/components/Header.vue | 6 ++- src/popup/router/components/Tour.vue | 1 + src/redirect/App.vue | 53 +++++++++++++------------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src/popup/router/components/Header.vue b/src/popup/router/components/Header.vue index e1e517583..d1c29ec03 100644 --- a/src/popup/router/components/Header.vue +++ b/src/popup/router/components/Header.vue @@ -97,8 +97,10 @@ export default { } .title { - margin-left: auto; - margin-right: auto; + position: absolute; + left: 0; + right: 0; + text-align: center; font-weight: 500; } diff --git a/src/popup/router/components/Tour.vue b/src/popup/router/components/Tour.vue index f688977e8..7368ca757 100644 --- a/src/popup/router/components/Tour.vue +++ b/src/popup/router/components/Tour.vue @@ -373,6 +373,7 @@ export default { bottom: 0; left: 0; right: 0; + z-index: 6; height: 44px; cursor: pointer; diff --git a/src/redirect/App.vue b/src/redirect/App.vue index 4e62b850a..825aa30d2 100644 --- a/src/redirect/App.vue +++ b/src/redirect/App.vue @@ -30,35 +30,10 @@ export default { }; - From ab1ee39f440a9e86fbe3faffd4a1c00fa237d03b Mon Sep 17 00:00:00 2001 From: Petar Baykov Date: Fri, 24 Apr 2020 14:29:15 +0300 Subject: [PATCH 3/3] Fix typo in cache invalidate URL --- src/popup/router/components/ClaimTips.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/popup/router/components/ClaimTips.vue b/src/popup/router/components/ClaimTips.vue index c947a4123..73e0bdc64 100644 --- a/src/popup/router/components/ClaimTips.vue +++ b/src/popup/router/components/ClaimTips.vue @@ -60,7 +60,7 @@ export default { throw new Error(this.$t('pages.claim.unknownError')); else throw new Error(error); }); - await axios.post(`${BACKEND_URL}/cache/invalidate/tip`).catch(); + await axios.post(`${BACKEND_URL}/cache/invalidate/tips`).catch(); await axios.post(`${BACKEND_URL}/cache/invalidate/oracle`).catch(); this.$emit('setLoading', false); this.$store.dispatch('modals/open', { name: 'claim-success', url: tab.url, claimAmount });