From 8fa0d16c166b68e70e989742f041c8b218efe112 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 12 Mar 2026 16:34:36 +0300 Subject: [PATCH 1/3] Updated on 2026-08-14 --- .../wallet/model/intents/WalletCurrencyActionsClickIntents.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCurrencyActionsClickIntents.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCurrencyActionsClickIntents.kt index b57effd249..3635996d11 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCurrencyActionsClickIntents.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCurrencyActionsClickIntents.kt @@ -1,5 +1,6 @@ package com.tangem.feature.wallet.child.wallet.model.intents +import com.arkivanov.decompose.router.slot.dismiss import com.tangem.blockchain.common.address.AddressType import com.tangem.common.routing.AppRoute import com.tangem.common.routing.AppRouter @@ -288,7 +289,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor( ) }, ifRight = { - stateHolder.update(CloseBottomSheetTransformer(userWalletId = accountId.userWalletId)) + router.dialogNavigation.dismiss() }, ) } From d10df0569a92c157e9a408d58703dd7ca22d350a Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 12 Mar 2026 18:34:46 +0500 Subject: [PATCH 2/3] Updated on 2026-08-14 --- .../model/converter/TokenListToStateConverter.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/organizetokens/model/converter/TokenListToStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/organizetokens/model/converter/TokenListToStateConverter.kt index d6fbf57989..2d1b76c423 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/organizetokens/model/converter/TokenListToStateConverter.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/organizetokens/model/converter/TokenListToStateConverter.kt @@ -5,7 +5,6 @@ import com.tangem.domain.account.models.AccountStatusList import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.TokensGroupType import com.tangem.domain.models.TokensSortType -import com.tangem.domain.models.TotalFiatBalance import com.tangem.domain.models.account.filterCryptoPortfolio import com.tangem.domain.models.tokenlist.TokenList import com.tangem.feature.wallet.child.organizetokens.entity.DraggableItem @@ -70,7 +69,7 @@ internal class AccountTokenItemConverter( tokenItemState = AccountCryptoPortfolioItemStateConverter( appCurrency = appCurrency, account = accountStatus.account, - ).convert(TotalFiatBalance.Loading), + ).convert(accountStatus.tokenList.totalFiatBalance), ), ) if (isGrouping) { From f063bd6bb8edca2802a24d308f6ca8d0479976d1 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 12 Mar 2026 18:35:21 +0500 Subject: [PATCH 3/3] Updated on 2026-08-14 --- .../impl/child/accesscode/ui/MultiWalletAccessCodeEnter.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeEnter.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeEnter.kt index d4c055fcda..990778ca91 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeEnter.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeEnter.kt @@ -59,7 +59,7 @@ internal fun MultiWalletAccessCodeEnter( val focusRequester = remember { FocusRequester() } OutlineTextField( - modifier = modifier + modifier = Modifier .focusRequester(focusRequester) .fillMaxWidth(), value = if (reEnterAccessCodeState) { @@ -73,12 +73,14 @@ internal fun MultiWalletAccessCodeEnter( state.onAccessCodeFirstChange }, label = stringResourceSafe(id = R.string.onboarding_wallet_info_title_third), - isError = state.codesNotMatchError, + isError = state.codesNotMatchError || state.atLeast4CharError, visualTransformation = PasswordVisualTransformation(), keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password), caption = when { state.codesNotMatchError && reEnterAccessCodeState -> stringResourceSafe(R.string.onboarding_access_codes_doesnt_match) + state.atLeast4CharError && !reEnterAccessCodeState -> + stringResourceSafe(R.string.onboarding_access_code_too_short) else -> null }, )