@expensify/react-native-wallet 0.1.36 → 0.1.38

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

@@ -1,8 +1,8 @@
 package com.expensify.wallet
 
 import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.PromiseImpl
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableMap
 import com.google.android.gms.tapandpay.issuer.UserAddress
 import com.expensify.wallet.model.CardData
 import kotlinx.coroutines.Deferred
@@ -45,100 +45,23 @@ object Utils {
     async {
       withContext(Dispatchers.IO) {
         suspendCancellableCoroutine { continuation ->
-          val promise = object : Promise {
-            @Deprecated(
-              "Prefer passing a module-specific error code to JS. Using this method will pass the error code UNSPECIFIED",
-              replaceWith = ReplaceWith("reject(code, message)")
-            )
-            override fun reject(message: String) {
-              continuation.resumeWithException(
-                Exception("Error: $message")
-              )
-            }
-
-            override fun reject(code: String?, userInfo: WritableMap) {
-              val errorMessage = "Error: ${code ?: "Unknown code"}\nUserInfo: $userInfo"
-              continuation.resumeWithException(
-                Exception(errorMessage)
-              )
-            }
-
-            override fun reject(code: String?, message: String?) {
-              val errorMessage = "Error: ${code ?: "Unknown code"}\nMessage: ${message ?: "No message provided"}"
-              continuation.resumeWithException(
-                Exception(errorMessage)
-              )
-            }
-
-            override fun reject(code: String?, message: String?, userInfo: WritableMap) {
-              val errorMessage =
-                "Error: ${code ?: "Unknown code"}\nMessage: ${message ?: "No message provided"}\nUserInfo: $userInfo"
-              continuation.resumeWithException(
-                Exception(errorMessage)
-              )
-            }
-
-            override fun reject(code: String?, message: String?, throwable: Throwable?) {
-              val errorMessage = "Error: ${code ?: "Unknown code"}\nMessage: ${message ?: "No message provided"}"
-              continuation.resumeWithException(
-                throwable ?: Exception(errorMessage)
-              )
-            }
-
-            override fun reject(code: String?, throwable: Throwable?) {
-              val errorMessage = "Error: ${code ?: "Unknown code"}"
+          val promise = PromiseImpl({ args ->
+            val value = args.getOrNull(0)
+            if (resultType.isInstance(value)) {
+              continuation.resume(value as String)
+            } else {
               continuation.resumeWithException(
-                throwable ?: Exception(errorMessage)
+                RuntimeException("Expected result of type ${resultType.simpleName}, but got ${value?.javaClass?.simpleName}")
               )
             }
-
-            override fun reject(code: String?, throwable: Throwable?, userInfo: WritableMap) {
-              val errorMessage = "Error: ${code ?: "Unknown code"}\nUserInfo: $userInfo"
-              continuation.resumeWithException(
-                throwable ?: Exception(errorMessage)
-              )
-            }
-
-            override fun reject(
-              code: String?,
-              message: String?,
-              throwable: Throwable?,
-              userInfo: WritableMap?
-            ) {
-              val errorMessage = buildString {
-                append("Error: ${code ?: "Unknown code"}")
-                if (message != null) append("\nMessage: $message")
-                if (userInfo != null) append("\nUserInfo: $userInfo")
-              }
-              continuation.resumeWithException(
-                throwable ?: Exception(errorMessage)
-              )
-            }
-
-            override fun reject(throwable: Throwable) {
-              continuation.resumeWithException(
-                throwable
-              )
-            }
-
-            override fun reject(throwable: Throwable, userInfo: WritableMap) {
-              val errorMessage = "Exception occurred\nUserInfo: $userInfo"
-              continuation.resumeWithException(
-                Exception(errorMessage, throwable)
-              )
-            }
-
-            override fun resolve(value: Any?) {
-              if (resultType.isInstance(value)) {
-                continuation.resume(value as String)
-              } else {
-                continuation.resumeWithException(
-                  RuntimeException("Expected result of type ${resultType.simpleName}, but got ${value?.javaClass?.simpleName}")
-                )
-              }
-            }
-
-          }
+          }, { args ->
+            val error = args.getOrNull(0) as? ReadableMap
+            val code = error?.getString("code") ?: "Unknown code"
+            val message = error?.getString("message") ?: "No message provided"
+            continuation.resumeWithException(
+              Exception("Error: $code\nMessage: $message")
+            )
+          })
           getPromiseOperation(promise)
         }
       }

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

@@ -76,6 +76,8 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
         pendingCreateWalletPromise?.resolve(resultCode == RESULT_OK)
         pendingCreateWalletPromise = null
       } else if (requestCode == REQUEST_CODE_PUSH_TOKENIZE) {
+        val localPromise = pendingPushTokenizePromise
+        pendingPushTokenizePromise = null
         if (resultCode == RESULT_OK) {
           data?.let {
             val tokenId = it.getStringExtra(TapAndPay.EXTRA_ISSUER_TOKEN_ID).toString()
@@ -84,7 +86,7 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
               OnCardActivatedEvent.NAME,
               OnCardActivatedEvent("activated", tokenId).toMap()
             )
-            pendingPushTokenizePromise?.resolve(TokenizationStatus.SUCCESS.code)
+            localPromise?.resolve(TokenizationStatus.SUCCESS.code)
           }
         } else if (resultCode == RESULT_CANCELED) {
           sendEvent(
@@ -92,7 +94,7 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
             OnCardActivatedEvent.NAME,
             OnCardActivatedEvent("canceled", null).toMap()
           )
-          pendingPushTokenizePromise?.resolve(TokenizationStatus.CANCELED.code)
+          localPromise?.resolve(TokenizationStatus.CANCELED.code)
         }
       }
     }
@@ -185,6 +187,9 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
   override fun addCardToGoogleWallet(
     data: ReadableMap, promise: Promise
   ) {
+    if (pendingPushTokenizePromise != null) {
+      return promise.reject(E_OPERATION_FAILED, "A tokenization request is already in progress")
+    }
     try {
       val cardData = data.toCardData() ?: return promise.reject(E_INVALID_DATA, "Insufficient data")
       val cardNetwork = getCardNetwork(cardData.network)
@@ -205,12 +210,16 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
         activity, pushTokenizeRequest, REQUEST_CODE_PUSH_TOKENIZE
       )
     } catch (e: java.lang.Exception) {
+      pendingPushTokenizePromise = null
       promise.reject(e)
     }
   }
 
   @ReactMethod
   override fun resumeAddCardToGoogleWallet(data: ReadableMap, promise: Promise) {
+    if (pendingPushTokenizePromise != null) {
+      return promise.reject(E_OPERATION_FAILED, "A tokenization request is already in progress")
+    }
     try {
       val tokenReferenceID = data.getString("tokenReferenceID")
         ?: return promise.reject(E_INVALID_DATA, "Missing tokenReferenceID")
@@ -232,6 +241,7 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
         REQUEST_CODE_PUSH_TOKENIZE
       )
     } catch (e: java.lang.Exception) {
+      pendingPushTokenizePromise = null
       promise.reject(e)
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-wallet",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "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",