From d7f7b1da9f7e973792f916442033a90f5b84bbb6 Mon Sep 17 00:00:00 2001 From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com> Date: Fri, 29 Jul 2022 01:18:42 -0300 Subject: [PATCH] [FIX] iFrame login takes user to blank screen (#4389) --- app/sagas/selectServer.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/sagas/selectServer.js b/app/sagas/selectServer.js index 9e65fa7bf..cc01354c3 100644 --- a/app/sagas/selectServer.js +++ b/app/sagas/selectServer.js @@ -1,4 +1,4 @@ -import { put, takeLatest } from 'redux-saga/effects'; +import { put, takeLatest, select } from 'redux-saga/effects'; import { Alert } from 'react-native'; import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord'; import { Q } from '@nozbe/watermelondb'; @@ -163,7 +163,8 @@ const handleServerRequest = function* handleServerRequest({ server, username, fr yield getLoginSettings({ server }); Navigation.navigate('WorkspaceView'); - if (fromServerHistory) { + const Accounts_iframe_enabled = yield select(state => state.settings.Accounts_iframe_enabled); + if (fromServerHistory && !Accounts_iframe_enabled) { Navigation.navigate('LoginView', { username }); }