diff --git a/1/ecolyo.aecac12d6b6c6e78ef5b.js b/1/ecolyo.33ec7fbc09781b1a80f8.js
similarity index 97%
rename from 1/ecolyo.aecac12d6b6c6e78ef5b.js
rename to 1/ecolyo.33ec7fbc09781b1a80f8.js
index 8ab8c6ae82be9b2d76c58322981dc6ca242e7bc2..f602b34b4eb5bdf442f93e54d5bfd9808ad657f6 100644
--- a/1/ecolyo.aecac12d6b6c6e78ef5b.js
+++ b/1/ecolyo.33ec7fbc09781b1a80f8.js
@@ -953,11 +953,11 @@ var SgeInit = function SgeInit() {
   var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
     return state.ecolyo.global;
   }),
-      statusArray = _useAppSelector.fluidStatus;
+      fluidStatus = _useAppSelector.fluidStatus;
 
-  var fluidStatus = statusArray[_enums.FluidType.ELECTRICITY];
-  var konnectorSlug = fluidStatus.connection.konnectorConfig.slug;
-  var account = fluidStatus.connection.account;
+  var currentFluidStatus = fluidStatus[_enums.FluidType.ELECTRICITY];
+  var konnectorSlug = currentFluidStatus.connection.konnectorConfig.slug;
+  var account = currentFluidStatus.connection.account;
 
   var _useAppSelector2 = (0, _hooks.useAppSelector)(function (state) {
     return state.ecolyo.global;
@@ -966,7 +966,7 @@ var SgeInit = function SgeInit() {
 
   var dispatch = (0, _hooks.useAppDispatch)();
 
-  var _useKonnectorAuth = (0, _useKonnectorAuth3.default)(fluidStatus.fluidType),
+  var _useKonnectorAuth = (0, _useKonnectorAuth3.default)(currentFluidStatus.fluidType),
       _useKonnectorAuth2 = (0, _slicedToArray2.default)(_useKonnectorAuth, 2),
       connect = _useKonnectorAuth2[0],
       update = _useKonnectorAuth2[1];
@@ -1043,7 +1043,7 @@ var SgeInit = function SgeInit() {
       root: 'btn-highlight',
       label: 'text-16-bold'
     }
-  }, t("auth.".concat(konnectorSlug, ".connect"))), fluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_core.Button, {
+  }, t("auth.".concat(konnectorSlug, ".connect"))), currentFluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_core.Button, {
     classes: {
       root: 'btn-secondary',
       label: 'text-16-bold'
@@ -1672,9 +1672,9 @@ var Connection = function Connection(_ref) {
   var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
     return state.ecolyo.global;
   }),
-      statusArray = _useAppSelector.fluidStatus;
+      fluidStatus = _useAppSelector.fluidStatus;
 
-  var fluidStatus = statusArray[fluidType];
+  var currentFluidStatus = fluidStatus[fluidType];
   var dispatch = (0, _hooks.useAppDispatch)();
   var handleSuccess = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
     var updatedConnection;
@@ -1682,7 +1682,7 @@ var Connection = function Connection(_ref) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+            updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
               shouldLaunchKonnector: true
             });
             dispatch((0, _global.updateFluidConnection)({
@@ -1696,7 +1696,7 @@ var Connection = function Connection(_ref) {
         }
       }
     }, _callee);
