Updated on 2026-08-14

This commit is contained in:
Tangem 2026-07-10 13:13:04 +02:00
parent 3900f1004b
commit 68b2bb4d1e
10 changed files with 48 additions and 8 deletions

View file

@ -139,7 +139,7 @@ sealed class QuickActionUM(
) )
data object SwapAndSend : V2( data object SwapAndSend : V2(
title = resourceReference(R.string.common_send_with_swap), title = resourceReference(R.string.send_with_swap_confirm_title),
description = resourceReference(R.string.quick_action_send_and_swap_description), description = resourceReference(R.string.quick_action_send_and_swap_description),
icon = R.drawable.ic_exchange_mini_24, icon = R.drawable.ic_exchange_mini_24,
) )

View file

@ -44,7 +44,7 @@ data class TokenActionsBSContentUM(
iconRes = R.drawable.ic_exchange_horizontal_24, iconRes = R.drawable.ic_exchange_horizontal_24,
), ),
SendWithSwap( SendWithSwap(
text = resourceReference(R.string.common_send_with_swap), text = resourceReference(R.string.send_with_swap_confirm_title),
iconRes = R.drawable.ic_exchange_horizontal_24, iconRes = R.drawable.ic_exchange_horizontal_24,
), ),
Stake( Stake(

View file

@ -131,6 +131,7 @@
<string name="address_book_no_contacts">Noch keine Kontakte</string> <string name="address_book_no_contacts">Noch keine Kontakte</string>
<string name="address_book_no_contacts_description">Die von Ihnen hinzugefügten Kontakte werden hier angezeigt</string> <string name="address_book_no_contacts_description">Die von Ihnen hinzugefügten Kontakte werden hier angezeigt</string>
<string name="address_book_remove_address">Adresse entfernen</string> <string name="address_book_remove_address">Adresse entfernen</string>
<string name="address_book_save_address">Adresse speichern</string>
<string name="address_book_save_contact">Kontakt speichern</string> <string name="address_book_save_contact">Kontakt speichern</string>
<string name="address_book_save_to_wallet_title">In Wallet speichern</string> <string name="address_book_save_to_wallet_title">In Wallet speichern</string>
<string name="address_book_save_wallet_to_description">Dieser Kontakt wird mit dem Adressbuch dieser Wallet verknüpft.</string> <string name="address_book_save_wallet_to_description">Dieser Kontakt wird mit dem Adressbuch dieser Wallet verknüpft.</string>
@ -638,6 +639,8 @@
<string name="express_exchange_notification_long_transaction_time_title">Lange Transaktionszeit</string> <string name="express_exchange_notification_long_transaction_time_title">Lange Transaktionszeit</string>
<string name="express_exchange_notification_refund_text">Der Transaktionsbetrag wurde aufgrund von OKX- oder Bridge-Regeln in %1$s auf deine Wallet zurückerstattet. %2$s</string> <string name="express_exchange_notification_refund_text">Der Transaktionsbetrag wurde aufgrund von OKX- oder Bridge-Regeln in %1$s auf deine Wallet zurückerstattet. %2$s</string>
<string name="express_exchange_notification_refund_title">Der Betrag wurde in %1$s (%2$s Netzwerk) zurückerstattet.</string> <string name="express_exchange_notification_refund_title">Der Betrag wurde in %1$s (%2$s Netzwerk) zurückerstattet.</string>
<string name="express_exchange_notification_refunded_in_text">Ihr Guthaben wurde gemäß den Regeln der OKX-Börse in %1$s an Ihre Wallet im %2$s -Netzwerk zurückerstattet.</string>
<string name="express_exchange_notification_refunded_in_title">Rückerstattung erfolgt in %s</string>
<string name="express_exchange_notification_verification_text">Besuche die Website des Anbieters zur Überprüfung</string> <string name="express_exchange_notification_verification_text">Besuche die Website des Anbieters zur Überprüfung</string>
<string name="express_exchange_notification_verification_title">KYC-Überprüfung durch den Anbieter erforderlich</string> <string name="express_exchange_notification_verification_title">KYC-Überprüfung durch den Anbieter erforderlich</string>
<string name="express_exchange_status_bought">Kauf abgeschlossen</string> <string name="express_exchange_status_bought">Kauf abgeschlossen</string>
@ -1307,9 +1310,12 @@
<string name="promo_campaign_enroll_success_title">Sie sind erfolgreich eingeschrieben in %1$s</string> <string name="promo_campaign_enroll_success_title">Sie sind erfolgreich eingeschrieben in %1$s</string>
<string name="promo_campaign_not_active_subtitle">Diese Aktion existiert nicht mehr oder ist abgelaufen.</string> <string name="promo_campaign_not_active_subtitle">Diese Aktion existiert nicht mehr oder ist abgelaufen.</string>
<string name="promo_campaign_not_active_title">Kampagne nicht aktiv</string> <string name="promo_campaign_not_active_title">Kampagne nicht aktiv</string>
<string name="promo_campaign_reactivation_summary_description">Erhalten Sie bei jedem Swap über 500 $ ein Cashback von 0,5% , und zwar für alle Währungspaare außer „Stablecoin zu Stablecoin“. Die maximale Auszahlung beträgt 50 $ pro Swap.\n\nFühren Sie fünf qualifizierende Swaps durch und sichern Sie sich einen zusätzlichen Bonus von 10 $.\n\nDie Prämien werden wöchentlich in USDT oder USDC an die ausgewählte Adresse ausgezahlt.</string>
<string name="promo_campaign_select_cashback_account">Cashback-Konto auswählen</string> <string name="promo_campaign_select_cashback_account">Cashback-Konto auswählen</string>
<string name="promo_campaign_select_token">Token auswählen</string>
<string name="promo_campaign_summary_title">Melden Sie sich an %1$s</string> <string name="promo_campaign_summary_title">Melden Sie sich an %1$s</string>
<string name="promo_campaign_terms_agreement">Ich stimme zu, dass %1$s</string> <string name="promo_campaign_terms_agreement">Ich stimme zu, dass %1$s</string>
<string name="promo_campaign_terms_agreement_android">Ich stimme zu, dass</string>
<string name="promo_campaign_terms_link">%1$s Bedingungen</string> <string name="promo_campaign_terms_link">%1$s Bedingungen</string>
<string name="promo_campaign_whale_swap_summary_description">Erhalten Sie bis Ende Juli bei jedem Swap ab 10.000 $ Cashback.\n\nDie Sätze steigen mit dem Volumen: 0,10% ab 10.000 $, 0,20% ab 20.000 $, 0,50% ab 100.000 $.\n\nMaximale Auszahlung: 500 $ pro Swap und 10.000 $ pro Wallet und Swap-Richtung, solange die Aktion läuft. Swaps von Stablecoins in andere Stablecoins sind ausgeschlossen.\n\nDie Auszahlung erfolgt wöchentlich an eine USDT- oder USDC-Adresse Ihrer Wahl.</string> <string name="promo_campaign_whale_swap_summary_description">Erhalten Sie bis Ende Juli bei jedem Swap ab 10.000 $ Cashback.\n\nDie Sätze steigen mit dem Volumen: 0,10% ab 10.000 $, 0,20% ab 20.000 $, 0,50% ab 100.000 $.\n\nMaximale Auszahlung: 500 $ pro Swap und 10.000 $ pro Wallet und Swap-Richtung, solange die Aktion läuft. Swaps von Stablecoins in andere Stablecoins sind ausgeschlossen.\n\nDie Auszahlung erfolgt wöchentlich an eine USDT- oder USDC-Adresse Ihrer Wahl.</string>
<string name="provider_name_support">%s Unterstützung</string> <string name="provider_name_support">%s Unterstützung</string>

View file

@ -1288,6 +1288,7 @@
<string name="quick_action_buy_description">Tarjeta de crédito o cuenta bancaria</string> <string name="quick_action_buy_description">Tarjeta de crédito o cuenta bancaria</string>
<string name="quick_action_receive_description">Comparta su dirección o código QR</string> <string name="quick_action_receive_description">Comparta su dirección o código QR</string>
<string name="quick_action_sell_description">Venda criptomonedas de forma segura</string> <string name="quick_action_sell_description">Venda criptomonedas de forma segura</string>
<string name="quick_action_send_and_swap_description">Enviar con intercambio a otro token</string>
<string name="quick_action_send_description">Enviar a otra billetera</string> <string name="quick_action_send_description">Enviar a otra billetera</string>
<string name="quick_action_swap_description">Entre sus portafolios</string> <string name="quick_action_swap_description">Entre sus portafolios</string>
<string name="quick_top_up_chip_other">Otro</string> <string name="quick_top_up_chip_other">Otro</string>

View file

@ -355,6 +355,7 @@
<string name="common_from">送信元</string> <string name="common_from">送信元</string>
<string name="common_from_wallet_name">%sから</string> <string name="common_from_wallet_name">%sから</string>
<string name="common_generate_addresses">アドレスを同期する</string> <string name="common_generate_addresses">アドレスを同期する</string>
<string name="common_get">入手</string>
<string name="common_get_started">はじめる</string> <string name="common_get_started">はじめる</string>
<string name="common_get_token">トークンを取得</string> <string name="common_get_token">トークンを取得</string>
<string name="common_go_to_provider">プロバイダーへ移動</string> <string name="common_go_to_provider">プロバイダーへ移動</string>
@ -1249,6 +1250,20 @@
<string name="organize_tokens_sort_by_balance">残高順</string> <string name="organize_tokens_sort_by_balance">残高順</string>
<string name="organize_tokens_title">トークンを整理する</string> <string name="organize_tokens_title">トークンを整理する</string>
<string name="organize_tokens_ungroup">グループ解除</string> <string name="organize_tokens_ungroup">グループ解除</string>
<string name="promo_campaign_already_activated_subtitle">対象のキャッシュバックは次のアドレスに配布されます:</string>
<string name="promo_campaign_already_activated_title">すでに%1$sに参加しています</string>
<string name="promo_campaign_eligible_tokens">対象トークン</string>
<string name="promo_campaign_enroll">参加する</string>
<string name="promo_campaign_enroll_success_title">%1$sへの参加が完了しました</string>
<string name="promo_campaign_not_active_subtitle">このキャンペーンは終了したか、無効です</string>
<string name="promo_campaign_not_active_title">キャンペーンは実施されていません</string>
<string name="promo_campaign_reactivation_summary_description">500ドルを超えるスワップごとに0.5%のキャッシュバックを獲得できます。ステーブルコイン同士を除く、すべてのペアが対象です。キャッシュバックは1回のスワップあたり最大50ドルです。\n\n対象のスワップを5回完了すると、さらに10ドルのボーナスを獲得できます。\n\n報酬は毎週、ご指定のUSDTまたはUSDCアドレスにお支払いします。</string>
<string name="promo_campaign_select_cashback_account">キャッシュバックの受取口座を選択</string>
<string name="promo_campaign_select_token">トークンを選択</string>
<string name="promo_campaign_summary_title">%1$sに参加</string>
<string name="promo_campaign_terms_agreement">%1$sに同意します</string>
<string name="promo_campaign_terms_link">%1$s 利用規約</string>
<string name="promo_campaign_whale_swap_summary_description">7月末まで、累計1万ドル以上のスワップでキャッシュバックを獲得できます。\n\n累計スワップ額に応じて還元率がアップします。1万ドル以上で0.10%、2万ドル以上で0.20%、10万ドル以上で0.50%。\n\nキャッシュバックは、1回のスワップあたり最大500ドル、ウォレットごと・スワップ方向ごとにキャンペーン期間中、合計最大1万ドルです。ステーブルコイン同士のスワップは対象外です。\n\nキャッシュバックは毎週、ご指定のUSDTまたはUSDCアドレスにお支払いします。</string>
<string name="provider_name_support">%sサポート</string> <string name="provider_name_support">%sサポート</string>
<string name="push_notification_settings_banner_description">プッシュ通知は有効ですが、許可するまで動作しません</string> <string name="push_notification_settings_banner_description">プッシュ通知は有効ですが、許可するまで動作しません</string>
<string name="push_notification_settings_banner_title">通知を許可する</string> <string name="push_notification_settings_banner_title">通知を許可する</string>

View file

@ -1310,6 +1310,7 @@
<string name="promo_campaign_select_cashback_account">Selecione a conta de cashback</string> <string name="promo_campaign_select_cashback_account">Selecione a conta de cashback</string>
<string name="promo_campaign_summary_title">Inscreva-se em %1$s</string> <string name="promo_campaign_summary_title">Inscreva-se em %1$s</string>
<string name="promo_campaign_terms_agreement">Concordo com %1$s</string> <string name="promo_campaign_terms_agreement">Concordo com %1$s</string>
<string name="promo_campaign_terms_agreement_android">Concordo com</string>
<string name="promo_campaign_terms_link">%1$s Termos</string> <string name="promo_campaign_terms_link">%1$s Termos</string>
<string name="promo_campaign_whale_swap_summary_description">Ganhe cashback em todas as suas transações a partir de US$ 10.000 até o final de julho.\n\nAs taxas aumentam conforme o tamanho da transação: 0,10% a partir de US$ 10 mil, 0,20% a partir de US$ 20 mil, 0,50% A partir de US$ 100 mil.\n\nPagamento máximo: US$ 500 por troca e US$ 10.000 por carteira por direção de troca, enquanto durar a campanha. Trocas de stablecoin por stablecoin estão excluídas.\n\nO pagamento é feito semanalmente em USDT ou USDC, no endereço de sua escolha.</string> <string name="promo_campaign_whale_swap_summary_description">Ganhe cashback em todas as suas transações a partir de US$ 10.000 até o final de julho.\n\nAs taxas aumentam conforme o tamanho da transação: 0,10% a partir de US$ 10 mil, 0,20% a partir de US$ 20 mil, 0,50% A partir de US$ 100 mil.\n\nPagamento máximo: US$ 500 por troca e US$ 10.000 por carteira por direção de troca, enquanto durar a campanha. Trocas de stablecoin por stablecoin estão excluídas.\n\nO pagamento é feito semanalmente em USDT ou USDC, no endereço de sua escolha.</string>
<string name="provider_name_support">%s suporte</string> <string name="provider_name_support">%s suporte</string>

View file

@ -377,6 +377,7 @@
<string name="common_from">Из</string> <string name="common_from">Из</string>
<string name="common_from_wallet_name">Из %s</string> <string name="common_from_wallet_name">Из %s</string>
<string name="common_generate_addresses">Синхронизировать адреса</string> <string name="common_generate_addresses">Синхронизировать адреса</string>
<string name="common_get">Приобрести</string>
<string name="common_get_started">Начать</string> <string name="common_get_started">Начать</string>
<string name="common_get_token">Получить токен</string> <string name="common_get_token">Получить токен</string>
<string name="common_go_to_provider">К провайдеру</string> <string name="common_go_to_provider">К провайдеру</string>

View file

@ -356,6 +356,7 @@
<string name="common_from"></string> <string name="common_from"></string>
<string name="common_from_wallet_name">从 %s</string> <string name="common_from_wallet_name">从 %s</string>
<string name="common_generate_addresses">同步地址</string> <string name="common_generate_addresses">同步地址</string>
<string name="common_get">得到</string>
<string name="common_get_started">开始</string> <string name="common_get_started">开始</string>
<string name="common_get_token">获取代币</string> <string name="common_get_token">获取代币</string>
<string name="common_go_to_provider">前往服务提供商</string> <string name="common_go_to_provider">前往服务提供商</string>
@ -1245,6 +1246,21 @@
<string name="organize_tokens_sort_by_balance">按余额</string> <string name="organize_tokens_sort_by_balance">按余额</string>
<string name="organize_tokens_title">整理代币</string> <string name="organize_tokens_title">整理代币</string>
<string name="organize_tokens_ungroup">取消分组</string> <string name="organize_tokens_ungroup">取消分组</string>
<string name="promo_campaign_already_activated_subtitle">符合条件的返现将发放给:</string>
<string name="promo_campaign_already_activated_title">您已经注册了 %1$s</string>
<string name="promo_campaign_eligible_tokens">符合条件的代币</string>
<string name="promo_campaign_enroll">注册</string>
<string name="promo_campaign_enroll_success_title">您已成功注册 %1$s</string>
<string name="promo_campaign_not_active_subtitle">此活动已结束或已过期。</string>
<string name="promo_campaign_not_active_title">活动未启动</string>
<string name="promo_campaign_reactivation_summary_description">每次兑换金额超过 500 美元,即可获得 0.5% 的返现,适用于除稳定币与稳定币之间的兑换以外的所有交易对。每次兑换的最高返现金额为 50 美元。\n\n完成五笔符合条件的兑换即可解锁额外 10 美元的奖励。\n\n奖励每周以 USDT 或 USDC 形式支付至您选择的地址。</string>
<string name="promo_campaign_select_cashback_account">选择返现账户</string>
<string name="promo_campaign_select_token">选择代币</string>
<string name="promo_campaign_summary_title">报名参加 %1$s</string>
<string name="promo_campaign_terms_agreement">我同意 %1$s</string>
<string name="promo_campaign_terms_agreement_android">我同意</string>
<string name="promo_campaign_terms_link">%1$s 条款</string>
<string name="promo_campaign_whale_swap_summary_description">7月底前每次1万美元及以上的兑换均可获得返现。\n\n返现率随交易金额递增1万美元起为0.10% 2万美元起为0.20% 10万美元起为0.50% 。n\n最高奖励每笔最少兑换500美元且在活动期间内每个钱包单向兑换方向的奖励上限为10,000美元。稳定币与稳定币之间的兑换不计入奖励范围。\n\n奖励每周发放至您指定的USDT或USDC地址。</string>
<string name="provider_name_support">%s 支持</string> <string name="provider_name_support">%s 支持</string>
<string name="push_notification_settings_banner_description">推送通知已启用,但需要您在设备设置中允许通知才能正常工作。</string> <string name="push_notification_settings_banner_description">推送通知已启用,但需要您在设备设置中允许通知才能正常工作。</string>
<string name="push_notification_settings_banner_title">允许通知</string> <string name="push_notification_settings_banner_title">允许通知</string>

View file

@ -131,6 +131,7 @@
<string name="address_book_no_contacts">No contacts yet</string> <string name="address_book_no_contacts">No contacts yet</string>
<string name="address_book_no_contacts_description">Contacts added will appear here</string> <string name="address_book_no_contacts_description">Contacts added will appear here</string>
<string name="address_book_remove_address">Remove address</string> <string name="address_book_remove_address">Remove address</string>
<string name="address_book_save_address">Save address</string>
<string name="address_book_save_contact">Save contact</string> <string name="address_book_save_contact">Save contact</string>
<string name="address_book_save_to_wallet_title">Save to Wallet</string> <string name="address_book_save_to_wallet_title">Save to Wallet</string>
<string name="address_book_save_wallet_to_description">This contact will be linked to this wallets address book.</string> <string name="address_book_save_wallet_to_description">This contact will be linked to this wallets address book.</string>
@ -1310,9 +1311,12 @@
<string name="promo_campaign_enroll_success_title">You\'re successfully enrolled in %1$s</string> <string name="promo_campaign_enroll_success_title">You\'re successfully enrolled in %1$s</string>
<string name="promo_campaign_not_active_subtitle">This campaign no longer exists or has expired</string> <string name="promo_campaign_not_active_subtitle">This campaign no longer exists or has expired</string>
<string name="promo_campaign_not_active_title">Campaign not active</string> <string name="promo_campaign_not_active_title">Campaign not active</string>
<string name="promo_campaign_reactivation_summary_description">Earn 0.5% cashback on every swap over $500, on any pair except stable to stable. Max payout $50 per swap.\n\nComplete five qualifying swaps and unlock an extra $10 bonus.\n\nRewards are paid weekly in USDT or USDC on the address selected.</string>
<string name="promo_campaign_select_cashback_account">Select cashback account</string> <string name="promo_campaign_select_cashback_account">Select cashback account</string>
<string name="promo_campaign_select_token">Select token</string>
<string name="promo_campaign_summary_title">Enroll in %1$s</string> <string name="promo_campaign_summary_title">Enroll in %1$s</string>
<string name="promo_campaign_terms_agreement">I agree with %1$s</string> <string name="promo_campaign_terms_agreement">I agree with %1$s</string>
<string name="promo_campaign_terms_agreement_android">I agree with</string>
<string name="promo_campaign_terms_link">%1$s Terms</string> <string name="promo_campaign_terms_link">%1$s Terms</string>
<string name="promo_campaign_whale_swap_summary_description">Earn cashback on every swap from $10K until the end of July.\n\nRates step up with size: 0.10% from $10K, 0.20% from $20K, 0.50% from $100K.\n\nMax payout: $500 per swap, and $10,000 per wallet per swap direction until campaign lasts. Stable coin into stablecoin swaps are excluded.\n\nPayout arrives weekly in USDT or USDC address of your choice.</string> <string name="promo_campaign_whale_swap_summary_description">Earn cashback on every swap from $10K until the end of July.\n\nRates step up with size: 0.10% from $10K, 0.20% from $20K, 0.50% from $100K.\n\nMax payout: $500 per swap, and $10,000 per wallet per swap direction until campaign lasts. Stable coin into stablecoin swaps are excluded.\n\nPayout arrives weekly in USDT or USDC address of your choice.</string>
<string name="provider_name_support">%s support</string> <string name="provider_name_support">%s support</string>

View file

@ -1,10 +1,6 @@
package com.tangem.feature.tokendetails.presentation.tokendetails.ui.bottomsheet package com.tangem.feature.tokendetails.presentation.tokendetails.ui.bottomsheet
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.CompositionLocalProvider
@ -87,7 +83,7 @@ private fun SwapAndSendActionRow(state: TransferUM) {
if (state is TransferUM.Content && row == null) return if (state is TransferUM.Content && row == null) return
ActionRow( ActionRow(
iconRes = CoreR.drawable.ic_exchange_mini_24, iconRes = CoreR.drawable.ic_exchange_mini_24,
title = resourceReference(CoreR.string.common_send_with_swap), title = resourceReference(CoreR.string.send_with_swap_confirm_title),
description = resourceReference(CoreR.string.quick_action_send_and_swap_description), description = resourceReference(CoreR.string.quick_action_send_and_swap_description),
row = row, row = row,
isLoading = state is TransferUM.Loading, isLoading = state is TransferUM.Loading,