From 807b2d31094700fb2a13f91b5bc1bd74512eb137 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 25 Oct 2020 12:46:25 -0500 Subject: [PATCH] Don't delay hiding the progress bar unless we are animating it. --- iOS/MasterFeed/RefreshProgressView.swift | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/iOS/MasterFeed/RefreshProgressView.swift b/iOS/MasterFeed/RefreshProgressView.swift index 7886745f2..6c20ce95d 100644 --- a/iOS/MasterFeed/RefreshProgressView.swift +++ b/iOS/MasterFeed/RefreshProgressView.swift @@ -67,9 +67,10 @@ private extension RefreshProgressView { if isInViewHierarchy { progressView.setProgress(1, animated: animated) } - DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { + + func completeLabel() { // Check that there are no pending downloads. - if (AccountManager.shared.combinedRefreshProgress.isComplete) { + if AccountManager.shared.combinedRefreshProgress.isComplete { self.updateRefreshLabel() self.label.isHidden = false self.progressView.isHidden = true @@ -78,6 +79,14 @@ private extension RefreshProgressView { } } } + + if animated { + DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { + completeLabel() + } + } else { + completeLabel() + } } else { label.isHidden = true progressView.isHidden = false