@stripe/stripe-react-native 0.14.0 → 0.17.0

package/.editorconfig

@@ -0,0 +1,15 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+
+indent_style = space
+indent_size = 2
+
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

package/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn lint && yarn typescript

package/CHANGELOG.md

@@ -2,6 +2,61 @@
 
 ## Unreleased
 
+## 0.17.0 - 2022-08-11
+
+### Breaking changes
+
+### New features
+
+- Added the [`collectBankAccountToken`](https://stripe.com/docs/financial-connections/connect-payouts?platform=react-native) & [`collectFinancialConnectionsAccounts`](https://stripe.com/docs/financial-connections/other-data-powered-products?platform=react-native) functions.
+
+### Fixes
+
+- Fixed an issue where `collectBankAccountForPayment` and `collectBankAccountForSetup` would fail on Android when using React Native 0.65.x or under. [#1059](https://github.com/stripe/stripe-react-native/pull/1059)
+- Fixed an issue where Android apps could crash with the error `IllegalStateException: Cannot remove Fragment attached to a different FragmentManager`. [#1054](https://github.com/stripe/stripe-react-native/pull/1054)
+- Bumped Gradle from 4.2.2 to 7.1.1. [#1058](https://github.com/stripe/stripe-react-native/pull/1058)
+
+## 0.16.0 - 2022-07-22
+
+### Breaking changes
+
+- The `<GooglePayButton />` component no longer overrides the `type` to use the dark mode version when the device is in Dark Mode. If you set the `type` value, it will always be respected. If you don't set the `type` value, it will match the system's theme (`standard_shadow` when in Light Mode, and `standard_dark` when in Dark Mode). [#1051](https://github.com/stripe/stripe-react-native/pull/1051)
+
+### New features
+
+- Added support for `pay_dark` and `standard_dark` to the `<GooglePayButton />` component's `type` prop. This allows you to display the [dark Google Pay button](https://developers.google.com/pay/api/android/guides/brand-guidelines). [#1051](https://github.com/stripe/stripe-react-native/pull/1051)
+- Added support for `borderColor`, `borderRadius`, and `cursorColor` to `CardForm`'s `cardStyle` prop on iOS (already exists on Android). [#1048](https://github.com/stripe/stripe-react-native/pull/1048)
+
+### Fixes
+
+- Reduced the size of the `@stripe/stripe-react-native` by preventing unnecessary files from being published. [#1043](https://github.com/stripe/stripe-react-native/pull/1043)
+
+## 0.15.0 - 2022-07-14
+
+### Breaking changes
+
+- [#1020](https://github.com/stripe/stripe-react-native/pull/1020) Changed some of fields for the `params` object that is supplied to `initPaymentSheet(params)`:
+  - **Changed the `applePay` field**. Previously this field accepted a boolean, now it accepts an object of type `ApplePayParams`, which includes the `merchantCountryCode` field, and a new `paymentSummaryItems` field (see "New features" below).
+  - **Changed the `googlePay` field**. Previously this field accepted a boolean, now it accepts an object of type `GooglePayParams`, which includes the `merchantCountryCode`, `currencyCode`, and `testEnv` fields.
+  - Since the `merchantCountryCode` field now lives under the `applePay` and `googlePay` objects, it has been removed from the base `params` object.
+  - Similarly, since the `currencyCode` and `testEnv` fields now live under the `googlePay` object, they have been removed from the base `params` object .
+- [#1020](https://github.com/stripe/stripe-react-native/pull/1020) In `ApplePay.CartSummaryItem`:
+  - Renamed `type` to `isPending`- (if you had `type: 'pending'`, replace it with `isPending: true`. if `type: 'final'`, either remove it or set `isPending: false`).
+    - The same change was made to `ApplePay.ShippingMethod`: renamed `type` to `isPending`.
+  - Added a **new** `paymentType` field. This field is **required**, and in all pre-existing cases where you created a `CartSummaryItem`, should be set to `paymentType: 'Immediate'` (support for types `Deferred` and `Recurring` wasn't available until this release).
+
+### New features
+
+- Added support for iOS 15 `paymentSummaryItems`: `PKDeferredPaymentSummaryItem` and `PKRecurringPaymentSummaryItem`.
+- You can now specify Apple Pay line items to be displayed when paying with Apple Pay in PaymentSheet by providing `applePay.paymentSummaryItems` to the `initPaymentSheet` method. [#1020](https://github.com/stripe/stripe-react-native/pull/1020)
+- Added support for Affirm (previously, Affirm was only available in the Payment Sheet). [1036](https://github.com/stripe/stripe-react-native/pull/1036)
+
+### Fixes
+
+- Fixed behavior of `CardField` and `CardForm` on Android to match that on iOS; postal code input no longer accepts characters that are never present in postal codes (anything besides 0-9, a-z, A-Z, hyphens, and whitespace). [#1027](https://github.com/stripe/stripe-react-native/pull/1027).
+- Fixed an issue on older version of React Native where calling `collectBankAccountForSetup` or `collectBankAccountForPayment` and getting a `Canceled` result could cause a crash. [#1037](https://github.com/stripe/stripe-react-native/pull/1037)
+- Fixed an issue where some Android builds would fail on the `lintVitalRelease` step. [#1038](https://github.com/stripe/stripe-react-native/pull/1038)
+
 ## 0.14.0 - 2022-06-30
 
 ### Breaking changes

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.2.2'
+    classpath 'com.android.tools.build:gradle:7.1.1'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -153,8 +153,3 @@ dependencies {
   androidTestImplementation 'androidx.test:runner:1.1.0'
   androidTestImplementation "org.mockito:mockito-core:3.+"
 }
-
-configurations {
-    // We want to include all of our compileOnly libraries in our tests
-    androidTestImplementation.extendsFrom compileOnly
-}

package/android/src/main/java/com/reactnativestripesdk/AuBECSDebitFormView.kt

@@ -10,6 +10,8 @@ import com.facebook.react.uimanager.events.EventDispatcher
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
+import com.reactnativestripesdk.utils.getIntOrNull
+import com.reactnativestripesdk.utils.getValOr
 import com.stripe.android.databinding.BecsDebitWidgetBinding
 import com.stripe.android.model.PaymentMethodCreateParams
 import com.stripe.android.view.BecsDebitWidget

package/android/src/main/java/com/reactnativestripesdk/CardFieldView.kt

@@ -5,6 +5,7 @@ import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Build
 import android.text.Editable
+import android.text.InputFilter
 import android.text.TextWatcher
 import android.util.Log
 import android.widget.FrameLayout
@@ -16,6 +17,8 @@ import com.facebook.react.uimanager.events.EventDispatcher
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
+import com.reactnativestripesdk.utils.*
+import com.reactnativestripesdk.utils.mapCardBrand
 import com.stripe.android.core.model.CountryCode
 import com.stripe.android.core.model.CountryUtils
 import com.stripe.android.databinding.CardInputWidgetBinding
@@ -25,7 +28,6 @@ import com.stripe.android.view.CardInputListener
 import com.stripe.android.view.CardInputWidget
 import com.stripe.android.view.CardValidCallback
 import com.stripe.android.view.StripeEditText
-import java.lang.Exception
 
 class CardFieldView(context: ThemedReactContext) : FrameLayout(context) {
   private var mCardWidget: CardInputWidget = CardInputWidget(context)
@@ -205,12 +207,11 @@ class CardFieldView(context: ThemedReactContext) : FrameLayout(context) {
    * We can reliable assume that setPostalCodeEnabled is called before
    * setCountryCode because of the order of the props in CardField.tsx
    */
-  fun setCountryCode(countryCode: String?) {
+  fun setCountryCode(countryString: String?) {
     if (mCardWidget.postalCodeEnabled) {
-      val doesCountryUsePostalCode = CountryUtils.doesCountryUsePostalCode(
-        CountryCode.create(value = countryCode ?: LocaleListCompat.getAdjustedDefault()[0].country)
-      )
-      mCardWidget.postalCodeRequired = doesCountryUsePostalCode
+      val countryCode = CountryCode.create(value = countryString ?: LocaleListCompat.getAdjustedDefault()[0].country)
+      mCardWidget.postalCodeRequired = CountryUtils.doesCountryUsePostalCode(countryCode)
+      setPostalCodeFilter(countryCode)
     }
   }
 
@@ -336,6 +337,26 @@ class CardFieldView(context: ThemedReactContext) : FrameLayout(context) {
     })
   }
 
+  private fun setPostalCodeFilter(countryCode: CountryCode) {
+    cardInputWidgetBinding.postalCodeEditText.filters = arrayOf(
+      *cardInputWidgetBinding.postalCodeEditText.filters,
+      createPostalCodeInputFilter(countryCode)
+    )
+  }
+
+  private fun createPostalCodeInputFilter(countryCode: CountryCode): InputFilter {
+    return InputFilter { charSequence, start, end, _, _, _ ->
+      for (i in start until end) {
+        val isValidCharacter = (countryCode == CountryCode.US && PostalCodeUtilities.isValidUsPostalCodeCharacter(charSequence[i])) ||
+          (countryCode != CountryCode.US && PostalCodeUtilities.isValidGlobalPostalCodeCharacter(charSequence[i]))
+        if (!isValidCharacter) {
+          return@InputFilter ""
+        }
+      }
+      return@InputFilter null
+    }
+  }
+
   override fun requestLayout() {
     super.requestLayout()
     post(mLayoutRunnable)

package/android/src/main/java/com/reactnativestripesdk/CardFormView.kt

@@ -4,6 +4,7 @@ import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Build
+import android.text.InputFilter
 import android.view.View
 import android.view.View.OnFocusChangeListener
 import android.widget.FrameLayout
@@ -14,6 +15,8 @@ import com.facebook.react.uimanager.events.EventDispatcher
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
+import com.reactnativestripesdk.utils.*
+import com.reactnativestripesdk.utils.mapCardBrand
 import com.stripe.android.core.model.CountryCode
 import com.stripe.android.databinding.CardMultilineWidgetBinding
 import com.stripe.android.databinding.StripeCardFormViewBinding
@@ -50,10 +53,15 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) {
   }
 
   fun setDefaultValues(defaults: ReadableMap) {
-    defaults.getString("countryCode")?.let {
-      cardFormViewBinding.countryLayout.setSelectedCountryCode(CountryCode(it))
-      cardFormViewBinding.countryLayout.updateUiForCountryEntered(CountryCode(it))
+    setCountry(defaults.getString("countryCode"))
+  }
+
+  private fun setCountry(countryString: String?) {
+    if (countryString != null) {
+      cardFormViewBinding.countryLayout.setSelectedCountryCode(CountryCode(countryString))
+      cardFormViewBinding.countryLayout.updateUiForCountryEntered(CountryCode(countryString))
     }
+    setPostalCodeFilter()
   }
 
   fun setPlaceHolders(value: ReadableMap) {
@@ -254,6 +262,29 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) {
     }
   }
 
+  private fun setPostalCodeFilter() {
+    cardFormViewBinding.postalCode.filters = arrayOf(
+      *cardFormViewBinding.postalCode.filters,
+      createPostalCodeInputFilter()
+    )
+  }
+
+  private fun createPostalCodeInputFilter(): InputFilter {
+    return InputFilter { charSequence, start, end, _, _, _ ->
+      if (cardFormViewBinding.countryLayout.getSelectedCountryCode() == CountryCode.US) {
+        // Rely on CardFormView's built-in US postal code filter
+        return@InputFilter null
+      }
+
+      for (i in start until end) {
+        if (!PostalCodeUtilities.isValidGlobalPostalCodeCharacter(charSequence[i])) {
+          return@InputFilter ""
+        }
+      }
+      return@InputFilter null
+    }
+  }
+
   override fun requestLayout() {
     super.requestLayout()
     post(mLayoutRunnable)

package/android/src/main/java/com/reactnativestripesdk/CollectBankAccountLauncherFragment.kt

@@ -9,6 +9,11 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
+import com.reactnativestripesdk.utils.*
+import com.reactnativestripesdk.utils.createError
+import com.reactnativestripesdk.utils.createResult
+import com.reactnativestripesdk.utils.mapFromPaymentIntentResult
+import com.reactnativestripesdk.utils.mapFromSetupIntentResult
 import com.stripe.android.model.PaymentIntent
 import com.stripe.android.model.SetupIntent
 import com.stripe.android.model.StripeIntent
@@ -78,7 +83,11 @@ class CollectBankAccountLauncherFragment(
           promise.resolve(createError(ErrorType.Failed.toString(), result.error))
         }
       }
-      (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
+      removeFragment(context)
     }
   }
+
+  companion object {
+    const val TAG = "collect_bank_account_launcher_fragment"
+  }
 }

package/android/src/main/java/com/reactnativestripesdk/FinancialConnectionsSheetFragment.kt

@@ -0,0 +1,284 @@
+package com.reactnativestripesdk
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import com.facebook.react.bridge.*
+import com.reactnativestripesdk.utils.*
+import com.reactnativestripesdk.utils.createError
+import com.reactnativestripesdk.utils.createMissingActivityError
+import com.reactnativestripesdk.utils.createResult
+import com.reactnativestripesdk.utils.mapFromToken
+import com.stripe.android.financialconnections.FinancialConnectionsSheet
+import com.stripe.android.financialconnections.FinancialConnectionsSheetForTokenResult
+import com.stripe.android.financialconnections.FinancialConnectionsSheetResult
+import com.stripe.android.financialconnections.FinancialConnectionsSheetResultCallback
+import com.stripe.android.financialconnections.model.*
+
+class FinancialConnectionsSheetFragment : Fragment() {
+  enum class Mode {
+    ForToken, ForSession
+  }
+
+  private lateinit var promise: Promise
+  private lateinit var context: ReactApplicationContext
+  private lateinit var clientSecret: String
+  private lateinit var publishableKey: String
+  private lateinit var mode: Mode
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                            savedInstanceState: Bundle?): View {
+    return FrameLayout(requireActivity()).also {
+      it.visibility = View.GONE
+    }
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    when (mode) {
+      Mode.ForToken -> {
+        FinancialConnectionsSheet.createForBankAccountToken(
+          this,
+          ::onFinancialConnectionsSheetForTokenResult
+        ).present(
+          configuration = FinancialConnectionsSheet.Configuration(
+            financialConnectionsSessionClientSecret = clientSecret,
+            publishableKey = publishableKey
+          )
+        )
+      }
+      Mode.ForSession -> {
+        FinancialConnectionsSheet.create(
+          this,
+          ::onFinancialConnectionsSheetForDataResult
+        ).present(
+          configuration = FinancialConnectionsSheet.Configuration(
+            financialConnectionsSessionClientSecret = clientSecret,
+            publishableKey = publishableKey
+          )
+        )
+      }
+    }
+  }
+
+  private fun onFinancialConnectionsSheetForTokenResult(result: FinancialConnectionsSheetForTokenResult) {
+    when(result) {
+      is FinancialConnectionsSheetForTokenResult.Canceled -> {
+        promise.resolve(
+          createError(ErrorType.Canceled.toString(), "The flow has been canceled")
+        )
+      }
+      is FinancialConnectionsSheetForTokenResult.Failed -> {
+        promise.resolve(
+          createError(ErrorType.Failed.toString(), result.error)
+        )
+      }
+      is FinancialConnectionsSheetForTokenResult.Completed -> {
+        promise.resolve(createTokenResult(result))
+        (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
+      }
+    }
+  }
+
+  private fun onFinancialConnectionsSheetForDataResult(result: FinancialConnectionsSheetResult) {
+    when(result) {
+      is FinancialConnectionsSheetResult.Canceled -> {
+        promise.resolve(
+          createError(ErrorType.Canceled.toString(), "The flow has been canceled")
+        )
+      }
+      is FinancialConnectionsSheetResult.Failed -> {
+        promise.resolve(
+          createError(ErrorType.Failed.toString(), result.error)
+        )
+      }
+      is FinancialConnectionsSheetResult.Completed -> {
+        promise.resolve(
+            WritableNativeMap().also {
+              it.putMap("session", mapFromSession(result.financialConnectionsSession))
+            }
+        )
+        (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
+      }
+    }
+  }
+
+  fun presentFinancialConnectionsSheet(clientSecret: String, mode: Mode, publishableKey: String, promise: Promise, context: ReactApplicationContext) {
+    this.promise = promise
+    this.context = context
+    this.clientSecret = clientSecret
+    this.publishableKey = publishableKey
+    this.mode = mode
+
+    (context.currentActivity as? AppCompatActivity)?.let {
+      attemptToCleanupPreviousFragment(it)
+      commitFragmentAndStartFlow(it)
+    } ?: run {
+      promise.resolve(createMissingActivityError())
+      return
+    }
+  }
+
+  private fun attemptToCleanupPreviousFragment(currentActivity: AppCompatActivity) {
+    currentActivity.supportFragmentManager.beginTransaction()
+      .remove(this)
+      .commitAllowingStateLoss()
+  }
+
+  private fun commitFragmentAndStartFlow(currentActivity: AppCompatActivity) {
+    try {
+      currentActivity.supportFragmentManager.beginTransaction()
+        .add(this, "financial_connections_sheet_launch_fragment")
+        .commit()
+    } catch (error: IllegalStateException) {
+      promise.resolve(createError(ErrorType.Failed.toString(), error.message))
+    }
+  }
+
+  companion object {
+    private fun createTokenResult(result: FinancialConnectionsSheetForTokenResult.Completed): WritableMap {
+      return WritableNativeMap().also {
+        it.putMap("session", mapFromSession(result.financialConnectionsSession))
+        it.putMap("token", mapFromToken(result.token))
+      }
+    }
+
+    private fun mapFromSession(financialConnectionsSession: FinancialConnectionsSession): WritableMap {
+      val session = WritableNativeMap()
+      session.putString("id", financialConnectionsSession.id)
+      session.putString("clientSecret", financialConnectionsSession.clientSecret)
+      session.putBoolean("livemode", financialConnectionsSession.livemode)
+      session.putArray("accounts", mapFromAccountsList(financialConnectionsSession.accounts))
+      return session
+    }
+
+    private fun mapFromAccountsList(accounts: FinancialConnectionsAccountList): ReadableArray {
+      val results: WritableArray = Arguments.createArray()
+      for (account in accounts.data) {
+        val map = WritableNativeMap()
+        map.putString("id", account.id)
+        map.putBoolean("livemode", account.livemode)
+        map.putString("displayName", account.displayName)
+        map.putString("status", mapFromStatus(account.status))
+        map.putString("institutionName", account.institutionName)
+        map.putString("last4", account.last4)
+        map.putDouble("created", account.created * 1000.0)
+        map.putMap("balance", mapFromAccountBalance(account.balance))
+        map.putMap("balanceRefresh", mapFromAccountBalanceRefresh(account.balanceRefresh))
+        map.putString("category", mapFromCategory(account.category))
+        map.putString("subcategory", mapFromSubcategory(account.subcategory))
+        map.putArray("permissions", (account.permissions?.map { permission -> mapFromPermission(permission) })?.toReadableArray())
+        map.putArray("supportedPaymentMethodTypes", (account.supportedPaymentMethodTypes.map { type -> mapFromSupportedPaymentMethodTypes(type) }).toReadableArray())
+        results.pushMap(map)
+      }
+      return results
+    }
+
+    private fun mapFromAccountBalance(balance: Balance?): WritableMap? {
+      if (balance == null) {
+        return null
+      }
+      val map = WritableNativeMap()
+      map.putDouble("asOf", balance.asOf * 1000.0)
+      map.putString("type", mapFromBalanceType(balance.type))
+      map.putMap("current", balance.current as ReadableMap)
+      WritableNativeMap().also {
+        it.putMap("available", balance.cash?.available as ReadableMap)
+        map.putMap("cash", it)
+      }
+      WritableNativeMap().also {
+        it.putMap("used", balance.credit?.used as ReadableMap)
+        map.putMap("credit", it)
+      }
+      return map
+    }
+
+    private fun mapFromAccountBalanceRefresh(balanceRefresh: BalanceRefresh?): WritableMap? {
+      if (balanceRefresh == null) {
+        return null
+      }
+      val map = WritableNativeMap()
+      map.putString("status", mapFromBalanceRefreshStatus(balanceRefresh.status))
+      map.putDouble("lastAttemptedAt", balanceRefresh.lastAttemptedAt * 1000.0)
+      return map
+    }
+
+    private fun mapFromStatus(status: FinancialConnectionsAccount.Status): String {
+      return when (status) {
+        FinancialConnectionsAccount.Status.ACTIVE -> "active"
+        FinancialConnectionsAccount.Status.DISCONNECTED -> "disconnected"
+        FinancialConnectionsAccount.Status.INACTIVE -> "inactive"
+        FinancialConnectionsAccount.Status.UNKNOWN -> "unparsable"
+      }
+    }
+
+    private fun mapFromCategory(category: FinancialConnectionsAccount.Category): String {
+      return when (category) {
+        FinancialConnectionsAccount.Category.CASH -> "cash"
+        FinancialConnectionsAccount.Category.CREDIT -> "credit"
+        FinancialConnectionsAccount.Category.INVESTMENT -> "investment"
+        FinancialConnectionsAccount.Category.OTHER -> "other"
+        FinancialConnectionsAccount.Category.UNKNOWN -> "unparsable"
+      }
+    }
+
+    private fun mapFromSubcategory(subcategory: FinancialConnectionsAccount.Subcategory): String {
+      return when (subcategory) {
+        FinancialConnectionsAccount.Subcategory.CHECKING -> "checking"
+        FinancialConnectionsAccount.Subcategory.CREDIT_CARD -> "creditCard"
+        FinancialConnectionsAccount.Subcategory.LINE_OF_CREDIT -> "lineOfCredit"
+        FinancialConnectionsAccount.Subcategory.MORTGAGE -> "mortgage"
+        FinancialConnectionsAccount.Subcategory.OTHER -> "other"
+        FinancialConnectionsAccount.Subcategory.SAVINGS -> "savings"
+        FinancialConnectionsAccount.Subcategory.UNKNOWN -> "unparsable"
+      }
+    }
+
+    private fun mapFromPermission(permission: FinancialConnectionsAccount.Permissions): String {
+      return when (permission) {
+        FinancialConnectionsAccount.Permissions.PAYMENT_METHOD -> "paymentMethod"
+        FinancialConnectionsAccount.Permissions.BALANCES -> "balances"
+        FinancialConnectionsAccount.Permissions.OWNERSHIP -> "ownership"
+        FinancialConnectionsAccount.Permissions.TRANSACTIONS -> "transactions"
+        FinancialConnectionsAccount.Permissions.UNKNOWN -> "unparsable"
+      }
+    }
+
+    private fun mapFromSupportedPaymentMethodTypes(type: FinancialConnectionsAccount.SupportedPaymentMethodTypes): String {
+      return when (type) {
+        FinancialConnectionsAccount.SupportedPaymentMethodTypes.US_BANK_ACCOUNT -> "usBankAccount"
+        FinancialConnectionsAccount.SupportedPaymentMethodTypes.LINK -> "link"
+        FinancialConnectionsAccount.SupportedPaymentMethodTypes.UNKNOWN -> "unparsable"
+      }
+    }
+
+    private fun mapFromBalanceType(type: Balance.Type): String {
+      return when (type) {
+        Balance.Type.CASH -> "cash"
+        Balance.Type.CREDIT -> "credit"
+        Balance.Type.UNKNOWN -> "unparsable"
+      }
+    }
+
+    private fun mapFromBalanceRefreshStatus(status: BalanceRefresh.BalanceRefreshStatus?): String {
+      return when (status) {
+        BalanceRefresh.BalanceRefreshStatus.SUCCEEDED -> "succeeded"
+        BalanceRefresh.BalanceRefreshStatus.FAILED -> "failed"
+        BalanceRefresh.BalanceRefreshStatus.PENDING -> "pending"
+        BalanceRefresh.BalanceRefreshStatus.UNKNOWN -> "unparsable"
+        null -> "null"
+      }
+    }
+  }
+}
+
+fun List<String>.toReadableArray(): ReadableArray {
+  val results: WritableArray = Arguments.createArray()
+  for (s in this) {
+    results.pushString(s)
+  }
+  return results
+}

package/android/src/main/java/com/reactnativestripesdk/GooglePayButtonView.kt

@@ -1,5 +1,6 @@
 package com.reactnativestripesdk
 
+import android.content.res.Configuration
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import com.facebook.react.uimanager.ThemedReactContext
@@ -8,13 +9,17 @@ class GooglePayButtonView(private val context: ThemedReactContext) : FrameLayout
   private var buttonType: String? = null
 
   fun initialize() {
-    val type = when (buttonType) {
-      "pay" -> R.layout.pay_with_googlepay_button_no_shadow
-      "pay_shadow" -> R.layout.pay_with_googlepay_button
-      "standard_shadow" -> R.layout.googlepay_button
-      "standard" -> R.layout.googlepay_button_no_shadow
-      else -> R.layout.googlepay_button
-    }
+    val type =
+      when (buttonType) {
+        "pay" -> R.layout.pay_with_googlepay_button_no_shadow
+        "pay_dark" -> R.layout.pay_with_googlepay_button_dark
+        "pay_shadow" -> R.layout.pay_with_googlepay_button
+        "standard" -> R.layout.googlepay_button_no_shadow
+        "standard_dark" -> R.layout.googlepay_button_dark
+        "standard_shadow" -> R.layout.googlepay_button
+        else -> if (isNightMode()) R.layout.googlepay_button_dark else R.layout.googlepay_button
+      }
+
     val button = LayoutInflater.from(context).inflate(
       type, null
     )
@@ -25,4 +30,9 @@ class GooglePayButtonView(private val context: ThemedReactContext) : FrameLayout
   fun setType(type: String) {
     buttonType = type
   }
+
+  private fun isNightMode(): Boolean {
+    val nightModeFlags: Int = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+    return nightModeFlags == Configuration.UI_MODE_NIGHT_YES
+  }
 }

package/android/src/main/java/com/reactnativestripesdk/GooglePayFragment.kt

@@ -8,6 +8,10 @@ import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.WritableNativeMap
+import com.reactnativestripesdk.utils.GooglePayErrorType
+import com.reactnativestripesdk.utils.createError
+import com.reactnativestripesdk.utils.createResult
+import com.reactnativestripesdk.utils.mapFromPaymentMethod
 import com.stripe.android.googlepaylauncher.GooglePayEnvironment
 import com.stripe.android.googlepaylauncher.GooglePayLauncher
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
@@ -200,4 +204,8 @@ class GooglePayFragment(private val initPromise: Promise) : Fragment() {
       isPhoneNumberRequired = isPhoneNumberRequired
     )
   }
+
+  companion object {
+    const val TAG = "google_pay_launch_fragment"
+  }
 }

package/android/src/main/java/com/reactnativestripesdk/GooglePayPaymentMethodLauncherFragment.kt

@@ -5,10 +5,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
+import com.reactnativestripesdk.utils.removeFragment
 import com.stripe.android.googlepaylauncher.GooglePayEnvironment
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
 
@@ -37,9 +37,13 @@ class GooglePayPaymentMethodLauncherFragment(
       ),
       readyCallback = {
         promise.resolve(it)
-        (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
+        removeFragment(context)
       },
       resultCallback = {}
     )
   }
+
+  companion object {
+    const val TAG = "google_pay_support_fragment"
+  }
 }