From 144bb6db94bfaa22b8d1cf921a30271c1dbec754 Mon Sep 17 00:00:00 2001
From: adriano <adriano08andrade@hotmail.com>
Date: Thu, 7 Mar 2024 18:17:02 -0300
Subject: [PATCH 1/6] update before git pull

---
 frontend/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/server.js b/frontend/server.js
index a05ba32..cd23e05 100644
--- a/frontend/server.js
+++ b/frontend/server.js
@@ -6,4 +6,4 @@ app.use(express.static(path.join(__dirname, "build")));
 app.get("/*", function (req, res) {
 	res.sendFile(path.join(__dirname, "build", "index.html"));
 });
-app.listen(3333);
+app.listen(3337);

From e30573519d6925bfd66d40300ab862bdefb19985 Mon Sep 17 00:00:00 2001
From: gustavo-gsp <gustavo.s.pinho@hotmail.com>
Date: Tue, 25 Jun 2024 10:45:46 -0300
Subject: [PATCH 2/6] fix: resolve issues with WhatsApp creation and editing,
 message input, and ControlByNumber errors

Details:
- Fixed issue where the 'number' field was not being saved during WhatsApp creation and editing.
- Resolved problem where text in the message input was being cleared upon receiving a new message.
- Addressed errors in ControlByNumber when ticketId was not found.
---
 backend/src/controllers/WhatsAppController.ts | 12 +++++---
 backend/src/helpers/controllByNumber.ts       | 29 ++++++++++---------
 frontend/src/components/MessageInput/index.js |  2 +-
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/backend/src/controllers/WhatsAppController.ts b/backend/src/controllers/WhatsAppController.ts
index 0158748..1a82021 100644
--- a/backend/src/controllers/WhatsAppController.ts
+++ b/backend/src/controllers/WhatsAppController.ts
@@ -377,9 +377,11 @@ export const store = async (req: Request, res: Response): Promise<Response> => {
   } else if (!isOfficial) {
     phoneNumberId = "";
     wabaId = "";
-    number = "";
+    //number = "";
+  }
+  if(!number){
+    number = getNumberFromName(name)
   }
