fix: barber receiving unapproved message

src/components/DropdownMenu/index.tsx

@@ -10,7 +10,7 @@ import { useDropdown } from 'hooks/useDropdown';
 import styles from './DropdownMenu.module.scss';
 
 export function DropdownMenu() {
-  const { user, isAlexander, isBarbeiro, isBarbeiroApproved } = useAuth();
+  const { user, isAlexander, isBarbeiro } = useAuth();
   const { activeMenu, dropdownRef, calcHeight, menuHeight, photo } = useDropdown();
 
   return (
@@ -40,7 +40,7 @@ export function DropdownMenu() {
           </DropdownItem>
 
           {isAlexander && <DropdownItem link="/admin">Painel Admin</DropdownItem>}
-          {isBarbeiro && isBarbeiroApproved && <DropdownItem link="/horarios">Atualizar horários</DropdownItem>}
+          {isBarbeiro && <DropdownItem link="/horarios">Atualizar horários</DropdownItem>}
 
           <DropdownItem logout>Sair</DropdownItem>
         </div>

src/contexts/Auth.tsx

@@ -6,7 +6,6 @@ import { useFormik } from 'formik';
 import { AuthContextProps } from 'types/IContext';
 import { loginSchema } from 'validations/Login';
 
-import { getBarbeiro } from 'services/get/barbeiros';
 import { getPhoto } from 'services/get/photo';
 import { getUser } from 'services/get/user';
 import { signIn } from 'services/post/signIn';
@@ -20,7 +19,6 @@ export function AuthProvider({ children }: any) {
   const [user, setUser] = useState<any>();
   const [ocupacao, setOcupacao] = useState('cliente');
   const [loading, setLoading] = useState(false);
-  const [approved, setApproved] = useState('');
 
   function isSigned() {
     const storagedUser = localStorage.getItem('supabase.auth.token');
@@ -56,14 +54,6 @@ export function AuthProvider({ children }: any) {
     return false;
   }
 
-  function isBarbeiroApproved() {
-    if (approved === '') {
-      return false;
-    }
-
-    return true;
-  }
-
   async function checkUser() {
     const hash = window.location.href.split('#')[0];
     const params = hash.split('/')[3];
@@ -116,30 +106,6 @@ export function AuthProvider({ children }: any) {
     }
   }
 
-  async function verificarStatusBarbeiro() {
-    const storagedUser = JSON.parse(localStorage.getItem('supabase.auth.token') || '{}');
-
-    const id = storagedUser?.currentSession?.user.id;
-
-    const { data, status, error } = await getBarbeiro(id, true);
-
-    if (error) {
-      switch (status) {
-        default:
-          return;
-      }
-    }
-
-    if (!data) return;
-    if (!data[0].j) return;
-
-    if (data[0].j === null) {
-      return;
-    }
-
-    setApproved(data[0].j[0].admin_confirmed);
-  }
-
   useEffect(() => {
     checkUser();
 
@@ -148,10 +114,6 @@ export function AuthProvider({ children }: any) {
     });
   }, []);
 
-  useEffect(() => {
-    verificarStatusBarbeiro();
-  }, []);
-
   const formikLogin = useFormik({
     initialValues: {
       email: '',
@@ -243,7 +205,6 @@ export function AuthProvider({ children }: any) {
         isBarbeiro: isBarbeiro(),
         isCliente: isCliente(),
         isAlexander: isAlexander(),
-        isBarbeiroApproved: isBarbeiroApproved(),
       }}
     >
       {children}

src/hooks/useBarbeiro.tsx

@@ -9,10 +9,10 @@ import * as XLSX from 'xlsx';
 
 import { useUser } from 'contexts/User';
 
+import { getBarbeiro } from 'services/get/barbeiros';
 import { getClientesMonth } from 'services/get/clientes';
 
 const THIRTYMINUTES = 30 * 60 * 1000;
-const ONE_MONTH = 30;
 const ONE_DAY = 1;
 const pastMonth = new Date();
 
@@ -21,6 +21,7 @@ export function useBarbeiro() {
   const [visible, setVisible] = useState(true);
   const [modalIsOpen, setIsOpen] = useState(false);
   const [date, setDate] = useState(new Date());
+  const [approved, setApproved] = useState('');
   const [ultimaAtualizacao, setUltimaAtualizacao] = useState(format(new Date(), 'HH:mm:ss'));
   const [dataExport, setDataExport] = useState<ClienteMetadata[]>([]);
   const defaultSelected: DateRange = {
@@ -32,6 +33,28 @@ export function useBarbeiro() {
   const dataInicial = format(range?.from as Date, 'yyyy-MM-dd');
   const dataFinal = format(range?.to as Date, 'yyyy-MM-dd');
 
+  async function verificarStatusBarbeiro() {
+    console.log('id ->', clientId);
+
+    const { data, status, error } = await getBarbeiro(clientId as string, true);
+
+    if (error) {
+      switch (status) {
+        default:
+          return;
+      }
+    }
+
+    if (!data) return;
+    if (!data[0].j) return;
+
+    if (data[0].j === null) {
+      return;
+    }
+
+    setApproved(data[0].j[0].admin_confirmed);
+  }
+
   async function buscarDadosParaExcel() {
     const { data, error, status } = await getClientesMonth(clientId || '', dataInicial, dataFinal);
 
@@ -77,6 +100,14 @@ export function useBarbeiro() {
     setIsOpen(false);
   }
 
+  function isBarbeiroApproved() {
+    if (approved === 'S') {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   useEffect(() => {
     const timerID = setInterval(() => tick(), 1000);
 
@@ -128,22 +159,7 @@ export function useBarbeiro() {
   }, []);
 
   useEffect(() => {
-    if (
-      (Cookies.get('barbeiro_modal') === 'false' && Cookies.get('barbeiro_warning') === 'true') ||
-      (Cookies.get('barbeiro_modal') === undefined && Cookies.get('barbeiro_warning') === 'true')
-    ) {
-      Swal.fire({
-        title: 'Novidade no ar!',
-        html: 'Agora você pode fazer relatórios do mês. Basta clicar no botão "Download do mês" e selecionar o periodo desejado.',
-        icon: 'info',
-        confirmButtonColor: '#ff9000',
-        background: '#312e38',
-        color: '#f4ede8',
-        confirmButtonText: 'Entendi!',
-      }).then(() => {
-        Cookies.set('barbeiro_modal', 'true', { expires: ONE_MONTH });
-      });
-    }
+    verificarStatusBarbeiro();
   }, []);
 
   const customStyles = {
@@ -183,5 +199,6 @@ export function useBarbeiro() {
     setRange,
     exportToExcel,
     pastMonth,
+    isBarbeiroApproved: isBarbeiroApproved(),
   };
 }

src/pages/Barbeiro/index.tsx

@@ -14,14 +14,12 @@ import { getDiaSemana } from 'utils/diaDaSemana';
 
 import { useUser } from 'contexts/User';
 
-import { useAuth } from 'hooks/useAuth';
 import { useBarbeiro } from 'hooks/useBarbeiro';
 
 import styles from './Barbeiro.module.scss';
 
 export function Barbeiro() {
   const navigate = useNavigate();
-  const { isBarbeiroApproved } = useAuth();
   const {
     clientes,
     selectDay,
@@ -47,6 +45,7 @@ export function Barbeiro() {
     setRange,
     exportToExcel,
     pastMonth,
+    isBarbeiroApproved,
   } = useBarbeiro();
 
   return (

src/types/IContext.tsx

@@ -111,7 +111,6 @@ export interface AuthContextProps {
   isBarbeiro: boolean;
   isCliente: boolean;
   isAlexander: boolean;
-  isBarbeiroApproved: boolean;
 }
 
 export interface FormikProps {