From bdfc5ee5da072aceeeb96fcfb3e241db4b7056cb Mon Sep 17 00:00:00 2001
From: Nora Trapp <nora@signal.org>
Date: Fri, 24 Jan 2020 18:30:54 -0800
Subject: [PATCH] Only show experience upgrades when the app becomes active

---
 .../HomeView/ConversationListViewController.m               | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/HomeView/ConversationListViewController.m b/Signal/src/ViewControllers/HomeView/ConversationListViewController.m
index 868665a4b2..2afcbc2eb7 100644
--- a/Signal/src/ViewControllers/HomeView/ConversationListViewController.m
+++ b/Signal/src/ViewControllers/HomeView/ConversationListViewController.m
@@ -756,7 +756,7 @@ NSString *const kArchiveButtonPseudoGroup = @"kArchiveButtonPseudoGroup";
 {
     [super viewDidAppear:animated];
 
-    if (![ExperienceUpgradeManager presentNextFromViewController:self]) {
+    if (!self.hasEverAppeared && ![ExperienceUpgradeManager presentNextFromViewController:self]) {
         [OWSActionSheets showIOSUpgradeNagIfNecessary];
     }
 
@@ -1183,6 +1183,10 @@ NSString *const kArchiveButtonPseudoGroup = @"kArchiveButtonPseudoGroup";
 - (void)applicationDidBecomeActive:(NSNotification *)notification
 {
     [self updateShouldObserveDBModifications];
+
+    if (![ExperienceUpgradeManager presentNextFromViewController:self]) {
+        [OWSActionSheets showIOSUpgradeNagIfNecessary];
+    }
 }
 
 - (void)applicationWillResignActive:(NSNotification *)notification