From 040f9f89344b62915cd30e9f6ac69b595ba288b5 Mon Sep 17 00:00:00 2001
From: Edgar097 <edgar.parra@eoscostarica.io>
Date: Thu, 24 Jun 2021 11:18:38 -0600
Subject: [PATCH 1/5] fix(routes)

---
 makefile                                            |  2 ++
 webapp/src/routes/OffersApproval/OffersApproval.js  | 12 +++++++++---
 .../src/routes/OffersManagement/OffersManagement.js | 13 +++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/makefile b/makefile
index 1182c976..f4310311 100644
--- a/makefile
+++ b/makefile
@@ -10,6 +10,8 @@ run:
 	make -j 3 run-hapi run-hasura run-webapp
 
 run-env:
+	@fuser -k 3000/tcp
+	@fuser -k 9695/tcp
 	@[ -f .env ] && source .env || echo "$(YELLOW)WARNING:$(RESET) .env file not found"
 
 run-postgres:
diff --git a/webapp/src/routes/OffersApproval/OffersApproval.js b/webapp/src/routes/OffersApproval/OffersApproval.js
index d78f3151..970ddc6d 100644
--- a/webapp/src/routes/OffersApproval/OffersApproval.js
+++ b/webapp/src/routes/OffersApproval/OffersApproval.js
@@ -10,6 +10,7 @@ import MenuItem from '@material-ui/core/MenuItem'
 import FormControl from '@material-ui/core/FormControl'
 import Select from '@material-ui/core/Select'
 import SnackbarContent from '@material-ui/core/SnackbarContent'
