diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index ac0834d2c..81654be94 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -8,11 +8,10 @@
-
- {{ $t('decay.calculation_decay') }} +
+ {{ $t('decay.calculation_decay') }}
-
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 4de2f7a66..9c779d4ed 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -35,7 +35,8 @@ "seconds":"Sekunden", "received":"empfangen", "sent":"gesendet", - "created":"geschöpft" + "created":"geschöpft", + "fromCommunity":"Aus der Community" }, "form": { "cancel": "Abbrechen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 79d811f78..92f814686 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -8,7 +8,7 @@ "reset": "Reset password", "imprint":"Legal notice", "privacy_policy":"Privacy policy", - "members_area": "Members area", + "members_area": "Member´s area", "whitepaper": "Whitepaper", "back":"Back", "send":"Send", @@ -35,7 +35,8 @@ "seconds": "Seconds", "received":"received", "sent":"sent", - "created":"created" + "created":"reated", + "fromCommunity":"From the community" }, "form": { "cancel":"Cancel", diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js index b07114feb..0ebf23322 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js @@ -19,7 +19,7 @@ describe('GddTransactionList', () => { $t: jest.fn((t) => t), $d: jest.fn((d) => d), $i18n: { - locale: () => 'en', + locale: () => 'de', }, } @@ -60,6 +60,7 @@ describe('GddTransactionList', () => { name: 'Bob der Baumeister', transaction_id: 29, type: 'send', + decay: { balance: '0.5' }, }, { balance: '1000', @@ -76,6 +77,7 @@ describe('GddTransactionList', () => { name: 'Jan Ulrich', transaction_id: 8, type: 'receive', + decay: { balance: '1.5' }, }, { balance: '1.07', @@ -113,11 +115,21 @@ describe('GddTransactionList', () => { }) it('shows the name of the receiver', () => { - expect(transaction.findAll('div').at(3).text()).toContain('Bob der Baumeister') + expect(transaction.findAll('div').at(0).text()).toContain('Bob der Baumeister') + }) + + it('shows the memo of the receiver', () => { + expect(transaction.findAll('div').at(5).text()).toContain('Alles Gute zum Geburtstag') }) it('shows the date of the transaction', () => { - expect(transaction.findAll('div').at(3).text()).toContain('Tue May 25 2021') + expect(transaction.findAll('div').at(8).text()).toContain( + 'Tue May 25 2021 19:38:13 GMT+0200', + ) + }) + + it('shows the decay calculation', () => { + expect(transaction.findAll('div').at(9).text()).toContain('-0.5') }) }) @@ -167,19 +179,25 @@ describe('GddTransactionList', () => { }) it('shows the amount of transaction', () => { - expect(transaction.findAll('div').at(2).text()).toContain('314.98') - }) - - it('has a plus operator', () => { - expect(transaction.findAll('div').at(2).text()).toContain('+') + expect(transaction.findAll('div').at(2).text()).toContain('+ 314.98') }) it('shows the name of the receiver', () => { - expect(transaction.findAll('div').at(3).text()).toContain('Jan Ulrich') + expect(transaction.findAll('div').at(0).text()).toContain('Jan Ulrich') + }) + + it('shows the memo of the receiver', () => { + expect(transaction.findAll('div').at(5).text()).toContain('Für das Fahrrad!') }) it('shows the date of the transaction', () => { - expect(transaction.findAll('div').at(3).text()).toContain('Thu Apr 29 2021') + expect(transaction.findAll('div').at(8).text()).toContain( + 'Thu Apr 29 2021 19:26:40 GMT+0200', + ) + }) + + it('shows the decay calculation', () => { + expect(transaction.findAll('div').at(9).text()).toContain('-1.5') }) }) diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue index 1d8473884..1e107fb91 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue @@ -9,19 +9,19 @@
-
+
-
+
{{ getProperties(type).operator }} {{ $n(balance, 'decimal') }} {{ $n(balance, 'decimal') }} -
+
- {{ $t('form.message') }} + {{ $t('form.memo') }}
@@ -30,8 +30,8 @@
-
- {{ name ? name : '' }} +
+
{{ name ? name : '' }}
{{ memo }} @@ -46,7 +46,7 @@
-
+
i @@ -55,24 +55,11 @@ - - -
-
- {{ type === 'receive' ? $t('form.from') : $t('form.to1') }}: -
-
- {{ name }} - -
-
-
-
-
Schöpfung
-
Aus der Community
+
{{ $t('decay.created') }}
+
{{ $t('decay.fromCommunity') }}