From 2de88bff7688e9604ed6a1fc1ab945398f1b0274 Mon Sep 17 00:00:00 2001
From: Francisco Gindre <francisco.gindre@gmail.com>
Date: Thu, 29 Feb 2024 14:32:35 -0300
Subject: [PATCH] Fix Rebase issues

---
 .../CombineSynchronizer.swift                 |  2 +-
 .../Synchronizer/CombineSDKSynchronizer.swift | 24 ++-----------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/Sources/ZcashLightClientKit/CombineSynchronizer.swift b/Sources/ZcashLightClientKit/CombineSynchronizer.swift
index 16ae0830..6f72cdc6 100644
--- a/Sources/ZcashLightClientKit/CombineSynchronizer.swift
+++ b/Sources/ZcashLightClientKit/CombineSynchronizer.swift
@@ -61,7 +61,7 @@ public protocol CombineSynchronizer {
         accountIndex: Int,
         shieldingThreshold: Zatoshi,
         memo: Memo
-    ) -> SinglePublisher<Proposal, Error>
+    ) -> SinglePublisher<Proposal?, Error>
 
     func proposefulfillingPaymentURI(
         _ uri: String,
diff --git a/Sources/ZcashLightClientKit/Synchronizer/CombineSDKSynchronizer.swift b/Sources/ZcashLightClientKit/Synchronizer/CombineSDKSynchronizer.swift
index 1811b12c..09679398 100644
--- a/Sources/ZcashLightClientKit/Synchronizer/CombineSDKSynchronizer.swift
+++ b/Sources/ZcashLightClientKit/Synchronizer/CombineSDKSynchronizer.swift
@@ -69,24 +69,13 @@ extension CombineSDKSynchronizer: CombineSynchronizer {
         }
     }
 
-    public func proposeTransfer(
-        accountIndex: Int,
-        recipient: Recipient,
-        amount: Zatoshi,
-        memo: Memo?
-    ) -> SinglePublisher<Proposal, Error> {
-        AsyncToCombineGateway.executeThrowingAction() {
-            try await self.synchronizer.proposeTransfer(accountIndex: accountIndex, recipient: recipient, amount: amount, memo: memo)
-        }
-    }
-
     public func proposeShielding(
         accountIndex: Int,
         shieldingThreshold: Zatoshi,
         memo: Memo
-    ) -> SinglePublisher<Proposal, Error> {
+    ) -> SinglePublisher<Proposal?, Error> {
         AsyncToCombineGateway.executeThrowingAction() {
-            try await self.synchronizer.proposeShielding(accountIndex: accountIndex, shieldingThreshold: shieldingThreshold, memo: memo)
+            try await self.synchronizer.proposeShielding(accountIndex: accountIndex, shieldingThreshold: shieldingThreshold, memo: memo, transparentReceiver: nil)
         }
     }
 
@@ -102,15 +91,6 @@ extension CombineSDKSynchronizer: CombineSynchronizer {
         }
     }
 
-    public func createProposedTransactions(
-        proposal: Proposal,
-        spendingKey: UnifiedSpendingKey
-    ) -> SinglePublisher<AsyncThrowingStream<TransactionSubmitResult, Error>, Error> {
-        AsyncToCombineGateway.executeThrowingAction() {
-            try await self.synchronizer.createProposedTransactions(proposal: proposal, spendingKey: spendingKey)
-        }
-    }
-
     public func proposeTransfer(
         accountIndex: Int,
         recipient: Recipient,