diff --git a/5/ecolyo.c3fe5649e2a2a2336b5e.js b/5/ecolyo.f2a786173c3d491d5f2e.js
similarity index 99%
rename from 5/ecolyo.c3fe5649e2a2a2336b5e.js
rename to 5/ecolyo.f2a786173c3d491d5f2e.js
index 6a3b0ba84cf3f8723fe6d853164aba4b241ac6a4..46b566e9c6a561379dc0f900ad30c5ac3987a269 100644
--- a/5/ecolyo.c3fe5649e2a2a2336b5e.js
+++ b/5/ecolyo.f2a786173c3d491d5f2e.js
@@ -2943,16 +2943,18 @@ var _interopRequireDefault = __webpack_require__("jm00");
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.GrdfWaitConsent = void 0;
+exports.GrdfWaitConsentModal = exports.GrdfWaitConsent = void 0;
var _regenerator = _interopRequireDefault(__webpack_require__("hJxD"));
var _defineProperty2 = _interopRequireDefault(__webpack_require__("J58c"));
var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("HZZ/"));
var _slicedToArray2 = _interopRequireDefault(__webpack_require__("XkwL"));
var _core = __webpack_require__("rMFn");
+var _close = _interopRequireDefault(__webpack_require__("lCJQ"));
var _grdfMail = _interopRequireDefault(__webpack_require__("70Fk"));
var _StyledIcon = _interopRequireDefault(__webpack_require__("VP3k"));
var _useUserInstanceSettings = _interopRequireDefault(__webpack_require__("PVlC"));
var _I18n = __webpack_require__("nUfk");
+var _Icon = _interopRequireDefault(__webpack_require__("AHiN"));
var _enums = __webpack_require__("j0hM");
var _react = _interopRequireWildcard(__webpack_require__("ivGQ"));
var _global = __webpack_require__("33gc");
@@ -3029,6 +3031,35 @@ var GrdfWaitConsent = function GrdfWaitConsent() {
}, t('auth.grdfgrandlyon.waiting.button_done')));
};
exports.GrdfWaitConsent = GrdfWaitConsent;
+var GrdfWaitConsentModal = function GrdfWaitConsentModal(_ref2) {
+ var open = _ref2.open,
+ setOpen = _ref2.setOpen;
+ var _useI18n2 = (0, _I18n.useI18n)(),
+ t = _useI18n2.t;
+ return /*#__PURE__*/_react.default.createElement(_core.Dialog, {
+ open: open,
+ onClose: function onClose() {
+ return setOpen(false);
+ },
+ "aria-labelledby": "accessibility-title",
+ classes: {
+ root: 'modal-root',
+ paper: 'modal-paper'
+ }
+ }, /*#__PURE__*/_react.default.createElement("div", {
+ id: "accessibility-title"
+ }, t('consumption_visualizer.modal.window_title')), /*#__PURE__*/_react.default.createElement(_core.IconButton, {
+ "aria-label": t('consumption_visualizer.modal.close'),
+ className: "modal-paper-close-button",
+ onClick: function onClick() {
+ return setOpen(false);
+ }
+ }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
+ icon: _close.default,
+ size: 16
+ })), /*#__PURE__*/_react.default.createElement(GrdfWaitConsent, null));
+};
+exports.GrdfWaitConsentModal = GrdfWaitConsentModal;
/***/ }),
@@ -4652,14 +4683,20 @@ var ConsumptionView = function ConsumptionView(_ref) {
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
openReleaseNoteModal = _useState2[0],
setOpenReleaseNoteModal = _useState2[1];
- var _useState3 = (0, _react.useState)(false),
+ var _useState3 = (0, _react.useState)(true),
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
- active = _useState4[0],
- setActive = _useState4[1];
- var _useState5 = (0, _react.useState)(true),
+ openExpiredConsentModal = _useState4[0],
+ setOpenExpiredConsentModal = _useState4[1];
+ var isWaitingForConsent = fluidType === _enums.FluidType.GAS && currentFluidStatus.status === _enums.FluidState.CHALLENGE_ASKED;
+ var _useState5 = (0, _react.useState)(isWaitingForConsent),
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
- openExpiredConsentModal = _useState6[0],
- setOpenExpiredConsentModal = _useState6[1];
+ waitConsent = _useState6[0],
+ setWaitConsent = _useState6[1];
+
+ /** Show wait consent modal when navigating and consent is "A valider" */
+ (0, _react.useEffect)(function () {
+ setWaitConsent(isWaitingForConsent);
+ }, [isWaitingForConsent]);
var _useState7 = (0, _react.useState)([]),
_useState8 = (0, _slicedToArray2.default)(_useState7, 2),
consentExpiredFluids = _useState8[0],
@@ -4808,7 +4845,6 @@ var ConsumptionView = function ConsumptionView(_ref) {
dispatch((0, _chart.setSelectedDate)(updatedDate));
dispatch((0, _chart.setCurrentIndex)(updatedIndex));
};
- var isGRDFWaitingForConsent = fluidType === _enums.FluidType.GAS && currentFluidStatus.status === _enums.FluidState.CHALLENGE_ASKED;
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
titleKey: "common.title_consumption"
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
@@ -4827,7 +4863,7 @@ var ConsumptionView = function ConsumptionView(_ref) {
})), /*#__PURE__*/_react.default.createElement(_Content.default, null, /*#__PURE__*/_react.default.createElement(_FluidButtons.default, {
activeFluid: fluidType,
key: updateKey
- }), isGRDFWaitingForConsent ? /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, null) : showOfflineData && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FluidChart.default, {
+ }), showOfflineData && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FluidChart.default, {
fluidType: fluidType,
key: lastDataDateKey
}), /*#__PURE__*/_react.default.createElement(_ConsumptionDetails.default, {
@@ -4865,6 +4901,9 @@ var ConsumptionView = function ConsumptionView(_ref) {
});
}
});
+ }), /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsentModal, {
+ open: waitConsent,
+ setOpen: setWaitConsent
}));
};
var _default = ConsumptionView;
diff --git a/app/ecolyo.399c95adaabf5484f24e.js b/app/ecolyo.e6a0769cff24350aa7b0.js
similarity index 99%
rename from app/ecolyo.399c95adaabf5484f24e.js
rename to app/ecolyo.e6a0769cff24350aa7b0.js
index bb6ce68b0dd2cc3a3f558c5eee8cef986da42f33..dc76e292d5e1e0fa85183f3d42a8fb5276942955 100644
--- a/app/ecolyo.399c95adaabf5484f24e.js
+++ b/app/ecolyo.e6a0769cff24350aa7b0.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"175d1078d8b45557fca0","4":"11cfc25145ad25979886","5":"c3fe5649e2a2a2336b5e","6":"9fa3483c6e8f81d1eec5","7":"0aa5f5c57c463f74cbec","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"175d1078d8b45557fca0","4":"11cfc25145ad25979886","5":"f2a786173c3d491d5f2e","6":"9fa3483c6e8f81d1eec5","7":"0aa5f5c57c463f74cbec","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index 103767f147c1f1d45255df0d5092fd733ac504c3..f624d438f616eb293331ca23cdc78d55433428d7 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.399c95adaabf5484f24e.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.e6a0769cff24350aa7b0.js"></script></div></body></html>
\ No newline at end of file