+import { useHistory } from 'react-router-dom'
 
 import ShowOffersAproval from '../../components/ShowElements/ShowOffersAproval'
 import {
@@ -27,7 +28,11 @@ const OffersApproval = () => {
   const [loadingOffers, setLoadingOffers] = useState(true)
   const [offers, setOffers] = useState([])
   const [currentUser] = useUser()
-  const [account] = useState(currentUser.account)
+  const history = useHistory()
+  const [account] = useState(
+     currentUser ? currentUser.account :
+     () => {history.replace('/')}
+    )
   const [discountOffers, setDiscountOffers] = useState([])
   const [freeOffers, setFreetOffers] = useState([])
   const [badgeOffers, setBadgeOffers] = useState([])
@@ -92,8 +97,9 @@ const OffersApproval = () => {
   }, [allOffers])
 
   useEffect(() => {
-    getInfo()
-    getOffers()
+    if(account){
+      getOffers()
+    }
   }, [])
 
   useEffect(() => {
diff --git a/webapp/src/routes/OffersManagement/OffersManagement.js b/webapp/src/routes/OffersManagement/OffersManagement.js
index 89404b1b..3f08bf34 100644
--- a/webapp/src/routes/OffersManagement/OffersManagement.js
+++ b/webapp/src/routes/OffersManagement/OffersManagement.js
@@ -19,6 +19,7 @@ import CircularProgress from '@material-ui/core/CircularProgress'
 import * as m from 'moment-timezone'
 import moment from 'moment'
 import { useTranslation } from 'react-i18next'
+import { useHistory } from 'react-router-dom'
 
 import {
   GET_SPONSOR_OFFERS_QUERY,
@@ -30,13 +31,13 @@ import {
 import OfferDetails from './OfferDetails'
 import GenericOfferFormComponent from './GenericOfferFormComponent'
 import styles from './styles'
-import { TextField } from '@material-ui/core'
 
 const useStyles = makeStyles(styles)
 
 const OffersManagement = () => {
   const { t } = useTranslation('translations')
   const classes = useStyles()
+  const history = useHistory()
   const [offers, setOffers] = useState(undefined)
   const [profileIDLoaded, setProfileIDLoaded] = useState(false)
   const [offersLoaded, setOffersLoaded] = useState(false)
@@ -113,7 +114,7 @@ const OffersManagement = () => {
   }
   const [
     loadProfileID,
-    { data: { profile: { profile } = {} } = {} }
+    {error: profileError ,data: { profile: { profile } = {} } = {} }
   ] = useLazyQuery(PROFILE_ID_QUERY, { fetchPolicy: 'network-only' })
 
   const [
@@ -216,6 +217,10 @@ const OffersManagement = () => {
     setOpenSnackbar({ ...openSnackbar, show: false })
   }
 
+  const errorManager = () => {
+    history.replace('/')
+  }
+
   const getGenericOfferComponent = (editing, data) => {
     return (
       <GenericOfferFormComponent
@@ -249,6 +254,10 @@ const OffersManagement = () => {
     loadProfileID()
   }, [loadProfileID])
 
+  useEffect(() => {
+    if(profileError) errorManager()
+  }, [profileError])
+
   useEffect(() => {
     if (profile) setProfileIDLoaded(true)
   }, [profile])

From 786b5782a0aa6eec77c23dcd232e5b28bd54a86d Mon Sep 17 00:00:00 2001
From: Edgar097 <edgar.parra@eoscostarica.io>
Date: Thu, 24 Jun 2021 11:51:28 -0600
Subject: [PATCH 2/5] fix(routes): automatic home route

---
 makefile                                      |  2 --
 .../NotificationStructure.js                  |  6 ++---
 webapp/src/routes/EditProfile/EditProfile.js  |  3 ++-
 .../HistoryDashboard/HistoryDashboard.js      | 23 +++++++++++--------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/makefile b/makefile
index f4310311..1182c976 100644
--- a/makefile
+++ b/makefile
@@ -10,8 +10,6 @@ run:
 	make -j 3 run-hapi run-hasura run-webapp
 
 run-env:
-	@fuser -k 3000/tcp
-	@fuser -k 9695/tcp
 	@[ -f .env ] && source .env || echo "$(YELLOW)WARNING:$(RESET) .env file not found"
 
 run-postgres:
diff --git a/webapp/src/components/NotificationStructure/NotificationStructure.js b/webapp/src/components/NotificationStructure/NotificationStructure.js
index 9455c800..20b19870 100644
--- a/webapp/src/components/NotificationStructure/NotificationStructure.js
+++ b/webapp/src/components/NotificationStructure/NotificationStructure.js
@@ -49,14 +49,14 @@ const NotificationStructure = ({ id, title, description, state, dateAndTime }) =
   return (
     <>
       <Button className={classes.wrapper} onMouseOver={changeNotificationState}>
-        <Grid container xs={3}>
+        <Grid container>
           <Grid item xs={12}>
             {state === true && (
               <NewNotificationIcon className={classes.iconOption} />
             )}
           </Grid>
         </Grid>
-        <Grid container xs={11}>
+        <Grid container>
           <Grid item xs={12}>
             <Typography className={classes.title}>
               {title}
@@ -68,7 +68,7 @@ const NotificationStructure = ({ id, title, description, state, dateAndTime }) =
             </Typography>
           </Grid>
         </Grid>
-        <Grid container xs={6}>
+        <Grid container>
           <Grid item xs={12}>
             <Typography className={classes.labelOption}>
               {dateAndTime.substring(11, 19)}
diff --git a/webapp/src/routes/EditProfile/EditProfile.js b/webapp/src/routes/EditProfile/EditProfile.js
index 90e10108..b64a3964 100644
--- a/webapp/src/routes/EditProfile/EditProfile.js
+++ b/webapp/src/routes/EditProfile/EditProfile.js
@@ -95,7 +95,8 @@ const EditProfilePage = () => {
   }
   useEffect(() => {
     if (!currentUser) {
-      return
+      history.replace('/')
+      return 
     }
 
     loadProfile()
diff --git a/webapp/src/routes/HistoryDashboard/HistoryDashboard.js b/webapp/src/routes/HistoryDashboard/HistoryDashboard.js
index 39ed42db..e0ee5366 100644
--- a/webapp/src/routes/HistoryDashboard/HistoryDashboard.js
+++ b/webapp/src/routes/HistoryDashboard/HistoryDashboard.js
@@ -8,8 +8,9 @@ import FormControl from '@material-ui/core/FormControl'
 import Select from '@material-ui/core/Select'
 import InputLabel from '@material-ui/core/InputLabel'
 import Typography from '@material-ui/core/Typography'
+import { useHistory } from 'react-router-dom'
 
-import { GET_REPORT_QUERY, PROFILE_QUERY } from '../../gql'
+import { GET_REPORT_QUERY } from '../../gql'
 
 import { useUser } from '../../context/user.context'
 import styles from './styles'
@@ -23,25 +24,23 @@ const HistoryDashboard = (user) => {
   const [bodyReceive, setBodyReceive] = useState()
   const [bodySent, setBodySent] = useState()
   const [currentUser] = useUser()
+  const history = useHistory()
   const [optionSR, setOption] = useState('sent')
-
   const options = [
     { value: 'sent', label: t('historyDashboard.tableTitleSent') },
     { value: 'received', label: t('historyDashboard.tableTitleReceived') }
   ]
 
-  const [
-    loadProfile,
-    { error: errroLoadProfile, data: { profile: { profile } = {} } = {}, client }
-  ] = useLazyQuery(PROFILE_QUERY, { fetchPolicy: 'network-only' })
+  const manageError = () => {
+    history.replace('/')
+  }
 
   const [
     getReportQuery,
-    { errorReport, data: { get_report: getReportResult } = {} }
+    { error: errorReport, data: { get_report: getReportResult } = {} }
   ] = useLazyQuery(GET_REPORT_QUERY, { fetchPolicy: 'network-only' })
 
   useEffect(() => {
-
     if (!getReportResult) {
       getReportQuery()
     } else {
@@ -52,6 +51,10 @@ const HistoryDashboard = (user) => {
 
   }, [getReportResult])
 
+  useEffect( () => {
+    if(errorReport) manageError()
+  },[errorReport])
+
   const formatDataToReport = () => {
     const sent = getReportResult.notifications.sent
     const received = getReportResult.notifications.received
@@ -67,8 +70,8 @@ const HistoryDashboard = (user) => {
   }
 
   const handleChange = (event) => {
-    setOption(event.target.value);
-  };
+    setOption(event.target.value)
+  }
 
   return (
     <>

From 9a33a2effd3e642e7bcf3983d02a54473fc43d4e Mon Sep 17 00:00:00 2001
From: Edgar097 <edgar.parra@eoscostarica.io>
Date: Tue, 29 Jun 2021 11:53:03 -0600
Subject: [PATCH 3/5] feat(show modal): login modal

---
 webapp/src/components/LoginModal/Login.js     | 37 +++++++++++--------
 webapp/src/routes/EditProfile/EditProfile.js  |  3 +-
 .../HistoryDashboard/HistoryDashboard.js      | 14 ++-----
 .../routes/OffersApproval/OffersApproval.js   | 23 ++++++++----
 .../OffersManagement/OffersManagement.js      | 12 +++---
 webapp/src/routes/Profile/ProfilePage.js      |  3 +-
 webapp/src/routes/Profile/ProfilePageGuest.js |  2 +-
 7 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/webapp/src/components/LoginModal/Login.js b/webapp/src/components/LoginModal/Login.js
index 1f06c42a..fb26c125 100644
--- a/webapp/src/components/LoginModal/Login.js
+++ b/webapp/src/components/LoginModal/Login.js
@@ -41,7 +41,7 @@ import styles from './styles'
 
 const useStyles = makeStyles(styles)
 
-const LoginModal = ({ isNavBar, isSideBar }) => {
+const LoginModal = ({ isNavBar, isSideBar, isOutside }) => {
   const { t } = useTranslation('translations')
   const history = useHistory()
   const [user, setUser] = useState({})
@@ -49,7 +49,7 @@ const LoginModal = ({ isNavBar, isSideBar }) => {
   const classes = useStyles()
   const [activeStep, setActiveStep] = useState(0)
   const theme = useTheme()
-  const [open, setOpen] = useState(false)
+  const [open, setOpen] = useState(isOutside ? true : false)
   const [currentUser, { login }] = useUser()
 
 
@@ -120,8 +120,10 @@ const LoginModal = ({ isNavBar, isSideBar }) => {
   })
 
   const handleOpen = () => {
-    setOpen(!open)
-    setActiveStep(0)
+    if(!isOutside){
+      setOpen(!open)
+      setActiveStep(0)
+    }
   }
 
   const handleOpenCredentialsRecovery = () => {
@@ -147,6 +149,7 @@ const LoginModal = ({ isNavBar, isSideBar }) => {
         password: user.secret
       }
     })
+    if(isOutside) window.location.reload(); 
   }
 
   const handleLoginWithAuth = async (status, email, secret) => {
@@ -273,16 +276,18 @@ const LoginModal = ({ isNavBar, isSideBar }) => {
       >
         {activeStep === 0 && (
           <DialogContent className={classes.dimensions} >
-            <Box className={classes.closeIcon}>
-              <IconButton
-                aria-label="close"
-                color="inherit"
-                size="small"
-                onClick={handleOpen}
-              >
-                <CloseIcon fontSize="inherit" />
-              </IconButton>
-            </Box>
+            {!isOutside &&
+              <Box className={classes.closeIcon}>
+                <IconButton
+                  aria-label="close"
+                  color="inherit"
+                  size="small"
+                  onClick={handleOpen}
+                >
+                  <CloseIcon fontSize="inherit" />
+                </IconButton>
+              </Box>
+            }
             <Box>
               <Typography className={classes.title}>
                 {t('login.letsStarted')}
@@ -405,11 +410,13 @@ const LoginModal = ({ isNavBar, isSideBar }) => {
 LoginModal.propTypes = {
   isNavBar: PropTypes.bool,
   isSideBar: PropTypes.bool,
+  isOutside: PropTypes.bool
 }
 
 LoginModal.defaultProps = {
   isNavBar: false,
-  isSideBar: false
+  isSideBar: false,
+  isOutside: false
 }
 
 export default memo(LoginModal)
\ No newline at end of file
diff --git a/webapp/src/routes/EditProfile/EditProfile.js b/webapp/src/routes/EditProfile/EditProfile.js
index b64a3964..c0f7e1bc 100644
--- a/webapp/src/routes/EditProfile/EditProfile.js
+++ b/webapp/src/routes/EditProfile/EditProfile.js
@@ -20,6 +20,7 @@ import {
   SET_USERNAME
 } from '../../gql'
 import { useUser } from '../../context/user.context'
+import LoginModal from '../../components/LoginModal'
 import styles from './styles'
 
 const useStyles = makeStyles(styles)
@@ -95,7 +96,6 @@ const EditProfilePage = () => {
   }
   useEffect(() => {
     if (!currentUser) {
-      history.replace('/')
       return 
     }
 
@@ -153,6 +153,7 @@ const EditProfilePage = () => {
 
   return (
     <>
+      {!profile && (<LoginModal isOutside />)}
       {isDesktop && (
         <Box className={classes.wrapper}>
           {loading && <CircularProgress />}
diff --git a/webapp/src/routes/HistoryDashboard/HistoryDashboard.js b/webapp/src/routes/HistoryDashboard/HistoryDashboard.js
index e0ee5366..964243dd 100644
--- a/webapp/src/routes/HistoryDashboard/HistoryDashboard.js
+++ b/webapp/src/routes/HistoryDashboard/HistoryDashboard.js
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { makeStyles, useTheme } from '@material-ui/styles'
+import { makeStyles } from '@material-ui/styles'
 import { useTranslation } from 'react-i18next'
 import { useLazyQuery } from '@apollo/react-hooks'
 import MUIDataTable from 'mui-datatables'
@@ -8,11 +8,11 @@ import FormControl from '@material-ui/core/FormControl'
 import Select from '@material-ui/core/Select'
 import InputLabel from '@material-ui/core/InputLabel'
 import Typography from '@material-ui/core/Typography'
-import { useHistory } from 'react-router-dom'
 
 import { GET_REPORT_QUERY } from '../../gql'
 
 import { useUser } from '../../context/user.context'
+import LoginModal from '../../components/LoginModal'
 import styles from './styles'
 import { Box } from '@material-ui/core'
 
@@ -24,17 +24,12 @@ const HistoryDashboard = (user) => {
   const [bodyReceive, setBodyReceive] = useState()
   const [bodySent, setBodySent] = useState()
   const [currentUser] = useUser()
-  const history = useHistory()
   const [optionSR, setOption] = useState('sent')
   const options = [
     { value: 'sent', label: t('historyDashboard.tableTitleSent') },
     { value: 'received', label: t('historyDashboard.tableTitleReceived') }
   ]
 
-  const manageError = () => {
-    history.replace('/')
-  }
-
   const [
     getReportQuery,
     { error: errorReport, data: { get_report: getReportResult } = {} }
@@ -51,10 +46,6 @@ const HistoryDashboard = (user) => {
 
   }, [getReportResult])
 
-  useEffect( () => {
-    if(errorReport) manageError()
-  },[errorReport])
-
   const formatDataToReport = () => {
     const sent = getReportResult.notifications.sent
     const received = getReportResult.notifications.received
@@ -75,6 +66,7 @@ const HistoryDashboard = (user) => {
 
   return (
     <>
+      {errorReport && (<LoginModal isOutside />)}
       <Box className={classes.root} >
         <Typography className={classes.title} >{t('historyDashboard.title')}</Typography>
         <Box className={classes.boxSelect}>
diff --git a/webapp/src/routes/OffersApproval/OffersApproval.js b/webapp/src/routes/OffersApproval/OffersApproval.js
index 970ddc6d..af3c10c8 100644
--- a/webapp/src/routes/OffersApproval/OffersApproval.js
+++ b/webapp/src/routes/OffersApproval/OffersApproval.js
@@ -12,12 +12,14 @@ import Select from '@material-ui/core/Select'
 import SnackbarContent from '@material-ui/core/SnackbarContent'
 import { useHistory } from 'react-router-dom'
 
-import ShowOffersAproval from '../../components/ShowElements/ShowOffersAproval'
 import {
   GET_ALL_OFFERS_QUERY,
   GET_INFO
 } from '../../gql'
+
 import { useUser } from '../../context/user.context'
+import LoginModal from '../../components/LoginModal'
+import ShowOffersAproval from '../../components/ShowElements/ShowOffersAproval'
 import styles from './styles'
 
 const useStyles = makeStyles(styles)
@@ -30,8 +32,7 @@ const OffersApproval = () => {
   const [currentUser] = useUser()
   const history = useHistory()
   const [account] = useState(
-     currentUser ? currentUser.account :
-     () => {history.replace('/')}
+     currentUser ? currentUser.account : false
     )
   const [discountOffers, setDiscountOffers] = useState([])
   const [freeOffers, setFreetOffers] = useState([])
@@ -41,7 +42,6 @@ const OffersApproval = () => {
   const [categories, setCategories] = useState([])
   const [category, setCategory] = useState('')
 
-
   const CategoryX = [
     { value: 'all', label: t('categories.all') },
     { value: 'discount', label: t('categories.discount') },
@@ -52,9 +52,11 @@ const OffersApproval = () => {
   ]
 
   const getOffers = async () => {
-    setLoadingOffers(true)
-    await getAllOffers()
-    await getInfo()
+    if(account && currentUser.role === 'lifebank'){
+      setLoadingOffers(true)
+      await getAllOffers()
+      await getInfo()
+    }
   }
 
   const handleChange = (event) => {
@@ -102,6 +104,12 @@ const OffersApproval = () => {
     }
   }, [])
 
+  useEffect(() => {
+    if(currentUser && !(currentUser.role === 'lifebank')){
+      history.replace('/')
+    }
+  },[allOffers,info])
+
   useEffect(() => {
     const discountOff = []
     const freeProductOff = []
@@ -139,6 +147,7 @@ const OffersApproval = () => {
 
   return (
     <>
+      {!currentUser && (<LoginModal isOutside />)}
       <Grid
         container
         direction="row"
diff --git a/webapp/src/routes/OffersManagement/OffersManagement.js b/webapp/src/routes/OffersManagement/OffersManagement.js
index 3f08bf34..cfbbdac1 100644
--- a/webapp/src/routes/OffersManagement/OffersManagement.js
+++ b/webapp/src/routes/OffersManagement/OffersManagement.js
@@ -30,6 +30,7 @@ import {
 
 import OfferDetails from './OfferDetails'
 import GenericOfferFormComponent from './GenericOfferFormComponent'
+import LoginModal from '../../components/LoginModal'
 import styles from './styles'
 
 const useStyles = makeStyles(styles)
@@ -217,10 +218,6 @@ const OffersManagement = () => {
     setOpenSnackbar({ ...openSnackbar, show: false })
   }
 
-  const errorManager = () => {
-    history.replace('/')
-  }
-
   const getGenericOfferComponent = (editing, data) => {
     return (
       <GenericOfferFormComponent
@@ -255,8 +252,10 @@ const OffersManagement = () => {
   }, [loadProfileID])
 
   useEffect(() => {
-    if(profileError) errorManager()
-  }, [profileError])
+    if(profile && !(profile.role === 'sponsor')){
+      history.replace('/')
+    }
+  },[profile])
 
   useEffect(() => {
     if (profile) setProfileIDLoaded(true)
@@ -409,6 +408,7 @@ const OffersManagement = () => {
           </Button>
         </DialogActions>
       </Dialog>
+      {profileError && (<LoginModal isOutside />)}
       <Snackbar
         open={openSnackbar.show}
         autoHideDuration={2000}
diff --git a/webapp/src/routes/Profile/ProfilePage.js b/webapp/src/routes/Profile/ProfilePage.js
index 15abb41b..27be3685 100644
--- a/webapp/src/routes/Profile/ProfilePage.js
+++ b/webapp/src/routes/Profile/ProfilePage.js
@@ -14,6 +14,7 @@ import {
   REVOKE_CONSENT_MUTATION
 } from '../../gql'
 import { useUser } from '../../context/user.context'
+import LoginModal from '../../components/LoginModal'
 import styles from './styles'
 
 const useStyles = makeStyles(styles)
@@ -65,7 +66,6 @@ const ProfilePage = () => {
   useEffect(() => {
     if (!currentUser) {
       client && client.resetStore()
-      history.replace('/')
 
       return
     }
@@ -149,6 +149,7 @@ const ProfilePage = () => {
 
   return (
     <Box className={classes.contentBody}>
+      {!profile && (<LoginModal isOutside />)} 
       <Snackbar open={openAlert} autoHideDuration={6000} onClose={handleOpenAlert}>
         <Alert onClose={handleOpenAlert} severity={severity}>
           {messegaAlert}
diff --git a/webapp/src/routes/Profile/ProfilePageGuest.js b/webapp/src/routes/Profile/ProfilePageGuest.js
index d9c4510c..8909e2e1 100644
--- a/webapp/src/routes/Profile/ProfilePageGuest.js
+++ b/webapp/src/routes/Profile/ProfilePageGuest.js
@@ -15,7 +15,7 @@ const ProfilePageGuest = () => {
   return (
     <>
       <Box className={classes.rowBox}>
-        <Typography variant="subtitle1">{t('common.name')}</Typography>
+        <Typography variant="subtitle1">{t('profile.profile')}</Typography>
         <Typography variant="body1">{t('profile.guest')}</Typography>
       </Box>
       <Divider className={classes.divider} />

From ec63964008142ba2d48290e86b9e864cac39d9c0 Mon Sep 17 00:00:00 2001
From: Edgar097 <edgar.parra@eoscostarica.io>
Date: Wed, 30 Jun 2021 14:29:18 -0600
Subject: [PATCH 4/5] fix(login): not allowing to log in

---
 makefile                                               | 2 ++
 webapp/src/components/LoginModal/Login.js              | 2 +-
 webapp/src/routes/EditProfile/EditProfile.js           | 4 ++--
 webapp/src/routes/HistoryDashboard/HistoryDashboard.js | 2 +-
 webapp/src/routes/OffersManagement/OffersManagement.js | 6 ++++--
 webapp/src/routes/Profile/ProfilePage.js               | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/makefile b/makefile
index 1182c976..f4310311 100644
--- a/makefile
+++ b/makefile
@@ -10,6 +10,8 @@ run:
 	make -j 3 run-hapi run-hasura run-webapp
 
 run-env:
+	@fuser -k 3000/tcp
+	@fuser -k 9695/tcp
 	@[ -f .env ] && source .env || echo "$(YELLOW)WARNING:$(RESET) .env file not found"
 
 run-postgres:
diff --git a/webapp/src/components/LoginModal/Login.js b/webapp/src/components/LoginModal/Login.js
index c0d50496..b0386ad8 100644
--- a/webapp/src/components/LoginModal/Login.js
+++ b/webapp/src/components/LoginModal/Login.js
@@ -133,7 +133,6 @@ const LoginModal = ({ isNavBar, isSideBar, isOutside }) => {
         password: user.secret
       }
     })
-    if(isOutside) window.location.reload(); 
   }
 
   const handleLoginWithAuth = async (status, email, secret) => {
@@ -180,6 +179,7 @@ const LoginModal = ({ isNavBar, isSideBar, isOutside }) => {
     if (loginResult) {
       login(loginResult.token)
       setOpen(false)
+      if(isOutside) window.location.reload(); 
     }
   }, [loginResult])
 
diff --git a/webapp/src/routes/EditProfile/EditProfile.js b/webapp/src/routes/EditProfile/EditProfile.js
index c0f7e1bc..6df7e615 100644
--- a/webapp/src/routes/EditProfile/EditProfile.js
+++ b/webapp/src/routes/EditProfile/EditProfile.js
@@ -46,7 +46,7 @@ const EditProfilePage = () => {
     loadProfile,
     { error: errorProfile, loading, data: { profile: { profile } = {} } = {} }
   ] = useLazyQuery(PROFILE_QUERY, { fetchPolicy: 'network-only' })
- 
+  console.log(currentUser)
   const [
     revokeConsent,
     {
@@ -153,7 +153,7 @@ const EditProfilePage = () => {
 
   return (
     <>
-      {!profile && (<LoginModal isOutside />)}
+      {!currentUser && (<LoginModal isOutside />)}
       {isDesktop && (
         <Box className={classes.wrapper}>
           {loading && <CircularProgress />}
diff --git a/webapp/src/routes/HistoryDashboard/HistoryDashboard.js b/webapp/src/routes/HistoryDashboard/HistoryDashboard.js
index a6585de8..ddd06243 100644
--- a/webapp/src/routes/HistoryDashboard/HistoryDashboard.js
+++ b/webapp/src/routes/HistoryDashboard/HistoryDashboard.js
@@ -66,7 +66,7 @@ const HistoryDashboard = (user) => {
 
   return (
     <>
-      {errorReport && (<LoginModal isOutside />)}
+      {!currentUser && (<LoginModal isOutside />)}
       <Box className={classes.root} >
         <Typography className={classes.title} >{t('historyDashboard.title')}</Typography>
         <Box className={classes.boxSelect}>
diff --git a/webapp/src/routes/OffersManagement/OffersManagement.js b/webapp/src/routes/OffersManagement/OffersManagement.js
index cfbbdac1..b4ff03f2 100644
--- a/webapp/src/routes/OffersManagement/OffersManagement.js
+++ b/webapp/src/routes/OffersManagement/OffersManagement.js
@@ -31,6 +31,7 @@ import {
 import OfferDetails from './OfferDetails'
 import GenericOfferFormComponent from './GenericOfferFormComponent'
 import LoginModal from '../../components/LoginModal'
+import { useUser } from '../../context/user.context'
 import styles from './styles'
 
 const useStyles = makeStyles(styles)
@@ -39,6 +40,7 @@ const OffersManagement = () => {
   const { t } = useTranslation('translations')
   const classes = useStyles()
   const history = useHistory()
+  const [currentUser] = useUser()
   const [offers, setOffers] = useState(undefined)
   const [profileIDLoaded, setProfileIDLoaded] = useState(false)
   const [offersLoaded, setOffersLoaded] = useState(false)
@@ -115,7 +117,7 @@ const OffersManagement = () => {
   }
   const [
     loadProfileID,
-    {error: profileError ,data: { profile: { profile } = {} } = {} }
+    {data: { profile: { profile } = {} } = {} }
   ] = useLazyQuery(PROFILE_ID_QUERY, { fetchPolicy: 'network-only' })
 
   const [
@@ -408,7 +410,7 @@ const OffersManagement = () => {
           </Button>
         </DialogActions>
       </Dialog>
-      {profileError && (<LoginModal isOutside />)}
+      {!currentUser && (<LoginModal isOutside />)}
       <Snackbar
         open={openSnackbar.show}
         autoHideDuration={2000}
diff --git a/webapp/src/routes/Profile/ProfilePage.js b/webapp/src/routes/Profile/ProfilePage.js
index 27be3685..00faa2cb 100644
--- a/webapp/src/routes/Profile/ProfilePage.js
+++ b/webapp/src/routes/Profile/ProfilePage.js
@@ -149,7 +149,7 @@ const ProfilePage = () => {
 
   return (
     <Box className={classes.contentBody}>
-      {!profile && (<LoginModal isOutside />)} 
+      {!currentUser && (<LoginModal isOutside />)} 
       <Snackbar open={openAlert} autoHideDuration={6000} onClose={handleOpenAlert}>
         <Alert onClose={handleOpenAlert} severity={severity}>
           {messegaAlert}

From 97d1ae2cf8ac495fb12d7165837d5c310f22883a Mon Sep 17 00:00:00 2001
From: Edgar097 <edgar.parra@eoscostarica.io>
Date: Wed, 30 Jun 2021 14:30:02 -0600
Subject: [PATCH 5/5] makefile

---
 makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/makefile b/makefile
index f4310311..1182c976 100644
--- a/makefile
+++ b/makefile
@@ -10,8 +10,6 @@ run:
 	make -j 3 run-hapi run-hasura run-webapp
 
 run-env:
-	@fuser -k 3000/tcp
-	@fuser -k 9695/tcp
 	@[ -f .env ] && source .env || echo "$(YELLOW)WARNING:$(RESET) .env file not found"
 
 run-postgres: