From d97125609cf514a1032cf4c4b31932f151a0c8e9 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Thu, 29 Feb 2024 14:15:50 +0200
Subject: [PATCH] Fix create backup loading for signup

---
 .../org/futo/circles/auth/feature/uia/UIAViewModel.kt | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt
index 0c52c2a84..ffa302e88 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt
@@ -2,6 +2,7 @@ package org.futo.circles.auth.feature.uia
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import org.futo.circles.auth.R
@@ -38,7 +39,15 @@ class UIAViewModel @Inject constructor(
     val stagesNavigationLiveData = uiaDataSource.stagesNavigationLiveData
     val navigationLiveData = SingleEventLiveData<AuthUIAScreenNavigationEvent>()
     val restoreKeysLiveData = SingleEventLiveData<Response<Unit>>()
-    val passPhraseLoadingLiveData = restoreBackupDataSource.loadingLiveData
+    val passPhraseLoadingLiveData: MediatorLiveData<LoadingData> =
+        MediatorLiveData<LoadingData>().also {
+            it.addSource(restoreBackupDataSource.loadingLiveData) { value ->
+                it.postValue(value)
+            }
+            it.addSource(createPassPhraseDataSource.loadingLiveData) { value ->
+                it.postValue(value)
+            }
+        }
     val finishUIAEventLiveData = uiaDataSource.finishUIAEventLiveData
     val createBackupResultLiveData = SingleEventLiveData<Response<Unit>>()
 
-- 
GitLab