diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt index 8a65d0e7bd..ec5a34ac4e 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt @@ -262,7 +262,8 @@ private class DetailsScreenStateProvider : CollectionPreviewParameterProvider Unit, ) : SettingsItem( iconResId = R.drawable.ic_comment, - title = resourceReference(R.string.details_row_title_send_feedback), + title = resourceReference(R.string.details_row_title_contact_to_support), ) data class ReferralProgram( diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt index 3e12848581..5d4f2b20df 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt @@ -17,7 +17,6 @@ import com.tangem.tap.common.extensions.addContext import com.tangem.tap.common.extensions.dispatchOnMain import com.tangem.tap.common.extensions.dispatchWithMain import com.tangem.tap.common.feedback.FeedbackEmail -import com.tangem.tap.common.feedback.SupportInfo import com.tangem.tap.common.redux.AppState import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.features.details.redux.DetailsAction @@ -89,8 +88,9 @@ internal class DetailsViewModel( SettingsItem.AppSettings(::navigateToAppSettings) .let(::add) - SettingsItem.Chat(::navigateToChat) - .let(::add) + // removed chat in task [REDACTED_TASK_KEY] + // SettingsItem.Chat(::navigateToChat) + // .let(::add) SettingsItem.SendFeedback(::sendFeedback) .let(::add) @@ -141,11 +141,6 @@ internal class DetailsViewModel( store.dispatchOnMain(GlobalAction.SendEmail(FeedbackEmail())) } - private fun navigateToChat() { - Analytics.send(Settings.ButtonChat()) - store.dispatchOnMain(GlobalAction.OpenChat(SupportInfo())) - } - private fun navigateToAppSettings() { Analytics.send(Settings.ButtonAppSettings()) store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.AppSettings)) diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt index 4af057eb58..b979fd2d8c 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt @@ -22,7 +22,8 @@ class OnboardingMenuProvider : MenuProvider { override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) { R.id.menu_item_chat_support -> { Analytics.send(Onboarding.ButtonChat()) - store.dispatch(GlobalAction.OpenChat(SupportInfo())) + // changed on email support [REDACTED_TASK_KEY] + store.dispatch(GlobalAction.SendEmail(SupportInfo())) true } else -> false diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt index 9a08513cdb..dd07c89355 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt @@ -501,7 +501,8 @@ class OnboardingWalletFragment : private fun makeSeedPhraseRouter(): SeedPhraseRouter = SeedPhraseRouter( onBack = ::legacyOnBackHandler, onOpenChat = { - store.dispatch(GlobalAction.OpenChat(SupportInfo())) + // changed on email support [REDACTED_TASK_KEY] + store.dispatch(GlobalAction.SendEmail(SupportInfo())) }, onOpenUriClick = { uri -> store.dispatchOpenUrl(uri.toString()) diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/WalletActivationErrorDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/WalletActivationErrorDialog.kt index bc213e1d41..cfabd25957 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/WalletActivationErrorDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/WalletActivationErrorDialog.kt @@ -17,8 +17,9 @@ object WalletActivationErrorDialog { setTitle(context.getString(R.string.onboarding_activation_error_title)) setMessage(context.getString(R.string.onboarding_activation_error_message)) setPositiveButton(R.string.common_ok) { _, _ -> dialog.onConfirm() } - setNegativeButton(R.string.chat_button_title) { _, _ -> - store.dispatch(GlobalAction.OpenChat(SupportInfo())) + setNegativeButton(R.string.common_support) { _, _ -> + // changed on email support [REDACTED_TASK_KEY] + store.dispatch(GlobalAction.SendEmail(SupportInfo())) } setOnDismissListener { store.dispatchDialogHide() } setCancelable(false) diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt index 8da2d25445..cc67c24921 100644 --- a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt @@ -18,7 +18,7 @@ object RequestFeeErrorDialog { return AlertDialog.Builder(context).apply { setTitle(R.string.common_fee_error) setMessage(context.getString(R.string.alert_failed_to_send_transaction_message, errorMessage)) - setNegativeButton(R.string.alert_button_send_feedback) { _, _ -> + setNegativeButton(R.string.details_row_title_contact_to_support) { _, _ -> store.dispatch(GlobalAction.SendEmail(SendTransactionFailedEmail(errorMessage))) } setPositiveButton(R.string.common_retry) { _, _ -> dialog.onRetry() } diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt index 8d1fe0182f..4c300f7aeb 100644 --- a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/SendTransactionFailsDialog.kt @@ -30,7 +30,7 @@ object SendTransactionFailsDialog { return AlertDialog.Builder(context).apply { setTitle(R.string.alert_failed_to_send_transaction_title) setMessage(context.getString(R.string.alert_failed_to_send_transaction_message, errorMessage)) - setNeutralButton(R.string.alert_button_send_feedback) { _, _ -> + setNeutralButton(R.string.details_row_title_contact_to_support) { _, _ -> store.dispatch(GlobalAction.SendEmail(SendTransactionFailedEmail(errorMessage))) } setPositiveButton(R.string.common_cancel) { _, _ -> } diff --git a/app/src/main/res/menu/menu_onboarding.xml b/app/src/main/res/menu/menu_onboarding.xml index 28e7e73a09..fb7ee134ce 100644 --- a/app/src/main/res/menu/menu_onboarding.xml +++ b/app/src/main/res/menu/menu_onboarding.xml @@ -3,6 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index 45b3948014..62e755b2c6 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -130,6 +130,7 @@ Начать Отправить Успешно + Поддержка Обмен условия участия Ошибка транзакции @@ -181,11 +182,11 @@ Privacy policy %s хэшей Номер карты + Обратиться в поддержку Добавить еще карты Валюта приложения Скрывать балансы жестом переворота Эмитент - Отправить отзыв Подписано Подробности Проверьте подключение с интернетом или переключитесь на другую сеть @@ -454,7 +455,6 @@ Сумма Вычесть из суммы отправки Сумма к получению %s - Поддержка Транзакция не выполнена Причина: %1$s\nКод: %2$s Недостаточно средств для покрытия комиссии сети. Вычесть комиссию из отправляемой сумму? diff --git a/core/res/src/main/res/values-zh-rTW/strings.xml b/core/res/src/main/res/values-zh-rTW/strings.xml index 6f802b6be1..bef56ab91b 100644 --- a/core/res/src/main/res/values-zh-rTW/strings.xml +++ b/core/res/src/main/res/values-zh-rTW/strings.xml @@ -130,7 +130,6 @@ 連結更多錢包 App Currency 發行人 - 發送反饋 簽署 更多 檢查您的網路連接或切換到其他網絡 diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 246e7b197e..50a26c94a7 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -129,6 +129,7 @@ Start Submit Success + Support Swap terms and conditions Transaction failed @@ -180,11 +181,11 @@ Privacy policy %s hashes Card ID + Contact to Support Link More Cards App Currency Flip-to-Hide Balances Issuer - Send Feedback Signed Details Check your internet connection or switch to a different network @@ -456,7 +457,6 @@ Amount Subtract from send amount The recipient will receive %s - Support The transaction is not completed Reason: %1$s\nCode: %2$s Недостаточно средств для покрытия комиссии сети. Вычесть комиссию из отправляемой сумму? diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/SendAlertState.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/SendAlertState.kt index ce176c7174..204b99d3fb 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/SendAlertState.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/SendAlertState.kt @@ -20,7 +20,7 @@ internal sealed class SendAlertState { ) : SendAlertState() { override val message: TextReference = resourceReference(R.string.common_unknown_error) override val confirmButtonText: TextReference = - resourceReference(id = R.string.send_alert_button_request_support) + resourceReference(id = R.string.common_support) } data class TransactionError( @@ -35,7 +35,7 @@ internal sealed class SendAlertState { formatArgs = wrappedList(causeTextReference ?: cause.orEmpty(), code), ) override val confirmButtonText: TextReference = - resourceReference(id = R.string.send_alert_button_request_support) + resourceReference(id = R.string.common_support) } data class DemoMode(