Merge development (#86)

src/components/Contexts/CarUpdatesContext.jsx

@@ -1,6 +1,6 @@
 import React, { useContext, useState } from "react";
 
-import api from "../../services/updates";
+import api from "../../services/updatesAPI";
 import { validateStatusMessage } from "../../utils/statusMessage";
 
 const FINAL_UPDATE_STATES = ["package_install_complete"];
@@ -122,9 +122,9 @@ export const CarUpdatesProvider = ({ children }) => {
     let items = JSON.parse(JSON.stringify(carUpdates));
 
     statuses.forEach((status) => {
-      let item = items.find((item) => status.car_update_id === item.id);
-      if (!item || status.car_update_id === 0) return;
-      applyProgressStatus(item, status);
+      let x = items.find((item) => status.car_update_id === item.id);
+      if (!x || status.car_update_id === 0) return;
+      applyProgressStatus(x, status);
     });
 
     setCarUpdates(items);

src/components/Contexts/ManifestsContext.jsx

@@ -1,6 +1,6 @@
 import React, { useContext, useState } from "react";
 
-import api from "../../services/manifests";
+import api from "../../services/manifestsAPI";
 import { uploadFile, getCancelToken } from "../../services/uploadFile";
 
 const ManifestsContext = React.createContext();

src/components/Contexts/UserContext.jsx

@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useState } from "react";
 import auth from "../../services/auth";
-import getTimerWorker from "../../services/timer";
+import getTimerWorker from "../../services/getTimerWorker";
 import { parsePayload } from "../../utils/jwt";
 import { getGroups } from "../../utils/roles";
 
@@ -37,8 +37,7 @@ export const UserProvider = ({ children }) => {
 
   const refreshTokens = async () => {
     if (!token || !token.refreshToken || !token.refreshToken.token) return null;
-    const result = await refresh(token.refreshToken.token);
-    return result;
+    return refresh(token.refreshToken.token);
   };
 
   const startSessionTimer = () => {

src/components/Contexts/UserContext.test.jsx

@@ -1,5 +1,5 @@
 jest.mock("../../services/auth");
-jest.mock("../../services/timer");
+jest.mock("../../services/getTimerWorker");
 
 import {
   render,
@@ -10,7 +10,7 @@ import {
 } from "@testing-library/react";
 import { UserProvider, useUserContext } from "../Contexts/UserContext";
 import auth from "../../services/auth";
-import getTimerWorker from "../../services/timer";
+import getTimerWorker from "../../services/getTimerWorker";
 import { TEST_AUTH_OBJECT, TEST_EXPECTED_GROUPS } from "../../utils/testing";
 
 const INVALID_TOKEN_RESPONSE = {
@@ -125,14 +125,8 @@ describe("UseContext", () => {
   describe("Signout", () => {
     beforeEach(async () => {
       const TestComp = () => {
-        const {
-          signIn,
-          signOut,
-          error,
-          token,
-          groups,
-          fetching,
-        } = useUserContext();
+        const { signIn, signOut, error, token, groups, fetching } =
+          useUserContext();
         return (
           <>
             <div data-testid="error">{error}</div>