From d728da1ef6f8bfd16f6b4f3e39464037cb3af482 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Dec 2022 11:31:39 +0100
Subject: [PATCH] memo in transaction lis

---
 frontend/src/components/GddSend/TransactionForm.vue          | 4 ++--
 frontend/src/components/Transactions/TransactionCreation.vue | 5 ++++-
 frontend/src/components/Transactions/TransactionReceive.vue  | 5 ++++-
 frontend/src/components/Transactions/TransactionSend.vue     | 5 ++++-
 frontend/src/pages/Send.vue                                  | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index be413c8d2..bc908e329 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -1,7 +1,7 @@
 <template>
   <b-row class="transaction-form">
-    <b-col xl="12" md="12" class="p-0">
-      <b-card class="p-0 m-0 appBoxShadow gradido-border-radius">
+    <b-col xl="12" md="12">
+      <b-card class="appBoxShadow gradido-border-radius">
         <validation-observer v-slot="{ handleSubmit }" ref="formValidator">
           <b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
             <b-form-radio-group v-model="radioSelected" class="container">
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 47cdbfa75..f35400d10 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -8,7 +8,6 @@
         <div class="font-weight-bold">{{ linkedUser.firstName }} {{ linkedUser.lastName }}</div>
         <span class="small">{{ this.$d(new Date(balanceDate), 'short') }}</span>
         <span class="ml-4 small">{{ this.$d(new Date(balanceDate), 'time') }}</span>
-        <div class="word-break">{{ memo }}</div>
       </b-col>
       <b-col cols="3">
         <div class="small">{{ $t('decay.types.receive') }}</div>
@@ -17,6 +16,10 @@
       <b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col>
     </b-row>
     <b-collapse class="pb-4 pt-5" v-model="visible">
+      <div class="word-break mb-4 text-center">
+        <div class="font-weight-bold pb-2">{{ $t('form.memo') }}</div>
+        {{ memo }}
+      </div>
       <decay-information :typeId="typeId" :decay="decay" :amount="amount" />
     </b-collapse>
   </div>
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 866ee2665..fcd5c5da9 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -22,7 +22,6 @@
         </div>
         <span class="small">{{ this.$d(new Date(balanceDate), 'short') }}</span>
         <span class="ml-4 small">{{ this.$d(new Date(balanceDate), 'time') }}</span>
-        <div class="word-break">{{ memo }}</div>
       </b-col>
       <b-col cols="3">
         <div class="small">
@@ -42,6 +41,10 @@
       <b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col>
     </b-row>
     <b-collapse class="pb-4 pt-5" v-model="visible">
+      <div class="word-break mb-4 text-center">
+        <div class="font-weight-bold pb-2">{{ $t('form.memo') }}</div>
+        {{ memo }}
+      </div>
       <decay-information :typeId="typeId" :decay="decay" :amount="amount" />
     </b-collapse>
   </div>
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index e3f1c3238..62061080a 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -21,7 +21,6 @@
         </div>
         <span class="small">{{ this.$d(new Date(balanceDate), 'short') }}</span>
         <span class="ml-4 small">{{ this.$d(new Date(balanceDate), 'time') }}</span>
-        <div class="word-break">{{ memo }}</div>
       </b-col>
       <b-col cols="3">
         <div class="small">
@@ -41,6 +40,10 @@
       <b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col>
     </b-row>
     <b-collapse class="pb-4 pt-5" v-model="visible">
+      <div class="word-break mb-4 text-center">
+        <div class="font-weight-bold pb-2">{{ $t('form.memo') }}</div>
+        {{ memo }}
+      </div>
       <decay-information :typeId="typeId" :decay="decay" :amount="amount" :memo="memo" />
     </b-collapse>
   </div>
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index d8ced37de..7131a7247 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <gdd-send :currentTransactionStep="currentTransactionStep" class="p-3 mt--3">
+    <gdd-send :currentTransactionStep="currentTransactionStep" class="pt-3 mt--3">
       <template #transactionForm>
         <transaction-form
           v-bind="transactionData"