From 3a961e0803fd9c4f71a088d85ef0fc3fcf822b5f Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 4 Feb 2022 12:34:20 +0000
Subject: [PATCH] avoiding showing the loading when the last screen is not a
 transition into the main app

---
 .../vector/app/features/onboarding/OnboardingViewState.kt | 2 +-
 .../app/features/onboarding/ftueauth/FtueAuthVariant.kt   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
index 2035977af6..7bad2682a9 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
@@ -73,7 +73,7 @@ data class OnboardingViewState(
                 asyncRegistration is Loading
     }
 
-    fun isUserLogged(): Boolean {
+    fun isAuthTaskCompleted(): Boolean {
         return asyncLoginAction is Success
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index ef6da462e5..222e470d6d 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -229,8 +229,12 @@ class FtueAuthVariant(
     }
 
     private fun updateWithState(viewState: OnboardingViewState) {
-        // Loading
-        views.loginLoading.isVisible = viewState.isLoading()
+        views.loginLoading.isVisible = if (vectorFeatures.isOnboardingPersonalizeEnabled()) {
+            viewState.isLoading()
+        } else {
+            // Keep loading when during success because of the delay when switching to the next Activity
+            viewState.isLoading() || viewState.isAuthTaskCompleted()
+        }
     }
 
     private fun onWebLoginError(onWebLoginError: OnboardingViewEvents.OnWebLoginError) {