@expensify/react-native-wallet 0.1.37 → 0.1.39

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/ios/RNWallet.mm

@@ -7,7 +7,6 @@
 #import <react_native_wallet-Swift.h>
 #endif
 
-
 @interface RNWallet () <WalletDelegate>
 @end
 
@@ -34,17 +33,33 @@ RCT_REMAP_METHOD(checkWalletAvailability,
 }
 
 RCT_REMAP_METHOD(IOSPresentAddPaymentPassView,
+#ifdef RCT_NEW_ARCH_ENABLED
                  IOSPresentAddPaymentPassView:(JS::NativeWallet::IOSCardData &)cardData
+#else
+                 IOSPresentAddPaymentPassView:(NSDictionary *)cardData
+#endif
                  resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject)
 {
   @try {
-    NSDictionary *cardDataDict = @{
+    NSDictionary *cardDataDict = nil;
+
+#ifdef RCT_NEW_ARCH_ENABLED
+    cardDataDict = @{
       @"network": [self safeString:cardData.network()],
       @"cardHolderName": [self safeString:cardData.cardHolderName()],
       @"lastDigits": [self safeString:cardData.lastDigits()],
       @"cardDescription": [self safeString:cardData.cardDescription()],
     };
+#else
+    cardDataDict = @{
+      @"network": [self safeString:cardData[@"network"]],
+      @"cardHolderName": [self safeString:cardData[@"cardHolderName"]],
+      @"lastDigits": [self safeString:cardData[@"lastDigits"]],
+      @"cardDescription": [self safeString:cardData[@"cardDescription"]],
+    };
+#endif
+
     dispatch_async(dispatch_get_main_queue(), ^{
       [self->walletManager IOSPresentAddPaymentPassViewWithCardData:cardDataDict completion:^(OperationResult result, NSDictionary* data) {
         [self handleWalletResponse:result data:data completedBlock:resolve errorPrefix:@"present_payment_pass_view_failed" defaultErrorMessage:@"Failed to present the payment pass view" rejecter:reject];
@@ -56,16 +71,31 @@ RCT_REMAP_METHOD(IOSPresentAddPaymentPassView,
 }
 
 RCT_REMAP_METHOD(IOSHandleAddPaymentPassResponse,
+#ifdef RCT_NEW_ARCH_ENABLED
                  IOSHandleAddPaymentPassResponse:(JS::NativeWallet::IOSEncryptPayload &)payload
+#else
+                 IOSHandleAddPaymentPassResponse:(NSDictionary *)payload
+#endif
                  resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject)
 {
   @try {
-    NSDictionary *payloadDict = @{
+    NSDictionary *payloadDict = nil;
+
+#ifdef RCT_NEW_ARCH_ENABLED
+    payloadDict = @{
       @"encryptedPassData": [self safeString:payload.encryptedPassData()],
       @"activationData": [self safeString:payload.activationData()],
       @"ephemeralPublicKey": [self safeString:payload.ephemeralPublicKey()],
     };
+#else
+    payloadDict = @{
+      @"encryptedPassData": [self safeString:payload[@"encryptedPassData"]],
+      @"activationData": [self safeString:payload[@"activationData"]],
+      @"ephemeralPublicKey": [self safeString:payload[@"ephemeralPublicKey"]],
+    };
+#endif
+
     dispatch_async(dispatch_get_main_queue(), ^{
       [self->walletManager IOSHandleAddPaymentPassResponseWithPayload:payloadDict completion:^(OperationResult result, NSDictionary* data) {
         [self handleWalletResponse:result data:data completedBlock:resolve errorPrefix:@"add_card_failed" defaultErrorMessage:@"Failed to add the card to the wallet" rejecter:reject];
@@ -93,7 +123,15 @@ RCT_REMAP_METHOD(getCardStatusByIdentifier,
   resolve([walletManager getCardStatusByIdentifierWithIdentifier:identifier]);
 }
 
-- (void)addCardToGoogleWallet:(JS::NativeWallet::AndroidCardData &)cardData resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+- (void)addCardToGoogleWallet:
+#ifdef RCT_NEW_ARCH_ENABLED
+  (JS::NativeWallet::AndroidCardData &)cardData
+#else
+  (NSDictionary *)cardData
+#endif
+  resolve:(RCTPromiseResolveBlock)resolve
+  reject:(RCTPromiseRejectBlock)reject
+{
   // no-op
 }
 
@@ -149,5 +187,4 @@ RCT_REMAP_METHOD(getCardStatusByIdentifier,
 }
 #endif
 
-
 @end

package/package.json

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