Merge pull request #658 from Syn-McJ/fix/seed-phrase-screen

fix: seed phrase screen

DashWallet/Sources/UI/Setup/SecureWallet/BackupInfo/BackupInfoViewController.swift

@@ -123,25 +123,29 @@ final class BackupInfoViewController: BaseViewController {
 
     @IBAction
     func backupButtonAction() {
-        if type == .setup {
+        let authManager = DSAuthenticationManager.sharedInstance()
+
+        if type == .setup && authManager.didAuthenticate {
             showSeedPhraseViewController()
         } else {
-            DSAuthenticationManager.sharedInstance()
-                .authenticate(withPrompt: nil,
-                              usingBiometricAuthentication: false,
-                              alertIfLockout: true) { [weak self] authenticated, _, _ in
-                    guard authenticated else {
-                        return
-                    }
-
-                    guard let self else {
-                        return
-                    }
+            authManager.authenticate(withPrompt: nil,
+                   usingBiometricAuthentication: false,
+                   alertIfLockout: true) { [weak self] authenticated, _, _ in
+                guard authenticated else {
+                    return
+                }
 
+                guard let self else {
+                    return
+                }
+
+                if type != .setup {
                     self.seedPhraseModel = DWPreviewSeedPhraseModel()
                     self.seedPhraseModel.getOrCreateNewWallet()
-                    self.showSeedPhraseViewController()
                 }
+
+                self.showSeedPhraseViewController()
+            }
         }
     }
 
@@ -194,7 +198,7 @@ extension BackupInfoViewController {
     }
 
     private func showSeedPhraseViewController() {
-        let controller = DWBackupSeedPhraseViewController(model: seedPhraseModel)
+        let controller = BackupSeedPhraseViewController(model: seedPhraseModel)
         controller.shouldCreateNewWalletOnScreenshot = shouldCreateNewWalletOnScreenshot
         controller.delegate = delegate
         navigationController?.pushViewController(controller, animated: true)

DashWallet/Sources/UI/Setup/SecureWallet/Seed/BackupSeedPhraseViewController.swift

@@ -0,0 +1,66 @@
+//
+//  Created by Andrew Podkovyrin
+//  Copyright © 2019 Dash Core Group. All rights reserved.
+//
+//  Licensed under the MIT License (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  https://opensource.org/licenses/MIT
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+import UIKit
+
+class BackupSeedPhraseViewController: DWPreviewSeedPhraseViewController {
+
+    var shouldCreateNewWalletOnScreenshot: Bool = false
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        self.title = NSLocalizedString("Backup Wallet", comment: "A noun. Used as a title.")
+        self.actionButton?.isEnabled = false
+
+        self.contentView.displayType = DWSeedPhraseDisplayType.backup
+
+        #if SNAPSHOT
+        self.actionButton.accessibilityIdentifier = "seedphrase_continue_button"
+        #endif
+    }
+
+    var actionButtonTitle: String {
+        return NSLocalizedString("Continue", comment: "")
+    }
+
+    @objc override func actionButtonAction(_ sender: Any) {
+        let seedPhrase = self.contentView.model
+
+        let controller = DWVerifySeedPhraseViewController(seedPhrase: seedPhrase!)
+        controller.delegate = self.delegate
+        self.navigationController?.pushViewController(controller, animated: true)
+    }
+
+    override func screenshotAlertOKAction() {
+        if !self.shouldCreateNewWalletOnScreenshot {
+            return
+        }
+
+        self.model.clearAllWallets()
+
+        self.feedbackGenerator.notificationOccurred(.error)
+
+        let seedPhrase = self.model.getOrCreateNewWallet()
+        self.contentView.updateSeedPhraseModelAnimated(seedPhrase)
+        self.contentView.showScreenshotDetectedErrorMessage()
+
+        self.actionButton?.isEnabled = false
+    }
+}

DashWallet/dashwallet-Bridging-Header.h

@@ -55,8 +55,11 @@ static const bool _SNAPSHOT = 0;
 #import "DWCenteredTableView.h"
 
 //MARK: Backup Wallet
-#import "DWBackupSeedPhraseViewController.h"
+#import "DWPreviewSeedPhraseViewController.h"
 #import "DWSecureWalletDelegate.h"
+#import "DWPreviewSeedPhraseContentView.h"
+#import "DWPreviewSeedPhraseViewController+DWProtected.h"
+#import "DWVerifySeedPhraseViewController.h"
 
 //MARK: Payment flow
 #import "DWQRScanModel.h"