Improve screen flow

Author: CommanderRedYT

src/components/inverters/InverterList.tsx

@@ -25,7 +25,8 @@ const InverterList: FC = () => {
 
       return (
         a.every((x, i) => x.name === b[i].name) &&
-        a.every((x, i) => x.serial === b[i].serial)
+        a.every((x, i) => x.serial === b[i].serial) &&
+        a.every((x, i) => x.order === b[i].order)
       );
     },
   );

src/views/navigation/screens/InverterGroup/InverterDataScreen.tsx

@@ -1,4 +1,5 @@
 import type { FC } from 'react';
+import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Box } from 'react-native-flex-layout';
 import { Appbar, List, useTheme } from 'react-native-paper';
@@ -42,12 +43,14 @@ const InverterDataScreen: FC<PropsWithNavigation> = ({ navigation, route }) => {
         | undefined,
   );
 
-  if (!inverter) {
-    if (navigation.canGoBack()) {
+  useEffect(() => {
+    if (!inverter && navigation.canGoBack()) {
       log.warn('Inverter not found, going back', inverterSerial);
       navigation.goBack();
     }
+  }, [inverter, inverterSerial, navigation]);
 
+  if (!inverter) {
     return null;
   }
 

src/views/navigation/screens/InverterGroup/InverterDeviceInfoScreen.tsx

@@ -78,12 +78,14 @@ const InverterDeviceInfoScreen: FC<PropsWithNavigation> = ({
     [inverterDeviceInfo],
   );
 
-  if (typeof inverterDeviceInfo === 'undefined') {
-    if (navigation.canGoBack()) {
+  useEffect(() => {
+    if (typeof inverterDeviceInfo === 'undefined' && navigation.canGoBack()) {
       log.warn('Inverter not found, going back', inverterSerial);
       navigation.goBack();
     }
+  }, [inverterDeviceInfo, inverterSerial, navigation]);
 
+  if (typeof inverterDeviceInfo === 'undefined') {
     return null;
   }
 

src/views/navigation/screens/InverterGroup/InverterEventLogScreen.tsx

@@ -47,12 +47,14 @@ const InverterEventLogScreen: FC<PropsWithNavigation> = ({
     }
   }, [handleGetLog, navigation]);
 
-  if (!inverterSerial) {
-    if (navigation.canGoBack()) {
+  useEffect(() => {
+    if (!inverterSerial && navigation.canGoBack()) {
       log.warn('Inverter not found, going back', inverterSerial);
       navigation.goBack();
     }
+  }, [inverterSerial, navigation]);
 
+  if (!inverterSerial) {
     return null;
   }
 

src/views/navigation/screens/InverterGroup/InverterGridProfileScreen.tsx

@@ -73,12 +73,14 @@ const InverterGridProfileScreen: FC<PropsWithNavigation> = ({
     }
   }, [rawContent]);
 
-  if (!inverterSerial) {
-    if (navigation.canGoBack()) {
+  useEffect(() => {
+    if (!inverterSerial && navigation.canGoBack()) {
       log.warn('Inverter not found, going back', inverterSerial);
       navigation.goBack();
     }
+  }, [inverterSerial, navigation]);
 
+  if (!inverterSerial) {
     return null;
   }
 

src/views/navigation/screens/InverterGroup/InverterInfoScreen.tsx

@@ -203,12 +203,14 @@ const InverterInfoScreen: FC<PropsWithNavigation> = ({ navigation, route }) => {
 
   const hasAuthConfigured = useHasAuthConfigured();
 
-  if (typeof inverter === 'undefined') {
-    if (navigation.canGoBack()) {
+  useEffect(() => {
+    if (typeof inverter === 'undefined' && navigation.canGoBack()) {
       log.warn('Inverter not found, going back', inverterSerial);
       navigation.goBack();
     }
+  }, [inverter, inverterSerial, navigation]);
 
+  if (typeof inverter === 'undefined') {
     return null;
   }