@expensify/react-native-wallet 0.1.33 → 0.1.35

package/ios/RNWallet.mm

@@ -1,7 +1,7 @@
 #import <PassKit/PassKit.h>
 #import "RNWallet.h"
 
-#if RNWallet_USE_FRAMEWORKS
+#if __has_include(<react_native_wallet/react_native_wallet-Swift.h>)
 #import <react_native_wallet/react_native_wallet-Swift.h>
 #else
 #import <react_native_wallet-Swift.h>

package/ios/WalletManager.swift

@@ -119,13 +119,16 @@ open class WalletManager: UIViewController {
       return
     }
     
-    presentAddPaymentPassCompletionHandler = completion
     DispatchQueue.main.async {
       if self.addPassViewController == nil {
+        self.presentAddPaymentPassCompletionHandler = completion
         self.addPassViewController = enrollViewController
         RCTPresentedViewController()?.present(enrollViewController, animated: true, completion: nil)
       } else {
         self.logInfo(message: "EnrollViewController is already presented.")
+        completion(.error, [
+          "errorMessage": "EnrollViewController is already presented."
+        ])
       }
     }
   }
@@ -165,7 +168,7 @@ open class WalletManager: UIViewController {
     let paymentPasses = passLibrary.passes(of: .payment)
     if paymentPasses.isEmpty {
       self.logInfo(message: "No passes found in Wallet.")
-      return -1
+      return NSNumber(value: -1)
     }
     
     for pass in paymentPasses {
@@ -174,7 +177,7 @@ open class WalletManager: UIViewController {
         return NSNumber(value: securePassElement.passActivationState.rawValue)
       }
     }
-    return -1
+    return NSNumber(value: -1)
   }
   
   @objc public func getCardStatusBySuffix(last4Digits: NSString) -> NSNumber {

package/package.json

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

package/react-native-wallet.podspec

@@ -2,17 +2,6 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
-$RNWallet = Object.new
-
-def $RNWallet._add_compiler_flags(sp, extra_flags)
-  exisiting_flags = sp.attributes_hash["compiler_flags"]
-  if exisiting_flags.present?
-    sp.compiler_flags = exisiting_flags + " #{extra_flags}"
-  else
-    sp.compiler_flags = extra_flags
-  end
-end
-
 Pod::Spec.new do |s|
   s.name         = "react-native-wallet"
   s.version      = package["version"]
@@ -29,8 +18,4 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
 
   install_modules_dependencies(s);
-  
-  if ENV['USE_FRAMEWORKS']
-    $RNWallet._add_compiler_flags(s, "-DRNWallet_USE_FRAMEWORKS=1")
-  end
 end