@stripe/stripe-react-native 0.6.0 → 0.9.0

package/android/src/main/java/com/reactnativestripesdk/pushprovisioning/AddToWalletButtonView.kt

@@ -0,0 +1,148 @@
+package com.reactnativestripesdk.pushprovisioning
+
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.RippleDrawable
+import android.view.MotionEvent
+import androidx.appcompat.widget.AppCompatImageView
+import com.bumptech.glide.RequestManager
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.reactnativestripesdk.PushProvisioningProxy
+import com.reactnativestripesdk.createError
+
+
+class AddToWalletButtonView(private val context: ThemedReactContext, private val requestManager: RequestManager) : AppCompatImageView(context) {
+  private var cardDetails: ReadableMap? = null
+  private var ephemeralKey: String? = null
+  private var sourceMap: ReadableMap? = null
+  private var token: ReadableMap? = null
+
+  private var eventDispatcher: EventDispatcher? = context.getNativeModule(UIManagerModule::class.java)?.eventDispatcher
+  private var loadedSource: GlideUrl? = null
+  private var heightOverride: Int = 0
+  private var widthOverride: Int = 0
+
+  override fun performClick(): Boolean {
+    super.performClick()
+
+    cardDetails?.getString("description")?.let { cardDescription ->
+      ephemeralKey?.let { ephemeralKey ->
+        PushProvisioningProxy.invoke(
+          context.reactApplicationContext,
+          this,
+          cardDescription,
+          ephemeralKey,
+          token)
+      } ?: run {
+        dispatchEvent(
+          createError("Failed", "Missing parameters. `ephemeralKey` must be supplied in the props to <AddToWalletButton />")
+        )
+      }
+    } ?: run {
+      dispatchEvent(
+        createError("Failed", "Missing parameters. `cardDetails.cardDescription` must be supplied in the props to <AddToWalletButton />")
+      )
+    }
+    return true
+  }
+
+  init {
+    this.setOnTouchListener { view, event ->
+      if (event.action == MotionEvent.ACTION_DOWN) {
+        view.performClick()
+        return@setOnTouchListener true
+      }
+      return@setOnTouchListener false
+    }
+  }
+
+  fun onAfterUpdateTransaction() {
+    val sourceToLoad = createUrlFromSourceMap(sourceMap)
+    if (sourceToLoad == null) {
+      requestManager.clear(this)
+      setImageDrawable(null)
+      loadedSource = null
+    } else if (sourceToLoad != loadedSource || (heightOverride > 0 || widthOverride > 0)) {
+      loadedSource = sourceToLoad
+      val scale = sourceMap?.getDouble("scale") ?: 1.0
+
+      requestManager
+        .asDrawable()
+        .load(sourceToLoad)
+        .addListener(object : RequestListener<Drawable> {
+          override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean {
+            dispatchEvent(
+              createError("Failed", "Failed to load the source from $sourceToLoad")
+            )
+            return true
+          }
+          override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
+            setImageDrawable(
+              RippleDrawable(
+                ColorStateList.valueOf(Color.parseColor("#e0e0e0")),
+                resource,
+                null))
+            return true
+          }
+        })
+        .centerCrop()
+        .override((widthOverride * scale).toInt(), (heightOverride * scale).toInt())
+        .into(this)
+    }
+  }
+
+  private fun createUrlFromSourceMap(sourceMap: ReadableMap?): GlideUrl? {
+    val uriKey = sourceMap?.getString("uri")
+    return uriKey?.let { GlideUrl(uriKey) }
+  }
+
+  override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+    super.onSizeChanged(w, h, oldw, oldh)
+    if (w > 0 && h > 0) {
+      heightOverride = h
+      widthOverride = w
+      onAfterUpdateTransaction()
+      heightOverride = 0
+      widthOverride = 0
+    }
+  }
+
+  fun onDropViewInstance() {
+    requestManager.clear(this)
+  }
+
+  fun setSourceMap(map: ReadableMap) {
+    sourceMap = map
+  }
+
+  fun setCardDetails(detailsMap: ReadableMap) {
+    cardDetails = detailsMap
+  }
+
+  fun setEphemeralKey(map: ReadableMap) {
+    ephemeralKey = map.toHashMap().toString()
+  }
+
+  fun setToken(map: ReadableMap?) {
+    token = map
+  }
+
+  fun dispatchEvent(error: WritableMap?) {
+    eventDispatcher?.dispatchEvent(
+      AddToWalletCompleteEvent(
+        id,
+        error
+      )
+    )
+  }
+}

