From bf63cce83e2c6eeec4013b29623af5b4c4be067b Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Fri, 12 Apr 2024 14:06:21 +0200
Subject: [PATCH] publish: Merge branch 'feat/grdf-error-messages' into 'dev'
generated from commit 719ef087f88bbd1d60e3161cbb242e94ad165608
---
....9fe8e2c45e5678348d6c.js => ecolyo.e43490adbc5e4ec339d5.js} | 3 ++-
....41b3bb3b96940a3d723c.js => ecolyo.cfd02a91d88bd4c5d5c0.js} | 2 +-
index.html | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
rename 5/{ecolyo.9fe8e2c45e5678348d6c.js => ecolyo.e43490adbc5e4ec339d5.js} (99%)
rename app/{ecolyo.41b3bb3b96940a3d723c.js => ecolyo.cfd02a91d88bd4c5d5c0.js} (99%)
diff --git a/5/ecolyo.9fe8e2c45e5678348d6c.js b/5/ecolyo.e43490adbc5e4ec339d5.js
similarity index 99%
rename from 5/ecolyo.9fe8e2c45e5678348d6c.js
rename to 5/ecolyo.e43490adbc5e4ec339d5.js
index 997fa7244..20b5aee1f 100644
--- a/5/ecolyo.9fe8e2c45e5678348d6c.js
+++ b/5/ecolyo.e43490adbc5e4ec339d5.js
@@ -3930,6 +3930,7 @@ var _consentOutdatedEnedis = _interopRequireDefault(__webpack_require__("0Pit"))
var _dataNok = _interopRequireDefault(__webpack_require__("OvaW"));
var _dataOk = _interopRequireDefault(__webpack_require__("uCOS"));
var _classnames = _interopRequireDefault(__webpack_require__("uRLs"));
+var _GrdfWaitConsent = __webpack_require__("c3xf");
var _Loader = _interopRequireDefault(__webpack_require__("6oIw"));
var _connectionWaitingText = _interopRequireDefault(__webpack_require__("VXZ9"));
var _firstConnectionWaitingText = _interopRequireDefault(__webpack_require__("pImA"));
@@ -4097,7 +4098,7 @@ var KonnectorModal = function KonnectorModal(_ref) {
className: "title text-16-bold"
}, t('konnector_modal.error_consent_form_gas_title')), /*#__PURE__*/_react.default.createElement("div", {
className: "light text-14-regular"
- }, t('konnector_modal.error_consent_form_gas_report'))), error !== _enums.KonnectorError.LOGIN_FAILED && error !== _enums.KonnectorError.TERMS_VERSION_MISMATCH && error !== _enums.KonnectorError.USER_ACTION_NEEDED_ACCOUNT_REMOVED &&
+ }, t('konnector_modal.error_consent_form_gas_report'))), error === _enums.KonnectorError.CHALLENGE_ASKED && fluidType === _enums.FluidType.GAS && /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, null), error !== _enums.KonnectorError.LOGIN_FAILED && error !== _enums.KonnectorError.TERMS_VERSION_MISMATCH && error !== _enums.KonnectorError.CHALLENGE_ASKED && error !== _enums.KonnectorError.USER_ACTION_NEEDED_ACCOUNT_REMOVED &&
/*#__PURE__*/
// DEFAULT CASE
_react.default.createElement("div", {
diff --git a/app/ecolyo.41b3bb3b96940a3d723c.js b/app/ecolyo.cfd02a91d88bd4c5d5c0.js
similarity index 99%
rename from app/ecolyo.41b3bb3b96940a3d723c.js
rename to app/ecolyo.cfd02a91d88bd4c5d5c0.js
index fbfcd6854..f8a466aaf 100644
--- a/app/ecolyo.41b3bb3b96940a3d723c.js
+++ b/app/ecolyo.cfd02a91d88bd4c5d5c0.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"8a84577641f87c081060","5":"9fe8e2c45e5678348d6c","6":"d6c898dafabc82b6f0e4","7":"d61472e75eb196504d3e","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"8a84577641f87c081060","5":"e43490adbc5e4ec339d5","6":"d6c898dafabc82b6f0e4","7":"d61472e75eb196504d3e","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index 9e0773bff..c71507155 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.41b3bb3b96940a3d723c.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.cfd02a91d88bd4c5d5c0.js"></script></div></body></html>
\ No newline at end of file
--
GitLab