From 638b3288b499b7c0ecaa73e0515bb6e88b0e5cbe Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 6 Aug 2016 13:14:58 -0400 Subject: [PATCH] Don't focus fields if coming from register page so that they can see toast. --- src/App/Pages/LoginPage.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/App/Pages/LoginPage.cs b/src/App/Pages/LoginPage.cs index dd7015b8d..cd63a3a17 100644 --- a/src/App/Pages/LoginPage.cs +++ b/src/App/Pages/LoginPage.cs @@ -128,13 +128,16 @@ namespace Bit.App.Pages base.OnAppearing(); MessagingCenter.Send(Application.Current, "ShowStatusBar", true); - if(!string.IsNullOrWhiteSpace(EmailCell.Entry.Text)) + if(string.IsNullOrWhiteSpace(_email)) { - PasswordCell.Entry.Focus(); - } - else - { - EmailCell.Entry.Focus(); + if(!string.IsNullOrWhiteSpace(EmailCell.Entry.Text)) + { + PasswordCell.Entry.Focus(); + } + else + { + EmailCell.Entry.Focus(); + } } }