beforeRemove listener cleanup (#358)

stripe · Aug 31, 2022 · 25564e5 · 25564e5
1 parent 4cffee7
commit 25564e5
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/dev-app/src/screens/DiscoverReadersScreen.tsx b/dev-app/src/screens/DiscoverReadersScreen.tsx
@@ -106,6 +106,7 @@ export default function DiscoverReadersScreen() {
   const handleGoBack = useCallback(
     async (action: NavigationAction) => {
       await cancelDiscovering();
+
       if (navigation.canGoBack()) {
         navigation.dispatch(action);
       }
@@ -118,14 +119,23 @@ export default function DiscoverReadersScreen() {
       headerBackTitle: 'Cancel',
     });
 
-    navigation.addListener('beforeRemove', (e) => {
-      if (!discoveringLoading) {
+    const listener = navigation.addListener('beforeRemove', (e) => {
+      if (!discoveringLoading || !!connectingReader) {
         return;
       }
+
       e.preventDefault();
       handleGoBack(e.data.action);
     });
-  }, [navigation, cancelDiscovering, discoveringLoading, handleGoBack]);
+
+    return () => navigation.removeListener('beforeRemove', listener);
+  }, [
+    navigation,
+    cancelDiscovering,
+    discoveringLoading,
+    handleGoBack,
+    connectingReader,
+  ]);
 
   const handleDiscoverReaders = useCallback(async () => {
     setDiscoveringLoading(true);