package/android/src/main/java/com/reactnativestripesdk/pushprovisioning/AddToWalletCompleteEvent.kt

@@ -0,0 +1,22 @@
+package com.reactnativestripesdk.pushprovisioning
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+internal class AddToWalletCompleteEvent constructor(viewTag: Int, private val error: WritableMap?) : Event<AddToWalletCompleteEvent>(viewTag) {
+  override fun getEventName(): String {
+    return EVENT_NAME
+  }
+
+  override fun dispatch(rctEventEmitter: RCTEventEmitter) {
+    rctEventEmitter.receiveEvent(viewTag, eventName, serializeEventData())
+  }
+
+  private fun serializeEventData(): WritableMap? {
+    return error
+  }
+
+  companion object {
+    const val EVENT_NAME = "onCompleteAction"
+  }
+}

package/android/src/main/java/com/reactnativestripesdk/pushprovisioning/EphemeralKeyProvider.kt

@@ -0,0 +1,35 @@
+package com.reactnativestripesdk.pushprovisioning
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.stripe.android.pushProvisioning.PushProvisioningEphemeralKeyProvider
+
+
+class EphemeralKeyProvider(private val ephemeralKey: String) : PushProvisioningEphemeralKeyProvider {
+
+  private constructor(parcel: Parcel) : this(
+    ephemeralKey = parcel.readString() ?: ""
+  )
+
+  override fun describeContents(): Int {
+    return hashCode()
+  }
+
+  override fun writeToParcel(dest: Parcel, flags: Int) {
+    dest.writeString(ephemeralKey)
+  }
+
+  override fun createEphemeralKey(apiVersion: String, keyUpdateListener: com.stripe.android.pushProvisioning.EphemeralKeyUpdateListener) {
+    keyUpdateListener.onKeyUpdate(ephemeralKey)
+  }
+
+  companion object CREATOR : Parcelable.Creator<EphemeralKeyProvider> {
+    override fun createFromParcel(parcel: Parcel): EphemeralKeyProvider {
+      return EphemeralKeyProvider(parcel)
+    }
+
+    override fun newArray(size: Int): Array<EphemeralKeyProvider?> {
+      return arrayOfNulls(size)
+    }
+  }
+}

package/android/src/main/java/com/reactnativestripesdk/pushprovisioning/PushProvisioningProxy.kt

