Updated on 2026-08-14

This commit is contained in:
Tangem 2020-10-14 17:59:25 +03:00
parent 3c078b8554
commit e5c5b18c09
13 changed files with 334 additions and 106 deletions

View file

@ -28,14 +28,14 @@ sealed class TapError(
object NoInternetConnection : TapError(R.string.wallet_notification_no_internet)
object InsufficientBalance : TapError(R.string.send_error_insufficient_balance)
object BlockchainInternalError : TapError(R.string.send_error_blockchain_internal)
object AmountExceedsBalance : TapError(R.string.send_error_amount_exceeds_balance)
object FeeExceedsBalance : TapError(R.string.send_error_fee_exceeds_balance)
object TotalExceedsBalance : TapError(R.string.send_error_total_exceeds_balance)
object InvalidAmountValue : TapError(R.string.send_error_invalid_amount)
object AmountExceedsBalance : TapError(R.string.send_validation_amount_exceeds_balance)
object FeeExceedsBalance : TapError(R.string.send_validation_invalid_fee)
object TotalExceedsBalance : TapError(R.string.send_validation_invalid_total)
object InvalidAmountValue : TapError(R.string.send_validation_invalid_amount)
object InvalidFeeValue : TapError(R.string.send_error_invalid_fee_value)
data class DustAmount(override val args: List<Any>) : TapError(R.string.send_error_dust_amount_format)
object DustChange : TapError(R.string.send_error_dust_change)
data class CreateAccountUnderfunded(override val args: List<Any>) : TapError(R.string.send_error_no_target_accout)
data class CreateAccountUnderfunded(override val args: List<Any>) : TapError(R.string.send_error_no_target_account)
data class ValidateTransactionErrors(
override val errorList: List<TapError>,

View file

@ -24,7 +24,7 @@ sealed class DetailsAction : Action {
object Check : EraseWallet()
object Proceed : EraseWallet() {
object NotAllowedByCard: EraseWallet(), NotificationAction {
override val messageResource = R.string.details_notification_erase_wallet_not_allowed
override val messageResource = R.string.error_purge_prohibited
}
object NotEmpty: EraseWallet(), NotificationAction {
override val messageResource = R.string.details_notification_erase_wallet_not_possible

View file

@ -32,7 +32,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
if (activity == null) return
if (state.firstLaunch) {
tv_home_description.text = getText(R.string.home_welcome)
btn_shop.text = getText(R.string.home_button_no_card)
btn_shop.text = getText(R.string.common_no)
btn_yes.text = getText(R.string.home_button_yes)
} else {
tv_home_description.text = getText(R.string.home_welcome_back)

View file

@ -255,7 +255,7 @@ class FeeUiHelper {
private fun ToggleWidget.setupSendButtonStateModifiers(context: Context) {
mainViewModifiers.clear()
mainViewModifiers.add(ReplaceTextStateModifier(context.getString(R.string.send_btn_send), ""))
mainViewModifiers.add(ReplaceTextStateModifier(context.getString(R.string.send_title), ""))
mainViewModifiers.add(
TextViewDrawableStateModifier(
context.getDrawableCompat(R.drawable.ic_arrow_right), null, TextViewDrawableStateModifier.RIGHT

View file

@ -74,9 +74,9 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
fun parseError(context: Context, error: Error?): String? {
val resId = when (error) {
Error.PAY_ID_UNSUPPORTED_BY_BLOCKCHAIN -> R.string.send_error_payid_unsupported_by_blockchain
Error.PAY_ID_NOT_REGISTERED -> R.string.send_error_payid_not_registere
Error.PAY_ID_NOT_REGISTERED -> R.string.send_error_payid_not_registered
Error.PAY_ID_REQUEST_FAILED -> R.string.send_error_payid_request_failed
Error.ADDRESS_INVALID_OR_UNSUPPORTED_BY_BLOCKCHAIN -> R.string.send_error_address_invalid_or_unsupported
Error.ADDRESS_INVALID_OR_UNSUPPORTED_BY_BLOCKCHAIN -> R.string.send_validation_invalid_address
Error.ADDRESS_SAME_AS_WALLET -> R.string.send_error_address_same_as_wallet
else -> null
}

View file

@ -151,7 +151,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
snackbar = Snackbar.make(
coordinator_wallet, getString(R.string.wallet_notification_no_internet),
Snackbar.LENGTH_INDEFINITE
).setAction(getString(R.string.wallet_notification_no_internet_retry))
).setAction(getString(R.string.common_retry))
{ store.dispatch(WalletAction.LoadData) }
.also { it.show() }
}