toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show the unsupported alert if server version is available (#4608)

Browse source 
* Show the unsupported alert if server version is available

* Check for supported server version when channel screen updates
This commit is contained in:
Elias Nahum 2020-07-27 11:03:57 -04:00 committed by GitHub
parent 7c827fe319
commit 95720c358d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/screens/channel/channel_base.js
View file

@ -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) => {

18
app/screens/channel/index.js
View file

@ -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,

4
ios/Podfile.lock
View file

@ -586,11 +586,11 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
DoubleConversion: cde416483dac037923206447da6e1454df403714
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
FBLazyVector: a50434c875bd42f2b1c99c712bda892a1dc659c7
FBReactNativeSpec: 393853a536428e05a9da00b6290042f09809b15b
Folly: b73c3869541e86821df3c387eb0af5f65addfab4
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
jail-monkey: d7c5048b2336f22ee9c9e0efa145f1f917338ea9
libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3
MMKV: 5eb44526fcf38152328ebfeff5ec585972ace00d