Skip to content

fix: prevent NoSuchElementException in session chain selection #212

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: prevent NoSuchElementException in session chain selection #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions product/appkit/src/main/kotlin/com/reown/appkit/domain/delegate/AppKitDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,16 @@ internal object AppKitDelegate : AppKit.ModalDelegate {
}

override fun onSessionApproved(approvedSession: Modal.Model.ApprovedSession) {
scope.launch {
val chain = AppKit.chains.getSelectedChain(AppKit.selectedChain?.id)
scope.launch {
val chain = AppKit.chains.getSelectedChain(AppKit.selectedChain?.id)
if (chain != null) {
saveSessionUseCase(approvedSession.toSession(chain))
_wcEventModels.emit(approvedSession)
} else {
Log.e("AppKitDelegate", "Cannot process session - no chain available")
}
}
}

override fun onSessionAuthenticateResponse(sessionAuthenticateResponse: Modal.Model.SessionAuthenticateResponse) {
scope.launch {
Expand Down
23 changes: 17 additions & 6 deletions product/appkit/src/main/kotlin/com/reown/appkit/utils/SessionUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import com.reown.appkit.domain.model.Session

internal fun String.toVisibleAddress() = "${take(4)}...${takeLast(4)}"

internal fun List<Modal.Model.Chain>.getSelectedChain(chainId: String?) = find { it.id == chainId } ?: first()
internal fun List<Modal.Model.Chain>.getSelectedChain(chainId: String?) = find { it.id == chainId } ?: firstOrNull()

internal fun Modal.Model.Session.getAddress(selectedChain: Modal.Model.Chain) = getAccounts().find { it.startsWith(selectedChain.id) }?.split(":")?.last() ?: String.Empty

Expand All @@ -35,10 +35,17 @@ internal fun String.toChain() = AppKit.chains.find { it.id == this }

private fun Modal.Model.Session.getAccounts() = namespaces.values.toList().flatMap { it.accounts }

private fun Modal.Model.Session.getDefaultChain() = getAccounts()
.accountsToChainId()
.filter { CoreValidator.isChainIdCAIP2Compliant(it) }
.mapNotNull { it.toChain() }
private fun Modal.Model.Session.getDefaultChain(): List<Modal.Model.Chain> {
val chainIds = getAccounts()
.accountsToChainId()
.filter { CoreValidator.isChainIdCAIP2Compliant(it) }

return if (chainIds.isNotEmpty()) {
chainIds.mapNotNull { it.toChain() }
} else {
emptyList()
}
}

private fun List<String>.accountsToChainId() = map {
val (chainNamespace, chainReference, _) = it.split(":")
Expand All @@ -64,7 +71,11 @@ internal fun Sign.Model.Session.toAccount(session: Session.WalletConnect) = toMo
Account(address, chain)
}

internal fun getChain(chainId: String) = AppKit.chains.find { it.id == chainId } ?: AppKit.chains.first()
internal fun getChain(chainId: String): Modal.Model.Chain {
return AppKit.chains.find { it.id == chainId } ?:
AppKit.chains.firstOrNull() ?:
throw IllegalStateException("No chains available in AppKit.chains")
}

internal fun Session.toConnectorType() = when(this) {
is Session.Coinbase -> Modal.ConnectorType.WALLET_CONNECT
Expand Down
Loading