diff --git a/frontend/src/components/DecayInformations/DecayInformation.vue b/frontend/src/components/DecayInformations/DecayInformation.vue new file mode 100644 index 000000000..ae76a5bb4 --- /dev/null +++ b/frontend/src/components/DecayInformations/DecayInformation.vue @@ -0,0 +1,48 @@ + + diff --git a/frontend/src/components/GddTransactionList.spec.js b/frontend/src/components/GddTransactionList.spec.js index 01566ef13..320fd094f 100644 --- a/frontend/src/components/GddTransactionList.spec.js +++ b/frontend/src/components/GddTransactionList.spec.js @@ -256,7 +256,7 @@ describe('GddTransactionList', () => { it('shows the date of the transaction', () => { expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain( - 'Mon Feb 28 2022 13:55:47 GMT+0000 (Coordinated Universal Time)', + 'Mon Feb 28 2022 13:55:47', ) }) @@ -286,18 +286,23 @@ describe('GddTransactionList', () => { it('has a bi-gift icon', () => { expect(transaction.findAll('svg').at(1).classes()).toEqual([ 'bi-gift', - 'gradido-global-color-accent', 'm-mb-1', 'font2em', 'b-icon', 'bi', + 'gradido-global-color-accent', ]) }) it('has gradido-global-color-accent color', () => { - expect(transaction.findAll('svg').at(1).classes()).toContain( + expect(transaction.findAll('svg').at(1).classes()).toEqual([ + 'bi-gift', + 'm-mb-1', + 'font2em', + 'b-icon', + 'bi', 'gradido-global-color-accent', - ) + ]) }) // operators are renderd by GDD filter @@ -321,7 +326,7 @@ describe('GddTransactionList', () => { it('shows the date of the transaction', () => { expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain( - 'Fri Feb 25 2022 07:29:26 GMT+0000 (Coordinated Universal Time)', + 'Fri Feb 25 2022 07:29:26', ) }) }) @@ -348,11 +353,11 @@ describe('GddTransactionList', () => { it('has gradido-global-color-accent color', () => { expect(transaction.findAll('svg').at(1).classes()).toEqual([ 'bi-arrow-right-circle', - 'gradido-global-color-accent', 'm-mb-1', 'font2em', 'b-icon', 'bi', + 'gradido-global-color-accent', ]) }) @@ -383,7 +388,7 @@ describe('GddTransactionList', () => { it('shows the date of the transaction', () => { expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain( - 'Wed Feb 23 2022 10:55:30 GMT+0000 (Coordinated Universal Time)', + 'Wed Feb 23 2022 10:55:30', ) }) @@ -400,6 +405,7 @@ describe('GddTransactionList', () => { return { amount: '3.14', balanceDate: '2021-04-29T17:26:40+00:00', + decay: {}, memo: 'Kreiszahl PI', linkedUser: { firstName: 'Bibi', @@ -418,6 +424,7 @@ describe('GddTransactionList', () => { transactions, transactionCount: 42, showPagination: true, + decayStartBlock: new Date(), }) paginationButtons = wrapper.find('div.pagination-buttons') }) diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue index c3f3d4d7e..3b4cd961d 100644 --- a/frontend/src/components/GddTransactionList.vue +++ b/frontend/src/components/GddTransactionList.vue @@ -108,6 +108,10 @@ export default { }