verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] Check for old servers for Teams (#3171) 

Co-authored-by: Diego Mello <diegolmello@gmail.com>
This commit is contained in:
Gerzon Z 2021-05-28 15:06:20 -04:00 committed by GitHub
parent 852a893a00
commit 2b51f37384
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/NewMessageView.js
View File

@ -25,6 +25,7 @@ import Navigation from '../lib/Navigation';
import { createChannelRequest } from '../actions/createChannel'; import { createChannelRequest } from '../actions/createChannel';
import { goRoom } from '../utils/goRoom'; import { goRoom } from '../utils/goRoom';
import SafeAreaView from '../containers/SafeAreaView'; import SafeAreaView from '../containers/SafeAreaView';
import { compareServerVersion, methods } from '../lib/utils';
const QUERY_SIZE = 50; const QUERY_SIZE = 50;
@ -63,7 +64,8 @@ class NewMessageView extends React.Component {
create: PropTypes.func, create: PropTypes.func,
maxUsers: PropTypes.number, maxUsers: PropTypes.number,
theme: PropTypes.string, theme: PropTypes.string,
isMasterDetail: PropTypes.bool isMasterDetail: PropTypes.bool,
serverVersion: PropTypes.string
}; };
constructor(props) { constructor(props) {
@ -166,7 +168,7 @@ class NewMessageView extends React.Component {
} }
renderHeader = () => { renderHeader = () => {
const { maxUsers, theme } = this.props; const { maxUsers, theme, serverVersion } = this.props;
return ( return (
<View style={{ backgroundColor: themes[theme].auxiliaryBackground }}> <View style={{ backgroundColor: themes[theme].auxiliaryBackground }}>
<SearchBox onChangeText={text => this.onSearchChangeText(text)} testID='new-message-view-search' /> <SearchBox onChangeText={text => this.onSearchChangeText(text)} testID='new-message-view-search' />
@ -178,12 +180,13 @@ class NewMessageView extends React.Component {
testID: 'new-message-view-create-channel', testID: 'new-message-view-create-channel',
first: true first: true
})} })}
{this.renderButton({ {compareServerVersion(serverVersion, '3.13.0', methods.greaterThanOrEqualTo)
onPress: this.createTeam, ? (this.renderButton({
title: I18n.t('Create_Team'), onPress: this.createTeam,
icon: 'teams', title: I18n.t('Create_Team'),
testID: 'new-message-view-create-team' icon: 'teams',
})} testID: 'new-message-view-create-team'
})) : null}
{maxUsers > 2 ? this.renderButton({ {maxUsers > 2 ? this.renderButton({
onPress: this.createGroupChat, onPress: this.createGroupChat,
title: I18n.t('Create_Direct_Messages'), title: I18n.t('Create_Direct_Messages'),
@ -258,6 +261,7 @@ class NewMessageView extends React.Component {
} }
const mapStateToProps = state => ({ const mapStateToProps = state => ({
serverVersion: state.server.version,
isMasterDetail: state.app.isMasterDetail, isMasterDetail: state.app.isMasterDetail,
baseUrl: state.server.server, baseUrl: state.server.server,
maxUsers: state.settings.DirectMesssage_maxUsers || 1, maxUsers: state.settings.DirectMesssage_maxUsers || 1,