From 76d6b308cf53da269e708ff01d3c3d97e7f6dd11 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 25 Mar 2022 08:27:36 +0100
Subject: [PATCH] add deletedAt in query, change locales expired to valid_until

---
 admin/src/components/TransactionLinkList.vue        | 2 +-
 admin/src/graphql/listTransactionLinksAdmin.js      | 1 +
 frontend/src/components/TransactionRows/DateRow.vue | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/TransactionLinkList.vue b/admin/src/components/TransactionLinkList.vue
index 2b73b4e35..bd7f8e1de 100644
--- a/admin/src/components/TransactionLinkList.vue
+++ b/admin/src/components/TransactionLinkList.vue
@@ -41,7 +41,7 @@ export default {
         { key: 'memo', label: this.$t('transactionlist.memo') },
         {
           key: 'validUntil',
-          label: this.$t('transactionlink.expired'),
+          label: this.$t('transactionlink.valid_until'),
           formatter: (value, key, item) => {
             return this.$d(new Date(value))
           },
diff --git a/admin/src/graphql/listTransactionLinksAdmin.js b/admin/src/graphql/listTransactionLinksAdmin.js
index 0e83018db..bfb4bf47f 100644
--- a/admin/src/graphql/listTransactionLinksAdmin.js
+++ b/admin/src/graphql/listTransactionLinksAdmin.js
@@ -11,6 +11,7 @@ export const listTransactionLinksAdmin = gql`
       createdAt
       validUntil
       redeemedAt
+      deletedAt
     }
   }
 `
diff --git a/frontend/src/components/TransactionRows/DateRow.vue b/frontend/src/components/TransactionRows/DateRow.vue
index 0c72907fe..7f93656f7 100644
--- a/frontend/src/components/TransactionRows/DateRow.vue
+++ b/frontend/src/components/TransactionRows/DateRow.vue
@@ -2,7 +2,9 @@
   <div class="date-row">
     <b-row>
       <b-col cols="5">
-        <div class="text-right">{{ diffNow ? $t('gdd_per_link.expired') : $t('form.date') }}</div>
+        <div class="text-right">
+          {{ diffNow ? $t('gdd_per_link.valid_until') : $t('form.date') }}
+        </div>
       </b-col>
       <b-col cols="7">
         <div class="gdd-transaction-list-item-date">