From f7b74d8e63cb39f1ce6c2a6ff1254ffbe0e34354 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 07:57:11 +0100
Subject: [PATCH 01/21] refctor link result

---
 frontend/src/components/ClipboardCopy.vue     | 32 ++++++++++++-------
 .../GddSend/TransactionResultLink.vue         | 13 ++++++++
 frontend/src/mixins/copyLinks.js              | 11 ++-----
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 7c4e014ec..ce7d0f312 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -1,22 +1,32 @@
 <template>
   <div class="clipboard-copy">
-    <div v-if="canCopyLink" size="lg" class="mb-5">
-      <div class="d-flex">
-        <div>
-          <label>{{ $t('gdd_per_link.copy-link') }}</label>
-          <div class="pointer text-center bg-secondary gradido-border-radius p-4" @click="copyLink">
-            {{ link }}
-          </div>
-        </div>
-        <div class="ml-5">
-          <label>{{ $t('gdd_per_link.copy-link-with-text') }}</label>
+    <div v-if="canCopyLink" class="mb-5">
+      <div>
+        <label>{{ $t('gdd_per_link.copy-link') }}</label>
+        <div class="pointer text-center bg-secondary gradido-border-radius p-3" @click="copyLink">
+          {{ link }}
           <div>
-            <b-button @click="copyLinkWithText" class="p-4">
+            <b-button class="p-4">
               <b-icon icon="link45deg"></b-icon>
             </b-button>
           </div>
         </div>
       </div>
+      <div class="mt-5">
+        <label>{{ $t('gdd_per_link.copy-link-with-text') }}</label>
+        <div
+          class="pointer text-center bg-secondary gradido-border-radius p-3"
+          @click="copyLinkWithText"
+        >
+          {{ text }}
+          <div>
+            <b-button class="p-4">
+              <b-icon icon="link45deg"></b-icon>
+            </b-button>
+          </div>
+        </div>
+        <div></div>
+      </div>
     </div>
     <div v-else>
       <div class="alert-danger p-3">{{ $t('gdd_per_link.not-copied') }}</div>
diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
index e72bbc73f..53b9d05cb 100644
--- a/frontend/src/components/GddSend/TransactionResultLink.vue
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -6,7 +6,9 @@
       :amount="amount"
       :memo="memo"
       :validUntil="validUntil"
+      :text="text"
     ></clipboard-copy>
+    <label>{{ $t('qrCode') }}</label>
     <div class="text-center">
       <div><figure-qr-code :link="link" /></div>
       <div>
@@ -33,5 +35,16 @@ export default {
     memo: { type: String, required: true },
     validUntil: { type: String, required: true },
   },
+  data() {
+    return {
+      text: `${this.link}
+${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
+"${this.memo}"
+${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
+        date: this.$d(new Date(this.validUntil), 'short'),
+      })}
+${this.$t('gdd_per_link.link-hint')}`,
+    }
+  },
 }
 </script>
