Merge branch 'master' into tma948-video-playback

# Conflicts:
#	ios/Podfile.lock
#	package.json
#	src/components/moments/Moment.tsx
#	src/routes/main/MainStackNavigator.tsx
#	src/screens/moments/TagFriendsScreen.tsx
#	src/screens/profile/CaptionScreen.tsx
#	yarn.lock

1 files changed, 4 insertions, 4 deletions

diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index d53570cb..364b81a3 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -13,7 +13,7 @@ import {
   TouchableWithoutFeedback,
   View,
 } from 'react-native';
-import {MentionInput} from 'react-native-controlled-mentions';
+import {MentionInputControlled} from '../../components';
 import {Button, normalize} from 'react-native-elements';
 import Video from 'react-native-video';
 import {useDispatch, useSelector} from 'react-redux';
@@ -237,16 +237,16 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
               <Image
                 style={styles.media}
                 source={{uri: mediaUri}}
-                resizeMode={'cover'}
+                resizeMode={'contain'}
               />
             )}
-            <MentionInput
+            <MentionInputControlled
               containerStyle={styles.text}
               placeholder="Write something....."
               placeholderTextColor="gray"
               value={caption}
               onChange={setCaption}
-              partTypes={mentionPartTypes('blue')}
+              partTypes={mentionPartTypes('blue', 'caption')}
             />
             <TouchableOpacity
               onPress={() =>