changed review

frontend/src/assets/scss/gradido.scss

@@ -52,7 +52,6 @@
 // Bootstrap-vue (2.21.1) scss
 @import "~bootstrap-vue/src/index";
 
-
 .alert-success {
   color: #155724;
   background-color: #d4edda;

frontend/src/components/ClipboardCopy.vue

@@ -18,7 +18,7 @@ export default {
   },
   data() {
     return {
-      url: `http://localhost/redeem/${this.code}`,
+      url: `${window.location.origin}/redeem/${this.code}`,
     }
   },
   methods: {

frontend/src/components/GddSend/TransactionConfirmation.vue

@@ -26,7 +26,7 @@
               <div class="m-1 mt-2">GDD</div>
             </b-input-group-prepend>
 
-            <div class="p-3">{{ $n(amount, 'decimal') }}</div>
+            <div class="p-3">{{ amount | GDD }}</div>
           </b-input-group>
 
           <br />
@@ -45,14 +45,14 @@
       <div class="alert-heading text-left h3">{{ $t('advanced-calculation') }}</div>
       <b-row class="pr-3">
         <b-col class="text-right">{{ $t('form.current_balance') }}</b-col>
-        <b-col class="text-right">{{ $n(balance, 'decimal') }}</b-col>
+        <b-col class="text-right">{{ balance | GDD }}</b-col>
       </b-row>
       <b-row class="pr-3">
         <b-col class="text-right">
           <strong>{{ $t('form.your_amount') }}</strong>
         </b-col>
         <b-col class="text-right">
-          <strong>- {{ $n(amount, 'decimal') }}</strong>
+          <strong>- {{ amount | GDD }}</strong>
         </b-col>
       </b-row>
       <b-row class="pr-3">
@@ -60,7 +60,7 @@
           <strong>Vergänglichkeit für 14 Tage</strong>
         </b-col>
         <b-col class="text-right borderbottom">
-          <strong>- {{ $n(amount * 0.028, 'decimal') }}</strong>
+          <strong>~ {{ $n(amount * 0.028, 'decimal') }}</strong>
         </b-col>
       </b-row>
       <b-row class="pr-3">
@@ -88,12 +88,12 @@
 export default {
   name: 'TransactionConfirmation',
   props: {
-    balance: { type: Number, default: 0, required: true },
-    email: { type: String, default: '', required: false },
-    amount: { type: Number, default: 0, required: true },
-    memo: { type: String, default: '', required: true },
-    loading: { type: Boolean, default: false, required: true },
-    selected: { type: String, default: 'send', required: true },
+    balance: { type: Number, required: true },
+    email: { type: String, required: false, default: '' },
+    amount: { type: Number, required: true },
+    memo: { type: String, required: true },
+    loading: { type: Boolean, required: true },
+    selected: { type: String, required: true },
   },
 }
 </script>

frontend/src/components/GddSend/TransactionForm.spec.js

@@ -69,7 +69,7 @@ describe('GddSend', () => {
         })
         describe('transaction form show because balance 100,0 GDD', () => {
           it('has no warning message ', () => {
-            expect(wrapper.find('.text-danger').exists()).toBeFalsy()
+            expect(wrapper.find('.errors').exists()).toBeFalsy()
           })
           it('has a reset button', () => {
             expect(wrapper.find('.test-buttons').findAll('button').at(0).attributes('type')).toBe(

frontend/src/locales/de.json

@@ -238,8 +238,7 @@
   },
   "transaction-link": {
     "button": "einlösen",
-    "send_you": "sendet dir",
-    "subtitle": "subtitle"
+    "send_you": "sendet dir"
   },
   "transactions": "Transaktionen",
   "whitepaper": "Whitepaper"

frontend/src/locales/en.json

@@ -238,8 +238,7 @@
   },
   "transaction-link": {
     "button": "redeem",
-    "send_you": "wants to send you",
-    "subtitle": "subtitle"
+    "send_you": "wants to send you"
   },
   "transactions": "Transactions",
   "whitepaper": "Whitepaper"

frontend/src/pages/ShowTransactionLinkInformations.spec.js

@@ -18,9 +18,6 @@ const createMockObject = (code) => {
       $i18n: {
         locale: () => 'en',
       },
-      $store: {
-        // commit: stateCommitMock,
-      },
       $apollo: {
         query: queryTransactionLink,
       },

frontend/src/pages/ShowTransactionLinkInformations.vue

@@ -5,7 +5,7 @@
       <b-container>
         <div class="header-body text-center mb-7">
           <p class="h1">
-            {{ username }}
+            {{ displaySetup.user.firstName }}
             {{ $t('transaction-link.send_you') }} {{ displaySetup.amount | GDD }}
           </p>
           <p class="h4">{{ displaySetup.memo }}</p>
@@ -51,11 +51,6 @@ export default {
         })
     },
   },
-  computed: {
-    username() {
-      return this.displaySetup.user.firstName + ' ' + this.displaySetup.user.lastName
-    },
-  },
   created() {
     this.setTransactionLinkInformation()
   },

frontend/src/routes/router.test.js

@@ -49,7 +49,7 @@ describe('router', () => {
         expect(routes.find((r) => r.path === '/').redirect()).toEqual({ path: '/login' })
       })
 
-      it('has sixteen routes defined', () => {
+      it('has seventeen routes defined', () => {
         expect(routes).toHaveLength(17)
       })