@@ -0,0 +1,117 @@
+package com.reactnativestripesdk
+
+import android.app.Activity
+import android.app.Activity.RESULT_OK
+import android.content.Intent
+import android.util.Log
+import com.facebook.react.bridge.*
+import com.reactnativestripesdk.pushprovisioning.AddToWalletButtonView
+import com.reactnativestripesdk.pushprovisioning.EphemeralKeyProvider
+import com.reactnativestripesdk.pushprovisioning.TapAndPayProxy
+import com.stripe.android.pushProvisioning.PushProvisioningActivity
+import com.stripe.android.pushProvisioning.PushProvisioningActivityStarter
+
+
+object PushProvisioningProxy {
+  private const val TAG = "StripePushProvisioning"
+  private var description = "Added by Stripe"
+  private var tokenRequiringTokenization: ReadableMap? = null
+
+  fun getApiVersion(): String {
+    return try {
+      Class.forName("com.stripe.android.pushProvisioning.PushProvisioningActivity")
+      PushProvisioningActivity.API_VERSION
+    } catch (e: Exception) {
+      Log.e(TAG, "PushProvisioning dependency not found")
+      ""
+    }
+  }
+
+  fun invoke(
+          context: ReactApplicationContext,
+          view: AddToWalletButtonView,
+          cardDescription: String,
+          ephemeralKey: String,
+          token: ReadableMap?
+  ) {
+    try {
+      Class.forName("com.stripe.android.pushProvisioning.PushProvisioningActivityStarter")
+      description = cardDescription
+      tokenRequiringTokenization = token
+      createActivityEventListener(context, view)
+      context.currentActivity?.let {
+        DefaultPushProvisioningProxy().beginPushProvisioning(
+          it,
+          description,
+          EphemeralKeyProvider(ephemeralKey)
+        )
+      } ?: run {
+        view.dispatchEvent(
+          createError(
+            "Failed",
+            "Activity doesn't exist yet. You can safely retry.")
+        )
+      }
+    } catch (e: Exception) {
+      Log.e(TAG, "PushProvisioning dependency not found")
+    }
+  }
+
+  fun isCardInWallet(activity: Activity, cardLastFour: String, promise: Promise) {
+    TapAndPayProxy.invoke(activity, cardLastFour, promise)
+  }
+
+  private fun createActivityEventListener(context: ReactApplicationContext, view: AddToWalletButtonView) {
+    val listener = object : BaseActivityEventListener() {
+      override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(activity, requestCode, resultCode, data)
+        if (requestCode == TapAndPayProxy.REQUEST_CODE_TOKENIZE) {
+          view.dispatchEvent(
+            if (resultCode == RESULT_OK) null else mapError("Failed", "Failed to verify identity.", null, null, null, null)
+          )
+        } else if (requestCode == PushProvisioningActivityStarter.REQUEST_CODE) {
+          if (resultCode == PushProvisioningActivity.RESULT_OK) {
+            tokenRequiringTokenization?.let { tokenRequiringTokenization ->
+              val tokenReferenceId = tokenRequiringTokenization.getString("id")
+              if (tokenReferenceId.isNullOrBlank()) {
+                view.dispatchEvent(
+                  mapError("Failed", "Token object passed to `<AddToWalletButton />` is missing the `id` field.", null, null, null, null)
+                )
+              } else {
+                TapAndPayProxy.tokenize(
+                  activity,
+                  tokenReferenceId,
+                  tokenRequiringTokenization,
+                  description
+                )
+              }
+            } ?: run {
+              view.dispatchEvent(null)
+            }
+          } else if (resultCode == PushProvisioningActivity.RESULT_ERROR) {
+            data?.let {
+              val error: PushProvisioningActivityStarter.Error = PushProvisioningActivityStarter.Error.fromIntent(data)
+              view.dispatchEvent(
+                mapError(error.code.toString(), error.message, null, null, null, null)
+              )
+            }
+          }
+        }
+      }
+    }
+    context.addActivityEventListener(listener)
+  }
+}
+
+class DefaultPushProvisioningProxy {
+  fun beginPushProvisioning(
+    activity: Activity,
+    description: String,
+    provider: EphemeralKeyProvider
+  ) {
+      PushProvisioningActivityStarter(
+        activity,
+        PushProvisioningActivityStarter.Args(description, provider, false)
+      ).startForResult()
+  }
+}

package/android/src/main/java/com/reactnativestripesdk/pushprovisioning/TapAndPayProxy.kt

