From ae57cdea2a0ef85613929074f5f37d3fe6a5575a Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Mon, 29 Mar 2021 22:02:38 -0700
Subject: [PATCH] fix: GA should load on public share pages, closes #1992

---
 app/components/Layout.js |  2 --
 app/index.js             | 29 ++++++++++++++++-------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/components/Layout.js b/app/components/Layout.js
index c43912bd..5bda5222 100644
--- a/app/components/Layout.js
+++ b/app/components/Layout.js
@@ -21,7 +21,6 @@ import PoliciesStore from "stores/PoliciesStore";
 import UiStore from "stores/UiStore";
 import ErrorSuspended from "scenes/ErrorSuspended";
 import KeyboardShortcuts from "scenes/KeyboardShortcuts";
-import Analytics from "components/Analytics";
 import Button from "components/Button";
 import DocumentHistory from "components/DocumentHistory";
 import Flex from "components/Flex";
@@ -121,7 +120,6 @@ class Layout extends React.Component<Props> {
           />
         </Helmet>
         <SkipNavLink />
-        <Analytics />
 
         {this.props.ui.progressBarVisible && <LoadingIndicatorBar />}
         {this.props.notifications}
diff --git a/app/index.js b/app/index.js
index 6c7d1731..0b54200c 100644
--- a/app/index.js
+++ b/app/index.js
@@ -7,6 +7,7 @@ import { render } from "react-dom";
 import { Router } from "react-router-dom";
 import { initI18n } from "shared/i18n";
 import stores from "stores";
+import Analytics from "components/Analytics";
 import ErrorBoundary from "components/ErrorBoundary";
 import PageTheme from "components/PageTheme";
 import ScrollToTop from "components/ScrollToTop";
@@ -43,19 +44,21 @@ if ("serviceWorker" in window.navigator) {
 if (element) {
   render(
     <Provider {...stores}>
-      <Theme>
-        <ErrorBoundary>
-          <Router history={history}>
-            <>
-              <PageTheme />
-              <ScrollToTop>
-                <Routes />
-              </ScrollToTop>
-              <Toasts />
-            </>
-          </Router>
-        </ErrorBoundary>
-      </Theme>
+      <Analytics>
+        <Theme>
+          <ErrorBoundary>
+            <Router history={history}>
+              <>
+                <PageTheme />
+                <ScrollToTop>
+                  <Routes />
+                </ScrollToTop>
+                <Toasts />
+              </>
+            </Router>
+          </ErrorBoundary>
+        </Theme>
+      </Analytics>
     </Provider>,
     element
   );