- remove timeout from ledger sign as that will take time

- change ledgerStringToSign logic temporarily while we test the new app
kukai-wallet · Aug 21, 2024 · 9fdde00 · 9fdde00
1 parent 6bf4f57
commit 9fdde00
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Sources/KukaiCoreSwift/Models/LedgerWallet.swift b/Sources/KukaiCoreSwift/Models/LedgerWallet.swift
@@ -81,11 +81,8 @@ public class LedgerWallet: Wallet {
 			.timeout(.seconds(10), scheduler: RunLoop.main, customError: {
 				return KukaiError.knownErrorMessage("Timed out waiting for device to connect. Check device/bluetooth is turned on and try again")
 			})
-			.flatMap { _ -> Publishers.Timeout<AnyPublisher<String, KukaiError>, RunLoop> in
+			.flatMap { _ -> AnyPublisher<String, KukaiError> in
 				return LedgerService.shared.sign(hex: hex, parse: isWatermarkedOperation)
-					.timeout(.seconds(10), scheduler: RunLoop.main, customError: {
-						return KukaiError.knownErrorMessage("Timed out waiting for device to connect. Check device/bluetooth is turned on and try again")
-					})
 			}
 			.sink(onError: { error in
 				completion(Result.failure(error))

diff --git a/Sources/KukaiCoreSwift/Services/OperationService.swift b/Sources/KukaiCoreSwift/Services/OperationService.swift
@@ -160,7 +160,7 @@ public class OperationService {
 			ledgerCanParse = true
 		}
 
-		return (ledgerCanParse ? watermarkedOp : blakeHashString)
+		return watermarkedOp //(ledgerCanParse ? watermarkedOp : blakeHashString)
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -160,7 +160,7 @@ public class OperationService { @@
     			ledgerCanParse = true
     		}
-    		return (ledgerCanParse ? watermarkedOp : blakeHashString)
+    		return watermarkedOp //(ledgerCanParse ? watermarkedOp : blakeHashString)
     	}
     	/**
@@ Expand Down @@