Merge pull request #1968 from MixinNetwork/feature/wallet

over140 · web-flow · commit 6ce04d0c8d74 · 2025-12-30T14:45:08.000+04:00
New wallet summary view
diff --git a/Mixin/Resources/en.lproj/Localizable.strings b/Mixin/Resources/en.lproj/Localizable.strings
@@ -1656,7 +1656,9 @@
 "wallet_pin_pay_interval_tips" = "For the security of your assets, you need to verify your PIN for the specified interval.";
 "wallet_pin_tops_desc" = "Please remember the PIN is unrecoverable if lost. The PIN is based on the Throttled Identity Protocol, which is the decentralized key derivation protocol, read the document to learn more.";
 "wallet_refresh_address_failed" = "The withdrawal fee has been changed and the refresh fails, please try again.";
-"wallet_summary_tip" = "Watch wallets and hidden assets are excluded from the total";
+"wallet_summary_tip_all" = "Safes, watch wallets, and hidden assets are excluded from the total";
+"wallet_summary_tip_created" = "Hidden assets are excluded from the total";
+"wallet_summary_tip_safe" = "Co-managed Safes are excluded from the total";
 "wallet_transaction_continue_count_down" = "Continue (%d)";
 "wallet_transaction_tip" = "Are you sure you want to transfer %3$@ worth %2$@ to %1$@?";
 "wallet_transactions_asset_key_warning" = "Asset key is NOT a deposit address!";
diff --git a/Mixin/Resources/es.lproj/Localizable.strings b/Mixin/Resources/es.lproj/Localizable.strings
@@ -1656,7 +1656,9 @@
 "wallet_pin_pay_interval_tips" = "Para la seguridad de tus activos, debes verificar tu PIN durante el intervalo especificado.";
 "wallet_pin_tops_desc" = "Recuerda que el PIN es irrecuperable si se pierde. El PIN se basa en el Throttled Identity Protocol, que es el protocolo de derivación de claves descentralizado, lee el documento para obtener más información.";
 "wallet_refresh_address_failed" = "La tarifa de retiro ha cambiado y la actualización falla, inténtalo de nuevo.";
-"wallet_summary_tip" = "Watch wallets and hidden assets are excluded from the total";
+"wallet_summary_tip_all" = "Safes, watch wallets, and hidden assets are excluded from the total";
+"wallet_summary_tip_created" = "Hidden assets are excluded from the total";
+"wallet_summary_tip_safe" = "Co-managed Safes are excluded from the total";
 "wallet_transaction_continue_count_down" = "Continuar (%d)";
 "wallet_transaction_tip" = "¿Estás seguro de que quieres transferir %3$@ por valor de %2$@ a %1$@?";
 "wallet_transactions_asset_key_warning" = "¡La clave de activo NO es una dirección de depósito!";
diff --git a/Mixin/Resources/ja.lproj/Localizable.strings b/Mixin/Resources/ja.lproj/Localizable.strings
@@ -1656,7 +1656,9 @@
 "wallet_pin_pay_interval_tips" = "セキュリティ保護のため、PINコードの定期的な再確認が必要です。";
 "wallet_pin_tops_desc" = "PINコードを忘れた場合、ウォレットにアクセスすることができなくなるため、必ず覚えておいてください。PINコードは、分散型キー導出プロトコルであるThrottled Identity Protocolから作成されています。詳しくは、こちらをご覧ください。";
 "wallet_refresh_address_failed" = "出金手数料が変更され、更新に失敗しました。もう一度やり直してください。";
-"wallet_summary_tip" = "Watch wallets and hidden assets are excluded from the total";
+"wallet_summary_tip_all" = "Safes, watch wallets, and hidden assets are excluded from the total";
+"wallet_summary_tip_created" = "Hidden assets are excluded from the total";
+"wallet_summary_tip_safe" = "Co-managed Safes are excluded from the total";
 "wallet_transaction_continue_count_down" = "続ける (%d)";
 "wallet_transaction_tip" = "%1$@へ%2$@相当の%3$@を送金してもよろしいですか？";
 "wallet_transactions_asset_key_warning" = "資産キーは入金アドレスではありません！";
diff --git a/Mixin/Resources/ru.lproj/Localizable.strings b/Mixin/Resources/ru.lproj/Localizable.strings
@@ -1656,7 +1656,9 @@
 "wallet_pin_pay_interval_tips" = "В целях безопасности ваших активов вам необходимо подтверждать свой PIN-код в течение указанного интервала времени.";
 "wallet_pin_tops_desc" = "Пожалуйста, помните, что PIN-код невозможно восстановить, если он утерян. PIN-код основан на протоколе Throttled Identity Protocol, который представляет собой децентрализованный протокол получения ключей. Прочтите документ, чтобы узнать больше.";
 "wallet_refresh_address_failed" = "Комиссия за снятие была изменена, и обновление не удалось, попробуйте еще раз.";
