-
{{ $t('transactionlink.form_header') }}
+ {{ $t('transactionlink.name') }}
{{ previousBookedBalance | GDD }}
+ {{ decay === '0' ? $t('math.minus') : '' }}
{{ decay | GDD }} {{ $t('math.equal') }}
{{ balance | GDD }}
diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index 5802bfb4b..3d42f11f8 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -50,7 +50,6 @@ export default {
name: 'DecayInformation-StartBlock',
props: {
balanceDate: { type: String },
- decayStartBlock: { type: Date },
amount: {
type: String,
},
diff --git a/frontend/src/components/DecayInformations/DecayInformation.vue b/frontend/src/components/DecayInformations/DecayInformation.vue
index ae76a5bb4..690f6532b 100644
--- a/frontend/src/components/DecayInformations/DecayInformation.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation.vue
@@ -14,6 +14,7 @@
import DecayInformationLong from '../DecayInformations/DecayInformation-Long'
import DecayInformationBeforeStartblock from '../DecayInformations/DecayInformation-BeforeStartblock'
import DecayInformationDecayStartblock from '../DecayInformations/DecayInformation-DecayStartblock'
+import CONFIG from '@/config'
export default {
components: {
@@ -34,14 +35,10 @@ export default {
type: String,
required: true,
},
- decayStartBlock: {
- type: Date,
- required: true,
- },
},
computed: {
isStartBlock() {
- return new Date(this.decay.start).getTime() === this.decayStartBlock.getTime()
+ return new Date(this.decay.start).getTime() === CONFIG.DECAY_START_TIME.getTime()
},
},
}
diff --git a/frontend/src/components/GddSend/QrCode.spec.js b/frontend/src/components/GddSend/QrCode.spec.js
deleted file mode 100644
index 66da5748d..000000000
--- a/frontend/src/components/GddSend/QrCode.spec.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import { mount } from '@vue/test-utils'
-import QrCode from './QrCode'
-
-const localVue = global.localVue
-
-describe('QrCode', () => {
- let wrapper
-
- const mocks = {
- $t: jest.fn((t) => t),
- }
-
- const stubs = {
- QrcodeStream: true,
- QrcodeCapture: true,
- }
-
- const Wrapper = () => {
- return mount(QrCode, { localVue, mocks, stubs })
- }
-
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
- })
-
- it('renders the component', () => {
- expect(wrapper.find('div.alert').exists()).toBeTruthy()
- })
-
- describe('scanning', () => {
- beforeEach(async () => {
- wrapper.find('a').trigger('click')
- })
-
- it('has a scanning stream', () => {
- expect(wrapper.findComponent({ name: 'QrcodeStream' }).exists()).toBeTruthy()
- })
-
- describe('decode', () => {
- beforeEach(async () => {
- await wrapper
- .findComponent({ name: 'QrcodeStream' })
- .vm.$emit('decode', '[{"email": "user@example.org", "amount": 10.0}]')
- })
-
- it('emits set transaction', () => {
- expect(wrapper.emitted()['set-transaction']).toEqual([
- [
- {
- email: 'user@example.org',
- amount: 10,
- },
- ],
- ])
- })
- })
-
- describe('detect', () => {
- beforeEach(async () => {
- await wrapper.find('div.row > *').vm.$emit('detect')
- })
-
- it('calls onDetect', () => {
- expect(wrapper.vm.detect).toBeTruthy()
- })
- })
- })
- })
-})
diff --git a/frontend/src/components/GddSend/QrCode.vue b/frontend/src/components/GddSend/QrCode.vue
deleted file mode 100644
index 32e527cfe..000000000
--- a/frontend/src/components/GddSend/QrCode.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('form.cancel') }}
-
-
-
-
-
- {{ $t('gdd_per_link.created') }}
-
-
{{ $t('gdd_per_link.created') }}
+
+
+
+ {{ $t('form.close') }}
+
+
+
+
-
{{ $t('gdt.not-reachable') }}
+
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index f019a0ee1..ec2f657c3 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -13,6 +13,7 @@ const mocks = {
locale: 'en',
},
$t: jest.fn((t) => t),
+ $d: jest.fn((d) => d),
$tc: jest.fn((tc) => tc),
$apollo: {
mutate: mockAPIcall,
@@ -24,7 +25,7 @@ const propsData = {
code: 'c00000000c000000c0000',
holdAvailableAmount: '5.13109484759482747111',
id: 12,
- memo: 'Wie schön hier etwas Quatsch zu lesen!',
+ memo: 'Katzenauge, Eulenschrei, was verschwunden komm herbei!',
validUntil: '2022-03-30T14:22:40.000Z',
}
@@ -56,22 +57,36 @@ describe('TransactionLink', () => {
describe('copy with success', () => {
beforeEach(async () => {
navigatorClipboardMock.mockResolvedValue()
- await wrapper.findAll('button').at(0).trigger('click')
+ await wrapper.find('.test-copy-link').trigger('click')
+ })
+ it('should call clipboard.writeText', () => {
+ expect(navigator.clipboard.writeText).toHaveBeenCalledWith(
+ 'http://localhost/redeem/c00000000c000000c0000',
+ )
})
-
it('toasts success message', () => {
expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.link-copied')
})
})
+ })
- describe('copy with error', () => {
+ describe('qr code modal', () => {
+ let spy
+
+ beforeEach(() => {
+ jest.clearAllMocks()
+ })
+
+ describe('with success', () => {
beforeEach(async () => {
- navigatorClipboardMock.mockRejectedValue()
- await wrapper.findAll('button').at(0).trigger('click')
+ spy = jest.spyOn(wrapper.vm.$bvModal, 'show')
+ // spy.mockImplementation(() => Promise.resolve('some value'))
+ // mockAPIcall.mockResolvedValue()
+ await wrapper.find('.test-qr-code').trigger('click')
})
- it('toasts error message', () => {
- expect(toastErrorSpy).toBeCalledWith('gdd_per_link.not-copied')
+ it('qr-code Modal if show', () => {
+ expect(spy).toBeCalled()
})
})
})
@@ -88,7 +103,7 @@ describe('TransactionLink', () => {
spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
spy.mockImplementation(() => Promise.resolve('some value'))
mockAPIcall.mockResolvedValue()
- await wrapper.findAll('button').at(1).trigger('click')
+ await wrapper.find('.test-delete-link').trigger('click')
})
it('test Modal if confirm true', () => {
@@ -120,7 +135,7 @@ describe('TransactionLink', () => {
spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
spy.mockImplementation(() => Promise.resolve('some value'))
mockAPIcall.mockRejectedValue({ message: 'Something went wrong :(' })
- await wrapper.findAll('button').at(1).trigger('click')
+ await wrapper.find('.test-delete-link').trigger('click')
})
it('toasts an error message', () => {
@@ -133,7 +148,7 @@ describe('TransactionLink', () => {
spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
spy.mockImplementation(() => Promise.resolve(false))
mockAPIcall.mockResolvedValue()
- await wrapper.findAll('button').at(1).trigger('click')
+ await wrapper.find('.test-delete-link').trigger('click')
})
it('does not call the API', () => {
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 9cbfdfb93..66f9f2f92 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -1,20 +1,33 @@
-
+
-
-
+
+
+
+
+
+
+
+
-
+
@@ -33,6 +45,12 @@
+
+
+
diff --git a/frontend/src/components/TransactionRows/DateRow.vue b/frontend/src/components/TransactionRows/DateRow.vue
index 7f93656f7..5f526caaf 100644
--- a/frontend/src/components/TransactionRows/DateRow.vue
+++ b/frontend/src/components/TransactionRows/DateRow.vue
@@ -8,7 +8,7 @@
@@ -28,12 +28,5 @@ export default {
default: false,
},
},
- computed: {
- dateString() {
- return this.diffNow
- ? this.$moment(this.date).locale(this.$i18n.locale).fromNow()
- : this.$d(new Date(this.date), 'long')
- },
- },
}
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index dce11307b..694d907ed 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -27,12 +27,7 @@
+
+ {{ link }}
+
- {{ dateString }}
+ {{ $d(new Date(this.date), 'long') }}