Add "Add to Contacts" feature from transaction and transfer screens

- Add context menu option to add recipient address to contacts
- Reuse existing ContactsScene with Mode enum for add address flow
- Hide "Add to Contact" option when address already has a name
- Add ContactServiceTestKit for testing
- Update localization

Author: DRadmir

Features/Contacts/Package.swift

@@ -53,8 +53,8 @@ let package = Package(
                 "Primitives",
                 "PrimitivesComponents",
                 .product(name: "PrimitivesTestKit", package: "Primitives"),
-                .product(name: "StoreTestKit", package: "Store"),
                 .product(name: "ContactService", package: "FeatureServices"),
+                .product(name: "ContactServiceTestKit", package: "FeatureServices"),
             ]
         ),
     ]

Features/Contacts/Sources/Scenes/ContactsScene.swift

@@ -21,7 +21,7 @@ public struct ContactsScene: View {
             ForEach(model.contacts) { contact in
                 NavigationCustomLink(
                     with: ListItemView(model: model.listItemModel(for: contact)),
-                    action: { model.isPresentingContact = contact }
+                    action: { model.onSelectContact(contact) }
                 )
             }
             .onDelete(perform: model.deleteContacts)
@@ -39,27 +39,16 @@ public struct ContactsScene: View {
         .navigationTitle(model.title)
         .toolbar {
             ToolbarItem(placement: .primaryAction) {
-                Button {
-                    model.isPresentingAddContact = true
-                } label: {
+                Button(action: model.onSelectAddContact) {
                     Images.System.plus
                 }
             }
         }
-        .sheet(isPresented: $model.isPresentingAddContact) {
+        .sheet(item: $model.isPresentingContact) {
             ManageContactNavigationStack(
                 model: ManageContactViewModel(
                     service: model.service,
-                    mode: .add,
-                    onComplete: model.onAddContactComplete
-                )
-            )
-        }
-        .sheet(item: $model.isPresentingContact) { contact in
-            ManageContactNavigationStack(
-                model: ManageContactViewModel(
-                    service: model.service,
-                    mode: .edit(contact),
+                    mode: $0,
                     onComplete: model.onManageContactComplete
                 )
             )

Features/Contacts/Sources/Scenes/ManageContactNavigationStack.swift

@@ -4,15 +4,15 @@ import SwiftUI
 import Primitives
 import Components
 
-struct ManageContactNavigationStack: View {
+public struct ManageContactNavigationStack: View {
 
     @State private var model: ManageContactViewModel
 
-    init(model: ManageContactViewModel) {
+    public init(model: ManageContactViewModel) {
         _model = State(initialValue: model)
     }
 
-    var body: some View {
+    public var body: some View {
         NavigationStack {
             ManageContactScene(model: $model)
                 .toolbarDismissItem(type: .close, placement: .cancellationAction)

Features/Contacts/Sources/Scenes/ManageContactScene.swift

@@ -111,7 +111,9 @@ extension ManageContactScene {
     private func onSave() {
         focusedField = .none
         model.onSave()
-        dismiss()
+        if model.shouldDismissOnSave {
+            dismiss()
+        }
     }
 }
 

Features/Contacts/Sources/Types/AddAddressInput.swift

@@ -0,0 +1,23 @@
+// Copyright (c). Gem Wallet. All rights reserved.
+
+import Foundation
+import Primitives
+
+public struct AddAddressInput: Sendable {
+    public let chain: Chain
+    public let address: String
+    public let memo: String?
+    public let name: String?
+
+    public init(
+        chain: Chain,
+        address: String,
+        memo: String? = nil,
+        name: String? = nil
+    ) {
+        self.chain = chain
+        self.address = address
+        self.memo = memo
+        self.name = name
+    }
+}

Features/Contacts/Sources/Types/ManageContactViewModel+Mode.swift

@@ -0,0 +1,29 @@
+// Copyright (c). Gem Wallet. All rights reserved.
+
+import Foundation
+import Primitives
+
+extension ManageContactViewModel {
+    public enum Mode: Identifiable {
+        case add
+        case create(AddAddressInput)
+        case append(ContactData)
+        case edit(ContactData)
+
+        public var id: String {
+            switch self {
+            case .add: "add"
+            case .create(let input): "create-\(input.chain.rawValue)-\(input.address)"
+            case .append(let contactData): "append-\(contactData.contact.id)"
+            case .edit(let contactData): "edit-\(contactData.contact.id)"
+            }
+        }
+
+        var contact: Contact? {
+            switch self {
+            case .add, .create: nil
+            case .append(let contactData), .edit(let contactData): contactData.contact
+            }
+        }
+    }
+}

Features/Contacts/Sources/ViewModels/ContactsViewModel.swift

@@ -11,16 +11,23 @@ import Localization
 @Observable
 @MainActor
 public final class ContactsViewModel {
+
+    public enum Mode {
+        case view
+        case addAddress(AddAddressInput, onComplete: () -> Void)
+    }
+
     let service: ContactService
+    let mode: Mode
 
     public let query: ObservableQuery<ContactsRequest>
     var contacts: [ContactData] { query.value }
 
-    var isPresentingContact: ContactData?
-    var isPresentingAddContact = false
+    var isPresentingContact: ManageContactViewModel.Mode?
 
-    public init(service: ContactService) {
+    public init(service: ContactService, mode: Mode) {
         self.service = service
+        self.mode = mode
         self.query = ObservableQuery(ContactsRequest(), initialValue: [])
     }
 
@@ -38,12 +45,37 @@ public final class ContactsViewModel {
         )
     }
 
-    func onAddContactComplete() {
-        isPresentingAddContact = false
+    func onSelectAddContact() {
+        switch mode {
+        case .view:
+            isPresentingContact = .add
+        case .addAddress(let input, _):
+            isPresentingContact = .create(input)
+        }
+    }
+
+    func onSelectContact(_ contact: ContactData) {
+        switch mode {
+        case .view:
+            isPresentingContact = .edit(contact)
+        case .addAddress(let input, _):
+            let newAddress = ContactAddress.new(
+                contactId: contact.contact.id,
+                chain: input.chain,
+                address: input.address,
+                memo: input.memo
+            )
+            isPresentingContact = .append(ContactData(contact: contact.contact, addresses: contact.addresses + [newAddress]))
+        }
     }
 
     func onManageContactComplete() {
-        isPresentingContact = nil
+        switch mode {
+        case .view:
+            isPresentingContact = nil
+        case .addAddress(_, let onComplete):
+            onComplete()
+        }
     }
 
     func deleteContacts(at offsets: IndexSet) {

Features/Contacts/Sources/ViewModels/ManageContactViewModel.swift

@@ -17,18 +17,6 @@ import Formatters
 @MainActor
 public final class ManageContactViewModel {
 
-    public enum Mode {
-        case add
-        case edit(ContactData)
-
-        var contact: Contact? {
-            switch self {
-            case .add: nil
-            case .edit(let contactData): contactData.contact
-            }
-        }
-    }
-
     private let service: ContactService
     private let mode: Mode
     private let onComplete: (() -> Void)?
@@ -58,7 +46,18 @@ public final class ManageContactViewModel {
         switch mode {
         case .add:
             self.contactId = UUID().uuidString
-        case .edit(let contactData):
+        case .create(let input):
+            self.contactId = UUID().uuidString
+            self.nameInputModel.text = input.name ?? ""
+            self.addresses = [
+                ContactAddress.new(
+                    contactId: contactId,
+                    chain: input.chain,
+                    address: input.address,
+                    memo: input.memo
+                )
+            ]
+        case .append(let contactData), .edit(let contactData):
             self.contactId = contactData.contact.id
             self.nameInputModel.text = contactData.contact.name
             self.description = contactData.contact.description ?? ""
@@ -70,8 +69,8 @@ public final class ManageContactViewModel {
 
     var isAddMode: Bool {
         switch mode {
-        case .add: true
-        case .edit: false
+        case .add, .create: true
+        case .append, .edit: false
         }
     }
     var buttonTitle: String { Localized.Common.save }
@@ -80,6 +79,13 @@ public final class ManageContactViewModel {
     var contactSectionTitle: String { Localized.Contacts.contact }
     var addressesSectionTitle: String { Localized.Contacts.addresses }
 
+    var shouldDismissOnSave: Bool {
+        switch mode {
+        case .add, .edit: true
+        case .create, .append: false
+        }
+    }
+
     var buttonState: ButtonState {
         guard nameInputModel.isValid,
               nameInputModel.text.isNotEmpty,
@@ -126,8 +132,8 @@ public final class ManageContactViewModel {
     func onSave() {
         do {
             switch mode {
-            case .add: try service.addContact(currentContact, addresses: addresses)
-            case .edit: try service.updateContact(currentContact, addresses: addresses)
+            case .add, .create: try service.addContact(currentContact, addresses: addresses)
+            case .append, .edit: try service.updateContact(currentContact, addresses: addresses)
             }
             onComplete?()
         } catch {

Features/Contacts/Tests/ContactsTests/ManageContactViewModelTests.swift

@@ -3,8 +3,8 @@
 import Testing
 import Primitives
 import PrimitivesTestKit
-import StoreTestKit
 import ContactService
+import ContactServiceTestKit
 import Components
 
 @testable import Contacts
@@ -48,7 +48,7 @@ struct ManageContactViewModelTests {
 extension ManageContactViewModel {
     static func mock(mode: Mode) -> ManageContactViewModel {
         ManageContactViewModel(
-            service: ContactService(store: .mock(), addressStore: .mock()),
+            service: .mock(),
             mode: mode,
             onComplete: nil
         )

Features/Transactions/Package.swift

@@ -24,6 +24,7 @@ let package = Package(
         .package(name: "ChainServices", path: "../../Packages/ChainServices"),
         .package(name: "FeatureServices", path: "../../Packages/FeatureServices"),
         .package(name: "InfoSheet", path: "../InfoSheet"),
+        .package(name: "Contacts", path: "../Contacts"),
     ],
     targets: [
         .target(
@@ -39,7 +40,9 @@ let package = Package(
                 .product(name: "TransactionsService", package: "FeatureServices"),
                 .product(name: "WalletService", package: "FeatureServices"),
                 "Preferences",
-                "InfoSheet"
+                "InfoSheet",
+                "Contacts",
+                .product(name: "ContactService", package: "FeatureServices")
             ],
             path: "Sources"
         ),
@@ -48,6 +51,8 @@ let package = Package(
             dependencies: [
                 .product(name: "PrimitivesTestKit", package: "Primitives"),
                 .product(name: "PreferencesTestKit", package: "Preferences"),
+                .product(name: "ContactService", package: "FeatureServices"),
+                .product(name: "ContactServiceTestKit", package: "FeatureServices"),
                 "Transactions",
                 "PrimitivesComponents"
             ]