Merge pull request #1365 from LukasKorba/1358-build-Request-ZEC-flow

[#1358] build Request ZEC flow
Electric-Coin-Company · Oct 3, 2024 · b9af5a0 · b9af5a0
2 parents 686d482 + 510b4c0
commit b9af5a0
Show file tree

Hide file tree

Showing 54 changed files with 1,547 additions and 287 deletions.
diff --git a/modules/.swiftpm/xcode/xcshareddata/xcschemes/DeeplinkWarning.xcscheme b/modules/.swiftpm/xcode/xcshareddata/xcschemes/DeeplinkWarning.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1600"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DeeplinkWarning"
+               BuildableName = "DeeplinkWarning"
+               BlueprintName = "DeeplinkWarning"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DeeplinkWarning"
+            BuildableName = "DeeplinkWarning"
+            BlueprintName = "DeeplinkWarning"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/modules/Package.swift b/modules/Package.swift
@@ -24,6 +24,7 @@ let package = Package(
         .library(name: "DatabaseFiles", targets: ["DatabaseFiles"]),
         .library(name: "Date", targets: ["Date"]),
         .library(name: "Deeplink", targets: ["Deeplink"]),
+        .library(name: "DeeplinkWarning", targets: ["DeeplinkWarning"]),
         .library(name: "DeleteWallet", targets: ["DeleteWallet"]),
         .library(name: "DerivationTool", targets: ["DerivationTool"]),
         .library(name: "DiskSpaceChecker", targets: ["DiskSpaceChecker"]),
@@ -88,9 +89,11 @@ let package = Package(
         .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.5.4"),
         .package(url: "https://github.com/pointfreeco/swift-url-routing", from: "0.6.2"),
         .package(url: "https://github.com/zcash-hackworks/MnemonicSwift", from: "2.2.4"),
-        .package(url: "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk", from: "2.2.3"),
+//        .package(url: "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk", from: "2.2.3"),
+        .package(url: "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk", branch: "fix/note_commitment_tree_conflict"),
         .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.27.0"),
-        .package(url: "https://github.com/flexa/flexa-ios.git", from: "1.0.2")
+        .package(url: "https://github.com/flexa/flexa-ios.git", from: "1.0.3"),
+        .package(url: "https://github.com/pacu/zcash-swift-payment-uri", from: "0.1.0-beta.9")
     ],
     targets: [
         .target(
@@ -252,6 +255,15 @@ let package = Package(
             ],
             path: "Sources/Dependencies/Deeplink"
         ),
+        .target(
+            name: "DeeplinkWarning",
+            dependencies: [
+                "Generated",
+                "UIComponents",
+                .product(name: "ComposableArchitecture", package: "swift-composable-architecture")
+            ],
+            path: "Sources/Features/DeeplinkWarning"
+        ),
         .target(
             name: "DeleteWallet",
             dependencies: [
@@ -520,7 +532,8 @@ let package = Package(
                 "Utils",
                 "ZcashSDKEnvironment",
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
-                .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
+                .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk"),
+                .product(name: "ZcashPaymentURI", package: "zcash-swift-payment-uri")
             ],
             path: "Sources/Features/RequestZec"
         ),
@@ -551,6 +564,7 @@ let package = Package(
                 "CrashReporter",
                 "DatabaseFiles",
                 "Deeplink",
+                "DeeplinkWarning",
                 "DerivationTool",
                 "DiskSpaceChecker",
                 "ExchangeRate",
@@ -571,6 +585,7 @@ let package = Package(
                 "ServerSetup",
                 "Tabs",
                 "UIComponents",
+                "URIParser",
                 "UserDefaults",
                 "UserPreferencesStorage",
                 "Utils",
@@ -605,6 +620,7 @@ let package = Package(
                 "UIComponents",
                 "Utils",
                 "ZcashSDKEnvironment",
+                .product(name: "ZcashPaymentURI", package: "zcash-swift-payment-uri"),
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
                 .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
             ],
@@ -760,6 +776,7 @@ let package = Package(
         .target(
             name: "Tabs",
             dependencies: [
+                "AddressBook",
                 "AddressDetails",
                 "BalanceBreakdown",
                 "CurrencyConversionSetup",
@@ -813,6 +830,8 @@ let package = Package(
             name: "URIParser",
             dependencies: [
                 "DerivationTool",
+                "Models",
+                .product(name: "ZcashPaymentURI", package: "zcash-swift-payment-uri"),
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
                 .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
             ],

diff --git a/modules/Sources/Dependencies/AddressBookClient/AddressBookLiveKey.swift b/modules/Sources/Dependencies/AddressBookClient/AddressBookLiveKey.swift
@@ -39,18 +39,19 @@ extension AddressBookClient: DependencyKey {
                 }
 
                 // contacts haven't been loaded from the remote storage yet, do it
-                do {
-                    let data = try await remoteStorage.loadAddressBookContacts()
-
-                    let storedContacts = try AddressBookClient.decryptData(data)
-                    latestKnownContacts.value = storedContacts
-
-                    return storedContacts
-                } catch RemoteStorageClient.RemoteStorageError.fileDoesntExist {
-                    return []
-                } catch {
-                    throw error
-                }
+//                do {
+//                    let data = try await remoteStorage.loadAddressBookContacts()
+//
+//                    let storedContacts = try AddressBookClient.decryptData(data)
+//                    latestKnownContacts.value = storedContacts
+//
+//                    return storedContacts
+//                } catch RemoteStorageClient.RemoteStorageError.fileDoesntExist {
+//                    return []
+//                } catch {
+//                    throw error
+//                }
+                return []
             },
             storeContact: {
                 var contacts = latestKnownContacts.value ?? []
@@ -63,7 +64,8 @@ extension AddressBookClient: DependencyKey {
                 contacts.append($0)
 
                 // push encrypted data to the remote storage
-                try await remoteStorage.storeAddressBookContacts(AddressBookClient.encryptContacts(contacts))
+                //try await remoteStorage.storeAddressBookContacts(AddressBookClient.encryptContacts(contacts))
+                // TODO: FIXME
 
                 // update the latest known contacts
                 latestKnownContacts.value = contacts
@@ -81,7 +83,7 @@ extension AddressBookClient: DependencyKey {
                 contacts.remove($0)
 
                 // push encrypted data to the remote storage
-                try await remoteStorage.storeAddressBookContacts(AddressBookClient.encryptContacts(contacts))
+                //try await remoteStorage.storeAddressBookContacts(AddressBookClient.encryptContacts(contacts))
 
                 // update the latest known contacts
                 latestKnownContacts.value = contacts

diff --git a/modules/Sources/Dependencies/NumberFormatter/NumberFormatterInterface.swift b/modules/Sources/Dependencies/NumberFormatter/NumberFormatterInterface.swift
@@ -19,4 +19,5 @@ extension DependencyValues {
 public struct NumberFormatterClient {
     public var string: (NSDecimalNumber) -> String?
     public var number: (String) -> NSNumber?
+    public var convertUSToLocale: (String) -> String?
 }
diff --git a/modules/Sources/Dependencies/NumberFormatter/NumberFormatterLiveKey.swift b/modules/Sources/Dependencies/NumberFormatter/NumberFormatterLiveKey.swift
@@ -14,8 +14,17 @@ extension NumberFormatterClient: DependencyKey {
 
     public static func live(numberFormatter: NumberFormatter = NumberFormatter.zcashNumberFormatter) -> Self {
         Self(
-            string: { numberFormatter.string(from: $0) },
-            number: { numberFormatter.number(from: $0) }
+            string: {
+                numberFormatter.string(from: $0)
+            },
+            number: {
+                numberFormatter.number(from: $0)
+            },
+            convertUSToLocale: {
+                let number = NumberFormatter.zcashUSNumberFormatter.number(from: $0)
+                let decimalNumber = NSDecimalNumber(decimal: number?.decimalValue ?? 0)
+                return numberFormatter.string(from: decimalNumber)
+            }
         )
     }
 }
diff --git a/modules/Sources/Dependencies/NumberFormatter/NumberFormatterTestKey.swift b/modules/Sources/Dependencies/NumberFormatter/NumberFormatterTestKey.swift
@@ -11,13 +11,15 @@ import XCTestDynamicOverlay
 extension NumberFormatterClient: TestDependencyKey {
     public static let testValue = Self(
         string: unimplemented("\(Self.self).string", placeholder: nil),
-        number: unimplemented("\(Self.self).number", placeholder: nil)
+        number: unimplemented("\(Self.self).number", placeholder: nil),
+        convertUSToLocale: XCTUnimplemented("\(Self.self).number", placeholder: nil)
     )
 }
 
 extension NumberFormatterClient {
     public static let noOp = Self(
         string: { _ in nil },
-        number: { _ in nil }
+        number: { _ in nil },
+        convertUSToLocale: { _ in nil }
     )
 }
diff --git a/modules/Sources/Dependencies/URIParser/RequestPaymentParser.swift b/modules/Sources/Dependencies/URIParser/RequestPaymentParser.swift
@@ -0,0 +1,18 @@
+//
+//  RequestPaymentParser.swift
+//
+//
+//  Created by Lukáš Korba on 24.05.2024.
+//
+
+import Foundation
+import Models
+import ZcashPaymentURI
+
+public struct RequestPaymentParser {
+    public enum URIParserError: Error { }
+
+    public func checkRP(_ dataStr: String) -> ParserResult? {
+        try? ZIP321.request(from: dataStr)
+    }
+}
diff --git a/modules/Sources/Dependencies/URIParser/URIParserInterface.swift b/modules/Sources/Dependencies/URIParser/URIParserInterface.swift
@@ -8,6 +8,8 @@
 import Foundation
 import ComposableArchitecture
 import ZcashLightClientKit
+import Models
+import ZcashPaymentURI
 
 extension DependencyValues {
     public var uriParser: URIParserClient {
@@ -19,5 +21,6 @@ extension DependencyValues {
 @DependencyClient
 public struct URIParserClient {
     public var isValidURI: (String, NetworkType) -> Bool = { _, _ in false }
+    public var checkRP: (String) -> ParserResult? = { _ in nil }
 }
 
diff --git a/modules/Sources/Dependencies/URIParser/URIParserLive.swift b/modules/Sources/Dependencies/URIParser/URIParserLive.swift
@@ -11,6 +11,9 @@ extension URIParserClient: DependencyKey {
     public static let liveValue = Self(
         isValidURI: { uri, network in
             URIParser().isValidURI(uri, network: network)
+        },
+        checkRP: { data in
+            RequestPaymentParser().checkRP(data)
         }
     )
 }
diff --git a/modules/Sources/Dependencies/URIParser/URIParserTest.swift b/modules/Sources/Dependencies/URIParser/URIParserTest.swift
@@ -10,6 +10,7 @@ import XCTestDynamicOverlay
 
 extension URIParserClient: TestDependencyKey {
     public static let testValue = Self(
-        isValidURI: unimplemented("\(Self.self).isValidURI", placeholder: false)
+        isValidURI: XCTUnimplemented("\(Self.self).isValidURI", placeholder: false),
+        checkRP: XCTUnimplemented("\(Self.self).checkRP", placeholder: nil)
     )
 }
diff --git a/modules/Sources/Features/AddressBook/AddressBookContactView.swift b/modules/Sources/Features/AddressBook/AddressBookContactView.swift
@@ -48,7 +48,7 @@ public struct AddressBookContactView: View {
                 ZashiButton(L10n.General.save) {
                     store.send(.saveButtonTapped)
                 }
-                //.disabled(store.isSaveButtonDisabled) // TODO: FIXME
+                .disabled(store.isSaveButtonDisabled)
                 .padding(.bottom, isInEditMode ? 0 : 24)
 
                 if isInEditMode {

diff --git a/modules/Sources/Features/AddressBook/AddressBookStore.swift b/modules/Sources/Features/AddressBook/AddressBookStore.swift
@@ -237,11 +237,11 @@ public struct AddressBook {
                 return .send(.updateDestination(.add))
 
             case .saveButtonTapped:
-                let name = state.name.isEmpty ? "testName" : state.name
-                let address = state.address.isEmpty ? "testAddress" : state.address
-                return .run { send in
+//                let name = state.name.isEmpty ? "testName" : state.name
+//                let address = state.address.isEmpty ? "testAddress" : state.address
+                return .run { [state] send in
                     do {
-                        let contacts = try await addressBook.storeContact(ABRecord(address: address, name: name))
+                        let contacts = try await addressBook.storeContact(ABRecord(address: state.address, name: state.name))
                         await send(.fetchedABRecords(contacts))
                         await send(.contactStoreSuccess)
                     } catch {

diff --git a/modules/Sources/Features/AddressBook/AddressBookView.swift b/modules/Sources/Features/AddressBook/AddressBookView.swift
@@ -61,7 +61,7 @@ public struct AddressBookView: View {
                                 ContactView(
                                     iconText: record.name.initials,
                                     title: record.name,
-                                    desc: record.id
+                                    desc: record.id.trailingZip316
                                 ) {
                                     store.send(.editId(record.id))
                                 }

diff --git a/modules/Sources/Features/AddressDetails/AddressDetailsStore.swift b/modules/Sources/Features/AddressDetails/AddressDetailsStore.swift
@@ -67,7 +67,7 @@ public struct AddressDetails {
                 state.isAddressExpanded = false
                 state.isQRCodeAppreanceFlipped = false
                 return .none
-                
+
             case .onDisappear:
                 return .cancel(id: state.cancelId)
 
@@ -77,7 +77,7 @@ public struct AddressDetails {
                 }
                 state.isQRCodeAppreanceFlipped.toggle()
                 return .send(.generateQRCode(true))
-                
+
             case let .rememberQR(image):
                 state.storedQR = image
                 return .none

diff --git a/modules/Sources/Features/AddressDetails/AddressDetailsView.swift b/modules/Sources/Features/AddressDetails/AddressDetailsView.swift
@@ -60,6 +60,7 @@ public struct AddressDetailsView: View {
                         Text(store.address.data)
                             .zFont(size: 14, style: Design.Text.tertiary)
                             .lineLimit(store.isAddressExpanded ? nil : 2)
+                            .truncationMode(.middle)
                             .padding(.top, 8)
                             .onTapGesture {
                                 store.send(.addressTapped)
@@ -126,7 +127,11 @@ extension AddressDetailsView {
             color: .black
            ) {
             UIShareDialogView(activityItems: [
-                ShareableImage(image: UIImage(cgImage: cgImg)), "Hi, scan this QR code to send me a ZEC payment!"
+                ShareableImage(
+                    image: UIImage(cgImage: cgImg),
+                    title: "My Zashi ZEC Address",
+                    reason: "Hi, scan this QR code to send me a ZEC payment!"
+                ), "Hi, scan this QR code to send me a ZEC payment!"
             ]) {
                 store.send(.shareFinished)
             }