implement account filter operation on privacy setup

Decred Wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet Testnet.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Decred Wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Decred Wallet/Custom Views/WalletAccountView/WalletAccountView.swift

@@ -35,6 +35,7 @@ import Dcrlibwallet
     var showWatchOnlyWallet = true
     var showMixedAccount = true
     var showUnMixedAccount = true
+    var showMixedOnly = true
 
     var onAccountSelectionChanged: ((_ selectedWallet: DcrlibwalletWallet, _ selectedAccount: DcrlibwalletAccount) -> Void)?
 
@@ -81,7 +82,7 @@ import Dcrlibwallet
                                    selectedWallet: self.selectedWallet,
                                    selectedAccount: self.selectedAccount, showWatchOnlyWallet: showWatchOnlyWallet,
                                    showUnMixedAccount: showUnMixedAccount,
-                                   showMixedAccount: showMixedAccount,
+                                   showMixedAccount: showMixedAccount, showMixedOnly: showMixedOnly,
                                    callback: self.updateSelectedAccount)
     }
 
@@ -104,4 +105,37 @@ import Dcrlibwallet
 
         self.onAccountSelectionChanged?(firstWallet, firstWalletAccount)
     }
+
+    func selectFirstFilterWalletAccount() {
+        guard let firstWallet = WalletLoader.shared.wallets.first,
+            let firstWalletAccount = firstWallet.accounts.filter({ $0.totalBalance > 0 || $0.name != "imported" }).first,
+            let firstWalletUnMixedAccount = firstWallet.accounts.filter({ $0.totalBalance > 0 || $0.name != "imported" && $0.number != firstWallet.readInt32ConfigValue(forKey: DcrlibwalletAccountMixerUnmixedAccount, defaultValue: -1)}).first,
+            let firstWalletMixedOnlyAccount = firstWallet.accounts.filter({$0.number == firstWallet.readInt32ConfigValue(forKey: DcrlibwalletAccountMixerMixedAccount, defaultValue: -1)}).first,
+            let firstWalletMixedAccount = firstWallet.accounts.filter({ $0.totalBalance > 0 || $0.name != "imported" && $0.number != firstWallet.readInt32ConfigValue(forKey: DcrlibwalletAccountMixerMixedAccount, defaultValue: -1)}).first
+        else { return }
+        self.selectedWallet = firstWallet
+        if !showUnMixedAccount {
+            self.selectedAccount = firstWalletUnMixedAccount
+            self.onAccountSelectionChanged?(firstWallet, firstWalletUnMixedAccount)
+            return
+        }
+
+        if !showMixedOnly {
+            self.selectedAccount = firstWalletMixedOnlyAccount
+            self.onAccountSelectionChanged?(firstWallet, firstWalletMixedOnlyAccount)
+            return
+        }
+
+        if !showMixedAccount {
+            self.selectedAccount = firstWalletMixedAccount
+            self.onAccountSelectionChanged?(firstWallet, firstWalletMixedAccount)
+            return
+        }
+
+        self.selectedAccount = firstWalletAccount
+
+
+        self.onAccountSelectionChanged?(firstWallet, firstWalletAccount)
+
+    }
 }

Decred Wallet/Features/Custom Dialogs/AccountSelectorDialog/AccountSelectorDialog.swift

