Merge pull request #49 from uber-uchat/staging

Latest bug fixes from 1.13 testing
uber-archive · Jan 18, 2019 · 840e85f · 840e85f
2 parents 8bba7ba + e8af102
commit 840e85f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/components/error_text/error_text.js b/app/components/error_text/error_text.js
@@ -25,8 +25,8 @@ export default class ErrorText extends PureComponent {
 
         const style = getStyleSheet(theme);
 
-        if (error.hasOwnProperty('intl')) {
-            const {intl} = error;
+        const {intl} = error;
+        if (intl) {
             return (
                 <FormattedText
                     id={intl.id}

diff --git a/app/components/post/post.js b/app/components/post/post.js
@@ -374,7 +374,7 @@ export default class Post extends PureComponent {
         const selected = this.state && this.state.selected ? style.selected : null;
         const highlighted = highlight ? style.highlight : null;
         const isReplyPost = this.isReplyPost();
-        const onUsernamePress = Config.ExperimentalUsernamePressIsMention ? this.autofillUserMention : this.viewUserProfile;
+        const onUsernamePress = Config.ExperimentalUsernamePressIsMention && !channelIsReadOnly ? this.autofillUserMention : this.viewUserProfile;
         const mergeMessage = consecutivePost && !hasComments;
 
         let postHeader;