From 970592d00b016314150a09e255999f1a6b892991 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 3 Mar 2022 20:23:45 +0100
Subject: [PATCH] merge master, change tests, change operators

---
 .../DecayInformations/DecayInformation-Long.vue    |  2 +-
 .../Transactions/TransactionCreation.vue           |  3 ---
 .../components/Transactions/TransactionReceive.vue |  5 ++++-
 .../components/Transactions/TransactionSend.vue    |  2 +-
 .../AccountOverview/GddTransactionList.spec.js     | 14 +++++++-------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index d1f67485a..f48a498e2 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -78,7 +78,7 @@
       </b-col>
       <b-col cols="6">
         <div v-if="typeId === 'SEND'">
-          <b>{{ $n(Number(amount) - Number(decay.decay), 'decimal') }}</b>
+          <b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
         </div>
         <div v-if="typeId === 'RECEIVE'">
           <b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index bc83edc77..6a64772b5 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -1,9 +1,6 @@
 <template>
   <div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-creation">
     <div @click="visible = !visible">
-      {{ amount }}, {{ balance }}, {{ balanceDate }}, {{ decay }}, {{ id }}, {{ linkedUser }},
-      {{ memo }}
-
       <!-- Collaps Icon  -->
       <div class="text-right" style="width: 95%; position: absolute">
         <b-icon
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 36ce5ebc1..bbba2d54f 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -14,7 +14,10 @@
           <!-- ICON  -->
           <b-col cols="1">
             <div class="gdd-transaction-list-item-icon">
-              <b-icon icon="arrow-right-circle" class="text-success m-mb-1 font2em" />
+              <b-icon
+                icon="arrow-right-circle"
+                class="gradido-global-color-accent m-mb-1 font2em"
+              />
             </div>
           </b-col>
 
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index 922fd16e3..f9889ff97 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -23,7 +23,7 @@
             <b-row>
               <b-col cols="5">
                 <div class="text-right">
-                  <span class="gdd-transaction-list-item-operator">-</span>
+                  <span class="gdd-transaction-list-item-operator"></span>
                   <span class="gdd-transaction-list-item-amount">
                     {{ $n(amount, 'decimal') }}
                   </span>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
index 5c35ab14e..7d2a11840 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
@@ -238,11 +238,11 @@ describe('GddTransactionList', () => {
           expect(transaction.findAll('svg').at(1).classes()).toContain('text-danger')
         })
 
-        it('has a minus operator', () => {
-          expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
-            '-',
-          )
-        })
+        // it('has a minus operator', () => {
+        //   expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
+        //     '-',
+        //   )
+        // })
 
         it('shows the amount of transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
@@ -345,10 +345,10 @@ describe('GddTransactionList', () => {
           expect(transaction.findAll('svg').at(1).classes()).toContain('bi-arrow-right-circle')
         })
 
-        it('has text-success color', () => {
+        it('has gradido-global-color-accent color', () => {
           expect(transaction.findAll('svg').at(1).classes()).toEqual([
             'bi-arrow-right-circle',
-            'text-success',
+            'gradido-global-color-accent',
             'm-mb-1',
             'font2em',
             'b-icon',