From 3592393609908b83556503d15973208951d683e6 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 15:10:00 +0200
Subject: [PATCH] merge master, languange-switch test

---
 frontend/src/components/LanguageSwitch.vue            | 2 +-
 frontend/src/components/SidebarPlugin/SideBar.spec.js | 6 ++++++
 frontend/src/views/Layout/DashboardLayout_gdd.spec.js | 4 ----
 frontend/src/views/Layout/DashboardLayout_gdd.vue     | 1 -
 frontend/src/views/Pages/AccountOverview.vue          | 8 +++++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/LanguageSwitch.vue b/frontend/src/components/LanguageSwitch.vue
index 35dc63abf..0fad036a6 100644
--- a/frontend/src/components/LanguageSwitch.vue
+++ b/frontend/src/components/LanguageSwitch.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="language-switch">
     <b-dropdown size="sm" :text="$t('language') + ' - ' + $i18n.locale">
       <b-dropdown-item @click.prevent="setLocale('de')">Deutsch</b-dropdown-item>
       <b-dropdown-item @click.prevent="setLocale('en')">English</b-dropdown-item>
diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index cc56b00f1..36230849f 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -112,6 +112,12 @@ describe('SideBar', () => {
           expect(wrapper.emitted('logout')).toEqual([[]])
         })
       })
+
+      describe('language-switch', () => {
+        it('has a language-switch button', () => {
+          expect(wrapper.find('div.language-switch').exists()).toBeTruthy()
+        })
+      })
     })
   })
 })
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index 79e85b49f..8c1e604c0 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -59,10 +59,6 @@ describe('DashboardLayoutGdd', () => {
       expect(wrapper.find('nav#sidenav-main').exists()).toBeTruthy()
     })
 
-    it('has a notifications component', () => {
-      expect(wrapper.find('div.notifications').exists()).toBeTruthy()
-    })
-
     it('has a main content div', () => {
       expect(wrapper.find('div.main-content').exists()).toBeTruthy()
     })
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 72ddb9b57..575f8a861 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="wrapper">
-    <notifications></notifications>
     <side-bar @logout="logout" :balance="balance" :pending="pending">
       <template slot="links">
         <sidebar-item
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 97845818b..3a8789ac3 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -2,13 +2,15 @@
   <div>
     <base-header class="pb-lg-4 pt-lg-2 bg-transparent"></base-header>
     <b-container fluid class="p-lg-2 mt-lg-5">
-      <gdd-status v-if="showTransactionList" :balance="balance" :gdt-balance="GdtBalance" />
-      <br />
-      <gdd-send
+      <gdd-status
+        v-if="showContext"
+        :pending="pending"
         :balance="balance"
         :gdt-balance="GdtBalance"
       />
       <br />
+      <gdd-send :balance="balance" :gdt-balance="GdtBalance" />
+      <br />
       <gdd-send :currentTransactionStep="currentTransactionStep">
         <template #transaction-form>
           <transaction-form :balance="balance" @set-transaction="setTransaction"></transaction-form>