Fix issue with the welcome screen showing up after buying time

2 files changed, 7 insertions, 1 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/AccountRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/AccountRepository.kt
index eb618ea0f8..1d2a9ca818 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/AccountRepository.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/AccountRepository.kt
@@ -91,7 +91,7 @@ class AccountRepository(
         messageHandler.trySendRequest(Request.ClearAccountHistory)
     }
 
-    private fun clearCreatedAccountCache() {
+    fun clearCreatedAccountCache() {
         _cachedCreatedAccount.value = null
     }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
index 9f6cec8391..89b83d9f11 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
@@ -133,6 +133,12 @@ class ConnectViewModel(
             .debounce(UI_STATE_DEBOUNCE_DURATION_MILLIS)
             .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), ConnectUiState.INITIAL)
 
+    init {
+        // The create account cache is no longer needed as we have successfully reached the connect
+        // screen
+        accountRepository.clearCreatedAccountCache()
+    }
+
     private fun LocationInfoCache.locationCallbackFlow() = callbackFlow {
         onNewLocation = { this.trySend(it) }
         awaitClose { onNewLocation = null }