@@ -0,0 +1,129 @@
+package com.reactnativestripesdk.pushprovisioning
+
+import android.app.Activity
+import android.util.Log
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.bridge.WritableNativeMap
+import com.reactnativestripesdk.createError
+import com.google.android.gms.tasks.Task
+
+object TapAndPayProxy {
+  private const val TAG = "StripeTapAndPay"
+  private var tapAndPayClient: Any? = null
+  const val REQUEST_CODE_TOKENIZE = 90909
+
+  fun invoke(activity: Activity, newCardLastFour: String, promise: Promise) {
+    try {
+      val tapAndPayClass = Class.forName("com.google.android.gms.tapandpay.TapAndPay")
+      val getClientMethod = tapAndPayClass.getMethod("getClient", Activity::class.java)
+
+      tapAndPayClient = getClientMethod.invoke(null, activity).also {
+        val tapAndPayClientClass = Class.forName("com.google.android.gms.tapandpay.TapAndPayClient")
+        val listTokensMethod = tapAndPayClientClass.getMethod("listTokens")
+
+        val tokens = listTokensMethod.invoke(it) as Task<List<Any>>
+        tokens.addOnCompleteListener { task ->
+          if (task.isSuccessful) {
+            for (token in task.result) {
+              try {
+                val getFpanLastFourMethod = Class.forName("com.google.android.gms.tapandpay.issuer.TokenInfo").getMethod("getFpanLastFour")
+                val existingFpanLastFour = getFpanLastFourMethod.invoke(token) as String
+                if (existingFpanLastFour == newCardLastFour) {
+                  promise.resolve(
+                    createResult(
+                      true,
+                      token))
+                  return@addOnCompleteListener
+                }
+              } catch (e: Exception) {
+                Log.e(TAG, "There was a problem finding the class com.google.android.gms.tapandpay.issuer.TokenInfo. Make sure you've included Google's TapAndPay dependency.")
+              }
+            }
+          } else {
+            Log.e(TAG, "Unable to fetch existing tokens from Google TapAndPay.")
+          }
+          promise.resolve(createResult(false))
+        }
+      }
+    } catch (e: Exception) {
+      Log.e(TAG, "Google TapAndPay dependency not found")
+      promise.resolve(createError("Failed", "Google TapAndPay dependency not found."))
+    }
+  }
+
+  fun tokenize(activity: Activity, tokenReferenceId: String, token: ReadableMap, cardDescription: String) {
+    try {
+      val tapAndPayClientClass = Class.forName("com.google.android.gms.tapandpay.TapAndPayClient")
+      val tokenizeMethod = tapAndPayClientClass::class.java.getMethod("tokenize", Activity::class.java, String::class.java, Int::class.java, String::class.java, Int::class.java, Int::class.java)
+      tokenizeMethod.invoke(tapAndPayClient,
+                            activity,
+                            tokenReferenceId,
+                            token.getInt("serviceProvider"),
+                            cardDescription,
+                            token.getInt("network"),
+                            REQUEST_CODE_TOKENIZE)
+    } catch (e: Exception) {
+      Log.e(TAG, "Google TapAndPay dependency not found.")
+    }
+  }
+
+  private fun createResult(cardIsInWallet: Boolean, token: Any? = null): WritableMap {
+    val result = WritableNativeMap()
+    result.putBoolean("isInWallet", cardIsInWallet)
+    result.putMap("token", mapFromTokenInfo(token))
+    return result
+  }
+
+  private fun mapFromTokenInfo(token: Any?): WritableMap? {
+    if (token == null) {
+      return null
+    }
+    val result = WritableNativeMap()
+    try {
+      val tokenInfoClass = Class.forName("com.google.android.gms.tapandpay.issuer.TokenInfo")
+      result.putString(
+        "id",
+        tokenInfoClass.getMethod("getIssuerTokenId").invoke(token) as String)
+      result.putString(
+        "cardLastFour",
+        tokenInfoClass.getMethod("getFpanLastFour").invoke(token) as String)
+      result.putString(
+        "issuer",
+        tokenInfoClass.getMethod("getIssuerName").invoke(token) as String)
+      result.putString(
+        "status",
+        mapFromTokenState(tokenInfoClass.getMethod("getTokenState").invoke(token) as Int))
+      result.putInt(
+        "network",
+        tokenInfoClass.getMethod("getNetwork").invoke(token) as Int)
+      result.putInt(
+        "serviceProvider",
+        tokenInfoClass.getMethod("getTokenServiceProvider").invoke(token) as Int)
+    } catch (e: Exception) {
+      Log.e(TAG,
+            "There was a problem finding the class com.google.android.gms.tapandpay.issuer.TokenInfo. Make sure you've included Google's TapAndPay dependency.")
+    }
+    return result
+  }
+
+  private fun mapFromTokenState(status: Int): String {
+    try {
+      val tapAndPayClass = Class.forName("com.google.android.gms.tapandpay.TapAndPay")
+      return when (status) {
+        tapAndPayClass.getField("TOKEN_STATE_NEEDS_IDENTITY_VERIFICATION").get(tapAndPayClass) -> "TOKEN_STATE_NEEDS_IDENTITY_VERIFICATION"
+        tapAndPayClass.getField("TOKEN_STATE_PENDING").get(tapAndPayClass) -> "TOKEN_STATE_PENDING"
+        tapAndPayClass.getField("TOKEN_STATE_SUSPENDED").get(tapAndPayClass) -> "TOKEN_STATE_SUSPENDED"
+        tapAndPayClass.getField("TOKEN_STATE_ACTIVE").get(tapAndPayClass) -> "TOKEN_STATE_ACTIVE"
+        tapAndPayClass.getField("TOKEN_STATE_FELICA_PENDING_PROVISIONING").get(tapAndPayClass) -> "TOKEN_STATE_FELICA_PENDING_PROVISIONING"
+        tapAndPayClass.getField("TOKEN_STATE_UNTOKENIZED").get(tapAndPayClass) -> "TOKEN_STATE_UNTOKENIZED"
+        else -> "UNKNOWN"
+      }
+    } catch (e: Exception) {
+      Log.e(TAG,
+            "There was a problem finding Google's TapAndPay dependency.")
+      return "UNKNOWN"
+    }
+  }
+}