-  })), [dispatch, fluidType, fluidStatus.connection]);
+  })), [dispatch, fluidType, currentFluidStatus.connection]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "konnector-form"
   }, fluidType === _enums.FluidType.ELECTRICITY && /*#__PURE__*/_react.default.createElement(_SgeInit.default, null), fluidType === _enums.FluidType.WATER && /*#__PURE__*/_react.default.createElement(_EpglInit.default, null), fluidType === _enums.FluidType.GAS && /*#__PURE__*/_react.default.createElement(_GrdfInit.default, {
@@ -1810,37 +1810,13 @@ var useKonnectorAuth = function useKonnectorAuth(fluidType, login, password) {
       connectError = _useState2[0],
       setError = _useState2[1];
 
-  var onSuccess = (0, _react2.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-    var updatedConnection;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            console.log('Début onSucess');
-            console.log(fluidStatus[1].connection);
-            updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
-              shouldLaunchKonnector: true
-            });
-            dispatch((0, _global.updateFluidConnection)({
-              fluidType: currentFluidStatus.fluidType,
-              fluidConnection: updatedConnection
-            }));
-
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  })), [fluidStatus, currentFluidStatus.connection, currentFluidStatus.fluidType, dispatch]);
-
   var sendUsageEventError = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(slug) {
-      return _regenerator.default.wrap(function _callee2$(_context2) {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(slug) {
+      return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context.prev = _context.next) {
             case 0:
-              return _context2.abrupt("return", _usageEvent.default.addEvent(client, {
+              return _context.abrupt("return", _usageEvent.default.addEvent(client, {
                 type: _enums.UsageEventType.KONNECTOR_CONNECT_EVENT,
                 target: slug,
                 result: 'error'
@@ -1848,28 +1824,28 @@ var useKonnectorAuth = function useKonnectorAuth(fluidType, login, password) {
 
             case 1:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
         }
-      }, _callee2);
+      }, _callee);
     }));
 
     return function sendUsageEventError(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 
   var connect = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-      var connectionService, _ref4, _account, _trigger, updatedConnection;
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      var connectionService, _ref3, _account, _trigger, updatedConnection;
 
-      return _regenerator.default.wrap(function _callee3$(_context3) {
+      return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               connectionService = new _connection.default(client);
-              _context3.prev = 1;
-              _context3.next = 4;
+              _context2.prev = 1;
+              _context2.next = 4;
               return _usageEvent.default.addEvent(client, {
                 type: _enums.UsageEventType.KONNECTOR_ATTEMPT_EVENT,
                 target: konnectorSlug,
@@ -1878,41 +1854,41 @@ var useKonnectorAuth = function useKonnectorAuth(fluidType, login, password) {
 
             case 4:
               if (!(konnectorSlug === _enums.FluidSlugType.WATER)) {
-                _context3.next = 10;
+                _context2.next = 10;
                 break;
               }
 
-              _context3.next = 7;
+              _context2.next = 7;
               return connectionService.connectNewUser(konnectorSlug, {
                 login: login ? login : '',
                 password: password
               });
 
             case 7:
-              _context3.t0 = _context3.sent;
-              _context3.next = 13;
+              _context2.t0 = _context2.sent;
+              _context2.next = 13;
               break;
 
             case 10:
-              _context3.next = 12;
+              _context2.next = 12;
               return connectionService.connectNewUser(konnectorSlug, undefined, sgeConnect);
 
             case 12:
-              _context3.t0 = _context3.sent;
+              _context2.t0 = _context2.sent;
 
             case 13:
-              _ref4 = _context3.t0;
-              _account = _ref4.account;
-              _trigger = _ref4.trigger;
+              _ref3 = _context2.t0;
+              _account = _ref3.account;
+              _trigger = _ref3.trigger;
 
               if (!(!_trigger || !_account)) {
-                _context3.next = 20;
+                _context2.next = 20;
                 break;
               }
 
               setError(t('konnector_form.error_account_creation'));
               sendUsageEventError(konnectorSlug);
-              return _context3.abrupt("return", null);
+              return _context2.abrupt("return", null);
 
             case 20:
               updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
@@ -1926,46 +1902,45 @@ var useKonnectorAuth = function useKonnectorAuth(fluidType, login, password) {
                 fluidConnection: updatedConnection
               }));
               console.log('Avant onSucess');
-              console.log(fluidStatus[1].connection); // onSuccess()
-
-              _context3.next = 33;
+              console.log(fluidStatus[1].connection);
+              _context2.next = 33;
               break;
 
             case 27:
-              _context3.prev = 27;
-              _context3.t1 = _context3["catch"](1);
+              _context2.prev = 27;
+              _context2.t1 = _context2["catch"](1);
               (0, _chart.setLoading)(false);
               sendUsageEventError(konnectorSlug);
 
-              _logger.default.error(_context3.t1);
+              _logger.default.error(_context2.t1);
 
               Sentry.captureException(JSON.stringify({
-                error: _context3.t1
+                error: _context2.t1
               }));
 
             case 33:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
         }
-      }, _callee3, null, [[1, 27]]);
+      }, _callee2, null, [[1, 27]]);
     }));
 
     return function connect() {
-      return _ref3.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 
   var update = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
       var _account, auth, accountService, updatedAccount, updatedConnection;
 
-      return _regenerator.default.wrap(function _callee4$(_context4) {
+      return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               if (!currentFluidStatus.connection.account) {
-                _context4.next = 11;
+                _context3.next = 10;
                 break;
               }
 
@@ -1989,30 +1964,30 @@ var useKonnectorAuth = function useKonnectorAuth(fluidType, login, password) {
 
               _account.auth = auth;
               accountService = new _account2.default(client);
-              _context4.next = 7;
+              _context3.next = 7;
               return accountService.updateAccount(_account);
 
             case 7:
-              updatedAccount = _context4.sent;
+              updatedAccount = _context3.sent;
               updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
-                account: updatedAccount
+                account: updatedAccount,
+                shouldLaunchKonnector: true
               });
               dispatch((0, _global.updateFluidConnection)({
                 fluidType: currentFluidStatus.fluidType,
                 fluidConnection: updatedConnection
               }));
-              onSuccess();
 
-            case 11:
+            case 10:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
         }
-      }, _callee4);
+      }, _callee3);
     }));
 
     return function update() {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
 
@@ -2175,16 +2150,16 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
   }),
       currentChallenge = _useAppSelector.challenge.currentChallenge,
       _useAppSelector$globa = _useAppSelector.global,
-      statusArray = _useAppSelector$globa.fluidStatus,
+      fluidStatus = _useAppSelector$globa.fluidStatus,
       shouldRefreshConsent = _useAppSelector$globa.shouldRefreshConsent,
       partnersInfo = _useAppSelector$globa.partnersInfo;
 
-  var fluidStatus = statusArray[fluidType];
-  var fluidSlug = fluidStatus.connection.konnectorConfig.slug;
-  var fluidState = fluidStatus.status;
-  var konnector = fluidStatus.connection.konnector;
-  var account = fluidStatus.connection.account;
-  var trigger = fluidStatus.connection.trigger;
+  var currentFluidStatus = fluidStatus[fluidType];
+  var fluidSlug = currentFluidStatus.connection.konnectorConfig.slug;
+  var fluidState = currentFluidStatus.status;
+  var konnector = currentFluidStatus.connection.konnector;
+  var account = currentFluidStatus.connection.account;
+  var trigger = currentFluidStatus.connection.trigger;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -2227,9 +2202,9 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
   var partnersInfoService = (0, _react.useMemo)(function () {
     return new _partnersInfo2.default(client);
   }, [client]);
