Skip to content

feat: move collectData to per-PaymentOption and update IC flow #293

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
jakubuid merged 4 commits into from
Feb 18, 2026
Merged

feat: move collectData to per-PaymentOption and update IC flow #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f334af
Merge branch 'develop' of https://github.com/reown-com/reown-kotlin i…
jakubuid Feb 13, 2026
ece90a5
feat: move collectData to per-PaymentOption and update IC flow
jakubuid Feb 16, 2026
62e9adc
fix: prevent payment success modal from getting stuck after back/fort…
jakubuid Feb 17, 2026
79f7b09
Merge pull request #294 from reown-com/fix/payment-dialog-stuck-on-su…
jakubuid Feb 17, 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
2 changes: 1 addition & 1 deletion product/pay/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ dependencies {
// implementation("com.github.reown-com:yttrium-wcpay:unspecified")

//jitpack
implementation("com.github.reown-com.yttrium:yttrium-wcpay:0.10.34") {
implementation("com.github.reown-com.yttrium:yttrium-wcpay:0.10.41") {
exclude(group = "net.java.dev.jna", module = "jna")
}
implementation("net.java.dev.jna:jna:5.17.0@aar")
Expand Down
3 changes: 2 additions & 1 deletion product/pay/src/main/java/com/walletconnect/pay/Mappers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ internal object Mappers {
id = option.id,
amount = mapAmount(option.amount),
estimatedTxs = option.etaS.coerceAtMost(Int.MAX_VALUE.toULong().toLong()).toInt(),
account = option.account
account = option.account,
collectData = option.collectData?.let { mapCollectDataAction(it) }
)
}

Expand Down
3 changes: 2 additions & 1 deletion product/pay/src/main/java/com/walletconnect/pay/Pay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ object Pay {
val id: String,
val amount: Amount,
val account: String,
val estimatedTxs: Int?
val estimatedTxs: Int?,
val collectData: CollectDataAction? = null
)

data class MerchantInfo(
Expand Down
3 changes: 2 additions & 1 deletion product/walletkit/src/main/kotlin/com/reown/walletkit/client/PayMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ internal fun Pay.PaymentOption.toWallet(): Wallet.Model.PaymentOption =
id = id,
amount = amount.toWallet(),
account = account,
estimatedTxs = estimatedTxs
estimatedTxs = estimatedTxs,
collectData = collectData?.toWallet()
)

@JvmSynthetic
Expand Down
3 changes: 2 additions & 1 deletion product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,8 @@ object Wallet {
val id: String,
val amount: PaymentAmount,
val account: String,
val estimatedTxs: Int?
val estimatedTxs: Int?,
val collectData: CollectDataAction? = null
) : Model()

enum class CollectDataFieldType {
Expand Down
8 changes: 6 additions & 2 deletions sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@ class WalletKitActivity : AppCompatActivity() {
.onEach { paymentLink ->
navigateWhenReady {
val encodedLink = URLEncoder.encode(paymentLink, "UTF-8")
navController.navigate("${Route.Payment.path}/$encodedLink")
navController.navigate("${Route.Payment.path}/$encodedLink") {
launchSingleTop = true
}
}
}
.launchIn(lifecycleScope)
Expand All @@ -209,7 +211,9 @@ class WalletKitActivity : AppCompatActivity() {
lifecycleScope.launch {
navigateWhenReady {
val encodedLink = URLEncoder.encode(dataString, "UTF-8")
navController.navigate("${Route.Payment.path}/$encodedLink")
navController.navigate("${Route.Payment.path}/$encodedLink") {
launchSingleTop = true
}
}
}
return
Expand Down
Loading
Loading