Always fire checkoutDidFail

Shopify · Apr 22, 2024 · 690fb84 · 690fb84
1 parent ebad670
commit 690fb84
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,5 +1,6 @@
 disabled_rules:
   - line_length
+  - file_length
 
 opt_in_rules:
   - array_init

diff --git a/Samples/MobileBuyIntegration/MobileBuyIntegration/CartViewController.swift b/Samples/MobileBuyIntegration/MobileBuyIntegration/CartViewController.swift
@@ -202,7 +202,7 @@ extension CartViewController: CheckoutDelegate {
 			errorMessage = message
 		}
 
-		print(errorMessage)
+		print(errorMessage, "Recoverable: \(error.isRecoverable)")
 	}
 
 	private func handleCheckoutUnavailable(_ message: String, _ code: CheckoutUnavailable) {

diff --git a/Sources/ShopifyCheckoutSheetKit/CheckoutWebViewController.swift b/Sources/ShopifyCheckoutSheetKit/CheckoutWebViewController.swift
@@ -213,13 +213,12 @@ extension CheckoutWebViewController: CheckoutWebViewDelegate {
 
 	func checkoutViewDidFailWithError(error: CheckoutError) {
 		CheckoutWebView.invalidate()
+		delegate?.checkoutDidFail(error: error)
 
 		let shouldAttemptRecovery = delegate?.shouldRecoverFromError(error: error) ?? false
 
 		if shouldAttemptRecovery {
 			self.presentFallbackViewController(url: self.checkoutURL)
-		} else {
-			delegate?.checkoutDidFail(error: error)
 		}
 	}
 
@@ -238,8 +237,4 @@ extension CheckoutWebViewController: CheckoutWebViewDelegate {
 	func checkoutViewDidEmitWebPixelEvent(event: PixelEvent) {
 		delegate?.checkoutDidEmitWebPixelEvent(event: event)
 	}
-
-	private func isErrorRecoverable(error: CheckoutError) -> Bool {
-		return error.isRecoverable
-	}
 }