Merge pull request #7 from ACINQ/feature/contentview-fix

avoid InitView when a wallet exists
ACINQ · Sep 10, 2020 · 80c588b · 80c588b
2 parents 8c5b8bf + b0acae3
commit 80c588b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/phoenix-ios/phoenix-ios/ContentView.swift b/phoenix-ios/phoenix-ios/ContentView.swift
@@ -26,8 +26,20 @@ struct ContentView: MVIView {
                 NavigationView {
                     if model is Content.ModelIsInitialized {
                         HomeView()
-                    } else {
+                    } else if model is Content.ModelNeedInitialization {
                         InitView()
+                    } else {
+                        VStack {
+                            // Maybe a better animation / transition screen ?
+                            Image(systemName: "arrow.triangle.2.circlepath")
+                                    .imageScale(.large)
+                                    .rotationEffect(Angle(degrees: 360.0))
+                                    .animation(.easeIn)
+                        }
+                                .edgesIgnoringSafeArea(.all)
+                                .navigationBarTitle("", displayMode: .inline)
+                                .navigationBarHidden(true)
+                        // Phoenix Loading View ?
                     }
                 }
             }

diff --git a/phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/app/ctrl/AppContentController.kt b/phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/app/ctrl/AppContentController.kt
@@ -9,13 +9,19 @@ import org.kodein.di.DI
 import org.kodein.di.instance
 
 @OptIn(ExperimentalCoroutinesApi::class)
-class AppContentController(di: DI) : AppController<Content.Model, Content.Intent>(di, Content.Model.NeedInitialization) {
+class AppContentController(di: DI) : AppController<Content.Model, Content.Intent>(di, Content.Model.Waiting) {
     private val walletManager: WalletManager by instance()
 
     init {
         launch {
-            walletManager.openWalletUpdatesSubscription().consumeEach {
+            if (walletManager.getWallet() != null) {
                 model { Content.Model.IsInitialized }
+            } else {
+                model { Content.Model.NeedInitialization }
+                walletManager.openWalletUpdatesSubscription().consumeEach {
+                    model { Content.Model.IsInitialized }
+                    return@consumeEach
+                }
             }
         }
     }

diff --git a/phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/ctrl/ContentController.kt b/phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/ctrl/ContentController.kt
@@ -5,6 +5,7 @@ typealias ContentController = MVI.Controller<Content.Model, Content.Intent>
 object Content {
 
     sealed class Model : MVI.Model() {
+        object Waiting : Model()
         object IsInitialized : Model()
         object NeedInitialization : Model()
     }