diff --git a/Views/Menu.js b/Views/Menu.js index 03c4476..ff7666a 100644 --- a/Views/Menu.js +++ b/Views/Menu.js @@ -53,6 +53,7 @@ let MenuView = ({ navigation }) => { left={props => } titleStyle={{fontWeight:"bold"}} descriptionNumberOfLines={3} + key={profile._id} /> }) diff --git a/Views/NewPost.js b/Views/NewPost.js index 2fe4ccb..b9f8162 100644 --- a/Views/NewPost.js +++ b/Views/NewPost.js @@ -103,7 +103,7 @@ let NewPostView = (props) => { return ( - + {i18n.t("message.statusUpdate")}: - {comment.content} - + {cleanContent} + ); diff --git a/components/GroupCard.js b/components/GroupCard.js index bebac7e..385e2fd 100644 --- a/components/GroupCard.js +++ b/components/GroupCard.js @@ -88,7 +88,7 @@ const styles = StyleSheet.create({ content: { margin: 4, padding: 0, - borderRadius: 10, + borderRadius: 5, }, centerItems: { justifyContent: 'center', diff --git a/components/Media.js b/components/Media.js index f282c58..d07c734 100644 --- a/components/Media.js +++ b/components/Media.js @@ -82,7 +82,7 @@ let Media = (props) => { subscribed = false; }; }, [props.content]) - const video = videosFiles.length ? ( + const video = (videosFiles.length && !props.skiptVideo) ? ( loaded ? : ( setLoaded(true)}> @@ -91,7 +91,7 @@ let Media = (props) => { ) ) : (videosId.length ? : <>); - const video2 = hlsUrl ? ( + const video2 = (hlsUrl && !props.skiptVideo) ? ( loaded ? : { diff --git a/components/Post.js b/components/Post.js index ea9f696..0535ec8 100644 --- a/components/Post.js +++ b/components/Post.js @@ -69,7 +69,7 @@ let Post = (props) => { {" " + Moment(post.createdAt).fromNow()} - {cleanContent} + {cleanContent} : @@ -120,12 +120,12 @@ const styles = StyleSheet.create({ fontSize: 14, fontWeight: 'bold', marginBottom: 5, - fontSize: 18, + fontSize: 17, }, card: { margin: 8, backgroundColor: "#FFFFFF", - borderRadius: 10, + borderRadius: 5, }, comment: { margin: 8, diff --git a/components/UserName.js b/components/UserName.js index 99be9b9..08c444a 100644 --- a/components/UserName.js +++ b/components/UserName.js @@ -50,6 +50,7 @@ let UserName = ({ profileid, hideIcon }) => { icon = icon === "person-outline" && profile.subscription && profile.subscription > (new Date() - 0) ? "assignment-ind" : icon; icon = icon === "group" && profile.isCourse ? "subscriptions" : icon; icon = icon === "group" && profile.isPrivate ? "screen-lock-portrait" : icon; + const fullName = " " + profile.profile?.firstName + " " + profile.profile?.lastName; const onPress = () => { return navigation.navigate('Profile', { profileid }) @@ -57,11 +58,9 @@ let UserName = ({ profileid, hideIcon }) => { return ( - - {!hideIcon ? : <>} - - {profile.profile && profile.profile.firstName} {profile.profile && profile.profile.lastName} - + {!hideIcon ? + : <>} + {fullName} ); }