-  var lastDataDate = fluidType !== _enums.FluidType.MULTIFLUID && statusArray[fluidType].lastDataDate ? statusArray[fluidType].lastDataDate.toLocaleString() + fluidType : fluidType;
-  var iconType = (0, _picto.getParamPicto)(fluidStatus.fluidType);
-  var iconAddType = isParam ? (0, _picto.getParamPicto)(fluidStatus.fluidType) : (0, _picto.getAddPicto)(fluidStatus.fluidType);
+  var lastDataDate = fluidType !== _enums.FluidType.MULTIFLUID && fluidStatus[fluidType].lastDataDate ? fluidStatus[fluidType].lastDataDate.toLocaleString() + fluidType : fluidType;
+  var iconType = (0, _picto.getParamPicto)(currentFluidStatus.fluidType);
+  var iconAddType = isParam ? (0, _picto.getParamPicto)(currentFluidStatus.fluidType) : (0, _picto.getAddPicto)(currentFluidStatus.fluidType);
 
   var toggleAccordion = function toggleAccordion() {
     setActive(function (prev) {
@@ -2367,7 +2342,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
   })), [refreshChallengeState, updateGlobalFluidStatus, setActive, partnersInfoService, fluidService, dispatch]);
   var handleConnectionEnd = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(isSuccess) {
-      var isGlobalLoginFailed, isEnedisCodeInseeError, shouldDeleteAccount, _fluidStatus$connecti, auth, accountService, _updatedFluidStatus3;
+      var isGlobalLoginFailed, isEnedisCodeInseeError, shouldDeleteAccount, _currentFluidStatus$c, auth, accountService, _updatedFluidStatus3;
 
       return _regenerator.default.wrap(function _callee4$(_context4) {
         while (1) {
@@ -2377,7 +2352,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
               isGlobalLoginFailed = konnectorErrorDescription === _enums.KonnectorError.LOGIN_FAILED || konnectorErrorDescription === _enums.KonnectorError.UNKNOWN_ERROR || konnectorErrorDescription === _enums.KonnectorError.CHALLENGE_ASKED || konnectorErrorDescription === _enums.KonnectorError.CRITICAL; // CASE FOR ENEDIS CODE INSEE ERROR
 
               isEnedisCodeInseeError = !isUpdating && fluidType === _enums.FluidType.ELECTRICITY;
-              shouldDeleteAccount = account && !isSuccess && fluidStatus && fluidStatus.connection.account && (isGlobalLoginFailed || isEnedisCodeInseeError);
+              shouldDeleteAccount = account && !isSuccess && currentFluidStatus && currentFluidStatus.connection.account && (isGlobalLoginFailed || isEnedisCodeInseeError);
 
               if (!shouldDeleteAccount) {
                 _context4.next = 12;
@@ -2385,9 +2360,9 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
               }
 
               // KEEP CREDENTIALS FOR EGL
-              if (fluidSlug === _enums.FluidSlugType.WATER && (_fluidStatus$connecti = fluidStatus.connection.account) !== null && _fluidStatus$connecti !== void 0 && _fluidStatus$connecti.auth) {
-                auth = fluidStatus.connection.account.auth;
-                fluidStatus.connection.konnectorConfig.lastKnownCredentials = auth.login;
+              if (fluidSlug === _enums.FluidSlugType.WATER && (_currentFluidStatus$c = currentFluidStatus.connection.account) !== null && _currentFluidStatus$c !== void 0 && _currentFluidStatus$c.auth) {
+                auth = currentFluidStatus.connection.account.auth;
+                currentFluidStatus.connection.konnectorConfig.lastKnownCredentials = auth.login;
               } // DELETE ACCOUNT
 
 
@@ -2404,7 +2379,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
               break;
 
             case 12:
-              if (!(isSuccess && fluidStatus.lastDataDate === null)) {
+              if (!(isSuccess && currentFluidStatus.lastDataDate === null)) {
                 _context4.next = 15;
                 break;
               }
@@ -2443,7 +2418,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
     return function (_x) {
       return _ref5.apply(this, arguments);
     };
-  }(), [account, konnectorErrorDescription, fluidStatus, isUpdating, fluidType, setActive, fluidSlug, client, handleAccountDeletion, updatedFluidStatus.length, fluidService, partnersInfo, dispatch]);
+  }(), [account, konnectorErrorDescription, currentFluidStatus, isUpdating, fluidType, setActive, fluidSlug, client, handleAccountDeletion, updatedFluidStatus.length, fluidService, partnersInfo, dispatch]);
   var sendUsageEventSuccess = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(konnectorSlug, isConnexion) {
       return _regenerator.default.wrap(function _callee5$(_context5) {
@@ -2523,7 +2498,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
         konnectorSlug: fluidSlug
       });
     } // Handle login failed for EGL
-    else if (fluidState === _enums.FluidState.ERROR_LOGIN_FAILED && fluidType === _enums.FluidType.WATER || account && fluidStatus.status !== _enums.FluidState.NOT_CONNECTED) {
+    else if (fluidState === _enums.FluidState.ERROR_LOGIN_FAILED && fluidType === _enums.FluidType.WATER || account && currentFluidStatus.status !== _enums.FluidState.NOT_CONNECTED) {
       return /*#__PURE__*/_react.default.createElement(_ConnectionResult.default, {
         handleAccountDeletion: handleAccountDeletion,
         fluidType: fluidType,
@@ -2531,10 +2506,10 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
       });
     } else {
       return /*#__PURE__*/_react.default.createElement(_Connection.default, {
-        fluidType: fluidStatus.fluidType
+        fluidType: currentFluidStatus.fluidType
       });
     }
-  }, [fluidState, isUpdating, account, fluidStatus, fluidSlug, handleAccountDeletion, fluidType, lastDataDate]);
+  }, [fluidState, isUpdating, account, currentFluidStatus, fluidSlug, handleAccountDeletion, fluidType, lastDataDate]);
   var callbackResponse = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(_state) {
       var updatedConnection;
@@ -2547,11 +2522,11 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
                 break;
               }
 
-              updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+              updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
                 shouldLaunchKonnector: false
               });
               dispatch((0, _global.updateFluidConnection)({
-                fluidType: fluidStatus.fluidType,
+                fluidType: currentFluidStatus.fluidType,
                 fluidConnection: updatedConnection
               }));
               _context7.t0 = Promise;
@@ -2582,40 +2557,40 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
     return function (_x6) {
       return _ref8.apply(this, arguments);
     };
