toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

MM-13875 Fix user profile icon for a Webhook to follow the prop for use_user_icon (#2533)

Browse source
This commit is contained in:
Elias Nahum 2019-01-30 15:59:34 -03:00 committed by Sudheer
parent bbc7221ac4
commit fdcae0594a
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/components/post/index.js
View file

@ -23,8 +23,8 @@ function isConsecutivePost(state, ownProps) {
let consecutivePost = false;
if (previousPost) {
const postFromWebhook = Boolean(post.props && post.props.from_webhook);
const prevPostFromWebhook = Boolean(previousPost.props && previousPost.props.from_webhook);
const postFromWebhook = Boolean(post?.props?.from_webhook); // eslint-disable-line camelcase
const prevPostFromWebhook = Boolean(previousPost?.props?.from_webhook); // eslint-disable-line camelcase
if (previousPost && previousPost.user_id === post.user_id &&
post.create_at - previousPost.create_at <= Posts.POST_COLLAPSE_TIMEOUT &&
!postFromWebhook && !prevPostFromWebhook &&

4
app/components/post_header/index.js
View file

@ -36,12 +36,12 @@ function makeMapStateToProps() {
createAt: post.create_at,
displayName: displayUsername(user, teammateNameDisplay),
enablePostUsernameOverride: config.EnablePostUsernameOverride === 'true',
fromWebHook: post.props && post.props.from_webhook === 'true',
fromWebHook: post?.props?.from_webhook === 'true', // eslint-disable-line camelcase
militaryTime,
isPendingOrFailedPost: isPostPendingOrFailed(post),
isSystemMessage: isSystemMessage(post),
fromAutoResponder: fromAutoResponder(post),
overrideUsername: post.props && post.props.override_username,
overrideUsername: post?.props?.override_username, // eslint-disable-line camelcase
theme: getTheme(state),
username: user.username,
userTimezone,

6
app/components/post_profile_picture/index.js
View file

@ -18,11 +18,11 @@ function mapStateToProps(state, ownProps) {
const post = getPost(state, ownProps.postId);
return {
enablePostIconOverride: config.EnablePostIconOverride === 'true',
fromWebHook: post.props && post.props.from_webhook === 'true',
enablePostIconOverride: config.EnablePostIconOverride === 'true' && post?.props?.use_user_icon === 'false', // eslint-disable-line camelcase
fromWebHook: post?.props?.from_webhook === 'true', // eslint-disable-line camelcase
isSystemMessage: isSystemMessage(post),
fromAutoResponder: fromAutoResponder(post),
overrideIconUrl: post.props && post.props.override_icon_url,
overrideIconUrl: post?.props?.override_icon_url, // eslint-disable-line camelcase
userId: post.user_id,
theme: getTheme(state),
};

2
app/screens/notification/notification.js
View file

@ -72,7 +72,7 @@ export default class Notification extends PureComponent {
/>
);
if (data.from_webhook && config.EnablePostIconOverride === 'true') {
if (data.from_webhook && config.EnablePostIconOverride === 'true' && data.use_user_icon !== 'true') {
const wsIcon = data.override_icon_url ? {uri: data.override_icon_url} : webhookIcon;
icon = (
<Image