@stripe/stripe-react-native 0.13.1 → 0.14.0

package/CHANGELOG.md

@@ -2,7 +2,23 @@
 
 ## Unreleased
 
-## 0.13.1
+## 0.14.0 - 2022-06-30
+
+### Breaking changes
+
+### New features
+
+- Added the `canAddCardToWallet` method. [#986](https://github.com/stripe/stripe-react-native/pull/986).
+
+### Fixes
+
+- Fix build errors on Xcode 14 beta 1 by upgrading `stripe-ios` to `~>22.5.1`. [#1011](https://github.com/stripe/stripe-react-native/pull/1011)
+- Fixed an issue on Android where the `brand` field in `CardField`'s `onCardChange` callback wouldn't be set unless the card details were fully complete. [#1012](https://github.com/stripe/stripe-react-native/pull/1012)
+- Fixed an issue where Payment Sheet would cause crashes on Android if `merchantDisplayName` wasn't provided. [#1015](https://github.com/stripe/stripe-react-native/pull/1015)
+- Fixed a bug on Android where a crash could occur if the PaymentSheet was canceled and opened again. [#1014](https://github.com/stripe/stripe-react-native/pull/1014)
+- Fixed an instance on iOS where `CardField`'s expiry date would remain marked as valid, even when it's invalid. [#1018](https://github.com/stripe/stripe-react-native/issues/1018)
+
+## 0.13.1 - 2022-06-16
 
 ### Breaking changes
 
@@ -12,7 +28,7 @@
 
 - Never show postal code input in `CardField` if `postalCodeEnabled=false` (regardless of `countryCode`). [#996](https://github.com/stripe/stripe-react-native/pull/996)
 
-## 0.13.0
+## 0.13.0 - 2022-06-15
 
 ### Breaking changes
 
@@ -28,7 +44,7 @@
 - Fixed an issue on Android where the `complete` field in the `onCardChange` callback would incorrectly be set to `true` even if the postal code wasn't filled out. [#989](https://github.com/stripe/stripe-react-native/pull/989)
 - Make `SetupIntent.lastSetupError` and `PaymentIntent.lastPaymentError` object shape consistent on iOS and Android.[#990](https://github.com/stripe/stripe-react-native/pull/990)
 
-## 0.12.0
+## 0.12.0 - 2022-06-02
 
 ### Breaking changes
 
@@ -44,7 +60,7 @@
 - Fixed a bug where the wrong CVC icon was show in the `CardForm` component on Android. [#966](https://github.com/stripe/stripe-react-native/pull/966)
 - The card brand tint color is now correctly set in the `CardField` component on Android via the `cardStyle.textColor` prop. [#851](https://github.com/stripe/stripe-react-native/pull/851)
 
-## 0.11.0
+## 0.11.0 - 2022-05-24
 
 ### Breaking changes
 
@@ -60,7 +76,7 @@
 - Improved error messages on Android for failed `confirmPayment` and `confirmSetupIntent` calls, and any Google Pay related methods. [#957](https://github.com/stripe/stripe-react-native/pull/957)
 - Made Android card validation state consistent with iOS in the `CardField` `onCardChange` callback. [#958](https://github.com/stripe/stripe-react-native/pull/958)
 
-## 0.10.0
+## 0.10.0 - 2022-05-19
 
 ### Breaking changes
 
@@ -72,7 +88,7 @@
 
 ### Fixes
 
-## 0.9.0
+## 0.9.0 - 2022-05-10
 
 - [#913](https://github.com/stripe/stripe-react-native/pull/913) BREAKING CHANGE: Changed props for the `<AddToWalletButton />` component. Instead of passing `cardHolderName`, `cardLastFour`, `cardDescription`, and `cardBrand` directly as props, you will instead pass a `cardDetails` prop, which is an object containing the following fields:
   - `primaryAccountIdentifier`: The `wallet.primary_account_identifier` value from the issued card.
@@ -89,7 +105,7 @@
 - [#914](https://github.com/stripe/stripe-react-native/pull/914) fix: add `fingerprint` to Card result object on Android (already present on iOS)
 - [#912](https://github.com/stripe/stripe-react-native/pull/912) fix: allow for providing zip code straight from `CardField` component on Android
 
-## 0.8.0
+## 0.8.0 - 2022-04-27
 
 - **Breaking: This version requires you use `react-native@0.64.0` or above**
 - [#902](https://github.com/stripe/stripe-react-native/pull/902) fix: create custom babel plugin for package.json imports in src/
@@ -99,7 +115,7 @@
 - [#849](https://github.com/stripe/stripe-react-native/pull/849) BREAKING CHANGE: Renamed `placeholder` prop on `<CardField />` and `<CardForm />` to `placeholders`.
 - [#849](https://github.com/stripe/stripe-react-native/pull/849) Feat: Added customized styling options to `<CardForm />` on Android.
 
-## 0.7.0
+## 0.7.0 - 2022-04-19
 
 - [#894](https://github.com/stripe/stripe-react-native/pull/894) Fix: `<CardField />` `onBlur` callback will now be called appropriately on Android
 - [#846](https://github.com/stripe/stripe-react-native/pull/846) Fix: Avoid crashes when `currentActivity` is null
@@ -143,21 +159,21 @@
   - (Typescript) `GooglePay.IsGooglePaySupportedParams` is now `GooglePay.IsSupportedParams`
   - (Typescript) Removed `GooglePay.SetupIntentParams`
 
-## 0.6.0
+## 0.6.0 - 2022-04-01
 
 - [#861](https://github.com/stripe/stripe-react-native/pull/861) BREAKING: This library now supports iOS 12 and up, due to `stripe-ios` increasing the deployment target. If you would like to build for iOS 11, please continue to use `@stripe/stripe-react-native@0.5.0`.
   - To upgrade your iOS deployment target to 12.0, you can either do so in Xcode under your `Build Settings`, or by modifying `IPHONEOS_DEPLOYMENT_TARGET` in your `project.pbxproj` directly. You will also need to update your Podfile to target `:ios, '12.0'`.
 - [#861](https://github.com/stripe/stripe-react-native/pull/861) Feat: Add support for ACHv2 payments **on iOS only**.
 - [#861](https://github.com/stripe/stripe-react-native/pull/861) Chore: Upgrade `stripe-ios` to 22.0.0.
 
-## 0.5.0
+## 0.5.0 - 2022-03-29
 
 - [#863](https://github.com/stripe/stripe-react-native/pull/863) Feat: add card ID and bankAccount ID to token response
 - [#862](https://github.com/stripe/stripe-react-native/pull/862) Feat: Add support for setting a card's `currency` when creating a Token
 - [#854](https://github.com/stripe/stripe-react-native/pull/854) Chore: Upgrade `stripe-ios` to 21.13.0. Upgrade `stripe-android` to 19.3.0.
 - [#845](https://github.com/stripe/stripe-react-native/pull/845) Feat: Added support for `placeholderColor`, `textErrorColor `, `borderColor`, `borderRadius`, and `borderWidth` for `AuBECSDebitForm` on iOS
 
-## 0.4.0
+## 0.4.0 - 2022-03-10
 
 - [#821](https://github.com/stripe/stripe-react-native/pull/821) Feat: Add support for Klarna
 - [#630](https://github.com/stripe/stripe-react-native/pull/630) Fix: card field focus jumps back to the card number field on Android

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue Jun 21 15:53:42 EDT 2022
+gradle.version=7.1

package/android/.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

package/android/.idea/gradle.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

package/android/.idea/misc.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

package/android/.idea/modules/android.iml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
+        <option name="LAST_KNOWN_AGP_VERSION" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../.." />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/android/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/android.iml" filepath="$PROJECT_DIR$/.idea/modules/android.iml" />
+    </modules>
+  </component>
+</project>

package/android/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

package/android/.idea/workspace.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="6bd19f01-32d7-4d37-8b5e-6bd0f29ff270" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/src/androidTest/java/com/reactnativestripesdk/pushprovisioning/PushProvisioningProxyTest.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../ios/StripeSdk.xcodeproj/project.pbxproj" beforeDir="false" afterPath="$PROJECT_DIR$/../ios/StripeSdk.xcodeproj/project.pbxproj" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="ProjectId" id="2AtuQTRuDgWJsBWelsxPwKKLnTE" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="RunOnceActivity.cidr.known.project.marker" value="true" />
+    <property name="cidr.known.project.marker" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CreateTestDialog.Recents.Supers">
+      <recent name="" />
+    </key>
+    <key name="CreateTestDialog.RecentsKey">
+      <recent name="" />
+    </key>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="6bd19f01-32d7-4d37-8b5e-6bd0f29ff270" name="Changes" comment="" />
+      <created>1655841188103</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1655841188103</updated>
+    </task>
+    <servers />
+  </component>
+</project>

package/android/build.gradle

@@ -34,6 +34,7 @@ android {
     versionCode 1
     versionName "1.0"
     vectorDrawables.useSupportLibrary = true
+    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
 
   buildTypes {
@@ -146,4 +147,14 @@ dependencies {
 
   // Users need to declare this dependency on their own, otherwise all methods are a no-op
   compileOnly 'com.stripe:stripe-android-issuing-push-provisioning:1.1.0'
+
+  androidTestImplementation "junit:junit:4.13"
+  androidTestImplementation "androidx.test:core:1.4.0"
+  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/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Jun 21 15:53:06 EDT 2022
+sdk.dir=/Users/charliecruzan/Library/Android/sdk

package/android/src/androidTest/java/com/reactnativestripesdk/pushprovisioning/PushProvisioningProxyTest.kt

@@ -0,0 +1,35 @@
+package com.reactnativestripesdk.pushprovisioning
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.facebook.react.bridge.ReactApplicationContext
+import org.junit.Assert.*
+import org.junit.Test
+
+class PushProvisioningProxyTest {
+  private val reactApplicationContext = ReactApplicationContext(
+    ApplicationProvider.getApplicationContext<Context>()
+  )
+
+  @Test
+  fun getApiVersion() {
+    // This value very rarely changes, so the test is hard coded
+    assertEquals(
+      "2019-09-09",
+      PushProvisioningProxy.getApiVersion()
+    )
+  }
+
+  @Test
+  fun isNFCEnabled() {
+    assertEquals(
+      false,
+      PushProvisioningProxy.isNFCEnabled(reactApplicationContext)
+    )
+  }
+
+  @Test
+  fun isTokenInWallet() {
+    assertEquals(TapAndPayProxy.isTokenInWallet({}, "4242"), false)
+  }
+}

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

@@ -275,6 +275,7 @@ class CardFieldView(context: ThemedReactContext) : FrameLayout(context) {
       cardDetails["validNumber"] = getCardValidationState(CardValidCallback.Fields.Number, cardInputWidgetBinding.cardNumberEditText)
       cardDetails["validCVC"] = getCardValidationState(CardValidCallback.Fields.Cvc, cardInputWidgetBinding.cvcEditText)
       cardDetails["validExpiryDate"] = getCardValidationState(CardValidCallback.Fields.Expiry, cardInputWidgetBinding.expiryDateEditText)
+      cardDetails["brand"] = mapCardBrand(cardInputWidgetBinding.cardNumberEditText.cardBrand)
 
       if (isValid) {
         onValidCardChange()

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

@@ -14,6 +14,22 @@ internal fun createResult(key: String, value: WritableMap): WritableMap {
   return map
 }
 
+internal fun createCanAddCardResult(canAddCard: Boolean, status: String? = null, token: WritableMap? = null): WritableNativeMap {
+  val result = WritableNativeMap()
+  val details = WritableNativeMap()
+  if (status != null) {
+    result.putBoolean("canAddCard", false)
+    details.putString("status", status)
+  } else {
+    result.putBoolean("canAddCard", canAddCard)
+    if (token != null) {
+      details.putMap("token", token)
+    }
+  }
+  result.putMap("details", details)
+  return result
+}
+
 internal fun mapIntentStatus(status: StripeIntent.Status?): String {
   return when (status) {
     StripeIntent.Status.Succeeded -> "Succeeded"

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

@@ -49,6 +49,10 @@ class PaymentSheetFragment(
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     val merchantDisplayName = arguments?.getString("merchantDisplayName").orEmpty()
+    if (merchantDisplayName.isEmpty()) {
+      initPromise.resolve(createError(ErrorType.Failed.toString(), "merchantDisplayName cannot be empty or null."))
+      return
+    }
     val customerId = arguments?.getString("customerId").orEmpty()
     val customerEphemeralKeySecret = arguments?.getString("customerEphemeralKeySecret").orEmpty()
     val countryCode = arguments?.getString("merchantCountryCode").orEmpty()
@@ -98,9 +102,10 @@ class PaymentSheetFragment(
           confirmPromise?.resolve(WritableNativeMap()) ?: run {
             presentPromise?.resolve(WritableNativeMap())
           }
+          // Remove the fragment now, we can be sure it won't be needed again if an intent is successful
+          (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
         }
       }
-      (context.currentActivity as? AppCompatActivity)?.supportFragmentManager?.beginTransaction()?.remove(this)?.commitAllowingStateLoss()
     }
 
     var defaultBillingDetails: PaymentSheet.BillingDetails? = null

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

@@ -7,9 +7,10 @@ import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import com.facebook.react.bridge.*
 import com.facebook.react.module.annotations.ReactModule
+import com.reactnativestripesdk.pushprovisioning.PushProvisioningProxy
 import com.stripe.android.*
-import com.stripe.android.core.AppInfo
 import com.stripe.android.core.ApiVersion
+import com.stripe.android.core.AppInfo
 import com.stripe.android.model.*
 import com.stripe.android.payments.bankaccount.CollectBankAccountConfiguration
 import com.stripe.android.view.AddPaymentMethodActivityStarter
@@ -17,6 +18,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
+
 @ReactModule(name = StripeSdkModule.NAME)
 class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
   override fun getName(): String {
@@ -116,6 +118,10 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
   @ReactMethod
   fun initPaymentSheet(params: ReadableMap, promise: Promise) {
     getCurrentActivityOrResolveWithError(promise)?.let { activity ->
+      paymentSheetFragment?.let {
+        // If a payment sheet was already initialized, we want to remove its fragment first
+        activity.supportFragmentManager.beginTransaction().remove(it).commitAllowingStateLoss()
+      }
       paymentSheetFragment = PaymentSheetFragment(reactApplicationContext, promise).also {
         val bundle = toBundleObject(params)
         it.arguments = bundle
@@ -525,6 +531,30 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     googlePayFragment?.createPaymentMethod(currencyCode, amount, promise)
   }
 
+  @ReactMethod
+  fun canAddCardToWallet(params: ReadableMap, promise: Promise) {
+    val last4 = getValOr(params, "cardLastFour", null) ?: run {
+      promise.resolve(createError("Failed", "You must provide cardLastFour"))
+      return
+    }
+
+    if (!PushProvisioningProxy.isNFCEnabled(reactApplicationContext)) {
+      promise.resolve(createCanAddCardResult(false, "UNSUPPORTED_DEVICE"))
+      return
+    }
+
+    getCurrentActivityOrResolveWithError(promise)?.let {
+      PushProvisioningProxy.isCardInWallet(it, last4) { isCardInWallet, token, error ->
+        if (error != null) {
+          promise.resolve(createCanAddCardResult(false, "MISSING_CONFIGURATION", null))
+        } else {
+          val status = if (isCardInWallet) "CARD_ALREADY_EXISTS" else null
+          promise.resolve(createCanAddCardResult(!isCardInWallet, status, token))
+        }
+      }
+    }
+  }
+
   @ReactMethod
   fun isCardInWallet(params: ReadableMap, promise: Promise) {
     val last4 = getValOr(params, "cardLastFour", null) ?: run {
@@ -532,7 +562,16 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
       return
     }
     getCurrentActivityOrResolveWithError(promise)?.let {
-      PushProvisioningProxy.isCardInWallet(it, last4, promise)
+      PushProvisioningProxy.isCardInWallet(it, last4) { isCardInWallet, token, error ->
+        if (error != null) {
+          promise.resolve(error)
+        } else {
+          val result = WritableNativeMap()
+          result.putBoolean("isInWallet", isCardInWallet)
+          result.putMap("token", token)
+          promise.resolve(result)
+        }
+      }
     }
   }
 

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

@@ -17,7 +17,6 @@ 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
 
 

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

@@ -1,13 +1,16 @@
-package com.reactnativestripesdk
+package com.reactnativestripesdk.pushprovisioning
 
 import android.app.Activity
 import android.app.Activity.RESULT_OK
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.nfc.NfcAdapter
 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.facebook.react.bridge.BaseActivityEventListener
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+import com.reactnativestripesdk.createError
+import com.reactnativestripesdk.mapError
 import com.stripe.android.pushProvisioning.PushProvisioningActivity
 import com.stripe.android.pushProvisioning.PushProvisioningActivityStarter
 
@@ -27,6 +30,15 @@ object PushProvisioningProxy {
     }
   }
 
+  fun isNFCEnabled(context: ReactApplicationContext): Boolean {
+    return if (context.packageManager.hasSystemFeature(PackageManager.FEATURE_NFC)) {
+      val adapter = NfcAdapter.getDefaultAdapter(context)
+      adapter.isEnabled
+    } else {
+      false
+    }
+  }
+
   fun invoke(
           context: ReactApplicationContext,
           view: AddToWalletButtonView,
@@ -57,8 +69,8 @@ object PushProvisioningProxy {
     }
   }
 
-  fun isCardInWallet(activity: Activity, cardLastFour: String, promise: Promise) {
-    TapAndPayProxy.invoke(activity, cardLastFour, promise)
+  fun isCardInWallet(activity: Activity, cardLastFour: String, callback: TokenCheckHandler) {
+    TapAndPayProxy.findExistingToken(activity, cardLastFour, callback)
   }
 
   private fun createActivityEventListener(context: ReactApplicationContext, view: AddToWalletButtonView) {

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

@@ -2,54 +2,68 @@ 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
 
+typealias TokenCheckHandler = (isCardInWallet: Boolean, token: WritableMap?, error: WritableMap?) -> Unit
+
 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 {
+  private fun getTapandPayTokens(activity: Activity): Task<List<Any>>? {
+    return try {
       val tapAndPayClass = Class.forName("com.google.android.gms.tapandpay.TapAndPay")
-      val getClientMethod = tapAndPayClass.getMethod("getClient", Activity::class.java)
+      val getClientMethod = tapAndPayClass.getMethod(
+        "getClient",
+        Activity::class.java)
+      val client = getClientMethod.invoke(null, activity)
 
-      tapAndPayClient = getClientMethod.invoke(null, activity).also {
-        val tapAndPayClientClass = Class.forName("com.google.android.gms.tapandpay.TapAndPayClient")
-        val listTokensMethod = tapAndPayClientClass.getMethod("listTokens")
+      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.")
+      listTokensMethod.invoke(client) as Task<List<Any>>
+    } catch (e: Exception) {
+      Log.e(TAG, "Google TapAndPay dependency not found")
+      null
+    }
+  }
+
+  internal fun isTokenInWallet(token: Any, newLastFour: String): Boolean {
+    return try {
+      val getFpanLastFourMethod = Class.forName("com.google.android.gms.tapandpay.issuer.TokenInfo").getMethod("getFpanLastFour")
+      val existingFpanLastFour = getFpanLastFourMethod.invoke(token) as String
+      existingFpanLastFour == newLastFour
+    } 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.")
+      false
+    }
+  }
+
+
+  fun findExistingToken(activity: Activity, newCardLastFour: String, callback: TokenCheckHandler) {
+    val tokens = getTapandPayTokens(activity)
+    if (tokens == null) {
+      callback(false, null, createError("Failed", "Google TapAndPay dependency not found."))
+      return
+    }
+
+    tokens.addOnCompleteListener { task ->
+      if (task.isSuccessful) {
+        for (token in task.result) {
+          if (isTokenInWallet(token, newCardLastFour)) {
+            callback(true,  mapFromTokenInfo(token), null)
+            return@addOnCompleteListener
           }
-          promise.resolve(createResult(false))
         }
+      } else {
+        Log.e(TAG, "Unable to fetch existing tokens from Google TapAndPay.")
       }
-    } catch (e: Exception) {
-      Log.e(TAG, "Google TapAndPay dependency not found")
-      promise.resolve(createError("Failed", "Google TapAndPay dependency not found."))
+      callback(false, null, null)
     }
   }
 
@@ -69,13 +83,6 @@ object TapAndPayProxy {
     }
   }
 
-  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