From 95720c358d809dc195cc3fd2a2c4b0323cb973fc Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 27 Jul 2020 11:03:57 -0400
Subject: [PATCH] Show the unsupported alert if server version is available
 (#4608)

* Show the unsupported alert if server version is available

* Check for supported server version when channel screen updates
---
 app/screens/channel/channel_base.js |  4 ++++
 app/screens/channel/index.js        | 18 ++++++++++++------
 ios/Podfile.lock                    |  4 ++--
 3 files changed, 18 insertions(+), 8 deletions(-)

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,
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 8b9664ca1..2cc5c0bab 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -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