Skip to content

[FIX] Real name being ignored in SearchMessagesView #2838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 3 commits into from
Feb 11, 2021
Merged

[FIX] Real name being ignored in SearchMessagesView #2838

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93a2ab4
[FIX] UseRealName enforced in message search view
aKn1ghtOut Jan 26, 2021
dcc28c3
Merge branch 'develop' into fixUseRealNameInSearch
gerzonc Feb 3, 2021
a957671
Merge branch 'develop' into fixUseRealNameInSearch
diegolmello Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions app/views/SearchMessagesView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class SearchMessagesView extends React.Component {
user: PropTypes.object,
baseUrl: PropTypes.string,
customEmojis: PropTypes.object,
theme: PropTypes.string
theme: PropTypes.string,
useRealName: PropTypes.bool
}

constructor(props) {
Expand Down Expand Up @@ -143,7 +144,9 @@ class SearchMessagesView extends React.Component {
}

renderItem = ({ item }) => {
const { user, baseUrl, theme } = this.props;
const {
user, baseUrl, theme, useRealName
} = this.props;
return (
<Message
item={item}
Expand All @@ -154,6 +157,7 @@ class SearchMessagesView extends React.Component {
showAttachment={() => {}}
getCustomEmoji={this.getCustomEmoji}
navToRoomInfo={this.navToRoomInfo}
useRealName={useRealName}
theme={theme}
/>
);
Expand Down Expand Up @@ -206,6 +210,7 @@ class SearchMessagesView extends React.Component {
const mapStateToProps = state => ({
baseUrl: state.server.server,
user: getUserSelector(state),
useRealName: state.settings.UI_Use_Real_Name,
customEmojis: state.customEmojis
});

Expand Down