From d4bd7833eae79b5e5c2fd74d3ff9a54a403c0fc1 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 15 Aug 2019 11:25:46 -0400
Subject: [PATCH] Fix loosing the server config when handleManagedConfig
 (#3125)

---
 app/actions/views/select_server.js | 4 ++++
 app/init/emm_provider.js           | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/actions/views/select_server.js b/app/actions/views/select_server.js
index 065d7cbe1..b4776a7c6 100644
--- a/app/actions/views/select_server.js
+++ b/app/actions/views/select_server.js
@@ -16,6 +16,10 @@ export function handleServerUrlChanged(serverUrl) {
     };
 }
 
+export function setServerUrl(serverUrl) {
+    return {type: ViewTypes.SERVER_URL_CHANGED, serverUrl};
+}
+
 export default {
     handleServerUrlChanged,
 };
diff --git a/app/init/emm_provider.js b/app/init/emm_provider.js
index 77dfad013..36bcde4f1 100644
--- a/app/init/emm_provider.js
+++ b/app/init/emm_provider.js
@@ -4,7 +4,7 @@
 import {Alert, Platform} from 'react-native';
 
 import {handleLoginIdChanged} from 'app/actions/views/login';
-import {handleServerUrlChanged} from 'app/actions/views/select_server';
+import {setServerUrl} from 'app/actions/views/select_server';
 import {getTranslations} from 'app/i18n';
 import mattermostBucket from 'app/mattermost_bucket';
 import mattermostManaged from 'app/mattermost_managed';
@@ -93,7 +93,7 @@ class EMMProvider {
         const {dispatch} = store;
 
         if (LocalConfig.AutoSelectServerUrl) {
-            dispatch(handleServerUrlChanged(LocalConfig.DefaultServerUrl));
+            dispatch(setServerUrl(LocalConfig.DefaultServerUrl));
             this.allowOtherServers = false;
         }
 
@@ -122,7 +122,7 @@ class EMMProvider {
             }
 
             if (this.emmServerUrl) {
-                dispatch(handleServerUrlChanged(this.emmServerUrl));
+                dispatch(setServerUrl(this.emmServerUrl));
             }
 
             if (this.emmUsername) {