package/ios/CardFieldManager.m

@@ -7,7 +7,7 @@ RCT_EXPORT_VIEW_PROPERTY(postalCodeEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(onCardChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onFocusChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(cardStyle, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(placeholder, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(placeholders, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(autofocus, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(dangerouslyGetFullCardDetails, BOOL)
 RCT_EXTERN_METHOD(focus:(nonnull NSNumber*) reactTag)

package/ios/CardFieldView.swift

@@ -18,20 +18,20 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
         }
     }
     
-    @objc var placeholder: NSDictionary = NSDictionary() {
+    @objc var placeholders: NSDictionary = NSDictionary() {
         didSet {
-            if let numberPlaceholder = placeholder["number"] as? String {
+            if let numberPlaceholder = placeholders["number"] as? String {
                 cardField.numberPlaceholder = numberPlaceholder
             } else {
                 cardField.numberPlaceholder = "1234123412341234"
             }
-            if let expirationPlaceholder = placeholder["expiration"] as? String {
+            if let expirationPlaceholder = placeholders["expiration"] as? String {
                 cardField.expirationPlaceholder = expirationPlaceholder
             }
-            if let cvcPlaceholder = placeholder["cvc"] as? String {
+            if let cvcPlaceholder = placeholders["cvc"] as? String {
                 cardField.cvcPlaceholder = cvcPlaceholder
             }
-            if let postalCodePlaceholder = placeholder["postalCode"] as? String {
+            if let postalCodePlaceholder = placeholders["postalCode"] as? String {
                 cardField.postalCodePlaceholder = postalCodePlaceholder
             }
         }
@@ -134,7 +134,7 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
                 "expiryMonth": textField.cardParams.expMonth ?? NSNull(),
                 "expiryYear": textField.cardParams.expYear ?? NSNull(),
                 "complete": textField.isValid,
-                "brand": Mappers.mapCardBrand(brand) ?? NSNull(),
+                "brand": Mappers.mapFromCardBrand(brand) ?? NSNull(),
                 "last4": textField.cardParams.last4 ?? "",
                 "validExpiryDate": Mappers.mapFromCardValidationState(state: validExpiryDate),
                 "validCVC": Mappers.mapFromCardValidationState(state: validCVC),
@@ -145,6 +145,7 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
             }
             if (dangerouslyGetFullCardDetails) {
                 cardData["number"] = textField.cardParams.number ?? ""
+                cardData["cvc"] = textField.cardParams.cvc ?? ""
             }
             onCardChange!(cardData as [AnyHashable : Any])
         }

package/ios/CardFormView.swift

@@ -44,7 +44,7 @@ class CardFormView: UIView, STPCardFormViewDelegate {
                 "expiryMonth": cardForm?.cardParams?.card?.expMonth ?? NSNull(),
                 "expiryYear": cardForm?.cardParams?.card?.expYear ?? NSNull(),
                 "complete": complete,
-                "brand": Mappers.mapCardBrand(brand) ?? NSNull(),
+                "brand": Mappers.mapFromCardBrand(brand) ?? NSNull(),
                 "last4": cardForm?.cardParams?.card?.last4 ?? "",
                 "postalCode": cardForm?.cardParams?.billingDetails?.address?.postalCode ?? "",
                 "country": cardForm?.cardParams?.billingDetails?.address?.country
@@ -52,6 +52,7 @@ class CardFormView: UIView, STPCardFormViewDelegate {
 
             if (dangerouslyGetFullCardDetails) {
                 cardData["number"] = cardForm?.cardParams?.card?.number ?? ""
+                cardData["cvc"] = cardForm?.cardParams?.card?.cvc ?? ""
             }
             if (complete) {
                 self.cardParams = cardForm?.cardParams?.card

package/ios/Mappers.swift

@@ -82,7 +82,7 @@ class Mappers {
             return nil
         }
         let cardMap: NSDictionary = [
-            "brand": mapCardBrand(card?.brand) ?? NSNull(),
+            "brand": mapFromCardBrand(card?.brand) ?? NSNull(),
             "country": card?.country ?? NSNull(),
             "currency": card?.currency ?? NSNull(),
             "expMonth": card?.expMonth ?? NSNull(),
@@ -283,6 +283,7 @@ class Mappers {
         case STPPaymentMethodType.afterpayClearpay: return "AfterpayClearpay"
         case STPPaymentMethodType.klarna: return "Klarna"
         case STPPaymentMethodType.USBankAccount: return "USBankAccount"
+        case STPPaymentMethodType.payPal: return "PayPal"
         case STPPaymentMethodType.unknown: return "Unknown"
         default: return "Unknown"
         }
@@ -311,6 +312,7 @@ class Mappers {
             case "Klarna": return STPPaymentMethodType.klarna
             case "WeChatPay": return STPPaymentMethodType.weChatPay
             case "USBankAccount": return STPPaymentMethodType.USBankAccount
+            case "PayPal": return STPPaymentMethodType.payPal
             default: return STPPaymentMethodType.unknown
             }
         }
@@ -495,16 +497,18 @@ class Mappers {
         billing.phone = RCTConvert.nsString(billingDetails["phone"])
         billing.name = RCTConvert.nsString(billingDetails["name"])
 
-        let billingAddres = STPPaymentMethodAddress()
-
-        billingAddres.city = RCTConvert.nsString(billingDetails["addressCity"])
-        billingAddres.postalCode = RCTConvert.nsString(billingDetails["addressPostalCode"])
-        billingAddres.country = RCTConvert.nsString(billingDetails["addressCountry"])
-        billingAddres.line1 = RCTConvert.nsString(billingDetails["addressLine1"])
-        billingAddres.line2 = RCTConvert.nsString(billingDetails["addressLine2"])
-        billingAddres.state = RCTConvert.nsString(billingDetails["addressState"])
-
-        billing.address = billingAddres
+        let address = STPPaymentMethodAddress()
+        
+        if let addressMap = billingDetails["address"] as? NSDictionary {
+            address.city = RCTConvert.nsString(addressMap["city"])
+            address.postalCode = RCTConvert.nsString(addressMap["postalCode"])
+            address.country = RCTConvert.nsString(addressMap["country"])
+            address.line1 = RCTConvert.nsString(addressMap["line1"])
+            address.line2 = RCTConvert.nsString(addressMap["line2"])
+            address.state = RCTConvert.nsString(addressMap["state"])
+        }
+        
+        billing.address = address
 
         return billing
     }
@@ -513,15 +517,18 @@ class Mappers {
         guard let shippingDetails = shippingDetails else {
             return nil
         }
-        let shippingAddress = STPPaymentIntentShippingDetailsAddressParams(line1: shippingDetails["addressLine1"] as? String ?? "")
-
-        shippingAddress.city = shippingDetails["addressCity"] as? String
-        shippingAddress.postalCode = shippingDetails["addressPostalCode"] as? String
-        shippingAddress.country = shippingDetails["addressCountry"] as? String
-        shippingAddress.line1 = shippingDetails["addressLine1"] as? String ?? ""
-        shippingAddress.line2 = shippingDetails["addressLine2"] as? String
-        shippingAddress.state = shippingDetails["addressState"] as? String
+        
+        let shippingAddress = STPPaymentIntentShippingDetailsAddressParams(line1: "")
 
+        if let addressMap = shippingDetails["address"] as? NSDictionary {
+            shippingAddress.city = addressMap["city"] as? String
+            shippingAddress.postalCode = addressMap["postalCode"] as? String
+            shippingAddress.country = addressMap["country"] as? String
+            shippingAddress.line1 = addressMap["line1"] as? String ?? ""
+            shippingAddress.line2 = addressMap["line2"] as? String
+            shippingAddress.state = addressMap["state"] as? String
+        }
+        
         let shipping = STPPaymentIntentShippingDetailsParams(address: shippingAddress, name: shippingDetails["name"] as? String ?? "")
 
         return shipping
@@ -545,7 +552,7 @@ class Mappers {
         return billing
     }
 
-    class func mapCardBrand(_ brand: STPCardBrand?) -> String? {
+    class func mapFromCardBrand(_ brand: STPCardBrand?) -> String? {
         if let brand = brand {
             switch brand {
             case STPCardBrand.visa: return "Visa"
@@ -561,13 +568,30 @@ class Mappers {
         }
         return nil
     }
+    
+    class func mapToCardBrand(_ brand: String?) -> STPCardBrand {
+        if let brand = brand {
+            switch brand {
+            case "Visa": return STPCardBrand.visa
+            case "AmericanExpress" : return STPCardBrand.amex
+            case "MasterCard": return STPCardBrand.mastercard
+            case "Discover": return STPCardBrand.discover
+            case "JCB": return STPCardBrand.JCB
+            case "DinersClub": return STPCardBrand.dinersClub
+            case "UnionPay": return STPCardBrand.unionPay
+            case "Unknown": return STPCardBrand.unknown
+            default: return STPCardBrand.unknown
+            }
+        }
+        return STPCardBrand.unknown
+    }
 
     class func mapFromPaymentMethod(_ paymentMethod: STPPaymentMethod?) -> NSDictionary? {
         guard let paymentMethod = paymentMethod else {
             return nil
         }
         let card: NSDictionary = [
-            "brand": Mappers.mapCardBrand(paymentMethod.card?.brand) ?? NSNull(),
+            "brand": Mappers.mapFromCardBrand(paymentMethod.card?.brand) ?? NSNull(),
             "country": paymentMethod.card?.country ?? NSNull(),
             "expYear": paymentMethod.card?.expYear ?? NSNull(),
             "expMonth": paymentMethod.card?.expMonth ?? NSNull(),
@@ -604,7 +628,7 @@ class Mappers {
         ]
         let method: NSDictionary = [
             "id": paymentMethod.stripeId,
-            "type": Mappers.mapPaymentMethodType(type: paymentMethod.type),
+            "paymentMethodType": Mappers.mapPaymentMethodType(type: paymentMethod.type),
             "livemode": paymentMethod.liveMode,
             "customerId": paymentMethod.customerId ?? NSNull(),
             "billingDetails": Mappers.mapFromBillingDetails(billingDetails: paymentMethod.billingDetails),
@@ -919,6 +943,15 @@ class Mappers {
         return "Unknown"
     }
 
+    class func mapToPKAddPassButtonStyle(style: String?) -> PKAddPassButtonStyle {
+        if let style = style {
+            if (style == "onDarkBackground") {
+                return .blackOutline
+            }
+        }
+        return .black
+    }
+
     class func mapFromUSBankAccountHolderType(type: STPPaymentMethodUSBankAccountHolderType?) -> String {
         if let type = type {
             switch type {