         }
     }
 
+    /// Handles new wallet creation or recovery
     private func addWalletCreationListener() {
-//        Store.subscribe(self, name: .didCreateOrRecoverWallet, callback: { _ in
-//            DispatchQueue.walletQueue.async {
-//                self.walletManager?.initWallet { _ in
-//                    self.walletManager?.initPeerManager {
-//                        self.walletManager?.peerManager?.connect()
-//                        self.modalPresenter?.walletManager = self.walletManager
-//                        self.startDataFetchers()
-//
-//                    }
-//                }
-//            }
-//        })
+        Store.subscribe(self, name: .didCreateOrRecoverWallet, callback: { _ in
+            DispatchQueue.walletQueue.async {
+                self.primaryWalletManager.initWallet { _ in
+                    self.primaryWalletManager.initPeerManager {
+                        self.primaryWalletManager.peerManager?.connect()
+                        self.startDataFetchers()
+                    }
+                }
+            }
+        })
     }
     
     private func updateAssetBundles() {

    }

    private func startDataFetchers() {
//        walletManager?.apiClient?.updateFeatureFlags()
        initKVStoreCoordinator()
        feeUpdaters.values.forEach { $0.refresh() }
//        defaultsUpdater?.refresh()
//        walletManager?.apiClient?.events?.up()
        exchangeUpdaters.values.forEach {
            $0.refresh(completion: {
                //self.watchSessionManager.walletManager = self.walletManager

                self.walletCoordinators[currency.code] = WalletCoordinator(walletManager: walletManager, currency: currency)
                self.exchangeUpdaters[currency.code] = ExchangeUpdater(currency: currency, walletManager: walletManager)
                walletManager.initPeerManager {
                    // TODO:BCH only connect last active wallet
                    walletManager.peerManager?.connect()
                    dispatchGroup.leave()
                }
            }
