Merge branch 'develop' into node-14

MetaMask · Apr 16, 2021 · 86b4bbb · 86b4bbb
2 parents fd2e79b + 86771f7
commit 86b4bbb
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/components/Nav/Main/index.js b/app/components/Nav/Main/index.js
@@ -137,13 +137,17 @@ const Main = props => {
 
 	const connectionChangeHandler = useCallback(
 		state => {
+			if (!state) return;
+			const { isConnected } = state;
 			// Show the modal once the status changes to offline
-			if (connected && state && !state.isConnected) {
+			if (connected && isConnected === false) {
 				props.navigation.navigate('OfflineModeView');
-				setConnected(state.isConnected);
+			}
+			if (connected !== isConnected && isConnected !== null) {
+				setConnected(isConnected);
 			}
 		},
-		[connected, props.navigation]
+		[connected, setConnected, props.navigation]
 	);
 
 	const checkInfuraAvailability = useCallback(async () => {