Subscribe to NetInfo in Expensify constructor and have the reconnect …

…listeners sit behind AuthScreens
Expensify · Aug 9, 2022 · 0d13184 · 0d13184
1 parent e178897
commit 0d13184
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/Expensify.js b/src/Expensify.js
@@ -21,6 +21,7 @@ import ConfirmModal from './components/ConfirmModal';
 import compose from './libs/compose';
 import withLocalize, {withLocalizePropTypes} from './components/withLocalize';
 import * as User from './libs/actions/User';
+import NetworkConnection from './libs/NetworkConnection';
 
 Onyx.registerLogger(({level, message}) => {
     if (level === 'alert') {
@@ -91,6 +92,9 @@ class Expensify extends PureComponent {
             isOnyxMigrated: false,
             isSplashShown: true,
         };
+
+        // Used for the offline indicator appearing when someone is offline
+        NetworkConnection.subscribeToNetInfo();
     }
 
     componentDidMount() {

diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js
@@ -102,6 +102,10 @@ class AuthScreens extends React.Component {
 
     componentDidMount() {
         NetworkConnection.listenForReconnect();
+        NetworkConnection.onReconnect(() => {
+            App.getAppData();
+            App.reconnectApp();
+        });
         PusherConnectionManager.init();
         Pusher.init({
             appKey: CONFIG.PUSHER.APP_KEY,

diff --git a/src/libs/NetworkConnection.js b/src/libs/NetworkConnection.js
@@ -81,8 +81,6 @@ function listenForReconnect() {
     unsubscribeFromAppState = AppStateMonitor.addBecameActiveListener(() => {
         triggerReconnectionCallbacks('app became active');
     });
-
-    subscribeToNetInfo();
 }
 
 /**
@@ -130,4 +128,5 @@ export default {
     onReconnect,
     triggerReconnectionCallbacks,
     recheckNetworkConnection,
+    subscribeToNetInfo,
 };
diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
@@ -251,13 +251,6 @@ function openProfile() {
     Navigation.navigate(ROUTES.SETTINGS_PROFILE);
 }
 
-// When the app reconnects from being offline, fetch all initialization data
-NetworkConnection.listenForReconnect();
-NetworkConnection.onReconnect(() => {
-    getAppData();
-    reconnectApp();
-});
-
 export {
     setLocale,
     setSidebarLoaded,
@@ -266,4 +259,5 @@ export {
     setUpPoliciesAndNavigate,
     openProfile,
     openApp,
+    reconnectApp,
 };