1 files changed, 21 insertions, 6 deletions
diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx
index 40db1191..07b697d0 100644
--- a/src/screens/moments/CameraScreen.tsx
+++ b/src/screens/moments/CameraScreen.tsx
@@ -9,7 +9,7 @@ import {CameraType, FlashMode, RNCamera} from 'react-native-camera';
 import {AnimatedCircularProgress} from 'react-native-circular-progress';
 import CloseIcon from '../../assets/ionicons/close-outline.svg';
 import {FlashButton, FlipButton, GalleryIcon} from '../../components';
-import {TAGG_PURPLE} from '../../constants';
+import {MAX_VIDEO_RECORDING_DURATION, TAGG_PURPLE} from '../../constants';
 import {MainStackParams} from '../../routes';
 import {HeaderHeight, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
 import {showGIFFailureAlert, takePicture, takeVideo} from '../../utils/camera';
@@ -37,6 +37,7 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
       navigation.dangerouslyGetParent()?.setOptions({
         tabBarVisible: false,
       });
+      return () => setIsRecording(false);
     }, [navigation]),
   );
 
@@ -120,10 +121,24 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
             setIsRecording(true);
           }}
           onPressOut={async () => {
-            if (await cameraRef.current?.isRecording()) {
-              cameraRef.current?.stopRecording();
-              setIsRecording(false);
-            }
+            const cancelRecording = async () => {
+              if (await cameraRef.current?.isRecording()) {
+                cameraRef.current?.stopRecording();
+                setIsRecording(false);
+              }
+            };
+            cancelRecording();
+            // tmp fix for when the animation glitches during the beginning of
+            // recording causing onPressOut to not be detected.
+            setTimeout(() => {
+              cancelRecording();
+            }, 500);
+            setTimeout(() => {
+              cancelRecording();
+            }, 1000);
+            setTimeout(() => {
+              cancelRecording();
+            }, 1500);
           }}
           onPress={() => {
             takePicture(cameraRef, (pic) => navigateToEditMedia(pic.uri));
@@ -136,7 +151,7 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
             width={6}
             fill={100}
             rotation={0}
-            duration={60000 + 1000} // an extra second for UI to load
+            duration={(MAX_VIDEO_RECORDING_DURATION + 1) * 1000} // an extra second for UI to load
             tintColor={TAGG_PURPLE}
             style={styles.bottomContainer}
             lineCap={'round'}