diff --git a/4/ecolyo.b9db24361ed8d5b2dbcc.js b/4/ecolyo.2d80bfef72d41bc5794c.js
similarity index 99%
rename from 4/ecolyo.b9db24361ed8d5b2dbcc.js
rename to 4/ecolyo.2d80bfef72d41bc5794c.js
index 7889418e0c9e0e410549c9fe97804a9f86b933d8..c65a1a9e521c25ae4c20a0ce920d484532f0c2c9 100644
--- a/4/ecolyo.b9db24361ed8d5b2dbcc.js
+++ b/4/ecolyo.2d80bfef72d41bc5794c.js
@@ -1345,7 +1345,7 @@ var TotalAnalysisChart = function TotalAnalysisChart(_ref) {
className: "text-20-bold no_data"
}, t('analysis.no_data')));
};
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+ return /*#__PURE__*/_react.default.createElement("div", {
className: "totalAnalysis-container",
style: {
minHeight: radius + 100
@@ -1398,7 +1398,7 @@ var TotalAnalysisChart = function TotalAnalysisChart(_ref) {
}), /*#__PURE__*/_react.default.createElement("div", {
className: "text-16-normal"
}, t("FLUID.".concat(_enums.FluidType[index], ".LABEL"))));
- })))));
+ }))));
};
var _default = TotalAnalysisChart;
exports.default = _default;
diff --git a/5/ecolyo.72140ffa1136004033d5.js b/5/ecolyo.255e418e4b9e63180e06.js
similarity index 99%
rename from 5/ecolyo.72140ffa1136004033d5.js
rename to 5/ecolyo.255e418e4b9e63180e06.js
index d7bf7437e75487eb5978e62acccaefe694201bb2..a63868c0b857c7b0573e743e9d8bb68714b68024 100644
--- a/5/ecolyo.72140ffa1136004033d5.js
+++ b/5/ecolyo.255e418e4b9e63180e06.js
@@ -1980,7 +1980,7 @@ var InfoDataConsumptionVisualizer = function InfoDataConsumptionVisualizer(_ref)
var _useMoveToLatestDate = (0, _useMoveToDate.useMoveToLatestDate)(lastDataDate),
moveToLatestDate = _useMoveToLatestDate.moveToLatestDate;
if (!dataload) {
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+ return null;
}
if (dataload.state === _enums.DataloadState.MISSING || dataload.state === _enums.DataloadState.UPCOMING || dataload.state === _enums.DataloadState.COMING || dataload.state === _enums.DataloadState.AGGREGATED_HOLE_OR_MISSING || dataload.state === _enums.DataloadState.AGGREGATED_WITH_HOLE_OR_MISSING || dataload.state === _enums.DataloadState.AGGREGATED_COMING) {
var lastDate = lastDataDate ? lastDataDate.toFormat("dd'/'MM'/'yy") : '-';
@@ -2009,7 +2009,7 @@ var InfoDataConsumptionVisualizer = function InfoDataConsumptionVisualizer(_ref)
}
}));
}
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+ return null;
};
var _default = InfoDataConsumptionVisualizer;
exports.default = _default;
@@ -3330,14 +3330,14 @@ var DisplayDataOutdated = function DisplayDataOutdated(_ref4) {
className: "connection-caption text-16-normal"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "text-16-normal"
- }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, hasUpdatedToday ?
+ }, hasUpdatedToday ?
/*#__PURE__*/
// If user has already ran an update today, display a message about energy provider issue
_react.default.createElement(DisplayAlreadyUpdatedToday, {
fluidStatus: fluidStatus,
fluidType: fluidType,
lastExecutionDate: lastExecutionDate.toLocaleString()
- }) : /*#__PURE__*/_react.default.createElement(DisplayManualUpdate, null))));
+ }) : /*#__PURE__*/_react.default.createElement(DisplayManualUpdate, null)));
};
/** If user has already ran an update today, display a message about energy provider issue */
@@ -4063,17 +4063,17 @@ var KonnectorModal = function KonnectorModal(_ref) {
className: "headerError text-20-bold"
}, t('konnector_modal.error_txt')), /*#__PURE__*/_react.default.createElement("div", null, t("konnector_modal.error_credentials_".concat(isUpdating ? 'update_' : '').concat(fluidName))), fluidType === _enums.FluidType.ELECTRICITY && !isUpdating && /*#__PURE__*/_react.default.createElement("div", {
className: "elec-fail"
- }, t("konnector_modal.error_credentials_".concat(fluidName, "_2"))), fluidType === _enums.FluidType.ELECTRICITY && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !showCommonErrors ? /*#__PURE__*/_react.default.createElement(_core.Button, {
- className: "btnText",
- onClick: function onClick() {
- return setShowCommonErrors(true);
- }
- }, t('konnector_modal.show_common_error')) : /*#__PURE__*/_react.default.createElement("div", {
+ }, t("konnector_modal.error_credentials_".concat(fluidName, "_2"))), fluidType === _enums.FluidType.ELECTRICITY && showCommonErrors && /*#__PURE__*/_react.default.createElement("div", {
className: "commonErrorsList",
dangerouslySetInnerHTML: {
__html: t('konnector_modal.show_common_error_list')
}
- }))), error === _enums.KonnectorError.TERMS_VERSION_MISMATCH && isUpdating && fluidType === _enums.FluidType.ELECTRICITY &&
+ }), fluidType === _enums.FluidType.ELECTRICITY && !showCommonErrors && /*#__PURE__*/_react.default.createElement(_core.Button, {
+ className: "btnText",
+ onClick: function onClick() {
+ return setShowCommonErrors(true);
+ }
+ }, t('konnector_modal.show_common_error'))), error === _enums.KonnectorError.TERMS_VERSION_MISMATCH && isUpdating && fluidType === _enums.FluidType.ELECTRICITY &&
/*#__PURE__*/
// MISMATCH UPDATE ERROR ENEDIS
_react.default.createElement("div", {
diff --git a/7/ecolyo.bdf008a91fc5ac465e58.js b/7/ecolyo.d1f87eb67105e4a00434.js
similarity index 97%
rename from 7/ecolyo.bdf008a91fc5ac465e58.js
rename to 7/ecolyo.d1f87eb67105e4a00434.js
index 12d8d7cdf4065e903d7a7a102e8d209ca5fb0c21..407f4b075be40ac4afeb51a39a65a5ef1d82dd1e 100644
--- a/7/ecolyo.bdf008a91fc5ac465e58.js
+++ b/7/ecolyo.d1f87eb67105e4a00434.js
@@ -442,11 +442,14 @@ var DataloadSectionValue = function DataloadSectionValue(_ref) {
}, t('consumption_visualizer.estimated')));
}
var formattedValue = (0, _utils.formatNumberValues)(dataload.value, FLUIDNAME, true);
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Number(formattedValue) >= 1000 ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _utils.formatNumberValues)(dataload.value, FLUIDNAME), /*#__PURE__*/_react.default.createElement("span", {
- className: "text-18-normal"
- }, t("FLUID.".concat(FLUIDNAME, ".MEGAUNIT")))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _utils.formatNumberValues)(dataload.value), /*#__PURE__*/_react.default.createElement("span", {
+ if (Number(formattedValue) >= 1000) {
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _utils.formatNumberValues)(dataload.value, FLUIDNAME), /*#__PURE__*/_react.default.createElement("span", {
+ className: "text-18-normal"
+ }, t("FLUID.".concat(FLUIDNAME, ".MEGAUNIT"))));
+ }
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _utils.formatNumberValues)(dataload.value), /*#__PURE__*/_react.default.createElement("span", {
className: "text-18-normal"
- }, t("FLUID.".concat(FLUIDNAME, ".UNIT")))));
+ }, t("FLUID.".concat(FLUIDNAME, ".UNIT"))));
};
var _default = DataloadSectionValue;
exports.default = _default;
@@ -552,9 +555,9 @@ var DateNavigator = function DateNavigator(_ref) {
className: (0, _classnames.default)('date-navigator-button', (0, _defineProperty2.default)({}, 'disable', disablePrev))
}), /*#__PURE__*/_react.default.createElement("div", {
className: "date-navigator-format"
- }, inlineDateDisplay ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, formattedDate[0] && formattedDate[1] && /*#__PURE__*/_react.default.createElement("div", {
+ }, inlineDateDisplay && formattedDate[0] && formattedDate[1] && /*#__PURE__*/_react.default.createElement("div", {
className: "date-navigator-format-date text-16-bold"
- }, formattedDate[0], " ", formattedDate[1])) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, formattedDate[0] && /*#__PURE__*/_react.default.createElement("div", {
+ }, formattedDate[0], " ", formattedDate[1]), !inlineDateDisplay && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, formattedDate[0] && /*#__PURE__*/_react.default.createElement("div", {
className: "date-navigator-format-date text-16-bold timeRange"
}, formattedDate[0]), formattedDate[1] && /*#__PURE__*/_react.default.createElement("div", {
className: "date-navigator-format-date text-15-normal"
diff --git a/app/ecolyo.a68be1d1deae64731d32.js b/app/ecolyo.a274467ca7a287131298.js
similarity index 99%
rename from app/ecolyo.a68be1d1deae64731d32.js
rename to app/ecolyo.a274467ca7a287131298.js
index c71672e74c33b5c639af0feb7bbabbb9bdfd9e65..add55945cd26ab382b38fb3c4e5f644100e69410 100644
--- a/app/ecolyo.a68be1d1deae64731d32.js
+++ b/app/ecolyo.a274467ca7a287131298.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"b1a5d3f3abe225f5c329","4":"b9db24361ed8d5b2dbcc","5":"72140ffa1136004033d5","6":"29f85a0dbdcb4c98427d","7":"bdf008a91fc5ac465e58","8":"7f86157816222c0086ca","9":"f45e19d3c34ba67e355b","10":"fe3625578fa387c11975","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"b1a5d3f3abe225f5c329","4":"2d80bfef72d41bc5794c","5":"255e418e4b9e63180e06","6":"29f85a0dbdcb4c98427d","7":"d1f87eb67105e4a00434","8":"7f86157816222c0086ca","9":"f45e19d3c34ba67e355b","10":"fe3625578fa387c11975","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -2760,17 +2760,31 @@ var QuizQuestion = function QuizQuestion(_ref) {
subscribed = false;
};
}, [client, fluidTypes, isCustomQuest, userChallenge.quiz.customQuestion]);
+ if (isCustomQuest && !customQuestion) {
+ return /*#__PURE__*/_react.default.createElement("div", {
+ ref: mainContentRef,
+ className: "quiz-content",
+ tabIndex: -1
+ }, /*#__PURE__*/_react.default.createElement("div", {
+ className: "question-loading"
+ }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)));
+ }
+ if (isCustomQuest && customQuestion) {
+ return /*#__PURE__*/_react.default.createElement("div", {
+ ref: mainContentRef,
+ className: "quiz-content",
+ tabIndex: -1
+ }, /*#__PURE__*/_react.default.createElement(_QuizQuestionContentCustom.default, {
+ userChallenge: userChallenge,
+ goBack: goBack,
+ customQuestion: customQuestion
+ }));
+ }
return /*#__PURE__*/_react.default.createElement("div", {
ref: mainContentRef,
className: "quiz-content",
tabIndex: -1
- }, isCustomQuest ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !customQuestion ? /*#__PURE__*/_react.default.createElement("div", {
- className: "question-loading"
- }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)) : /*#__PURE__*/_react.default.createElement(_QuizQuestionContentCustom.default, {
- userChallenge: userChallenge,
- goBack: goBack,
- customQuestion: customQuestion
- })) : /*#__PURE__*/_react.default.createElement(_QuizQuestionContent.default, {
+ }, /*#__PURE__*/_react.default.createElement(_QuizQuestionContent.default, {
userChallenge: userChallenge,
setIsCustomQuest: setIsCustomQuest,
goBack: goBack,
@@ -16707,7 +16721,7 @@ var App = function App(_ref) {
topTheme: 'light'
});
}, [webviewIntent]);
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_SkipLink.default, null), /*#__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(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_SkipLink.default, null), /*#__PURE__*/_react.default.createElement(_Layout.Layout, null, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__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", {
id: "app-content",
@@ -16715,7 +16729,7 @@ var App = function App(_ref) {
tabIndex: -1
}, /*#__PURE__*/_react.default.createElement(_Routes.default, {
termsStatus: termsStatus
- }))), false ? /*#__PURE__*/undefined : null));
+ }))), false ? /*#__PURE__*/undefined : null)));
};
exports.App = App;
var _default = App;
@@ -18815,17 +18829,19 @@ var ActionList = function ActionList(_ref) {
subscribed = false;
};
}, [client, isProfileTypeCompleted, fluidTypes]);
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, actions && /*#__PURE__*/_react.default.createElement("div", {
- className: "action-list-container"
- }, actions.map(function (action) {
- return /*#__PURE__*/_react.default.createElement(_ActionCard.default, {
- key: action.id,
- action: action,
- setSelectedAction: setSelectedAction,
- setShowList: setShowList,
- setFocus: setFocus
- });
- })));
+ if (actions) {
+ return /*#__PURE__*/_react.default.createElement("div", {
+ className: "action-list-container"
+ }, actions.map(function (action) {
+ return /*#__PURE__*/_react.default.createElement(_ActionCard.default, {
+ key: action.id,
+ action: action,
+ setSelectedAction: setSelectedAction,
+ setShowList: setShowList,
+ setFocus: setFocus
+ });
+ }));
+ }
};
var _default = ActionList;
exports.default = _default;
@@ -21104,7 +21120,7 @@ __webpack_require__("pSgn");
var LegalNoticeContent = function LegalNoticeContent() {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+ return /*#__PURE__*/_react.default.createElement("div", {
className: "legal-notice-root"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "legal-notice-content"
@@ -21179,7 +21195,7 @@ var LegalNoticeContent = function LegalNoticeContent() {
className: "legal-notice-part"
}, /*#__PURE__*/_react.default.createElement("h3", null, t('legal.title8')), /*#__PURE__*/_react.default.createElement("p", null, t('legal.part8'))), /*#__PURE__*/_react.default.createElement("div", {
className: "legal-notice-part"
- }, /*#__PURE__*/_react.default.createElement("h3", null, t('legal.title9')), /*#__PURE__*/_react.default.createElement("p", null, t('legal.part9-1')), /*#__PURE__*/_react.default.createElement("p", null, t('legal.part9-2')))))));
+ }, /*#__PURE__*/_react.default.createElement("h3", null, t('legal.title9')), /*#__PURE__*/_react.default.createElement("p", null, t('legal.part9-1')), /*#__PURE__*/_react.default.createElement("p", null, t('legal.part9-2'))))));
};
var _default = LegalNoticeContent;
exports.default = _default;
@@ -24087,7 +24103,7 @@ var DuelUnlocked = function DuelUnlocked(_ref) {
}
handleEcogestureIcon();
}, [userChallenge]);
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+ return /*#__PURE__*/_react.default.createElement("div", {
className: "duel-unlocked-container"
}, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
className: "duel-icon",
@@ -24108,7 +24124,7 @@ var DuelUnlocked = function DuelUnlocked(_ref) {
"aria-label": t('duel.accessibility.button_start_duel'),
onClick: launchDuel,
className: "btnSecondary"
- }, t('duel.button_start')))));
+ }, t('duel.button_start'))));
};
var _default = DuelUnlocked;
exports.default = _default;
@@ -24599,7 +24615,7 @@ var ExplorationOngoing = function ExplorationOngoing(_ref) {
}, t('exploration.button_start'));
}
};
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+ return /*#__PURE__*/_react.default.createElement("div", {
className: "exploration-container"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "exploration-begin-container"
@@ -24612,7 +24628,7 @@ var ExplorationOngoing = function ExplorationOngoing(_ref) {
isQuizBegin: true
}), /*#__PURE__*/_react.default.createElement("div", {
className: "exploration-explanation text-18-bold"
- }, /*#__PURE__*/_react.default.createElement("div", null, userChallenge.exploration.description), /*#__PURE__*/_react.default.createElement("div", null, userChallenge.exploration.complementary_description)), renderButton())));
+ }, /*#__PURE__*/_react.default.createElement("div", null, userChallenge.exploration.description), /*#__PURE__*/_react.default.createElement("div", null, userChallenge.exploration.complementary_description)), renderButton()));
};
var _default = ExplorationOngoing;
exports.default = _default;
diff --git a/index.html b/index.html
index a78d9127a355e40374a83856e152954e01a27a85..945531d914947d701b8fada1aaa411870eed0bbb 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"><meta name="color-scheme" content="only dark">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.fc4bc60b9373625fdc9f.js"></script><script src="app/ecolyo.a68be1d1deae64731d32.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"><meta name="color-scheme" content="only dark">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.fc4bc60b9373625fdc9f.js"></script><script src="app/ecolyo.a274467ca7a287131298.js"></script></div></body></html>
\ No newline at end of file