Merge pull request #773 from gradido/758-Decay-of-0

decay with the value 0 is no longer displayed

frontend/src/components/DecayInformation.vue

@@ -1,7 +1,12 @@
 <template>
   <div>
     <span v-if="decaytyp === 'short'">
-      {{ decay ? ' -' + decay.balance + ' ' + decayStartBlockTextShort : '' }}
+      <div v-if="decay.balance > 0">
+        {{ decay ? ' -' + decay.balance + ' ' + decayStartBlockTextShort : '' }}
+      </div>
+      <div v-else>
+        {{ $t('decay.noDecay') }}
+      </div>
     </span>
 
     <div v-if="decaytyp === 'new'">

frontend/src/locales/de.json

@@ -38,7 +38,8 @@
     "sent":"Gesendet",
     "created":"Geschöpft",
     "fromCommunity":"Aus der Gemeinschaft",
-    "toCommunity":"An die Gemeinschaft"
+    "toCommunity":"An die Gemeinschaft",
+    "noDecay": "Keine Vergänglichkeit"
   }, 
   "form": {
     "cancel": "Abbrechen",

frontend/src/locales/en.json

@@ -38,7 +38,8 @@
     "sent":"Sent",
     "created":"Created",
     "fromCommunity":"From the community",
-    "toCommunity":"To the community"
+    "toCommunity":"To the community",
+    "noDecay": "No Decay"
   },
   "form": {
     "cancel":"Cancel",

frontend/src/views/Pages/AccountOverview/GddTransactionList.vue

@@ -8,7 +8,11 @@
       >
         <div class="list-group-item gdd-transaction-list-item" v-b-toggle="'a' + date + ''">
           <!-- Collaps Button  -->
-          <div v-if="type != 'decay'" class="text-right" style="width: 95%; position: absolute">
+          <div
+            v-if="type != 'decay' && decay"
+            class="text-right"
+            style="width: 95%; position: absolute"
+          >
             <b-button class="btn-sm">
               <b>i</b>
             </b-button>
@@ -49,7 +53,7 @@
               </b-row>
 
               <!-- Decay -->
-              <b-row v-if="decay">
+              <b-row v-if="decay && !decay.decayStartBlock">
                 <div class="col-5 text-right">
                   <b-icon v-if="type != 'decay'" icon="droplet-half" height="15" class="mb-1" />
                 </div>
@@ -57,6 +61,14 @@
                   <decay-information v-if="decay" decaytyp="short" :decay="decay" />
                 </div>
               </b-row>
+              <b-row v-if="decay && decay.decayStartBlock">
+                <div class="col-5 text-right">
+                  <b-icon v-if="type != 'decay'" icon="droplet-half" height="15" class="mb-1" />
+                </div>
+                <div class="col-7 gdd-transaction-list-item-decay">
+                  <b>{{ $t('decay.Starting_block_decay') }}</b>
+                </div>
+              </b-row>
             </div>
           </b-row>