Cleaning up code based on PR comments

LN-Zap · Oct 25, 2019 · a5b7658 · a5b7658
1 parent 4f3094b
commit a5b7658
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/Library/Scenes/ModalDetail/Send/SendViewModel.swift b/Library/Scenes/ModalDetail/Send/SendViewModel.swift
@@ -187,27 +187,20 @@ final class SendViewModel: NSObject {
         guard let amount = amount else { return }
 
         let feeCompletion = { [weak self] (result: Result<(amount: Satoshi, fee: Satoshi?), LndApiError>) -> Void in
+            guard
+                let self = self
+                else { return }
             switch result {
             case .success(let result):
                 guard
-                    let self = self,
                     result.amount == self.amount
                     else { return }
 
                 self.isTransactionDust = false
                 self.fee.value = .element(result.fee)
             case .failure(let lndApiError):
-                guard
-                    let self = self
-                    else { return }
-
-                if lndApiError == LndApiError.transactionDust {
-                    self.isTransactionDust = true
-                } else {
-                    self.isTransactionDust = false
-                }
-
-                self.fee.value = .error(lndApiError)
+                self.isTransactionDust = lndApiError == .transactionDust
+                self.fee.value = amount > 0 ? .error(lndApiError) : .element(nil)
                 self.updateIsUIEnabled()
             }
         }

diff --git a/SwiftLnd/Api/Helper/RpcZapHelper.swift b/SwiftLnd/Api/Helper/RpcZapHelper.swift
@@ -29,9 +29,9 @@ final class LndCallback<T: SwiftProtobuf.Message>: NSObject, LndmobileCallbackPr
             if error.localizedDescription == "Closed" {
                 result = .walletAlreadyUnlocked
             } else if error.localizedDescription == "rpc error: code = Unknown desc = transaction output is dust" {
-                result = LndApiError.transactionDust
+                result = .transactionDust
             } else {
-                result = LndApiError.localizedError(error.localizedDescription)
+                result = .localizedError(error.localizedDescription)
             }
             completion(.failure(result))
         } else {