From 3329ed720fb336d9e5f893158754f630c7c2509d Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 6 Aug 2021 17:47:57 -0400
Subject: Cleanup code, Pause preview earlier

---
 src/screens/moments/CameraScreen.tsx | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/screens')

diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx
index 1f38a0bf..739461a8 100644
--- a/src/screens/moments/CameraScreen.tsx
+++ b/src/screens/moments/CameraScreen.tsx
@@ -27,7 +27,6 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
   const {screenType, selectedCategory} = route.params;
   const cameraRef = useRef<RNCamera>(null);
   const tabBarHeight = useBottomTabBarHeight();
-  const focused = useIsFocused();
   const [cameraType, setCameraType] = useState<keyof CameraType>('back');
   const [flashMode, setFlashMode] = useState<keyof FlashMode>('off');
   const [mostRecentPhoto, setMostRecentPhoto] = useState<string>('');
@@ -44,14 +43,6 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
     }
   };
 
-  useEffect(() => {
-    if (!focused) {
-      setTimeout(() => {
-        setShowCamera(false);
-      }, 500);
-    }
-  }, [focused]);
-
   useFocusEffect(
     useCallback(() => {
       navigation.dangerouslyGetParent()?.setOptions({
@@ -66,7 +57,11 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
 
       setShowCamera(true);
 
-      return () => setIsRecording(false);
+      return () => {
+        setTimeout(() => {
+          setShowCamera(false);
+        }, 500);
+      };
     }, [navigation]),
   );
 
-- 
cgit v1.2.3-70-g09d2