From a8c210165938cfa4da7ed6bc185af297d528d2aa Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Wed, 30 Jun 2021 15:32:52 -0400
Subject: Remove filename requirement for all moment upload

---
 src/screens/moments/CameraScreen.tsx  | 18 +++++++++++++++---
 src/screens/profile/CaptionScreen.tsx | 16 ++++------------
 2 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'src/screens')

diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx
index b3275764..104774c0 100644
--- a/src/screens/moments/CameraScreen.tsx
+++ b/src/screens/moments/CameraScreen.tsx
@@ -1,8 +1,9 @@
 import CameraRoll from '@react-native-community/cameraroll';
 import {useBottomTabBarHeight} from '@react-navigation/bottom-tabs';
 import {RouteProp} from '@react-navigation/core';
+import {useFocusEffect} from '@react-navigation/native';
 import {StackNavigationProp} from '@react-navigation/stack';
-import React, {createRef, useEffect, useState} from 'react';
+import React, {createRef, useCallback, useEffect, useState} from 'react';
 import {StyleSheet, TouchableOpacity, View} from 'react-native';
 import {CameraType, FlashMode, RNCamera} from 'react-native-camera';
 import CloseIcon from '../../assets/ionicons/close-outline.svg';
@@ -36,6 +37,19 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
   const [mostRecentPhoto, setMostRecentPhoto] = useState<string>('');
   const [showSaveButton, setShowSaveButton] = useState<boolean>(false);
 
+  useFocusEffect(
+    useCallback(() => {
+      navigation.dangerouslyGetParent()?.setOptions({
+        tabBarVisible: false,
+      });
+      return () => {
+        navigation.dangerouslyGetParent()?.setOptions({
+          tabBarVisible: true,
+        });
+      };
+    }, [navigation]),
+  );
+
   /*
    *  Chooses the last picture from gallery to display as the gallery button icon
    */
@@ -61,7 +75,6 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
       screenType,
       title,
       media: {
-        filename: 'dont have that info',
         uri: capturedImage,
         isVideo: false, // TODO: false for now
       },
@@ -131,7 +144,6 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
                       screenType,
                       title,
                       media: {
-                        filename: pic.filename,
                         uri: pic.path,
                         isVideo: false,
                       },
diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index 364b81a3..da3efb06 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -69,7 +69,6 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
     selectedTags ? selectedTags : [],
   );
   const [taggedList, setTaggedList] = useState<string>('');
-  const mediaFilename = moment ? undefined : route.params.media!.filename;
   const mediaUri = moment ? moment.moment_url : route.params.media!.uri;
   // TODO: change this once moment refactor is done
   const isMediaAVideo = moment
@@ -138,7 +137,7 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
 
   const handleShare = async () => {
     setLoading(true);
-    if (moment || !mediaFilename || !title) {
+    if (moment || !title) {
       handleFailed();
       return;
     }
@@ -146,22 +145,16 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
     let momentId;
     // separate upload logic for image/video
     if (isMediaAVideo) {
-      const presignedURL = await handlePresignedURL(mediaFilename, title);
+      const presignedURL = await handlePresignedURL(title);
       if (!presignedURL) {
         handleFailed();
         return;
       }
       momentId = presignedURL.moment_id;
       // TODO: assume success for now
-      await handleVideoUpload(mediaFilename, mediaUri, presignedURL);
+      await handleVideoUpload(mediaUri, presignedURL);
     } else {
-      const momentResponse = await postMoment(
-        mediaFilename,
-        mediaUri,
-        caption,
-        title,
-        userId,
-      );
+      const momentResponse = await postMoment(mediaUri, caption, title, userId);
       if (!momentResponse) {
         handleFailed();
         return;
@@ -252,7 +245,6 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
               onPress={() =>
                 navigation.navigate('TagFriendsScreen', {
                   media: {
-                    filename: mediaFilename ?? '',
                     uri: mediaUri,
                     isVideo: isMediaAVideo,
                   },
-- 
cgit v1.2.3-70-g09d2