From 62e9819f4467a0531e59c267955298df2bd49e17 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Tue, 17 Sep 2024 16:12:14 +0200
Subject: [PATCH 1/6] add consts

---
 src/CONST.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/CONST.ts b/src/CONST.ts
index c00b33be1c31..3d8ca3dc30b4 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -5424,6 +5424,7 @@ const CONST = {
         INITIAL_URL: 'INITIAL_URL',
         ACTIVE_WORKSPACE_ID: 'ACTIVE_WORKSPACE_ID',
         RETRY_LAZY_REFRESHED: 'RETRY_LAZY_REFRESHED',
+        LAST_REFRESH_TIMESTAMP: 'LAST_REFRESH_TIMESTAMP',
     },
 
     RESERVATION_TYPE: {
@@ -5753,6 +5754,9 @@ const CONST = {
 
         CATEGORIES_ARTICLE_LINK: 'https://help.expensify.com/articles/expensify-classic/workspaces/Create-categories#import-custom-categories',
     },
+
+    // The timeout duration (1 minute) (in milliseconds) before the window reloads due to an error.
+    ERROR_WINDOW_RELOAD_TIMEOUT: 60000,
 } as const;
 
 type Country = keyof typeof CONST.ALL_COUNTRIES;

From de80004ecc5ff296683065809bb27ecfa632b640 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Tue, 17 Sep 2024 16:12:47 +0200
Subject: [PATCH 2/6] integrate refresh or reload in GenericErrorPage

---
 src/pages/ErrorPage/GenericErrorPage.tsx | 28 +++++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/pages/ErrorPage/GenericErrorPage.tsx b/src/pages/ErrorPage/GenericErrorPage.tsx
index 9f4186bc354f..4d7c2f649208 100644
--- a/src/pages/ErrorPage/GenericErrorPage.tsx
+++ b/src/pages/ErrorPage/GenericErrorPage.tsx
@@ -1,3 +1,4 @@
+import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
 import React from 'react';
 import {useErrorBoundary} from 'react-error-boundary';
 import {View} from 'react-native';
