diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue index 78903deda..c23ed35d2 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue +++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue @@ -39,10 +39,10 @@ - {{ $t('form.cancel') }} + {{ $t('back') }} - + {{ $t('form.generate_now') }} diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js index 21462ebab..3504b6e18 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js +++ b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js @@ -53,7 +53,7 @@ describe('GddSend confirm', () => { describe('single click', () => { beforeEach(async () => { - await wrapper.find('button.btn-success').trigger('click') + await wrapper.find('button.btn-primary').trigger('click') }) it('emits send transaction one time', () => { @@ -63,8 +63,8 @@ describe('GddSend confirm', () => { describe('double click', () => { beforeEach(async () => { - await wrapper.find('button.btn-success').trigger('click') - await wrapper.find('button.btn-success').trigger('click') + await wrapper.find('button.btn-primary').trigger('click') + await wrapper.find('button.btn-primary').trigger('click') }) it('emits send transaction one time', () => { diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue index 25519f4ed..33a8b9351 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue +++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue @@ -55,11 +55,11 @@ - {{ $t('form.cancel') }} + {{ $t('back') }} diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js index db971a2bc..0b7245b67 100644 --- a/frontend/src/components/GddSend/TransactionForm.spec.js +++ b/frontend/src/components/GddSend/TransactionForm.spec.js @@ -68,7 +68,7 @@ describe('TransactionForm', () => { }) it('has SEND_TYPES = send', () => { - expect(wrapper.vm.selected).toBe(SEND_TYPES.send) + expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.send) }) describe('transaction form', () => { @@ -249,7 +249,7 @@ Die ganze Welt bezwingen.“`) }) it('has the text "form.cancel"', () => { - expect(wrapper.find('button[type="reset"]').text()).toBe('form.reset') + expect(wrapper.find('button[type="reset"]').text()).toBe('form.cancel') }) it('clears all fields on click', async () => { @@ -300,7 +300,7 @@ Die ganze Welt bezwingen.“`) }) it('has SEND_TYPES = link', () => { - expect(wrapper.vm.selected).toBe(SEND_TYPES.link) + expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.link) }) it('has no input field of id input-group-1', () => { diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 6066f4cd5..62361c4d0 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -6,28 +6,38 @@ - + {{ $t('send_gdd') }} - + {{ $t('send_per_link') }} -
+

{{ $t('gdd_per_link.header') }}

{{ $t('gdd_per_link.choose-amount') }}
-
+
- {{ $t('form.reset') }} + {{ $t('form.cancel') }} - - {{ selected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') }} + + {{ $t('form.check_now') }} @@ -159,6 +169,7 @@ export default { email: { type: String, default: '' }, amount: { type: Number, default: 0 }, memo: { type: String, default: '' }, + selected: { type: String, default: 'send' }, }, inject: ['getTunneledEmail'], data() { @@ -171,14 +182,14 @@ export default { memo: this.memo, amountValue: 0.0, }, - selected: SEND_TYPES.send, + radioSelected: this.selected, } }, methods: { onSubmit() { this.normalizeAmount(true) this.$emit('set-transaction', { - selected: this.selected, + selected: this.radioSelected, email: this.form.email, amount: this.form.amountValue, memo: this.form.memo, diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue index 37605711c..55a11063c 100644 --- a/frontend/src/components/GddTransactionList.vue +++ b/frontend/src/components/GddTransactionList.vue @@ -70,7 +70,8 @@ :total-rows="transactionCount" >
- {{ $t('transaction.nullTransactions') }} + +
{{ $t('transaction.nullTransactions') }}
@@ -108,6 +109,7 @@ export default { transactionCount: { type: Number, default: 0 }, transactionLinkCount: { type: Number, default: 0 }, showPagination: { type: Boolean, default: false }, + pending: { type: Boolean }, }, methods: { updateTransactions() { diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue index 3542c1cd1..f998783f7 100644 --- a/frontend/src/components/Menu/Navbar.vue +++ b/frontend/src/components/Menu/Navbar.vue @@ -10,7 +10,10 @@
- {{ pending ? $t('em-dash') : balance | amount }} {{ $t('GDD') }} + + +
{{ pending ? $t('em-dash') : balance | amount }} {{ $t('GDD') }}
+
{{ $store.state.firstName }} {{ $store.state.lastName }} diff --git a/frontend/src/components/Status.spec.js b/frontend/src/components/Status.spec.js index ba7b03fa4..64a15deb1 100644 --- a/frontend/src/components/Status.spec.js +++ b/frontend/src/components/Status.spec.js @@ -26,8 +26,8 @@ describe('Status', () => { }) describe('balance is pending', () => { - it('it displays an en-dash', () => { - expect(wrapper.find('div.gdd-status-div').text()).toEqual('em-dash GDD') + it('displays an animation icon test-pending-icon', () => { + expect(wrapper.find('.test-pending-icon').exists()).toBe(true) }) }) @@ -38,6 +38,10 @@ describe('Status', () => { }) }) + it('does not display an animation icon test-pending-icon', () => { + expect(wrapper.find('.test-pending-icon').exists()).toBe(false) + }) + it('it displays the ammount of GDD', () => { expect(wrapper.find('div.gdd-status-div').text()).toEqual('1234 GDD') }) diff --git a/frontend/src/components/Status.vue b/frontend/src/components/Status.vue index 9ebe48e09..14d470fb3 100644 --- a/frontend/src/components/Status.vue +++ b/frontend/src/components/Status.vue @@ -1,7 +1,10 @@ diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 9f2626153..80f7ded25 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -52,6 +52,7 @@ "amount": "Betrag", "at": "am", "cancel": "Abbrechen", + "check_now": "Jetzt prüfen", "close": "Schließen", "current_balance": "Aktueller Kontostand", "date": "Datum", @@ -60,7 +61,7 @@ "email": "E-Mail", "firstname": "Vorname", "from": "Von", - "generate_now": "jetzt generieren", + "generate_now": "Jetzt generieren", "lastname": "Nachname", "memo": "Nachricht", "message": "Nachricht", @@ -95,7 +96,7 @@ }, "GDD": "GDD", "gdd_per_link": { - "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.", + "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „Jetzt generieren“ wird ein Link erstellt, den du versenden kannst.", "copy": "kopieren", "created": "Der Link wurde erstellt!", "decay-14-day": "Vergänglichkeit für 14 Tage", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index df533b488..500cceaae 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -52,6 +52,7 @@ "amount": "Amount", "at": "at", "cancel": "Cancel", + "check_now": "Check now", "close": "Close", "current_balance": "Current Balance", "date": "Date", diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue index d42576bf8..9723f6ade 100644 --- a/frontend/src/pages/Overview.vue +++ b/frontend/src/pages/Overview.vue @@ -21,6 +21,7 @@ :decayStartBlock="decayStartBlock" :transaction-count="transactionCount" :transactionLinkCount="transactionLinkCount" + :pending="pending" @update-transactions="updateTransactions" v-on="$listeners" /> diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js index 1f7c9ca9f..dd32fdb09 100644 --- a/frontend/src/pages/Send.spec.js +++ b/frontend/src/pages/Send.spec.js @@ -101,7 +101,7 @@ describe('Send', () => { jest.clearAllMocks() await wrapper .findComponent({ name: 'TransactionConfirmationSend' }) - .find('button.btn-success') + .find('button.btn-primary') .trigger('click') }) @@ -135,7 +135,7 @@ describe('Send', () => { apolloMutationMock.mockRejectedValue({ message: 'recipient not known' }) await wrapper .findComponent({ name: 'TransactionConfirmationSend' }) - .find('button.btn-success') + .find('button.btn-primary') .trigger('click') }) @@ -182,7 +182,7 @@ describe('Send', () => { jest.clearAllMocks() await wrapper .findComponent({ name: 'TransactionConfirmationLink' }) - .find('button.btn-success') + .find('button.btn-primary') .trigger('click') }) @@ -264,7 +264,7 @@ describe('Send', () => { apolloMutationMock.mockRejectedValue({ message: 'OUCH!' }) await wrapper .findComponent({ name: 'TransactionConfirmationLink' }) - .find('button.btn-success') + .find('button.btn-primary') .trigger('click') })