diff --git a/CHANGELOG.md b/CHANGELOG.md index 160a1cff..3d70af54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Support for verifiable presentations (proofs) from identities and accounts +### Fixed + +- Inability to change validator pool ID + ## [1.16.1] - 2025-12-05 ### Fixed diff --git a/app/src/main/java/com/concordium/wallet/ui/account/accountsoverview/AccountsListFragment.kt b/app/src/main/java/com/concordium/wallet/ui/account/accountsoverview/AccountsListFragment.kt index 26df4ec6..6393b2fe 100644 --- a/app/src/main/java/com/concordium/wallet/ui/account/accountsoverview/AccountsListFragment.kt +++ b/app/src/main/java/com/concordium/wallet/ui/account/accountsoverview/AccountsListFragment.kt @@ -108,7 +108,20 @@ class AccountsListFragment : BottomSheetDialogFragment() { } }) binding.accountRecyclerview.adapter = adapter - viewModel.listItemsLiveData.observe(viewLifecycleOwner, adapter::setData) + viewModel.listItemsLiveData.observe(viewLifecycleOwner) { items -> + adapter.setData(items) + scrollToActiveAccount(items) + } + } + + private fun scrollToActiveAccount(items: List) { + val activeIndex = items.indexOfFirst { + it is AccountsOverviewListItem.Account && + it.accountWithIdentity.account.isActive + } + + if (activeIndex == -1) return + binding.accountRecyclerview.scrollToPosition(activeIndex) } private fun selectAccount(item: Account) { diff --git a/app/src/main/java/com/concordium/wallet/ui/bakerdelegation/delegation/DelegationRegisterAmountActivity.kt b/app/src/main/java/com/concordium/wallet/ui/bakerdelegation/delegation/DelegationRegisterAmountActivity.kt index d07983e9..add89980 100644 --- a/app/src/main/java/com/concordium/wallet/ui/bakerdelegation/delegation/DelegationRegisterAmountActivity.kt +++ b/app/src/main/java/com/concordium/wallet/ui/bakerdelegation/delegation/DelegationRegisterAmountActivity.kt @@ -23,7 +23,8 @@ import com.concordium.wallet.util.getSerializable import java.math.BigInteger class DelegationRegisterAmountActivity : BaseDelegationBakerRegisterAmountActivity( - R.layout.activity_delegation_registration_amount, R.string.delegation_register_delegation_title + R.layout.activity_delegation_registration_amount, + R.string.delegation_register_delegation_title ) { private lateinit var binding: ActivityDelegationRegistrationAmountBinding diff --git a/app/src/main/java/com/concordium/wallet/ui/bakerdelegation/delegation/DelegationRegisterPoolActivity.kt b/app/src/main/java/com/concordium/wallet/ui/bakerdelegation/delegation/DelegationRegisterPoolActivity.kt index 0f301a08..39183a0d 100644 --- a/app/src/main/java/com/concordium/wallet/ui/bakerdelegation/delegation/DelegationRegisterPoolActivity.kt +++ b/app/src/main/java/com/concordium/wallet/ui/bakerdelegation/delegation/DelegationRegisterPoolActivity.kt @@ -211,15 +211,17 @@ class DelegationRegisterPoolActivity : BaseDelegationBakerActivity( ) binding.poolId.isVisible = checkIsPassiveMode().not() - if (checkIsPassiveMode()) + if (checkIsPassiveMode()) { binding.poolDesc.text = "" - else + } else { binding.poolDesc.setText( if (BuildConfig.ENV_NAME == "production") R.string.delegation_register_delegation_desc else R.string.delegation_register_delegation_desc_testnet ) + viewModel.selectBakerPool() + } binding.poolDesc.handleUrlClicks { url -> IntentUtil.openUrl(this, url)