Merge branch 'fix-welcome-screen-closing-prematurely'

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c63c44256c..804b6b48f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@ Line wrap the file at 100 chars.                                              Th
 - Fix invalid back stack history when connection to service is lost and the app returns to the
   launch screen.
 - Fix app leaving settings screen when entering split-screen mode.
+- Fix app sometimes leaving Welcome screen prematurely after creating an account.
 
 #### Windows
 - Fix race in network adapter monitor that could result in data corruption and crashes.
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
index 246c105398..3aa26db640 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
@@ -103,7 +103,9 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
 
     private fun checkExpiry(maybeExpiry: DateTime?) {
         maybeExpiry?.let { expiry ->
-            if (expiry.isAfterNow()) {
+            val tomorrow = DateTime.now().plusDays(1)
+
+            if (expiry.isAfter(tomorrow)) {
                 jobTracker.newUiJob("advanceToConnectScreen") {
                     advanceToConnectScreen()
                 }