feat: update “Import account” ui

.gitignore

@@ -100,3 +100,4 @@ iOSInjectionProject/
 .DS_Store
 /FRW/App/Env/Dev/ServiceConfig.plist
 /FRW/App/Env/Prod/ServiceConfig.plist
+/.cursor

FRW.xcodeproj/xcshareddata/xcschemes/FlowWallet-dev.xcscheme

@@ -33,6 +33,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = "en"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -49,6 +50,13 @@
             ReferencedContainer = "container:FRW.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <AdditionalOptions>
+         <AdditionalOption
+            key = "NSZombieEnabled"
+            value = "YES"
+            isEnabled = "YES">
+         </AdditionalOption>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

FRW/App/AppDelegate.swift

@@ -186,6 +186,8 @@ extension AppDelegate {
         if UserManager.shared.isLoggedIn {
             DeviceManager.shared.updateDevice()
         }
+
+        UserManager.shared.start()
     }
 
     private func commonConfig() {

FRW/Foundation/Model/AccountInfoProtocol.swift

@@ -0,0 +1,85 @@
+//
+//  AccountInfoProtocol.swift
+//  FRW
+//
+//  Created by cat on 5/29/25.
+//
+
+import FlowWalletKit
+import SwiftUI
+
+protocol AccountInfoProtocol {
+    var infoName: String { get }
+    var infoAddress: String { get }
+    var accountType: FWAccount.AccountType { get }
+
+    var walletMetadata: WalletUserProfile.User { get }
+
+    func avatar(isSelected: Bool, subAvatar: AvatarSource?) -> AvatarView
+}
+
+extension AccountInfoProtocol {
+    var walletMetadata: WalletUserProfile.User {
+        WalletManager.shared.walletAccount.readInfo(at: infoAddress)
+    }
+}
+
+// MARK: Account
+
+extension FlowWalletKit.Account: AccountInfoProtocol {
+    func avatar(isSelected: Bool, subAvatar: AvatarSource?) -> AvatarView {
+        AvatarView(mainAvatar: .user(walletMetadata), subAvatar: subAvatar, backgroundColor: Color.Summer.cards, isSelected: isSelected)
+    }
+
+    var infoName: String {
+        walletMetadata.name
+    }
+
+    var infoAddress: String {
+        hexAddr
+    }
+
+    var accountType: FWAccount.AccountType {
+        .main
+    }
+}
+
+// MARK: COA
+
+extension FlowWalletKit.COA: AccountInfoProtocol {
+    func avatar(isSelected: Bool, subAvatar: AvatarSource?) -> AvatarView {
+        AvatarView(mainAvatar: .user(walletMetadata), subAvatar: subAvatar, backgroundColor: Color.Summer.cards, isSelected: isSelected)
+    }
+
+    var infoName: String {
+        walletMetadata.name
+    }
+
+    var infoAddress: String {
+        address
+    }
+
+    var accountType: FWAccount.AccountType {
+        .coa
+    }
+}
+
+// MARK: FlowWalletKit.Account of AccountInfoProtocol
+
+extension FlowWalletKit.ChildAccount: AccountInfoProtocol {
+    func avatar(isSelected: Bool, subAvatar: AvatarSource?) -> AvatarView {
+        AvatarView(mainAvatar: .url(icon ?? AppPlaceholder.imageURL), subAvatar: subAvatar, isSelected: isSelected)
+    }
+
+    var infoName: String {
+        name ?? "unknown"
+    }
+
+    var infoAddress: String {
+        address.hexAddr
+    }
+
+    var accountType: FWAccount.AccountType {
+        .child
+    }
+}

FRW/Foundation/Model/AccountModel.swift

@@ -0,0 +1,56 @@
+//
+//  AccountModel.swift
+//  FRW
+//
+//  Created by cat on 6/3/25.
+//
+
+import Foundation
+
+struct AccountModel: Equatable {
+    static func == (lhs: AccountModel, rhs: AccountModel) -> Bool {
+        lhs.account.infoAddress == rhs.account.infoAddress
+    }
+
+    var account: any AccountInfoProtocol
+    /// not nil when account type is coa or child,other is nil
+    var mainAccount: (any AccountInfoProtocol)?
+    var flowCount: String
+    var nftCount: UInt
+}
+
+// MARK: - UI
+
+extension AccountModel {
+    var hideFlow: Bool {
+        account.accountType == .child
+    }
+
+    var showAmount: String {
+        var amount = ""
+        let flowCount = Double(flowCount) ?? 0
+        if flowCount >= 0 {
+            amount += "\(flowCount.formatCurrencyString()) Flow" + " | "
+        }
+        if nftCount >= 0 {
+            amount += "\(nftCount) NFT's"
+        }
+        return amount
+    }
+
+    func isSelected(_ address: String) -> Bool {
+        account.infoAddress == address
+    }
+
+    var isMain: Bool {
+        account.accountType == .main
+    }
+
+    var isCoa: Bool {
+        account.accountType == .coa
+    }
+
+    var isChild: Bool {
+        account.accountType == .child
+    }
+}

FRW/Foundation/Model/AddressBookInfoModel.swift

@@ -67,7 +67,7 @@ struct Contact: Codable, Identifiable {
     let domain: Domain?
     let id: Int
     let username: String?
-    var user: WalletAccount.User? = nil
+    var user: WalletUserProfile.User? = nil
     var walletType: WalletType? = .flow
 
     var needShowLocalAvatar: Bool {

FRW/Foundation/Model/MockAccountInfo.swift

@@ -0,0 +1,49 @@
+import SwiftUI
+
+struct MockAccountInfo: AccountInfoProtocol {
+    var infoName: String
+    var infoAddress: String
+    var accountType: FWAccount.AccountType
+    var walletMetadata: WalletUserProfile.User
+
+    func avatar(isSelected: Bool, subAvatar: AvatarSource?) -> AvatarView {
+        AvatarView(mainAvatar: .system("person.crop.circle.fill"), subAvatar: subAvatar, backgroundColor: Color.Summer.cards, isSelected: isSelected)
+    }
+}
+
+extension MockAccountInfo {
+    static func mockSamples() -> [MockAccountInfo] {
+        [
+            MockAccountInfo(
+                infoName: "mainAccount",
+                infoAddress: "0x1234567890abcdef",
+                accountType: .main,
+                walletMetadata: WalletUserProfile.User(emoji: .koala, address: "0x1234567890abcdef")
+            ),
+            MockAccountInfo(
+                infoName: "Child",
+                infoAddress: "0xabcdef1234567890",
+                accountType: .child,
+                walletMetadata: WalletUserProfile.User(emoji: .lion, address: "0xabcdef1234567890")
+            ),
+            MockAccountInfo(
+                infoName: "EVM",
+                infoAddress: "0x8e5b4a8e5b4a8e5b4a8e5b4a8e5b4a8e5b4a8e5b",
+                accountType: .coa,
+                walletMetadata: WalletUserProfile.User(emoji: .avocado, address: "0x8e5b4a8e5b4a8e5b4a8e5b4a8e5b4a8e5b4a8e5b")
+            ),
+        ]
+    }
+}
+
+extension AccountModel {
+    /// 生成一组典型的 AccountModel mock 测试数据
+    static func mockSamples() -> [AccountModel] {
+        let accounts = MockAccountInfo.mockSamples()
+        return [
+            AccountModel(account: accounts[0], mainAccount: nil, flowCount: "123.45", nftCount: 7),
+            AccountModel(account: accounts[1], mainAccount: accounts[0], flowCount: "0.00", nftCount: 0),
+            AccountModel(account: accounts[2], mainAccount: accounts[0], flowCount: "999.99", nftCount: 99),
+        ]
+    }
+}

FRW/Foundation/Model/UserModel.swift

@@ -45,7 +45,7 @@ struct UserInfo: Codable {
 
     func toContactWithCurrentUserAddress() -> Contact {
         let address = WalletManager.shared.getPrimaryWalletAddress()
-        var user: WalletAccount.User?
+        var user: WalletUserProfile.User?
         if let addr = address {
             user = WalletManager.shared.walletAccount.readInfo(at: addr)
         }

FRW/Modules/Alert/EmptyKeychainAlert.swift

@@ -26,7 +26,7 @@ extension AlertViewController {
                 ),
                 buttons: [
                     AlertView.ButtonItem(type: .primaryAction, title: "restore_wallet".localized, action: {
-                        Router.route(to: RouteMap.RestoreLogin.restoreList)
+                        Router.route(to: RouteMap.RestoreLogin.importAccountList)
                     }),
 
                     AlertView.ButtonItem(type: .normal, title: "tutorial_restore".localized, action: {

FRW/Modules/Browser/View/BrowserAuthnView.swift

@@ -186,7 +186,7 @@ struct BrowserAuthnView: View {
         .cornerRadius(12)
     }
 
-    var user: WalletAccount.User {
+    var user: WalletUserProfile.User {
         WalletManager.shared.walletAccount.readInfo(at: vm.walletAddress ?? "")
     }
 

FRW/Modules/EVM/View/EVMTagView.swift

@@ -7,36 +7,22 @@
 
 import SwiftUI
 
-// MARK: - EVMTagView
-
-struct EVMTagView: View {
-    var body: some View {
-        Text("EVM")
-            .font(.inter(size: 9))
-            .kerning(0.144)
-            .foregroundStyle(Color.white)
-            .frame(width: 36, height: 16)
-            .background(Color.Theme.evm)
-            .cornerRadius(8)
-    }
-}
-
 // MARK: - TagView
 
 struct TagView: View {
+    var size: CGFloat = 8
     var type: Contact.WalletType = .flow
 
     var body: some View {
         HStack {
             if type != .flow {
                 Text(title)
-                    .font(.inter(size: 9))
-                    .kerning(0.144)
+                    .font(.inter(size: size))
                     .foregroundStyle(Color.white)
-                    .frame(height: 16)
-                    .padding(.horizontal, 8)
+                    .padding(.horizontal, 4)
+                    .padding(.vertical, 2)
                     .background(BGColor)
-                    .cornerRadius(8)
+                    .clipShape(Capsule())
             }
         }
     }
@@ -65,5 +51,5 @@ struct TagView: View {
 }
 
 #Preview {
-    TagView()
+    TagView(type: .evm)
 }