diff --git a/4/ecolyo.3185369b41951a4b6742.js b/4/ecolyo.7207e1ed2198879696f4.js
similarity index 99%
rename from 4/ecolyo.3185369b41951a4b6742.js
rename to 4/ecolyo.7207e1ed2198879696f4.js
index 5d7a7dc8c6fbe8c6cbed13ac45cf5d1ca4ac53cc..9c5578f740a15122d853d74dc3427e7ba0be13ff 100644
--- a/4/ecolyo.3185369b41951a4b6742.js
+++ b/4/ecolyo.7207e1ed2198879696f4.js
@@ -2575,30 +2575,17 @@ var _Button = _interopRequireDefault(__webpack_require__("49+2"));
var _Dialog = _interopRequireDefault(__webpack_require__("L/1U"));
var _I18n = __webpack_require__("nUfk");
var _react = _interopRequireDefault(__webpack_require__("ivGQ"));
-var _reactRouterDom = __webpack_require__("Iyno");
-var _global = __webpack_require__("33gc");
var _hooks = __webpack_require__("6FOS");
__webpack_require__("k8St");
var ReleaseNotesModal = function ReleaseNotesModal(_ref) {
- var open = _ref.open;
+ var open = _ref.open,
+ handleCloseClick = _ref.handleCloseClick;
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
- var navigate = (0, _reactRouterDom.useNavigate)();
- var dispatch = (0, _hooks.useAppDispatch)();
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
return state.ecolyo.global;
}),
releaseNotes = _useAppSelector.releaseNotes;
- var handleCloseClick = function handleCloseClick() {
- dispatch((0, _global.showReleaseNotes)({
- show: false,
- notes: releaseNotes.notes,
- redirectLink: releaseNotes.redirectLink
- }));
- if (releaseNotes.redirectLink) {
- navigate(releaseNotes.redirectLink);
- }
- };
return /*#__PURE__*/_react.default.createElement(_Dialog.default, {
open: open,
disableEscapeKeyDown: true,
@@ -4576,9 +4563,11 @@ var _cozyClient = __webpack_require__("xEu0");
var _enums = __webpack_require__("j0hM");
var _luxon = __webpack_require__("1EDv");
var _react = _interopRequireWildcard(__webpack_require__("ivGQ"));
+var _reactRouterDom = __webpack_require__("Iyno");
var _dateChart = _interopRequireDefault(__webpack_require__("Aj1I"));
var _profile = _interopRequireDefault(__webpack_require__("uCkj"));
var _chart = __webpack_require__("dklY");
+var _global = __webpack_require__("33gc");
var _hooks = __webpack_require__("6FOS");
var _modal = __webpack_require__("IvDH");
var _date = __webpack_require__("0bnf");
@@ -4594,6 +4583,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
var ConsumptionView = function ConsumptionView(_ref) {
var fluidType = _ref.fluidType;
+ var navigate = (0, _reactRouterDom.useNavigate)();
var client = (0, _cozyClient.useClient)();
var dispatch = (0, _hooks.useAppDispatch)();
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
@@ -4620,10 +4610,14 @@ var ConsumptionView = function ConsumptionView(_ref) {
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
openExpiredConsentModal = _useState2[0],
setOpenExpiredConsentModal = _useState2[1];
- var _useState3 = (0, _react.useState)([]),
+ var _useState3 = (0, _react.useState)(releaseNotes.show),
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
- consentExpiredFluids = _useState4[0],
- setConsentExpiredFluids = _useState4[1];
+ openReleaseNoteModal = _useState4[0],
+ setOpenReleaseNoteModal = _useState4[1];
+ var _useState5 = (0, _react.useState)([]),
+ _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+ consentExpiredFluids = _useState6[0],
+ setConsentExpiredFluids = _useState6[1];
var profileService = (0, _react.useMemo)(function () {
return new _profile.default(client);
}, [client]);
@@ -4633,6 +4627,17 @@ var ConsumptionView = function ConsumptionView(_ref) {
if (fluidType === _enums.FluidType.MULTIFLUID) return 'common.title_consumption';
return "common.title_consumption_".concat((0, _utils.getFluidName)(fluidType));
};
+ var handleCloseReleaseNoteModal = (0, _react.useCallback)(function () {
+ setOpenReleaseNoteModal(false);
+ dispatch((0, _global.showReleaseNotes)({
+ show: false,
+ notes: releaseNotes.notes,
+ redirectLink: releaseNotes.redirectLink
+ }));
+ if (releaseNotes.redirectLink) {
+ navigate(releaseNotes.redirectLink);
+ }
+ }, [dispatch, navigate, releaseNotes.notes, releaseNotes.redirectLink]);
var handleClosePartnerIssueModal = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
var profileValues, updatedProfile;
return _regenerator.default.wrap(function _callee$(_context) {
@@ -4771,8 +4776,9 @@ var ConsumptionView = function ConsumptionView(_ref) {
fluidType: fluidType
})), !isMulti && /*#__PURE__*/_react.default.createElement(_KonnectorViewerCard.default, {
fluidType: fluidType
- }), isMulti && !showOfflineData && /*#__PURE__*/_react.default.createElement(_KonnectorViewerList.default, null)), releaseNotes.show && /*#__PURE__*/_react.default.createElement(_ReleaseNotesModal.default, {
- open: releaseNotes.show
+ }), isMulti && !showOfflineData && /*#__PURE__*/_react.default.createElement(_KonnectorViewerList.default, null)), openReleaseNoteModal && /*#__PURE__*/_react.default.createElement(_ReleaseNotesModal.default, {
+ open: openReleaseNoteModal,
+ handleCloseClick: handleCloseReleaseNoteModal
}), fluidStatus.filter(function (fluid) {
return fluid.maintenance;
}).filter(function (fluid) {
diff --git a/app/ecolyo.542f00f36840de91f504.js b/app/ecolyo.89898c035f29fc2893d2.js
similarity index 99%
rename from app/ecolyo.542f00f36840de91f504.js
rename to app/ecolyo.89898c035f29fc2893d2.js
index 9974ddad07bb1bc6fa3fd5a41ab2c078b6cb986c..87282e03261271477dbce415f82f994b75b95865 100644
--- a/app/ecolyo.542f00f36840de91f504.js
+++ b/app/ecolyo.89898c035f29fc2893d2.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"546ddc061ac2d090301c","4":"3185369b41951a4b6742","5":"dbb9361b7c3d2399eabb","6":"74e7a684478516b3c9ec","7":"62d0f8799ccda737a9e5","8":"76b674e1f6db43a6a522","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"546ddc061ac2d090301c","4":"7207e1ed2198879696f4","5":"dbb9361b7c3d2399eabb","6":"74e7a684478516b3c9ec","7":"62d0f8799ccda737a9e5","8":"76b674e1f6db43a6a522","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -6703,10 +6703,8 @@ if(false) {}
var _interopRequireDefault = __webpack_require__("jm00");
-var _core = __webpack_require__("rMFn");
var Sentry = _interopRequireWildcard(__webpack_require__("5QCN"));
var _tracing = __webpack_require__("zN4E");
-var _theme = __webpack_require__("tHDY");
var _cozyClient = _interopRequireWildcard(__webpack_require__("xEu0"));
var _cozyDeviceHelper = __webpack_require__("Kv7L");
var _oauth = __webpack_require__("XjBu");
@@ -6821,11 +6819,9 @@ var init = function init() {
}, /*#__PURE__*/_react2.default.createElement(_I18n.I18n, {
lang: locale,
polyglot: polyglot
- }, /*#__PURE__*/_react2.default.createElement(_reactRouterDom.HashRouter, history, /*#__PURE__*/_react2.default.createElement(_core.ThemeProvider, {
- theme: _theme.theme
- }, /*#__PURE__*/_react2.default.createElement(App, {
+ }, /*#__PURE__*/_react2.default.createElement(_reactRouterDom.HashRouter, history, /*#__PURE__*/_react2.default.createElement(App, {
tracker: tracker
- }))))))));
+ })))))));
};
// initial rendering of the application
@@ -11041,33 +11037,31 @@ var SplashRoot = function SplashRoot(_ref) {
name: 'Initialize app'
});
_context7.prev = 6;
- console.groupCollapsed('Initialization logs');
- // init Terms
- _context7.next = 10;
+ _context7.next = 9;
return initializationService.initConsent();
- case 10:
+ case 9:
termsStatus = _context7.sent;
if (subscribed) dispatch((0, _global.updateTermsStatus)(termsStatus));
// Init fluidPrices
- _context7.next = 14;
+ _context7.next = 13;
return initializationService.initFluidPrices();
- case 14:
- _context7.next = 16;
+ case 13:
+ _context7.next = 15;
return initializationService.initProfile();
- case 16:
+ case 15:
profile = _context7.sent;
- _context7.next = 19;
+ _context7.next = 18;
return initializationService.initProfileType();
- case 19:
+ case 18:
profileType = _context7.sent;
- _context7.next = 22;
+ _context7.next = 21;
return initializationService.initProfileEcogesture();
- case 22:
+ case 21:
profileEcogesture = _context7.sent;
- _context7.next = 25;
+ _context7.next = 24;
return ms.runMigrations(_migration.migrations);
- case 25:
+ case 24:
migrationsResult = _context7.sent;
// Init last release notes when they exist
dispatch((0, _global.showReleaseNotes)({
@@ -11076,13 +11070,13 @@ var SplashRoot = function SplashRoot(_ref) {
show: migrationsResult.show
}));
if (!(subscribed && profile)) {
- _context7.next = 46;
+ _context7.next = 45;
break;
}
setValidExploration(_enums.UserExplorationID.EXPLORATION007);
- _context7.next = 31;
+ _context7.next = 30;
return Promise.all([initializationService.initDuelEntity(profile.duelHash), initializationService.initQuizEntity(profile.quizHash), initializationService.initExplorationEntity(profile.challengeHash), initializationService.initChallengeEntity(profile.explorationHash), initializationService.initAnalysis(profile)]);
- case 31:
+ case 30:
_yield$Promise$all = _context7.sent;
_yield$Promise$all2 = (0, _slicedToArray2.default)(_yield$Promise$all, 5);
duelHash = _yield$Promise$all2[0];
@@ -11101,20 +11095,20 @@ var SplashRoot = function SplashRoot(_ref) {
dispatch((0, _profile.updateProfile)(updatedProfile));
dispatch((0, _analysis.setAnalysisMonth)(analysisResult.monthlyAnalysisDate));
if (!profileType) {
- _context7.next = 44;
+ _context7.next = 43;
break;
}
- _context7.next = 44;
+ _context7.next = 43;
return loadProfileType(profileType);
- case 44:
+ case 43:
if (profileEcogesture) {
dispatch((0, _profileEcogesture.setProfileEcogesture)(profileEcogesture));
}
dispatch((0, _global.toggleAnalysisNotification)(!profile.haveSeenLastAnalysis));
- case 46:
- _context7.next = 48;
+ case 45:
+ _context7.next = 47;
return initializationService.initFluidStatus();
- case 48:
+ case 47:
fluidStatus = _context7.sent;
if (subscribed) {
dispatch((0, _global.setFluidStatus)(fluidStatus));
@@ -11134,12 +11128,12 @@ var SplashRoot = function SplashRoot(_ref) {
}
}
// Init Challenge
- _context7.next = 52;
+ _context7.next = 51;
return initializationService.initUserChallenges(fluidStatus);
- case 52:
+ case 51:
userChallengeList = _context7.sent;
if (!subscribed) {
- _context7.next = 79;
+ _context7.next = 78;
break;
}
dispatch((0, _challenge2.setUserChallengeList)(userChallengeList));
@@ -11151,18 +11145,18 @@ var SplashRoot = function SplashRoot(_ref) {
}
// Set action to notification if action is accomplished
if (!(((_filteredCurrentOngoi2 = filteredCurrentOngoingChallenge[0]) === null || _filteredCurrentOngoi2 === void 0 ? void 0 : _filteredCurrentOngoi2.action.state) === _enums.UserActionState.ONGOING)) {
- _context7.next = 63;
+ _context7.next = 62;
break;
}
actionService = new _action.default(client);
- _context7.next = 61;
+ _context7.next = 60;
return actionService.isActionDone(filteredCurrentOngoingChallenge[0]);
- case 61:
+ case 60:
updatedUserChallenge = _context7.sent;
if (updatedUserChallenge) {
dispatch((0, _challenge2.updateUserChallengeList)(updatedUserChallenge));
}
- case 63:
+ case 62:
// Set Notification if action state is notification
if (((_filteredCurrentOngoi3 = filteredCurrentOngoingChallenge[0]) === null || _filteredCurrentOngoi3 === void 0 ? void 0 : _filteredCurrentOngoi3.action.state) === _enums.UserActionState.NOTIFICATION) {
dispatch((0, _global.toggleChallengeActionNotification)(true));
@@ -11171,17 +11165,17 @@ var SplashRoot = function SplashRoot(_ref) {
return challenge.state === _enums.UserChallengeState.DUEL;
});
if (!(((_filteredCurrentDuelC = filteredCurrentDuelChallenge[0]) === null || _filteredCurrentDuelC === void 0 ? void 0 : _filteredCurrentDuelC.duel.state) === _enums.UserDuelState.ONGOING)) {
- _context7.next = 79;
+ _context7.next = 78;
break;
}
- _context7.next = 68;
+ _context7.next = 67;
return initializationService.initDuelProgress(filteredCurrentDuelChallenge[0]);
- case 68:
+ case 67:
_yield$initialization = _context7.sent;
_updatedUserChallenge = _yield$initialization.updatedUserChallenge;
dataloads = _yield$initialization.dataloads;
if (!subscribed) {
- _context7.next = 79;
+ _context7.next = 78;
break;
}
dispatch((0, _challenge2.setChallengeConsumption)({
@@ -11190,13 +11184,13 @@ var SplashRoot = function SplashRoot(_ref) {
}));
// Check is duel is done and display notification
challengeService = new _challenge.default(client);
- _context7.next = 76;
+ _context7.next = 75;
return challengeService.isChallengeDone(_updatedUserChallenge, dataloads);
- case 76:
+ case 75:
_yield$challengeServi = _context7.sent;
isDone = _yield$challengeServi.isDone;
dispatch((0, _global.toggleChallengeDuelNotification)(isDone));
- case 79:
+ case 78:
/**
* Load custom popup and partners info synchronously so these treatments don't block the loading
*/
@@ -11257,27 +11251,26 @@ var SplashRoot = function SplashRoot(_ref) {
});
});
}
- _context7.next = 89;
+ _context7.next = 88;
break;
- case 84:
- _context7.prev = 84;
+ case 83:
+ _context7.prev = 83;
_context7.t0 = _context7["catch"](6);
if (_context7.t0.message === 'Failed to fetch' && !initStepErrors) {
setInitStepErrors(_models.InitStepsErrors.UNKNOWN_ERROR);
}
_logger.default.error("[Initialization] Error : ".concat(_context7.t0));
Sentry.captureException(_context7.t0);
- case 89:
- _context7.prev = 89;
- console.groupEnd();
+ case 88:
+ _context7.prev = 88;
transaction.finish();
- return _context7.finish(89);
- case 93:
+ return _context7.finish(88);
+ case 91:
case "end":
return _context7.stop();
}
}
- }, _callee7, null, [[6, 84, 89, 93]]);
+ }, _callee7, null, [[6, 83, 88, 91]]);
}));
return _loadData.apply(this, arguments);
}
@@ -17476,6 +17469,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.default = exports.App = void 0;
+var _core = __webpack_require__("rMFn");
var _Navbar = _interopRequireDefault(__webpack_require__("9A+l"));
var _Routes = _interopRequireDefault(__webpack_require__("ZKTt"));
var _SplashRoot = _interopRequireDefault(__webpack_require__("HAm2"));
@@ -17486,6 +17480,7 @@ var _Layout = __webpack_require__("mPFK");
var _react = _interopRequireWildcard(__webpack_require__("ivGQ"));
var _reactRouterDom = __webpack_require__("Iyno");
var _hooks = __webpack_require__("6FOS");
+var _theme = __webpack_require__("tHDY");
var _usePageTitle = _interopRequireDefault(__webpack_require__("hmgo"));
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -17510,13 +17505,15 @@ var App = function App(_ref) {
topTheme: 'light'
});
}, [webviewIntent]);
- return /*#__PURE__*/_react.default.createElement(_Layout.Layout, null, /*#__PURE__*/_react.default.createElement(_SplashRoot.default, null, termsStatus.accepted && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_WelcomeModal.default, {
+ return /*#__PURE__*/_react.default.createElement(_Layout.Layout, null, /*#__PURE__*/_react.default.createElement(_core.ThemeProvider, {
+ theme: _theme.theme
+ }, /*#__PURE__*/_react.default.createElement(_SplashRoot.default, null, termsStatus.accepted && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_WelcomeModal.default, {
open: !onboarding.isWelcomeSeen
}), /*#__PURE__*/_react.default.createElement(_Navbar.default, null)), /*#__PURE__*/_react.default.createElement("main", {
className: "app-content"
}, /*#__PURE__*/_react.default.createElement(_Routes.default, {
termsStatus: termsStatus
- }))), false ? /*#__PURE__*/undefined : null);
+ }))), false ? /*#__PURE__*/undefined : null));
};
exports.App = App;
var _default = App;
diff --git a/index.html b/index.html
index 0e76ea3e98b71b5176701c38a0d296a4de80d07a..c2c05fc36fd64a724d8c4641597497c9638497ce 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.051ab77aa284511d3340.js"></script><script src="app/ecolyo.542f00f36840de91f504.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.051ab77aa284511d3340.js"></script><script src="app/ecolyo.89898c035f29fc2893d2.js"></script></div></body></html>
\ No newline at end of file