Overview page: unlock to resume restoration feature

Decred Wallet/Features/Navigation Menu/NavigationMenuTabBarController.swift

@@ -7,6 +7,7 @@
 // license that can be found in the LICENSE file.
 
 import UIKit
+import Dcrlibwallet
 
 class NavigationMenuTabBarController: UITabBarController {
     private var isNewWallet: Bool = false
@@ -20,7 +21,7 @@ class NavigationMenuTabBarController: UITabBarController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.loadTabBar()
+        self.setupCustomTabMenu(NavigationMenuTabBarController.tabItems)
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -30,12 +31,6 @@ class NavigationMenuTabBarController: UITabBarController {
         }
     }
 
-    func loadTabBar() {
-        self.setupCustomTabMenu(NavigationMenuTabBarController.tabItems)
-        self.selectedIndex = 0
-        self.showFloatingButtons() // show floating buttons since selected index is 0 by default
-    }
-
     // Create our custom menu bar and display it right where the tab bar should be.
     func setupCustomTabMenu(_ menuItems: [MenuItem]) {
         tabBar.isHidden = true
@@ -77,6 +72,7 @@ class NavigationMenuTabBarController: UITabBarController {
         }
 
         self.viewControllers = menuItems.map({ $0.viewController })
+        self.selectedIndex = 0
 
         self.view.bringSubviewToFront(self.customTabBar) // Keep nav menu in front of any subviews
         self.view.layoutIfNeeded()
@@ -123,7 +119,7 @@ class NavigationMenuTabBarController: UITabBarController {
         AppDelegate.shared.setAndDisplayRootViewController(startView.wrapInNavigationcontroller())
 
         // start sync
-        SyncManager.shared.startOrRestartSync(allowSyncOnCellular: Settings.syncOnCellular)
+        SyncManager.shared.startSync(allowSyncOnCellular: Settings.syncOnCellular)
 
         // Start notification listener if notifications are enabled by user.
         if Settings.incomingNotificationEnabled {

Decred Wallet/Features/Overview/OverviewViewController.swift

@@ -279,7 +279,7 @@ class OverviewViewController: UIViewController {
         if SyncManager.shared.isSynced || SyncManager.shared.isSyncing {
             WalletLoader.shared.multiWallet.cancelSync()
         } else {
-            SyncManager.shared.startOrRestartSync(allowSyncOnCellular: Settings.syncOnCellular)
+            SyncManager.shared.startSync(allowSyncOnCellular: Settings.syncOnCellular)
         }
 
         self.updateSyncConnectionButtonTextAndIcon()

Decred Wallet/Features/Security/RequestPasswordViewController.swift

@@ -9,7 +9,8 @@ import UIKit
 
 class RequestPasswordViewController: SecurityCodeRequestBaseViewController, UITextFieldDelegate {
     @IBOutlet weak var headerLabel: UILabel!
-
+    @IBOutlet weak var subtextLabel: UILabel!
+
     @IBOutlet weak var passwordInput: FloatingPlaceholderTextField!
     @IBOutlet weak var passwordErrorLabel: UILabel!
     @IBOutlet weak var passwordCountLabel: UILabel?
@@ -33,6 +34,18 @@ class RequestPasswordViewController: SecurityCodeRequestBaseViewController, UITe
     }
 
     private func setupInterface() {
+        if let prompt = self.request.prompt {
+            self.headerLabel?.text = prompt
+        } else {
+            self.headerLabel?.removeFromSuperview()
+        }
+
+        if let subtext = self.request.subtext {
+            self.subtextLabel?.text = subtext
+        } else {
+            self.subtextLabel?.removeFromSuperview()
+        }
+
         self.passwordInput.placeholder = String(format: LocalizedStrings.passwordPlaceholder,
                                                 self.request.for.localizedString)
         self.passwordInput.isSecureTextEntry = true
@@ -55,12 +68,6 @@ class RequestPasswordViewController: SecurityCodeRequestBaseViewController, UITe
             self.passwordCountLabel?.removeFromSuperview()
         }
 
-        if let prompt = self.request.prompt {
-            self.headerLabel?.text = prompt
-        } else {
-            self.headerLabel?.removeFromSuperview()
-        }
-
         if !self.request.showCancelButton {
             self.btnCancel?.removeFromSuperview()
         }
@@ -163,7 +170,7 @@ class RequestPasswordViewController: SecurityCodeRequestBaseViewController, UITe
         }
 
         // `onCurrentAndNewCodesEntered` callback is set, request new code and notify callback.
-        Security(for: self.request.for).requestNewCode(sender: self) {
+        Security(for: self.request.for, initialSecurityType: .password).requestNewCode(sender: self) {
             newCode, newCodeType, newCodeRequestCompletion in
             currentAndNewCodesEnteredCallback(password, self, newCode, newCodeRequestCompletion, newCodeType)
         }

Decred Wallet/Features/Security/RequestPinViewController.swift

@@ -11,7 +11,8 @@ import Dcrlibwallet
 
 class RequestPinViewController: SecurityCodeRequestBaseViewController {
     @IBOutlet weak var headerLabel: UILabel!
-
+    @IBOutlet weak var subtextLabel: UILabel!
+
     @IBOutlet weak var pinCollectionView: UICollectionView!
     @IBOutlet weak var pinCollectionViewHeightContraint: NSLayoutConstraint!
     @IBOutlet weak var enterPinLabel: UILabel!
@@ -62,6 +63,12 @@ class RequestPinViewController: SecurityCodeRequestBaseViewController {
             self.headerLabel?.removeFromSuperview()
         }
 
+        if let subtext = self.request.subtext {
+            self.subtextLabel?.text = subtext
+        } else {
+            self.subtextLabel?.removeFromSuperview()
+        }
+
         if !self.request.showCancelButton {
             self.btnCancel?.removeFromSuperview()
         }
@@ -150,7 +157,7 @@ class RequestPinViewController: SecurityCodeRequestBaseViewController {
             }
 
             // `onCurrentAndNewCodesEntered` callback is set, request new code and notify callback.
-            Security(for: self.request.for).requestNewCode(sender: self) {
+            Security(for: self.request.for, initialSecurityType: .pin).requestNewCode(sender: self) {
                 newCode, newCodeType, newCodeRequestCompletion in
                 currentAndNewCodesEnteredCallback(pinText, self, newCode, newCodeRequestCompletion, newCodeType)
             }