@expensify/react-native-wallet 0.1.29 → 0.1.31

package/android/build.gradle

@@ -24,7 +24,13 @@ def isNewArchitectureEnabled() {
 }
 
 apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
+// AGP 9 ships built-in Kotlin support and registers the `kotlin` extension
+// itself. Applying the Kotlin plugin on top of it fails configuration with
+// "Cannot add extension with name 'kotlin'". Only apply it when nothing has
+// registered that extension yet.
+if (project.extensions.findByName('kotlin') == null) {
+  apply plugin: "kotlin-android"
+}
 
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"

package/android/src/main/java/com/expensify/wallet/WalletModule.kt

@@ -21,6 +21,8 @@ import com.google.android.gms.tapandpay.issuer.PushTokenizeRequest
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import com.expensify.wallet.Utils.getAsyncResult
 import com.expensify.wallet.Utils.toCardData
 import com.expensify.wallet.error.InvalidNetworkError
@@ -50,6 +52,7 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
   private val tapAndPayClient: TapAndPayClient = TapAndPay.getClient(activity)
   private var pendingCreateWalletPromise: Promise? = null
   private var pendingPushTokenizePromise: Promise? = null
+  private val moduleScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
 
   override fun initialize() {
     super.initialize()
@@ -58,6 +61,7 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
 
   override fun invalidate() {
     super.invalidate()
+    moduleScope.cancel()
     reactApplicationContext.removeActivityEventListener(cardListener)
   }
 
@@ -119,7 +123,7 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
 
   @ReactMethod
   override fun getSecureWalletInfo(promise: Promise) {
-    CoroutineScope(Dispatchers.Main).launch {
+    moduleScope.launch {
       try {
         val walletId = getWalletIdAsync()
         val hardwareId = getHardwareIdAsync()

package/ios/WalletManager.swift

@@ -274,6 +274,7 @@ extension WalletManager: PKAddPaymentPassViewControllerDelegate {
         }
       }
       
+      addPassHandler = nil
       hideModal()
       addPaymentPassCompletionHandler = nil
       presentAddPaymentPassCompletionHandler = nil

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-wallet",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "A React Native module designed for seamless integration of Card Push Provisioning into Apple Wallet and Google Wallet, enabling easy and secure addition of payment cards directly from your application.",
   "source": "./src/index.tsx",
   "main": "lib/commonjs/index",