2 files changed, 23 insertions, 54 deletions
diff --git a/src/screens/main/NotificationsScreen.tsx b/src/screens/main/NotificationsScreen.tsx
index b19107a7..55dd9051 100644
--- a/src/screens/main/NotificationsScreen.tsx
+++ b/src/screens/main/NotificationsScreen.tsx
@@ -1,4 +1,5 @@
 import AsyncStorage from '@react-native-community/async-storage';
+import PushNotificationIOS from '@react-native-community/push-notification-ios';
 import {useFocusEffect, useNavigation} from '@react-navigation/native';
 import moment from 'moment';
 import React, {useCallback, useEffect, useState} from 'react';
@@ -21,7 +22,6 @@ import FindFriendsBlueIcon from '../../assets/icons/findFriends/find-friends-blu
 import {TabsGradient} from '../../components';
 import EmptyContentView from '../../components/common/EmptyContentView';
 import {Notification} from '../../components/notifications';
-import {NewChatPrompt} from '../../components/notifications/NotificationPrompts';
 import {
   loadUserNotifications,
   updateNewNotificationReceived,
@@ -29,7 +29,6 @@ import {
 import {RootState} from '../../store/rootReducer';
 import {NotificationType, ScreenType} from '../../types';
 import {getDateAge, normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
-import PushNotificationIOS from '@react-native-community/push-notification-ios';
 
 const NotificationsScreen: React.FC = () => {
   const {newNotificationReceived} = useSelector(
@@ -299,7 +298,6 @@ const NotificationsScreen: React.FC = () => {
           renderItem={renderNotification}
           renderSectionHeader={renderSectionHeader}
           renderSectionFooter={renderSectionFooter}
-          ListHeaderComponent={<NewChatPrompt />}
           refreshControl={
             <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
           }
diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index 3ee0bd5b..d329c589 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -30,15 +30,14 @@ import {
   ERROR_NO_MOMENT_CATEGORY,
   ERROR_SOMETHING_WENT_WRONG_REFRESH,
   ERROR_UPLOAD,
-  SUCCESS_PIC_UPLOAD,
 } from '../../constants/strings';
 import * as RootNavigation from '../../RootNavigation';
 import {MainStackParams} from '../../routes';
-import {patchMoment, postMoment, postMomentTags} from '../../services';
+import {patchMoment} from '../../services';
 import {
+  handleImageMomentUpload,
   handleVideoMomentUpload,
   loadUserMoments,
-  updateProfileCompletionStage,
 } from '../../store/actions';
 import {RootState} from '../../store/rootReducer';
 import {MomentTagType} from '../../types';
@@ -138,11 +137,6 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
       // then switch to the profile tab
       navigation.popToTop();
       RootNavigation.navigate('ProfileTab');
-      setTimeout(() => {
-        if (!isMediaAVideo) {
-          Alert.alert(SUCCESS_PIC_UPLOAD);
-        }
-      }, 500);
     } else {
       // if editing, simply go back to profile screen
       navigation.navigate('Profile', {
@@ -167,53 +161,30 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
       handleFailed(true);
       return;
     }
-    let profileCompletionStage;
-    // separate upload logic for image/video
     if (isMediaAVideo) {
-      if (videoDuration) {
-        dispatch(
-          handleVideoMomentUpload(
-            mediaUri,
-            videoDuration,
-            momentCategory,
-            formattedTags(),
-          ),
-        );
-      } else {
-        handleFailed();
-        return;
-      }
-    } else {
-      const momentResponse = await postMoment(
-        mediaUri,
-        caption,
-        momentCategory,
-        userId,
+      dispatch(
+        handleVideoMomentUpload(
+          mediaUri,
+          videoDuration ?? 30,
+          caption,
+          momentCategory,
+          formattedTags(),
+        ),
       );
-      if (!momentResponse) {
-        handleFailed();
-        return;
-      }
-      profileCompletionStage = momentResponse.profile_completion_stage;
-      const momentId = momentResponse.moment_id;
-      if (momentId) {
-        const momentTagResponse = await postMomentTags(
-          momentId,
+    } else {
+      dispatch(
+        handleImageMomentUpload(
+          mediaUri,
+          caption,
+          momentCategory,
+          userId,
           formattedTags(),
-        );
-        if (!momentTagResponse) {
-          handleFailed();
-          return;
-        }
-      }
-    }
-    if (!isMediaAVideo) {
-      dispatch(loadUserMoments(userId));
-    }
-    if (profileCompletionStage) {
-      dispatch(updateProfileCompletionStage(profileCompletionStage));
+        ),
+      );
     }
-    handleSuccess();
+    setTimeout(() => {
+      handleSuccess();
+    }, 500);
   };
 
   const handleSubmitEditChanges = async () => {