Feat/private key import copy

FRW.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -130,7 +130,7 @@
     {
       "identity" : "flow-swift",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/outblock/flow-swift",
+      "location" : "https://github.com/outblock/flow-swift.git",
       "state" : {
         "revision" : "50b60826c4ce18adaa151946d11d468ac1fc98dd",
         "version" : "0.3.9"
@@ -141,7 +141,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Outblock/Flow-Wallet-Kit",
       "state" : {
-        "revision" : "d1f877f15bf1574bf64d75631f0187197a665b53"
+        "branch" : "master",
+        "revision" : "ff1688af156e51ef4257a818ab906301a241508d"
       }
     },
     {
@@ -654,6 +655,15 @@
         "version" : "3.1.0"
       }
     },
+    {
+      "identity" : "wallet-core",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Outblock/wallet-core",
+      "state" : {
+        "branch" : "master",
+        "revision" : "24497b1e6f34f171ad421dae8699758bda09e78d"
+      }
+    },
     {
       "identity" : "wallet-mobile-sdk",
       "kind" : "remoteSourceControl",

FRW/App/AppDelegate.swift

@@ -45,7 +45,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil
     ) -> Bool {
         _ = LocalEnvManager.shared
-
+        SecureEnclaveMigration.start()
         FirebaseApp.configure()
 
         Analytics.setAnalyticsCollectionEnabled(true)

FRW/App/Env/Dev/EnvDefine.swift

@@ -8,8 +8,8 @@
 import Foundation
 
 let AppGroupName = "group.com.flowfoundation.wallet.dev"
+let AppBundleName = "com.flowfoundation.wallet.dev"
 let isDevModel = true
-
 let FirstFavNFTImageURL = "FirstFavNFTImageURL"
 
 func groupUserDefaults() -> UserDefaults? {

FRW/App/Env/Prod/EnvDefine.swift

@@ -8,6 +8,7 @@
 import Foundation
 
 let AppGroupName = "group.com.flowfoundation.wallet"
+let AppBundleName = "com.flowfoundation.wallet"
 let isDevModel = false
 let FirstFavNFTImageURL = "FirstFavNFTImageURL"
 

FRW/App/Env/Prod/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.11</string>
+	<string>2.3.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

FRW/Foundation/Base/FlowLog.swift

@@ -63,6 +63,21 @@ extension FlowLog {
     }
 }
 
+// MARK: - FlowLog.Prefix
+
+extension FlowLog {
+    enum Prefix {
+        case cadence
+        case netword
+        case ui
+        case walletconnect
+
+        case main
+        case evm
+        case linked
+    }
+}
+
 // MARK: Levels
 
 extension FlowLog {

FRW/Foundation/Model/AddressBookInfoModel.swift

@@ -47,6 +47,17 @@ struct Contact: Codable, Identifiable {
         case flow
         case evm
         case link
+
+        var trackName: String {
+            switch self {
+            case .flow:
+                "flow"
+            case .evm:
+                "coa"
+            case .link:
+                "child"
+            }
+        }
     }
 
     let address, avatar, contactName: String?

FRW/Modules/Browser/Handler/JSMessageHandler.swift

@@ -89,7 +89,8 @@ extension JSMessageHandler {
             }
 
             guard let processingAuthzTransaction = processingAuthzTransaction,
-                  let data = try? JSONEncoder().encode(processingAuthzTransaction) else {
+                  let data = try? JSONEncoder().encode(processingAuthzTransaction)
+            else {
                 log.error("no processingAuthzTransaction")
                 return
             }
@@ -103,24 +104,6 @@ extension JSMessageHandler {
                 data: data
             )
             TransactionManager.shared.newTransaction(holder: holder)
-            Task {
-                do {
-                    let result = try await id.onceSealed()
-                    let voucher = authzResponse?.body.voucher
-                    EventTrack.Transaction
-                        .flowSigned(
-                            cadence: hashCadence(
-                                cadence: voucher?.cadence?
-                                    .toHexEncodedString() ?? ""
-                            ),
-                            txId: tid,
-                            authorizers: voucher?.authorizers ?? [],
-                            proposer: voucher?.proposalKey.address ?? "",
-                            payer: voucher?.payer ?? "",
-                            success: !result.isFailed
-                        )
-                } catch {}
-            }
 
             if let linkAccountVM = processingLinkAccountViewModel {
                 linkAccountVM.onTxID(id)
@@ -129,16 +112,6 @@ extension JSMessageHandler {
             log.error("invalid message", context: error)
         }
     }
-
-    private func hashCadence(cadence: String) -> String {
-        guard !cadence.isEmpty else {
-            return ""
-        }
-        let data = Data(cadence.utf8)
-        let hash = SHA256.hash(data: data)
-        let hashString = hash.compactMap { String(format: "%02x", $0) }.joined()
-        return hashString
-    }
 }
 
 extension JSMessageHandler {

FRW/Modules/Login/ChooseAccountView.swift

@@ -71,7 +71,8 @@ struct ChooseAccountView: RouteableView {
     var listView: some View {
         ScrollView(.vertical, showsIndicators: false) {
             LazyVStack(spacing: 12) {
-                ForEach(vm.items, id: \.username) { item in
+                ForEach(0 ..< vm.items.count, id: \.self) { index in
+                    let item = vm.items[index]
                     Button {
                         vm.restoreAccountAction(item: item)
                     } label: {

FRW/Modules/Login/ImportAccountsView.swift

@@ -0,0 +1,193 @@
+//
+//  ImportAccountsView.swift
+//  FRW
+//
+//  Created by cat on 2024/8/19.
+//
+
+import Flow
+import SwiftUI
+import SwiftUIX
+
+// MARK: - ImportAccountsViewModel
+
+class ImportAccountsViewModel: ObservableObject {
+    // MARK: Lifecycle
+
+    init(list: [Flow.Account], onSelectAddress: @escaping (Flow.Account) -> Void) {
+        self.list = list
+        self.onSelectAddress = onSelectAddress
+    }
+
+    // MARK: Internal
+
+    var list: [Flow.Account] = []
+    var onSelectAddress: (Flow.Account) -> Void
+}
+
+// MARK: - ImportAccountsView
+
+struct ImportAccountsView: RouteableView, PresentActionDelegate {
+    // MARK: Lifecycle
+
+    init(viewModel: ImportAccountsViewModel) {
+        _viewModel = StateObject(wrappedValue: viewModel)
+    }
+
+    // MARK: Internal
+
+    var changeHeight: (() -> Void)?
+
+    @StateObject
+    var viewModel: ImportAccountsViewModel
+
+    var title: String {
+        ""
+    }
+
+    var body: some View {
+        VStack(spacing: 0) {
+            ZStack(alignment: .topTrailing) {
+                HStack(alignment: .center) {
+                    Spacer()
+                    Text(headerTitle)
+                        .font(.inter(size: 24, weight: .bold))
+                        .foregroundStyle(
+                            viewModel.list.isEmpty ? Color.Theme.Accent.orange : Color
+                                .Theme.Accent.green
+                        )
+                    Spacer()
+                }
+
+                Button {
+                    onClose()
+                } label: {
+                    Image("icon_close_circle_gray")
+                        .resizable()
+                        .frame(width: 24, height: 24)
+                        .padding(4)
+                        .offset(y: -6)
+                }
+            }
+            .frame(height: 40)
+            .padding(.top, 18)
+
+            Text("choose_account_import".localized)
+                .font(.inter(size: 14))
+                .multilineTextAlignment(.center)
+                .foregroundStyle(Color.Theme.Text.black3)
+                .padding(.top, 20)
+                .visibility(viewModel.list.isEmpty ? .gone : .visible)
+
+            ScrollView(showsIndicators: false) {
+                VStack {
+                    ForEach(viewModel.list.indices, id: \.self) { index in
+                        let account = viewModel.list[index]
+                        let isSelected = (account.address.hex == selectedAccount?.address.hex)
+                        ImportAccountsView
+                            .Item(account: account, isSelected: isSelected) { itemAccount in
+                                self.selectedAccount = itemAccount
+                            }
+                    }
+                }
+            }
+            .padding(.top, 28)
+            .visibility(viewModel.list.isEmpty ? .gone : .visible)
+
+            Spacer()
+            Text("import_no_account_found".localized)
+                .font(.inter(size: 14))
+                .multilineTextAlignment(.center)
+                .foregroundStyle(Color.Theme.Text.black)
+                .padding(.horizontal, 27)
+                .visibility(viewModel.list.isEmpty ? .visible : .gone)
+
+            Spacer()
+
+            Button {
+                if let account = selectedAccount {
+                    onClose()
+                    viewModel.onSelectAddress(account)
+                }
+            } label: {
+                Text(buttonTitle())
+                    .font(.inter(size: 16, weight: .semibold))
+                    .frame(maxWidth: .infinity)
+                    .frame(height: 54)
+                    .foregroundColor(Color.LL.frontColor)
+                    .background(selectedAccount == nil ? Color.LL.disable : Color.LL.rebackground)
+                    .cornerRadius(16)
+            }
+            .disabled(selectedAccount == nil)
+            .padding(.bottom, 42)
+        }
+        .padding(.horizontal, 18)
+        .backgroundFill(.Theme.Background.bg2)
+        .cornerRadius([.topLeading, .topTrailing], 16)
+        .applyRouteable(self)
+        .ignoresSafeArea()
+    }
+
+    var headerTitle: String {
+        if viewModel.list.isEmpty {
+            return "no_account_found".localized
+        }
+        return "x_account_found_title".localized("\(viewModel.list.count)")
+    }
+
+    func onClose() {
+        Router.dismiss()
+    }
+
+    // MARK: Private
+
+    @State
+    private var selectedAccount: Flow.Account?
+
+    private func buttonTitle() -> String {
+        if selectedAccount == nil {
+            return "import_btn_text".localized.uppercasedFirstLetter()
+        }
+        return "import_x_wallet".localized("1")
+    }
+}
+
+// MARK: ImportAccountsView.Item
+
+extension ImportAccountsView {
+    struct Item: View {
+        let account: Flow.Account
+        var isSelected: Bool = false
+        var onClick: (Flow.Account) -> Void
+
+        var body: some View {
+            HStack {
+                Text(account.address.hex)
+                    .font(.inter(size: 14, weight: isSelected ? .semibold : .regular))
+                    .truncationMode(.middle)
+                    .lineLimit(1)
+                    .foregroundStyle(Color.Theme.Text.black)
+
+                Spacer()
+
+                Image(isSelected ? "icon_check_rounde_1" : "icon_check_rounde_0")
+                    .resizable()
+                    .frame(width: 16, height: 16)
+            }
+            .padding(.horizontal, 24)
+            .frame(height: 56)
+            .contentShape(Rectangle())
+            .background(isSelected ? Color.Theme.Background.pureWhite : .clear)
+            .onTapGesture {
+                onClick(account)
+            }
+            .cornerRadius(16)
+        }
+    }
+}
+
+#Preview {
+    ImportAccountsView(viewModel: ImportAccountsViewModel(list: [], onSelectAddress: { _ in
+
+    }))
+}