Merge 2.0.0-beta1 to main (#301)

* Remove MXO (#291)

* Remove MXO

* remove Package.resolved file containing incompatible pinstorage version

* CHANGELOG entry

* Jax feedback and docStrings correction

* Remove PatchOrder for MXO, unused files in demo app

* Remove more classes used exclusively for MXO

* Convert Delegation Pattern to Completion Handler (#293)

* PayPal remove delgation pattern for completion handler function for checkout

* lint error for paypal start

* completion and analytics into notify functions

* paypal vault completion, unit tests

* remove PayPal delegates, references

* Card vault to completion, unit tests

* Card approve to completion, unit tests

* docstrings for approve completion param

* wrap paypal functions in async await

* async await wrapper for CardClient functions

* remove CardDelegate and references

* fix error in notifyCheckoutFailure

* Make error names and messages payPal caps consistent

* changelog entires

* Steven PR feedback: typo in Chagelog

* Simplify Cancel Errors (#296)

* Simplify cancel errors

* CHANGELOG for the cancel errors

* Steven PR feedback: change back CardClientError.canceled to .threeDSecureCanceled

* CHANGELOG update

* Cancel error handling (#297)

* http performRequest returns NetworkingClientErrors

* CardClient helper function for threeDSCancel, demo app cancel, demo app minor fixes

* PayPalClient cancel helper functions and demo app changes

* Steven PR feedback: move static helper functions to error enums

* Rename CardClientError -> CardError, PayPalWebCheckoutError -> PayPalError

* Steven PR feedback: return CoreSDKError in merchant completion handler

* CHANGELOG and analytics typo and fix wrong code in graphql error

* v2 migration guide (#295)

* v2 migration guide

* just cocoapods or SPM

* fix typos

* minor spacing changes

* Update with simplified cancel errors

* Steven PR feedback - diff to render green/red

* include removal of delegate methods in delete block

* update with cardClient threeDSecureCanceled error

* change to threeDSecureCanceled in migration steps

* add comment highlighting cancellation errors

* typo fix

* clarify separating cancel cases in errors

* revert cancel handling instructions

* add changes for cancellation helper methods

* fix typo in PayPalError.isCheckoutCanceled

* Steven PR feedback

* Make PayPalError and CardError Code enum consistent (#298)

* Changelog: move additive changes from breaking section (#299)

* Changelog: move additive changes from breaking section

* remove duplicate line for PayPal cancel errors

Author: KunJeongPark

CHANGELOG.md

@@ -1,6 +1,39 @@
 
 # PayPal iOS SDK Release Notes
 
+## unreleased
+* Breaking Changes
+  * PayPalNativePayments
+    * Remove entire PayPalNativePayments module
+  * PayPalWebPayments
+    * Replace delegate pattern with completion handlers and Swift concurrency
+      * Remove `PayPalWebCheckoutDelegate` and `PayPalVaultDelegate`
+      * Remove `start(request:)` method that uses delegate callbacks
+      * Remove `vault(vaultRequest:)` method that uses delegate callbacks
+      * Add `start(request:completion(PayPalWebCheckoutResult?, CoreSDKError?) -> Void)` to `PayPalWebCheckoutClient`
+      * Add `vault(vaultRequest:completion(PayPalVaultResult?, CoreSDKError?) -> Void)` to `PayPalWebCheckoutClient`
+      * Add `start(request:) async throws -> PayPalCheckoutResult`
+      * Add `vault(vaultRequest:) async throws -> PayPalVaultResult`
+  * CardPayments
+    * Replace delegate pattern with completion handlers and Swift concurrency
+      * Remove `CardDelegate` and `CardVaultDelegate`
+      * Remove `approveOrder(request:)` method that uses delegate callbacks
+      * Remove `vault(vaultRequest:)` method that uses delegate callbacks
+      * Add `approveOrder(request:completion:(CardResult?, CoreSDKError?) -> Void)` to `CardClient`
+      * Add `vault(request:completion:(CardVaultResult?, CoreSDKError?) -> Void)` to `CardClient`
+      * Add `approveOrder(request:) async throws -> CardResult`
+      * Add `vault(vaultRequest:) async throws -> CardVaultResult`   
+* PayPalWebPayments
+  * Rename `PayPalWebCheckoutClientError` to `PayPalError`
+  * Add `.checkoutCanceledError` and `vaultCanceledError` to `PayPalError`
+  * Add public static functions `isCheckoutCanceled(Error)` and `isVaultCanceled(Error)` to `PayPalError` to distinguish cancellation errors in PayPal flows. 
+  * Make `PayPalError` public to expose cancellation error handling helpers
+* CardPayments
+  * Rename `CardClientError` to `CardError`
+  * Add `threeDSecureCanceledError` to `CardError`
+  * Add public static function `isThreeDSecureCanceled(Error)` to `CardError` to distinguish cancellation error from threeDSecure verification
+  * Make `CardError` public to expose cancellation error handling helper
+
 ## 1.5.0 (2024-10-24)
 * PayPalWebPayments
   * Deprecate `PayPalVaultRequest(url:setupTokenID:)`

Demo/Demo.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>2.0.0-beta1</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>

Demo/Demo/Helpers/OrderRequestHelpers.swift

@@ -116,18 +116,6 @@ final class DemoMerchantAPI {
         return try parse(from: data)
     }
 
-    /// This function replicates a way a merchant may go about patching an order on their server and is not part of the SDK flow.
-    /// - Parameters:
-    ///   - updateOrderParams: the parameters to update the order with
-    /// - Throws: an error explaining why patching the order failed
-    func updateOrder(_ updateOrderParams: UpdateOrderParams, selectedMerchantIntegration: MerchantIntegration) async throws {
-        guard let url = buildBaseURL(with: "/orders/" + updateOrderParams.orderID) else {
-            throw URLResponseError.invalidURL
-        }
-        let urlRequest = buildURLRequest(method: "PATCH", url: url, body: updateOrderParams.updateOperations)
-        _ = try await data(for: urlRequest)
-    }
-
     /// This function fetches a clientID to initialize any module of the SDK
     /// - Parameters:
     ///   - environment: the current environment

Demo/Demo/Info.plist

@@ -49,11 +49,6 @@ struct FeatureSelectionView: View {
                     } label: {
                         Text("PayPal Vaulting")
                     }
-                    NavigationLink {
-                        SwiftUINativeCheckoutDemo()
-                    } label: {
-                        Text("Native Checkout")
-                    }
                     NavigationLink {
                         SwiftUIPaymentButtonDemo()
                     } label: {

Demo/Demo/Models/ProcessOrderParams.swift

@@ -15,13 +15,18 @@ struct PayPalVaultView: View {
                     )
                     SetupTokenResultView(vaultViewModel: paypalVaultViewModel)
                     if let setupTokenID = paypalVaultViewModel.state.setupToken?.id {
-                        Button("Vault PayPal") {
-                            Task {
-                                await paypalVaultViewModel.vault(setupTokenID: setupTokenID)
+                        ZStack {
+                            Button("Vault PayPal") {
+                                Task {
+                                    await paypalVaultViewModel.vault(setupTokenID: setupTokenID)
+                                }
+                            }
+                            .buttonStyle(RoundedBlueButtonStyle())
+                            .padding()
+                            if case .loading = paypalVaultViewModel.state.paypalVaultTokenResponse {
+                                CircularProgressView()
                             }
                         }
-                        .buttonStyle(RoundedBlueButtonStyle())
-                        .padding()
                     }
                     PayPalVaultResultView(viewModel: paypalVaultViewModel)
                     if let paypalVaultResult = paypalVaultViewModel.state.paypalVaultToken {