sergiodt
/
vn-verdnaturachat
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] Verify useRealName setting on files screen (#2427) 

Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com>

Co-authored-by: Diego Mello <diegolmello@gmail.com>
This commit is contained in:
Ezequiel de Oliveira 2020-08-26 11:06:14 -03:00 committed by GitHub
parent e9bb24ee38
commit 212281795e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/MessagesView/index.js
View File

@ -25,7 +25,8 @@ class MessagesView extends React.Component {
route: PropTypes.object, route: PropTypes.object,
customEmojis: PropTypes.object, customEmojis: PropTypes.object,
theme: PropTypes.string, theme: PropTypes.string,
showActionSheet: PropTypes.func showActionSheet: PropTypes.func,
useRealName: PropTypes.bool
} }
constructor(props) { constructor(props) {
@ -81,7 +82,9 @@ class MessagesView extends React.Component {
} }
defineMessagesViewContent = (name) => { defineMessagesViewContent = (name) => {
const { user, baseUrl, theme } = this.props; const {
user, baseUrl, theme, useRealName
} = this.props;
const renderItemCommonProps = item => ({ const renderItemCommonProps = item => ({
item, item,
baseUrl, baseUrl,
@ -91,6 +94,7 @@ class MessagesView extends React.Component {
isEdited: !!item.editedAt, isEdited: !!item.editedAt,
isHeader: true, isHeader: true,
attachments: item.attachments || [], attachments: item.attachments || [],
useRealName,
showAttachment: this.showAttachment, showAttachment: this.showAttachment,
getCustomEmoji: this.getCustomEmoji, getCustomEmoji: this.getCustomEmoji,
navToRoomInfo: this.navToRoomInfo navToRoomInfo: this.navToRoomInfo
@ -311,7 +315,8 @@ class MessagesView extends React.Component {
const mapStateToProps = state => ({ const mapStateToProps = state => ({
baseUrl: state.server.server, baseUrl: state.server.server,
user: getUserSelector(state), user: getUserSelector(state),
customEmojis: state.customEmojis customEmojis: state.customEmojis,
useRealName: state.settings.UI_Use_Real_Name
}); });
export default connect(mapStateToProps)(withTheme(withActionSheet(MessagesView))); export default connect(mapStateToProps)(withTheme(withActionSheet(MessagesView)));