From 86b79be15e6f60ac9ac6103adde0e2d9959a9aeb Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Wed, 5 Jun 2019 10:38:41 -0300
Subject: [PATCH] [FIX] Lazy fetch server info (#959)

---
 app/sagas/selectServer.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/sagas/selectServer.js b/app/sagas/selectServer.js
index f5315e642..10aad2fad 100644
--- a/app/sagas/selectServer.js
+++ b/app/sagas/selectServer.js
@@ -11,11 +11,13 @@ import database from '../lib/realm';
 import log from '../utils/log';
 import I18n from '../i18n';
 
-const getServerInfo = function* getServerInfo({ server }) {
+const getServerInfo = function* getServerInfo({ server, raiseError = true }) {
 	try {
 		const serverInfo = yield RocketChat.getServerInfo(server);
 		if (!serverInfo.success) {
-			Alert.alert(I18n.t('Oops'), I18n.t(serverInfo.message, serverInfo.messageOptions));
+			if (raiseError) {
+				Alert.alert(I18n.t('Oops'), I18n.t(serverInfo.message, serverInfo.messageOptions));
+			}
 			yield put(serverFailure());
 			return;
 		}
@@ -32,10 +34,6 @@ const getServerInfo = function* getServerInfo({ server }) {
 
 const handleSelectServer = function* handleSelectServer({ server, version, fetchVersion }) {
 	try {
-		let serverInfo;
-		if (fetchVersion) {
-			serverInfo = yield getServerInfo({ server });
-		}
 		yield AsyncStorage.setItem('currentServer', server);
 		const userStringified = yield AsyncStorage.getItem(`${ RocketChat.TOKEN_KEY }-${ server }`);
 
@@ -52,7 +50,13 @@ const handleSelectServer = function* handleSelectServer({ server, version, fetch
 		const settings = database.objects('settings');
 		yield put(actions.setAllSettings(RocketChat.parseSettings(settings.slice(0, settings.length))));
 
-		yield put(selectServerSuccess(server, fetchVersion ? serverInfo && serverInfo.version : version));
+		let serverInfo;
+		if (fetchVersion) {
+			serverInfo = yield getServerInfo({ server, raiseError: false });
+		}
+
+		// Return server version even when offline
+		yield put(selectServerSuccess(server, (serverInfo && serverInfo.version) || version));
 	} catch (e) {
 		log('err_select_server', e);
 	}
@@ -62,7 +66,6 @@ const handleServerRequest = function* handleServerRequest({ server }) {
 	try {
 		const serverInfo = yield getServerInfo({ server });
 
-		// TODO: cai aqui O.o
 		const loginServicesLength = yield RocketChat.getLoginServices(server);
 		if (loginServicesLength === 0) {
 			Navigation.navigate('LoginView');