@@ -23,9 +24,27 @@ function GenericErrorPage() {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-
     const {resetBoundary} = useErrorBoundary();
 
+    const refresh = () => {
+        const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
+
+        if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT) {
+            resetBoundary();
+            sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
+
+            return;
+        }
+
+        window.location.reload();
+        sessionStorage.removeItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP);
+    };
+
+    const refreshAndSignOut = () => {
+        Session.signOutAndRedirectToSignIn();
+        refresh();
+    };
+
     return (
         <SafeAreaConsumer>
             {({paddingBottom}) => (
@@ -59,16 +78,13 @@ function GenericErrorPage() {
                                 <View style={[styles.flex1, styles.flexRow]}>
                                     <Button
                                         success
-                                        onPress={resetBoundary}
                                         text={translate('genericErrorPage.refresh')}
                                         style={styles.mr3}
+                                        onPress={refresh}
                                     />
                                     <Button
-                                        onPress={() => {
-                                            Session.signOutAndRedirectToSignIn();
-                                            resetBoundary();
-                                        }}
                                         text={translate('initialSettingsPage.signOut')}
+                                        onPress={refreshAndSignOut}
                                     />
                                 </View>
                             </View>

From 27e953c751cdda98f6b786bca6db6a3a90c248fa Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Tue, 17 Sep 2024 16:20:32 +0200
Subject: [PATCH 3/6] handle RN case

---
 src/pages/ErrorPage/GenericErrorPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ErrorPage/GenericErrorPage.tsx b/src/pages/ErrorPage/GenericErrorPage.tsx
index 4d7c2f649208..069f651442f6 100644
--- a/src/pages/ErrorPage/GenericErrorPage.tsx
+++ b/src/pages/ErrorPage/GenericErrorPage.tsx
@@ -29,7 +29,7 @@ function GenericErrorPage() {
     const refresh = () => {
         const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
 
-        if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT) {
+        if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT || !window?.location?.reload) {
             resetBoundary();
             sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
 

From de36524f8df6d00e09979c284976ee8668d29e7b Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Wed, 18 Sep 2024 12:14:00 +0200
Subject: [PATCH 4/6] integrate refreshPage

---
 src/libs/refreshPage/index.native.ts     |  3 +++
 src/libs/refreshPage/index.ts            | 16 +++++++++++++
 src/pages/ErrorPage/GenericErrorPage.tsx | 29 ++++++------------------
 3 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 src/libs/refreshPage/index.native.ts
 create mode 100644 src/libs/refreshPage/index.ts

diff --git a/src/libs/refreshPage/index.native.ts b/src/libs/refreshPage/index.native.ts
new file mode 100644
index 000000000000..765b1491f922
--- /dev/null
+++ b/src/libs/refreshPage/index.native.ts
@@ -0,0 +1,3 @@
+export default function refreshPage(resetBoundary: () => void) {
+    resetBoundary();
+}
diff --git a/src/libs/refreshPage/index.ts b/src/libs/refreshPage/index.ts
new file mode 100644
index 000000000000..8744ac1865c8
--- /dev/null
+++ b/src/libs/refreshPage/index.ts
@@ -0,0 +1,16 @@
+import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
+import CONST from '@src/CONST';
+
+export default function refreshPage(resetBoundary: () => void) {
+    const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
+
+    if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT) {
+        resetBoundary();
+        sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
+
+        return;
+    }
+
+    window.location.reload();
+    sessionStorage.removeItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP);
+}
diff --git a/src/pages/ErrorPage/GenericErrorPage.tsx b/src/pages/ErrorPage/GenericErrorPage.tsx
index 069f651442f6..9f62b774e08e 100644
--- a/src/pages/ErrorPage/GenericErrorPage.tsx
+++ b/src/pages/ErrorPage/GenericErrorPage.tsx
@@ -1,4 +1,3 @@
-import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
 import React from 'react';
 import {useErrorBoundary} from 'react-error-boundary';
 import {View} from 'react-native';
@@ -14,6 +13,7 @@ import useLocalize from '@hooks/useLocalize';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import refreshPage from '@libs/refreshPage';
 import variables from '@styles/variables';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
@@ -24,26 +24,8 @@ function GenericErrorPage() {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const {resetBoundary} = useErrorBoundary();
-
-    const refresh = () => {
-        const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
-
-        if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT || !window?.location?.reload) {
-            resetBoundary();
-            sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
 
-            return;
-        }
-
-        window.location.reload();
-        sessionStorage.removeItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP);
-    };
-
-    const refreshAndSignOut = () => {
-        Session.signOutAndRedirectToSignIn();
-        refresh();
-    };
+    const {resetBoundary} = useErrorBoundary();
 
     return (
         <SafeAreaConsumer>
@@ -80,11 +62,14 @@ function GenericErrorPage() {
                                         success
                                         text={translate('genericErrorPage.refresh')}
                                         style={styles.mr3}
-                                        onPress={refresh}
+                                        onPress={() => refreshPage(resetBoundary)}
                                     />
                                     <Button
                                         text={translate('initialSettingsPage.signOut')}
-                                        onPress={refreshAndSignOut}
+                                        onPress={() => {
+                                            Session.signOutAndRedirectToSignIn();
+                                            refreshPage(resetBoundary);
+                                        }}
                                     />
                                 </View>
                             </View>

From c5bbcc66ee492a03e8c0bc16e32217d9650bc1da Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Wed, 18 Sep 2024 12:21:33 +0200
Subject: [PATCH 5/6] integrate usePageRefresh

---
 src/hooks/usePageRefresh/index.native.ts | 10 ++++++++++
 src/hooks/usePageRefresh/index.ts        | 24 ++++++++++++++++++++++++
 src/hooks/usePageRefresh/type.ts         |  3 +++
 src/libs/refreshPage/index.native.ts     |  3 ---
 src/libs/refreshPage/index.ts            | 16 ----------------
 src/pages/ErrorPage/GenericErrorPage.tsx | 10 ++++------
 6 files changed, 41 insertions(+), 25 deletions(-)
 create mode 100644 src/hooks/usePageRefresh/index.native.ts
 create mode 100644 src/hooks/usePageRefresh/index.ts
 create mode 100644 src/hooks/usePageRefresh/type.ts
 delete mode 100644 src/libs/refreshPage/index.native.ts
 delete mode 100644 src/libs/refreshPage/index.ts

diff --git a/src/hooks/usePageRefresh/index.native.ts b/src/hooks/usePageRefresh/index.native.ts
new file mode 100644
index 000000000000..c2685708ffff
--- /dev/null
+++ b/src/hooks/usePageRefresh/index.native.ts
@@ -0,0 +1,10 @@
+import {useErrorBoundary} from 'react-error-boundary';
+import type UsePageRefreshType from './type';
+
+const usePageRefresh: UsePageRefreshType = () => {
+    const {resetBoundary} = useErrorBoundary();
+
+    return resetBoundary;
+};
+
+export default usePageRefresh;
diff --git a/src/hooks/usePageRefresh/index.ts b/src/hooks/usePageRefresh/index.ts
new file mode 100644
index 000000000000..d6edd13edd74
--- /dev/null
+++ b/src/hooks/usePageRefresh/index.ts
@@ -0,0 +1,24 @@
+import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
+import {useErrorBoundary} from 'react-error-boundary';
+import CONST from '@src/CONST';
+import type UsePageRefreshType from './type';
+
+const usePageRefresh: UsePageRefreshType = () => {
+    const {resetBoundary} = useErrorBoundary();
+
+    return () => {
+        const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
+
+        if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT) {
+            resetBoundary();
+            sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
+
+            return;
+        }
+
+        window.location.reload();
+        sessionStorage.removeItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP);
+    };
+};
+
+export default usePageRefresh;
diff --git a/src/hooks/usePageRefresh/type.ts b/src/hooks/usePageRefresh/type.ts
new file mode 100644
index 000000000000..72d4c8bab71d
--- /dev/null
+++ b/src/hooks/usePageRefresh/type.ts
@@ -0,0 +1,3 @@
+type UsePageRefreshType = () => () => void;
+
+export default UsePageRefreshType;
diff --git a/src/libs/refreshPage/index.native.ts b/src/libs/refreshPage/index.native.ts
deleted file mode 100644
index 765b1491f922..000000000000
--- a/src/libs/refreshPage/index.native.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function refreshPage(resetBoundary: () => void) {
-    resetBoundary();
-}
diff --git a/src/libs/refreshPage/index.ts b/src/libs/refreshPage/index.ts
deleted file mode 100644
index 8744ac1865c8..000000000000
--- a/src/libs/refreshPage/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
-import CONST from '@src/CONST';
-
-export default function refreshPage(resetBoundary: () => void) {
-    const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
-
-    if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT) {
-        resetBoundary();
-        sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
-
-        return;
-    }
-
-    window.location.reload();
-    sessionStorage.removeItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP);
-}
diff --git a/src/pages/ErrorPage/GenericErrorPage.tsx b/src/pages/ErrorPage/GenericErrorPage.tsx
index 9f62b774e08e..0357cdc0204b 100644
--- a/src/pages/ErrorPage/GenericErrorPage.tsx
+++ b/src/pages/ErrorPage/GenericErrorPage.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import {useErrorBoundary} from 'react-error-boundary';
 import {View} from 'react-native';
 import LogoWordmark from '@assets/images/expensify-wordmark.svg';
 import Button from '@components/Button';
@@ -10,10 +9,10 @@ import SafeAreaConsumer from '@components/SafeAreaConsumer';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
+import usePageRefresh from '@hooks/usePageRefresh';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import refreshPage from '@libs/refreshPage';
 import variables from '@styles/variables';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
@@ -24,8 +23,7 @@ function GenericErrorPage() {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-
-    const {resetBoundary} = useErrorBoundary();
+    const refreshPage = usePageRefresh();
 
     return (
         <SafeAreaConsumer>
@@ -62,13 +60,13 @@ function GenericErrorPage() {
                                         success
                                         text={translate('genericErrorPage.refresh')}
                                         style={styles.mr3}
-                                        onPress={() => refreshPage(resetBoundary)}
+                                        onPress={refreshPage}
                                     />
                                     <Button
                                         text={translate('initialSettingsPage.signOut')}
                                         onPress={() => {
                                             Session.signOutAndRedirectToSignIn();
-                                            refreshPage(resetBoundary);
+                                            refreshPage();
                                         }}
                                     />
                                 </View>

From 77f36722a1cf0e87adc10f6024b5cf37bbac2446 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Wed, 18 Sep 2024 13:04:42 +0200
Subject: [PATCH 6/6] rename type

---
 src/hooks/usePageRefresh/index.native.ts | 4 ++--
 src/hooks/usePageRefresh/index.ts        | 4 ++--
 src/hooks/usePageRefresh/type.ts         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hooks/usePageRefresh/index.native.ts b/src/hooks/usePageRefresh/index.native.ts
index c2685708ffff..eb6a229ad65c 100644
--- a/src/hooks/usePageRefresh/index.native.ts
+++ b/src/hooks/usePageRefresh/index.native.ts
@@ -1,7 +1,7 @@
 import {useErrorBoundary} from 'react-error-boundary';
-import type UsePageRefreshType from './type';
+import type UsePageRefresh from './type';
 
-const usePageRefresh: UsePageRefreshType = () => {
+const usePageRefresh: UsePageRefresh = () => {
     const {resetBoundary} = useErrorBoundary();
 
     return resetBoundary;
diff --git a/src/hooks/usePageRefresh/index.ts b/src/hooks/usePageRefresh/index.ts
index d6edd13edd74..3708fe29e966 100644
--- a/src/hooks/usePageRefresh/index.ts
+++ b/src/hooks/usePageRefresh/index.ts
@@ -1,9 +1,9 @@
 import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
 import {useErrorBoundary} from 'react-error-boundary';
 import CONST from '@src/CONST';
-import type UsePageRefreshType from './type';
+import type UsePageRefresh from './type';
 
-const usePageRefresh: UsePageRefreshType = () => {
+const usePageRefresh: UsePageRefresh = () => {
     const {resetBoundary} = useErrorBoundary();
 
     return () => {
diff --git a/src/hooks/usePageRefresh/type.ts b/src/hooks/usePageRefresh/type.ts
index 72d4c8bab71d..f800cc0224a9 100644
--- a/src/hooks/usePageRefresh/type.ts
+++ b/src/hooks/usePageRefresh/type.ts
@@ -1,3 +1,3 @@
-type UsePageRefreshType = () => () => void;
+type UsePageRefresh = () => () => void;
 
-export default UsePageRefreshType;
+export default UsePageRefresh;