diff --git a/app/screens/channel/channel_base.js b/app/screens/channel/channel_base.js index a5f19b182..5bb2f21f4 100644 --- a/app/screens/channel/channel_base.js +++ b/app/screens/channel/channel_base.js @@ -118,6 +118,10 @@ export default class ChannelBase extends PureComponent { this.props.actions.recordLoadTime('Switch Team', 'teamSwitch'); } + if (prevProps.isSupportedServer && !this.props.isSupportedServer) { + unsupportedServer(this.props.isSystemAdmin, this.context.intl.formatMessage); + } + if (this.props.theme !== prevProps.theme) { setNavigatorStyles(this.props.componentId, this.props.theme); EphemeralStore.allNavigationComponentIds.forEach((componentId) => { diff --git a/app/screens/channel/index.js b/app/screens/channel/index.js index 0fae44b5e..0ca69d265 100644 --- a/app/screens/channel/index.js +++ b/app/screens/channel/index.js @@ -9,6 +9,7 @@ import {recordLoadTime} from '@actions/views/root'; import {selectDefaultTeam} from '@actions/views/select_team'; import {ViewTypes} from '@constants'; import {getChannelStats} from '@mm-redux/actions/channels'; +import {Client4} from '@mm-redux/client'; import {getCurrentChannelId} from '@mm-redux/selectors/entities/channels'; import {getServerVersion} from '@mm-redux/selectors/entities/general'; import {getTheme} from '@mm-redux/selectors/entities/preferences'; @@ -23,12 +24,17 @@ function mapStateToProps(state) { const currentTeam = getCurrentTeam(state); const roles = getCurrentUserId(state) ? getCurrentUserRoles(state) : ''; const isSystemAdmin = checkIsSystemAdmin(roles); - const isSupportedServer = isMinimumServerVersion( - getServerVersion(state), - ViewTypes.RequiredServer.MAJOR_VERSION, - ViewTypes.RequiredServer.MIN_VERSION, - ViewTypes.RequiredServer.PATCH_VERSION, - ); + const serverVersion = Client4.getServerVersion() || getServerVersion(state); + + let isSupportedServer = true; + if (serverVersion) { + isSupportedServer = isMinimumServerVersion( + serverVersion, + ViewTypes.RequiredServer.MAJOR_VERSION, + ViewTypes.RequiredServer.MIN_VERSION, + ViewTypes.RequiredServer.PATCH_VERSION, + ); + } return { currentTeamId: currentTeam?.id,