@stripe/stripe-react-native 0.57.0 → 0.57.2

package/ios/NewArch/NavigationBarComponentView.mm

@@ -0,0 +1,86 @@
+#import "NavigationBarComponentView.h"
+
+#import <react/renderer/components/rnstripe/ComponentDescriptors.h>
+#import <react/renderer/components/rnstripe/EventEmitters.h>
+#import <react/renderer/components/rnstripe/Props.h>
+#import <react/renderer/components/rnstripe/RCTComponentViewHelpers.h>
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+#import "StripeNewArchConversions.h"
+#import "StripeSwiftInterop.h"
+
+using namespace facebook::react;
+using namespace stripe::react;
+
+@interface NavigationBarComponentView () <RCTNavigationBarViewProtocol>
+@end
+
+@implementation NavigationBarComponentView {
+  NavigationBarView *_view;
+}
+
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
++ (void)load
+{
+  [super load];
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const NavigationBarProps>();
+    _props = defaultProps;
+    [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view = [[NavigationBarView alloc] initWithFrame:self.frame];
+  self.contentView = _view;
+
+  __weak __typeof(self) weakSelf = self;
+
+  _view.onCloseButtonPress = ^(NSDictionary *event) {
+    __typeof(self) strongSelf = weakSelf;
+    if (!strongSelf || !strongSelf->_eventEmitter) {
+      return;
+    }
+    NavigationBarEventEmitter::OnCloseButtonPress emitterEvent = {};
+    std::static_pointer_cast<const NavigationBarEventEmitter>(strongSelf->_eventEmitter)
+        ->onCloseButtonPress(std::move(emitterEvent));
+  };
+}
+
+- (void)updateProps:(const facebook::react::Props::Shared &)props
+           oldProps:(const facebook::react::Props::Shared &)oldProps
+{
+  const auto &newViewProps = *std::static_pointer_cast<const NavigationBarProps>(props);
+
+  _view.title = RCTNSStringFromStringNilIfEmpty(newViewProps.title);
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<NavigationBarComponentDescriptor>();
+}
+
+- (void)prepareForRecycle
+{
+  [super prepareForRecycle];
+  [self prepareView];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> NavigationBarCls(void)
+{
+  return NavigationBarComponentView.class;
+}

package/ios/OldArch/StripeSdkEventEmitterCompat.h

@@ -23,5 +23,6 @@
 - (void)emitEmbeddedPaymentElementRowSelectionImmediateAction;
 - (void)emitEmbeddedPaymentElementLoadingFailed:(NSDictionary *)value;
 - (void)emitOnCustomPaymentMethodConfirmHandlerCallback:(NSDictionary *)value;
+- (void)emitOnCheckoutClientSecretRequested:(NSDictionary *)value;
 @end
 

package/ios/OldArch/StripeSdkEventEmitterCompat.m

@@ -23,7 +23,8 @@
     @"embeddedPaymentElementFormSheetConfirmComplete",
     @"embeddedPaymentElementRowSelectionImmediateAction",
     @"embeddedPaymentElementLoadingFailed",
-    @"onCustomPaymentMethodConfirmHandlerCallback"
+    @"onCustomPaymentMethodConfirmHandlerCallback",
+    @"onCheckoutClientSecretRequested"
   ];
 }
 
@@ -122,4 +123,9 @@
   [self sendEventWithName:@"onCustomPaymentMethodConfirmHandlerCallback" body:value];
 }
 
+- (void)emitOnCheckoutClientSecretRequested:(NSDictionary *)value
+{
+  [self sendEventWithName:@"onCheckoutClientSecretRequested" body:value];
+}
+
 @end

package/ios/PaymentMethodFactory.swift

