Merge branch 'master' into backend_passwort_encryption_parallel

frontend/src/components/Transaction.spec.js

@@ -345,7 +345,7 @@ describe('Transaction', () => {
       })
 
       it('has the description gdt.contribution', () => {
-        expect(wrapper.findAll('div.row').at(0).text()).toContain('gdt.contribution')
+        expect(wrapper.findAll('div.row').at(0).text()).toContain('This is a comment')
       })
 
       it('renders the amount of euros', () => {

frontend/src/components/Transaction.vue

@@ -91,7 +91,7 @@ const getLinesByType = computed(() => {
         icon: 'heart',
         iconclasses: 'gradido-global-color-accent',
         iconColor: '4',
-        description: t('gdt.contribution'),
+        description: props.comment, // t('gdt.contribution'),
         descriptiontext: n(props.amount, 'decimal') + ' €',
         credittext: n(props.gdt, 'decimal') + ' GDT',
       }

frontend/src/components/TransactionLinks/TransactionLink.spec.js

@@ -127,7 +127,8 @@ describe('TransactionLink.vue', () => {
     expect(wrapper.vm.decay).toBe('100')
   })
 
-  it('computes validLink correctly when link is valid', () => {
+  it('computes validLink correctly when link is valid', async () => {
+    await wrapper.setProps({ validUntil: new Date(new Date().getTime() + 1000000) })
     expect(wrapper.vm.validLink).toBe(true)
   })
 

frontend/src/locales/de.json

@@ -231,7 +231,6 @@
   },
   "gdt": {
     "calculation": "Berechnung der Gradido Transform",
-    "contribution": "Beitrag",
     "conversion": "Umrechnung",
     "conversion-gdt-euro": "Umrechnung Euro / Gradido Transform (GDT)",
     "credit": "Gutschrift",

frontend/src/locales/en.json

@@ -231,7 +231,6 @@
   },
   "gdt": {
     "calculation": "Calculation of Gradido Transform",
-    "contribution": "Contribution",
     "conversion": "Conversion",
     "conversion-gdt-euro": "Conversion Euro / Gradido Transform (GDT)",
     "credit": "Credit",