Merge pull request #41412 from tienifr/fix/38212-regression-offline-i…

…ndicator fix app does not go offline when Force offline
Expensify · May 4, 2024 · 550e83b · 550e83b
2 parents 2f5173c + 8df5121
commit 550e83b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/hooks/useNetwork.ts b/src/hooks/useNetwork.ts
@@ -12,8 +12,7 @@ export default function useNetwork({onReconnect = () => {}}: UseNetworkProps = {
     const callback = useRef(onReconnect);
     callback.current = onReconnect;
 
-    const {networkStatus} = useContext(NetworkContext) ?? {...CONST.DEFAULT_NETWORK_DATA, networkStatus: CONST.NETWORK.NETWORK_STATUS.UNKNOWN};
-    const isOffline = networkStatus === CONST.NETWORK.NETWORK_STATUS.OFFLINE;
+    const {isOffline, networkStatus} = useContext(NetworkContext) ?? {...CONST.DEFAULT_NETWORK_DATA, networkStatus: CONST.NETWORK.NETWORK_STATUS.UNKNOWN};
     const prevOfflineStatusRef = useRef(isOffline);
     useEffect(() => {
         // If we were offline before and now we are not offline then we just reconnected
@@ -30,5 +29,6 @@ export default function useNetwork({onReconnect = () => {}}: UseNetworkProps = {
         prevOfflineStatusRef.current = isOffline;
     }, [isOffline]);
 
-    return {isOffline};
+    // If the network status is undefined, we don't treat it as offline. Otherwise, we utilize the isOffline prop.
+    return {isOffline: networkStatus === CONST.NETWORK.NETWORK_STATUS.UNKNOWN ? false : isOffline};
 }