-"wallet_summary_tip" = "Watch wallets and hidden assets are excluded from the total";
+"wallet_summary_tip_all" = "Safes, watch wallets, and hidden assets are excluded from the total";
+"wallet_summary_tip_created" = "Hidden assets are excluded from the total";
+"wallet_summary_tip_safe" = "Co-managed Safes are excluded from the total";
 "wallet_transaction_continue_count_down" = "Продолжить (%d)";
 "wallet_transaction_tip" = "Вы уверены, что хотите перевести %3$@ на сумму %2$@ на %1$@?";
 "wallet_transactions_asset_key_warning" = "Ключ актива НЕ является депозитным адресом!";
diff --git a/Mixin/Resources/zh-Hans.lproj/Localizable.strings b/Mixin/Resources/zh-Hans.lproj/Localizable.strings
@@ -1656,7 +1656,9 @@
 "wallet_pin_pay_interval_tips" = "为了您的资产安全，距离上次输入支付 PIN 的时间超过以上指定时间时，再次转账时依然需要支付 PIN";
 "wallet_pin_tops_desc" = "注意 PIN 丢失无法找回，6 位数字 PIN 是基于去中心化密钥派生协议 Throttled Identity Protocol，阅读文档以了解更多。";
 "wallet_refresh_address_failed" = "手续费已变更且刷新失败，请重试。";
-"wallet_summary_tip" = "观察钱包、隐藏的资产不计入统计";
+"wallet_summary_tip_all" = "Safe 金库、观察钱包和隐藏的资产不计入统计";
+"wallet_summary_tip_created" = "隐藏的资产不计入统计";
+"wallet_summary_tip_safe" = "共管的 Safe 金库不计入统计";
 "wallet_transaction_continue_count_down" = "继续 （%d）";
 "wallet_transaction_tip" = "确定给 %1$@ 转价值 %2$@ 的 %3$@ ？";
 "wallet_transactions_asset_key_warning" = "资产标识不是充值地址！";
diff --git a/Mixin/Resources/zh-Hant.lproj/Localizable.strings b/Mixin/Resources/zh-Hant.lproj/Localizable.strings
@@ -1656,7 +1656,9 @@
 "wallet_pin_pay_interval_tips" = "為了您的資產安全，距離上次輸入支付 PIN 的時間超過以上指定時間時，再次轉賬時依然需要支付 PIN";
 "wallet_pin_tops_desc" = "注意 PIN 丟失無法找回，6 位數字 PIN 是基於去中心化金鑰派生協議 Throttled Identity Protocol，閱讀檔案以瞭解更多。";
 "wallet_refresh_address_failed" = "手續費已變更且重新整理失敗，請重試。";
-"wallet_summary_tip" = "觀察錢包、隱藏的資產不計入統計";
+"wallet_summary_tip_all" = "Safe 金庫、觀察錢包和隱藏的資產不計入統計";
+"wallet_summary_tip_created" = "隱藏的資產不計入統計";
+"wallet_summary_tip_safe" = "共管的 Safe 金庫不計入統計";
 "wallet_transaction_continue_count_down" = "繼續 （%d）";
 "wallet_transaction_tip" = "確定給 %1$@ 轉價值 %2$@ 的 %3$@ ？";
 "wallet_transactions_asset_key_warning" = "資產標識不是充值地址！";
diff --git a/Mixin/UserInterface/Controllers/Wallet/Authentication Preview/AuthenticationPreviewViewController.swift b/Mixin/UserInterface/Controllers/Wallet/Authentication Preview/AuthenticationPreviewViewController.swift
@@ -306,7 +306,12 @@ extension AuthenticationPreviewViewController: UITableViewDataSource {
                 cell.nameLabel.text = wallet.name
                 cell.iconImageView.image = R.image.safe_vault()
                 cell.iconImageView.isHidden = false
-                cell.walletTag = .role(wallet.role.localizedDescription)
+                switch wallet.role.knownCase {
+                case .owner:
+                    cell.walletTag = .safeOwner(wallet.role.localizedDescription)
+                case .member, .none:
+                    cell.walletTag = .plain(wallet.role.localizedDescription)
+                }
             }
             return cell
         case let .safe(name, role):
@@ -315,7 +320,12 @@ extension AuthenticationPreviewViewController: UITableViewDataSource {
             cell.nameLabel.text = name
             cell.iconImageView.image = R.image.safe_vault()
             cell.iconImageView.isHidden = false
-            cell.walletTag = .role(role)
+            switch role.knownCase {
+            case .owner:
+                cell.walletTag = .safeOwner(role.localizedDescription)
+            case .member, .none:
+                cell.walletTag = .plain(role.localizedDescription)
+            }
             return cell
         case let .commonWalletReceiver(user, address):
             let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.common_wallet_receiver, for: indexPath)!
