From d8df224374bf5ea161933881ed05dfdd4d2a67cc Mon Sep 17 00:00:00 2001
From: build-token <build-token>
Date: Mon, 25 Nov 2024 08:16:56 +0000
Subject: [PATCH] publish: Merge branch 'fix/email-grdf-consent' into 'dev'
generated from commit b87e943e16cc67c7e36c4f44be4dec7f162d3966
---
...a219.js => ecolyo.9aa749e9513e17fa83d2.js} | 20 ++++++++++++-------
index.html | 2 +-
2 files changed, 14 insertions(+), 8 deletions(-)
rename app/{ecolyo.25791a84e1e69d5ca219.js => ecolyo.9aa749e9513e17fa83d2.js} (99%)
diff --git a/app/ecolyo.25791a84e1e69d5ca219.js b/app/ecolyo.9aa749e9513e17fa83d2.js
similarity index 99%
rename from app/ecolyo.25791a84e1e69d5ca219.js
rename to app/ecolyo.9aa749e9513e17fa83d2.js
index c069571d1..6aaf33912 100644
--- a/app/ecolyo.25791a84e1e69d5ca219.js
+++ b/app/ecolyo.9aa749e9513e17fa83d2.js
@@ -3217,14 +3217,19 @@ var GrdfConnectView = function GrdfConnectView() {
_useKonnectorAuth2 = (0, _slicedToArray2.default)(_useKonnectorAuth, 2),
connect = _useKonnectorAuth2[0],
update = _useKonnectorAuth2[1];
+ (0, _react.useEffect)(function () {
+ setGrdfState(function (prev) {
+ return _objectSpread(_objectSpread({}, prev), (0, _useForm.createInitialGrdfState)(formData));
+ });
+ }, [formData]);
(0, _react.useEffect)(function () {
setGrdfState(function (prev) {
var _instanceSettings$ema;
- return _objectSpread(_objectSpread(_objectSpread({}, prev), (0, _useForm.createInitialGrdfState)(formData)), {}, {
- email: (_instanceSettings$ema = instanceSettings.email) !== null && _instanceSettings$ema !== void 0 ? _instanceSettings$ema : ''
+ return _objectSpread(_objectSpread({}, prev), {}, {
+ email: (_instanceSettings$ema = instanceSettings.email) !== null && _instanceSettings$ema !== void 0 ? _instanceSettings$ema : prev.email
});
});
- }, [instanceSettings, formData]);
+ }, [instanceSettings]);
(0, _react.useEffect)(function () {
function launchConnect() {
return _launchConnect.apply(this, arguments);
@@ -3283,6 +3288,7 @@ var GrdfConnectView = function GrdfConnectView() {
_type: _doctypes.FORM_DOCTYPE,
firstName: grdfState.firstname,
lastName: grdfState.lastname,
+ email: grdfState.email,
pce: grdfState.pce,
zipCode: grdfState.postalCode
}));
@@ -3291,7 +3297,7 @@ var GrdfConnectView = function GrdfConnectView() {
setLaunchConnection(true);
}
focusMainContent();
- }, [client, currentStep, formData, grdfState.firstname, grdfState.lastname, grdfState.pce, grdfState.postalCode, isNextValid]);
+ }, [client, currentStep, formData, grdfState.firstname, grdfState.lastname, grdfState.email, grdfState.pce, grdfState.postalCode, isNextValid]);
var handlePrev = function handlePrev() {
setCurrentStep(function (prev) {
return prev - 1;
@@ -21112,13 +21118,13 @@ var createInitialSgeState = function createInitialSgeState(formData) {
};
exports.createInitialSgeState = createInitialSgeState;
var createInitialGrdfState = function createInitialGrdfState(formData) {
- var _formData$lastName2, _formData$firstName2, _formData$pce, _formData$zipCode;
+ var _formData$lastName2, _formData$firstName2, _formData$email, _formData$pce, _formData$zipCode;
return {
lastname: (_formData$lastName2 = formData === null || formData === void 0 ? void 0 : formData.lastName) !== null && _formData$lastName2 !== void 0 ? _formData$lastName2 : '',
firstname: (_formData$firstName2 = formData === null || formData === void 0 ? void 0 : formData.firstName) !== null && _formData$firstName2 !== void 0 ? _formData$firstName2 : '',
+ email: (_formData$email = formData === null || formData === void 0 ? void 0 : formData.email) !== null && _formData$email !== void 0 ? _formData$email : '',
pce: (_formData$pce = formData === null || formData === void 0 ? void 0 : formData.pce) !== null && _formData$pce !== void 0 ? _formData$pce : '',
- postalCode: (_formData$zipCode = formData === null || formData === void 0 ? void 0 : formData.zipCode) !== null && _formData$zipCode !== void 0 ? _formData$zipCode : '',
- email: ''
+ postalCode: (_formData$zipCode = formData === null || formData === void 0 ? void 0 : formData.zipCode) !== null && _formData$zipCode !== void 0 ? _formData$zipCode : ''
};
};
exports.createInitialGrdfState = createInitialGrdfState;
diff --git a/index.html b/index.html
index d39953ab5..82ad87036 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.d8f4ed281ee673627c46.js"></script><script src="app/ecolyo.25791a84e1e69d5ca219.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.d8f4ed281ee673627c46.js"></script><script src="app/ecolyo.9aa749e9513e17fa83d2.js"></script></div></body></html>
\ No newline at end of file
--
GitLab