Revert additional uneeded changes from the first commit

Author: allendav

WooCommerce/Classes/ViewModels/CardPresentPayments/PaymentCaptureOrchestrator.swift

@@ -60,8 +60,8 @@ final class PaymentCaptureOrchestrator {
                     }
                 },
                 onCompletion: { [weak self] result in
-                    onProcessingMessage()
                     self?.allowPassPresentation()
+                    onProcessingMessage()
                     self?.completePaymentIntentCapture(
                         order: order,
                         captureResult: result,

Yosemite/Yosemite/Stores/CardPresentPaymentStore.swift

@@ -185,16 +185,15 @@ private extension CardPresentPaymentStore {
 
         cardReaderService.cancelPaymentIntent()
             .subscribe(Subscribers.Sink(receiveCompletion: { value in
-                switch value {
-                case .failure(let error):
-                    onCompletion?(.failure(error))
-                case .finished:
-                    break
-                }
-            }, receiveValue: {
-                onCompletion?(.success(()))
-            })
-        )
+            switch value {
+            case .failure(let error):
+                onCompletion?(.failure(error))
+            case .finished:
+                break
+            }
+        }, receiveValue: {
+            onCompletion?(.success(()))
+        }))
     }
 
     func checkForCardReaderUpdate(onCompletion: @escaping (Result<CardReaderSoftwareUpdate?, Error>) -> Void) {
@@ -259,6 +258,7 @@ private extension CardPresentPaymentStore {
     }
 }
 
+
 /// Implementation of the CardReaderNetworkingAdapter
 /// that fetches a token using WCPayRemote
 private final class WCPayTokenProvider: CardReaderConfigProvider {