From 9b22b424571259fc4e87585a8ee7a7c00625a5d6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Feb 2022 15:06:26 +0100
Subject: [PATCH] change conflicts fixed

---
 .../Pages/AccountOverview/GddTransactionList.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 607d7bdf7..f558bc616 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -31,7 +31,11 @@
         >
           <!-- Collaps Button  -->
           <div
-            v-if="(type !== 'decay' && decay) || firstTransaction"
+            v-if="
+              (type != 'decay' && decay) ||
+              firstTransaction ||
+              (!firstTransaction && decay === null)
+            "
             class="text-right"
             style="width: 95%; position: absolute"
           >
@@ -123,7 +127,11 @@
           <!-- Collaps Start -->
 
           <b-collapse
-            v-if="(type !== 'decay' && decay) || firstTransaction"
+            v-if="
+              (type != 'decay' && decay) ||
+              firstTransaction ||
+              (!firstTransaction && decay === null)
+            "
             class="pb-4"
             :id="'decay-' + transactionId"
           >
@@ -138,6 +146,10 @@
               <div v-if="firstTransaction" class="mt-3 mb-3 text-center">
                 <b>{{ $t('decay.first_transaction') }}</b>
               </div>
+
+              <div v-if="!firstTransaction && decay === null" class="mt-3 mb-3 text-center">
+                <b>{{ $t('decay.first_transaction') }}</b>
+              </div>
             </div>
           </b-collapse>