-  }(), [dispatch, fluidStatus.connection, fluidStatus.fluidType, refreshChallengeState, updateGlobalFluidStatus]);
+  }(), [dispatch, currentFluidStatus.connection, currentFluidStatus.fluidType, refreshChallengeState, updateGlobalFluidStatus]);
   var displayKonnectorIcon = (0, _react.useCallback)(function () {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "konnector-icon"
     }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
-      icon: fluidStatus.connection.account ? iconType : _offlineParam.default,
+      icon: currentFluidStatus.connection.account ? iconType : _offlineParam.default,
       size: 49
-    }), fluidStatus.maintenance ? /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
+    }), currentFluidStatus.maintenance ? /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
       icon: _notif_maintenance.default,
       size: 24,
       className: "konnector-state-picto"
-    }) : (fluidStatus.status === _enums.FluidState.ERROR || isOutdatedData || fluidStatus.status === _enums.FluidState.ERROR_LOGIN_FAILED) && fluidStatus.connection.account && /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
+    }) : (currentFluidStatus.status === _enums.FluidState.ERROR || isOutdatedData || currentFluidStatus.status === _enums.FluidState.ERROR_LOGIN_FAILED) && currentFluidStatus.connection.account && /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
       icon: _notif_error.default,
       size: 24,
       className: "konnector-state-picto"
     }));
