From f4d6a2ad9164d4dbcbdc2a44fcf10a63ebce0fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Miesza=C5=82a?= <patryk.mieszala@angrynerds.pl>
Date: Wed, 31 Mar 2021 19:32:15 +0200
Subject: [PATCH] #584 Flickering navigation bar when going back to
 LoginPrologueViewController with interactive gesture

---
 .../Signin/LoginPrologueViewController.swift                | 2 +-
 .../Site Address/SiteAddressViewController.swift            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPressAuthenticator/Signin/LoginPrologueViewController.swift b/WordPressAuthenticator/Signin/LoginPrologueViewController.swift
index 58dd366b4..838bad014 100644
--- a/WordPressAuthenticator/Signin/LoginPrologueViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginPrologueViewController.swift
@@ -76,7 +76,7 @@ class LoginPrologueViewController: LoginViewController {
         super.viewWillAppear(animated)
 
         configureButtonVC()
-        navigationController?.setNavigationBarHidden(true, animated: false)
+        navigationController?.setNavigationBarHidden(true, animated: animated)
     }
 
     override func viewDidAppear(_ animated: Bool) {
diff --git a/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteAddressViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteAddressViewController.swift
index 821a5d241..2b2ba8092 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteAddressViewController.swift	
+++ b/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteAddressViewController.swift	
@@ -45,6 +45,9 @@ final class SiteAddressViewController: LoginViewController {
 
         siteURLField?.text = loginFields.siteAddress
         configureSubmitButton(animating: false)
+        
+        // Nav bar could be hidden from the host app, so reshow it.
+        navigationController?.setNavigationBarHidden(false, animated: animated)
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -232,9 +235,6 @@ private extension SiteAddressViewController {
     func configureNavBar() {
         navigationItem.title = WordPressAuthenticator.shared.displayStrings.logInTitle
         styleNavigationBar(forUnified: true)
-
-        // Nav bar could be hidden from the host app, so reshow it.
-        navigationController?.setNavigationBarHidden(false, animated: false)
     }
 
     func setupTable() {