Sync iOS with React Native 0.57.1

Author: jonasbark

packages/stripe_ios/ios/stripe_ios.podspec

@@ -2,7 +2,7 @@
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
 # Run `pod lib lint stripe_ios.podspec' to validate before publishing.
 #
-stripe_version = '~> 24.25.0'
+stripe_version = '~> 25.0.1'
 Pod::Spec.new do |s|
   s.name             = 'stripe_ios'
   s.version          = '0.0.1'

packages/stripe_ios/ios/stripe_ios/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         .library(name: "stripe-ios", targets: ["stripe_ios"])
     ],
     dependencies: [
-        .package(url: "https://github.com/stripe/stripe-ios-spm", exact: "24.25.0")
+        .package(url: "https://github.com/stripe/stripe-ios-spm", exact: "25.0.1")
     ],
     targets: [
         .target(

packages/stripe_ios/ios/stripe_ios/Sources/stripe_ios/Stripe Sdk/AddressSheet/AddressSheetUtils.swift

@@ -67,7 +67,7 @@ class AddressSheetUtils {
     }
 
     internal class func getFieldConfiguration(input: String?, default: AddressViewController.Configuration.AdditionalFields.FieldConfiguration) -> AddressViewController.Configuration.AdditionalFields.FieldConfiguration {
-        switch (input) {
+        switch input {
         case "optional":
             return .optional
         case "required":
@@ -79,7 +79,7 @@ class AddressSheetUtils {
         }
     }
 
-    internal class func buildResult(address: AddressViewController.AddressDetails) -> [AnyHashable : Any] {
+    internal class func buildResult(address: AddressViewController.AddressDetails) -> [AnyHashable: Any] {
         return [
             "result": [
                 "name": address.name ?? NSNull(),
@@ -93,7 +93,7 @@ class AddressSheetUtils {
                 ],
                 "phone": address.phone ?? NSNull(),
                 "isCheckboxSelected": address.isCheckboxSelected ?? NSNull(),
-            ] as [AnyHashable : Any]
+            ] as [AnyHashable: Any],
         ]
     }
 

packages/stripe_ios/ios/stripe_ios/Sources/stripe_ios/Stripe Sdk/AddressSheet/AddressSheetView.swift

@@ -7,40 +7,39 @@
 
 import Foundation
 import StripePaymentSheet
-import UIKit
 
 @objc(AddressSheetView)
 public class AddressSheetView: UIView {
     @objc public var visible = false
     @objc public var presentationStyle: String = "popover"
     @objc public var animationStyle: String = ""
-    @objc public var appearance: NSDictionary? = nil
-    @objc public var defaultValues: NSDictionary? = nil
-    @objc public var additionalFields: NSDictionary? = nil
+    @objc public var appearance: NSDictionary?
+    @objc public var defaultValues: NSDictionary?
+    @objc public var additionalFields: NSDictionary?
     @objc public var allowedCountries: [String] = []
     @objc public var autocompleteCountries: [String] = []
-    @objc public var primaryButtonTitle: String? = nil
-    @objc public var sheetTitle: String? = nil
+    @objc public var primaryButtonTitle: String?
+    @objc public var sheetTitle: String?
     @objc public var onSubmitAction: RCTDirectEventBlock?
     @objc public var onErrorAction: RCTDirectEventBlock?
 
     private var wasVisible = false
-    private var addressViewController: AddressViewController? = nil
-    internal var addressDetails: AddressViewController.AddressDetails? = nil
-    
+    private var addressViewController: AddressViewController?
+    internal var addressDetails: AddressViewController.AddressDetails?
+
     override public init(frame: CGRect) {
         super.init(frame: frame)
     }
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-  
+
     @objc public func didSetProps() {
-        if (visible && !wasVisible) {
+        if visible && !wasVisible {
             presentAddressSheet()
             wasVisible = true
-        } else if (!visible && wasVisible) {
+        } else if !visible && wasVisible {
             addressViewController?.dismiss(animated: true)
             wasVisible = false
         }
@@ -51,11 +50,11 @@ public class AddressSheetView: UIView {
         // by the view component.
         self.didSetProps()
     }
-    
+
     private func presentAddressSheet() {
-        if (STPAPIClient.shared.publishableKey == nil) {
+        if STPAPIClient.shared.publishableKey == nil {
             onErrorAction!(
-                Errors.createError(ErrorType.Failed, "No publishable key set. Stripe has not been initialized. Initialize Stripe in your app with the StripeProvider component or the initStripe method.") as? [AnyHashable : Any]
+                Errors.createError(ErrorType.Failed, "No publishable key set. Stripe has not been initialized. Initialize Stripe in your app with the StripeProvider component or the initStripe method.") as? [AnyHashable: Any]
             )
             return
         }
@@ -64,38 +63,38 @@ public class AddressSheetView: UIView {
             config = try buildAddressSheetConfiguration()
         } catch {
             onErrorAction!(
-                Errors.createError(ErrorType.Failed, error.localizedDescription) as? [AnyHashable : Any]
+                Errors.createError(ErrorType.Failed, error.localizedDescription) as? [AnyHashable: Any]
             )
             return
         }
-        
+
         self.addressViewController = AddressViewController(
             configuration: config,
             delegate: self
         )
-                
+
         let navigationController = UINavigationController(rootViewController: addressViewController!)
         navigationController.modalPresentationStyle = getModalPresentationStyle()
         navigationController.modalTransitionStyle = getModalTransitionStyle()
-        let vc = findViewControllerPresenter(from: UIApplication.shared.delegate?.window??.rootViewController ?? UIViewController())
+        let vc = findViewControllerPresenter(from: RCTKeyWindow()?.rootViewController ?? UIViewController())
         vc.present(navigationController, animated: true)
     }
-    
+
     private func buildAddressSheetConfiguration() throws -> AddressViewController.Configuration {
         let appearanceConfiguration = try PaymentSheetAppearance.buildAppearanceFromParams(userParams: appearance)
-        
+
         return AddressViewController.Configuration(
             defaultValues: AddressSheetUtils.buildDefaultValues(params: defaultValues),
             additionalFields: AddressSheetUtils.buildAdditionalFieldsConfiguration(params: additionalFields),
             allowedCountries: allowedCountries,
             appearance: appearanceConfiguration,
             buttonTitle: primaryButtonTitle,
             title: sheetTitle
-          )
+        )
     }
-    
+
     private func getModalPresentationStyle() -> UIModalPresentationStyle {
-        switch (presentationStyle) {
+        switch presentationStyle {
         case "fullscreen":
             return .fullScreen
         case "pageSheet":
@@ -112,9 +111,9 @@ public class AddressSheetView: UIView {
             return .popover
         }
     }
-    
+
     private func getModalTransitionStyle() -> UIModalTransitionStyle {
-        switch (animationStyle) {
+        switch animationStyle {
         case "flip":
             return .flipHorizontal
         case "curl":
@@ -136,7 +135,7 @@ extension AddressSheetView: AddressViewControllerDelegate {
                 Errors.createError(
                     ErrorType.Canceled,
                     "The flow has been canceled."
-                ) as? [AnyHashable : Any]
+                ) as? [AnyHashable: Any]
             )
             return
         }