Merge branch 'dev' into features/113-bilan-mensuel

manifest.webapp

@@ -3,7 +3,7 @@
   "slug": "ecolyo",
   "icon": "icon.svg",
   "categories": ["energy"],
-  "version": "0.1.6",
+  "version": "0.1.7",
   "licence": "AGPL-3.0",
   "editor": "Métropole de Lyon",
   "default_locale": "fr",

package.json

 {
   "name": "ecolyo",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "scripts": {
     "tx": "tx pull --all || true",
     "lint": "yarn lint:js && yarn lint:styles",

src/components/CommonKit/Modal/Modal.tsx

@@ -23,6 +23,9 @@ const Modal: React.FC<ModalProps> = ({
 
   useEffect(() => {
     open ? disableBackgroundScroll(true) : disableBackgroundScroll(false)
+    return () => {
+      disableBackgroundScroll(false)
+    }
   }, [open])
 
   const closeClick = () => {

src/components/ContentComponents/ChallengeList/ChallengesList.tsx

@@ -19,9 +19,12 @@ interface ChallengesListProps {
 const ChallengesList: React.FC<ChallengesListProps> = ({
   client,
 }: ChallengesListProps) => {
-  const { fluidTypes, refreshCurrentChallenge, screenType } = useContext(
-    AppContext
-  )
+  const {
+    fluidTypes,
+    refreshCurrentChallenge,
+    screenType,
+    challengeNotification,
+  } = useContext(AppContext)
   const challengeManager = new ChallengeManager(client)
   const [
     ongoingChallenge,
@@ -104,12 +107,7 @@ const ChallengesList: React.FC<ChallengesListProps> = ({
         setOngoingChallenge(ongoingChallengeTmp)
         setOngoingChallengeModal(ongoingChallengeTmp)
         setUserLevel(levelOfUser)
-        if (
-          await challengeManager.isChallengeOver(
-            ongoingChallengeTmp,
-            fluidTypes
-          )
-        ) {
+        if (challengeNotification) {
           setOpenChallengeModal(true)
           await challengeManager.endChallenge(ongoingChallengeTmp, fluidTypes)
           await refreshCurrentChallenge()
@@ -205,12 +203,14 @@ const ChallengesList: React.FC<ChallengesListProps> = ({
           </div>
         </div>
       )}
-      <ChallengeModal
-        opened={openChallengeModal}
-        challenge={ongoingChallengeModal}
-        handleCloseClick={handleCloseClick}
-        badgeStatus={ongoingChallengeModal && ongoingChallengeModal.badge}
-      />
+      {openChallengeModal && (
+        <ChallengeModal
+          opened={openChallengeModal}
+          challenge={ongoingChallengeModal}
+          handleCloseClick={handleCloseClick}
+          badgeStatus={ongoingChallengeModal && ongoingChallengeModal.badge}
+        />
+      )}
     </>
   )
 }

src/components/Contexts/AppContextProvider.tsx

@@ -79,7 +79,6 @@ const AppContextProvider: React.FC<AppContextProviderProps> = ({
   const [isIndexesLoadingSuccess, setIndexesLoadingSuccess] = useState<
     boolean | null
   >(null)
-
   const [isDataLoading, setDataLoading] = useState<boolean>(false)
   const [isDataLoadingSuccess, setDataLoadingSuccess] = useState<
     boolean | null
@@ -107,7 +106,6 @@ const AppContextProvider: React.FC<AppContextProviderProps> = ({
   const [challengeNotification, setChallengeNotification] = useState<boolean>(
     false
   )
-
   const [isContextLoaded, setContextLoaded] = useState<boolean>(false)
   const [isError, setError] = useState<boolean>(false)
   const [screenType, setScreenType] = useState<ScreenType>(ScreenType.MOBILE)