From 06705366ad3e8e494cf5fafc56b078d5d36f8d31 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 16:44:06 +0100
Subject: [PATCH] change decay Object to String

---
 .../DecayInformations/DecayInformation-Decay.vue          | 8 +++++---
 .../DecayInformations/DecayInformation-Short.vue          | 4 ++--
 .../src/components/TransactionLinks/TransactionLink.vue   | 6 +++---
 frontend/src/components/TransactionRows/DecayRow.vue      | 2 +-
 .../src/components/Transactions/TransactionCreation.vue   | 2 +-
 frontend/src/components/Transactions/TransactionDecay.vue | 2 +-
 .../components/Transactions/TransactionLinksSummary.vue   | 2 +-
 .../src/components/Transactions/TransactionReceive.vue    | 2 +-
 frontend/src/components/Transactions/TransactionSend.vue  | 2 +-
 9 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
index 7377b6fa8..6abacd2b8 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
@@ -13,8 +13,8 @@
       </b-col>
       <b-col cols="6">
         <div>
-          {{ (Number(balance) - Number(decay.decay)) | GDD }}
-          {{ decay.decay | GDD }} {{ $t('math.equal') }}
+          {{ (Number(balance) - Number(decay)) | GDD }}
+          {{ decay | GDD }} {{ $t('math.equal') }}
           <b>{{ balance | GDD }}</b>
         </div>
       </b-col>
@@ -27,9 +27,11 @@ export default {
   props: {
     balance: {
       type: String,
+      required: true,
     },
     decay: {
-      type: Object,
+      type: String,
+      required: true,
     },
   },
 }
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Short.vue b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
index 333a38216..ba1f16d72 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Short.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="decayinformation-short">
-    <span v-if="decay.decay">{{ decay.decay | GDD }}</span>
+    <span v-if="decay">{{ decay | GDD }}</span>
   </div>
 </template>
 <script>
@@ -8,7 +8,7 @@ export default {
   name: 'DecayInformation-Short',
   props: {
     decay: {
-      type: Object,
+      type: String,
       required: true,
     },
   },
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index e558ac50b..5851ba453 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -8,7 +8,7 @@
         <amount-and-name-row :amount="amount" :text="$t('form.amount')" />
         <memo-row :memo="memo" />
         <date-row :date="validUntil" :diffNow="true" />
-        <decay-row :decay="decayObject" />
+        <decay-row :decay="decay" />
       </b-col>
 
       <b-col cols="1" class="text-right">
@@ -93,8 +93,8 @@ export default {
     },
   },
   computed: {
-    decayObject() {
-      return { decay: this.amount - this.holdAvailableAmount }
+    decay() {
+      return `${this.amount - this.holdAvailableAmount}`
     },
   },
 }
diff --git a/frontend/src/components/TransactionRows/DecayRow.vue b/frontend/src/components/TransactionRows/DecayRow.vue
index 92d79ef4b..f853d9f93 100644
--- a/frontend/src/components/TransactionRows/DecayRow.vue
+++ b/frontend/src/components/TransactionRows/DecayRow.vue
@@ -23,7 +23,7 @@ export default {
   },
   props: {
     decay: {
-      type: Object,
+      type: String,
       required: false,
     },
   },
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 579bf06a5..bb131d39a 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -21,7 +21,7 @@
             <date-row :date="balanceDate" />
 
             <!-- Decay -->
-            <decay-row :decay="decay" />
+            <decay-row :decay="decay.decay" />
           </b-col>
         </b-row>
       </div>
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index 9c7d52495..2f235502a 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -21,7 +21,7 @@
       </div>
 
       <b-collapse class="pb-4 pt-5" v-model="visible">
-        <decay-information-decay :balance="balance" :decay="decay" />
+        <decay-information-decay :balance="balance" :decay="decay.decay" />
       </b-collapse>
     </div>
   </div>
diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
index bfc774f71..21a965803 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -19,7 +19,7 @@
               <link-count-row :count="transactionLinkCount" />
 
               <!-- Decay -->
-              <decay-row :decay="decay" />
+              <decay-row :decay="decay.decay" />
             </b-col>
           </b-row>
         </div>
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index bffd61eab..eade4a30c 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -22,7 +22,7 @@
             <date-row :date="balanceDate" />
 
             <!-- Decay -->
-            <decay-row :decay="decay" />
+            <decay-row :decay="decay.decay" />
           </b-col>
         </b-row>
       </div>
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index b7c6fefe6..8183a5734 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -22,7 +22,7 @@
             <date-row :date="balanceDate" />
 
             <!-- Decay -->
-            <decay-row :decay="decay" />
+            <decay-row :decay="decay.decay" />
           </b-col>
         </b-row>
       </div>