From 4b67103b53067e185ee27d34b86992ab9e9eb170 Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Wed, 17 Nov 2021 10:57:31 +0000
Subject: [PATCH] publish: Merge branch 'fix/US647-scroll-to-top' into 'dev'

generated from commit 31cd5587d52814b086ab3da8d1034b6fc690d5fd
---
 ...7364.js => ecolyo.88e27d88c6f00fc18106.js} | 23 ++++++++++++++-----
 index.html                                    |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)
 rename app/{ecolyo.380f69a6a7f0fe427364.js => ecolyo.88e27d88c6f00fc18106.js} (99%)

diff --git a/app/ecolyo.380f69a6a7f0fe427364.js b/app/ecolyo.88e27d88c6f00fc18106.js
similarity index 99%
rename from app/ecolyo.380f69a6a7f0fe427364.js
rename to app/ecolyo.88e27d88c6f00fc18106.js
index 4eba7542b..44269143f 100644
--- a/app/ecolyo.380f69a6a7f0fe427364.js
+++ b/app/ecolyo.88e27d88c6f00fc18106.js
@@ -16681,16 +16681,27 @@ var Content = function Content(_ref) {
   var cozyNavHeight = 56;
   var handleFeedbackModalClose = (0, _react.useCallback)(function () {
     dispatch((0, _modal.updateModalIsFeedbacksOpen)(false));
-  }, [dispatch]);
+  }, [dispatch]); // Scroll handling
+
+  var app = document.querySelector('.app-content');
+  /**
+   * Handle Desktop scroll
+   */
+
+  var handleWindowScroll = function handleWindowScroll() {
+    app && app.scrollTo(0, 0);
+    window.scrollTo(0, 0);
+  }; // Set listners for scroll
+
+
   (0, _react.useEffect)(function () {
-    var unlisten = _App.history.listen(function () {
-      document.querySelector('.app-content').scrollTo(0, 0);
-    });
+    var listner = _App.history.listen(handleWindowScroll);
 
     return function () {
-      unlisten();
+      // remove listner subscription
+      listner();
     };
-  }, [children]);
+  }, []);
   (0, _react.useEffect)(function () {
     function handleResize() {
       if (innerWidth <= 768) {
diff --git a/index.html b/index.html
index 8e4f2e200..7a04bc1da 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="theme-color" content="#ffffff"><!-- 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="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover">{{.ThemeCSS}} {{.CozyBar}}</head><body><div role="application" class="application" data-cozy-token="{{.Token}}" data-cozy-domain="{{.Domain}}" data-cozy-locale="{{.Locale}}" data-cozy-app-name="{{.AppName}}" data-cozy-app-slug="{{.AppSlug}}" data-cozy-app-name-prefix="{{.AppNamePrefix}}" data-cozy-app-editor="{{.AppEditor}}" data-cozy-icon-path="{{.IconPath}}"><script src="vendors/ecolyo.ab99c1db99293979813b.js"></script><script src="app/ecolyo.380f69a6a7f0fe427364.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="theme-color" content="#ffffff"><!-- 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="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover">{{.ThemeCSS}} {{.CozyBar}}</head><body><div role="application" class="application" data-cozy-token="{{.Token}}" data-cozy-domain="{{.Domain}}" data-cozy-locale="{{.Locale}}" data-cozy-app-name="{{.AppName}}" data-cozy-app-slug="{{.AppSlug}}" data-cozy-app-name-prefix="{{.AppNamePrefix}}" data-cozy-app-editor="{{.AppEditor}}" data-cozy-icon-path="{{.IconPath}}"><script src="vendors/ecolyo.ab99c1db99293979813b.js"></script><script src="app/ecolyo.88e27d88c6f00fc18106.js"></script></div></body></html>
\ No newline at end of file
-- 
GitLab