fix mark requested tab after purchase

Sjors · Jun 4, 2021 · 1cc14fb · 1cc14fb
1 parent 53156e8
commit 1cc14fb
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/NthKey/View/Settings/AnnounceView/AnnounceView.swift b/NthKey/View/Settings/AnnounceView/AnnounceView.swift
@@ -20,6 +20,7 @@ struct AnnounceView: View {
                 return
             }
 
+            model.selectMainnetAfterPurchase = true
             activeSheet = .subscription
         }
 

diff --git a/NthKey/View/Settings/AnnounceView/AnnounceViewModel.swift b/NthKey/View/Settings/AnnounceView/AnnounceViewModel.swift
@@ -7,14 +7,13 @@
 //  license, see the accompanying file LICENSE.md
 
 import UIKit
+import Combine
 
 final class AnnounceViewModel: ObservableObject {
     @Published var network: WalletNetwork = .testnet
     @Published var showPubKeyQR = false
 
-    var hasSubscription: Bool {
-        subsManager.hasSubscription
-    }
+    var hasSubscription: Bool = false
 
     var pubKeyImage: UIImage? {
         QRCodeBuilder.generateQRCode(from: ourPubKey)
@@ -24,14 +23,33 @@ final class AnnounceViewModel: ObservableObject {
         SeedManager.ourPubKey(network: network.networkValue)
     }
 
+    var selectMainnetAfterPurchase = false
+
     private let subsManager: SubscriptionManager
+    private var cancellables = Set<AnyCancellable>()
     private let fileSaveController: SettingsViewController = SettingsViewController()
 
     init(subsManager: SubscriptionManager) {
         self.subsManager = subsManager
+
+        setupObservables()
     }
 
     func exportPublicKey() {
         fileSaveController.exportPublicKey(data: ourPubKey)
     }
+
+    private func setupObservables() {
+        subsManager
+            .$hasSubscription
+            .sink { [weak self] value in
+                guard let self = self else { return }
+                self.hasSubscription = value
+
+                guard self.selectMainnetAfterPurchase && value else { return }
+                self.selectMainnetAfterPurchase = false
+                self.network = .mainnet
+            }
+            .store(in: &cancellables)
+    }
 }
diff --git a/NthKey/View/Settings/Import Wallet/ImportWalletView.swift b/NthKey/View/Settings/Import Wallet/ImportWalletView.swift
@@ -20,6 +20,7 @@ struct ImportWalletView: View {
                 return
             }
 
+            model.selectMainnetAfterPurchase = true
             activeSheet = .subscription
         }
 

diff --git a/NthKey/View/Settings/Import Wallet/ImportWalletViewModel.swift b/NthKey/View/Settings/Import Wallet/ImportWalletViewModel.swift
@@ -13,9 +13,8 @@ final class ImportWalletViewModel: ObservableObject {
     @Published var selectedNetwork: WalletNetwork
     @Published var loadWalletError: DataProcessingError?
 
-    var hasSubscription: Bool {
-        subsManager.hasSubscription
-    }
+    var hasSubscription: Bool = false
+    var selectMainnetAfterPurchase: Bool = false
 
     private let loadFileController: SettingsViewController = SettingsViewController()
     private let dataManager: DataManager
@@ -41,6 +40,19 @@ final class ImportWalletViewModel: ObservableObject {
             .map{ $0 as WalletNetwork? }
             .assign(to: \.currentNetwork, on: self.dataManager)
             .store(in: &cancellables)
+
+        // TODO: DRY TBC here and in AnnounceViewModel
+        subsManager
+            .$hasSubscription
+            .sink { [weak self] value in
+                guard let self = self else { return }
+                self.hasSubscription = value
+
+                guard self.selectMainnetAfterPurchase && value else { return }
+                self.selectMainnetAfterPurchase = false
+                self.selectedNetwork = .mainnet
+            }
+            .store(in: &cancellables)
     }
 
     func addWalletByFile() {