From e8a8daed5a7849f74d42c26fbb21cf98bedbaddb Mon Sep 17 00:00:00 2001
From: Sergio Betanzos <sbetanzos@opennebula.io>
Date: Thu, 18 Feb 2021 18:58:37 +0100
Subject: [PATCH] F #3951: Minor fixes (#842)

---
 src/fireedge/src/client/containers/Settings/index.js | 8 +++-----
 src/fireedge/src/client/hooks/useAuth.js             | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/fireedge/src/client/containers/Settings/index.js b/src/fireedge/src/client/containers/Settings/index.js
index 34208f70a8..ee43626147 100644
--- a/src/fireedge/src/client/containers/Settings/index.js
+++ b/src/fireedge/src/client/containers/Settings/index.js
@@ -79,12 +79,10 @@ const Settings = () => {
 
     const values = Object.entries(settings)
       .map(([key, value]) => `\n ${String(key).toUpperCase()} = "${value}"`)
+      .join(',')
 
-    console.log({values})
-
-    updateUser({
-      template: `FIREEDGE = [\n SCHEME = "${scheme}",\n LANG = "${lang}" ]\n`
-    }).then(() => context.changeLang(lang))
+    updateUser({ template: `FIREEDGE = [${values}]\n` })
+      .then(() => context.changeLang(settings.lang))
   }
 
   return (
diff --git a/src/fireedge/src/client/hooks/useAuth.js b/src/fireedge/src/client/hooks/useAuth.js
index d3267f428f..11c9105c48 100644
--- a/src/fireedge/src/client/hooks/useAuth.js
+++ b/src/fireedge/src/client/hooks/useAuth.js
@@ -15,7 +15,7 @@ import {
   logout as logoutRequest
 } from 'client/actions/user'
 import { setGroups } from 'client/actions/pool'
-import { updateScheme, enqueueError, enqueueSuccess } from 'client/actions/general'
+import { updateScheme, enqueueError, enqueueSuccess, closeSnackbar } from 'client/actions/general'
 
 const useAuth = () => {
   const {
@@ -46,6 +46,7 @@ const useAuth = () => {
         .then(data => {
           const { id, token } = data
           dispatch(successAuth())
+          dispatch(closeSnackbar())
 
           if (token) {
             storage(JWT_NAME, token, remember)