@@ -25,6 +25,7 @@ class AccountSelectorDialog: UIViewController {
     var showWatchOnly = true
     var showUnMixedAccount = true
     var showMixedAccount = true
+    var showMixedOnly = true
 
     let accountCellRowHeight: CGFloat = 74
     let walletHeaderSectionHeight: CGFloat = 36
@@ -36,6 +37,7 @@ class AccountSelectorDialog: UIViewController {
                      showWatchOnlyWallet: Bool,
                      showUnMixedAccount: Bool,
                      showMixedAccount: Bool,
+                     showMixedOnly: Bool,
                      callback: @escaping AccountSelectorDialogCallback) {
 
         let dialog = AccountSelectorDialog.instantiate(from: .CustomDialogs)
@@ -45,6 +47,7 @@ class AccountSelectorDialog: UIViewController {
         dialog.selectedAccount = selectedAccount
         dialog.showWatchOnly = showWatchOnlyWallet
         dialog.showUnMixedAccount = showUnMixedAccount
+        dialog.showMixedOnly = showMixedOnly
         dialog.showMixedAccount = showMixedAccount
         dialog.modalPresentationStyle = .pageSheet
         vc.present(dialog, animated: true, completion: nil)
@@ -75,8 +78,12 @@ class AccountSelectorDialog: UIViewController {
             accountsFilterFn = { $0.totalBalance > 0 || $0.name != "imported" && $0.number != self.selectedWallet?.readInt32ConfigValue(forKey: DcrlibwalletAccountMixerUnmixedAccount, defaultValue: -1)}
         }
 
+        if !showMixedOnly {
+            accountsFilterFn = {$0.number == self.selectedWallet?.readInt32ConfigValue(forKey: DcrlibwalletAccountMixerMixedAccount, defaultValue: -1)}
+        }
+
         if !showMixedAccount {
-            accountsFilterFn = { $0.totalBalance > 0 || $0.name != "imported" && $0.number != self.selectedWallet?.readInt32ConfigValue(forKey: DcrlibwalletAccountMixerMixedAccount, defaultValue: -1)}
+            accountsFilterFn = { $0.name != "imported" && $0.number != self.selectedWallet?.readInt32ConfigValue(forKey: DcrlibwalletAccountMixerMixedAccount, defaultValue: -1)}
         }
 
         let fullCoinWallet = WalletLoader.shared.wallets.filter { !$0.isWatchingOnlyWallet()}

Decred Wallet/Features/Send/SendViewController.swift

@@ -105,16 +105,20 @@ class SendViewController: UIViewController {
 
     func setupViews() {
         self.sourceAccountView.showWatchOnlyWallet = false
-        self.sourceAccountView.showMixedAccount = false
-        self.sourceAccountView.onAccountSelectionChanged = { _, newSourceAccount in
-            let spendableAmount = (Decimal(newSourceAccount.balance!.dcrSpendable) as NSDecimalNumber).round(8).formattedWithSeparator
-            self.sourceAccountSpendableBalanceLabel.text = "\(LocalizedStrings.spendable): \(spendableAmount) DCR"
+
+        self.sourceAccountView.selectFirstFilterWalletAccount()
+
+        if let setup = self.sourceAccountView?.selectedWallet?.readBoolConfigValue(forKey: DcrlibwalletAccountMixerConfigSet, defaultValue: false) {
 
-            if self.sendMax {
-                self.calculateAndSetMaxSendableAmount()
+            if setup {
+                self.sourceAccountView.showMixedOnly = false
+            } else {
+                self.sourceAccountView.showUnMixedAccount = false
             }
         }
 
+        self.sourceAccountView.onAccountSelectionChanged = self.updateSelectedAccount
+
         self.destinationAddressTextField.placeholder = LocalizedStrings.destinationAddress
 
         self.destinationAddressTextField.add(button: self.scanQRCodeForAddressButton)
@@ -123,8 +127,7 @@ class SendViewController: UIViewController {
 
         self.toSelfAccountSection.isHidden = true
         self.destinationAccountView.showWatchOnlyWallet = true
-        self.sourceAccountView.showUnMixedAccount = false
-        self.destinationAccountView.showUnMixedAccount = false 
+        self.destinationAccountView.showMixedAccount = false 
         self.destinationAccountView.onAccountSelectionChanged = { _, _ in
             self.displayFeeDetailsAndTransactionSummary() // re-calculate fee with updated destination info
         }
@@ -139,6 +142,18 @@ class SendViewController: UIViewController {
         )
         self.transactionFeeDetailsSection.isHidden = true
     }
+
+    func updateSelectedAccount(_ selectedWallet: DcrlibwalletWallet, _ selectedAccount: DcrlibwalletAccount) {
+        self.sourceAccountView.selectedWallet = selectedWallet
+        self.sourceAccountView.selectedAccount = selectedAccount
+
+        let spendableAmount = (Decimal(selectedAccount.balance!.dcrSpendable) as NSDecimalNumber).round(8).formattedWithSeparator
+        self.sourceAccountSpendableBalanceLabel.text = "\(LocalizedStrings.spendable): \(spendableAmount) DCR"
+
+        if self.sendMax {
+            self.calculateAndSetMaxSendableAmount()
+        }
+    }
 
     @objc func toggleTransactionFeeDetailsVisibility() {
         UIView.animate(withDuration: 0.1, delay: 0, options: .curveEaseInOut, animations: {
@@ -150,7 +165,7 @@ class SendViewController: UIViewController {
     }
 
     @objc func resetFields() {
-        self.sourceAccountView.selectFirstWalletAccount()
+        self.sourceAccountView.selectFirstFilterWalletAccount()
 
         // Clearing the destination address textfield will trigger the set textview delegate
         // which will hide the error label and show the paste button if a valid address is in clipboard.
@@ -160,7 +175,7 @@ class SendViewController: UIViewController {
         self.amountValue = nil
         self.exchangeValue = nil
 
-        self.destinationAccountView.selectFirstWalletAccount()
+        self.destinationAccountView.selectFirstFilterWalletAccount()
 
         // Clearing the primary amount textfield should set the usd amount to 0,
         // hide the address error label, update the transaction fee details and sending summary fields.
@@ -169,10 +184,10 @@ class SendViewController: UIViewController {
     }
 
     func refreshFields() {
-        self.sourceAccountView.selectFirstWalletAccount()
+        self.sourceAccountView.selectFirstFilterWalletAccount()
         self.amountTextFieldEditingBegan()
         self.amountTextFieldChanged()
-        self.destinationAccountView.selectFirstWalletAccount()
+        self.destinationAccountView.selectFirstFilterWalletAccount()
         self.amountTextFieldEditingEnded()
     }
 
@@ -255,7 +270,11 @@ class SendViewController: UIViewController {
         UIView.animate(withDuration: 0.1, delay: 0, options: .curveEaseIn, animations: {
             self.toAddressSection.isHidden = true
             self.toSelfAccountSection.isHidden = false
-
+            self.sourceAccountView.showMixedAccount = self.toAddressSection.isHidden
+            self.sourceAccountView.showUnMixedAccount = self.toAddressSection.isHidden
+            self.sourceAccountView.showMixedOnly = true
+            self.destinationAccountView.showMixedAccount = false
+            self.sourceAccountView.selectFirstFilterWalletAccount()
             self.displayFeeDetailsAndTransactionSummary() // re-calculate fee with updated destination info
         })
     }
@@ -265,6 +284,13 @@ class SendViewController: UIViewController {
             self.toSelfAccountSection.isHidden = true
             self.toAddressSection.isHidden = false
 
+            if ((self.sourceAccountView?.selectedWallet?.readBoolConfigValue(forKey: DcrlibwalletAccountMixerConfigSet, defaultValue: false)) != nil) {
+                self.sourceAccountView.showMixedOnly = false
+                self.sourceAccountView.selectFirstFilterWalletAccount()
+            } else {
+                self.sourceAccountView.showUnMixedAccount = false
+            }
+
             self.displayFeeDetailsAndTransactionSummary() // re-calculate fee with updated destination info
         })
     }

Decred Wallet/Features/TransactionDetails/TransactionDetailsViewController.swift

@@ -71,12 +71,16 @@ class TransactionDetailsViewController: UIViewController {
 
     private func displayTitle() {
         if self.transaction.type == DcrlibwalletTxTypeRegular {
-            if self.transaction.direction == DcrlibwalletTxDirectionSent {
-                self.txTypeLabel.text = LocalizedStrings.sent
-            } else if self.transaction.direction == DcrlibwalletTxDirectionReceived {
-                self.txTypeLabel.text = LocalizedStrings.received
-            } else if self.transaction.direction == DcrlibwalletTxDirectionTransferred {
-                self.txTypeLabel.text = LocalizedStrings.transferred
+            if transaction.isMixed {
+                self.txTypeLabel.text = LocalizedStrings.mixed
+            } else {
+                if self.transaction.direction == DcrlibwalletTxDirectionSent {
+                    self.txTypeLabel.text = LocalizedStrings.sent
+                } else if self.transaction.direction == DcrlibwalletTxDirectionReceived {
+                    self.txTypeLabel.text = LocalizedStrings.received
+                } else if self.transaction.direction == DcrlibwalletTxDirectionTransferred {
+                    self.txTypeLabel.text = LocalizedStrings.transferred
+                }
             }
         } else if self.transaction.type == DcrlibwalletTxTypeVote {
             self.txTypeLabel.text = LocalizedStrings.voted
@@ -224,7 +228,7 @@ class TransactionDetailsViewController: UIViewController {
         } else if transaction.direction == DcrlibwalletTxDirectionReceived {
             self.txOverview.txIconImage = UIImage(named: "ic_receive")
         } else if transaction.direction == DcrlibwalletTxDirectionTransferred {
-            self.txOverview.txIconImage = UIImage(named: "ic_fee")
+            self.txOverview.txIconImage = UIImage(named: "nav_menu/ic_wallet")
         }
     }