From 23451758f05ec4829eec14e6cf99b86baa0992f6 Mon Sep 17 00:00:00 2001 From: Joshua Rogers Date: Sat, 31 Jan 2026 01:08:56 +0800 Subject: [PATCH] Avoid module-load crash from eager currentActivity access (cherry picked from commit 03709fc9cbf0900334d1fa7ec19cf3fd2f89e1d9) --- android/src/main/java/com/expensify/wallet/WalletModule.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/expensify/wallet/WalletModule.kt b/android/src/main/java/com/expensify/wallet/WalletModule.kt index 368f31f..56d9131 100644 --- a/android/src/main/java/com/expensify/wallet/WalletModule.kt +++ b/android/src/main/java/com/expensify/wallet/WalletModule.kt @@ -46,8 +46,11 @@ class WalletModule internal constructor(context: ReactApplicationContext) : const val E_INVALID_DATA = "E_INVALID_DATA" } - private val activity = reactApplicationContext.currentActivity ?: throw ActivityNotFoundException() - private val tapAndPayClient: TapAndPayClient = TapAndPay.getClient(activity) + private val activity: Activity + get() = reactApplicationContext.currentActivity ?: throw ActivityNotFoundException() + + private val tapAndPayClient: TapAndPayClient + get() = TapAndPay.getClient(activity) private var pendingCreateWalletPromise: Promise? = null private var pendingPushTokenizePromise: Promise? = null