-  }, [fluidStatus.connection.account, fluidStatus.maintenance, fluidStatus.status, iconAddType, iconType, isOutdatedData]);
+  }, [currentFluidStatus.connection.account, currentFluidStatus.maintenance, currentFluidStatus.status, iconAddType, iconType, isOutdatedData]);
   var displayKonnectorHeader = (0, _react.useCallback)(function () {
-    if (fluidStatus.maintenance) {
+    if (currentFluidStatus.maintenance) {
       return /*#__PURE__*/_react.default.createElement("span", {
         className: "text-16-bold"
       }, t("konnector_options.partner_issue"));
-    } else if (isOutdatedData && fluidStatus.connection.account) {
+    } else if (isOutdatedData && currentFluidStatus.connection.account) {
       return /*#__PURE__*/_react.default.createElement("span", {
         className: "text-16-bold outdated"
       }, t('konnector_options.outdated', {
         isOutdatedData: isOutdatedData
       }));
-    } else if (fluidStatus.connection.account && !isOutdatedData) {
-      return t("FLUID.".concat(_enums.FluidType[fluidStatus.fluidType], ".LABEL"));
+    } else if (currentFluidStatus.connection.account && !isOutdatedData) {
+      return t("FLUID.".concat(_enums.FluidType[currentFluidStatus.fluidType], ".LABEL"));
     } else {
-      return t("konnector_options.label_offline_".concat(_enums.FluidType[fluidStatus.fluidType].toLowerCase()));
+      return t("konnector_options.label_offline_".concat(_enums.FluidType[currentFluidStatus.fluidType].toLowerCase()));
     }
-  }, [fluidStatus.connection.account, fluidStatus.fluidType, fluidStatus.maintenance, isOutdatedData, t]); // If user has selected accept button on Expired consent modal, then delete its account
+  }, [currentFluidStatus.connection.account, currentFluidStatus.fluidType, currentFluidStatus.maintenance, isOutdatedData, t]); // If user has selected accept button on Expired consent modal, then delete its account
 
   (0, _react.useEffect)(function () {
     function deleteAccountForConsentRefresh() {
@@ -2668,19 +2643,19 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
           while (1) {
             switch (_context9.prev = _context9.next) {
               case 0:
-                if (!(fluidStatus.connection.shouldLaunchKonnector && !(0, _triggers.isKonnectorRunning)(trigger))) {
+                if (!(currentFluidStatus.connection.shouldLaunchKonnector && !(0, _triggers.isKonnectorRunning)(trigger))) {
                   _context9.next = 11;
                   break;
                 }
 
                 if (subscribed) {
-                  if (fluidStatus.connection.isUpdating) setIsUpdating(true);
+                  if (currentFluidStatus.connection.isUpdating) setIsUpdating(true);
                   setOpenModal(true);
-                  updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+                  updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
                     shouldLaunchKonnector: false
                   });
                   dispatch((0, _global.updateFluidConnection)({
-                    fluidType: fluidStatus.fluidType,
+                    fluidType: currentFluidStatus.fluidType,
                     fluidConnection: updatedConnection
                   })); // fluidStatus.connection.shouldLaunchKonnector = false
                 }
@@ -2694,16 +2669,16 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
 
               case 8:
                 connectionFlow.jobWatcher.on(_flowEvents.ERROR_EVENT, function () {
-                  sendUsageEventError(fluidSlug, fluidStatus.lastDataDate === null);
+                  sendUsageEventError(fluidSlug, currentFluidStatus.lastDataDate === null);
                   setKonnectorErrorDescription(connectionFlow.jobWatcher.on()._error);
                   callbackResponse(_flowEvents.ERROR_EVENT);
                 });
                 connectionFlow.jobWatcher.on(_flowEvents.LOGIN_SUCCESS_EVENT, function () {
                   setIsLogging(false);
-                  sendUsageEventSuccess(fluidSlug, fluidStatus.lastDataDate === null);
+                  sendUsageEventSuccess(fluidSlug, currentFluidStatus.lastDataDate === null);
                 });
                 connectionFlow.jobWatcher.on(_flowEvents.SUCCESS_EVENT, function () {
-                  sendUsageEventSuccess(fluidSlug, fluidStatus.lastDataDate === null);
+                  sendUsageEventSuccess(fluidSlug, currentFluidStatus.lastDataDate === null);
                   callbackResponse(_flowEvents.SUCCESS_EVENT);
                 });
 
@@ -2719,19 +2694,19 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
 
     !shouldRefreshConsent && getData();
     var dateChartService = new _dateChart.default();
-    setIsOutdatedData(dateChartService.isDataOutdated(fluidStatus.lastDataDate, fluidType));
+    setIsOutdatedData(dateChartService.isDataOutdated(currentFluidStatus.lastDataDate, fluidType));
     return function () {
       subscribed = false;
     };
-  }, [client, konnector, trigger, fluidStatus.connection, fluidStatus.connection.shouldLaunchKonnector, fluidStatus.connection.isUpdating, fluidStatus.fluidType, callbackResponse, setActive, fluidStatus.lastDataDate, fluidType, sendUsageEventError, fluidSlug, sendUsageEventSuccess, shouldRefreshConsent]);
+  }, [client, konnector, trigger, currentFluidStatus.connection, currentFluidStatus.connection.shouldLaunchKonnector, currentFluidStatus.connection.isUpdating, currentFluidStatus.fluidType, callbackResponse, setActive, currentFluidStatus.lastDataDate, fluidType, sendUsageEventError, fluidSlug, sendUsageEventSuccess, shouldRefreshConsent]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !isDisconnected ? /*#__PURE__*/_react.default.createElement(_core.Accordion, {
     expanded: active,
     onChange: toggleAccordion,
     classes: {
-      root: "expansion-panel-root ".concat(!fluidStatus.maintenance && (fluidStatus.status === _enums.FluidState.ERROR || fluidStatus.status === _enums.FluidState.ERROR_LOGIN_FAILED) ? 'red-border' : '')
+      root: "expansion-panel-root ".concat(!currentFluidStatus.maintenance && (currentFluidStatus.status === _enums.FluidState.ERROR || currentFluidStatus.status === _enums.FluidState.ERROR_LOGIN_FAILED) ? 'red-border' : '')
     }
   }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, {
-    "aria-label": t("konnector_options.accessibility.button_toggle_detail_".concat(_enums.FluidType[fluidStatus.fluidType].toLowerCase())),
+    "aria-label": t("konnector_options.accessibility.button_toggle_detail_".concat(_enums.FluidType[currentFluidStatus.fluidType].toLowerCase())),
     expandIcon: /*#__PURE__*/_react.default.createElement(_Icon.default, {
       icon: _chevronDown.default,
       size: 16,
@@ -2742,7 +2717,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
       content: 'expansion-panel-content'
     }
   }, displayKonnectorIcon(), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)('text-16-bold konnector-title', (0, _defineProperty2.default)({}, "".concat(_enums.FluidType[fluidStatus.fluidType].toLowerCase(), "-connected"), fluidStatus.status !== _enums.FluidState.NOT_CONNECTED && !fluidStatus.maintenance))
+    className: (0, _classnames.default)('text-16-bold konnector-title', (0, _defineProperty2.default)({}, "".concat(_enums.FluidType[currentFluidStatus.fluidType].toLowerCase(), "-connected"), currentFluidStatus.status !== _enums.FluidState.NOT_CONNECTED && !currentFluidStatus.maintenance))
   }, displayKonnectorHeader())), /*#__PURE__*/_react.default.createElement(_core.AccordionDetails, {
     classes: {
       root: 'expansion-panel-details'
@@ -2753,7 +2728,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
     isLogging: isLogging,
     state: konnectorState,
     error: konnectorErrorDescription,
-    fluidType: fluidStatus.fluidType,
+    fluidType: currentFluidStatus.fluidType,
     handleCloseClick: handleConnectionEnd,
     handleAccountDeletion: handleAccountDeletion,
     account: account
@@ -3332,17 +3307,17 @@ var GrdfInit = function GrdfInit(_ref) {
     return state.ecolyo;
   }),
       isConnectionModalOpen = _useAppSelector.modal.isConnectionModalOpen,
-      statusArray = _useAppSelector.global.fluidStatus;
+      fluidStatus = _useAppSelector.global.fluidStatus;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       showForm = _useState2[0],
       setShowForm = _useState2[1];
 
-  var fluidStatus = statusArray[_enums.FluidType.GAS];
-  var konnectorSlug = fluidStatus.connection.konnectorConfig.slug;
-  var siteLink = fluidStatus.connection.konnectorConfig.siteLink;
-  var konnector = fluidStatus.connection.konnector;
+  var currentFluidStatus = fluidStatus[_enums.FluidType.GAS];
+  var konnectorSlug = currentFluidStatus.connection.konnectorConfig.slug;
+  var siteLink = currentFluidStatus.connection.konnectorConfig.siteLink;
+  var konnector = currentFluidStatus.connection.konnector;
   var handleSuccess = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(accountId) {
       var accountService, account, updatedConnection, triggersServices, trigger, _updatedConnection;
@@ -3368,12 +3343,12 @@ var GrdfInit = function GrdfInit(_ref) {
                 break;
               }
 
-              updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+              updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
                 account: null,
                 trigger: null
               });
               dispatch((0, _global.updateFluidConnection)({
-                fluidType: fluidStatus.fluidType,
+                fluidType: currentFluidStatus.fluidType,
                 fluidConnection: updatedConnection
               }));
               _context.next = 10;
@@ -3394,12 +3369,12 @@ var GrdfInit = function GrdfInit(_ref) {
 
             case 15:
               trigger = _context.sent;
-              _updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+              _updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
                 account: account,
                 trigger: trigger
               });
               dispatch((0, _global.updateFluidConnection)({
-                fluidType: fluidStatus.fluidType,
+                fluidType: currentFluidStatus.fluidType,
                 fluidConnection: _updatedConnection
               }));
               onSuccess();
@@ -3415,7 +3390,7 @@ var GrdfInit = function GrdfInit(_ref) {
     return function (_x) {
       return _ref2.apply(this, arguments);
     };
-  }(), [client, konnector, dispatch, fluidStatus.fluidType, fluidStatus.connection, onSuccess, konnectorSlug]);
+  }(), [client, konnector, dispatch, currentFluidStatus.fluidType, currentFluidStatus.connection, onSuccess, konnectorSlug]);
   var goToPartnerSite = (0, _react.useCallback)(function () {
     window.open(siteLink, '_blank');
   }, [siteLink]);
@@ -3826,13 +3801,13 @@ var FormLogin = function FormLogin() {
   var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
     return state.ecolyo.global;
   }),
