GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2026-07-02 18:21:04 +04:00
parent 5da166073b
commit 4ed2144ca3
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/AddWalletTransformer.kt
View file

@ -29,6 +29,10 @@ internal class AddWalletTransformer(
override fun transform(prevState: WalletScreenState): WalletScreenState { override fun transform(prevState: WalletScreenState): WalletScreenState {
return prevState.copy( return prevState.copy(
// Select the newly added wallet synchronously (it is appended to the end), mirroring
// Initialize/Delete transformers. Otherwise selectedWalletIndex stays stale until the
// deferred scroll settles, and getSelectedWalletId() returns the previously selected wallet.
selectedWalletIndex = prevState.wallets2.size,
wallets = (prevState.wallets + walletLoadingStateFactory.create(userWallet)).toImmutableList(), wallets = (prevState.wallets + walletLoadingStateFactory.create(userWallet)).toImmutableList(),
wallets2 = (prevState.wallets2 + walletLoadingStateFactory.create2(userWallet)).toImmutableList(), wallets2 = (prevState.wallets2 + walletLoadingStateFactory.create2(userWallet)).toImmutableList(),
) )

17
features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen2.kt
View file

@ -80,6 +80,8 @@ import com.tangem.features.virtualaccount.main.component.VirtualAccountMainBlock
import com.tangem.features.virtualaccount.main.entity.VirtualAccountMainUM import com.tangem.features.virtualaccount.main.entity.VirtualAccountMainUM
import dev.chrisbanes.haze.HazeProgressive import dev.chrisbanes.haze.HazeProgressive
import dev.chrisbanes.haze.HazeTint import dev.chrisbanes.haze.HazeTint
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.drop
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlin.math.abs import kotlin.math.abs
@ -208,10 +210,17 @@ private fun WalletContent2(
bottom = paddingValues.calculateBottomPadding() + marketHintApproxHeight, bottom = paddingValues.calculateBottomPadding() + marketHintApproxHeight,
) )
LaunchedEffect(walletsPagerState.currentPage) { val selectedWalletIndex by rememberUpdatedState(state.selectedWalletIndex)
if (walletsPagerState.currentPage != state.selectedWalletIndex) { LaunchedEffect(walletsPagerState) {
state.onWalletChange(walletsPagerState.currentPage, false) // Only react to genuine settles and skip the page the pager was (re)created with, so a
} // programmatic scroll or pager recreation can't revert the selection to a stale page.
snapshotFlow { walletsPagerState.settledPage }
.drop(count = 1)
.collectLatest { settledPage ->
if (settledPage != selectedWalletIndex) {
state.onWalletChange(settledPage, false)
}
}
} }
val canPagerScroll by remember { derivedStateOf { behavior.state.heightOffset == 0f } } val canPagerScroll by remember { derivedStateOf { behavior.state.heightOffset == 0f } }