From e2e81b0810cb8113f88fc274076de7e53c828120 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 16 Jul 2026 11:29:22 +0200
Subject: [PATCH] Updated on 2026-08-14

---
 .../impl/managefunds/DefaultManageFundsComponent.kt   | 11 ++++++++---
 .../impl/tokenactions/ui/TokenActionsContentV2.kt     |  6 ++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/managefunds/DefaultManageFundsComponent.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/managefunds/DefaultManageFundsComponent.kt
index b2ae5d9dda..df8257ed67 100644
--- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/managefunds/DefaultManageFundsComponent.kt
+++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/managefunds/DefaultManageFundsComponent.kt
@@ -1,6 +1,9 @@
 package com.tangem.features.commonfeatures.impl.managefunds
 
 import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -11,6 +14,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.common.ui.markets.action.TokenActionsContext
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.context.child
 import com.tangem.core.decompose.model.getOrCreateModel
@@ -22,14 +26,13 @@ import com.tangem.core.ui.ds2.button.TangemButton
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemeRedesign
 import com.tangem.core.ui.test.BaseBottomSheetTestTags
-import com.tangem.features.commonfeatures.api.managefunds.ManageFundsComponent
 import com.tangem.features.commonfeatures.api.choosetoken.ChooseTokenComponent
+import com.tangem.features.commonfeatures.api.managefunds.ManageFundsComponent
+import com.tangem.features.commonfeatures.impl.R
 import com.tangem.features.commonfeatures.impl.managefunds.model.ManageFundsModel
 import com.tangem.features.commonfeatures.impl.managefunds.model.uiSpec
-import com.tangem.common.ui.markets.action.TokenActionsContext
 import com.tangem.features.commonfeatures.impl.tokenactions.TokenActionsComponent
 import com.tangem.features.commonfeatures.impl.userportfolio.UserPortfolioComponent
-import com.tangem.features.commonfeatures.impl.R
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -140,6 +143,8 @@ internal class DefaultManageFundsComponent @AssistedInject constructor(
                     AnimatedContent(
                         targetState = route,
                         modifier = animatedContentModifier,
+                        transitionSpec = { fadeIn().togetherWith(fadeOut()) },
+                        contentKey = { route -> route::class },
                         label = "ManageFundsContentAnimation",
                     ) { animatedRoute ->
                         ManageFundsRouteContent(
diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/ui/TokenActionsContentV2.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/ui/TokenActionsContentV2.kt
index bf4f21300b..f9c83e26ab 100644
--- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/ui/TokenActionsContentV2.kt
+++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/ui/TokenActionsContentV2.kt
@@ -3,10 +3,8 @@ package com.tangem.features.commonfeatures.impl.tokenactions.ui
 import android.content.res.Configuration
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.MutableTransitionState
-import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -119,8 +117,8 @@ private fun QuickActionsList(state: TokenActionsUM, modifier: Modifier = Modifie
                 }
                 AnimatedVisibility(
                     visibleState = transitionState,
-                    enter = fadeIn() + expandVertically(),
-                    exit = fadeOut() + shrinkVertically(),
+                    enter = fadeIn(),
+                    exit = fadeOut(),
                 ) {
                     val actionModifier = when (actionUM) {
                         is QuickActionUM.V1.Buy, is QuickActionUM.V2.Buy ->