-      statusArray = _useAppSelector.fluidStatus;
+      fluidStatus = _useAppSelector.fluidStatus;
 
-  var fluidStatus = statusArray[_enums.FluidType.WATER];
-  var konnectorSlug = fluidStatus.connection.konnectorConfig.slug;
-  var lastKnownCredentials = fluidStatus.connection.konnectorConfig.lastKnownCredentials;
-  var fluidName = _enums.FluidType[fluidStatus.fluidType];
-  var account = fluidStatus.connection.account;
+  var currentFluidStatus = fluidStatus[_enums.FluidType.WATER];
+  var konnectorSlug = currentFluidStatus.connection.konnectorConfig.slug;
+  var lastKnownCredentials = currentFluidStatus.connection.konnectorConfig.lastKnownCredentials;
+  var fluidName = _enums.FluidType[currentFluidStatus.fluidType];
+  var account = currentFluidStatus.connection.account;
 
   var _useState = (0, _react2.useState)(''),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -3856,7 +3831,7 @@ var FormLogin = function FormLogin() {
 
   var icon = (0, _picto.getPartnerPicto)(konnectorSlug);
 
-  var _useKonnectorAuth = (0, _useKonnectorAuth3.default)(fluidStatus.fluidType, login, password),
+  var _useKonnectorAuth = (0, _useKonnectorAuth3.default)(currentFluidStatus.fluidType, login, password),
       _useKonnectorAuth2 = (0, _slicedToArray2.default)(_useKonnectorAuth, 3),
       connect = _useKonnectorAuth2[0],
       update = _useKonnectorAuth2[1],
@@ -6305,9 +6280,9 @@ var GrdfBill = function GrdfBill() {
   var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
     return state.ecolyo.global;
   }),
-      statusArray = _useAppSelector.fluidStatus;
+      fluidStatus = _useAppSelector.fluidStatus;
 
