Updated on 2026-08-14

features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/entity/customtoken/CustomTokenFormUM.kt

@@ -14,6 +14,7 @@ internal data class CustomTokenFormUM(
     val notifications: PersistentList<NotificationUM> = persistentListOf(),
     val canAddToken: Boolean = false,
     val isValidating: Boolean = false,
+    val needToAddDerivation: Boolean = false,
     val saveToken: () -> Unit,
 ) {
 

features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/CustomTokenFormModel.kt

@@ -12,6 +12,7 @@ import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.message.ContentMessage
 import com.tangem.domain.card.DerivePublicKeysUseCase
+import com.tangem.domain.card.HasMissedDerivationsUseCase
 import com.tangem.domain.managetokens.model.exceptoin.CustomTokenFormValidationException
 import com.tangem.domain.tokens.AddCryptoCurrenciesUseCase
 import com.tangem.domain.tokens.model.CryptoCurrency
@@ -43,6 +44,7 @@ internal class CustomTokenFormModel @Inject constructor(
     private val customCurrencyValidator: CustomCurrencyValidator,
     private val addCryptoCurrenciesUseCase: AddCryptoCurrenciesUseCase,
     private val derivePublicKeysUseCase: DerivePublicKeysUseCase,
+    private val hasMissedDerivationsUseCase: HasMissedDerivationsUseCase,
     private val messageSender: UiMessageSender,
     private val customTokenFormManager: CustomCurrencyFormBuilder,
     private val analyticsEventHandler: AnalyticsEventHandler,
@@ -156,7 +158,12 @@ internal class CustomTokenFormModel @Inject constructor(
         fillForm: Boolean,
         isAlreadyAdded: Boolean,
         isCustom: Boolean,
-    ) {
+    ) = modelScope.launch {
+        val needToAddDerivation = hasMissedDerivationsUseCase(
+            userWalletId = params.userWalletId,
+            networksWithDerivationPath = mapOf(currency.network.backendId to getDerivationPath().value),
+        )
+
         state.update { state ->
             var updatedState = state
                 .updateWithProgress(
@@ -166,6 +173,7 @@ internal class CustomTokenFormModel @Inject constructor(
                     clearNotifications = true,
                     clearFieldErrors = true,
                     disableSecondaryFields = !isCustom,
+                    needToAddDerivation = needToAddDerivation,
                 )
 
             if (fillForm) {

features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/CustomTokenFormContent.kt

@@ -22,9 +22,11 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastForEach
-import com.tangem.core.ui.components.PrimaryButton
 import com.tangem.core.ui.components.block.information.InformationBlock
 import com.tangem.core.ui.components.bottomFade
+import com.tangem.core.ui.components.buttons.common.TangemButton
+import com.tangem.core.ui.components.buttons.common.TangemButtonIconPosition
+import com.tangem.core.ui.components.buttons.common.TangemButtonsDefaults
 import com.tangem.core.ui.components.fields.SimpleTextField
 import com.tangem.core.ui.components.isOpened
 import com.tangem.core.ui.components.keyboardAsState
@@ -82,14 +84,21 @@ internal fun CustomTokenFormContent(model: CustomTokenFormUM, modifier: Modifier
             }
         }
 
-        PrimaryButton(
+        TangemButton(
             modifier = Modifier
                 .align(Alignment.BottomCenter)
                 .padding(bottom = TangemTheme.dimens.spacing16 + bottomBarHeight)
                 .fillMaxWidth(),
             text = stringResource(id = R.string.custom_token_add_token),
+            colors = TangemButtonsDefaults.primaryButtonColors,
             enabled = model.canAddToken,
             showProgress = model.isValidating,
+            animateContentChange = true,
+            icon = if (model.needToAddDerivation) {
+                TangemButtonIconPosition.End(R.drawable.ic_tangem_24)
+            } else {
+                TangemButtonIconPosition.None
+            },
             onClick = model.saveToken,
         )
     }

features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/ui/CustomCurrencyFormOperations.kt

@@ -27,6 +27,7 @@ internal fun CustomTokenFormUM.updateWithProgress(
     showProgress: Boolean,
     isWasFilled: Boolean = this.tokenForm?.wasFilled ?: false,
     canAddToken: Boolean = this.canAddToken,
+    needToAddDerivation: Boolean = false,
     clearNotifications: Boolean = false,
     clearFieldErrors: Boolean = false,
     disableSecondaryFields: Boolean = false,
@@ -34,6 +35,7 @@ internal fun CustomTokenFormUM.updateWithProgress(
     return copy(
         isValidating = showProgress,
         canAddToken = canAddToken,
+        needToAddDerivation = needToAddDerivation,
         notifications = if (clearNotifications) persistentListOf() else notifications,
     ).updateTokenForm {
         val updatedFields = fields.mapValues { (key, field) ->