From 929177b90e74b9483757107c785686e5188ba89b Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 16 Jul 2024 12:07:21 +0100 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/tap/common/DialogManager.kt | 3 ++- .../main/java/com/tangem/tap/common/redux/AppDialog.kt | 1 + .../impl/presentation/router/DefaultTokensListRouter.kt | 8 ++++++-- .../tokens/impl/presentation/router/TokensListRouter.kt | 3 ++- .../impl/presentation/viewmodels/TokensListViewModel.kt | 1 + .../notifications/NotificationWithBackground.kt | 4 ++-- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/common/DialogManager.kt b/app/src/main/java/com/tangem/tap/common/DialogManager.kt index 6b870386be..01625dc4f2 100644 --- a/app/src/main/java/com/tangem/tap/common/DialogManager.kt +++ b/app/src/main/java/com/tangem/tap/common/DialogManager.kt @@ -139,8 +139,9 @@ class DialogManager : StoreSubscriber { title = context.getString(state.dialog.titleRes, state.dialog.currencySymbol), message = context.getString( state.dialog.messageRes, - state.dialog.currencySymbol, state.dialog.currencyTitle, + state.dialog.currencySymbol, + state.dialog.networkName, ), context = context, ) diff --git a/app/src/main/java/com/tangem/tap/common/redux/AppDialog.kt b/app/src/main/java/com/tangem/tap/common/redux/AppDialog.kt index fc362509c3..a65014a580 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/AppDialog.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/AppDialog.kt @@ -43,6 +43,7 @@ sealed class AppDialog : StateDialog { data class TokensAreLinkedDialog( val currencyTitle: String, val currencySymbol: String, + val networkName: String, ) : AppDialog() { val messageRes: Int = R.string.token_details_unable_hide_alert_message val titleRes: Int = R.string.token_details_unable_hide_alert_title diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt index 27418f3d01..f401253e1e 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt @@ -29,9 +29,13 @@ internal class DefaultTokensListRouter : TokensListRouter { store.dispatchNotification(R.string.contract_address_copied_message) } - override fun openUnableHideMainTokenAlert(tokenName: String, tokenSymbol: String) { + override fun openUnableHideMainTokenAlert(tokenName: String, tokenSymbol: String, networkName: String) { store.dispatchDialogShow( - dialog = AppDialog.TokensAreLinkedDialog(currencyTitle = tokenName, currencySymbol = tokenSymbol), + dialog = AppDialog.TokensAreLinkedDialog( + currencyTitle = tokenName, + currencySymbol = tokenSymbol, + networkName = networkName, + ), ) } diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt index 34b5379b48..a11e584564 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt @@ -19,8 +19,9 @@ internal interface TokensListRouter { * * @param tokenName token name * @param tokenSymbol token brief name + * @param networkName blockchain network full name */ - fun openUnableHideMainTokenAlert(tokenName: String, tokenSymbol: String) + fun openUnableHideMainTokenAlert(tokenName: String, tokenSymbol: String, networkName: String) /** * Open alert to remove wallet diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt index 53867da367..4874bc303c 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt @@ -365,6 +365,7 @@ internal class TokensListViewModel @Inject constructor( router.openUnableHideMainTokenAlert( tokenName = blockchain.name, tokenSymbol = blockchain.currency, + networkName = blockchain.fullName, ) } else if (isAddedOnMainScreen) { router.openRemoveWalletAlert( diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationWithBackground.kt b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationWithBackground.kt index 076c60da41..34ae262e6d 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationWithBackground.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationWithBackground.kt @@ -172,7 +172,7 @@ private class NotificationWithBackgroundPreviewProvider : PreviewParameterProvid title = resourceReference(id = R.string.main_swap_changelly_promotion_title), subtitle = resourceReference( id = R.string.main_swap_changelly_promotion_message, - formatArgs = wrappedList("1", "2"), + formatArgs = wrappedList("1", "2", "3"), ), iconResId = R.drawable.img_swap_promo, backgroundResId = R.drawable.img_swap_promo_blue_banner_background, @@ -180,7 +180,7 @@ private class NotificationWithBackgroundPreviewProvider : PreviewParameterProvid NotificationConfig( title = resourceReference( id = R.string.token_swap_changelly_promotion_title, - formatArgs = wrappedList("1", "2"), + formatArgs = wrappedList("1"), ), subtitle = stringReference( "Swap multiple currencies between any chains you wish. Swap multiple " +