@@ -2,12 +2,12 @@ import Foundation
 import Stripe
 
 class PaymentMethodFactory {
-    var billingDetailsParams: STPPaymentMethodBillingDetails? = nil
-    var paymentMethodData: NSDictionary? = nil
-    var paymentMethodOptions: NSDictionary? = nil
-    var cardFieldView: CardFieldView? = nil
-    var cardFormView: CardFormView? = nil
-    var metadata: [String: String]? = nil
+    var billingDetailsParams: STPPaymentMethodBillingDetails?
+    var paymentMethodData: NSDictionary?
+    var paymentMethodOptions: NSDictionary?
+    var cardFieldView: CardFieldView?
+    var cardFormView: CardFormView?
+    var metadata: [String: String]?
 
     init(paymentMethodData: NSDictionary?, options: NSDictionary, cardFieldView: CardFieldView?, cardFormView: CardFormView?) {
         self.paymentMethodData = paymentMethodData
@@ -61,8 +61,8 @@ class PaymentMethodFactory {
                 return try createCashAppPaymentMethodParams()
             case STPPaymentMethodType.revolutPay:
                 return try createRevolutPayPaymentMethodParams()
-//            case STPPaymentMethodType.weChatPay:
-//                return try createWeChatPayPaymentMethodParams()
+            //            case STPPaymentMethodType.weChatPay:
+            //                return try createWeChatPayPaymentMethodParams()
             default:
                 throw PaymentMethodError.paymentNotSupported
             }
@@ -124,11 +124,11 @@ class PaymentMethodFactory {
         }
     }
 
-//    private func createWeChatPayPaymentMethodParams() throws -> STPPaymentMethodParams {
-//        let params = STPPaymentMethodWeChatPayParams()
-//        return STPPaymentMethodParams(weChatPay: params, billingDetails: billingDetailsParams, metadata: metadata)
-//    }
-//
+    //    private func createWeChatPayPaymentMethodParams() throws -> STPPaymentMethodParams {
+    //        let params = STPPaymentMethodWeChatPayParams()
+    //        return STPPaymentMethodParams(weChatPay: params, billingDetails: billingDetailsParams, metadata: metadata)
+    //    }
+    //
 
     private func createUSBankAccountPaymentMethodOptions() throws -> STPConfirmPaymentMethodOptions {
         let paymentOptions = STPConfirmPaymentMethodOptions()
@@ -155,26 +155,25 @@ class PaymentMethodFactory {
             params.bankName = bankName
         }
 
-
-      return STPPaymentMethodParams(iDEAL: params, billingDetails: billingDetailsParams, metadata: metadata)
+        return STPPaymentMethodParams(iDEAL: params, billingDetails: billingDetailsParams, metadata: metadata)
     }
 
     private func createGrabpayPaymentMethodParams() -> STPPaymentMethodParams {
         let params = STPPaymentMethodGrabPayParams()
 
-      return STPPaymentMethodParams(grabPay: params, billingDetails: billingDetailsParams, metadata: metadata)
+        return STPPaymentMethodParams(grabPay: params, billingDetails: billingDetailsParams, metadata: metadata)
     }
 
     private func createCardPaymentMethodParams() throws -> STPPaymentMethodParams {
         if let token = paymentMethodData?["token"] as? String {
             let methodParams = STPPaymentMethodCardParams()
             methodParams.token = token
-          return STPPaymentMethodParams(card: methodParams, billingDetails: billingDetailsParams, metadata: metadata)
+            return STPPaymentMethodParams(card: methodParams, billingDetails: billingDetailsParams, metadata: metadata)
         }
 
         if let params = cardFieldView?.cardParams as? STPPaymentMethodParams {
             if let postalCode = cardFieldView?.cardPostalCode{
-                if (billingDetailsParams == nil) {
+                if billingDetailsParams == nil {
                     let bd = STPPaymentMethodBillingDetails()
                     bd.address = STPPaymentMethodAddress()
                     bd.address?.postalCode = postalCode
@@ -188,7 +187,7 @@ class PaymentMethodFactory {
         }
         if let params = cardFormView?.cardParams as? STPPaymentMethodCardParams {
             if let address = cardFormView?.cardForm?.cardParams?.billingDetails?.address {
-                if (billingDetailsParams == nil) {
+                if billingDetailsParams == nil {
                     let bd = STPPaymentMethodBillingDetails()
                     bd.address = STPPaymentMethodAddress()
                     bd.address?.postalCode = address.postalCode
@@ -205,7 +204,6 @@ class PaymentMethodFactory {
         throw PaymentMethodError.cardPaymentMissingParams
     }
 
-
     private func createCardPaymentMethodOptions() -> STPConfirmPaymentMethodOptions? {
         let cvc = paymentMethodData?["cvc"] as? String
         guard cvc != nil else {
@@ -213,7 +211,7 @@ class PaymentMethodFactory {
         }
 
         let cardOptions = STPConfirmCardOptions()
-        cardOptions.cvc = cvc;
+        cardOptions.cvc = cvc
         let paymentMethodOptions = STPConfirmPaymentMethodOptions()
         paymentMethodOptions.cardOptions = cardOptions
 
@@ -227,7 +225,7 @@ class PaymentMethodFactory {
             params.rawBankString = "test_offline_bank"
         }
 
-      return STPPaymentMethodParams(fpx: params, billingDetails: billingDetailsParams, metadata: metadata)
+        return STPPaymentMethodParams(fpx: params, billingDetails: billingDetailsParams, metadata: metadata)
     }
 
     private func createAlipayPaymentMethodParams() throws -> STPPaymentMethodParams {
@@ -366,8 +364,10 @@ class PaymentMethodFactory {
     }
 
     private func createAffirmPaymentMethodParams() throws -> STPPaymentMethodParams {
-        let params = STPPaymentMethodAffirmParams()
-        return STPPaymentMethodParams(affirm: params, metadata: metadata)
+        let affirmParams = STPPaymentMethodAffirmParams()
+        let params = STPPaymentMethodParams(affirm: affirmParams, metadata: metadata)
+        params.billingDetails = billingDetailsParams
+        return params
     }
 
     private func createCashAppPaymentMethodParams() throws -> STPPaymentMethodParams {

package/ios/PaymentOptionDisplayData+ReactNative.swift

@@ -32,7 +32,7 @@ extension EmbeddedPaymentElement.PaymentOptionDisplayData {
                     "line1": addr.line1 ?? "",
                     "line2": addr.line2 ?? "",
                     "postalCode": addr.postalCode ?? "",
-                    "state": addr.state ?? ""
+                    "state": addr.state ?? "",
                 ]
             }()
 
@@ -40,7 +40,7 @@ extension EmbeddedPaymentElement.PaymentOptionDisplayData {
                 "name": billing.name ?? "",
                 "email": billing.email ?? "",
                 "phone": billing.phone ?? "",
-                "address": addressDict
+                "address": addressDict,
             ]
         }()
 
@@ -53,7 +53,7 @@ extension EmbeddedPaymentElement.PaymentOptionDisplayData {
                     from: NSRange(location: 0, length: mandateText.length),
                     documentAttributes: [
                         .documentType: NSAttributedString.DocumentType.html,
-                        .characterEncoding: String.Encoding.utf8.rawValue
+                        .characterEncoding: String.Encoding.utf8.rawValue,
                     ]
                 )
                 return String(data: htmlData, encoding: .utf8)
@@ -69,7 +69,7 @@ extension EmbeddedPaymentElement.PaymentOptionDisplayData {
             "label": label,
             "billingDetails": billingDetailsDict,
             "paymentMethodType": paymentMethodType,
-            "mandateHTML": mandateTextHTML
+            "mandateHTML": mandateTextHTML,
         ]
     }
 }

package/ios/PaymentPassFinder.swift

@@ -12,7 +12,7 @@ internal class PaymentPassFinder: NSObject {
         case CURRENT_DEVICE
         case PAIRED_DEVICE
     }
-    
+
     class func findPassWith(
         primaryAccountIdentifier: String,
         hasPairedAppleWatch: Bool,
@@ -27,21 +27,21 @@ internal class PaymentPassFinder: NSObject {
                     .first(where: { $0.paymentPass?.primaryAccountIdentifier == primaryAccountIdentifier && $0.paymentPass?.passActivationState != .deactivated && !$0.isRemotePass })
             }
         }()
-        
+
         var passLocations: [PassLocation] = []
-        if (existingPassOnDevice != nil) {
+        if existingPassOnDevice != nil {
             passLocations.append(.CURRENT_DEVICE)
         }
-        
+
         // We're done here if the user does not have a paired Apple Watch
-        if (!hasPairedAppleWatch) {
+        if !hasPairedAppleWatch {
             completion(
                 passLocations.count < 1,
                 passLocations
             )
             return
         }
-        
+
         let existingPassOnPairedDevices: PKPass? = {
             if #available(iOS 13.4, *) {
                 return PKPassLibrary().remoteSecureElementPasses
@@ -51,12 +51,11 @@ internal class PaymentPassFinder: NSObject {
                     .first(where: { $0.paymentPass?.primaryAccountIdentifier == primaryAccountIdentifier && $0.paymentPass?.passActivationState != .deactivated })
             }
         }()
-        
-        
-        if (existingPassOnPairedDevices != nil) {
+
+        if existingPassOnPairedDevices != nil {
             passLocations.append(.PAIRED_DEVICE)
         }
-        
+
         completion(
             passLocations.count < 2,
             passLocations