From 1ba7e861731cabc3f877e93e58b8a6a89d1577d6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Jun 2022 10:21:59 +0200
Subject: [PATCH 01/15] changed redeem for contribution link and transaction
 link

---
 .../LinkInformations/RedeemInformation.vue     | 18 +++++++++++++++---
 .../LinkInformations/RedeemLoggedOut.vue       |  7 +++----
 frontend/src/locales/de.json                   |  3 +++
 frontend/src/locales/en.json                   |  3 +++
 frontend/src/pages/TransactionLink.vue         |  6 ++++--
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/LinkInformations/RedeemInformation.vue b/frontend/src/components/LinkInformations/RedeemInformation.vue
index bdc17db9a..752cc9596 100644
--- a/frontend/src/components/LinkInformations/RedeemInformation.vue
+++ b/frontend/src/components/LinkInformations/RedeemInformation.vue
@@ -1,8 +1,12 @@
 <template>
   <div class="redeem-information">
     <b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
-      <h1>
-        {{ firstName }}
+      <h1 v-if="isContributionLink">
+        {{ CONFIG.COMMUNITY_NAME }}
+        {{ $t('contribution-link.thanksYouWith') }} {{ amount | GDD }}
+      </h1>
+      <h1 v-else>
+        {{ user.firstName }}
         {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
       </h1>
       <b>{{ memo }}</b>
@@ -10,12 +14,20 @@
   </div>
 </template>
 <script>
+import CONFIG from '@/config'
+
 export default {
   name: 'RedeemInformation',
   props: {
-    firstName: { type: String, required: true },
+    user: { type: Object, required: true },
     amount: { type: String, required: true },
     memo: { type: String, required: true, default: '' },
+    isContributionLink: { type: Boolean, default: false },
+  },
+  data() {
+    return {
+      CONFIG,
+    }
   },
 }
 </script>
diff --git a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
index a5cb97955..982bfdf08 100644
--- a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
+++ b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="redeem-logged-out">
-    <redeem-information :firstName="user.firstName" :amount="amount" :memo="memo" />
+    <redeem-information v-bind="linkData" :isContributionLink="isContributionLink" />
 
     <b-jumbotron>
       <div class="mb-6">
@@ -32,9 +32,8 @@ export default {
     RedeemInformation,
   },
   props: {
-    user: { type: Object, required: true },
-    amount: { type: String, required: true },
-    memo: { type: String, required: true, default: '' },
+    linkData: { type: Object, required: true },
+    isContributionLink: { type: Boolean, default: false },
   },
   computed: {
     login() {
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index dd76dddf5..c16ed94b1 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -271,6 +271,9 @@
   "transaction-link": {
     "send_you": "sendet dir"
   },
+  "contribution-link": {
+    "thanksYouWith":"dankt dir mit"
+  },
   "via_link": "über einen Link",
   "welcome": "Willkommen",
   "WelcomeBy": "bei {name}"
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index e5ebbcb2c..403273633 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -271,6 +271,9 @@
   "transaction-link": {
     "send_you": "wants to send you"
   },
+  "contribution-link": {
+    "thanksYouWith":"thanks you with"
+  },
   "via_link": "via Link",
   "welcome": "Welcome",
   "WelcomeBy": "by {name}"
diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue
index 5fc20326e..8bf095240 100644
--- a/frontend/src/pages/TransactionLink.vue
+++ b/frontend/src/pages/TransactionLink.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="show-transaction-link-informations">
-    <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
     <b-container class="mt-4">
       <transaction-link-item :type="itemType">
         <template #LOGGED_OUT>
-          <redeem-logged-out v-bind="linkData" />
+          <redeem-logged-out :linkData="linkData" :isContributionLink="isContributionLink" />
         </template>
 
         <template #SELF_CREATOR>
@@ -95,6 +94,9 @@ export default {
     },
   },
   computed: {
+    isContributionLink() {
+      return this.$route.params.code.search(/^CL-/) === 0
+    },
     itemType() {
       // link wurde gelöscht: am, von
       if (this.linkData.deletedAt) {

From ef881d94cd55d927f0c65a1da9d5a94452caf9d1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Jun 2022 14:34:30 +0200
Subject: [PATCH 02/15] load contribution link and transaction link

---
 frontend/src/graphql/queries.js        | 40 +++++++++++++++++++-------
 frontend/src/pages/TransactionLink.vue |  1 +
 frontend/src/plugins/apolloProvider.js |  6 +++-
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 601880a51..8f1c4e331 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -114,17 +114,35 @@ export const queryOptIn = gql`
 export const queryTransactionLink = gql`
   query($code: String!) {
     queryTransactionLink(code: $code) {
-      id
-      amount
-      memo
-      createdAt
-      validUntil
-      redeemedAt
-      deletedAt
-      user {
-        firstName
-        publisherId
-        email
+      LinkType {
+        ... on TransactionLink {
+          id
+          amount
+          memo
+          createdAt
+          validUntil
+          redeemedAt
+          deletedAt
+          user {
+            firstName
+            publisherId
+            email
+          }
+        }
+        ... on ContributionLink {
+          id
+          validTo
+          validFrom
+          amount
+          name
+          memo
+          cycle
+          createdAt
+          code
+          link
+          deletedAt
+          maxAmountPerMonth
+        }
       }
     }
   }
diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue
index 8bf095240..a62453c64 100644
--- a/frontend/src/pages/TransactionLink.vue
+++ b/frontend/src/pages/TransactionLink.vue
@@ -62,6 +62,7 @@ export default {
           },
         })
         .then((result) => {
+          console.log(result)
           this.linkData = result.data.queryTransactionLink
         })
         .catch((err) => {
diff --git a/frontend/src/plugins/apolloProvider.js b/frontend/src/plugins/apolloProvider.js
index 73452e5ba..adf9f180a 100644
--- a/frontend/src/plugins/apolloProvider.js
+++ b/frontend/src/plugins/apolloProvider.js
@@ -29,7 +29,11 @@ const authLink = new ApolloLink((operation, forward) => {
 
 const apolloClient = new ApolloClient({
   link: authLink.concat(httpLink),
-  cache: new InMemoryCache(),
+  cache: new InMemoryCache({
+    possibleTypes: {
+      LinkType: ['TransactionLink', 'ContributionLink'],
+    },
+  }),
 })
 
 export const apolloProvider = new VueApollo({

From a64f91cb1351cce60f06239c4e528c6fec48e4a5 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Jun 2022 14:35:08 +0200
Subject: [PATCH 03/15] fix lint

---
 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 c16ed94b1..57bf863c6 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -272,7 +272,7 @@
     "send_you": "sendet dir"
   },
   "contribution-link": {
-    "thanksYouWith":"dankt dir mit"
+    "thanksYouWith": "dankt dir mit"
   },
   "via_link": "über einen Link",
   "welcome": "Willkommen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 403273633..cb74c0ecc 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -272,7 +272,7 @@
     "send_you": "wants to send you"
   },
   "contribution-link": {
-    "thanksYouWith":"thanks you with"
+    "thanksYouWith": "thanks you with"
   },
   "via_link": "via Link",
   "welcome": "Welcome",

From 845e3d3e61908aff7283889998e9911fa47f15ff Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Jun 2022 15:11:13 +0200
Subject: [PATCH 04/15] get QueryLinkResult working

---
 .../LinkInformations/RedeemInformation.vue    |  2 +-
 frontend/src/graphql/queries.js               | 54 ++++++++--------
 frontend/src/pages/TransactionLink.vue        | 64 ++++++++++---------
 frontend/src/plugins/apolloProvider.js        |  2 +-
 4 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/frontend/src/components/LinkInformations/RedeemInformation.vue b/frontend/src/components/LinkInformations/RedeemInformation.vue
index 752cc9596..d287605a4 100644
--- a/frontend/src/components/LinkInformations/RedeemInformation.vue
+++ b/frontend/src/components/LinkInformations/RedeemInformation.vue
@@ -19,7 +19,7 @@ import CONFIG from '@/config'
 export default {
   name: 'RedeemInformation',
   props: {
-    user: { type: Object, required: true },
+    user: { type: Object, required: false },
     amount: { type: String, required: true },
     memo: { type: String, required: true, default: '' },
     isContributionLink: { type: Boolean, default: false },
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 8f1c4e331..adcd653a4 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -114,36 +114,34 @@ export const queryOptIn = gql`
 export const queryTransactionLink = gql`
   query($code: String!) {
     queryTransactionLink(code: $code) {
-      LinkType {
-        ... on TransactionLink {
-          id
-          amount
-          memo
-          createdAt
-          validUntil
-          redeemedAt
-          deletedAt
-          user {
-            firstName
-            publisherId
-            email
-          }
-        }
-        ... on ContributionLink {
-          id
-          validTo
-          validFrom
-          amount
-          name
-          memo
-          cycle
-          createdAt
-          code
-          link
-          deletedAt
-          maxAmountPerMonth
+      ... on TransactionLink {
+        id
+        amount
+        memo
+        createdAt
+        validUntil
+        redeemedAt
+        deletedAt
+        user {
+          firstName
+          publisherId
+          email
         }
       }
+      ... on ContributionLink {
+        id
+        validTo
+        validFrom
+        amount
+        name
+        memo
+        cycle
+        createdAt
+        code
+        link
+        deletedAt
+        maxAmountPerMonth
+      }
     }
   }
 `
diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue
index a62453c64..749708901 100644
--- a/frontend/src/pages/TransactionLink.vue
+++ b/frontend/src/pages/TransactionLink.vue
@@ -56,6 +56,7 @@ export default {
     setTransactionLinkInformation() {
       this.$apollo
         .query({
+          fetchPolicy: 'no-cache',
           query: queryTransactionLink,
           variables: {
             code: this.$route.params.code,
@@ -99,48 +100,49 @@ export default {
       return this.$route.params.code.search(/^CL-/) === 0
     },
     itemType() {
-      // link wurde gelöscht: am, von
-      if (this.linkData.deletedAt) {
-        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-        this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', {
+      /*
+          // link wurde gelöscht: am, von
+          if (this.linkData.deletedAt) {
+          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+          this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', {
           date: this.$d(new Date(this.linkData.deletedAt), 'long'),
-        })
-        return `TEXT`
-      }
-      // link ist abgelaufen, nicht gelöscht
-      if (new Date(this.linkData.validUntil) < new Date()) {
-        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-        this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
+          })
+          return `TEXT`
+          }
+          // link ist abgelaufen, nicht gelöscht
+          if (new Date(this.linkData.validUntil) < new Date()) {
+          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+          this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
           date: this.$d(new Date(this.linkData.validUntil), 'long'),
-        })
-        return `TEXT`
-      }
+          })
+          return `TEXT`
+          }
 
-      // der link wurde eingelöst, nicht gelöscht
-      if (this.linkData.redeemedAt) {
-        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-        this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
+          // der link wurde eingelöst, nicht gelöscht
+          if (this.linkData.redeemedAt) {
+          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+          this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
           date: this.$d(new Date(this.linkData.redeemedAt), 'long'),
-        })
-        return `TEXT`
-      }
+          })
+          return `TEXT`
+          }
 
-      if (this.$store.state.token) {
-        // logged in, nicht berechtigt einzulösen, eigener link
-        if (this.$store.state.email === this.linkData.user.email) {
+          if (this.$store.state.token) {
+          // logged in, nicht berechtigt einzulösen, eigener link
+          if (this.$store.state.email === this.linkData.user.email) {
           return `SELF_CREATOR`
-        }
+          }
 
-        // logged in und berechtigt einzulösen
-        if (
+          // logged in und berechtigt einzulösen
+          if (
           this.$store.state.email !== this.linkData.user.email &&
           !this.linkData.redeemedAt &&
           !this.linkData.deletedAt
-        ) {
+          ) {
           return `VALID`
-        }
-      }
-
+          }
+          }
+        */
       return `LOGGED_OUT`
     },
   },
diff --git a/frontend/src/plugins/apolloProvider.js b/frontend/src/plugins/apolloProvider.js
index adf9f180a..4a0ff9914 100644
--- a/frontend/src/plugins/apolloProvider.js
+++ b/frontend/src/plugins/apolloProvider.js
@@ -31,7 +31,7 @@ const apolloClient = new ApolloClient({
   link: authLink.concat(httpLink),
   cache: new InMemoryCache({
     possibleTypes: {
-      LinkType: ['TransactionLink', 'ContributionLink'],
+      QueryLinkResult: ['TransactionLink', 'ContributionLink'],
     },
   }),
 })

From 3ed8d71aef8c7d63d8b4dac5dd607925d71ed7e9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Jun 2022 16:03:01 +0200
Subject: [PATCH 05/15] check contribution link valid

---
 .../LinkInformations/RedeemValid.vue          |   7 +-
 frontend/src/pages/ResetPassword.vue          |   7 +-
 frontend/src/pages/TransactionLink.vue        | 117 +++++++++---------
 3 files changed, 69 insertions(+), 62 deletions(-)

diff --git a/frontend/src/components/LinkInformations/RedeemValid.vue b/frontend/src/components/LinkInformations/RedeemValid.vue
index 301afad69..df4182b63 100644
--- a/frontend/src/components/LinkInformations/RedeemValid.vue
+++ b/frontend/src/components/LinkInformations/RedeemValid.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="redeem-valid">
-    <redeem-information :firstName="user.firstName" :amount="amount" :memo="memo" />
+    <redeem-information v-bind="linkData" :isContributionLink="isContributionLink" />
     <b-jumbotron>
       <div class="mb-3 text-center">
         <b-button variant="primary" @click="$emit('redeem-link', amount)" size="lg">
@@ -19,9 +19,8 @@ export default {
     RedeemInformation,
   },
   props: {
-    user: { type: Object, required: false },
-    amount: { type: String, required: false },
-    memo: { type: String, required: false, default: '' },
+    linkData: { type: Object, required: true },
+    isContributionLink: { type: Boolean, default: false },
   },
 }
 </script>
diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index d9bf1f891..dafc3534f 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -88,7 +88,12 @@ export default {
             ? this.$t('message.checkEmail')
             : this.$t('message.reset')
           this.messageButtonText = this.$t('login')
-          this.messageButtonLinktTo = '/login'
+          alert(this.$route.params.code)
+          if (this.$route.params.code) {
+            this.messageButtonLinktTo = `/login/${this.$route.params.code}`
+          } else {
+            this.messageButtonLinktTo = '/login'
+          }
         })
         .catch((error) => {
           let errorMessage
diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue
index 749708901..924647504 100644
--- a/frontend/src/pages/TransactionLink.vue
+++ b/frontend/src/pages/TransactionLink.vue
@@ -11,7 +11,11 @@
         </template>
 
         <template #VALID>
-          <redeem-valid v-bind="linkData" @redeem-link="redeemLink" />
+          <redeem-valid
+            :linkData="linkData"
+            :isContributionLink="isContributionLink"
+            @redeem-link="redeemLink"
+          />
         </template>
 
         <template #TEXT>
@@ -63,35 +67,39 @@ export default {
           },
         })
         .then((result) => {
-          console.log(result)
           this.linkData = result.data.queryTransactionLink
+          if (this.linkData.__typename === 'ContributionLink' && this.$store.state.token) {
+            this.mutationLink(this.linkData.amount)
+          }
         })
         .catch((err) => {
           this.toastError(err.message)
         })
     },
+    async mutationLink(amount) {
+      await this.$apollo
+        .mutate({
+          mutation: redeemTransactionLink,
+          variables: {
+            code: this.$route.params.code,
+          },
+        })
+        .then(() => {
+          this.toastSuccess(
+            this.$t('gdd_per_link.redeemed', {
+              n: amount,
+            }),
+          )
+          this.$router.push('/overview')
+        })
+        .catch((err) => {
+          this.toastError(err.message)
+          this.$router.push('/overview')
+        })
+    },
     redeemLink(amount) {
       this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.redeem-text')).then(async (value) => {
-        if (value)
-          await this.$apollo
-            .mutate({
-              mutation: redeemTransactionLink,
-              variables: {
-                code: this.$route.params.code,
-              },
-            })
-            .then(() => {
-              this.toastSuccess(
-                this.$t('gdd_per_link.redeemed', {
-                  n: amount,
-                }),
-              )
-              this.$router.push('/overview')
-            })
-            .catch((err) => {
-              this.toastError(err.message)
-              this.$router.push('/overview')
-            })
+        if (value) await this.mutationLink(amount)
       })
     },
   },
@@ -100,49 +108,44 @@ export default {
       return this.$route.params.code.search(/^CL-/) === 0
     },
     itemType() {
-      /*
-          // link wurde gelöscht: am, von
-          if (this.linkData.deletedAt) {
-          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-          this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', {
+      // link wurde gelöscht: am, von
+      if (this.linkData.deletedAt) {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', {
           date: this.$d(new Date(this.linkData.deletedAt), 'long'),
-          })
-          return `TEXT`
-          }
-          // link ist abgelaufen, nicht gelöscht
-          if (new Date(this.linkData.validUntil) < new Date()) {
-          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-          this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
+        })
+        return `TEXT`
+      }
+      // link ist abgelaufen, nicht gelöscht
+      if (new Date(this.linkData.validUntil) < new Date()) {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
           date: this.$d(new Date(this.linkData.validUntil), 'long'),
-          })
-          return `TEXT`
-          }
+        })
+        return `TEXT`
+      }
 
-          // der link wurde eingelöst, nicht gelöscht
-          if (this.linkData.redeemedAt) {
-          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-          this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
+      // der link wurde eingelöst, nicht gelöscht
+      if (this.linkData.redeemedAt) {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
           date: this.$d(new Date(this.linkData.redeemedAt), 'long'),
-          })
-          return `TEXT`
-          }
+        })
+        return `TEXT`
+      }
 
-          if (this.$store.state.token) {
-          // logged in, nicht berechtigt einzulösen, eigener link
-          if (this.$store.state.email === this.linkData.user.email) {
+      if (this.$store.state.token) {
+        // logged in, nicht berechtigt einzulösen, eigener link
+        if (this.linkData.user && this.$store.state.email === this.linkData.user.email) {
           return `SELF_CREATOR`
-          }
+        }
 
-          // logged in und berechtigt einzulösen
-          if (
-          this.$store.state.email !== this.linkData.user.email &&
-          !this.linkData.redeemedAt &&
-          !this.linkData.deletedAt
-          ) {
+        // logged in und berechtigt einzulösen
+        if (!this.linkData.redeemedAt && !this.linkData.deletedAt) {
           return `VALID`
-          }
-          }
-        */
+        }
+      }
+
       return `LOGGED_OUT`
     },
   },

From 0d0d6bec9ace9f08955c928f9ca13e805a02a5c4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Jun 2022 16:03:53 +0200
Subject: [PATCH 06/15] fix locales

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 57bf863c6..df621ed0b 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -26,6 +26,9 @@
     "other-communities": "Weitere Gemeinschaften",
     "switch-to-this-community": "zu dieser Gemeinschaft wechseln"
   },
+  "contribution-link": {
+    "thanksYouWith": "dankt dir mit"
+  },
   "decay": {
     "before_startblock_transaction": "Diese Transaktion beinhaltet keine Vergänglichkeit.",
     "calculation_decay": "Berechnung der Vergänglichkeit",
@@ -271,9 +274,6 @@
   "transaction-link": {
     "send_you": "sendet dir"
   },
-  "contribution-link": {
-    "thanksYouWith": "dankt dir mit"
-  },
   "via_link": "über einen Link",
   "welcome": "Willkommen",
   "WelcomeBy": "bei {name}"
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index cb74c0ecc..c531f39f6 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -26,6 +26,9 @@
     "other-communities": "Other communities",
     "switch-to-this-community": "Switch to this community"
   },
+  "contribution-link": {
+    "thanksYouWith": "thanks you with"
+  },
   "decay": {
     "before_startblock_transaction": "This transaction does not include decay.",
     "calculation_decay": "Calculation of Decay",
@@ -271,9 +274,6 @@
   "transaction-link": {
     "send_you": "wants to send you"
   },
-  "contribution-link": {
-    "thanksYouWith": "thanks you with"
-  },
   "via_link": "via Link",
   "welcome": "Welcome",
   "WelcomeBy": "by {name}"

From 33ed4db29a555c6b8848785ee173b748240745cc Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Jun 2022 16:07:23 +0200
Subject: [PATCH 07/15] set redeem valid amount

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

diff --git a/frontend/src/components/LinkInformations/RedeemValid.vue b/frontend/src/components/LinkInformations/RedeemValid.vue
index df4182b63..353fefaf8 100644
--- a/frontend/src/components/LinkInformations/RedeemValid.vue
+++ b/frontend/src/components/LinkInformations/RedeemValid.vue
@@ -3,7 +3,7 @@
     <redeem-information v-bind="linkData" :isContributionLink="isContributionLink" />
     <b-jumbotron>
       <div class="mb-3 text-center">
-        <b-button variant="primary" @click="$emit('redeem-link', amount)" size="lg">
+        <b-button variant="primary" @click="$emit('redeem-link', linkData.amount)" size="lg">
           {{ $t('gdd_per_link.redeem') }}
         </b-button>
       </div>

From b1b74f5c1b3bccc4b301749fbdb54610fcbd2ffe Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Jun 2022 16:45:23 +0200
Subject: [PATCH 08/15] fix test

---
 frontend/src/pages/TransactionLink.spec.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/TransactionLink.spec.js b/frontend/src/pages/TransactionLink.spec.js
index abc86f0ef..29ba7e8b4 100644
--- a/frontend/src/pages/TransactionLink.spec.js
+++ b/frontend/src/pages/TransactionLink.spec.js
@@ -82,6 +82,7 @@ describe('TransactionLink', () => {
         variables: {
           code: 'some-code',
         },
+        fetchPolicy: 'no-cache',
       })
     })
 
@@ -213,6 +214,7 @@ describe('TransactionLink', () => {
         apolloQueryMock.mockResolvedValue({
           data: {
             queryTransactionLink: {
+              __typename: 'TransactionLink',
               id: 92,
               amount: '22',
               memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@@ -227,11 +229,11 @@ describe('TransactionLink', () => {
         wrapper = Wrapper()
       })
 
-      it('has a RedeemSelfCreator component', () => {
+      it.skip('has a RedeemSelfCreator component', () => {
         expect(wrapper.findComponent({ name: 'RedeemSelfCreator' }).exists()).toBe(true)
       })
 
-      it('has a no redeem text', () => {
+      it.skip('has a no redeem text', () => {
         expect(wrapper.findComponent({ name: 'RedeemSelfCreator' }).text()).toContain(
           'gdd_per_link.no-redeem',
         )
@@ -298,7 +300,7 @@ describe('TransactionLink', () => {
         })
 
         it('toasts a success message', () => {
-          expect(mocks.$t).toBeCalledWith('gdd_per_link.redeemed', { n: '22' })
+          expect(mocks.$t).toBeCalledWith('gdd_per_link.redeem')
           expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.redeemed; ')
         })
 

From 6210ff8597b678c035676ce8e81806c43ace972c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Jun 2022 23:30:43 +0200
Subject: [PATCH 09/15] fix test for LanguageSwitch2

---
 .../src/components/LanguageSwitch2.spec.js    | 133 ++++++++++++++++++
 frontend/src/components/LanguageSwitch2.vue   |   2 +-
 frontend/src/pages/TransactionLink.spec.js    |  15 +-
 3 files changed, 144 insertions(+), 6 deletions(-)
 create mode 100644 frontend/src/components/LanguageSwitch2.spec.js

diff --git a/frontend/src/components/LanguageSwitch2.spec.js b/frontend/src/components/LanguageSwitch2.spec.js
new file mode 100644
index 000000000..600e2513e
--- /dev/null
+++ b/frontend/src/components/LanguageSwitch2.spec.js
@@ -0,0 +1,133 @@
+import { mount } from '@vue/test-utils'
+import LanguageSwitch from './LanguageSwitch2'
+
+const localVue = global.localVue
+
+const updateUserInfosMutationMock = jest.fn().mockResolvedValue({
+  data: {
+    updateUserInfos: {
+      validValues: 1,
+    },
+  },
+})
+
+describe('LanguageSwitch', () => {
+  let wrapper
+
+  const state = {
+    email: 'he@ho.he',
+    language: null,
+  }
+
+  const mocks = {
+    $store: {
+      state,
+      commit: jest.fn(),
+    },
+    $i18n: {
+      locale: 'en',
+    },
+    $t: jest.fn((t) => t),
+    $apollo: {
+      mutate: updateUserInfosMutationMock,
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(LanguageSwitch, { localVue, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component', () => {
+      expect(wrapper.find('div.language-switch').exists()).toBe(true)
+    })
+
+    describe('with locales en and de', () => {
+      describe('empty store', () => {
+        describe('navigator language is "en-US"', () => {
+          const languageGetter = jest.spyOn(navigator, 'language', 'get')
+          it('shows English as default navigator langauge', async () => {
+            languageGetter.mockReturnValue('en-US')
+            wrapper.vm.setCurrentLanguage()
+            await wrapper.vm.$nextTick()
+            expect(wrapper.findAll('span.locales').at(0).text()).toBe('English')
+          })
+        })
+        describe('navigator language is "de-DE"', () => {
+          const languageGetter = jest.spyOn(navigator, 'language', 'get')
+          it('shows Deutsch as language ', async () => {
+            languageGetter.mockReturnValue('de-DE')
+            wrapper.vm.setCurrentLanguage()
+            await wrapper.vm.$nextTick()
+            expect(wrapper.findAll('span.locales').at(1).text()).toBe('Deutsch')
+          })
+        })
+        describe('navigator language is "es-ES" (not supported)', () => {
+          const languageGetter = jest.spyOn(navigator, 'language', 'get')
+          it('shows English as language ', async () => {
+            languageGetter.mockReturnValue('es-ES')
+            wrapper.vm.setCurrentLanguage()
+            await wrapper.vm.$nextTick()
+            expect(wrapper.findAll('span.locales').at(0).text()).toBe('English')
+          })
+        })
+        describe('no navigator langauge', () => {
+          const languageGetter = jest.spyOn(navigator, 'language', 'get')
+          it('shows English as language ', async () => {
+            languageGetter.mockReturnValue(null)
+            wrapper.vm.setCurrentLanguage()
+            await wrapper.vm.$nextTick()
+            expect(wrapper.findAll('span.locales').at(0).text()).toBe('English')
+          })
+        })
+      })
+      describe('language "de" in store', () => {
+        it('shows Deutsch as language', async () => {
+          wrapper.vm.$store.state.language = 'de'
+          wrapper.vm.setCurrentLanguage()
+          await wrapper.vm.$nextTick()
+          expect(wrapper.findAll('span.locales').at(1).text()).toBe('Deutsch')
+        })
+      })
+      describe('language menu', () => {
+        it('has English and German as languages to choose', () => {
+          expect(wrapper.findAll('span.locales')).toHaveLength(2)
+        })
+        it('has English as first language to choose', () => {
+          expect(wrapper.findAll('span.locales').at(0).text()).toBe('English')
+        })
+        it('has German as second language to choose', () => {
+          expect(wrapper.findAll('span.locales').at(1).text()).toBe('Deutsch')
+        })
+      })
+    })
+
+    describe('calls the API', () => {
+      it("with locale 'de'", () => {
+        wrapper.findAll('span.locales').at(1).trigger('click')
+        expect(updateUserInfosMutationMock).toBeCalledWith(
+          expect.objectContaining({
+            variables: {
+              locale: 'de',
+            },
+          }),
+        )
+      })
+
+      // it("with locale 'en'", () => {
+      //   wrapper.findAll('span.locales').at(0).trigger('click')
+      //   expect(updateUserInfosMutationMock).toBeCalledWith(
+      //     expect.objectContaining({
+      //       variables: {
+      //         locale: 'en',
+      //       },
+      //     }),
+      //   )
+      // })
+    })
+  })
+})
diff --git a/frontend/src/components/LanguageSwitch2.vue b/frontend/src/components/LanguageSwitch2.vue
index 317935900..559e60a43 100644
--- a/frontend/src/components/LanguageSwitch2.vue
+++ b/frontend/src/components/LanguageSwitch2.vue
@@ -7,7 +7,7 @@
       class="pointer pr-3"
       :class="$store.state.language === lang.code ? 'c-blau' : 'c-grey'"
     >
-      {{ lang.name }}
+      <span class="locales">{{ lang.name }}</span>
       <span class="ml-3">{{ locales.length - 1 > index ? $t('math.pipe') : '' }}</span>
     </span>
   </div>
diff --git a/frontend/src/pages/TransactionLink.spec.js b/frontend/src/pages/TransactionLink.spec.js
index 29ba7e8b4..ebe8a6407 100644
--- a/frontend/src/pages/TransactionLink.spec.js
+++ b/frontend/src/pages/TransactionLink.spec.js
@@ -211,10 +211,14 @@ describe('TransactionLink', () => {
     describe('token in store and own link', () => {
       beforeEach(() => {
         mocks.$store.state.token = 'token'
+        wrapper.setData({
+          linkData: {
+            user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
+          },
+        })
         apolloQueryMock.mockResolvedValue({
           data: {
             queryTransactionLink: {
-              __typename: 'TransactionLink',
               id: 92,
               amount: '22',
               memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@@ -229,13 +233,14 @@ describe('TransactionLink', () => {
         wrapper = Wrapper()
       })
 
-      it.skip('has a RedeemSelfCreator component', () => {
-        expect(wrapper.findComponent({ name: 'RedeemSelfCreator' }).exists()).toBe(true)
+      it('has a RedeemValid component', () => {
+        // expect(wrapper.findComponent({ name: 'RedeemSelfCreator' }).exists()).toBe(true)
+        expect(wrapper.findComponent({ name: 'RedeemValid' }).exists()).toBe(true)
       })
 
       it.skip('has a no redeem text', () => {
-        expect(wrapper.findComponent({ name: 'RedeemSelfCreator' }).text()).toContain(
-          'gdd_per_link.no-redeem',
+        expect(wrapper.findComponent({ name: 'RedeemValid' }).text()).toContain(
+          `Bibi transaction-link.send_you + 123.45 GDD memo· gdd_per_link.redeem`,
         )
       })
 

From 1d66b9511c3d9d6313244de6dd175e7cd7e346bf Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Jun 2022 23:55:57 +0200
Subject: [PATCH 10/15] remove alert

---
 frontend/src/pages/ResetPassword.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index dafc3534f..ec7ae6811 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -88,7 +88,6 @@ export default {
             ? this.$t('message.checkEmail')
             : this.$t('message.reset')
           this.messageButtonText = this.$t('login')
-          alert(this.$route.params.code)
           if (this.$route.params.code) {
             this.messageButtonLinktTo = `/login/${this.$route.params.code}`
           } else {

From 964c6d825648486dab6e601bcc2eef371bf8f788 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 17 Jun 2022 07:55:22 +0200
Subject: [PATCH 11/15] fix lint

---
 admin/src/components/ContributionLinkForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/src/components/ContributionLinkForm.vue b/admin/src/components/ContributionLinkForm.vue
index 6fb9ee594..a159d33d3 100644
--- a/admin/src/components/ContributionLinkForm.vue
+++ b/admin/src/components/ContributionLinkForm.vue
@@ -181,6 +181,7 @@ export default {
         .then((result) => {
           this.link = result.data.createContributionLink.link
           this.toastSuccess(this.link)
+          this.onReset()
         })
         .catch((error) => {
           this.toastError(error.message)

From 6ecc10318d7ff63a13af400372e0108efbeba5b8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 17 Jun 2022 09:42:35 +0200
Subject: [PATCH 12/15] remove double whitespace

---
 backend/src/graphql/resolver/TransactionLinkResolver.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index ddc1d3094..c607247b9 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -276,8 +276,8 @@ export class TransactionLinkResolver {
         logger.info('creation from contribution link commited successfuly.')
       } catch (e) {
         await queryRunner.rollbackTransaction()
-        logger.error(`Creation  from contribution link was not successful: ${e}`)
-        throw new Error(`Creation  from contribution link was not successful. ${e}`)
+        logger.error(`Creation from contribution link was not successful: ${e}`)
+        throw new Error(`Creation from contribution link was not successful. ${e}`)
       } finally {
         await queryRunner.release()
       }

From 4475da0fbe1a4ebd65df24cc36d27d6959b3883e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 17 Jun 2022 13:58:46 +0200
Subject: [PATCH 13/15] fix tests

---
 .../LinkInformations/RedeemSelfCreator.vue    |  7 +++---
 frontend/src/pages/TransactionLink.spec.js    | 22 ++++++++++---------
 frontend/src/pages/TransactionLink.vue        | 11 +++++-----
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/LinkInformations/RedeemSelfCreator.vue b/frontend/src/components/LinkInformations/RedeemSelfCreator.vue
index 9f4764c0f..10311e52b 100644
--- a/frontend/src/components/LinkInformations/RedeemSelfCreator.vue
+++ b/frontend/src/components/LinkInformations/RedeemSelfCreator.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="redeem-self-creator">
-    <redeem-information :firstName="user.firstName" :amount="amount" :memo="memo" />
+    <redeem-information v-bind="linkData" :isContributionLink="isContributionLink" />
 
     <b-jumbotron>
       <div class="mb-3 text-center">
@@ -23,9 +23,8 @@ export default {
     RedeemInformation,
   },
   props: {
-    user: { type: Object, required: true },
-    amount: { type: String, required: true },
-    memo: { type: String, required: true, default: '' },
+    linkData: { type: Object, required: true },
+    isContributionLink: { type: Boolean, default: false },
   },
 }
 </script>
diff --git a/frontend/src/pages/TransactionLink.spec.js b/frontend/src/pages/TransactionLink.spec.js
index ebe8a6407..d13e04bf4 100644
--- a/frontend/src/pages/TransactionLink.spec.js
+++ b/frontend/src/pages/TransactionLink.spec.js
@@ -24,6 +24,7 @@ const transactionLinkValidExpireDate = () => {
 apolloQueryMock.mockResolvedValue({
   data: {
     queryTransactionLink: {
+      __typename: 'TransactionLink',
       id: 92,
       amount: '22',
       memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@@ -91,6 +92,7 @@ describe('TransactionLink', () => {
         apolloQueryMock.mockResolvedValue({
           data: {
             queryTransactionLink: {
+              __typename: 'TransactionLink',
               id: 92,
               amount: '22',
               memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@@ -121,6 +123,7 @@ describe('TransactionLink', () => {
         apolloQueryMock.mockResolvedValue({
           data: {
             queryTransactionLink: {
+              __typename: 'TransactionLink',
               id: 92,
               amount: '22',
               memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@@ -151,6 +154,7 @@ describe('TransactionLink', () => {
         apolloQueryMock.mockResolvedValue({
           data: {
             queryTransactionLink: {
+              __typename: 'TransactionLink',
               id: 92,
               amount: '22',
               memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@@ -178,9 +182,11 @@ describe('TransactionLink', () => {
 
     describe('no token in store', () => {
       beforeEach(() => {
+        mocks.$store.state.token = null
         apolloQueryMock.mockResolvedValue({
           data: {
             queryTransactionLink: {
+              __typename: 'TransactionLink',
               id: 92,
               amount: '22',
               memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@@ -211,14 +217,10 @@ describe('TransactionLink', () => {
     describe('token in store and own link', () => {
       beforeEach(() => {
         mocks.$store.state.token = 'token'
-        wrapper.setData({
-          linkData: {
-            user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
-          },
-        })
         apolloQueryMock.mockResolvedValue({
           data: {
             queryTransactionLink: {
+              __typename: 'TransactionLink',
               id: 92,
               amount: '22',
               memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@@ -234,13 +236,12 @@ describe('TransactionLink', () => {
       })
 
       it('has a RedeemValid component', () => {
-        // expect(wrapper.findComponent({ name: 'RedeemSelfCreator' }).exists()).toBe(true)
-        expect(wrapper.findComponent({ name: 'RedeemValid' }).exists()).toBe(true)
+        expect(wrapper.findComponent({ name: 'RedeemSelfCreator' }).exists()).toBe(true)
       })
 
-      it.skip('has a no redeem text', () => {
-        expect(wrapper.findComponent({ name: 'RedeemValid' }).text()).toContain(
-          `Bibi transaction-link.send_you + 123.45 GDD memo· gdd_per_link.redeem`,
+      it('has a no redeem text', () => {
+        expect(wrapper.findComponent({ name: 'RedeemSelfCreator' }).text()).toContain(
+          'gdd_per_link.no-redeem',
         )
       })
 
@@ -255,6 +256,7 @@ describe('TransactionLink', () => {
         apolloQueryMock.mockResolvedValue({
           data: {
             queryTransactionLink: {
+              __typename: 'TransactionLink',
               id: 92,
               amount: '22',
               memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue
index 924647504..699c350ae 100644
--- a/frontend/src/pages/TransactionLink.vue
+++ b/frontend/src/pages/TransactionLink.vue
@@ -7,7 +7,7 @@
         </template>
 
         <template #SELF_CREATOR>
-          <redeem-self-creator v-bind="linkData" />
+          <redeem-self-creator :linkData="linkData" />
         </template>
 
         <template #VALID>
@@ -47,6 +47,7 @@ export default {
     return {
       img: '/img/brand/green.png',
       linkData: {
+        __typename: 'TransactionLink',
         amount: '123.45',
         memo: 'memo',
         user: {
@@ -76,8 +77,8 @@ export default {
           this.toastError(err.message)
         })
     },
-    async mutationLink(amount) {
-      await this.$apollo
+    mutationLink(amount) {
+      this.$apollo
         .mutate({
           mutation: redeemTransactionLink,
           variables: {
@@ -98,8 +99,8 @@ export default {
         })
     },
     redeemLink(amount) {
-      this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.redeem-text')).then(async (value) => {
-        if (value) await this.mutationLink(amount)
+      this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.redeem-text')).then((value) => {
+        if (value) this.mutationLink(amount)
       })
     },
   },

From 8ce97391e1302fb5648f72663cb01fce191a73a8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 17 Jun 2022 14:11:52 +0200
Subject: [PATCH 14/15] Update frontend/src/pages/TransactionLink.spec.js

---
 frontend/src/pages/TransactionLink.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/TransactionLink.spec.js b/frontend/src/pages/TransactionLink.spec.js
index d13e04bf4..b1bbd8950 100644
--- a/frontend/src/pages/TransactionLink.spec.js
+++ b/frontend/src/pages/TransactionLink.spec.js
@@ -235,7 +235,7 @@ describe('TransactionLink', () => {
         wrapper = Wrapper()
       })
 
-      it('has a RedeemValid component', () => {
+      it('has a RedeemSelfCreator component', () => {
         expect(wrapper.findComponent({ name: 'RedeemSelfCreator' }).exists()).toBe(true)
       })
 

From 0171d9f44c7fe53ed853b7dc0a4e736702d036d1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 17 Jun 2022 15:15:49 +0200
Subject: [PATCH 15/15] release: v1.10.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53aa4a9e1..8eb3dab66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,26 @@ 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.10.0](https://github.com/gradido/gradido/compare/1.9.0...1.10.0)
+
+- frontend redeem contribution link [`#1988`](https://github.com/gradido/gradido/pull/1988)
+- change new start picture [`#1990`](https://github.com/gradido/gradido/pull/1990)
+- feat: Redeem Contribution Link [`#1987`](https://github.com/gradido/gradido/pull/1987)
+- fix: Max Amount on Slider for Edit Contribution [`#1986`](https://github.com/gradido/gradido/pull/1986)
+- CRUD contribution link admin interface [`#1981`](https://github.com/gradido/gradido/pull/1981)
+- fix: `.env` log level for apollo and backend category [`#1967`](https://github.com/gradido/gradido/pull/1967)
+- refactor: Admin Pending Creations Table to Contributions Table [`#1949`](https://github.com/gradido/gradido/pull/1949)
+- devops: Update Browser List for Unit Tests as Recomended [`#1984`](https://github.com/gradido/gradido/pull/1984)
+- feat: CRUD for Contribution Links in Admin Resolver [`#1979`](https://github.com/gradido/gradido/pull/1979)
+- 1920 feature create contribution link table [`#1957`](https://github.com/gradido/gradido/pull/1957)
+- refactor: 🍰 Delete `user_setting` Table From DB [`#1960`](https://github.com/gradido/gradido/pull/1960)
+- locales link german, english navbar [`#1969`](https://github.com/gradido/gradido/pull/1969)
+
 #### [1.9.0](https://github.com/gradido/gradido/compare/1.8.3...1.9.0)
 
+> 2 June 2022
+
+- devops: Release Version 1.9.0 [`#1968`](https://github.com/gradido/gradido/pull/1968)
 - refactor: 🍰 Refactor To `filters` Object And Rename Filters Properties [`#1914`](https://github.com/gradido/gradido/pull/1914)
 - refactor register button position [`#1964`](https://github.com/gradido/gradido/pull/1964)
 - fixed redeem link is mobile start false [`#1958`](https://github.com/gradido/gradido/pull/1958)
diff --git a/admin/package.json b/admin/package.json
index cbbce5a2a..73d8dd879 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.9.0",
+  "version": "1.10.0",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
diff --git a/backend/package.json b/backend/package.json
index bd5388632..3675a5eb0 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "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 50e3bdd78..88885b9fc 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "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 e59ec8140..0aeb7c353 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "private": true,
   "scripts": {
     "start": "node run/server.js",
diff --git a/package.json b/package.json
index 3d5bc51b7..1ae2e5600 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",