diff --git a/5/ecolyo.760d84e3e28ae17a0fb1.js b/5/ecolyo.5aef7c5a3bfdd73e738d.js
similarity index 99%
rename from 5/ecolyo.760d84e3e28ae17a0fb1.js
rename to 5/ecolyo.5aef7c5a3bfdd73e738d.js
index 7539385e95b0c572b24c3b9dedf5366a4c14a671..9f82b8f032a2ee619ecfb0d3077c377b299b0de0 100644
--- a/5/ecolyo.760d84e3e28ae17a0fb1.js
+++ b/5/ecolyo.5aef7c5a3bfdd73e738d.js
@@ -910,7 +910,6 @@ var _offlineParam = _interopRequireDefault(__webpack_require__("00x6"));
var _classnames = _interopRequireDefault(__webpack_require__("uRLs"));
var _StyledIcon = _interopRequireDefault(__webpack_require__("VP3k"));
var _Connection = _interopRequireDefault(__webpack_require__("xrI2"));
-var _GrdfWaitConsent = __webpack_require__("c3xf");
var _KonnectorModal = _interopRequireDefault(__webpack_require__("mdtF"));
var _cozyClient = __webpack_require__("xEu0");
var _triggers = __webpack_require__("JPZu");
@@ -1182,9 +1181,6 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
}
}, [dispatch, fluidType, navigate]);
var getConnectionCard = (0, _react.useCallback)(function () {
- if (fluidType === _enums.FluidType.GAS && fluidState === _enums.FluidState.CHALLENGE_ASKED) {
- return /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, null);
- }
if (showOfflineData && !account) {
return /*#__PURE__*/_react.default.createElement(_core.Button, {
className: "btnPrimary",
@@ -4538,6 +4534,7 @@ var _defineProperty2 = _interopRequireDefault(__webpack_require__("J58c"));
var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("HZZ/"));
var _slicedToArray2 = _interopRequireDefault(__webpack_require__("XkwL"));
var _ExpiredConsentModal = _interopRequireDefault(__webpack_require__("Hmac"));
+var _GrdfWaitConsent = __webpack_require__("c3xf");
var _Content = _interopRequireDefault(__webpack_require__("Yd9R"));
var _CustomPopupModal = _interopRequireDefault(__webpack_require__("oJdK"));
var _DateNavigator = _interopRequireDefault(__webpack_require__("r5RG"));
@@ -4590,6 +4587,7 @@ var ConsumptionView = function ConsumptionView(_ref) {
_useAppSelector$modal = _useAppSelector.modal,
partnersIssueModal = _useAppSelector$modal.partnersIssueModal,
customPopupModal = _useAppSelector$modal.customPopupModal;
+ var currentFluidStatus = fluidStatus[fluidType];
var dateChartService = new _dateChart.default();
var _useState = (0, _react.useState)(releaseNotes.show),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -4611,8 +4609,8 @@ var ConsumptionView = function ConsumptionView(_ref) {
_useState10 = (0, _slicedToArray2.default)(_useState9, 2),
consentExpiredFluids = _useState10[0],
setConsentExpiredFluids = _useState10[1];
- var updateKey = fluidType !== _enums.FluidType.MULTIFLUID && fluidStatus[fluidType].lastDataDate ? "".concat(fluidStatus[fluidType].lastDataDate.toLocaleString(), " + ").concat(fluidStatus[fluidType].status + fluidType) : '';
- var lastDataDateKey = fluidType !== _enums.FluidType.MULTIFLUID && fluidStatus[fluidType].lastDataDate ? "".concat(fluidStatus[fluidType].lastDataDate.toLocaleString() + fluidType) : '';
+ var updateKey = fluidType !== _enums.FluidType.MULTIFLUID && currentFluidStatus.lastDataDate ? "".concat(currentFluidStatus.lastDataDate.toLocaleString(), " + ").concat(currentFluidStatus.status + fluidType) : '';
+ var lastDataDateKey = fluidType !== _enums.FluidType.MULTIFLUID && currentFluidStatus.lastDataDate ? "".concat(currentFluidStatus.lastDataDate.toLocaleString() + fluidType) : '';
var handleCloseReleaseNoteModal = (0, _react.useCallback)(function () {
setOpenReleaseNoteModal(false);
dispatch((0, _global.showReleaseNotes)({
@@ -4702,9 +4700,8 @@ var ConsumptionView = function ConsumptionView(_ref) {
return _ref3.apply(this, arguments);
};
}();
-
- /** Handle time change */
- (0, _react.useEffect)(function () {
+ (0, _react.useEffect)( /** Reset half-hour timestep for water & gas */
+ function setDefaultTimeStep() {
if (fluidType !== _enums.FluidType.ELECTRICITY && currentTimeStep == _enums.TimeStep.HALF_AN_HOUR) {
dispatch((0, _chart.setCurrentTimeStep)(_enums.TimeStep.WEEK));
}
@@ -4777,10 +4774,7 @@ var ConsumptionView = function ConsumptionView(_ref) {
}, /*#__PURE__*/_react.default.createElement(_FluidButtons.default, {
activeFluid: fluidType,
key: updateKey
- }), openReleaseNoteModal && /*#__PURE__*/_react.default.createElement(_ReleaseNotesModal.default, {
- open: openReleaseNoteModal,
- handleCloseClick: handleCloseReleaseNoteModal
- }), showOfflineData && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FluidChart.default, {
+ }), fluidType === _enums.FluidType.GAS && currentFluidStatus.status === _enums.FluidState.CHALLENGE_ASKED && /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, null), showOfflineData && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FluidChart.default, {
fluidType: fluidType,
setActive: setActive,
key: lastDataDateKey
@@ -4801,7 +4795,10 @@ var ConsumptionView = function ConsumptionView(_ref) {
showOfflineData: false,
setActive: setActive,
active: active
- }))), fluidStatus.filter(function (fluid) {
+ }))), openReleaseNoteModal && /*#__PURE__*/_react.default.createElement(_ReleaseNotesModal.default, {
+ open: openReleaseNoteModal,
+ handleCloseClick: handleCloseReleaseNoteModal
+ }), fluidStatus.filter(function (fluid) {
return fluid.maintenance;
}).filter(function (fluid) {
return fluid.fluidType === fluidType;
diff --git a/app/ecolyo.fa57fc2f1a8d5bbbbde9.js b/app/ecolyo.3c343d7ac25472f21b0c.js
similarity index 99%
rename from app/ecolyo.fa57fc2f1a8d5bbbbde9.js
rename to app/ecolyo.3c343d7ac25472f21b0c.js
index 0650cad1dd6e8ceadfab1dbc3b5b576424077921..7835edd5ea008897b6e6d10962b150bb6d24cfc1 100644
--- a/app/ecolyo.fa57fc2f1a8d5bbbbde9.js
+++ b/app/ecolyo.3c343d7ac25472f21b0c.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"4691b499045ab5abaaa1","4":"4d0cba6449d311d8b400","5":"760d84e3e28ae17a0fb1","6":"e012537170b10acdcc2b","7":"0aa5f5c57c463f74cbec","8":"e5c126b21505089b1bec","9":"d291da09c33bf88b3d41","10":"48e22fe54b797e13649d","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"4691b499045ab5abaaa1","4":"4d0cba6449d311d8b400","5":"5aef7c5a3bfdd73e738d","6":"e012537170b10acdcc2b","7":"0aa5f5c57c463f74cbec","8":"e5c126b21505089b1bec","9":"d291da09c33bf88b3d41","10":"48e22fe54b797e13649d","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index 7148aa624ec901be03395fdf0568e7465f5c0f7f..11c29bc8f3fca51fbc336358f184989b1fc9d5ed 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.b479e82bf0a2e56e4c58.js"></script><script src="app/ecolyo.fa57fc2f1a8d5bbbbde9.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.b479e82bf0a2e56e4c58.js"></script><script src="app/ecolyo.3c343d7ac25472f21b0c.js"></script></div></body></html>
\ No newline at end of file