diff --git a/frontend/src/mixins/copyLinks.js b/frontend/src/mixins/copyLinks.js
index ac6be95c5..b6d422c67 100644
--- a/frontend/src/mixins/copyLinks.js
+++ b/frontend/src/mixins/copyLinks.js
@@ -4,6 +4,7 @@ export const copyLinks = {
     amount: { type: String, required: true },
     memo: { type: String, required: true },
     validUntil: { type: String, required: true },
+    text: { type: String, required: true },
   },
   data() {
     return {
@@ -24,15 +25,7 @@ export const copyLinks = {
     },
     copyLinkWithText() {
       navigator.clipboard
-        .writeText(
-          `${this.link}
-${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
-"${this.memo}"
-${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
-            date: this.$d(new Date(this.validUntil), 'short'),
-          })}
-${this.$t('gdd_per_link.link-hint')}`,
-        )
+        .writeText(this.text)
         .then(() => {
           this.toastSuccess(this.$t('gdd_per_link.link-and-text-copied'))
         })

From ad8e8b860907ba8bbb65be7738d6a64d8ba478cc Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 09:13:39 +0100
Subject: [PATCH 02/21] fix test

---
 frontend/src/components/ClipboardCopy.vue                 | 7 ++++++-
 .../DecayInformations/CollapseLinksList.spec.js           | 2 ++
 .../components/TransactionLinks/TransactionLink.spec.js   | 1 +
 .../Transactions/TransactionLinkSummary.spec.js           | 8 ++++++++
 frontend/src/pages/Send.spec.js                           | 8 ++++----
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index ce7d0f312..67887d3bd 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -3,7 +3,11 @@
     <div v-if="canCopyLink" class="mb-5">
       <div>
         <label>{{ $t('gdd_per_link.copy-link') }}</label>
-        <div class="pointer text-center bg-secondary gradido-border-radius p-3" @click="copyLink">
+        <div
+          class="pointer text-center bg-secondary gradido-border-radius p-3"
+          @click="copyLink"
+          data-test="copyLink"
+        >
           {{ link }}
           <div>
             <b-button class="p-4">
@@ -16,6 +20,7 @@
         <label>{{ $t('gdd_per_link.copy-link-with-text') }}</label>
         <div
           class="pointer text-center bg-secondary gradido-border-radius p-3"
+          data-test="copyLinkWithText"
           @click="copyLinkWithText"
         >
           {{ text }}
diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
index 68d5d427f..2bec71172 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -24,6 +24,7 @@ const propsData = {
       memo: 'Eene meene Siegerpreis, vor mir steht ein Schokoeis. Hex-hex!',
       redeemedAt: null,
       validUntil: '2022-03-30T14:22:40.000Z',
+      text: '',
     },
     {
       amount: '6',
@@ -35,6 +36,7 @@ const propsData = {
       memo: 'Eene meene buntes Laub, auf dem Schrank da liegt kein Staub.',
       redeemedAt: null,
       validUntil: '2022-03-30T14:22:40.000Z',
+      text: '',
     },
   ],
   transactionLinkCount: 3,
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index da37173c9..e947a7818 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -28,6 +28,7 @@ const propsData = {
   id: 12,
   memo: 'Katzenauge, Eulenschrei, was verschwunden komm herbei!',
   validUntil: '2022-03-30T14:22:40.000Z',
+  text: '',
 }
 
 describe('TransactionLink', () => {
diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
index fe949bd61..829a8930e 100644
--- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
@@ -52,6 +52,7 @@ describe('TransactionLinkSummary', () => {
                 'Hokuspokus Haselnuss, Vogelbein und Fliegenfuß, damit der Trick gelingen muss!',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
+              text: '',
             },
             {
               amount: '85',
@@ -62,6 +63,7 @@ describe('TransactionLinkSummary', () => {
               memo: 'Mäusespeck und Katzenbuckel, Tricks und Tracks und Zauberkugel!',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
+              text: '',
             },
             {
               amount: '95',
@@ -73,6 +75,7 @@ describe('TransactionLinkSummary', () => {
                 'Abrakadabra 1,2,3, die Sonne kommt herbei. Schweinepups und Spuckebrei, der Regen ist vorbei.',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
+              text: '',
             },
             {
               amount: '150',
@@ -84,6 +87,7 @@ describe('TransactionLinkSummary', () => {
                 'Abrakadabra 1,2,3 was verschwunden ist komme herbei.Wieseldreck und Schweinemist, zaubern das ist keine List.',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
+              text: '',
             },
           ],
         },
@@ -171,6 +175,7 @@ describe('TransactionLinkSummary', () => {
                     'Hat jemand die Nummer von der Hexe aus Schneewittchen? Ich bräuchte mal ein paar Äpfel.',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
+                  text: '',
                 },
                 {
                   amount: '86',
@@ -182,6 +187,7 @@ describe('TransactionLinkSummary', () => {
                     'Die Windfahn´ krächzt am Dach, Der Uhu im Geklüfte; Was wispert wie ein Ach Verhallend in die Lüfte?',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
+                  text: '',
                 },
                 {
                   amount: '96',
@@ -193,6 +199,7 @@ describe('TransactionLinkSummary', () => {
                     'Verschlafen kräht der Hahn, Ein Blitz noch, und ein trüber, Umwölbter Tag bricht an – Walpurgisnacht vorüber!',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
+                  text: '',
                 },
                 {
                   amount: '150',
@@ -203,6 +210,7 @@ describe('TransactionLinkSummary', () => {
                   memo: 'Eene meene Flaschenschrank, fertig ist der Hexentrank!',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
+                  text: '',
                 },
               ],
             },
diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index 63715a6a2..651ba9c4d 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -254,7 +254,7 @@ describe('Send', () => {
           describe('copy link with success', () => {
             beforeEach(async () => {
               navigatorClipboardMock.mockResolvedValue()
-              await wrapper.find('.pointer').trigger('click')
+              await wrapper.find('div[data-test="copyLink"]').trigger('click')
             })
 
             it('should call clipboard.writeText', () => {
@@ -270,7 +270,7 @@ describe('Send', () => {
           describe('copy link with error', () => {
             beforeEach(async () => {
               navigatorClipboardMock.mockRejectedValue()
-              await wrapper.find('.clipboard-copy').find('.btn-secondary').trigger('click')
+              await wrapper.find('div[data-test="copyLink"]').trigger('click')
             })
 
             it('toasts error message', () => {
@@ -292,7 +292,7 @@ describe('Send', () => {
           describe('copy link and text with success', () => {
             beforeEach(async () => {
               navigatorClipboardMock.mockResolvedValue()
-              await wrapper.findAll('button').at(0).trigger('click')
+              await wrapper.find('div[data-test="copyLinkWithText"]').trigger('click')
             })
 
             it('should call clipboard.writeText', () => {
@@ -312,7 +312,7 @@ describe('Send', () => {
           describe('copy link and text with error', () => {
             beforeEach(async () => {
               navigatorClipboardMock.mockRejectedValue()
-              await wrapper.findAll('button').at(0).trigger('click')
+              await wrapper.find('div[data-test="copyLinkWithText"]').trigger('click')
             })
 
             it('toasts error message', () => {

From 79d9af6ec47c3fe42c8a68f78ebecc5ef206fbff Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 10:14:45 +0100
Subject: [PATCH 03/21] test open in TransactionLinkSummary.spec.js

---
 .../DecayInformations/CollapseLinksList.spec.js      |  2 --
 .../src/components/GddSend/TransactionResultLink.vue | 12 ------------
 .../Transactions/TransactionLinkSummary.spec.js      | 10 +---------
 frontend/src/mixins/copyLinks.js                     |  8 +++++++-
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
index 2bec71172..68d5d427f 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -24,7 +24,6 @@ const propsData = {
       memo: 'Eene meene Siegerpreis, vor mir steht ein Schokoeis. Hex-hex!',
       redeemedAt: null,
       validUntil: '2022-03-30T14:22:40.000Z',
-      text: '',
     },
     {
       amount: '6',
@@ -36,7 +35,6 @@ const propsData = {
       memo: 'Eene meene buntes Laub, auf dem Schrank da liegt kein Staub.',
       redeemedAt: null,
       validUntil: '2022-03-30T14:22:40.000Z',
-      text: '',
     },
   ],
   transactionLinkCount: 3,
diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
index 53b9d05cb..9efbbb3c2 100644
--- a/frontend/src/components/GddSend/TransactionResultLink.vue
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -6,7 +6,6 @@
       :amount="amount"
       :memo="memo"
       :validUntil="validUntil"
-      :text="text"
     ></clipboard-copy>
     <label>{{ $t('qrCode') }}</label>
     <div class="text-center">
@@ -35,16 +34,5 @@ export default {
     memo: { type: String, required: true },
     validUntil: { type: String, required: true },
   },
-  data() {
-    return {
-      text: `${this.link}
-${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
-"${this.memo}"
-${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
-        date: this.$d(new Date(this.validUntil), 'short'),
-      })}
-${this.$t('gdd_per_link.link-hint')}`,
-    }
-  },
 }
 </script>
diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
index 829a8930e..a5bdc4714 100644
--- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
@@ -52,7 +52,6 @@ describe('TransactionLinkSummary', () => {
                 'Hokuspokus Haselnuss, Vogelbein und Fliegenfuß, damit der Trick gelingen muss!',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
-              text: '',
             },
             {
               amount: '85',
@@ -63,7 +62,6 @@ describe('TransactionLinkSummary', () => {
               memo: 'Mäusespeck und Katzenbuckel, Tricks und Tracks und Zauberkugel!',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
-              text: '',
             },
             {
               amount: '95',
@@ -75,7 +73,6 @@ describe('TransactionLinkSummary', () => {
                 'Abrakadabra 1,2,3, die Sonne kommt herbei. Schweinepups und Spuckebrei, der Regen ist vorbei.',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
-              text: '',
             },
             {
               amount: '150',
@@ -87,7 +84,6 @@ describe('TransactionLinkSummary', () => {
                 'Abrakadabra 1,2,3 was verschwunden ist komme herbei.Wieseldreck und Schweinemist, zaubern das ist keine List.',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
-              text: '',
             },
           ],
         },
@@ -175,7 +171,6 @@ describe('TransactionLinkSummary', () => {
                     'Hat jemand die Nummer von der Hexe aus Schneewittchen? Ich bräuchte mal ein paar Äpfel.',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
-                  text: '',
                 },
                 {
                   amount: '86',
@@ -187,7 +182,6 @@ describe('TransactionLinkSummary', () => {
                     'Die Windfahn´ krächzt am Dach, Der Uhu im Geklüfte; Was wispert wie ein Ach Verhallend in die Lüfte?',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
-                  text: '',
                 },
                 {
                   amount: '96',
@@ -199,7 +193,6 @@ describe('TransactionLinkSummary', () => {
                     'Verschlafen kräht der Hahn, Ein Blitz noch, und ein trüber, Umwölbter Tag bricht an – Walpurgisnacht vorüber!',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
-                  text: '',
                 },
                 {
                   amount: '150',
@@ -210,7 +203,6 @@ describe('TransactionLinkSummary', () => {
                   memo: 'Eene meene Flaschenschrank, fertig ist der Hexentrank!',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
-                  text: '',
                 },
               ],
             },
@@ -222,7 +214,7 @@ describe('TransactionLinkSummary', () => {
           })
         })
 
-        it('has eight transactionLinks', () => {
+        it('has four transactionLinks', () => {
           expect(wrapper.vm.transactionLinks).toHaveLength(4)
         })
 
diff --git a/frontend/src/mixins/copyLinks.js b/frontend/src/mixins/copyLinks.js
index b6d422c67..ee48dc4e1 100644
--- a/frontend/src/mixins/copyLinks.js
+++ b/frontend/src/mixins/copyLinks.js
@@ -4,11 +4,17 @@ export const copyLinks = {
     amount: { type: String, required: true },
     memo: { type: String, required: true },
     validUntil: { type: String, required: true },
-    text: { type: String, required: true },
   },
   data() {
     return {
       canCopyLink: true,
+      text: `${this.link}
+${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
+"${this.memo}"
+${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
+        date: this.$d(new Date(this.validUntil), 'short'),
+      })}
+${this.$t('gdd_per_link.link-hint')}`,
     }
   },
   methods: {

From 13c52efbbe5783db5a34f9836595ff097c0d8147 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 11:50:31 +0100
Subject: [PATCH 04/21] Update frontend/src/components/ClipboardCopy.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 frontend/src/components/ClipboardCopy.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 67887d3bd..df224bb67 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -30,7 +30,6 @@
             </b-button>
           </div>
         </div>
-        <div></div>
       </div>
     </div>
     <div v-else>

From 0f0a5a88070bdf7ef062a2de018c374730adf6f3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 12:13:57 +0100
Subject: [PATCH 05/21] fix tests after new layout

---
 .../TransactionLinkSummary.spec.js            | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
index a5bdc4714..d0086ceab 100644
--- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
@@ -17,6 +17,12 @@ const mocks = {
   $apollo: {
     query: apolloQueryMock,
   },
+  $store: {
+    state: {
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+    },
+  },
 }
 
 const propsData = {
@@ -102,10 +108,10 @@ describe('TransactionLinkSummary', () => {
 
     describe('click on transaction links', () => {
       beforeEach(async () => {
-        wrapper.find('div.transaction-slot-link').trigger('click')
+        wrapper.find('div.row').trigger('click')
       })
 
-      it.skip('calls the API to get the list transaction links', () => {
+      it('calls the API to get the list transaction links', () => {
         expect(apolloQueryMock).toBeCalledWith({
           query: listTransactionLinks,
           variables: {
@@ -115,14 +121,14 @@ describe('TransactionLinkSummary', () => {
         })
       })
 
-      it.skip('has four transactionLinks', () => {
+      it('has four transactionLinks', () => {
         expect(wrapper.vm.transactionLinks).toHaveLength(4)
       })
 
       describe('close transaction link details', () => {
         beforeEach(() => {
           jest.clearAllMocks()
-          wrapper.find('div.transaction-slot-link').trigger('click')
+          wrapper.find('div.row').trigger('click')
         })
 
         it('does not call the API', () => {
@@ -136,10 +142,10 @@ describe('TransactionLinkSummary', () => {
         describe('reopen transaction link details', () => {
           beforeEach(() => {
             jest.clearAllMocks()
-            wrapper.find('div.transaction-slot-link').trigger('click')
+            wrapper.find('div.row').trigger('click')
           })
 
-          it.skip('calls the API to get the list transaction links', () => {
+          it('calls the API to get the list transaction links', () => {
             expect(apolloQueryMock).toBeCalledWith({
               query: listTransactionLinks,
               variables: {
@@ -149,7 +155,7 @@ describe('TransactionLinkSummary', () => {
             })
           })
 
-          it.skip('has four transactionLinks', () => {
+          it('has four transactionLinks', () => {
             expect(wrapper.vm.transactionLinks).toHaveLength(4)
           })
         })
@@ -214,8 +220,8 @@ describe('TransactionLinkSummary', () => {
           })
         })
 
-        it('has four transactionLinks', () => {
-          expect(wrapper.vm.transactionLinks).toHaveLength(4)
+        it('has eight transactionLinks', () => {
+          expect(wrapper.vm.transactionLinks).toHaveLength(8)
         })
 
         it('loads more transaction links', () => {
@@ -230,19 +236,19 @@ describe('TransactionLinkSummary', () => {
 
         describe('close transaction link list', () => {
           beforeEach(async () => {
-            wrapper.find('div.transaction-slot-link').trigger('click')
+            wrapper.find('div.row').trigger('click')
           })
           describe('reopen transaction link list', () => {
             beforeEach(async () => {
               jest.clearAllMocks()
-              wrapper.find('div.transaction-slot-link').trigger('click')
+              wrapper.find('div.row').trigger('click')
             })
 
-            it.skip('calls the API once', () => {
+            it('calls the API once', () => {
               expect(apolloQueryMock).toBeCalledTimes(1)
             })
 
-            it.skip('calls the API with current page one', () => {
+            it('calls the API with current page one', () => {
               expect(apolloQueryMock).toBeCalledWith({
                 query: listTransactionLinks,
                 variables: {
@@ -289,10 +295,10 @@ describe('TransactionLinkSummary', () => {
       })
     })
 
-    describe.skip('loads transaction links with error', () => {
+    describe('loads transaction links with error', () => {
       beforeEach(() => {
         apolloQueryMock.mockRejectedValue({ message: 'OUCH!' })
-        wrapper.find('div.transaction-slot-link').trigger('click')
+        wrapper.find('div.row').trigger('click')
       })
 
       it('toasts an error message', () => {

From e0365b3ed5cf94dfa4185d013d1954fd008881ed Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 12:16:55 +0100
Subject: [PATCH 06/21] add store to mocks

---
 .../components/DecayInformations/CollapseLinksList.spec.js  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
index 68d5d427f..fddc00317 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -10,6 +10,12 @@ const mocks = {
   $tc: jest.fn((tc) => tc),
   $t: jest.fn((t) => t),
   $d: jest.fn((d) => d),
+  $store: {
+    state: {
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+    },
+  },
 }
 
 const propsData = {

From 2d567fb46c70d89ac59656fba6c9472a4e542d8f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 12:22:06 +0100
Subject: [PATCH 07/21] linkText as computed property

---
 frontend/src/components/ClipboardCopy.vue     |  2 +-
 .../TransactionLinks/TransactionLink.spec.js  |  1 -
 frontend/src/mixins/copyLinks.js              | 20 +++++++++++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index df224bb67..4374f7182 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -23,7 +23,7 @@
           data-test="copyLinkWithText"
           @click="copyLinkWithText"
         >
-          {{ text }}
+          {{ linkText }}
           <div>
             <b-button class="p-4">
               <b-icon icon="link45deg"></b-icon>
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index e947a7818..da37173c9 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -28,7 +28,6 @@ const propsData = {
   id: 12,
   memo: 'Katzenauge, Eulenschrei, was verschwunden komm herbei!',
   validUntil: '2022-03-30T14:22:40.000Z',
-  text: '',
 }
 
 describe('TransactionLink', () => {
diff --git a/frontend/src/mixins/copyLinks.js b/frontend/src/mixins/copyLinks.js
index ee48dc4e1..1e339c49f 100644
--- a/frontend/src/mixins/copyLinks.js
+++ b/frontend/src/mixins/copyLinks.js
@@ -8,13 +8,6 @@ export const copyLinks = {
   data() {
     return {
       canCopyLink: true,
-      text: `${this.link}
-${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
-"${this.memo}"
-${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
-        date: this.$d(new Date(this.validUntil), 'short'),
-      })}
-${this.$t('gdd_per_link.link-hint')}`,
     }
   },
   methods: {
@@ -31,7 +24,7 @@ ${this.$t('gdd_per_link.link-hint')}`,
     },
     copyLinkWithText() {
       navigator.clipboard
-        .writeText(this.text)
+        .writeText(this.linkText)
         .then(() => {
           this.toastSuccess(this.$t('gdd_per_link.link-and-text-copied'))
         })
@@ -41,4 +34,15 @@ ${this.$t('gdd_per_link.link-hint')}`,
         })
     },
   },
+  computed: {
+    linkText() {
+      return `${this.link}
+${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
+"${this.memo}"
+${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
+        date: this.$d(new Date(this.validUntil), 'short'),
+      })}
+${this.$t('gdd_per_link.link-hint')}`
+    },
+  },
 }

From a99acadf2168b65c1e99cfd746565136f19343e4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 12:23:05 +0100
Subject: [PATCH 08/21] coverage frontend to 93%

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 82785db18..dfac48371 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -437,7 +437,7 @@ jobs:
           report_name: Coverage Frontend
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 92
+          min_coverage: 93
           token: ${{ github.token }}
   
   ##############################################################################

From 633c89f082ca16fd9a138e13bb68c7cc8b14e05c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 12:59:17 +0100
Subject: [PATCH 09/21] change dropdown placement calender no-flip true

---
 frontend/src/components/Contributions/ContributionForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index e9f99848f..84059dcbd 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -17,7 +17,7 @@
         :label-no-date-selected="$t('contribution.noDateSelected')"
         required
         :disabled="this.form.id !== null"
-        :dropleft="true"
+        :no-flip="true"
       >
         <template #nav-prev-year><span></span></template>
         <template #nav-next-year><span></span></template>

From ac15586f34f09281d41a9862a5d62e16832fc4e1 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 19 Jan 2023 13:05:58 +0100
Subject: [PATCH 10/21] reduce min value to 0.25 to be consistent

---
 frontend/src/components/Contributions/ContributionForm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index e9f99848f..b70404c9b 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -35,12 +35,12 @@
         v-model="form.hours"
         :name="$t('form.hours')"
         :label="$t('form.hours')"
-        placeholder="0.5"
+        placeholder="0.25"
         :rules="{
           required: true,
-          min: 0.5,
+          min: 0.25,
           max: validMaxTime,
-          gddCreationTime: [0.5, validMaxTime],
+          gddCreationTime: [0.25, validMaxTime],
         }"
         :validMaxTime="validMaxTime"
         @updateAmount="updateAmount"

From d7fa8b8f8b4133e861e8e73daadec940335c0b38 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 13:24:51 +0100
Subject: [PATCH 11/21] refactor(frontend): forgot password unit tests

---
 frontend/src/pages/ForgotPassword.spec.js | 62 +++++++++--------------
 1 file changed, 24 insertions(+), 38 deletions(-)

diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index f4b74e555..c5b25bf1c 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -1,4 +1,4 @@
-import { mount, RouterLinkStub } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import flushPromises from 'flush-promises'
 import { toastErrorSpy } from '@test/testSetup'
 import ForgotPassword from './ForgotPassword'
@@ -7,43 +7,28 @@ const mockAPIcall = jest.fn()
 
 const localVue = global.localVue
 
-const mockRouterPush = jest.fn()
-
-const stubs = {
-  RouterLink: RouterLinkStub,
-}
-
-const createMockObject = (comingFrom) => {
-  return {
-    localVue,
-    mocks: {
-      $t: jest.fn((t) => t),
-      $router: {
-        push: mockRouterPush,
-      },
-      $apollo: {
-        mutate: mockAPIcall,
-      },
-      $route: {
-        params: {
-          comingFrom,
-        },
-      },
+const mocks = {
+  $t: jest.fn((t) => t),
+  $apollo: {
+    mutate: mockAPIcall,
+  },
+  $route: {
+    params: {
+      comingFrom: '',
     },
-    stubs,
-  }
+  },
 }
 
 describe('ForgotPassword', () => {
   let wrapper
 
-  const Wrapper = (functionN) => {
-    return mount(ForgotPassword, functionN)
+  const Wrapper = () => {
+    return mount(ForgotPassword, { localVue, mocks })
   }
 
   describe('mount', () => {
     beforeEach(() => {
-      wrapper = Wrapper(createMockObject())
+      wrapper = Wrapper()
     })
 
     it('renders the component', () => {
@@ -110,12 +95,6 @@ describe('ForgotPassword', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
 
-            it.skip('click redirects to "/login"', async () => {
-              // wrapper.find('.test-message-button').trigger('click')
-              // await wrapper.vm.$nextTick()
-              expect(mockRouterPush).toBeCalledWith('/login')
-            })
-
             it('toasts a standard error message', () => {
               expect(toastErrorSpy).toBeCalledWith('error.email-already-sent')
             })
@@ -144,13 +123,20 @@ describe('ForgotPassword', () => {
             it('button link redirects to "/login"', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
-
-            it.skip('click redirects to "/login"', () => {
-              // expect(mockRouterPush).toBeCalledWith('/login')
-            })
           })
         })
       })
     })
+
+    describe('route has coming from ', () => {
+      beforeEach(() => {
+        mocks.$route.params.comingFrom = 'coming from'
+        wrapper = Wrapper()
+      })
+
+      it('changes subtitle', () => {
+        expect(wrapper.vm.subtitle).toBe('settings.password.resend_subtitle')
+      })
+    })
   })
 })

From cda222a648b118e62ae318df1c17fc7fd54d2a1b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 13:39:08 +0100
Subject: [PATCH 12/21] change contribution memo add word-break

---
 .../src/components/Contributions/ContributionListItem.vue  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 4717f29e5..faec028f9 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -16,12 +16,15 @@
           <b-avatar v-else :icon="icon" :variant="variant" size="3em"></b-avatar>
         </b-col>
         <b-col>
-          <div v-if="firstName" class="mr-3 font-weight-bold">{{ firstName }} {{ lastName }}</div>
+          <div v-if="firstName" class="mr-3 font-weight-bold">
+            {{ firstName }} {{ lastName }}
+            <b-icon :icon="icon" :variant="variant"></b-icon>
+          </div>
           <div class="small">
             {{ $d(new Date(contributionDate), 'monthAndYear') }}
           </div>
           <div class="mt-3 font-weight-bold">{{ $t('contributionText') }}</div>
-          <div class="mb-3">{{ memo }}</div>
+          <div class="mb-3 text-break word-break">{{ memo }}</div>
           <div v-if="state === 'IN_PROGRESS'" class="text-205">
             {{ $t('contribution.alert.answerQuestion') }}
           </div>

From e519f048fe59c2eded6c25aed14f31c0f9ef0ef8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 14:27:38 +0100
Subject: [PATCH 13/21] add no-resize props on InpuArea.vue

---
 frontend/src/components/Inputs/InputTextarea.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/Inputs/InputTextarea.vue b/frontend/src/components/Inputs/InputTextarea.vue
index e8dcf2840..4096a1b09 100644
--- a/frontend/src/components/Inputs/InputTextarea.vue
+++ b/frontend/src/components/Inputs/InputTextarea.vue
@@ -18,6 +18,7 @@
         rows="4"
         max-rows="4"
         :disabled="disabled"
+        no-resize="true"
       ></b-form-textarea>
       <b-form-invalid-feedback v-bind="ariaMsg">
         {{ errors[0] }}

From 3f6bcdc0d2d4025458c62766cb8378a10cc7aacd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 14:42:36 +0100
Subject: [PATCH 14/21] add text-break on all table memo fields

---
 admin/src/components/CreationTransactionList.vue       | 2 +-
 admin/src/components/Tables/OpenCreationsTable.spec.js | 2 +-
 admin/src/components/TransactionLinkList.vue           | 2 +-
 admin/src/pages/CreationConfirm.vue                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index 2ce143c7f..950afcebc 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -88,7 +88,7 @@ export default {
             return `${value} GDD`
           },
         },
-        { key: 'memo', label: this.$t('transactionlist.memo') },
+        { key: 'memo', label: this.$t('transactionlist.memo'), class: 'text-break' },
       ],
     }
   },
diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index 2eb149e4f..9e43fd66c 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -57,7 +57,7 @@ const propsData = {
         return value + ' GDD'
       },
     },
-    { key: 'memo', label: 'text' },
+    { key: 'memo', label: 'text', class: 'text-break' },
     {
       key: 'date',
       label: 'date',
diff --git a/admin/src/components/TransactionLinkList.vue b/admin/src/components/TransactionLinkList.vue
index d850083cc..564865440 100644
--- a/admin/src/components/TransactionLinkList.vue
+++ b/admin/src/components/TransactionLinkList.vue
@@ -67,7 +67,7 @@ export default {
             return `${value} GDD`
           },
         },
-        { key: 'memo', label: this.$t('transactionlist.memo') },
+        { key: 'memo', label: this.$t('transactionlist.memo'), class: 'text-break' },
         {
           key: 'validUntil',
           label: this.$t('transactionlink.valid_until'),
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 311c898a5..23871635d 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -99,7 +99,7 @@ export default {
             return value + ' GDD'
           },
         },
-        { key: 'memo', label: this.$t('text') },
+        { key: 'memo', label: this.$t('text'), class: 'text-break' },
         {
           key: 'date',
           label: this.$t('date'),

From a5fd937e14302fc8a3b2ea0c45e3f618e61da2f6 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 19 Jan 2023 14:58:19 +0100
Subject: [PATCH 15/21] Equalize en with fr languages.

---
 frontend/src/assets/News/news.json |  2 +-
 frontend/src/locales/fr.json       | 63 +++++++++++++++++++-----------
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/frontend/src/assets/News/news.json b/frontend/src/assets/News/news.json
index 284fc711c..9246be2e3 100644
--- a/frontend/src/assets/News/news.json
+++ b/frontend/src/assets/News/news.json
@@ -18,7 +18,7 @@
     "date": "01 janvier 2023",
     "text": "Compte Gradido 2023 : nouveau design et communautés décentralisées",
     "url": "https://gradido.net/fr/gradido-konto-2023-neues-design-und-dezentrale-communities/",
-    "extra": "Ce sont souvent les personnes les plus discrètes qui créent silencieusement, avec application et passion, les bases de grands développements. Notre site Développeur ont effectué ces derniers mois un travail préparatoire formidable qui sera mis à profit en 2023."
+    "extra": "Ce sont souvent les personnes les plus discrètes qui créent silencieusement, avec application et passion, les bases de grands développements. Nos développeurs ont effectués ces derniers mois un travail préparatoire formidable qui sera mis à profit en 2023."
   },
   {
     "locale": "es",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index e911af300..389e86307 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -1,4 +1,6 @@
 {
+  "(": "(",
+  ")": ")",
   "100": "100%",
   "1000thanks": "1000 mercis d'être avec nous!",
   "125": "125%",
@@ -20,25 +22,25 @@
   "community": {
     "choose-another-community": "Choisissez une autre communauté",
     "community": "Communauté",
+    "communityMember": "Vous etes un membre actif",
     "continue-to-registration": "Continuez l´inscription",
-    "current-community": "Communauté actuelle",
-    "members": "Membres",
     "moderator": "Modérateur",
     "moderators": "Modérateurs",
-    "myContributions": "Mes contributions aux biens communs",
+    "myContributions": "Mes contributions",
+    "noOpenContributionLinkText": "Currently there are no automatic creations.",
     "openContributionLinks": "liste de liens de contribution publique",
     "openContributionLinkText": "Les {count} créations automatiques suivantes sont actuellement fournies par la communauté \"{name}\".",
-    "other-communities": "Autres communautés",
-    "statistic": "Statistiques",
-    "submitContribution": "écrire",
-    "switch-to-this-community": "Passer à cette communauté"
+    "submitContribution": "Contribuer"
   },
+  "communityInfo": "Information communauté^^",
+  "contact": "Contact",
   "contribution": {
     "activity": "Activité",
     "alert": {
       "answerQuestion": "S'il te plais répond à la question",
       "communityNoteList": "Vous trouverez ci-contre toutes les contributions versées et certifiées de tous les membres de cette communauté.",
-      "confirm": " Approuvé",
+      "confirm": "Approuvé",
+      "deleted": "Supprimé",
       "in_progress": "Il y a une question du modérateur.",
       "myContributionNoteList": "À tout moment vous pouvez éditer ou supprimer les données qui n´ont pas été confirmées.",
       "pending": "Inscription en attente de validation",
@@ -65,6 +67,8 @@
     "thanksYouWith": "vous remercie avec",
     "unique": "(unique)"
   },
+  "contributionText": "Texte de la contribution",
+  "creation": "Création",
   "decay": {
     "before_startblock_transaction": "Cette transaction n´est pas péremptoire.",
     "calculation_decay": "Calcul de la décroissance",
@@ -84,6 +88,7 @@
     }
   },
   "delete": "Supprimer",
+  "edit": "modifier",
   "em-dash": "—",
   "error": {
     "email-already-sent": "Nous vous avons déjà envoyé un email il y a moins de 10 minutes.",
@@ -121,7 +126,7 @@
     "firstname": " Prénom",
     "from": "de",
     "generate_now": "Produire maintenant",
-    "hours": "Uren",
+    "hours": "Heures",
     "lastname": "Nom",
     "memo": "Note",
     "message": "Message",
@@ -147,7 +152,8 @@
     "to": "à",
     "to1": "à",
     "validation": {
-      "gddSendAmount": "L´espace {_field_} doit comprendre un nombre entre {min} et {max} avec un maximum de deux chiffres après la virgule",
+      "gddCreationTime": "Le champ {_field_} doit comprendre un nombre entre {min} et {max} avec un maximum de une décimale.",
+      "gddSendAmount": "Le champ {_field_} doit comprendre un nombre entre {min} et {max} avec un maximum de deux chiffres après la virgule",
       "is-not": "Vous ne pouvez pas vous envoyer de Gradido à vous-même",
       "usernmae-regex": "Le nom d´utilisateur doit commencer par une lettre, suivi d´au moins deux caractères alphanumériques.",
       "usernmae-unique": "Ce nom d´utilisateur est déjà pris."
@@ -155,13 +161,13 @@
     "your_amount": "Votre montant"
   },
   "GDD": "GDD",
+  "gddKonto": "Compte GDD",
   "gdd_per_link": {
     "choose-amount": "Sélectionnez le montant que vous souhaitez envoyer via lien. Vous pouvez également joindre un message. Cliquez sur ‘créer maintenant’ pour établir un lien que vous pourrez partager.",
     "copy-link": "Copier le lien",
     "copy-link-with-text": "Copier le lien et le texte",
     "created": "Le lien a été créé!",
     "credit-your-gradido": "Pour l´accréditation du Gradido, cliquer sur le lien!",
-    "decay-14-day": "Perte sur 14 jours",
     "delete-the-link": "Supprimer le lien?",
     "deleted": "Le lien a été supprimé!",
     "expiredOn": "A expiré le",
@@ -188,6 +194,7 @@
     "validUntil": "Valide jusqu´au",
     "validUntilDate": "Le lien est valide jusqu´au {date}."
   },
+  "GDT": "GDT",
   "gdt": {
     "calculation": "Calcul de Gradido Transform",
     "contribution": "Contribution",
@@ -199,22 +206,25 @@
     "funding": "Aux contributions au financement",
     "gdt": "Gradido Transform",
     "gdt-received": "Gradido Transform (GDT) perçu",
+    "gdtKonto": "Compte GDT",
     "no-transactions": "Vous ne possédez pas encore Gradido Transform (GDT).",
     "not-reachable": "Le Serveur GDT n´est pas accessible.",
     "publisher": "Un membre que vous avez référé a apporté un contribution",
     "raise": "Augmentation",
     "recruited-member": "Membre invité"
   },
+  "h": "h",
   "language": "Langage",
   "link-load": "Enregistrer le dernier lien | Enregistrer les derniers {n} liens |  Enregistrer plus de {n} liens",
   "login": "Connexion",
   "math": {
-    "aprox": "~",
     "asterisk": "*",
     "equal": "=",
     "minus": "−",
     "pipe": "|"
   },
+  "maxReached": "Max. atteint",
+  "member": "Membre",
   "message": {
     "activateEmail": "Votre compte n´a pas encore été activé. Veuillez vérifier vos emails et cliquer sur le lien d´activation ou faites la demande d´un nouveau lien en utilisant la page qui permet de générer un nouveau mot de passe.",
     "checkEmail": "Votre email a bien été vérifié. Vous pouvez vous enregistrer maintenant.",
@@ -231,13 +241,22 @@
     "community": "Communauté",
     "info": "Information",
     "logout": "Déconnexion",
-    "members_area": "Partie réservée aux membres",
     "overview": "Aperçu",
-    "profile": "Mon profile",
     "send": "Envoyer",
+    "settings": "Configuration",
     "support": "Aide",
     "transactions": "Transactions"
   },
+  "openHours": "Heures ouverte",
+  "pageTitle": {
+    "community": "Ma communauté",
+    "gdt": "Vos transactions GDT",
+    "information": "{community}",
+    "overview": "Bienvenue {name}",
+    "send": "Envoyé Gradidos",
+    "settings": "Configuration",
+    "transactions": "Vos transactions"
+  },
   "qrCode": "QR Code",
   "send_gdd": "Envoyer GDD",
   "send_per_link": "Envoyer GDD via lien",
@@ -248,6 +267,8 @@
     "warningText": "Êtes-vous toujours connecté?"
   },
   "settings": {
+    "hideAmountGDD": "Votre montant GDD est caché.",
+    "hideAmountGDT": "Votre montant GDT est caché.",
     "language": {
       "changeLanguage": "Changer la langue",
       "de": "Deutsch",
@@ -280,7 +301,9 @@
         "text": "Sauvegardez votre nouveau mot de passe maintenant, que vous pourrez utiliser pour vous connecter à votre compte Gradido dans le futur."
       },
       "subtitle": "Si vous avez oublié votre mot de passe, vous pouvez le réinitialiser ici."
-    }
+    },
+    "showAmountGDD": "Votre montant GDD est visible.",
+    "showAmountGDT": "Votre montant GDT est visible."
   },
   "signin": "S´identifier",
   "signup": "S´inscrire",
@@ -302,11 +325,8 @@
       "uppercase": "Une lettre majuscule requise."
     }
   },
-  "statistic": {
-    "totalGradidoAvailable": "GDD total en circulation",
-    "totalGradidoCreated": "GDD total puisé",
-    "totalGradidoDecayed": "Total de GDD écoulé"
-  },
+  "status": "Statu",
+  "submitted": "Envoyé",
   "success": "Avec succès",
   "time": {
     "days": "Jours",
@@ -318,8 +338,7 @@
     "years": "Année"
   },
   "transaction": {
-    "gdd-text": "Transactions Gradido",
-    "gdt-text": "Transactions de GradidoTransform",
+    "lastTransactions": "Dernières transactions",
     "nullTransactions": "Vous n´avez pas encore de transaction effectuée sur votre compte.",
     "receiverDeleted": "Le compte du destinataire n´existe plus",
     "receiverNotFound": "Destinataire inconnu",

From 89d5d3b3cbbc70d026264097be6f5e5c7855d20c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 19 Jan 2023 15:16:22 +0100
Subject: [PATCH 16/21] fixed error

---
 frontend/src/components/Inputs/InputTextarea.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Inputs/InputTextarea.vue b/frontend/src/components/Inputs/InputTextarea.vue
index 4096a1b09..3881c4b16 100644
--- a/frontend/src/components/Inputs/InputTextarea.vue
+++ b/frontend/src/components/Inputs/InputTextarea.vue
@@ -18,7 +18,7 @@
         rows="4"
         max-rows="4"
         :disabled="disabled"
-        no-resize="true"
+        no-resize
       ></b-form-textarea>
       <b-form-invalid-feedback v-bind="ariaMsg">
         {{ errors[0] }}

From 7349a9bdd1aaed82f499e52098b278d126ab1ecd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 15:24:54 +0100
Subject: [PATCH 17/21] add localation in toast

---
 frontend/src/locales/de.json     | 3 ++-
 frontend/src/locales/en.json     | 3 ++-
 frontend/src/pages/Community.vue | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index ce9f8b41d..d4f1544b9 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -37,7 +37,8 @@
   "contribution": {
     "activity": "Tätigkeit",
     "alert": {
-      "answerQuestion": "Bitte beantworte die Rückfrage!",
+      "answerQuestionToast": "Du hast eine Rückfrage auf einen Beitrag. Bitte antworte auf diese.",
+      "answerQuestion": "Bitte beantworte diese Rückfrage.",
       "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
       "confirm": "bestätigt",
       "deleted": "gelöscht",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 5841c759c..d45502df1 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -37,7 +37,8 @@
   "contribution": {
     "activity": "Activity",
     "alert": {
-      "answerQuestion": "Please answer the question",
+      "answerQuestionToast": "You have a question about a post. Please reply to it.",
+      "answerQuestion": "Please answer the question.",
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
       "deleted": "deleted",
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 13aad1a72..5e4186c21 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -282,7 +282,7 @@ export default {
             if (this.$route.hash !== '#my') {
               this.$router.push({ path: '/community#my' })
             }
-            this.toastInfo('Du hast eine Rückfrage auf eine Contribution. Bitte beantworte diese!')
+            this.toastInfo(this.$t('contribution.alert.answerQuestionToast'))
           }
         })
         .catch((err) => {

From 31b7e090170b840b2dc95a480c418996d1bfb753 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 19 Jan 2023 15:33:38 +0100
Subject: [PATCH 18/21] fix error handling to throw proper errors

---
 frontend/test/testSetup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index 06e84b269..27317425f 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -70,6 +70,6 @@ console.warn = (m) => {
 }
 
 // throw errors for vue warnings to force the programmers to take care about warnings
-Vue.config.warnHandler = (w) => {
+Vue.config.warnHandler = async (w) => {
   throw new Error(w)
 }

From aa5a6e071130cc4363970f4db558247478c17c42 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 15:37:41 +0100
Subject: [PATCH 19/21] fix locales

---
 frontend/src/locales/de.json | 2 +-
 frontend/src/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index d4f1544b9..406f2564a 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -37,8 +37,8 @@
   "contribution": {
     "activity": "Tätigkeit",
     "alert": {
-      "answerQuestionToast": "Du hast eine Rückfrage auf einen Beitrag. Bitte antworte auf diese.",
       "answerQuestion": "Bitte beantworte diese Rückfrage.",
+      "answerQuestionToast": "Du hast eine Rückfrage auf einen Beitrag. Bitte antworte auf diese.",
       "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
       "confirm": "bestätigt",
       "deleted": "gelöscht",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d45502df1..16d4a414b 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -37,8 +37,8 @@
   "contribution": {
     "activity": "Activity",
     "alert": {
-      "answerQuestionToast": "You have a question about a post. Please reply to it.",
       "answerQuestion": "Please answer the question.",
+      "answerQuestionToast": "You have a question about a post. Please reply to it.",
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
       "deleted": "deleted",

From 0b7fdac38a8c96b06d9dabe04502f0ce8e79017a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 19 Jan 2023 18:24:00 +0100
Subject: [PATCH 20/21] removed comment

---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dfac48371..412154b04 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,6 @@ jobs:
   build_test_admin:
     name: Docker Build Test - Admin Interface
     runs-on: ubuntu-latest
-    #needs: [nothing]
     steps:
       ##########################################################################
       # CHECKOUT CODE ##########################################################

From 62e76e02ad3114a3c269d3a5850f0ab9bf7eedb2 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 19 Jan 2023 22:11:20 +0100
Subject: [PATCH 21/21] v1.17.1

---
 CHANGELOG.md          | 16 ++++++++++++++++
 admin/package.json    |  2 +-
 backend/package.json  |  2 +-
 database/package.json |  2 +-
 frontend/package.json |  2 +-
 package.json          |  2 +-
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 165ed53e5..358e4670a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,24 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.17.1](https://github.com/gradido/gradido/compare/1.17.0...1.17.1)
+
+- refactor(frontend): change contribution memo add word-break [`#2583`](https://github.com/gradido/gradido/pull/2583)
+- refactor(admin): add text-break on all table memo fields [`#2584`](https://github.com/gradido/gradido/pull/2584)
+- fix(frontend): throw proper frontend warning errors [`#2586`](https://github.com/gradido/gradido/pull/2586)
+- refactor(frontend): equalize en with fr languages. [`#2585`](https://github.com/gradido/gradido/pull/2585)
+- refactor(frontend): forgot password unit tests [`#2582`](https://github.com/gradido/gradido/pull/2582)
+- fix(frontend): fix min value for hours input [`#2581`](https://github.com/gradido/gradido/pull/2581)
+- fix(frontend): change dropdown placement calender no-flip true [`#2580`](https://github.com/gradido/gradido/pull/2580)
+- refactor(frontend): link send result style [`#2577`](https://github.com/gradido/gradido/pull/2577)
+- refactor(frontend): remove vertical scrolling & small fixes [`#2578`](https://github.com/gradido/gradido/pull/2578)
+- refactor(frontend): tyle mobile device auth template [`#2576`](https://github.com/gradido/gradido/pull/2576)
+
 #### [1.17.0](https://github.com/gradido/gradido/compare/1.16.0...1.17.0)
 
+> 18 January 2023
+
+- chore(release): v1.17.0 [`#2575`](https://github.com/gradido/gradido/pull/2575)
 - fix(frontend): submit contribution text [`#2573`](https://github.com/gradido/gradido/pull/2573)
 - fix(backend): admin cannot delete confirmed contribution [`#2571`](https://github.com/gradido/gradido/pull/2571)
 - fix(frontend): english locales - horas -&gt; hours [`#2572`](https://github.com/gradido/gradido/pull/2572)
diff --git a/admin/package.json b/admin/package.json
index aabe002b4..8270c4da6 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -3,7 +3,7 @@
   "description": "Administraion Interface for Gradido",
   "main": "index.js",
   "author": "Moriz Wahl",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
diff --git a/backend/package.json b/backend/package.json
index cd0a8f6bc..bfcd61d5b 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",
diff --git a/database/package.json b/database/package.json
index 6fc745500..f4e1c7e84 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",
diff --git a/frontend/package.json b/frontend/package.json
index 55e28b45c..02a6aa2f0 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "private": true,
   "scripts": {
     "start": "node run/server.js",
diff --git a/package.json b/package.json
index 539a13b66..7a01da338 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",