Make ui-fixes for app backup feature

horizontalsystems · Oct 13, 2023 · c81093b · c81093b
1 parent 50b12dd
commit c81093b
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 26 deletions.
diff --git a/...et/UnstoppableWallet/Modules/RestoreAccount/RestoreCloud/RestoreCloudViewController.swift b/...et/UnstoppableWallet/Modules/RestoreAccount/RestoreCloud/RestoreCloudViewController.swift
@@ -174,13 +174,12 @@ class RestoreCloudViewController: ThemeViewController {
 extension RestoreCloudViewController: SectionsDataSource {
 
     func buildSections() -> [SectionProtocol] {
-        guard !walletViewItem.isEmpty else {
+        guard !walletViewItem.isEmpty || !fullBackupViewItem.isEmpty else {
             return []
         }
 
-        var sections = [
-            descriptionSection,
-        ]
+        var sections = [ descriptionSection ]
+
         if !walletViewItem.notImported.isEmpty {
             sections.append(
                     section(id: "not_imported", headerTitle: "restore.cloud.wallets".localized, viewItems: viewModel.walletViewItem.notImported)

diff --git a/.../RestoreAccount/RestoreFile/RestoreFileConfiguration/RestoreFileConfigurationModule.swift b/.../RestoreAccount/RestoreFile/RestoreFileConfiguration/RestoreFileConfigurationModule.swift
@@ -5,6 +5,7 @@ class RestoreFileConfigurationModule {
         let viewModel = RestoreFileConfigurationViewModel(
             cloudBackupManager: App.shared.cloudBackupManager,
             appBackupProvider: App.shared.appBackupProvider,
+            contactBookManager: App.shared.contactManager,
             rawBackup: rawBackup
         )
 

diff --git a/...Account/RestoreFile/RestoreFileConfiguration/RestoreFileConfigurationViewController.swift b/...Account/RestoreFile/RestoreFileConfiguration/RestoreFileConfigurationViewController.swift
@@ -52,6 +52,13 @@ class RestoreFileConfigurationViewController: KeyboardAwareViewController {
         restoreButton.addTarget(self, action: #selector(onTapRestore), for: .touchUpInside)
         restoreButton.set(style: .yellow)
 
+        viewModel.showMergeAlertPublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] in
+                self?.showMergeAlert()
+            }
+            .store(in: &cancellables)
+
         viewModel.finishedPublisher
             .receive(on: DispatchQueue.main)
             .sink { [weak self] success in
@@ -75,6 +82,10 @@ class RestoreFileConfigurationViewController: KeyboardAwareViewController {
     }
 
     @objc private func onTapRestore() {
+        viewModel.onTapRestore()
+    }
+
+    private func showMergeAlert() {
         let viewController = BottomSheetModule.viewController(
                 image: .local(image: UIImage(named: "warning_2_24")?.withTintColor(.themeJacob)),
                 title: "alert.notice".localized,
@@ -83,7 +94,7 @@ class RestoreFileConfigurationViewController: KeyboardAwareViewController {
                 ],
                 buttons: [
                     .init(style: .red, title: "backup_app.restore.notice.merge".localized, actionType: .afterClose) { [weak self] in
-                        self?.viewModel.onTapRestore()
+                        self?.viewModel.restore()
                     },
                     .init(style: .transparent, title: "button.cancel".localized, actionType: .afterClose),
                 ]

diff --git a/...storeAccount/RestoreFile/RestoreFileConfiguration/RestoreFileConfigurationViewModel.swift b/...storeAccount/RestoreFile/RestoreFileConfiguration/RestoreFileConfigurationViewModel.swift
@@ -4,13 +4,16 @@ import Combine
 class RestoreFileConfigurationViewModel {
     private let cloudBackupManager: CloudBackupManager
     private let appBackupProvider: AppBackupProvider
+    private let contactBookManager: ContactBookManager
     private let rawBackup: RawFullBackup
 
+    private let showMergeAlertSubject = PassthroughSubject<Void, Never>()
     private let finishedSubject = PassthroughSubject<Bool, Never>()
 
-    init(cloudBackupManager: CloudBackupManager, appBackupProvider: AppBackupProvider, rawBackup: RawFullBackup) {
+    init(cloudBackupManager: CloudBackupManager, appBackupProvider: AppBackupProvider, contactBookManager: ContactBookManager, rawBackup: RawFullBackup) {
         self.cloudBackupManager = cloudBackupManager
         self.appBackupProvider = appBackupProvider
+        self.contactBookManager = contactBookManager
         self.rawBackup = rawBackup
     }
 
@@ -61,10 +64,22 @@ extension RestoreFileConfigurationViewModel {
     }
 
     func onTapRestore() {
+        if contactBookManager.state.data?.contacts.isEmpty ?? true {
+            restore()
+        } else {
+            showMergeAlertSubject.send()
+        }
+    }
+
+    func restore() {
         appBackupProvider.restore(raw: rawBackup)
         finishedSubject.send(true)
     }
 
+    var showMergeAlertPublisher: AnyPublisher<Void, Never> {
+        showMergeAlertSubject.eraseToAnyPublisher()
+    }
+
     var finishedPublisher: AnyPublisher<Bool, Never> {
         finishedSubject.eraseToAnyPublisher()
     }

diff --git a/...pableWallet/Modules/Settings/BackupApp/Backup/BackupDisclaimer/BackupDisclaimerView.swift b/...pableWallet/Modules/Settings/BackupApp/Backup/BackupDisclaimer/BackupDisclaimerView.swift
@@ -6,7 +6,7 @@ struct BackupDisclaimerView: View {
     @ObservedObject var viewModel: BackupAppViewModel
     var onDismiss: (() -> Void)?
 
-    @State var isOn: Bool = true
+    @State var isOn: Bool = false
 
     var body: some View {
         let backupDisclaimer = (viewModel.destination ?? .local).backupDisclaimer

diff --git a/...allet/UnstoppableWallet/Modules/Settings/BackupApp/Backup/BackupList/BackupListView.swift b/...allet/UnstoppableWallet/Modules/Settings/BackupApp/Backup/BackupList/BackupListView.swift
@@ -10,28 +10,30 @@ struct BackupListView: View {
         ThemeView {
             BottomGradientWrapper {
                 VStack(spacing: .margin24) {
-                    VStack(spacing: 0) {
-                        ListSectionHeader(text: "backup_app.backup_list.header.wallets".localized)
+                    if !viewModel.accountItems.isEmpty {
+                        VStack(spacing: 0) {
+                            ListSectionHeader(text: "backup_app.backup_list.header.wallets".localized)
 
-                        ListSection {
-                            ForEach(viewModel.accountItems, id: \.accountId) { (item: BackupAppModule.AccountItem) in
-                                if viewModel.selected[item.id] != nil {
-                                    let selected = binding(for: item.accountId)
+                            ListSection {
+                                ForEach(viewModel.accountItems, id: \.accountId) { (item: BackupAppModule.AccountItem) in
+                                    if viewModel.selected[item.id] != nil {
+                                        let selected = binding(for: item.accountId)
 
-                                    ClickableRow(action: {
-                                        viewModel.toggle(item: item)
-                                    }) {
-                                        HStack {
-                                            AccountView(item: item)
+                                        ClickableRow(action: {
+                                            viewModel.toggle(item: item)
+                                        }) {
+                                            HStack {
+                                                AccountView(item: item)
 
-                                            Toggle(isOn: selected) {}
-                                                .labelsHidden()
-                                                .toggleStyle(CheckboxStyle())
+                                                Toggle(isOn: selected) {}
+                                                    .labelsHidden()
+                                                    .toggleStyle(CheckboxStyle())
+                                            }
+                                        }
+                                    } else {
+                                        ListRow {
+                                            AccountView(item: item)
                                         }
-                                    }
-                                } else {
-                                    ListRow {
-                                        AccountView(item: item)
                                     }
                                 }
                             }

diff --git a/UnstoppableWallet/UnstoppableWallet/en.lproj/Localizable.strings b/UnstoppableWallet/UnstoppableWallet/en.lproj/Localizable.strings
@@ -271,7 +271,7 @@ Go to Settings - > %@ and allow access to the camera.";
 "backup.cloud.password.confirm.placeholder" = "Confirm";
 "backup.cloud.password.save" = "Save and Backup";
 
-"backup.cloud.password.error.empty_passphrase" = "Passphrase cannot be empty";
+"backup.cloud.password.error.empty_passphrase" = "Password cannot be empty";
 "backup.cloud.password.error.forbidden_symbols" = "Please use only supported symbols: A-Z a-z 0-9 ' \" ` & / ? ! : ; . , ~ * $ = + - [ ] ( ) { } < > \\ _ # @ | %";
 "backup.cloud.password.error.minimum_requirement" = "At least 8 characters, including one uppercase letter, one lowercase letter, one number, and one symbol";
 "backup.cloud.password.error.invalid_password" = "Incorrect Password";