From 8bfab1a46183e06efab69563c332e4a1c8bcec35 Mon Sep 17 00:00:00 2001
From: "marc.sirisak" <marc.sirisak@beta.gouv.fr>
Date: Thu, 1 Aug 2024 19:01:42 +0200
Subject: [PATCH] fix(init): move initTchap to dynamic import for  browser
 feature check

---
 src/tchap/app/initTchap.ts |  8 ++++++++
 src/vector/index.ts        | 22 ++++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/tchap/app/initTchap.ts b/src/tchap/app/initTchap.ts
index f5ab4515a..1b23fdf28 100644
--- a/src/tchap/app/initTchap.ts
+++ b/src/tchap/app/initTchap.ts
@@ -90,3 +90,11 @@ export function saveAppVersionInLocalStorage() {
 export function registerExpiredAccountListener() {
     ExpiredAccountHandler.register();
 }
+
+export default {
+    registerExpiredAccountListener,
+    saveAppVersionInLocalStorage,
+    queueOverideUserSettings,
+    queueClearCacheAndReload,
+    needsRefreshForVersion4
+}
\ No newline at end of file
diff --git a/src/vector/index.ts b/src/vector/index.ts
index 3c8a5ad4c..85857037c 100644
--- a/src/vector/index.ts
+++ b/src/vector/index.ts
@@ -24,14 +24,6 @@ import { shouldPolyfill as shouldPolyFillIntlSegmenter } from "@formatjs/intl-se
 // These are things that can run before the skin loads - be careful not to reference the react-sdk though.
 import { parseQsFromFragment } from "./url_utils";
 import "./modernizr";
-// eslint-disable-next-line max-len
-import {
-    queueClearCacheAndReload,
-    queueOverideUserSettings,
-    needsRefreshForVersion4,
-    saveAppVersionInLocalStorage,
-    registerExpiredAccountListener,
-} from "../tchap/app/initTchap";
 
 // Make setImmediate available in bundle
 import "setimmediate";
@@ -150,6 +142,20 @@ async function start(): Promise<void> {
         /* webpackPreload: true */
         "./init"
     );
+   
+    // :TCHAP: load initTchap.ts async so that its code is not executed immediately and we can catch any exceptions
+    const {
+        registerExpiredAccountListener,
+        saveAppVersionInLocalStorage,
+        queueOverideUserSettings,
+        queueClearCacheAndReload,
+        needsRefreshForVersion4
+    } = await import(
+        /* webpackChunkName: "initTchap" */
+        /* webpackPreload: true */
+        "../tchap/app/initTchap"
+    );
+    // end :TCHAP:
 
     // Now perform the next stage of initialisation. This has its own try/catch in which we render
     // a react error page on failure.