From cdbd5f59b51a51103e34a37b74741109214197d7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 20 Sep 2021 08:58:58 +0200
Subject: [PATCH] after remove conflicts, fix lint

---
 frontend/src/components/DecayInformation.vue  | 53 ++++++++++---------
 .../AccountOverview/GddTransactionList.vue    | 10 +++-
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 55ca03317..c827b26ee 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -10,7 +10,6 @@
     </span>
 
     <div v-if="decaytyp === 'new'">
-   
       <b-list-group style="border: 0px">
         <b-list-group-item style="border: 0px; background-color: #f1f1f1">
           <div class="d-flex" v-if="!decay.decayStartBlock">
@@ -20,7 +19,6 @@
             </div>
           </div>
 
-
           <div class="d-flex">
             <div style="width: 40%" class="text-right pr-3 mr-2">
               <div v-if="!decay.decayStartBlock">{{ $t('decay.last_transaction') }}</div>
@@ -65,33 +63,36 @@
             </div>
           </div>
           <div v-if="decay.balance > 0">
-          <div class="d-flex" >
-            <div style="width: 40%" class="text-right pr-3 mr-2">
-              <div v-if="type === 'send'">{{ $t('form.amount') }} </div>
-              <div v-if="type === 'receive'">{{ $t('form.amount') }} </div>
+            <div class="d-flex">
+              <div style="width: 40%" class="text-right pr-3 mr-2">
+                <div v-if="type === 'send'">{{ $t('form.amount') }}</div>
+                <div v-if="type === 'receive'">{{ $t('form.amount') }}</div>
+              </div>
+              <div style="width: 60%">
+                <div>{{ balance }}</div>
+              </div>
             </div>
-            <div style="width: 60%">
-              <div> {{balance}} </div>               
+            <div class="d-flex">
+              <div style="width: 40%" class="text-right pr-3 mr-2">
+                <div>{{ $t('decay.decay') }}</div>
+              </div>
+              <div style="width: 60%">
+                <div>{{ decay.balance }}</div>
+              </div>
             </div>
-          </div>
-           <div class="d-flex">
-            <div style="width: 40%" class="text-right pr-3 mr-2">
-              <div>{{ $t('decay.decay') }}</div>
+            <div class="d-flex">
+              <div style="width: 40%" class="text-right pr-3 mr-2">
+                <div>{{ $t('decay.total') }}</div>
+              </div>
+              <div style="width: 60%">
+                <div v-if="type === 'send'">
+                  <b>{{ parseInt(balance) + decay.balance }}</b>
+                </div>
+                <div v-if="type === 'receive'">
+                  <b>{{ parseInt(balance) - decay.balance }}</b>
+                </div>
+              </div>
             </div>
-            <div style="width: 60%">
-              <div> {{ decay.balance }} </div>               
-            </div>
-          </div>
-          <div class="d-flex">
-            <div style="width: 40%" class="text-right pr-3 mr-2">
-              <div>{{ $t('decay.total') }}</div>
-             
-            </div>
-            <div style="width: 60%">
-              <div v-if="type === 'send'"><b> {{ parseInt(balance) + decay.balance  }} </b></div>               
-              <div v-if="type === 'receive'"><b> {{ parseInt(balance) - decay.balance  }} </b></div>
-            </div>
-          </div>
           </div>
         </b-list-group-item>
       </b-list-group>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 416e6392e..bdf4199f3 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -23,7 +23,7 @@
             <div class="col-1 gdd-transaction-list-item-icon">
               <b-icon :icon="getProperties(type).icon" :class="getProperties(type).class" />
             </div>
-            
+
             <div class="col col-11">
               <!-- Betrag / Name Email -->
               <b-row>
@@ -76,7 +76,13 @@
 
           <b-collapse v-if="type != 'decay'" class="pb-4" :id="'a' + date + ''">
             <div style="border: 0px; background-color: #f1f1f1" class="p-2 pb-4 mb-4">
-              <decay-information v-if="decay" decaytyp="new" :balance="balance" :decay="decay" :type="type" />
+              <decay-information
+                v-if="decay"
+                decaytyp="new"
+                :balance="balance"
+                :decay="decay"
+                :type="type"
+              />
             </div>
           </b-collapse>