@@ -460,7 +470,7 @@ extension AuthenticationPreviewViewController {
         case safeMultisigAmount(token: MixinTokenItem, tokenAmount: String, fiatMoneyAmount: String)
         case addressReceivers(MixinTokenItem, [SafeMultisigResponse.Safe.Recipient])
         case wallet(caption: Caption, wallet: Wallet, threshold: Int32?)
-        case safe(name: String, role: String)
+        case safe(name: String, role: UnknownableEnum<SafeRole>)
         case commonWalletReceiver(user: UserItem, address: String)
         case user(title: String, user: UserItem)
         case waivedFee(token: String, fiatMoney: String, display: AmountIntent)
diff --git a/Mixin/UserInterface/Controllers/Wallet/Authentication Preview/AuthenticationPreviewWalletCell.swift b/Mixin/UserInterface/Controllers/Wallet/Authentication Preview/AuthenticationPreviewWalletCell.swift
@@ -39,7 +39,7 @@ final class AuthenticationPreviewWalletCell: UITableViewCell {
                     label.backgroundColor = R.color.market_red()!.withAlphaComponent(0.2)
                     label.textColor = R.color.market_red()
                     label.text = text
-                case .role(let text):
+                case .safeOwner(let text):
                     label.backgroundColor = UIColor(displayP3RgbValue: 0xFFAA00).withAlphaComponent(0.6)
                     label.textColor = .white
                     label.text = text
diff --git a/Mixin/UserInterface/Controllers/Wallet/Cells/WalletCell.swift b/Mixin/UserInterface/Controllers/Wallet/Cells/WalletCell.swift
@@ -123,7 +123,12 @@ final class WalletCell: UICollectionViewCell, TokenProportionRepresentableCell {
             titleLabel.text = wallet.name
             iconImageView.isHidden = false
             iconImageView.image = R.image.safe_vault()
-            tags = [.role(wallet.role.localizedDescription)]
+            switch wallet.role.knownCase {
+            case .owner:
+                tags = [.safeOwner(wallet.role.localizedDescription)]
+            case .member, .none:
+                tags = [.plain(wallet.role.localizedDescription)]
+            }
             loadProportions(
                 tokens: digest.tokens,
                 placeholder: .safeVault(chainID: wallet.chainID),
@@ -172,7 +177,7 @@ extension WalletCell {
                 label.backgroundColor = R.color.market_red()!.withAlphaComponent(0.2)
                 label.textColor = R.color.market_red()
                 label.text = text
-            case .role(let text):
+            case .safeOwner(let text):
                 label.backgroundColor = UIColor(displayP3RgbValue: 0xFFAA00).withAlphaComponent(0.6)
                 label.textColor = .white
                 label.text = text
diff --git a/Mixin/UserInterface/Controllers/Wallet/Cells/WalletSummaryValueCell.swift b/Mixin/UserInterface/Controllers/Wallet/Cells/WalletSummaryValueCell.swift
@@ -63,13 +63,15 @@ final class WalletSummaryValueCell: UICollectionViewCell {
             middleAssetWrapperView.alpha = 0
             rightAssetWrapperView.alpha = 0
         case 2:
+            leftAssetSampleImageView.image = R.image.wallet.token_sample_primary()
             leftAssetSymbolLabel.text = components[0].symbol.localized
             leftAssetPercentLabel.text = NumberFormatter.simplePercentage.string(decimal: components[0].percentage)
             middleAssetWrapperView.alpha = 1
             middleAssetSymbolLabel.text = components[1].symbol.localized
             middleAssetPercentLabel.text = NumberFormatter.simplePercentage.string(decimal: components[1].percentage)
             rightAssetWrapperView.alpha = 0
         default:
+            leftAssetSampleImageView.image = R.image.wallet.token_sample_primary()
             leftAssetSymbolLabel.text = components[0].symbol.localized
             leftAssetPercentLabel.text = NumberFormatter.simplePercentage.string(decimal: components[0].percentage)
             middleAssetWrapperView.alpha = 1
diff --git a/Mixin/UserInterface/Controllers/Wallet/Models/Wallet+UI.swift b/Mixin/UserInterface/Controllers/Wallet/Models/Wallet+UI.swift
@@ -16,42 +16,12 @@ extension Wallet {
     
 }
 
-extension Wallet {
-    
-    private var createdAt: String? {
-        switch self {
-        case .privacy:
-            nil
-        case .common(let wallet):
-            wallet.createdAt
-        case .safe(let wallet):
-            wallet.createdAt
-        }
-    }
-    
-    func compare(_ other: Wallet) -> ComparisonResult {
-        let oneCreatedAt = self.createdAt
-        let otherCreatedAt = other.createdAt
-        return switch (oneCreatedAt, otherCreatedAt) {
-        case (.none, .some):
-                .orderedAscending
-        case (.none, .none):
-                .orderedSame
-        case (.some, .none):
-                .orderedDescending
-        case let (.some(one), .some(another)):
-            one.compare(another)
-        }
-    }
-    
-}
-
 extension Wallet {
     
     enum Tag {
         case plain(String)
         case warning(String)
-        case role(String)
+        case safeOwner(String)
     }
     
 }
diff --git a/Mixin/UserInterface/Controllers/Wallet/Models/WalletSummary.swift b/Mixin/UserInterface/Controllers/Wallet/Models/WalletSummary.swift
@@ -27,24 +27,9 @@ struct WalletSummary {
     let usdValue: Decimal
     let components: [Component]
     
-    init(walletDigests: [WalletDigest]) {
+    init(digests: [WalletDigest]) {
         let maxNumberOfComponents = 3
-        
-        let wallets = walletDigests.filter { digest in
-            switch digest.wallet {
-            case .privacy, .safe:
-                true
-            case .common(let wallet):
-                switch wallet.category.knownCase {
-                case .classic, .importedMnemonic, .importedPrivateKey:
-                    true
-                case .watchAddress, .none:
-                    // Watch wallets are excluded from calculation
-                    false
-                }
-            }
-        }
-        let usdValues: [Token: Decimal] = wallets
+        let usdValues: [Token: Decimal] = digests
             .flatMap(\.tokens)
             .reduce(into: [:]) { result, digest in
                 let token = Token(digest: digest)
diff --git a/Mixin/UserInterface/Controllers/Wallet/Payment/MultisigPreviewViewController.swift b/Mixin/UserInterface/Controllers/Wallet/Payment/MultisigPreviewViewController.swift
@@ -145,7 +145,7 @@ final class MultisigPreviewViewController: AuthenticationPreviewViewController {
             rows = [
                 .safeMultisigAmount(token: token, tokenAmount: tokenValue, fiatMoneyAmount: fiatMoneyValue),
                 .info(caption: .sender, content: safe.address),
-                .safe(name: safe.name, role: safe.role.localizedDescription),
+                .safe(name: safe.name, role: safe.role),
             ]
             switch safe.operation {
             case let .transaction(transaction):
diff --git a/Mixin/UserInterface/Controllers/Wallet/WalletDisplayCategory.swift b/Mixin/UserInterface/Controllers/Wallet/WalletDisplayCategory.swift
@@ -25,6 +25,19 @@ enum WalletDisplayCategory: Int {
         }
     }
     
+    var summaryTip: String? {
+        switch self {
+        case .all:
+            R.string.localizable.wallet_summary_tip_all()
+        case .safe:
+            R.string.localizable.wallet_summary_tip_safe()
+        case .created, .imported:
+            R.string.localizable.wallet_summary_tip_created()
+        case .watching:
+            nil
+        }
+    }
+    
 }
 
 extension WalletDisplayCategory {
@@ -34,7 +47,16 @@ extension WalletDisplayCategory {
     static func categorize(digests: [WalletDigest]) -> CategorizedWalletDigests {
         // Empty arrays for category ordering
         var results: CategorizedWalletDigests = [
-            .all: digests,
+            .all: digests.filter { digest in
+                switch digest.wallet {
+                case .privacy:
+                    true
+                case .common(let wallet):
+                    wallet.category.knownCase != .watchAddress
+                case .safe(let vault):
+                    false
+                }
+            },
             .safe: [],
             .created: [],
             .imported: [],
@@ -66,7 +88,14 @@ extension WalletDisplayCategory {
         }
         for key in results.keys {
             results[key]?.sort { one, another in
-                one.wallet.compare(another.wallet) != .orderedDescending
+                switch (one.wallet, another.wallet) {
+                case (.privacy, _):
+                    true
+                case (_, .privacy):
+                    false
+                default:
+                    one.usdBalanceSum > another.usdBalanceSum
+                }
             }
         }
         return results
diff --git a/Mixin/UserInterface/Controllers/Wallet/WalletSelectorViewController.swift b/Mixin/UserInterface/Controllers/Wallet/WalletSelectorViewController.swift
diff --git a/Mixin/UserInterface/Controllers/Wallet/WalletSummaryViewController.swift b/Mixin/UserInterface/Controllers/Wallet/WalletSummaryViewController.swift
diff --git a/Mixin/UserInterface/Controllers/Web3/Web3TransferPreviewViewController.swift b/Mixin/UserInterface/Controllers/Web3/Web3TransferPreviewViewController.swift
