@expensify/react-native-wallet 0.1.8 → 0.1.10

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:7.3.1"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }

package/android/gradle.properties

@@ -1,5 +1,5 @@
-Wallet_kotlinVersion=1.8.0
-Wallet_minSdkVersion=21
-Wallet_targetSdkVersion=34
-Wallet_compileSdkVersion=34
+Wallet_kotlinVersion=2.1.20
+Wallet_minSdkVersion=24
+Wallet_targetSdkVersion=36
+Wallet_compileSdkVersion=36
 Wallet_ndkversion=27.1.12297006

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

@@ -43,11 +43,10 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
 
     const val E_SDK_API = "SDK API Error"
     const val E_OPERATION_FAILED = "E_OPERATION_FAILED"
-    const val E_NO_TOKENS_AVAILABLE = "E_NO_TOKENS_AVAILABLE"
     const val E_INVALID_DATA = "E_INVALID_DATA"
   }
 
-  private val activity = currentActivity ?: throw ActivityNotFoundException()
+  private val activity = reactApplicationContext.currentActivity ?: throw ActivityNotFoundException()
   private val tapAndPayClient: TapAndPayClient = TapAndPay.getClient(activity)
   private var pendingCreateWalletPromise: Promise? = null
   private var pendingPushTokenizePromise: Promise? = null
@@ -64,14 +63,14 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
 
   private val cardListener = object : ActivityEventListener {
     override fun onActivityResult(
-      activity: Activity?, requestCode: Int, resultCode: Int, intent: Intent?
+      activity: Activity, requestCode: Int, resultCode: Int, data: Intent?
     ) {
       if (requestCode == REQUEST_CREATE_WALLET) {
         pendingCreateWalletPromise?.resolve(resultCode == RESULT_OK)
         pendingCreateWalletPromise = null
       } else if (requestCode == REQUEST_CODE_PUSH_TOKENIZE) {
         if (resultCode == RESULT_OK) {
-          intent?.let {
+          data?.let {
             val tokenId = it.getStringExtra(TapAndPay.EXTRA_ISSUER_TOKEN_ID).toString()
             sendEvent(
               context,
@@ -91,7 +90,7 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
       }
     }
 
-    override fun onNewIntent(p0: Intent?) {}
+    override fun onNewIntent(intent: Intent) {}
   }
 
   @ReactMethod

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

@@ -1,6 +1,6 @@
 package com.expensify.wallet
 
-import com.expensify.wallet.components.AddToWalletButtonViewManager
+import com.expensify.wallet.components.RNAddToWalletButtonManager
 import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.NativeModule
@@ -44,5 +44,5 @@ class WalletPackage : BaseReactPackage() {
   }
 
   override fun createViewManagers(reactContext: com.facebook.react.bridge.ReactApplicationContext)
-    : List<ViewManager<*, *>> = listOf(AddToWalletButtonViewManager())
+    : List<ViewManager<*, *>> = listOf(RNAddToWalletButtonManager())
 }

package/android/src/main/java/com/expensify/wallet/components/{RNAddToWalletButtonViewManager.kt → RNAddToWalletButtonManager.kt}

@@ -4,16 +4,16 @@ import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 
-class AddToWalletButtonViewManager : SimpleViewManager<AddToWalletButtonView>() {
+class RNAddToWalletButtonManager : SimpleViewManager<RNAddToWalletButtonView>() {
 
   override fun getName(): String = "RNAddToWalletButton"
 
-  override fun createViewInstance(reactContext: ThemedReactContext): AddToWalletButtonView {
-    return AddToWalletButtonView(reactContext)
+  override fun createViewInstance(reactContext: ThemedReactContext): RNAddToWalletButtonView {
+    return RNAddToWalletButtonView(reactContext)
   }
 
   @ReactProp(name = "buttonType")
-  fun setButtonType(view: AddToWalletButtonView, type: String) {
+  fun setButtonType(view: RNAddToWalletButtonView, type: String) {
     view.setButtonType(type)
   }
 }

package/android/src/main/java/com/expensify/wallet/components/RNAddToWalletButtonView.kt

@@ -6,7 +6,7 @@ import com.expensify.wallet.R
 import android.view.LayoutInflater
 import android.view.View
 
-class AddToWalletButtonView(context: Context) : FrameLayout(context) {
+class RNAddToWalletButtonView(context: Context) : FrameLayout(context) {
 
   private var buttonView: View? = null
   private var buttonType: String = "basic"

package/ios/components/RNAddToWalletButtonManager.swift

@@ -4,7 +4,7 @@ import React
 @objc(RNAddToWalletButtonManager)
 class RNAddToWalletButtonManager: RCTViewManager {
   override func view() -> UIView! {
-    return AddToWalletButtonView()
+    return RNAddToWalletButtonView()
   }
 
   override static func requiresMainQueueSetup() -> Bool {

package/ios/components/RNAddToWalletButtonView.swift

@@ -2,8 +2,8 @@ import Foundation
 import PassKit
 import UIKit
 
-@objc(AddToWalletButtonView)
-class AddToWalletButtonView: UIView {
+@objc(RNAddToWalletButtonView)
+class RNAddToWalletButtonView: UIView {
   private var addPassButton = PKAddPassButton(addPassButtonStyle: .blackOutline)
   private let defaultWidth: CGFloat = 120
   private let defaultHeight: CGFloat = 40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-wallet",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "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",
@@ -64,14 +64,14 @@
     "@commitlint/config-conventional": "^17.0.2",
     "@evilmartians/lefthook": "^1.5.0",
     "@lwc/eslint-plugin-lwc": "^1.7.2",
-    "@react-native-community/cli": "18.0.0",
-    "@react-native-community/cli-platform-android": "18.0.0",
-    "@react-native-community/cli-platform-ios": "18.0.0",
-    "@react-native/eslint-config": "0.79.2",
-    "@react-native/gradle-plugin": "0.79.2",
+    "@react-native-community/cli": "20.0.0",
+    "@react-native-community/cli-platform-android": "20.0.0",
+    "@react-native-community/cli-platform-ios": "20.0.0",
+    "@react-native/eslint-config": "0.81.0",
+    "@react-native/gradle-plugin": "0.81.0",
     "@release-it/conventional-changelog": "^5.0.0",
     "@types/jest": "^29.5.14",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.1.0",
     "@typescript-eslint/eslint-plugin": "^6.15.0",
     "@typescript-eslint/parser": "^6.15.0",
     "del-cli": "^5.0.0",
@@ -90,12 +90,12 @@
     "eslint-plugin-tsdoc": "^0.2.17",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
-    "react": "^19.0.0",
-    "react-native": "0.79.2",
+    "react": "19.1.0",
+    "react-native": "0.81.0",
     "react-native-builder-bob": "^0.20.0",
     "release-it": "^15.0.0",
     "turbo": "^1.10.7",
-    "typescript": "~5.3.3"
+    "typescript": "^5.8.3"
   },
   "peerDependencies": {
     "react": "*",