From d89f296e1e2fe315c9ecabdd22e3856fdc1fd6cd Mon Sep 17 00:00:00 2001
From: Avinash Lingaloo <>
Date: Mon, 14 Jun 2021 10:20:44 +0400
Subject: [PATCH] Update: Aligning with PR 5452

---
 app/screens/sso/index.tsx            |  4 ++--
 app/screens/sso/sso_with_webview.tsx |  6 +++---
 ios/Podfile.lock                     |  4 ++--
 package-lock.json                    | 18 ++++++++----------
 package.json                         |  2 +-
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/app/screens/sso/index.tsx b/app/screens/sso/index.tsx
index aa22ba02d1..f810f2b893 100644
--- a/app/screens/sso/index.tsx
+++ b/app/screens/sso/index.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React from 'react';
+import React, {useState} from 'react';
 import {useIntl} from 'react-intl';
 
 import {Client4} from '@client/rest';
@@ -28,7 +28,7 @@ const SSO = ({config, serverUrl, ssoType, theme}: SSOProps) => {
     const intl = useIntl();
     const managedConfig = useManagedConfig();
 
-    const [loginError, setLoginError] = React.useState<string>('');
+    const [loginError, setLoginError] = useState<string>('');
     let completeUrlPath = '';
     let loginUrl = '';
     switch (ssoType) {
diff --git a/app/screens/sso/sso_with_webview.tsx b/app/screens/sso/sso_with_webview.tsx
index 6be4d13103..f1467299b8 100644
--- a/app/screens/sso/sso_with_webview.tsx
+++ b/app/screens/sso/sso_with_webview.tsx
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 import CookieManager, {Cookies} from '@react-native-community/cookies';
-import React from 'react';
+import React, {useEffect} from 'react';
 import {useIntl} from 'react-intl';
 import {Alert, Text, View} from 'react-native';
 import {SafeAreaView} from 'react-native-safe-area-context';
@@ -78,7 +78,7 @@ function SSOWithWebView({completeUrlPath, loginError, loginUrl, onCSRFToken, onM
     const cookiesTimeout = React.useRef<NodeJS.Timeout>();
     const webView = React.useRef<WebView>(null);
 
-    React.useEffect(() => {
+    useEffect(() => {
         return () => {
             if (cookiesTimeout.current) {
                 clearTimeout(cookiesTimeout.current);
@@ -192,7 +192,7 @@ function SSOWithWebView({completeUrlPath, loginError, loginUrl, onCSRFToken, onM
             return (
                 <WebView
                     automaticallyAdjustContentInsets={false}
-                    cacheEnabled={false}
+                    cacheEnabled={true}
                     injectedJavaScript={jsCode}
                     javaScriptEnabled={true}
                     onLoadEnd={onLoadEnd}
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index e5cda2de3f..294cae4ee2 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -253,7 +253,7 @@ PODS:
     - react-native-video/Video (= 5.1.1)
   - react-native-video/Video (5.1.1):
     - React-Core
-  - react-native-webview (11.4.0):
+  - react-native-webview (11.6.2):
     - React-Core
   - React-perflogger (0.64.0)
   - React-RCTActionSheet (0.64.0):
@@ -744,7 +744,7 @@ SPEC CHECKSUMS:
   react-native-paste-input: 003693cff6fcea476066172e66901beb7ef25670
   react-native-safe-area-context: e471852c5ed67eea4b10c5d9d43c1cebae3b231d
   react-native-video: 1574074179ecaf6a9dd067116c8f31bf9fec15c8
-  react-native-webview: fdd3c7c2ad173e8ca8c82729ed05f3fda2491a82
+  react-native-webview: 1f56115845c98f0a59dfbbac685797c014a821be
   React-perflogger: 9c547d8f06b9bf00cb447f2b75e8d7f19b7e02af
   React-RCTActionSheet: 3080b6e12e0e1a5b313c8c0050699b5c794a1b11
   React-RCTAnimation: 3f96f21a497ae7dabf4d2f150ee43f906aaf516f
diff --git a/package-lock.json b/package-lock.json
index 635447115f..23a46e9070 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3415,13 +3415,6 @@
         "rambdax": "2.15.0",
         "rxjs": "^6.5.3",
         "sql-escape-string": "^1.1.0"
-      },
-      "dependencies": {
-        "lokijs": {
-          "version": "npm:@nozbe/lokijs@1.5.12-wmelon",
-          "resolved": "https://registry.npmjs.org/@nozbe/lokijs/-/lokijs-1.5.12-wmelon.tgz",
-          "integrity": "sha512-7xQUn80pzPBB9VcwvB/W2V9/60xIfuk+3IDIvS9cU7W29jJx4QBXe5dBWTaARmxD9hXozPCcPWh2wfd7m4dbTA=="
-        }
       }
     },
     "@nozbe/with-observables": {
@@ -16601,6 +16594,11 @@
         }
       }
     },
+    "lokijs": {
+      "version": "npm:@nozbe/lokijs@1.5.12-wmelon",
+      "resolved": "https://registry.npmjs.org/@nozbe/lokijs/-/lokijs-1.5.12-wmelon.tgz",
+      "integrity": "sha512-7xQUn80pzPBB9VcwvB/W2V9/60xIfuk+3IDIvS9cU7W29jJx4QBXe5dBWTaARmxD9hXozPCcPWh2wfd7m4dbTA=="
+    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -20728,9 +20726,9 @@
       }
     },
     "react-native-webview": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-11.4.0.tgz",
-      "integrity": "sha512-il4OOJxBJgFXk8rtVgYQJIGRqYD5wJXc4By6nvnkHlH3hbyw1Mx5HKfP9Qmsy8xdCwHYgCBjUuCfHoGXJ9hMSA==",
+      "version": "11.6.2",
+      "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-11.6.2.tgz",
+      "integrity": "sha512-7e5ltLBgqt1mX0gdTTS2nFPIjfS6y300wqJ4rLWqU71lDO+8ZeayfsF5qo83qxo2Go74CtLnSeWae4pdGwUqYw==",
       "requires": {
         "escape-string-regexp": "2.0.0",
         "invariant": "2.2.4"
diff --git a/package.json b/package.json
index d46b6d8ee1..fc275223d4 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "react-native-unimodules": "0.13.3",
     "react-native-vector-icons": "8.1.0",
     "react-native-video": "5.1.1",
-    "react-native-webview": "11.4.0",
+    "react-native-webview": "11.6.2",
     "react-native-youtube": "2.0.1",
     "rn-fetch-blob": "0.12.0",
     "rn-placeholder": "3.0.3",