@sumup/react-native-checkout 0.0.0-alpha.2 → 0.0.0-alpha.3

package/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:8.6.1"
   }
 }
 
@@ -15,9 +15,6 @@ def isNewArchitectureEnabled() {
 
 apply plugin: "com.android.library"
 
-
-def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
-
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
 }
@@ -30,12 +27,25 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["SumupReactNative_" + name]).toInteger()
 }
 
+def getReactNativeAndroidDependency() {
+  if (rootProject.ext.has("reactNativeVersion")) {
+    return "com.facebook.react:react-android:${rootProject.ext.get("reactNativeVersion")}"
+  }
+  if (project.hasProperty("reactNativeVersion")) {
+    return "com.facebook.react:react-android:${project.property("reactNativeVersion")}"
+  }
+  // Fallback for older hosts still exposing only react-native:+ from local maven.
+  return "com.facebook.react:react-native:+"
+}
+
 android {
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+  namespace "com.sumupreactnative"
+  compileSdk getExtOrIntegerDefault("compileSdkVersion")
+  ndkVersion getExtOrDefault("ndkversion")
 
   defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    minSdk getExtOrIntegerDefault("minSdkVersion")
+    targetSdk getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
   buildTypes {
@@ -44,13 +54,13 @@ android {
     }
   }
 
-  lintOptions {
+  lint {
     disable "GradleCompatible"
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 
 }
@@ -62,10 +72,7 @@ repositories {
 
 
 dependencies {
-  // For < 0.71, this will be from the local maven repo
-  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
+  implementation getReactNativeAndroidDependency()
   implementation 'com.google.android.gms:play-services-wallet:19.1.0'
 }
 

package/android/gradle.properties

@@ -1,5 +1,5 @@
 SumupReactNative_kotlinVersion=1.7.0
-SumupReactNative_minSdkVersion=21
-SumupReactNative_targetSdkVersion=31
-SumupReactNative_compileSdkVersion=31
-SumupReactNative_ndkversion=21.4.7075529
+SumupReactNative_minSdkVersion=23
+SumupReactNative_targetSdkVersion=35
+SumupReactNative_compileSdkVersion=35
+SumupReactNative_ndkversion=26.1.10909125

package/android/src/main/java/com/sumupreactnative/SumupReactNativeModule.java

@@ -60,6 +60,10 @@ public class SumupReactNativeModule extends ReactContextBaseJavaModule {
   private final ActivityEventListener activityEventListener = new BaseActivityEventListener() {
     @Override
     public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
+      if (requestPaymentPromise == null) {
+        return;
+      }
+
       switch (requestCode) {
         // value passed in AutoResolveHelper
         case LOAD_PAYMENT_DATA_REQUEST_CODE:
@@ -81,6 +85,7 @@ public class SumupReactNativeModule extends ReactContextBaseJavaModule {
             default:
               // Do nothing.
           }
+          requestPaymentPromise = null;
           break;
       }
     }
@@ -114,6 +119,11 @@ public class SumupReactNativeModule extends ReactContextBaseJavaModule {
       promise.resolve(false);
       return;
     }
+    if (mPaymentsClient == null) {
+      Log.w(NAME, "[GooglePay] payments client is not initialized");
+      promise.resolve(false);
+      return;
+    }
 
     final JSONObject isReadyToPayJson = PaymentUtil.getIsReadyToPayRequest(allowedCardNetworks.toArrayList(), allowedCardAuthMethods.toArrayList());
     if (isReadyToPayJson == null) {
@@ -158,6 +168,11 @@ public class SumupReactNativeModule extends ReactContextBaseJavaModule {
       promise.reject("NO_ACTIVITY", "activity is null");
       return;
     }
+    if (mPaymentsClient == null) {
+      Log.w(NAME, "[GooglePay] payments client is not initialized");
+      promise.reject("NO_PAYMENTS_CLIENT", "payments client is not initialized");
+      return;
+    }
 
     JSONObject paymentDataRequestJson = PaymentUtil.getPaymentDataRequest(requestData);
     if (paymentDataRequestJson == null) {

package/ios/SumupReactNative.swift

@@ -1,31 +1,34 @@
 import PassKit
+import UIKit
 
 @objc(SumupReactNative)
-class SumupReactNative: UIViewController {
+class SumupReactNative: NSObject {
 
     private var request: PKPaymentRequest = PKPaymentRequest()
     private var resolve: RCTPromiseResolveBlock?
+    private var reject: RCTPromiseRejectBlock?
     private var paymentNetworks: [PKPaymentNetwork]?
+    private var didResolvePayment = false
     
     @objc(configure:details:)
-    private func configure(withMethod method: NSDictionary, details: NSDictionary) -> Void {
-
-        self.paymentNetworks = method["supportedNetworks"] as? [PKPaymentNetwork]
+    func configure(withMethod method: NSDictionary, details: NSDictionary) -> Void {
+        self.paymentNetworks = parseSupportedNetworks(from: method)
+        self.request = PKPaymentRequest()
 
         guard let paymentNetworks = paymentNetworks,
               PKPaymentAuthorizationViewController.canMakePayments(usingNetworks: paymentNetworks),
               let total = details["total"] as? NSDictionary,
               let label = total["label"] as? String,
-              let amount = total["amount"] as? Double,
+              let amountNumber = total["amount"] as? NSNumber,
               let currencyCode = method["currencyCode"] as? String,
               let countryCode = method["countryCode"] as? String,
               let merchantIdentifier = method["merchantIdentifier"] as? String else {
-            print("SumupReactNative: params are not valid")
+            NSLog("SumupReactNative: invalid Apple Pay configuration")
             return
         }
         
         let paymentItem = PKPaymentSummaryItem.init(label: label,
-                                                    amount: NSDecimalNumber(value: amount))
+                                                    amount: NSDecimalNumber(decimal: amountNumber.decimalValue))
         request.currencyCode = currencyCode
         request.countryCode = countryCode
         request.merchantIdentifier = merchantIdentifier
@@ -35,31 +38,30 @@ class SumupReactNative: UIViewController {
     }
 
     @objc(presentApplePay:withRejecter:)
-    func presentApplePay(resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+    func presentApplePay(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        self.resolve = resolve
+        self.reject = reject
+        self.didResolvePayment = false
+
         guard let paymentNetworks = paymentNetworks,
               PKPaymentAuthorizationViewController.canMakePayments(usingNetworks: paymentNetworks) else {
-            print("SumupReactNative: Can not make payment")
+            reject("PAYMENT_NOT_AVAILABLE", "Apple Pay is not available for the configured networks", nil)
             return
         }
-        
-        self.resolve = resolve
-        
-        if let controller = PKPaymentAuthorizationViewController(paymentRequest: request) {
-            controller.delegate = self
 
-            DispatchQueue.main.async {
-                var rootViewController = UIApplication.shared.keyWindow?.rootViewController
-                if let presentedViewController = rootViewController?.presentedViewController {
-                    rootViewController = presentedViewController
-                }
-
-                guard let rootViewController = rootViewController else {
-                    print("SumupReactNative: unable to find rootViewController")
-                    return
-                }
+        guard let controller = PKPaymentAuthorizationViewController(paymentRequest: request) else {
+            reject("PRESENTATION_ERROR", "Unable to create Apple Pay authorization controller", nil)
+            return
+        }
+        controller.delegate = self
 
-                rootViewController.present(controller, animated: true, completion: nil)
+        DispatchQueue.main.async {
+            guard let rootViewController = self.topViewController() else {
+                self.reject?("NO_ROOT_VIEW_CONTROLLER", "Unable to find active root view controller", nil)
+                return
             }
+
+            rootViewController.present(controller, animated: true, completion: nil)
         }
     }
 
@@ -72,15 +74,44 @@ class SumupReactNative: UIViewController {
             resolve(false)
         }
     }
+
+    private func parseSupportedNetworks(from method: NSDictionary) -> [PKPaymentNetwork]? {
+        guard let networks = method["supportedNetworks"] as? [String] else {
+            return nil
+        }
+        let parsedNetworks = networks.compactMap { PKPaymentNetwork(rawValue: $0) }
+        return parsedNetworks.isEmpty ? nil : parsedNetworks
+    }
+
+    private func topViewController() -> UIViewController? {
+        let foregroundScene = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+            .first { $0.activationState == .foregroundActive }
+
+        let keyWindow = foregroundScene?.windows.first(where: { $0.isKeyWindow })
+        var root = keyWindow?.rootViewController
+
+        while let presented = root?.presentedViewController {
+            root = presented
+        }
+
+        return root
+    }
 }
 
 extension SumupReactNative: PKPaymentAuthorizationViewControllerDelegate {
     func paymentAuthorizationViewControllerDidFinish(_ controller: PKPaymentAuthorizationViewController) {
         controller.dismiss(animated: true, completion: nil)
+        if !didResolvePayment {
+            reject?("PAYMENT_RESULT_CANCELED", "Payment has been canceled", nil)
+        }
+        resolve = nil
+        reject = nil
     }
 
     func paymentAuthorizationViewController(_ controller: PKPaymentAuthorizationViewController, didAuthorizePayment payment: PKPayment, completion: @escaping (PKPaymentAuthorizationStatus) -> Void) {
 
+        didResolvePayment = true
         self.resolve?(payment.toDictionary())
         completion(.success)
     }
@@ -132,8 +163,15 @@ extension PKPaymentMethod {
 extension PKPaymentMethodType {
 
     func toString() -> String {
-        let arr = ["unknown", "debit", "credit", "prepaid", "store", "eMoney"]
-        return arr[Int(self.rawValue)]
+        let namesByRawValue: [Int: String] = [
+            0: "unknown",
+            1: "debit",
+            2: "credit",
+            3: "prepaid",
+            4: "store",
+            5: "eMoney",
+        ]
+        return namesByRawValue[Int(self.rawValue)] ?? "unknown"
     }
 }
 
@@ -153,12 +191,13 @@ extension PKPaymentPass {
 extension PKPaymentPassActivationState {
 
     func toString() -> String {
-        let arr = ["PKPaymentPassActivationStateActivated",
-                   "PKPaymentPassActivationStateRequiresActivation",
-                   "PKPaymentPassActivationStateActivating",
-                   "PKPaymentPassActivationStateSuspended",
-                   "PKPaymentPassActivationStateDeactivated"]
-
-        return arr[Int(self.rawValue)]
+        let namesByRawValue: [Int: String] = [
+            0: "PKPaymentPassActivationStateActivated",
+            1: "PKPaymentPassActivationStateRequiresActivation",
+            2: "PKPaymentPassActivationStateActivating",
+            3: "PKPaymentPassActivationStateSuspended",
+            4: "PKPaymentPassActivationStateDeactivated",
+        ]
+        return namesByRawValue[Int(self.rawValue)] ?? "PKPaymentPassActivationStateActivated"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sumup/react-native-checkout",
-	"version": "0.0.0-alpha.2",
+	"version": "0.0.0-alpha.3",
 	"description": "Official SumUp React Native SDK",
 	"main": "lib/commonjs/index",
 	"module": "lib/module/index",
@@ -63,7 +63,7 @@
 		"@evilmartians/lefthook": "^1.2.2",
 		"@react-native-community/eslint-config": "^3.0.2",
 		"@react-native-community/netinfo": "^11.5.2",
-		"@react-native/babel-preset": "^0.74.87",
+		"@react-native/babel-preset": "^0.74.89",
 		"@testing-library/react-native": "^13.3.3",
 		"@types/jest": "^29.5.1",
 		"@types/react": "^18.2.6",
@@ -78,7 +78,7 @@
 		"react": "18.2.0",
 		"react-native": "0.74.5",
 		"react-native-builder-bob": "^0.20.0",
-		"react-native-localization": "^2.3.1",
+		"react-native-localization": "^2.3.2",
 		"react-native-webview": "^13.16.0",
 		"react-test-renderer": "^18.2.0",
 		"typescript": "^5.9.3"
@@ -159,6 +159,6 @@
 		"mobx-react-lite": "^4.1.1",
 		"react-native-modal": "^13.0.1",
 		"react-native-spacing-system": "^2.0.0-rc.0",
-		"react-native-uuid": "^2.0.1"
+		"react-native-uuid": "^2.0.3"
 	}
 }

package/sumup-react-native-checkout.podspec

@@ -13,8 +13,8 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => "11.0" }
-  s.source       = { :git => "https://github.com/sumup/sumup-react-native-checkout-sdk.git", :tag => package["version"] }
+  s.platforms    = { :ios => "13.4" }
+  s.source       = { :git => "https://github.com/sumup/sumup-react-native-checkout-sdk.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"