-
   let invalidPhoneName = validatePhoneName(name);
 
   if (invalidPhoneName) {
@@ -479,9 +481,11 @@ export const update = async (
   } else if (!isOfficial) {
     whatsappData.phoneNumberId = "";
     whatsappData.wabaId = "";
-    whatsappData.number = "";
+    //whatsappData.number = "";
+  }
+  if(!whatsappData?.number){
+    whatsappData.number = getNumberFromName(whatsappData.name)
   }
-
   const { whatsapp, oldDefaultWhatsapp } = await UpdateWhatsAppService({
     whatsappData,
     whatsappId
diff --git a/backend/src/helpers/controllByNumber.ts b/backend/src/helpers/controllByNumber.ts
index e202f6f..6ffad64 100644
--- a/backend/src/helpers/controllByNumber.ts
+++ b/backend/src/helpers/controllByNumber.ts
@@ -13,43 +13,44 @@ async function controllByNumber() {
   let controll: any[] = [];
 
   for (const ticket of tickets) {
-    let match = ticket.match(/"whatsappId":(\d+)/);
+    let match = ticket?.match(/"whatsappId":(\d+)/);
     let whatsappId = match ? match[1] : null;
 
     const whatsapp = await get({
       key: `whatsapp:${whatsappId}`
     });
 
-    match = whatsapp.match(/"number":"(\d+)"/);
+    match = whatsapp?.match(/"number":"(\d+)"/);
     let number = match ? match[1] : null;
 
-    match = ticket.match(/"id":(\d+)/);
+    match = ticket?.match(/"id":(\d+)/);
     let ticketId = match ? match[1] : null;
 
     number = JSON.parse(number);
     ticketId = JSON.parse(ticketId);
 
-    const index = controll.findIndex((c: any) => c.number == number);
+    const index = controll?.findIndex((c: any) => c.number == number);
 
     if (index == -1) {
-      controll.push({ ticketId, number });
+      controll?.push({ ticketId, number });
     }
   }
 
-  const ticketIds = controll.map((c: any) => c.ticketId);
+  const ticketIds = controll?.map((c: any) => c.ticketId);
 
-  console.log("=======> ticketIds: ", ticketIds);
+  //console.log("=======> ticketIds: ", ticketIds);
 
   for (const ticketId of ticketIds) {
     const ticket: any = await Ticket.findByPk(ticketId);
+    if(ticket){
+      const { status } = ticket;
 
-    const { status } = ticket;
-
-    if (status == "pending") {
-      await UpdateTicketService({
-        ticketData: { statusChatEnd: uuidv4() },
-        ticketId: ticket.id
-      });
+      if (status && status == "pending") {
+        await UpdateTicketService({
+          ticketData: { statusChatEnd: uuidv4() },
+          ticketId: ticket.id
+        });
+      }
     }
   }
 
diff --git a/frontend/src/components/MessageInput/index.js b/frontend/src/components/MessageInput/index.js
index 9f0b895..f20b25a 100644
--- a/frontend/src/components/MessageInput/index.js
+++ b/frontend/src/components/MessageInput/index.js
@@ -247,7 +247,7 @@ const MessageInput = ({ ticketStatus, ticketLastMessage, ticketIsRemote }) => {
       setInputMessage(ticketLastMessage)
     }
     else {
-      setInputMessage("")
+      //setInputMessage("")
     }
   }, [countTicketMsg, ticketIsRemote, ticketLastMessage])
 

From 2bb5db92d7c652a3d9b5bc7e98dd06f7458f5baf Mon Sep 17 00:00:00 2001
From: gustavo-gsp <gustavo.s.pinho@hotmail.com>
Date: Thu, 27 Jun 2024 14:10:26 -0300
Subject: [PATCH 3/6] fix: resolve issue with blocking audio and video without
 the option being active

Details:
- Fixed the problem where audio and video were being blocked even when the option was not active.
---
 .../src/services/WbotServices/wbotMessageListener.ts   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/backend/src/services/WbotServices/wbotMessageListener.ts b/backend/src/services/WbotServices/wbotMessageListener.ts
index db8604a..53b50e2 100644
--- a/backend/src/services/WbotServices/wbotMessageListener.ts
+++ b/backend/src/services/WbotServices/wbotMessageListener.ts
@@ -184,12 +184,10 @@ const verifyMediaMessage = async (
     phoneNumberId: msg?.phoneNumberId,
     fromAgent: false
   };
-  if (
-    messageData.mediaType === "video" ||
-    (messageData.mediaType === "audio" &&
-      getSettingValue("blockAudioVideoMedia")?.value === "enabled")
-  ) {
-    mediaAuthorized = false;
+  if(getSettingValue('blockAudioVideoMedia')?.value === 'enabled'){
+    if( messageData.mediaType === 'video' || messageData.mediaType === 'audio' ){
+      mediaAuthorized = false;
+    }
   }
   if (msg?.fromMe) {
     messageData = { ...messageData, fromAgent: true };

From c39cae9f81f084b04602671ea4e55723e1ec9676 Mon Sep 17 00:00:00 2001
From: adriano <adriano08andrade@hotmail.com>
Date: Thu, 25 Jul 2024 11:05:39 -0500
Subject: [PATCH 4/6] fix(i18n): add missing translations in the interface

---
 .../ChatEnd/TimerPickerSelect/index.js        |  4 +-
 frontend/src/components/ConfigModal/index.js  | 39 ++++-----
 .../src/components/DashboardUser/CardUser.jsx | 10 ++-
 .../DatePicker2/index.js                      |  4 +-
 .../TimerPickerSelect2/index.js               |  4 +-
 .../src/components/PositionModal/index.js     |  4 +-
 .../src/components/Report/DatePicker/index.js |  4 +-
 frontend/src/components/Report/Modal/index.js |  2 +-
 frontend/src/components/ReportModal/index.js  |  7 +-
 frontend/src/components/UserModal/index.js    |  4 +-
 frontend/src/layout/MainListItems.js          |  4 +-
 frontend/src/pages/Dashboard/PieChart.js      |  4 +-
 frontend/src/pages/Dashboard/index.js         | 10 +--
 frontend/src/pages/Report/index.js            | 76 +++++++++---------
 frontend/src/pages/StatusChatEnd/index.js     | 10 +--
 frontend/src/translate/languages/en.js        | 80 +++++++++++++++----
 frontend/src/translate/languages/es.js        | 73 ++++++++++++++---
 frontend/src/translate/languages/pt.js        | 61 ++++++++++++--
 18 files changed, 283 insertions(+), 117 deletions(-)

diff --git a/frontend/src/components/ChatEnd/TimerPickerSelect/index.js b/frontend/src/components/ChatEnd/TimerPickerSelect/index.js
index b49ccf7..b642246 100644
--- a/frontend/src/components/ChatEnd/TimerPickerSelect/index.js
+++ b/frontend/src/components/ChatEnd/TimerPickerSelect/index.js
@@ -45,7 +45,7 @@ import {
 
 
 import ptBrLocale from "date-fns/locale/pt-BR";
- 
+import esLocale from 'date-fns/locale/es';
 
 const ResponsiveTimePickers = (props) => {
   
@@ -63,7 +63,7 @@ const ResponsiveTimePickers = (props) => {
 
     <Fragment>
 
-    <MuiPickersUtilsProvider utils={DateFnsUtils} locale={ptBrLocale}>
+    <MuiPickersUtilsProvider utils={DateFnsUtils} locale={esLocale}>
           <TimePicker
               variant="outline"
               label={props.title} 
diff --git a/frontend/src/components/ConfigModal/index.js b/frontend/src/components/ConfigModal/index.js
index cf41fa3..c07218e 100644
--- a/frontend/src/components/ConfigModal/index.js
+++ b/frontend/src/components/ConfigModal/index.js
@@ -11,6 +11,9 @@ import { TimePicker, DatePicker } from 'formik-material-ui-pickers'
 import DateFnsUtils from '@date-io/date-fns'
 
 import ptBrLocale from "date-fns/locale/pt-BR"
+import esLocale from 'date-fns/locale/es';
+
+import { i18n } from '../../../translate/i18n';
 
 import { WhatsAppsContext } from "../../context/WhatsApp/WhatsAppsContext"
 
@@ -257,7 +260,7 @@ const ConfigModal = ({ open, onClose, change }) => {
                     }}
                 >
                     {({ values, touched, errors, isSubmitting }) => (
-                        <MuiPickersUtilsProvider utils={DateFnsUtils} locale={ptBrLocale}>
+                        <MuiPickersUtilsProvider utils={DateFnsUtils} locale={esLocale}>
                             <Form>
 
                                 <DialogContent dividers>
@@ -299,7 +302,7 @@ const ConfigModal = ({ open, onClose, change }) => {
                                         <Field
                                             component={TimePicker}
                                             name="startTimeBus"
-                                            label="Inicio atendimento"
+                                            label={i18n.t('configModal.titles.startService')}
                                             ampm={false}
                                             openTo="hours"
                                             views={['hours', 'minutes',]}
@@ -309,7 +312,7 @@ const ConfigModal = ({ open, onClose, change }) => {
                                         <Field
                                             component={TimePicker}
                                             name="endTimeBus"
-                                            label="Fim atendimento"
+                                            label={i18n.t('configModal.titles.endService')}
                                             ampm={false}
                                             openTo="hours"
                                             views={['hours', 'minutes',]}
@@ -325,13 +328,13 @@ const ConfigModal = ({ open, onClose, change }) => {
                                                     checked={values.businessTimeEnable}
                                                 />
                                             }
-                                            label={'Ativar/Desativar'} />
+                                            label={i18n.t('configModal.titles.enableDisable')} />
                                     </div>
 
                                     <div>
                                         <Field
                                             as={TextField}
-                                            label={'Mensagem fora do horário de atendimento'}
+                                            label={i18n.t('configModal.titles.outOfHours')}
                                             type="messageBus"
                                             multiline
                                             rows={5}
@@ -355,7 +358,7 @@ const ConfigModal = ({ open, onClose, change }) => {
                                         <Field
                                             component={TimePicker}
                                             name="startTimeBusSaturday"
-                                            label="Inicio atendimentos"
+                                            label={i18n.t('configModal.titles.startService')}
                                             ampm={false}
                                             openTo="hours"
                                             views={['hours', 'minutes',]}
@@ -365,7 +368,7 @@ const ConfigModal = ({ open, onClose, change }) => {
                                         <Field
                                             component={TimePicker}
                                             name="endTimeBusSaturday"
-                                            label="Fim atendimento"
+                                            label={i18n.t('configModal.titles.endService')}
                                             ampm={false}
                                             openTo="hours"
                                             views={['hours', 'minutes',]}
@@ -381,13 +384,13 @@ const ConfigModal = ({ open, onClose, change }) => {
                                                     checked={values.businessTimeEnableSaturday}
                                                 />
                                             }
-                                            label={'Ativar/Desativar'} />
+                                            label={i18n.t('configModal.titles.enableDisable')} />
                                     </div>
 
                                     <div>
                                         <Field
                                             as={TextField}
-                                            label={'Mensagem fora do horário de atendimento sábado'}
+                                            label={i18n.t('configModal.titles.outOfHoursSaturday')}
                                             type="messageBusSaturday"
                                             multiline
                                             rows={5}
@@ -405,7 +408,7 @@ const ConfigModal = ({ open, onClose, change }) => {
                                     </div>
                                     {/* SABADO FIM */}
                                     <br />
-
+ 
 
                                     {/* Saturday and Sunday date */}
                                     <div className={classes.multFieldLine} style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
@@ -430,13 +433,13 @@ const ConfigModal = ({ open, onClose, change }) => {
                                                     checked={values.enableWeekendMessage}
                                                 />
                                             }
-                                            label={'Ativar/Desativar'}
+                                            label={i18n.t('configModal.titles.enableDisable')}
                                         />
                                     </div>
                                     <div>
                                         <Field
                                             as={TextField}
-                                            label={'Mensagem para final de semana'}
+                                            label={i18n.t('configModal.titles.forTheWeekend')}
                                             type="weekendMessage"
                                             multiline
                                             rows={5}
@@ -461,7 +464,7 @@ const ConfigModal = ({ open, onClose, change }) => {
                                         <Field
                                             component={DatePicker}
                                             name="holidayDate"
-                                            label="Data do feriado"
+                                            label={i18n.t('configModal.titles.holiday')}
                                             format="dd/MM/yyyy"
                                             fullWidth
                                         />
@@ -475,13 +478,13 @@ const ConfigModal = ({ open, onClose, change }) => {
                                                     checked={values.holidayDateEnable}
                                                 />
                                             }
-                                            label={'Ativar/Desativar'}
+                                            label={i18n.t('configModal.titles.enableDisable')}
                                         />
                                     </div>
                                     <div>
                                         <Field
                                             as={TextField}
-                                            label={'Mensagem para feriado'}
+                                            label={i18n.t('configModal.titles.holidayMessage')}
                                             type="holidayDateMessage"
                                             multiline
                                             rows={5}
@@ -524,13 +527,13 @@ const ConfigModal = ({ open, onClose, change }) => {
                                                     checked={values.ticketExpirationEnable}
                                                 />
                                             }
-                                            label={'Ativar/Desativar'}
+                                            label={i18n.t('configModal.titles.enableDisable')}
                                         />
                                     </div>
                                     <div>
                                         <Field
                                             as={TextField}
-                                            label={'Mensagem por falta de atividade no atendimento'}
+                                            label={i18n.t('configModal.titles.inactivityMessage')}
                                             type="ticketExpirationMsg"
                                             multiline
                                             rows={5}
@@ -569,7 +572,7 @@ const ConfigModal = ({ open, onClose, change }) => {
                                                 size={24}
                                                 className={classes.buttonProgress}
                                             />
-                                        ) : 'Salvar'}
+                                        ) : i18n.t('configModal.titles.save')}
                                     </Button>
                                 </DialogActions>
                             </Form>
diff --git a/frontend/src/components/DashboardUser/CardUser.jsx b/frontend/src/components/DashboardUser/CardUser.jsx
index eea89d1..bd595dd 100644
--- a/frontend/src/components/DashboardUser/CardUser.jsx
+++ b/frontend/src/components/DashboardUser/CardUser.jsx
@@ -23,6 +23,8 @@ import CheckCircleIcon from "@material-ui/icons/CheckCircle";
 import ErrorIcon from "@material-ui/icons/Error";
 import RemoveCircleIcon from "@material-ui/icons/RemoveCircle";
 
+import { i18n } from "../../translate/i18n";
+
 const CardUser = ({ classes, usersOnlineInfo, logout }) => {
   const [search, setSearch] = React.useState("");
 
@@ -46,14 +48,14 @@ const CardUser = ({ classes, usersOnlineInfo, logout }) => {
               color="primary"
               style={{ marginBottom: "16px" }}
             >
-              Lista de Usuários
+              {i18n.t('dashboard.titles.listUser')}
             </Typography>
           </Grid>
           <Grid item sx={8} width="100%">
             <Box sx={{ marginBottom: 2, display: "flex", gap: "12px" }}>
               <TextField
                 id="outlined-basic"
-                label="Usuário"
+                label={i18n.t('dashboard.titles.user')}
                 variant="standard"
                 value={search}
                 onChange={handlesearch}
@@ -70,7 +72,7 @@ const CardUser = ({ classes, usersOnlineInfo, logout }) => {
                   <MenuItem value={null}>Todos</MenuItem>
                   <MenuItem value={"online"}>Online</MenuItem>
                   <MenuItem value={"offline"}>Offline</MenuItem>
-                  <MenuItem value={"not"}>Não entrou</MenuItem>
+                  <MenuItem value={"not"}>{i18n.t('dashboard.titles.notEnter')}</MenuItem>
                 </Select>
               </FormControl>
             </Box>
@@ -161,7 +163,7 @@ const CardUser = ({ classes, usersOnlineInfo, logout }) => {
                         <Typography component="p" color="textPrimary" paragraph>
                           {user.sumOnlineTime && user.sumOnlineTime.sum
                             ? user.sumOnlineTime.sum
-                            : "Não entrou Hoje"}
+                            : i18n.t('dashboard.titles.notEnterToday')}
                         </Typography>
                       </Typography>
                     </CardContent>
diff --git a/frontend/src/components/ModalUpdateScheduleReminder/DatePicker2/index.js b/frontend/src/components/ModalUpdateScheduleReminder/DatePicker2/index.js
index a4e953e..0dd343c 100644
--- a/frontend/src/components/ModalUpdateScheduleReminder/DatePicker2/index.js
+++ b/frontend/src/components/ModalUpdateScheduleReminder/DatePicker2/index.js
@@ -13,7 +13,7 @@ import {
 
 
 import ptBrLocale from "date-fns/locale/pt-BR";
-
+import esLocale from 'date-fns/locale/es';
   
 function formatDateDatePicker(data){
   return String(new Date(data).getFullYear())+'-'+
@@ -50,7 +50,7 @@ function ResponsiveDatePickers(props) {
   return ( 
 
     <Fragment> 
-      <MuiPickersUtilsProvider utils={DateFnsUtils} locale={ptBrLocale}>
+      <MuiPickersUtilsProvider utils={DateFnsUtils} locale={esLocale}>
         <KeyboardDatePicker
         //   autoOk 
           
diff --git a/frontend/src/components/ModalUpdateScheduleReminder/TimerPickerSelect2/index.js b/frontend/src/components/ModalUpdateScheduleReminder/TimerPickerSelect2/index.js
index f02731d..346ede7 100644
--- a/frontend/src/components/ModalUpdateScheduleReminder/TimerPickerSelect2/index.js
+++ b/frontend/src/components/ModalUpdateScheduleReminder/TimerPickerSelect2/index.js
@@ -45,7 +45,7 @@ import {
 
 
 import ptBrLocale from "date-fns/locale/pt-BR";
-
+import esLocale from 'date-fns/locale/es';
 
 function formatDate(strDate){
   const date = strDate.split(' ')[0].split('/')
@@ -70,7 +70,7 @@ const ResponsiveTimePickers = (props) => {
 
     <Fragment>
 
-    <MuiPickersUtilsProvider utils={DateFnsUtils} locale={ptBrLocale}>
+    <MuiPickersUtilsProvider utils={DateFnsUtils} locale={esLocale}>
           <TimePicker
               variant="outline"
               label={props.title} 
diff --git a/frontend/src/components/PositionModal/index.js b/frontend/src/components/PositionModal/index.js
index 29dcde5..d1b68b7 100644
--- a/frontend/src/components/PositionModal/index.js
+++ b/frontend/src/components/PositionModal/index.js
@@ -5,6 +5,8 @@ import { Formik, Form, Field } from "formik"
 import { toast } from "react-toastify"
 import openSocket from 'socket.io-client'
 
+import { i18n } from "../../translate/i18n";
+
 
 import {
   makeStyles,
@@ -191,7 +193,7 @@ const PositionModal = ({
                 <div className={classes.textQuickAnswerContainer}>
                   <Field
                     as={TextField}
-                    label={'Nome'}
+                    label={i18n.t('dashboard.titles.name')}
                     name="name"
                     autoFocus
                     error={touched.name && Boolean(errors.name)}
diff --git a/frontend/src/components/Report/DatePicker/index.js b/frontend/src/components/Report/DatePicker/index.js
index 64e9b80..81ffe6f 100644
--- a/frontend/src/components/Report/DatePicker/index.js
+++ b/frontend/src/components/Report/DatePicker/index.js
@@ -15,7 +15,7 @@ import {
 
 
 import ptBrLocale from "date-fns/locale/pt-BR";
-
+import esLocale from 'date-fns/locale/es';
   
 function formatDateDatePicker(data){
   return String(new Date(data).getFullYear())+'-'+
@@ -52,7 +52,7 @@ function ResponsiveDatePickers(props) {
   return ( 
 
     <Fragment> 
-      <MuiPickersUtilsProvider utils={DateFnsUtils} locale={ptBrLocale}>
+      <MuiPickersUtilsProvider utils={DateFnsUtils} locale={esLocale}>
         <KeyboardDatePicker
           // autoOk 
         
diff --git a/frontend/src/components/Report/Modal/index.js b/frontend/src/components/Report/Modal/index.js
index f4d7f96..bac385e 100644
--- a/frontend/src/components/Report/Modal/index.js
+++ b/frontend/src/components/Report/Modal/index.js
@@ -52,7 +52,7 @@ const Modal = (props) => {
 
   const dataChat = props.data.map((dt) => { 
     return {
-      'fromMe': dt.fromMe  ? 'Atendente' : 'Cliente', 
+      'fromMe': dt.fromMe  ? i18n.t('dashboard.titles.attendant') : 'Cliente', 
       'body': dt.body,
       'createdAt': dt.createdAt
     }
diff --git a/frontend/src/components/ReportModal/index.js b/frontend/src/components/ReportModal/index.js
index 35c8216..5ae5095 100644
--- a/frontend/src/components/ReportModal/index.js
+++ b/frontend/src/components/ReportModal/index.js
@@ -11,7 +11,8 @@ import FormControl from '@mui/material/FormControl';
 import InputLabel from '@mui/material/InputLabel';
 import MenuItem from '@mui/material/MenuItem';
 import Select from '@mui/material/Select';
- 
+
+import { i18n } from "../../translate/i18n";
 
 
 
@@ -56,11 +57,11 @@ useEffect(()=>{
         open={open}
         onClose={handleClose}
       >
-        <DialogTitle>Relatórios</DialogTitle>
+        <DialogTitle>{i18n.t('dashboard.titles.dialogTitle')}</DialogTitle>
        
         <DialogContent>
           <DialogContentText>
-           Escolha uma opção de relatório abaixo
+            {i18n.t('dashboard.titles.dialogContentText')}
           </DialogContentText>
          
           <Box
diff --git a/frontend/src/components/UserModal/index.js b/frontend/src/components/UserModal/index.js
index 6520545..7be05b4 100644
--- a/frontend/src/components/UserModal/index.js
+++ b/frontend/src/components/UserModal/index.js
@@ -261,8 +261,8 @@ const UserModal = ({ open, onClose, userId, }) => {
 									fullWidth
 								/>
 								<div className={classes.multFieldLine}> 
-									<label style={{display: 'flex', alignItems:'center'}}>
-										Transferir para outras filas
+									<label style={{display: 'flex', alignItems:'center'}}>										
+										{i18n.t('dashboard.titles.transfer')}
 										<Switch
 										name= 'transferToOtherQueues'
 										checked={checked}
diff --git a/frontend/src/layout/MainListItems.js b/frontend/src/layout/MainListItems.js
index 03339d2..3f04337 100644
--- a/frontend/src/layout/MainListItems.js
+++ b/frontend/src/layout/MainListItems.js
@@ -189,7 +189,7 @@ const MainListItems = (props) => {
             />
             <ListItemLink
               to="/report"
-              primary="Relatório"
+              primary={i18n.t("mainDrawer.listItems.reports")}
               icon={<ReportOutlinedIcon />}
             />
           </>
@@ -242,7 +242,7 @@ const MainListItems = (props) => {
               (getSettingValue('hasCampaign') === 'enabled' || user.profile === 'master') && (
                 <ListItemLink
                   to="/campaign"
-                  primary="Campanha"
+                  primary={i18n.t("mainDrawer.listItems.campaign") || 'Campaign'}
                   icon={<CampaignIcon />}
                 />
               )
diff --git a/frontend/src/pages/Dashboard/PieChart.js b/frontend/src/pages/Dashboard/PieChart.js
index b1b6c46..f1d52b2 100644
--- a/frontend/src/pages/Dashboard/PieChart.js
+++ b/frontend/src/pages/Dashboard/PieChart.js
@@ -5,6 +5,8 @@ import { PieChart as RechartsPieChart, Pie, Cell, ResponsiveContainer, Tooltip }
 
 import Title from './Title';
 
+import { i18n } from "../../translate/i18n";
+
 const generateDataExample = (amount) => {
   const arr = []
   for (let i = 1; i <= amount; i++) {
@@ -76,7 +78,7 @@ const PieChart = ({ data = dataExample }) => {
     >
       <Box width="100%" height="100%" position="sticky" top="0" zIndex={1000}>
         <Box sx={{ position: "absolute" }}>
-          <Title>Tickets encerramento</Title>
+          <Title>{i18n.t('dashboard.titles.title')}</Title>
         </Box>
         <ResponsiveContainer width="100%" height="100%">
           <RechartsPieChart width={400} height={400}>
diff --git a/frontend/src/pages/Dashboard/index.js b/frontend/src/pages/Dashboard/index.js
index 3fa4e2d..99bbd0a 100644
--- a/frontend/src/pages/Dashboard/index.js
+++ b/frontend/src/pages/Dashboard/index.js
@@ -14,7 +14,7 @@ import Info from "@material-ui/icons/Info"
 import SelectField from "../../components/Report/SelectField"
 
 import { AuthContext } from "../../context/Auth/AuthContext"
-// import { i18n } from "../../translate/i18n";
+import { i18n } from "../../translate/i18n";
 import Chart from "./Chart"
 import PieChart from "./PieChart"
 import openSocket from "socket.io-client"
@@ -472,7 +472,7 @@ const Dashboard = () => {
                       func={handleSelectedQueue}
                       textBoxFieldSelected={'All'}
                       emptyField={false}
-                      header={'Filas'}
+                      header={i18n.t('dashboard.titles.selectQueues')}
                       currencies={user.queues.map((obj) => {
                         return { 'value': obj.id, 'label': obj.name }
                       })} />
@@ -485,7 +485,7 @@ const Dashboard = () => {
                     variant="outlined"
                   >
                     <Typography component="h3" variant="h6" color="primary" paragraph>
-                      Aguardando
+                      {i18n.t('dashboard.titles.waiting')}
                     </Typography>
                     <Grid item>
                       <Typography component="h1" variant="h4">
@@ -501,7 +501,7 @@ const Dashboard = () => {
                     variant="outlined"
                   >
                     <Typography component="h3" variant="h6" color="primary" style={{ marginBottom: "0" }} paragraph>
-                      Em Atendimento
+                      {i18n.t('dashboard.titles.inService')}
                     </Typography>
                     <Typography paragraph style={{ fontSize: "12px", margin: "0px" }}>Hoje/Todo Periodo</Typography>
 
@@ -551,7 +551,7 @@ const Dashboard = () => {
                   color="primary"
                   style={{ marginBottom: "16px" }}
                 >
-                  Usuários
+                  {i18n.t('dashboard.titles.users')}
                   <Tooltip
                     title={`Os dados informados abaixo é baseado na data: ${new Date().toLocaleDateString(
                       "pt-BR",
diff --git a/frontend/src/pages/Report/index.js b/frontend/src/pages/Report/index.js
index 2a94ef3..269f30f 100644
--- a/frontend/src/pages/Report/index.js
+++ b/frontend/src/pages/Report/index.js
@@ -25,16 +25,16 @@ import Switch from '@mui/material/Switch'
 const label = { inputProps: { 'aria-label': 'Size switch demo' } }
 
 const report = [
-  { 'value': '1', 'label': 'Atendimento por atendentes' },
-  { 'value': '2', 'label': 'Usuários online/offline' },
-  { 'value': '3', 'label': 'Relatorio de atendimento por numeros' },
-  { 'value': '4', 'label': 'Relatorio de atendimento por filas' },
+  { 'value': '1', 'label': `${i18n.t("reports.listTitles.title1_1")}` },
+  { 'value': '2', 'label': `${i18n.t("reports.listTitles.title3_1")}` },
+  { 'value': '3', 'label': `${i18n.t("reports.listTitles.title4_1")}` },
+  { 'value': '4', 'label': `${i18n.t("reports.listTitles.title5_1")}` },
 ]
 
 const reportOptType = [
-  { 'value': '1', 'label': 'Padrão' },
-  { 'value': '2', 'label': 'Sintético' },
-  { 'value': '3', 'label': 'Analítico' }
+  { 'value': '1', 'label': i18n.t('reportOptType.listTitles.title1') },
+  { 'value': '2', 'label': i18n.t('reportOptType.listTitles.title2') },
+  { 'value': '3', 'label': i18n.t('reportOptType.listTitles.title3') }
 ]
 
 
@@ -838,11 +838,11 @@ const Report = () => {
               <Box sx={{ display: 'flex', flexDirection: 'column', padding: '10px 0', }}>
                 <FormControlLabel
                   control={<Checkbox checked={selectedValue === 'created'} onChange={() => handleCheckBoxChange('created')} />}
-                  label="Criado"
+                  label="Creado"
                 />
                 <FormControlLabel
                   control={<Checkbox checked={selectedValue === 'updated'} onChange={() => handleCheckBoxChange('updated')} />}
-                  label="Atualizado"
+                  label="Actualizado"
                 />
               </Box> :
 
@@ -896,7 +896,7 @@ const Report = () => {
                   localization={{
 
                     header: {
-                      actions: 'Deslogar'
+                      actions: 'Unidad'
                     },
 
                   }}
@@ -906,7 +906,7 @@ const Report = () => {
                     [
 
                       // { title: 'Foto', field: 'ticket.contact.profilePicUrl', render: rowData => <img src={rowData['ticket.contact.profilePicUrl']} alt="imagem de perfil do whatsapp" style={{ width: 40, borderRadius: '50%' }} /> },
-                      { title: 'Nome', field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
+                      { title: 'Nombre', field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
 
                       {
                         title: 'Status', field: 'statusOnline.status',
@@ -935,11 +935,11 @@ const Report = () => {
 
                       },
 
-                      { title: 'Tempo online', field: 'sumOnlineTime.sum' },
+                      { title: `${i18n.t('reports.onlineTime')}`, field: 'sumOnlineTime.sum' },
                       { title: `${i18n.t("reports.dateStart")}`, field: 'startDate' },
                       { title: `${i18n.t("reports.dateEnd")}`, field: 'endDate' },
-                      { title: 'Em atendimento', field: 'sumOpen.count' },
-                      { title: 'Finalizado', field: 'sumClosed.count' },
+                      { title: `${i18n.t('reports.inService')}`, field: 'sumOpen.count' },
+                      { title: `${i18n.t('reports.finished')}`, field: 'sumClosed.count' },
 
                     ]
                   }
@@ -1001,20 +1001,20 @@ const Report = () => {
                   title={i18n.t("reports.listTitles.title4_1")}
                   columns={
                     !checkedRemote ? [
-                      { title: 'Unidade', field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
-                      { title: 'Conversas iniciadas', field: 'startedByAgent', },
-                      { title: 'Conversas recebidas', field: 'startedByClient' },
-                      { title: `Conversas finalizadas`, field: 'closedChat' },
-                      { title: `Tempo médio de espera`, field: 'avgChatWaitingTime' },
-                      { title: 'Aguardando', field: 'pendingChat' }
+                      { title: i18n.t('reports.listColumns.column3_1'), field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
+                      { title: i18n.t('reports.listColumns.column3_3'), field: 'startedByAgent', },
+                      { title: i18n.t('reports.listColumns.column3_4'), field: 'startedByClient' },
+                      { title: i18n.t('reports.listColumns.column3_5'), field: 'closedChat' },
+                      { title: i18n.t('reports.listColumns.column3_6'), field: 'avgChatWaitingTime' },
+                      { title: i18n.t('reports.listColumns.column3_7'), field: 'pendingChat' }
 
                     ] :
                       [
-                        { title: 'Unidade', field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
-                        { title: 'Conversas iniciadas', field: 'startedByAgent', },
-                        { title: 'Conversas respondidas', field: 'startedByClient' },
-                        { title: `Conversas finalizadas`, field: 'closedChat' },
-                        { title: 'Aguardando', field: 'pendingChat' }
+                        { title: i18n.t('reports.listColumns.column3_1'), field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
+                        { title: i18n.t('reports.listColumns.column3_3'), field: 'startedByAgent', },
+                        { title: i18n.t('reports.listColumns.column3_4'), field: 'startedByClient' },
+                        { title: i18n.t('reports.listColumns.column3_5'), field: 'closedChat' },
+                        { title: i18n.t('reports.listColumns.column3_7'), field: 'pendingChat' }
 
                       ]
                   }
@@ -1054,9 +1054,9 @@ const Report = () => {
                   columns={
                     !checkedRemote ? [
 
-                      { title: 'Unidade', field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
+                      { title: i18n.t('reports.listColumns.column3_1'), field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
                       {
-                        title: 'Fila', field: 'queueName',
+                        title: i18n.t('reports.listColumns.column3_2'), field: 'queueName',
                         cellStyle: (evt, rowData) => {
                           return {
                             whiteSpace: 'nowrap',
@@ -1066,19 +1066,19 @@ const Report = () => {
                         }
 
                       },
-                      { title: 'Conversas iniciadas', field: 'startedByAgent', },
-                      { title: 'Conversas recebidas', field: 'startedByClient' },
-                      { title: `Conversas finalizadas`, field: 'closedChat' },
-                      { title: `Tempo médio de espera`, field: 'avgChatWaitingTime' },
-                      { title: 'Aguardando', field: 'pendingChat' }
+                      { title: i18n.t('reports.listColumns.column3_3'), field: 'startedByAgent', },
+                      { title: i18n.t('reports.listColumns.column3_4'), field: 'startedByClient' },
+                      { title: i18n.t('reports.listColumns.column3_5'), field: 'closedChat' },
+                      { title: i18n.t('reports.listColumns.column3_6'), field: 'avgChatWaitingTime' },
+                      { title: i18n.t('reports.listColumns.column3_7'), field: 'pendingChat' }
 
                     ] :
 
                       [
 
-                        { title: 'Unidade', field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
+                        { title: i18n.t('reports.listColumns.column3_1'), field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
                         {
-                          title: 'Fila', field: 'queueName',
+                          title: i18n.t('reports.listColumns.column3_2'), field: 'queueName',
                           cellStyle: (evt, rowData) => {
                             return {
                               whiteSpace: 'nowrap',
@@ -1088,10 +1088,10 @@ const Report = () => {
                           }
 
                         },
-                        { title: 'Conversas iniciadas', field: 'startedByAgent', },
-                        { title: 'Conversas respondidas', field: 'startedByClient' },
-                        { title: `Conversas finalizadas`, field: 'closedChat' },
-                        { title: 'Aguardando', field: 'pendingChat' }
+                        { title: i18n.t('reports.listColumns.column3_3'), field: 'startedByAgent', },
+                        { title: i18n.t('reports.listColumns.column3_4'), field: 'startedByClient' },
+                        { title: i18n.t('reports.listColumns.column3_5'), field: 'closedChat' },
+                        { title: i18n.t('reports.listColumns.column3_7'), field: 'pendingChat' }
 
                       ]
                   }
diff --git a/frontend/src/pages/StatusChatEnd/index.js b/frontend/src/pages/StatusChatEnd/index.js
index c8de207..7424a9b 100644
--- a/frontend/src/pages/StatusChatEnd/index.js
+++ b/frontend/src/pages/StatusChatEnd/index.js
@@ -217,7 +217,7 @@ const StatusChatEnd = () => {
       <ConfirmationModal
         title={
           deletingStatusChatEnds &&
-          `Você tem certeza que quer excluir esta Status de encerramento: ${deletingStatusChatEnds.name
+          `${i18n.t('dashboard.titles.confirmationModal')} ${deletingStatusChatEnds.name
           }?`
         }
         open={confirmModalOpen}
@@ -233,7 +233,7 @@ const StatusChatEnd = () => {
         statusChatEndId={selectedStatusChatEnd && selectedStatusChatEnd.id}
       ></StatusChatEndModal>
       <MainHeader>
-        <Title>{"Status de encerramento"}</Title>
+        <Title>{i18n.t('dashboard.titles.status')}</Title>
         <MainHeaderButtonsWrapper>
           <TextField
             placeholder={i18n.t("quickAnswers.searchPlaceholder")}
@@ -266,13 +266,13 @@ const StatusChatEnd = () => {
           <TableHead>
             <TableRow>
               <TableCell align="center">
-                {"Status de encerramento"}
+                {i18n.t('dashboard.titles.status')}
               </TableCell>
               <TableCell align="center">
-                {"Mensagem de despedida"}
+                {i18n.t('quickAnswers.table.farewellMessage')}
               </TableCell>
               <TableCell align="center">
-                {"Padrão"}
+                {i18n.t('quickAnswers.table.standard')}
               </TableCell>
               <TableCell align="center">
                 {i18n.t("quickAnswers.table.actions")}
diff --git a/frontend/src/translate/languages/en.js b/frontend/src/translate/languages/en.js
index a499d94..e5bc319 100644
--- a/frontend/src/translate/languages/en.js
+++ b/frontend/src/translate/languages/en.js
@@ -51,14 +51,52 @@ const messages = {
           }
         },
 
-        table_users:{
-           title: 'User List',
-           column0: 'Name',
-           column1: 'In Service/Finished',
-           column2: 'Open by Queue',
-           column3: 'Closed by Queue',
-           column4: 'Online time', 
-           column5: 'Actions',
+        table_users: {
+          title: 'User List',
+          column0: 'Name',
+          column1: 'In Service/Finished',
+          column2: 'Open by Queue',
+          column3: 'Closed by Queue',
+          column4: 'Online time',
+          column5: 'Actions',
+        },
+        titles: {
+          selectQueues: 'Queues',
+          waiting: 'In Waiting',
+          inService: 'In Service',
+          users: 'Users',
+          name: 'Name',
+          attendant: 'Attendant',
+          dialogContentText: 'Choose a reporting option below.',
+          transfer: 'Transfer to other queues',
+          title: 'Closing tickets',
+          confirmationModal: 'Are you sure you want to remove this closing state: ',
+          status: 'Closing status',
+          listUser: 'List user',
+          user: 'user',
+          notEnter: 'Did not enter',
+          notEnterToday: 'Did not enter today'
+        }
+      },
+      reportOptType: {
+        listTitles: {
+          title1: 'Standard',
+          title2: 'Synthetic',
+          title3: 'Analytical'
+        }
+      },
+      configModal: {
+        titles: {
+          startService: 'Start Service',
+          endService: 'End Service',
+          enableDisable: 'Enable/Disable',
+          outOfHours: 'Message outside opening hours',
+          outOfHoursSaturday: 'Message outside opening hours Saturday',
+          forTheWeekend: 'Weekend message',
+          holiday: 'Holiday date',
+          holidayMessage: 'Message for holidays',
+          inactivityMessage: 'Message due to lack of service activity',
+          save: 'Save'
         }
       },
       connections: {
@@ -294,8 +332,9 @@ const messages = {
           queues: "Queues",
           administration: "Administration",
           users: "Users",
-          settings: "Settings", 
-          schedules: "Schedules"
+          settings: "Settings",
+          schedules: "Schedules",
+          reports: "Reports"
         },
         appBar: {
           user: {
@@ -311,7 +350,7 @@ const messages = {
           title2_1: "Whatsapp chat",
           title3_1: "Users online/offline"
         },
-        listColumns:{
+        listColumns: {
           column0_1: 'Actions',
           column0_2: 'Pic',
           column0_3: 'Name',
@@ -322,7 +361,7 @@ const messages = {
           column0_8: 'Message',
 
           column1_1: 'Store',
-          column1_2: 'Attendant', 
+          column1_2: 'Attendant',
           column1_5: 'Subject',
           column1_6: 'Status',
           column1_7: 'Created',
@@ -330,13 +369,22 @@ const messages = {
           column1_9: 'Closing status',
 
           column2_1: 'Attendant/Client',
+
+          column3_1: 'Unit',
+          column3_2: 'Row',
+          column3_3: 'Conversations started',
+          column3_4: 'Incoming conversations',
+          column3_5: 'Finished conversations',
+          column3_6: 'Average waiting time',
+          column3_7: 'Waiting',
         },
         search: 'Number/Name...',
         dateStart: 'Start date',
         dateEnd: 'End date',
-        user: 'User'
-
-
+        user: 'User',
+        onlineTime: 'Online time',
+        inService: 'In service',
+        finished: 'Finished'
       },
       notifications: {
         noTickets: "No notifications.",
@@ -367,6 +415,8 @@ const messages = {
           shortcut: "Shortcut",
           message: "Quick Reply",
           actions: "Actions",
+          farewellMessage: "Farewell message",
+          standard: "Standard"
         },
         buttons: {
           add: "Add Quick Reply",
diff --git a/frontend/src/translate/languages/es.js b/frontend/src/translate/languages/es.js
index a2c9f3a..5021cb0 100644
--- a/frontend/src/translate/languages/es.js
+++ b/frontend/src/translate/languages/es.js
@@ -61,6 +61,45 @@ const messages = {
            column3: 'Cerrado por cola',
            column4: 'Tiempo Online', 
            column5: 'Actions',
+        },
+        titles: {
+          selectQueues: 'Colas',
+          waiting: 'En espera',
+          inService: 'En Atendimiento',
+          users: 'Usuarios',
+          name: 'Nombre',
+          attendant: 'Agente',
+          dialogTitle: 'Reportes',
+          dialogContentText: 'Escoja una opción de reporte abajo.',
+          transfer: 'Transferir para outras filas',
+          title: 'Entradas de cierre',
+          confirmationModal: 'Está seguro de que desea eliminar este estado de cierre: ',
+          status: 'Status de cierre',
+          listUser: 'Lista de Usuarios',
+          user: 'Usuario',
+          notEnter: 'No ingresó',
+          notEnterToday: 'No ingresó hoy'
+        }
+      },
+      reportOptType: {
+        listTitles: {
+          title1: 'Patrón',
+          title2: 'Sintético',
+          title3: 'Analítico'
+        }
+      },
+      configModal: {
+        titles: {
+          startService: 'Inicio atención',
+          endService: 'Fin atención',
+          enableDisable: 'Activar/Desactivar',
+          outOfHours: 'Mensaje fuera de horario de atención',
+          outOfHoursSaturday: 'Mensaje fuera del horario de atención sábado',
+          forTheWeekend: 'Mensaje fin de semana',
+          holiday: 'Día Festivo',
+          holidayMessage: 'Mensaje para Festivos',
+          inactivityMessage: 'Mensaje por falta de actividad',
+          save: 'Guardar'
         }
       },
       connections: {
@@ -237,7 +276,7 @@ const messages = {
         },
       },
       ticketsQueueSelect: {
-        placeholder: "Linhas",
+        placeholder: "Líneas",
       },
       tickets: {
         toasts: {
@@ -296,11 +335,13 @@ const messages = {
           tickets: "Tickets",
           contacts: "Contactos",
           quickAnswers: "Respuestas rápidas",
-          queues: "Linhas",
+          queues: "Líneas",
           administration: "Administración",
           users: "Usuarios",
           settings: "Configuración",
-          schedules: "Recordatorio"
+          schedules: "Recordatorio",
+          reports: "Reportes",
+          campain: "Campañas"
         },
         appBar: {
           user: {
@@ -312,9 +353,11 @@ const messages = {
       reports: {
         listTitles: {
           title0_1: "Recordatorios/Programación",
-          title1_1: "Llamadas de asistentes",
+          title1_1: "Atención por agentes",
           title2_1: "Chat de whatsapp",
-          title3_1: "Usuarios online/offline"
+          title3_1: "Usuarios online/offline",
+          title4_1: "Relatório de atendimento por números",
+          title5_1: "Relatório de atendimento por filas"
         },
         listColumns:{
           column0_1: 'Acción',
@@ -335,18 +378,28 @@ const messages = {
           column1_9: 'Estado de cierre',
 
           column2_1: 'Secretario/Cliente',
+
+          column3_1: 'Unidad',
+          column3_2: 'Cola',
+          column3_3: 'Chats iniciados',
+          column3_4: 'Chats Recibidos',
+          column3_5: 'Chats Finalizados',
+          column3_6: 'Tiempo medio de espera',
+          column3_7: 'En Espera',
         },
         search: 'Número/Nombre...',
         dateStart: 'Fecha de inicio',
         dateEnd: 'Fecha final',
-        user: 'Usuario'
-
+        user: 'Usuario',
+        onlineTime: 'Tiempo online',
+        inService: 'En servicio',
+        finished: 'Finalizado'
       },
       notifications: {
         noTickets: "Sin notificaciones.",
       },
       queues: {
-        title: "Linhas",
+        title: "Líneas",
         table: {
           name: "Nombre",
           color: "Color",
@@ -363,7 +416,7 @@ const messages = {
         },
       },
       queueSelect: {
-        inputLabel: "Linhas",
+        inputLabel: "Líneas",
       },
       quickAnswers: {
         title: "Respuestas rápidas",
@@ -371,6 +424,8 @@ const messages = {
           shortcut: "Atajo",
           message: "Respuesta rápida",
           actions: "Acciones",
+          farewellMessage: "Mensaje de despedida",
+          standard: "Patrón"
         },
         buttons: {
           add: "Agregar respuesta rápida",
diff --git a/frontend/src/translate/languages/pt.js b/frontend/src/translate/languages/pt.js
index 6cdad45..b3d8cd3 100644
--- a/frontend/src/translate/languages/pt.js
+++ b/frontend/src/translate/languages/pt.js
@@ -59,6 +59,45 @@ const messages = {
            column3: 'Fechados Por Fila',
            column4: 'Tempo Online', 
            column5: 'Ações',
+        },
+        titles: {
+          selectQueues: 'Filas',
+          waiting: 'Em espera',
+          inService: 'Em Atendimento',
+          users: 'Usuários',
+          name: 'Nome',
+          attendant: 'Atendente',
+          dialogTitle: 'Relatórios',
+          dialogContentText: 'Escolha uma opção de relatório abaixo.',
+          transfer: 'Transferir para outras filas',
+          title: 'Tickets encerramento',
+          confirmationModal: 'Você tem certeza que quer excluir esta Status de encerramento: '          ,
+          status: 'Status de encerramento',
+          listUser: 'Lista de Usuarios',
+          user: 'Usuario',
+          notEnter: 'No ingresó',
+          notEnterToday: 'Não entrou'
+        }
+      },
+      reportOptType: {
+        listTitles: {
+          title1: 'Padrão',
+          title2: 'Sintético',
+          title3: 'Analítico'
+        }
+      },
+      configModal: {
+        titles: {
+          startService: 'Início atendimento',
+          endService: 'Fim atendimento',
+          enableDisable: 'Ativar/Desativar',
+          outOfHours: 'Mensagem fora do horário de atendimento',
+          outOfHoursSaturday: 'Mensagem fora do horário de atendimento sábado',
+          forTheWeekend: 'Mensagem fim de semana',
+          holiday: 'Data do feriado',
+          holidayMessage: 'Mensagem para feriados',
+          inactivityMessage: 'Mensagem por falta de atividade no atendimento',
+          save: 'Salvar'
         }
       },
       connections: {
@@ -299,7 +338,9 @@ const messages = {
           administration: "Administração",
           users: "Usuários",
           settings: "Configurações",
-          schedules: "Lembretes"
+          schedules: "Lembretes",
+          reports: "Relatórios",
+          campaign: "Campanha"
         },
         appBar: {
           user: {
@@ -336,14 +377,22 @@ const messages = {
           column1_9: 'Status de encerramento',
 
           column2_1: 'Atendente/Cliente',
-          
+
+          column3_1: 'Unidade',
+          column3_2: 'Fila',
+          column3_3: 'Conversas iniciadas',
+          column3_4: 'Conversas recebidas',
+          column3_5: 'Conversas finalizadas',
+          column3_6: 'Tempo médio de espera',
+          column3_7: 'Aguardando',          
         },
         search: 'Numer/Nome...',
         dateStart: 'Data início',
         dateEnd: 'Data fim',
-        user: 'Usuário'
-
-
+        user: 'Usuário',
+        onlineTime: 'Tempo online',
+        inService: 'Em atendimento',
+        finished: 'Finalizado'
       },
       notifications: {
         noTickets: "Nenhuma notificação.",
@@ -374,6 +423,8 @@ const messages = {
           shortcut: "Atalho",
           message: "Resposta Rápida",
           actions: "Ações",
+          farewellMessage: "Mensagem de despedida",
+          standard: "Padrão"
         },
         buttons: {
           add: "Adicionar Resposta Rápida",

From 814c892e081f6e206dddae79c077227754378d84 Mon Sep 17 00:00:00 2001
From: adriano <adriano08andrade@hotmail.com>
Date: Fri, 26 Jul 2024 15:23:02 -0500
Subject: [PATCH 5/6] fix(i18n): correct translation bugs

---
 frontend/server.js                            |  2 +-
 frontend/src/components/ConfigModal/index.js  |  2 --
 .../components/DashboardUser/TableUser.jsx    |  4 +--
 .../src/components/PositionModal/index.js     |  3 --
 frontend/src/translate/languages/en.js        |  4 ++-
 frontend/src/translate/languages/es.js        | 30 +++++++++----------
 frontend/src/translate/languages/pt.js        |  4 +--
 7 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/frontend/server.js b/frontend/server.js
index cd23e05..a05ba32 100644
--- a/frontend/server.js
+++ b/frontend/server.js
@@ -6,4 +6,4 @@ app.use(express.static(path.join(__dirname, "build")));
 app.get("/*", function (req, res) {
 	res.sendFile(path.join(__dirname, "build", "index.html"));
 });
-app.listen(3337);
+app.listen(3333);
diff --git a/frontend/src/components/ConfigModal/index.js b/frontend/src/components/ConfigModal/index.js
index c07218e..9ae3bc4 100644
--- a/frontend/src/components/ConfigModal/index.js
+++ b/frontend/src/components/ConfigModal/index.js
@@ -13,8 +13,6 @@ import DateFnsUtils from '@date-io/date-fns'
 import ptBrLocale from "date-fns/locale/pt-BR"
 import esLocale from 'date-fns/locale/es';
 
-import { i18n } from '../../../translate/i18n';
-
 import { WhatsAppsContext } from "../../context/WhatsApp/WhatsAppsContext"
 
 import {
diff --git a/frontend/src/components/DashboardUser/TableUser.jsx b/frontend/src/components/DashboardUser/TableUser.jsx
index e574d56..899f98f 100644
--- a/frontend/src/components/DashboardUser/TableUser.jsx
+++ b/frontend/src/components/DashboardUser/TableUser.jsx
@@ -75,7 +75,7 @@ const TableUser = ({ classes, usersOnlineInfo, logout }) => {
                   <MenuItem value={null}>Todos</MenuItem>
                   <MenuItem value={"online"}>Online</MenuItem>
                   <MenuItem value={"offline"}>Offline</MenuItem>
-                  <MenuItem value={"not"}>Não entrou</MenuItem>
+                  <MenuItem value={"not"}>{i18n.t('dashboard.titles.notEnter')}</MenuItem>
                 </Select>
               </FormControl>
             </Box>
@@ -221,7 +221,7 @@ const TableUser = ({ classes, usersOnlineInfo, logout }) => {
                           </div>
                         </TableCell>
                         <TableCell>
-                          {user.sumOnlineTime ? user.sumOnlineTime.sum : "Não entrou"}
+                          {user.sumOnlineTime ? user.sumOnlineTime.sum : i18n.t('dashboard.titles.notEnter')}
                         </TableCell>
                         <TableCell>
                           {user.statusOnline && user.statusOnline.status === "online" ? (
diff --git a/frontend/src/components/PositionModal/index.js b/frontend/src/components/PositionModal/index.js
index d1b68b7..4489f8d 100644
--- a/frontend/src/components/PositionModal/index.js
+++ b/frontend/src/components/PositionModal/index.js
@@ -5,9 +5,6 @@ import { Formik, Form, Field } from "formik"
 import { toast } from "react-toastify"
 import openSocket from 'socket.io-client'
 
-import { i18n } from "../../translate/i18n";
-
-
 import {
   makeStyles,
   Button,
diff --git a/frontend/src/translate/languages/en.js b/frontend/src/translate/languages/en.js
index e5bc319..9f10bd6 100644
--- a/frontend/src/translate/languages/en.js
+++ b/frontend/src/translate/languages/en.js
@@ -348,7 +348,9 @@ const messages = {
           title0_1: "Reminders/Schedulings",
           title1_1: "Calls by attendants",
           title2_1: "Whatsapp chat",
-          title3_1: "Users online/offline"
+          title3_1: "Users online/offline",
+          title4_1: "Attendance report by numbers",
+          title5_1: "Queue service report"
         },
         listColumns: {
           column0_1: 'Actions',
diff --git a/frontend/src/translate/languages/es.js b/frontend/src/translate/languages/es.js
index 5021cb0..6611563 100644
--- a/frontend/src/translate/languages/es.js
+++ b/frontend/src/translate/languages/es.js
@@ -52,15 +52,15 @@ const messages = {
           }
         },
 
-        table_users:{
-          
-           title: 'Lista de usuarios',
-           column0: 'Nombre',
-           column1: 'En servicio/Terminado(S)',
-           column2: 'Abrir por cola',
-           column3: 'Cerrado por cola',
-           column4: 'Tiempo Online', 
-           column5: 'Actions',
+        table_users: {
+
+          title: 'Lista de usuarios',
+          column0: 'Nombre',
+          column1: 'En servicio/Terminado(S)',
+          column2: 'Abrir por cola',
+          column3: 'Cerrado por cola',
+          column4: 'Tiempo Online',
+          column5: 'Actions',
         },
         titles: {
           selectQueues: 'Colas',
@@ -71,8 +71,8 @@ const messages = {
           attendant: 'Agente',
           dialogTitle: 'Reportes',
           dialogContentText: 'Escoja una opción de reporte abajo.',
-          transfer: 'Transferir para outras filas',
-          title: 'Entradas de cierre',
+          transfer: 'Transferir para otras Colas',
+          title: 'Cierre de Tickets',
           confirmationModal: 'Está seguro de que desea eliminar este estado de cierre: ',
           status: 'Status de cierre',
           listUser: 'Lista de Usuarios',
@@ -356,10 +356,10 @@ const messages = {
           title1_1: "Atención por agentes",
           title2_1: "Chat de whatsapp",
           title3_1: "Usuarios online/offline",
-          title4_1: "Relatório de atendimento por números",
-          title5_1: "Relatório de atendimento por filas"
+          title4_1: "Reporte de atención por números",
+          title5_1: "Reporte de atención por colas"
         },
-        listColumns:{
+        listColumns: {
           column0_1: 'Acción',
           column0_2: 'Pic',
           column0_3: 'Nombre',
@@ -370,7 +370,7 @@ const messages = {
           column0_8: 'Mensaje',
 
           column1_1: 'Almacenar',
-          column1_2: 'Secretario', 
+          column1_2: 'Secretario',
           column1_5: 'Tema',
           column1_6: 'Status',
           column1_7: 'Creado',
diff --git a/frontend/src/translate/languages/pt.js b/frontend/src/translate/languages/pt.js
index b3d8cd3..8c1af2b 100644
--- a/frontend/src/translate/languages/pt.js
+++ b/frontend/src/translate/languages/pt.js
@@ -75,8 +75,8 @@ const messages = {
           status: 'Status de encerramento',
           listUser: 'Lista de Usuarios',
           user: 'Usuario',
-          notEnter: 'No ingresó',
-          notEnterToday: 'Não entrou'
+          notEnter: 'Não entrou',
+          notEnterToday: 'Não entrou hoje'
         }
       },
       reportOptType: {

From e8227661e075ec5161a1c7bcc56100986e8c055f Mon Sep 17 00:00:00 2001
From: adriano <adriano08andrade@hotmail.com>
Date: Fri, 26 Jul 2024 16:08:18 -0500
Subject: [PATCH 6/6] fix(i18n): resolve translation issues

---
 frontend/src/pages/Dashboard/index.js  | 2 +-
 frontend/src/translate/languages/en.js | 3 ++-
 frontend/src/translate/languages/es.js | 3 ++-
 frontend/src/translate/languages/pt.js | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/Dashboard/index.js b/frontend/src/pages/Dashboard/index.js
index 99bbd0a..9337cc0 100644
--- a/frontend/src/pages/Dashboard/index.js
+++ b/frontend/src/pages/Dashboard/index.js
@@ -520,7 +520,7 @@ const Dashboard = () => {
                     variant="outlined"
                   >
                     <Typography component="h3" variant="h6" color="primary" paragraph>
-                      Fechados
+                      {i18n.t('dashboard.titles.ticketsClosed')}
                     </Typography>
                     <Grid item>
                       <Typography component="h1" variant="h4">
diff --git a/frontend/src/translate/languages/en.js b/frontend/src/translate/languages/en.js
index 9f10bd6..1b28d36 100644
--- a/frontend/src/translate/languages/en.js
+++ b/frontend/src/translate/languages/en.js
@@ -75,7 +75,8 @@ const messages = {
           listUser: 'List user',
           user: 'user',
           notEnter: 'Did not enter',
-          notEnterToday: 'Did not enter today'
+          notEnterToday: 'Did not enter today',
+          ticketsClosed: 'Closed'
         }
       },
       reportOptType: {
diff --git a/frontend/src/translate/languages/es.js b/frontend/src/translate/languages/es.js
index 6611563..b6a1d29 100644
--- a/frontend/src/translate/languages/es.js
+++ b/frontend/src/translate/languages/es.js
@@ -78,7 +78,8 @@ const messages = {
           listUser: 'Lista de Usuarios',
           user: 'Usuario',
           notEnter: 'No ingresó',
-          notEnterToday: 'No ingresó hoy'
+          notEnterToday: 'No ingresó hoy',
+          ticketsClosed: 'Cerrados'
         }
       },
       reportOptType: {
diff --git a/frontend/src/translate/languages/pt.js b/frontend/src/translate/languages/pt.js
index 8c1af2b..01a2a19 100644
--- a/frontend/src/translate/languages/pt.js
+++ b/frontend/src/translate/languages/pt.js
@@ -76,7 +76,8 @@ const messages = {
           listUser: 'Lista de Usuarios',
           user: 'Usuario',
           notEnter: 'Não entrou',
-          notEnterToday: 'Não entrou hoje'
+          notEnterToday: 'Não entrou hoje',
+          ticketsClosed: 'Fechados'
         }
       },
       reportOptType: {