Skip to content

Fix push tokenization promise never settling in onActivityResult #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JakubKorytko merged 3 commits into from
Oct 9, 2026
Merged

Fix push tokenization promise never settling in onActivityResult #70

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26e0ebf
onActivityResult can hang forever if OK but data == null, and pending…
MegaManSec Feb 3, 2026
5dd8935
Merge branch 'main' into pr/jr-3-a330c1e
MegaManSec Oct 6, 2026
f002d46
Resolve on RESULT_OK without data and return ERROR for other result c…
MegaManSec Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions android/src/main/java/com/expensify/wallet/WalletModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,22 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
val localPromise = pendingPushTokenizePromise
pendingPushTokenizePromise = null
if (resultCode == RESULT_OK) {
data?.let {
val tokenId = it.getStringExtra(TapAndPay.EXTRA_ISSUER_TOKEN_ID).toString()
sendEvent(
context,
OnCardActivatedEvent.NAME,
OnCardActivatedEvent("activated", tokenId).toMap()
)
localPromise?.resolve(TokenizationStatus.SUCCESS.code)
}
val tokenId = data?.getStringExtra(TapAndPay.EXTRA_ISSUER_TOKEN_ID)
sendEvent(
context,
OnCardActivatedEvent.NAME,
OnCardActivatedEvent("activated", tokenId).toMap()
)
localPromise?.resolve(TokenizationStatus.SUCCESS.code)
} else if (resultCode == RESULT_CANCELED) {
sendEvent(
context,
OnCardActivatedEvent.NAME,
OnCardActivatedEvent("canceled", null).toMap()
)
localPromise?.resolve(TokenizationStatus.CANCELED.code)
} else {
localPromise?.resolve(TokenizationStatus.ERROR.code)
}
}
}
Expand Down
Loading