Merge pull request #1595 from dedis/work-fe1-dmassonn-fix-offline-wro…

…ngly-redirect

Fix offline wrongly redirect

fe1-web/src/features/home/screens/Home.tsx

@@ -36,12 +36,8 @@ const Home: FunctionComponent<unknown> = () => {
   useEffect(() => {
     // Return the function to unsubscribe from the event so it gets removed on unmount
     return navigation.addListener('focus', () => {
-      // The screen is now focused, check if we are connected to a lao
-      if (isConnected) {
-        // if we enter this screen and connected to a lao
-        // disconnect from this lao
-        disconnectFromLao();
-      }
+      // The screen is now focused, disconnect from the current lao if any
+      disconnectFromLao();
     });
   }, [navigation, isConnected, disconnectFromLao]);
 

fe1-web/src/features/lao/navigation/LaoNavigation.tsx

@@ -14,7 +14,6 @@ import { makeIcon } from 'core/components/PoPIcon';
 import { AppScreen } from 'core/navigation/AppNavigation';
 import { drawerNavigationOptions } from 'core/navigation/ScreenOptions';
 import { LaoParamList } from 'core/navigation/typing/LaoParamList';
-import { getNetworkManager } from 'core/network';
 import { Color, Spacing, Typography } from 'core/styles';
 import STRINGS from 'resources/strings';
 
@@ -86,8 +85,7 @@ const LaoDrawerContent = ({ descriptors, navigation, state }: DrawerContentCompo
         <DrawerItem
           label={STRINGS.navigation_lao_disconnect_title}
           onPress={() => {
-            getNetworkManager().disconnectFromAll();
-
+            // when going back to the app home, it will automatically disconnect from the lao
             navigation.navigate(STRINGS.navigation_app_home, {
               screen: STRINGS.navigation_home_home,
             });