-  var fluidStatus = statusArray[_enums.FluidType.GAS];
+  var currentFluidStatus = fluidStatus[_enums.FluidType.GAS];
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "connection-form"
   }, /*#__PURE__*/_react.default.createElement("p", {
@@ -6331,7 +6306,7 @@ var GrdfBill = function GrdfBill() {
       root: 'btn-highlight',
       label: 'text-16-bold'
     }
-  }, t('auth.grdfgrandlyon.connect')), fluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_Button.default, {
+  }, t('auth.grdfgrandlyon.connect')), currentFluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_Button.default, {
     classes: {
       root: 'btn-secondary',
       label: 'text-16-bold'
@@ -6779,7 +6754,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var ConnectionResult = function ConnectionResult(_ref) {
-  var _fluidStatus$connecti2;
+  var _currentFluidStatus$c2;
 
   var handleAccountDeletion = _ref.handleAccountDeletion,
       fluidType = _ref.fluidType;
@@ -6793,10 +6768,10 @@ var ConnectionResult = function ConnectionResult(_ref) {
   var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
     return state.ecolyo.global;
   }),
-      statusArray = _useAppSelector.fluidStatus;
+      fluidStatus = _useAppSelector.fluidStatus;
 
-  var fluidStatus = statusArray[fluidType];
-  var account = fluidStatus.connection.account;
+  var currentFluidStatus = fluidStatus[fluidType];
+  var account = currentFluidStatus.connection.account;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -6850,12 +6825,12 @@ var ConnectionResult = function ConnectionResult(_ref) {
               setStatus('');
               setLastExecutionDate('-');
               setKonnectorError('');
-              updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+              updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
                 shouldLaunchKonnector: true,
                 isUpdating: true
               });
               dispatch((0, _global.updateFluidConnection)({
-                fluidType: fluidStatus.fluidType,
+                fluidType: currentFluidStatus.fluidType,
                 fluidConnection: updatedConnection
               }));
               setUpdating(false);
@@ -6968,8 +6943,8 @@ var ConnectionResult = function ConnectionResult(_ref) {
   })), [account, client, handleAccountDeletion]);
   var isOutdated = (0, _react.useCallback)(function () {
     var dateChartService = new _dateChart.default();
-    return dateChartService.isDataOutdated(fluidStatus.lastDataDate, fluidStatus.fluidType);
-  }, [fluidStatus]);
+    return dateChartService.isDataOutdated(currentFluidStatus.lastDataDate, currentFluidStatus.fluidType);
+  }, [currentFluidStatus]);
   var hasUpdatedToday = (0, _react.useCallback)(function () {
     var todayDate = _luxon.DateTime.local().setZone('utc', {
       keepLocalTime: true
@@ -6987,9 +6962,9 @@ var ConnectionResult = function ConnectionResult(_ref) {
   }, [lastExecutionDate]);
   var handleRefreshConsent = (0, _react.useCallback)(function (fluidType) {
     if (fluidType == _enums.FluidType.ELECTRICITY) {
-      var _fluidStatus$connecti;
+      var _currentFluidStatus$c;
 
-      var accountData = (_fluidStatus$connecti = fluidStatus.connection.account) === null || _fluidStatus$connecti === void 0 ? void 0 : _fluidStatus$connecti.auth; // store the previous account data since the onDelete will remove account from DB
+      var accountData = (_currentFluidStatus$c = currentFluidStatus.connection.account) === null || _currentFluidStatus$c === void 0 ? void 0 : _currentFluidStatus$c.auth; // store the previous account data since the onDelete will remove account from DB
 
       dispatch((0, _global.updateSgeStore)({
         currentStep: 0,
@@ -7007,27 +6982,27 @@ var ConnectionResult = function ConnectionResult(_ref) {
     } else {
       deleteAccountsAndTriggers();
     }
-  }, [deleteAccountsAndTriggers, dispatch, (_fluidStatus$connecti2 = fluidStatus.connection.account) === null || _fluidStatus$connecti2 === void 0 ? void 0 : _fluidStatus$connecti2.auth]);
+  }, [deleteAccountsAndTriggers, dispatch, (_currentFluidStatus$c2 = currentFluidStatus.connection.account) === null || _currentFluidStatus$c2 === void 0 ? void 0 : _currentFluidStatus$c2.auth]);
   (0, _react.useEffect)(function () {
-    var _fluidStatus$connecti3, _fluidStatus$connecti4, _fluidStatus$connecti5;
+    var _currentFluidStatus$c3, _currentFluidStatus$c4, _currentFluidStatus$c5;
 
-    if ((_fluidStatus$connecti3 = fluidStatus.connection.triggerState) !== null && _fluidStatus$connecti3 !== void 0 && _fluidStatus$connecti3.last_success) {
-      var result = _luxon.DateTime.fromISO(fluidStatus.connection.triggerState.last_success);
+    if ((_currentFluidStatus$c3 = currentFluidStatus.connection.triggerState) !== null && _currentFluidStatus$c3 !== void 0 && _currentFluidStatus$c3.last_success) {
+      var result = _luxon.DateTime.fromISO(currentFluidStatus.connection.triggerState.last_success);
 
       setLastExecutionDate(result);
     } else {
       setLastExecutionDate('-');
     }
 
-    if (((_fluidStatus$connecti4 = fluidStatus.connection.triggerState) === null || _fluidStatus$connecti4 === void 0 ? void 0 : _fluidStatus$connecti4.status) === 'errored' && (_fluidStatus$connecti5 = fluidStatus.connection.triggerState) !== null && _fluidStatus$connecti5 !== void 0 && _fluidStatus$connecti5.last_error) {
+    if (((_currentFluidStatus$c4 = currentFluidStatus.connection.triggerState) === null || _currentFluidStatus$c4 === void 0 ? void 0 : _currentFluidStatus$c4.status) === 'errored' && (_currentFluidStatus$c5 = currentFluidStatus.connection.triggerState) !== null && _currentFluidStatus$c5 !== void 0 && _currentFluidStatus$c5.last_error) {
       setStatus('errored');
-      setKonnectorError((0, _utils.getKonnectorUpdateError)(fluidStatus.connection.triggerState.last_error));
+      setKonnectorError((0, _utils.getKonnectorUpdateError)(currentFluidStatus.connection.triggerState.last_error));
     }
 
     if (isOutdated()) {
       setOutDatedDataDays(isOutdated());
     }
-  }, [fluidStatus.connection.triggerState, isOutdated]);
+  }, [currentFluidStatus.connection.triggerState, isOutdated]);
 
   var getFluidTypeTranslation = function getFluidTypeTranslation(fluidType) {
     switch (fluidType) {
@@ -7053,7 +7028,7 @@ var ConnectionResult = function ConnectionResult(_ref) {
 
   var getConnectionStatus = function getConnectionStatus() {
     // First check if there is partner error from backoffice
-    if (fluidStatus.maintenance) {
+    if (currentFluidStatus.maintenance) {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "connection-caption text-16-normal"
       }, /*#__PURE__*/_react.default.createElement("div", {
@@ -7076,7 +7051,7 @@ var ConnectionResult = function ConnectionResult(_ref) {
 
     if (outDatedDataDays) {
       return /*#__PURE__*/_react.default.createElement(DisplayDataOutdated, {
-        fluidStatus: fluidStatus,
+        fluidStatus: currentFluidStatus,
         fluidType: fluidType,
         lastExecutionDate: lastExecutionDate,
         hasUpdatedToday: hasUpdatedToday()
@@ -7093,7 +7068,7 @@ var ConnectionResult = function ConnectionResult(_ref) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "connection-update-result"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: status === 'errored' && !hasUpdatedToday() && !fluidStatus.maintenance ? 'connection-update-errored' : ''
+    className: status === 'errored' && !hasUpdatedToday() && !currentFluidStatus.maintenance ? 'connection-update-errored' : ''
   }, getConnectionStatus()), /*#__PURE__*/_react.default.createElement("div", {
     className: "inline-buttons"
   }, !consentError && /*#__PURE__*/_react.default.createElement(_Button.default, {
@@ -7176,7 +7151,7 @@ var DisplayDataOutdated = function DisplayDataOutdated(_ref5) {
 
 
 var DisplayAlreadyUpdatedToday = function DisplayAlreadyUpdatedToday(_ref6) {
-  var _fluidStatus$connecti6;
+  var _fluidStatus$connecti;
 
   var fluidStatus = _ref6.fluidStatus,
       fluidType = _ref6.fluidType,
@@ -7202,7 +7177,7 @@ var DisplayAlreadyUpdatedToday = function DisplayAlreadyUpdatedToday(_ref6) {
     className: "connection-caption"
   }, t('konnector_form.label_updated_at')), /*#__PURE__*/_react.default.createElement("div", {
     className: "text-16-bold"
-  }, lastExecutionDate.toLocaleString()), /*#__PURE__*/_react.default.createElement("div", null, (fluidStatus === null || fluidStatus === void 0 ? void 0 : (_fluidStatus$connecti6 = fluidStatus.connection) === null || _fluidStatus$connecti6 === void 0 ? void 0 : _fluidStatus$connecti6.konnector) && t('konnector_form.issue') + ' ' + getFluidTypeKonnectorTranslation(fluidType) + '.'));
+  }, lastExecutionDate.toLocaleString()), /*#__PURE__*/_react.default.createElement("div", null, (fluidStatus === null || fluidStatus === void 0 ? void 0 : (_fluidStatus$connecti = fluidStatus.connection) === null || _fluidStatus$connecti === void 0 ? void 0 : _fluidStatus$connecti.konnector) && t('konnector_form.issue') + ' ' + getFluidTypeKonnectorTranslation(fluidType) + '.'));
 };
 /** Tells user to run a manual update */
 
@@ -7349,10 +7324,10 @@ var GrdfFormOAuth = function GrdfFormOAuth(_ref) {
     return state.ecolyo.global;
   }),
       shouldRefreshConsent = _useAppSelector.shouldRefreshConsent,
-      statusArray = _useAppSelector.fluidStatus;
+      fluidStatus = _useAppSelector.fluidStatus;
 
-  var fluidStatus = statusArray[_enums.FluidType.GAS];
-  var konnector = fluidStatus.connection.konnector;
+  var currentFluidStatus = fluidStatus[_enums.FluidType.GAS];
+  var konnector = currentFluidStatus.connection.konnector;
   var dispatch = (0, _hooks.useAppDispatch)();
 
   var _useState = (0, _react.useState)(IDLE),
@@ -7370,7 +7345,7 @@ var GrdfFormOAuth = function GrdfFormOAuth(_ref) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            if (!(konnector !== null && konnector !== void 0 && konnector.slug && fluidStatus.lastDataDate === null)) {
+            if (!(konnector !== null && konnector !== void 0 && konnector.slug && currentFluidStatus.lastDataDate === null)) {
               _context.next = 3;
               break;
             }
@@ -7391,7 +7366,7 @@ var GrdfFormOAuth = function GrdfFormOAuth(_ref) {
         }
       }
     }, _callee);
-  })), [client, fluidStatus.lastDataDate, konnector]);
+  })), [client, currentFluidStatus.lastDataDate, konnector]);
   var handleAccountId = (0, _react.useCallback)(function (accountId) {
     endOAuth();
     onSuccess(accountId);
@@ -7590,9 +7565,9 @@ var EpglBill = function EpglBill() {
   var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
     return state.ecolyo.global;
   }),
-      statusArray = _useAppSelector.fluidStatus;
+      fluidStatus = _useAppSelector.fluidStatus;
 
-  var fluidStatus = statusArray[_enums.FluidType.WATER];
+  var currentFluidStatus = fluidStatus[_enums.FluidType.WATER];
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "connection-form"
   }, /*#__PURE__*/_react.default.createElement("p", {
@@ -7616,7 +7591,7 @@ var EpglBill = function EpglBill() {
       root: 'btn-highlight',
       label: 'text-16-bold'
     }
-  }, t('auth.eglgrandlyon.connect')), fluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_Button.default, {
+  }, t('auth.eglgrandlyon.connect')), currentFluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_Button.default, {
     classes: {
       root: 'btn-secondary',
       label: 'text-16-bold'
@@ -7834,10 +7809,10 @@ var EpglInit = function EpglInit() {
     return state.ecolyo;
   }),
       isConnectionModalOpen = _useAppSelector.modal.isConnectionModalOpen,
-      statusArray = _useAppSelector.global.fluidStatus;
+      fluidStatus = _useAppSelector.global.fluidStatus;
 
-  var fluidStatus = statusArray[_enums.FluidType.WATER];
-  var siteLink = fluidStatus.connection.konnectorConfig.siteLink;
+  var currentFluidStatus = fluidStatus[_enums.FluidType.WATER];
+  var siteLink = currentFluidStatus.connection.konnectorConfig.siteLink;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
diff --git a/app/ecolyo.20200bbb498d9c87450b.js b/app/ecolyo.45cff1abf4280e6c9007.js
similarity index 99%
rename from app/ecolyo.20200bbb498d9c87450b.js
rename to app/ecolyo.45cff1abf4280e6c9007.js
index a4d9220bda0442f3dea0ea3d7f07d44c2a9b1725..5df9cf6f7e8dc7cf140f3ac5ef8d70d338a177ce 100644
--- a/app/ecolyo.20200bbb498d9c87450b.js
+++ b/app/ecolyo.45cff1abf4280e6c9007.js
@@ -64,7 +64,7 @@
 /******/
 /******/ 	// script path function
 /******/ 	function jsonpScriptSrc(chunkId) {
-/******/ 		return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"aecac12d6b6c6e78ef5b","2":"ee6e82fa75e665d74560","4":"d2bf69e982254c3ce239","5":"376cdd52c18eb6f092a0","6":"06009b1da7881a5924bd","7":"03964c0031ba71f39f0a","8":"79baa4590f4f0a94be8c","9":"30da7dc1931663d9bbdf","10":"24e1a14cab96b50d3fbd"}[chunkId] + ".js"
+/******/ 		return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"33ec7fbc09781b1a80f8","2":"ee6e82fa75e665d74560","4":"d2bf69e982254c3ce239","5":"376cdd52c18eb6f092a0","6":"06009b1da7881a5924bd","7":"03964c0031ba71f39f0a","8":"79baa4590f4f0a94be8c","9":"30da7dc1931663d9bbdf","10":"24e1a14cab96b50d3fbd"}[chunkId] + ".js"
 /******/ 	}
 /******/
 /******/ 	// The require function
@@ -23199,8 +23199,11 @@ var globalSlice = (0, _toolkit.createSlice)({
     setShouldRefreshConsent: function setShouldRefreshConsent(state, action) {
       state.shouldRefreshConsent = action.payload;
     },
-    updateFluidConnection: function updateFluidConnection(state, action) {
-      state.fluidStatus[action.payload.fluidType].connection = action.payload.fluidConnection;
+    updateFluidConnection: function updateFluidConnection(state, _ref) {
+      var _ref$payload = _ref.payload,
+          fluidType = _ref$payload.fluidType,
+          fluidConnection = _ref$payload.fluidConnection;
+      state.fluidStatus[fluidType].connection = fluidConnection;
     },
     updateSgeStore: function updateSgeStore(state, action) {
       state.sgeConnect = action.payload;
diff --git a/index.html b/index.html
index f17be7ff7826e83851ac3571a996532dd51c0f1d..d637fdccc8422b992b1a666c25944c7dc12ae8e0 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.e8305b3519e4c7b4170b.js"></script><script src="app/ecolyo.20200bbb498d9c87450b.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.e8305b3519e4c7b4170b.js"></script><script src="app/ecolyo.45cff1abf4280e6c9007.js"></script></div></body></html>
\ No newline at end of file