Add new fields for fullWallet backup

UnstoppableWallet/UnstoppableWallet/Core/App.swift

@@ -296,7 +296,9 @@ class App {
             balancePrimaryValueManager: balancePrimaryValueManager,
             balanceConversionManager: balanceConversionManager,
             balanceHiddenManager: balanceHiddenManager,
-            contactManager: contactManager
+            contactManager: contactManager,
+            priceChangeModeManager: priceChangeModeManager,
+            walletButtonHiddenManager: walletButtonHiddenManager
         )
         cloudBackupManager = CloudBackupManager(
             ubiquityContainerIdentifier: AppConfig.sharedCloudContainer,

UnstoppableWallet/UnstoppableWallet/Core/Crypto/SettingsBackup.swift

@@ -2,7 +2,7 @@ import Chart
 import Foundation
 import ThemeKit
 
-struct SettingsBackup: Codable {
+class SettingsBackup: Codable {
     var evmSyncSources: EvmSyncSourceManager.SyncSourceBackup
     let btcModes: [BtcBlockchainManager.BtcRestoreModeBackup]
 
@@ -15,8 +15,10 @@ struct SettingsBackup: Codable {
 
     let mode: ThemeMode
     let showMarketTab: Bool
+    let priceChangeMode: PriceChangeMode
     let launchScreen: LaunchScreen
     let conversionTokenQueryId: String?
+    let balanceHideButtons: Bool
     let balancePrimaryValue: BalancePrimaryValue
     let balanceAutoHide: Bool
     let appIcon: String
@@ -32,12 +34,73 @@ struct SettingsBackup: Codable {
         case baseCurrency = "currency"
         case mode = "theme_mode"
         case showMarketTab = "show_market"
+        case priceChangeMode = "price_change_mode"
         case launchScreen = "launch_screen"
         case conversionTokenQueryId = "conversion_token_query_id"
+        case balanceHideButtons = "balance_hide_buttons"
         case balancePrimaryValue = "balance_primary_value"
         case balanceAutoHide = "balance_auto_hide"
         case appIcon = "app_icon"
     }
+
+    init(
+        evmSyncSources: EvmSyncSourceManager.SyncSourceBackup,
+        btcModes: [BtcBlockchainManager.BtcRestoreModeBackup],
+        remoteContactsSync: Bool?,
+        swapProviders: [DefaultProvider],
+        chartIndicators: ChartIndicatorsRepository.BackupIndicators,
+        indicatorsShown: Bool,
+        currentLanguage: String,
+        baseCurrency: String,
+        mode: ThemeMode,
+        showMarketTab: Bool,
+        priceChangeMode: PriceChangeMode,
+        launchScreen: LaunchScreen,
+        conversionTokenQueryId: String?,
+        balanceHideButtons: Bool,
+        balancePrimaryValue: BalancePrimaryValue,
+        balanceAutoHide: Bool,
+        appIcon: String) {
+            self.evmSyncSources = evmSyncSources
+            self.btcModes = btcModes
+            self.remoteContactsSync = remoteContactsSync
+            self.swapProviders = swapProviders
+            self.chartIndicators = chartIndicators
+            self.indicatorsShown = indicatorsShown
+            self.currentLanguage = currentLanguage
+            self.baseCurrency = baseCurrency
+            self.mode = mode
+            self.showMarketTab = showMarketTab
+            self.priceChangeMode = priceChangeMode
+            self.launchScreen = launchScreen
+            self.conversionTokenQueryId = conversionTokenQueryId
+            self.balanceHideButtons = balanceHideButtons
+            self.balancePrimaryValue = balancePrimaryValue
+            self.balanceAutoHide = balanceAutoHide
+            self.appIcon = appIcon
+    }
+
+    required init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        evmSyncSources = try container.decode(EvmSyncSourceManager.SyncSourceBackup.self, forKey: .evmSyncSources)
+        btcModes = try container.decode([BtcBlockchainManager.BtcRestoreModeBackup].self, forKey: .btcModes)
+        remoteContactsSync = try? container.decode(Bool.self, forKey: .remoteContactsSync)
+        swapProviders = try container.decode([DefaultProvider].self, forKey: .swapProviders)
+        chartIndicators = try container.decode(ChartIndicatorsRepository.BackupIndicators.self, forKey: .chartIndicators)
+        indicatorsShown = try container.decode(Bool.self, forKey: .indicatorsShown)
+        currentLanguage = try container.decode(String.self, forKey: .currentLanguage)
+        baseCurrency = try container.decode(String.self, forKey: .baseCurrency)
+        mode = try container.decode(ThemeMode.self, forKey: .mode)
+        showMarketTab = try container.decode(Bool.self, forKey: .showMarketTab)
+        priceChangeMode = (try? container.decode(PriceChangeMode.self, forKey: .priceChangeMode)) ?? .hour24
+        launchScreen = try container.decode(LaunchScreen.self, forKey: .launchScreen)
+        conversionTokenQueryId = try container.decode(String?.self, forKey: .conversionTokenQueryId)
+        balanceHideButtons = (try? container.decode(Bool.self, forKey: .balanceHideButtons)) ?? false
+        balancePrimaryValue = try container.decode(BalancePrimaryValue.self, forKey: .balancePrimaryValue)
+        balanceAutoHide = try container.decode(Bool.self, forKey: .balanceAutoHide)
+        appIcon = try container.decode(String.self, forKey: .appIcon)
+    }
+
 }
 
 extension SettingsBackup {

UnstoppableWallet/UnstoppableWallet/Models/PriceChangeMode.swift

@@ -1,6 +1,6 @@
 enum PriceChangeMode: String, CaseIterable, Codable {
-    case hour24
-    case midnightUtc
+    case hour24 = "hour_24"
+    case midnightUtc = "midnight_utc"
 }
 
 extension PriceChangeMode {

UnstoppableWallet/UnstoppableWallet/Modules/Backup/ICloud/AppBackupProvider.swift

@@ -23,6 +23,8 @@ class AppBackupProvider {
     private let balanceConversionManager: BalanceConversionManager
     private let balanceHiddenManager: BalanceHiddenManager
     private let contactManager: ContactBookManager
+    private let priceChangeModeManager: PriceChangeModeManager
+    private let walletButtonHiddenManager: WalletButtonHiddenManager
 
     init(accountManager: AccountManager,
          accountFactory: AccountFactory,
@@ -41,7 +43,9 @@ class AppBackupProvider {
          balancePrimaryValueManager: BalancePrimaryValueManager,
          balanceConversionManager: BalanceConversionManager,
          balanceHiddenManager: BalanceHiddenManager,
-         contactManager: ContactBookManager)
+         contactManager: ContactBookManager,
+         priceChangeModeManager: PriceChangeModeManager,
+         walletButtonHiddenManager: WalletButtonHiddenManager)
     {
         self.accountManager = accountManager
         self.accountFactory = accountFactory
@@ -61,6 +65,8 @@ class AppBackupProvider {
         self.balanceConversionManager = balanceConversionManager
         self.balanceHiddenManager = balanceHiddenManager
         self.contactManager = contactManager
+        self.priceChangeModeManager = priceChangeModeManager
+        self.walletButtonHiddenManager = walletButtonHiddenManager
     }
 
     // Parts of backups
@@ -98,8 +104,10 @@ class AppBackupProvider {
             baseCurrency: currencyManager.baseCurrency.code,
             mode: themeManager.themeMode,
             showMarketTab: launchScreenManager.showMarket,
+            priceChangeMode: priceChangeModeManager.priceChangeMode,
             launchScreen: launchScreenManager.launchScreen,
             conversionTokenQueryId: balanceConversionManager.conversionToken?.tokenQuery.id,
+            balanceHideButtons: walletButtonHiddenManager.buttonHidden,
             balancePrimaryValue: balancePrimaryValueManager.balancePrimaryValue,
             balanceAutoHide: balanceHiddenManager.balanceAutoHide,
             appIcon: appIconManager.appIcon.title
@@ -204,8 +212,10 @@ extension AppBackupProvider {
         themeManager.themeMode = raw.settings.mode
         launchScreenManager.showMarket = raw.settings.showMarketTab
         launchScreenManager.launchScreen = raw.settings.launchScreen
+        priceChangeModeManager.priceChangeMode = raw.settings.priceChangeMode
         balancePrimaryValueManager.balancePrimaryValue = raw.settings.balancePrimaryValue
 
+        walletButtonHiddenManager.buttonHidden = raw.settings.balanceHideButtons
         balanceConversionManager.set(tokenQueryId: raw.settings.conversionTokenQueryId)
         balanceHiddenManager.set(balanceAutoHide: raw.settings.balanceAutoHide)
         let appIcon = AppIconManager.allAppIcons.first { $0.title == raw.settings.appIcon } ?? .main

UnstoppableWallet/UnstoppableWallet/Modules/Settings/Main/MainSettingsViewController.swift

@@ -67,7 +67,7 @@ class MainSettingsViewController: ThemeViewController {
         manageAccountsCell.set(backgroundStyle: .lawrence, isFirst: true)
         syncManageAccountCell()
 
-        walletConnectCell.set(backgroundStyle: .lawrence, isLast: true)
+        walletConnectCell.set(backgroundStyle: .lawrence)
         syncWalletConnectCell()
 
         securityCell.set(backgroundStyle: .lawrence, isFirst: true)
@@ -244,6 +244,20 @@ class MainSettingsViewController: ThemeViewController {
                     self?.viewModel.onTapWalletConnect()
                 }
             ),
+            tableView.universalRow48(
+                id: "backup-manager",
+                image: .local(UIImage(named: "icloud_24")),
+                title: .body("settings.backup_manager".localized),
+                accessoryType: .disclosure,
+                isFirst: false,
+                isLast: true,
+                action: { [weak self] in
+                    let viewController = BackupManagerModule.viewController()
+                    self?.navigationController?.pushViewController(viewController, animated: true)
+
+                    stat(page: .settings, event: .open(page: .backupManager))
+                }
+            )
         ]
     }
 
@@ -337,25 +351,6 @@ class MainSettingsViewController: ThemeViewController {
         ]
     }
 
-    private var backupRows: [RowProtocol] {
-        [
-            tableView.universalRow48(
-                id: "backup-manager",
-                image: .local(UIImage(named: "icloud_24")),
-                title: .body("settings.backup_manager".localized),
-                accessoryType: .disclosure,
-                isFirst: true,
-                isLast: true,
-                action: { [weak self] in
-                    let viewController = BackupManagerModule.viewController()
-                    self?.navigationController?.pushViewController(viewController, animated: true)
-
-                    stat(page: .settings, event: .open(page: .backupManager))
-                }
-            ),
-        ]
-    }
-
     private var socialRows: [RowProtocol] {
         [
             tableView.universalRow48(
@@ -542,7 +537,6 @@ extension MainSettingsViewController: SectionsDataSource {
                 rows: socialRows
             ),
             Section(id: "knowledge", headerState: .margin(height: .margin32), rows: knowledgeRows),
-            Section(id: "backup", headerState: .margin(height: .margin32), rows: backupRows),
             Section(id: "about", headerState: .margin(height: .margin32), rows: aboutRows),
             Section(id: "footer", headerState: .margin(height: .margin32), footerState: .margin(height: .margin32), rows: footerRows),
         ]