Merge branch 'master' into tma994-bugfix-camera-screen-preview

# Conflicts:
#	src/components/moments/TrimmerPlayer.tsx
#	src/screens/upload/EditMedia.tsx

1 files changed, 2 insertions, 0 deletions

diff --git a/src/components/profile/Content.tsx b/src/components/profile/Content.tsx
index 2d1002dd..9edd890d 100644
--- a/src/components/profile/Content.tsx
+++ b/src/components/profile/Content.tsx
@@ -6,6 +6,7 @@ import Animated, {
   useSharedValue,
 } from 'react-native-reanimated';
 import {useDispatch, useSelector, useStore} from 'react-redux';
+import {MomentUploadProgressBar} from '..';
 import {
   blockUnblockUser,
   loadFriendsData,
@@ -140,6 +141,7 @@ const Content: React.FC<ContentProps> = ({userXId, screenType}) => {
       refreshControl={
         <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
       }>
+      {!userXId && <MomentUploadProgressBar />}
       <Cover {...{userXId, screenType}} />
       <ProfileCutout />
       <ProfileHeader