Skip to content

[FIX] Check for old servers for Teams #3171

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 2 commits into from
May 28, 2021
Merged

[FIX] Check for old servers for Teams #3171

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c3b39d
Update NewMessageView.js
gerzonc May 28, 2021
a0e1aab
Merge branch 'develop' into fix.check-for-old-server-versions
diegolmello May 28, 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
20 changes: 12 additions & 8 deletions app/views/NewMessageView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import Navigation from '../lib/Navigation';
import { createChannelRequest } from '../actions/createChannel';
import { goRoom } from '../utils/goRoom';
import SafeAreaView from '../containers/SafeAreaView';
import { compareServerVersion, methods } from '../lib/utils';

const QUERY_SIZE = 50;

Expand Down Expand Up @@ -63,7 +64,8 @@ class NewMessageView extends React.Component {
create: PropTypes.func,
maxUsers: PropTypes.number,
theme: PropTypes.string,
isMasterDetail: PropTypes.bool
isMasterDetail: PropTypes.bool,
serverVersion: PropTypes.string
};

constructor(props) {
Expand Down Expand Up @@ -166,7 +168,7 @@ class NewMessageView extends React.Component {
}

renderHeader = () => {
const { maxUsers, theme } = this.props;
const { maxUsers, theme, serverVersion } = this.props;
return (
<View style={{ backgroundColor: themes[theme].auxiliaryBackground }}>
<SearchBox onChangeText={text => this.onSearchChangeText(text)} testID='new-message-view-search' />
Expand All @@ -178,12 +180,13 @@ class NewMessageView extends React.Component {
testID: 'new-message-view-create-channel',
first: true
})}
{this.renderButton({
onPress: this.createTeam,
title: I18n.t('Create_Team'),
icon: 'teams',
testID: 'new-message-view-create-team'
})}
{compareServerVersion(serverVersion, '3.13.0', methods.greaterThanOrEqualTo)
? (this.renderButton({
onPress: this.createTeam,
title: I18n.t('Create_Team'),
icon: 'teams',
testID: 'new-message-view-create-team'
})) : null}
{maxUsers > 2 ? this.renderButton({
onPress: this.createGroupChat,
title: I18n.t('Create_Direct_Messages'),
Expand Down Expand Up @@ -258,6 +261,7 @@ class NewMessageView extends React.Component {
}

const mapStateToProps = state => ({
serverVersion: state.server.version,
isMasterDetail: state.app.isMasterDetail,
baseUrl: state.server.server,
maxUsers: state.settings.DirectMesssage_maxUsers || 1,
Expand Down