diff --git a/5/ecolyo.0910ab7edec7db99a369.js b/5/ecolyo.96b67016693ed2d7cd92.js similarity index 99% rename from 5/ecolyo.0910ab7edec7db99a369.js rename to 5/ecolyo.96b67016693ed2d7cd92.js index 0f0bc7a226408590330ce01e055c5667e1578fa8..b09a6ffde5fe7ca0b499ddeefcd347308ce60358 100644 --- a/5/ecolyo.0910ab7edec7db99a369.js +++ b/5/ecolyo.96b67016693ed2d7cd92.js @@ -3366,7 +3366,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; } 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 ConnectionResult = function ConnectionResult(_ref) { - var _currentFluidStatus$c2; var handleAccountDeletion = _ref.handleAccountDeletion, fluidType = _ref.fluidType; var _useI18n = (0, _I18n.useI18n)(), @@ -3503,35 +3502,20 @@ var ConnectionResult = function ConnectionResult(_ref) { }, [lastExecutionDate]); var handleRefreshConsent = (0, _react.useCallback)(function () { if (fluidType == _enums.FluidType.ELECTRICITY) { - var _currentFluidStatus$c; - var accountData = (_currentFluidStatus$c = currentFluidStatus.connection.account) === null || _currentFluidStatus$c === void 0 ? void 0 : _currentFluidStatus$c.auth; - // store the previous account data since the onDelete will remove account from DB - dispatch((0, _global.updateSgeStore)({ - currentStep: 0, - firstName: accountData.firstname, - lastName: accountData.lastname, - pdl: parseInt(accountData.pointId), - address: accountData.address, - zipCode: parseInt(accountData.postalCode), - city: accountData.city, - dataConsent: true, - pdlConfirm: true, - shouldLaunchAccount: true - })); dispatch((0, _global.setShouldRefreshConsent)(true)); } else { deleteAccountsAndTriggers(); } - }, [fluidType, (_currentFluidStatus$c2 = currentFluidStatus.connection.account) === null || _currentFluidStatus$c2 === void 0 ? void 0 : _currentFluidStatus$c2.auth, dispatch, deleteAccountsAndTriggers]); + }, [fluidType, dispatch, deleteAccountsAndTriggers]); (0, _react.useEffect)(function () { - var _currentFluidStatus$c3, _currentFluidStatus$c4, _currentFluidStatus$c5; - if ((_currentFluidStatus$c3 = currentFluidStatus.connection.triggerState) !== null && _currentFluidStatus$c3 !== void 0 && _currentFluidStatus$c3.last_success) { + var _currentFluidStatus$c, _currentFluidStatus$c2, _currentFluidStatus$c3; + if ((_currentFluidStatus$c = currentFluidStatus.connection.triggerState) !== null && _currentFluidStatus$c !== void 0 && _currentFluidStatus$c.last_success) { var result = _luxon.DateTime.fromISO(currentFluidStatus.connection.triggerState.last_success); setLastExecutionDate(result); } else { setLastExecutionDate('-'); } - if (((_currentFluidStatus$c4 = currentFluidStatus.connection.triggerState) === null || _currentFluidStatus$c4 === void 0 ? void 0 : _currentFluidStatus$c4.status) === 'errored' && (_currentFluidStatus$c5 = currentFluidStatus.connection.triggerState) !== null && _currentFluidStatus$c5 !== void 0 && _currentFluidStatus$c5.last_error) { + if (((_currentFluidStatus$c2 = currentFluidStatus.connection.triggerState) === null || _currentFluidStatus$c2 === void 0 ? void 0 : _currentFluidStatus$c2.status) === 'errored' && (_currentFluidStatus$c3 = currentFluidStatus.connection.triggerState) !== null && _currentFluidStatus$c3 !== void 0 && _currentFluidStatus$c3.last_error) { setStatus('errored'); setKonnectorError((0, _utils.getKonnectorUpdateError)(currentFluidStatus.connection.triggerState.last_error)); } diff --git a/app/ecolyo.ce6c9ae0986de7b8e932.js b/app/ecolyo.d868c6768e3aa38f5b4a.js similarity index 99% rename from app/ecolyo.ce6c9ae0986de7b8e932.js rename to app/ecolyo.d868c6768e3aa38f5b4a.js index 99a34af7bfea3345b78391081189007cf6a5cb44..5c0d93605bba7bf0da5419bda4a4cd426442cc4c 100644 --- a/app/ecolyo.ce6c9ae0986de7b8e932.js +++ b/app/ecolyo.d868c6768e3aa38f5b4a.js @@ -64,7 +64,7 @@ /******/ /******/ // script path function /******/ function jsonpScriptSrc(chunkId) { -/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"b1a5d3f3abe225f5c329","4":"67f3fe6d9d232a3381d9","5":"0910ab7edec7db99a369","6":"29f85a0dbdcb4c98427d","7":"d1f87eb67105e4a00434","8":"7f86157816222c0086ca","9":"f45e19d3c34ba67e355b","10":"fe3625578fa387c11975","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js" +/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"b1a5d3f3abe225f5c329","4":"67f3fe6d9d232a3381d9","5":"96b67016693ed2d7cd92","6":"29f85a0dbdcb4c98427d","7":"d1f87eb67105e4a00434","8":"7f86157816222c0086ca","9":"f45e19d3c34ba67e355b","10":"fe3625578fa387c11975","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js" /******/ } /******/ /******/ // The require function @@ -3223,18 +3223,11 @@ var GrdfConnectView = function GrdfConnectView() { (0, _react.useEffect)(function () { setGrdfState(function (prev) { var _instanceSettings$ema; - return _objectSpread(_objectSpread({}, prev), {}, { + return _objectSpread(_objectSpread(_objectSpread({}, prev), (0, _useForm.createInitialGrdfState)(formData)), {}, { email: (_instanceSettings$ema = instanceSettings.email) !== null && _instanceSettings$ema !== void 0 ? _instanceSettings$ema : '' }); }); - }, [instanceSettings]); - (0, _react.useEffect)(function applyFormData() { - if (formData) { - setGrdfState(function (prevState) { - return _objectSpread(_objectSpread({}, prevState), (0, _useForm.createInitialGrdfState)(formData)); - }); - } - }, [formData]); + }, [instanceSettings, formData]); (0, _react.useEffect)(function () { function launchConnect() { return _launchConnect.apply(this, arguments); @@ -21105,7 +21098,6 @@ var createInitialSgeState = function createInitialSgeState(formData) { var _formData$address, _formData$lastName, _formData$firstName, _formData$city; return { address: (_formData$address = formData === null || formData === void 0 ? void 0 : formData.address) !== null && _formData$address !== void 0 ? _formData$address : '', - // should be lowercase lastName: (_formData$lastName = formData === null || formData === void 0 ? void 0 : formData.lastName) !== null && _formData$lastName !== void 0 ? _formData$lastName : '', firstName: (_formData$firstName = formData === null || formData === void 0 ? void 0 : formData.firstName) !== null && _formData$firstName !== void 0 ? _formData$firstName : '', pdl: formData !== null && formData !== void 0 && formData.pdl ? parseInt(formData.pdl) : null, diff --git a/index.html b/index.html index 30ec972c6e8d3655b59c5d247ce8593683cbdb8d..5f743f24cc464a32e286f508b557c93fab2b49ec 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.77ee755a00655d3845ec.js"></script><script src="app/ecolyo.ce6c9ae0986de7b8e932.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.77ee755a00655d3845ec.js"></script><script src="app/ecolyo.d868c6768e3aa38f5b4a.js"></script></div></body></html> \ No newline at end of file