diff --git a/app/build.gradle b/app/build.gradle
index 0b53a8df5e..bdc8173275 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,14 +71,13 @@ dependencies {
implementation 'androidx.fragment:fragment-ktx:1.3.6'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'com.google.android.material:material:1.4.0'
- implementation "androidx.core:core-ktx:1.6.0"
implementation 'com.google.android.play:core:1.10.2'
implementation 'com.google.android.play:core-ktx:1.8.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
implementation 'com.tangem:blockchain:develop-42'
- implementation 'com.tangem.tangem-sdk-kotlin:core:develop-91'
- implementation 'com.tangem.tangem-sdk-kotlin:android:develop-91'
+ implementation 'com.tangem.tangem-sdk-kotlin:core:develop-92'
+ implementation 'com.tangem.tangem-sdk-kotlin:android:develop-92'
// WebView
implementation "androidx.browser:browser:1.3.0"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c2d4929889..f3c400a3ec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,13 @@
+
+
+
+
+
+
+
+ *
+ *
+ *
+ *
+ *
+ */
+fun Activity.sendEmail(
+ email: String,
+ subject: String,
+ message: String,
+ file: File? = null,
+ onFail: ((Exception) -> Unit)? = null
+) {
+ fun createEmailShareIntent(recipient: String, subject: String, text: String, file: File? = null): Intent {
+ val builder = ShareCompat.IntentBuilder.from(this)
+ .setType("message/rfc822")
+ .setEmailTo(arrayOf(recipient))
+ .setSubject(subject)
+ .setText(text)
+ file?.let { builder.setStream(FileProvider.getUriForFile(this, "${packageName}.provider", it)) }
+ return builder.intent
+ }
+
+ val originalIntent = createEmailShareIntent(email, subject, message, file)
+ val emailFilterIntent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
+
+ val originalIntentResults = packageManager.queryIntentActivities(originalIntent, 0)
+ val emailFilterIntentResults = packageManager.queryIntentActivities(emailFilterIntent, 0)
+
+ val targetedIntents = originalIntentResults
+ .filter { originalResult ->
+ emailFilterIntentResults.any {
+ originalResult.activityInfo.packageName == it.activityInfo.packageName
+ }
+ }
+ .map {
+ createEmailShareIntent(email, subject, message, file).apply {
+ setPackage(it.activityInfo.packageName)
+ }
+ }
+ .toMutableList()
+ try {
+ val chooserIntent = Intent.createChooser(targetedIntents.removeAt(0), "Send mail...")
+ chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, targetedIntents.toTypedArray())
+ chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ ContextCompat.startActivity(this, chooserIntent, null)
+ } catch (ex: Exception) {
+ onFail?.invoke(ex)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
index 3a3acc1a87..27776c28b7 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
@@ -125,6 +125,7 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
companion object {
val config = Config(
+ allowUntrustedCards = true,
filter = CardFilter(
allowedCardTypes = FirmwareVersion.FirmwareType.values().toList()
)
diff --git a/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt b/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt
index 4be4dda58f..5ec3ea7672 100644
--- a/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt
+++ b/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt
@@ -15,7 +15,7 @@ fun Blockchain.isNoAccountError(exception: Throwable): Boolean {
fun Blockchain.amountToCreateAccount(token: Token? = null): BigDecimal? {
return when (this) {
- Blockchain.Stellar -> if (token?.symbol == NODL) BigDecimal(1.5) else BigDecimal.ZERO
+ Blockchain.Stellar -> if (token?.symbol == NODL) BigDecimal(1.5) else BigDecimal.ONE
Blockchain.XRP -> BigDecimal(10)
else -> null
}
diff --git a/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
index ec7a45dd3d..82f131a3a2 100644
--- a/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
@@ -25,8 +25,8 @@ class DisclaimerFragment : Fragment(R.layout.fragment_disclaimer),
}
})
val inflater = TransitionInflater.from(requireContext())
- enterTransition = inflater.inflateTransition(R.transition.slide_right)
- exitTransition = inflater.inflateTransition(R.transition.fade)
+ enterTransition = inflater.inflateTransition(android.R.transition.slide_bottom)
+ exitTransition = inflater.inflateTransition(android.R.transition.slide_top)
}
override fun onStart() {
diff --git a/app/src/main/java/com/tangem/tap/features/feedback/FeedbackManager.kt b/app/src/main/java/com/tangem/tap/features/feedback/FeedbackManager.kt
index 6007d61e23..68b6262389 100644
--- a/app/src/main/java/com/tangem/tap/features/feedback/FeedbackManager.kt
+++ b/app/src/main/java/com/tangem/tap/features/feedback/FeedbackManager.kt
@@ -1,19 +1,14 @@
package com.tangem.tap.features.feedback
import android.app.Activity
-import android.content.ActivityNotFoundException
import android.content.Context
-import android.content.Intent
import android.content.pm.PackageManager
-import android.net.Uri
import android.os.Build
-import androidx.core.app.ShareCompat
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
import com.tangem.Log
import com.tangem.TangemSdkLogger
import com.tangem.blockchain.common.*
import com.tangem.common.card.Card
+import com.tangem.tap.common.extensions.sendEmail
import com.tangem.tap.common.extensions.stripZeroPlainString
import com.tangem.tap.domain.TapWorkarounds
import timber.log.Timber
@@ -28,22 +23,26 @@ import java.util.*
[REDACTED_AUTHOR]
*/
class FeedbackManager(
- val infoHolder: AdditionalEmailInfo,
- private val logCollector: TangemLogCollector,
+ val infoHolder: AdditionalEmailInfo,
+ private val logCollector: TangemLogCollector,
) {
private lateinit var activity: Activity
- fun updateAcivity(activity: Activity) {
+ fun updateActivity(activity: Activity) {
this.activity = activity
}
- fun send(emailData: EmailData) {
+ fun send(emailData: EmailData, onFail: ((Exception) -> Unit)? = null) {
+ if (!this::activity.isInitialized) return
+
+ emailData.prepare(infoHolder)
val fileLog = if (emailData is ScanFailsEmail) createLogFile() else null
- sendTo(
+ activity.sendEmail(
email = getSupportEmail(),
subject = emailData.subject, message = emailData.joinTogether(infoHolder),
- fileLog = fileLog
+ file = fileLog,
+ onFail = onFail
)
}
@@ -55,42 +54,6 @@ class FeedbackManager(
}
}
- private fun sendTo(email: String, subject: String, message: String, fileLog: File? = null) {
- val emailFilterIntent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
- val originalIntentResults = activity.packageManager.queryIntentActivities(emailFilterIntent, 0)
- val emailFilterIntentResults = activity.packageManager.queryIntentActivities(emailFilterIntent, 0)
- val targetedIntents = originalIntentResults
- .filter { originalResult ->
- emailFilterIntentResults.any {
- originalResult.activityInfo.packageName == it.activityInfo.packageName
- }
- }
- .map {
- createEmailShareIntent(email, subject, message, fileLog).apply {
- setPackage(it.activityInfo.packageName)
- }
- }
- .toMutableList()
- try {
- val chooserIntent = Intent.createChooser(targetedIntents.removeAt(0), "Send mail...")
- chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, targetedIntents.toTypedArray())
- chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
- ContextCompat.startActivity(activity, chooserIntent, null)
- } catch (ex: ActivityNotFoundException) {
- Timber.e(ex)
- }
- }
-
- private fun createEmailShareIntent(recipient: String, subject: String, text: String, file: File? = null): Intent {
- val builder = ShareCompat.IntentBuilder.from(activity)
- .setType("message/rfc822")
- .setEmailTo(arrayOf(recipient))
- .setSubject(subject)
- .setText(text)
- file?.let { builder.setStream(FileProvider.getUriForFile(activity, "${activity.packageName}.provider", it)) }
- return builder.intent
- }
-
private fun createLogFile(): File? {
return try {
val file = File(activity.filesDir, "logs.txt")
@@ -134,12 +97,12 @@ class TangemLogCollector : TangemSdkLogger {
class AdditionalEmailInfo {
class EmailWalletInfo(
- var blockchain: Blockchain = Blockchain.Unknown,
- var address: String = "",
- var explorerLink: String = "",
- var host: String = "",
- // var outputsCount: String = ""
- // var transactionHex: String = ""
+ var blockchain: Blockchain = Blockchain.Unknown,
+ var address: String = "",
+ var explorerLink: String = "",
+ var host: String = "",
+ // var outputsCount: String = ""
+ // var transactionHex: String = ""
)
var appVersion: String = ""
@@ -178,7 +141,7 @@ class AdditionalEmailInfo {
cardFirmwareVersion = card.firmwareVersion.stringValue
cardIssuer = card.issuer.name
signedHashesCount = card.wallets
- .joinToString(";") { "${it.curve?.curve} - ${it.totalSignedHashes}" }
+ .joinToString(";") { "${it.curve?.curve} - ${it.totalSignedHashes}" }
}
fun setWalletsInfo(walletManagers: List) {
@@ -235,10 +198,21 @@ class AdditionalEmailInfo {
interface EmailData {
val subject: String
val mainMessage: String
+
+ fun prepare(infoHolder: AdditionalEmailInfo) {}
+
+ fun appendDelimiter(builder: StringBuilder) {
+ builder.append("----------\n")
+ }
+
+ fun appendBlankLine(builder: StringBuilder) {
+ builder.append("\n")
+ }
+
fun createOptionalMessage(infoHolder: AdditionalEmailInfo): String
fun joinTogether(infoHolder: AdditionalEmailInfo): String {
- return "$mainMessage\n\n\n\n\n" +
+ return "$mainMessage\n\n\n\n" +
"Following information is optional. You can erase it if you don’t want to share it.\n" +
createOptionalMessage(infoHolder)
}
@@ -253,6 +227,7 @@ class RateCanBeBetterEmail : EmailData {
return StringBuilder().apply {
appendKeyValue("Card ID", infoHolder.cardId)
appendKeyValue("Blockchain", walletInfo.blockchain.fullName)
+ appendBlankLine(this)
appendKeyValue("Phone model", infoHolder.phoneModel)
appendKeyValue("OS version", infoHolder.osVersion)
appendKeyValue("App version", infoHolder.appVersion)
@@ -265,6 +240,7 @@ class ScanFailsEmail : EmailData {
override val mainMessage: String = "Please tell us what card do you have?"
override fun createOptionalMessage(infoHolder: AdditionalEmailInfo): String {
return StringBuilder().apply {
+ appendBlankLine(this)
appendKeyValue("Phone model", infoHolder.phoneModel)
appendKeyValue("OS version", infoHolder.osVersion)
appendKeyValue("App version", infoHolder.appVersion)
@@ -280,6 +256,7 @@ class SendTransactionFailedEmail(private val error: String) : EmailData {
return StringBuilder().apply {
appendKeyValue("Error", error)
appendKeyValue("Card ID", infoHolder.cardId)
+ appendDelimiter(this)
appendKeyValue("Blockchain", walletInfo.blockchain.fullName)
appendKeyValue("Host", walletInfo.host)
appendKeyValue("Token", infoHolder.token)
@@ -287,6 +264,7 @@ class SendTransactionFailedEmail(private val error: String) : EmailData {
appendKeyValue("Destination address", infoHolder.destinationAddress)
appendKeyValue("Amount", infoHolder.amount)
appendKeyValue("Fee", infoHolder.fee)
+ appendBlankLine(this)
appendKeyValue("Phone model", infoHolder.phoneModel)
appendKeyValue("OS version", infoHolder.osVersion)
appendKeyValue("App version", infoHolder.appVersion)
@@ -298,8 +276,23 @@ class SendTransactionFailedEmail(private val error: String) : EmailData {
}
class FeedbackEmail : EmailData {
- override val subject: String = "Tangem Tap feedback"
- override val mainMessage: String = "Hi Tangem,"
+ override val subject: String
+ get() = if (isS2CCard) s2cSubject else tangemSubject
+ override val mainMessage: String
+ get() = if (isS2CCard) s2cMainMessage else tangemMainMessage
+
+ private val tangemSubject = "Tangem Tap feedback"
+ private val tangemMainMessage = "Hi Tangem,"
+
+ private val s2cSubject = "Feedback"
+ private val s2cMainMessage = "Hi support team,"
+
+ private var isS2CCard = false
+
+ override fun prepare(infoHolder: AdditionalEmailInfo) {
+ isS2CCard = TapWorkarounds.isStart2CoinIssuer(infoHolder.cardIssuer)
+ }
+
override fun createOptionalMessage(infoHolder: AdditionalEmailInfo): String {
val builder = StringBuilder()
builder.appendKeyValue("Card ID", infoHolder.cardId)
@@ -307,11 +300,14 @@ class FeedbackEmail : EmailData {
builder.appendKeyValue("Signed hashes", infoHolder.signedHashesCount)
infoHolder.walletsInfo.forEach {
+ appendDelimiter(builder)
builder.appendKeyValue("Blockchain", it.blockchain.fullName)
builder.appendKeyValue("Host", it.host)
builder.appendKeyValue("Wallet address", it.address)
builder.appendKeyValue("Explorer link", it.explorerLink)
}
+ appendBlankLine(builder)
+
// appendKeyValue("Outputs count", infoHolder.outputsCount)
builder.appendKeyValue("Phone model", infoHolder.phoneModel)
builder.appendKeyValue("OS version", infoHolder.osVersion)
diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
index 0d337c6da9..f28523564f 100644
--- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
@@ -18,6 +18,7 @@ import com.tangem.wallet.R
import kotlinx.android.synthetic.main.fragment_onboarding_main.*
import kotlinx.android.synthetic.main.layout_onboarding_container_bottom.*
import kotlinx.android.synthetic.main.layout_onboarding_home_top.*
+import kotlinx.android.synthetic.main.view_bg_home.*
class HomeFragment : BaseOnboardingFragment() {
@@ -39,7 +40,10 @@ class HomeFragment : BaseOnboardingFragment() {
val shareTransition = FragmentShareTransition(
listOf(
ShareElement(imv_front_card, ShareElement.imvFrontCard),
- ShareElement(imv_back_card, ShareElement.imvBackCard)
+ ShareElement(imv_back_card, ShareElement.imvBackCard),
+ ShareElement(bg_circle_large),
+ ShareElement(bg_circle_medium),
+ ShareElement(bg_circle_min),
),
FrontCardEnterTransition(),
FrontCardExitTransition()
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
index 7eb8b3a5fc..644bf15d51 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
@@ -132,17 +132,29 @@ class OnboardingNoteFragment : BaseOnboardingFragment() {
imv_card_background.setBackgroundDrawable(requireContext().getDrawableCompat(R.drawable.shape_circle))
updateConstraints(state.currentStep, R.layout.lp_onboarding_create_wallet)
+
+ btn_alternative_action.isVisible = false // temporary
}
private fun setupTopUpWalletState(state: OnboardingNoteState) {
- btn_main_action.setText(R.string.onboarding_top_up_button_but_crypto)
- btn_main_action.setOnClickListener {
- store.dispatch(OnboardingNoteAction.TopUp)
- }
+ if (state.isBuyAllowed) {
+ btn_main_action.setText(R.string.onboarding_top_up_button_but_crypto)
+ btn_main_action.setOnClickListener {
+ store.dispatch(OnboardingNoteAction.TopUp)
+ }
- btn_alternative_action.setText(R.string.onboarding_top_up_button_show_wallet_address)
- btn_alternative_action.setOnClickListener {
- store.dispatch(OnboardingNoteAction.ShowAddressInfoDialog)
+ btn_alternative_action.isVisible = true
+ btn_alternative_action.setText(R.string.onboarding_top_up_button_show_wallet_address)
+ btn_alternative_action.setOnClickListener {
+ store.dispatch(OnboardingNoteAction.ShowAddressInfoDialog)
+ }
+ } else {
+ btn_main_action.setText(R.string.onboarding_button_receive_crypto)
+ btn_main_action.setOnClickListener {
+ store.dispatch(OnboardingNoteAction.ShowAddressInfoDialog)
+ }
+
+ btn_alternative_action.isVisible = false
}
tv_header.setText(R.string.onboarding_top_up_header)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteState.kt
index 5bc772fa3a..5178c2eb72 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteState.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteState.kt
@@ -3,7 +3,9 @@ package com.tangem.tap.features.onboarding.products.note.redux
import com.tangem.blockchain.common.WalletManager
import com.tangem.tap.domain.TapError
import com.tangem.tap.features.onboarding.OnboardingWalletBalance
+import com.tangem.tap.store
import org.rekotlin.StateType
+import kotlin.properties.ReadOnlyProperty
/**
[REDACTED_AUTHOR]
@@ -22,6 +24,10 @@ data class OnboardingNoteState(
val progress: Int
get() = steps.indexOf(currentStep)
+
+ val isBuyAllowed: Boolean by ReadOnlyProperty { thisRef, property ->
+ store.state.globalState.moonPayUserStatus?.isBuyAllowed ?: false
+ }
}
enum class OnboardingNoteStep {
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
index 0072388bcb..22e479721b 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
@@ -87,6 +87,8 @@ class OnboardingOtherCardsFragment : BaseOnboardingFragment {
updateScanResponse(result.data)
delay(DELAY_SDK_DIALOG_CLOSE)
- withMainContext { store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.TopUpWallet)) }
+ withMainContext {
+ when (twinCardsState.mode) {
+ CreateTwinWalletMode.CreateWallet -> {
+ store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.TopUpWallet))
+ }
+ CreateTwinWalletMode.RecreateWallet -> {
+ store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.Done))
+ }
+ }
+ }
}
is Result.Failure -> {
}
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt
index 22834a920e..7e8cea4f57 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt
@@ -5,7 +5,9 @@ import com.tangem.tap.domain.TapError
import com.tangem.tap.domain.twins.TwinCardNumber
import com.tangem.tap.domain.twins.TwinCardsManager
import com.tangem.tap.features.onboarding.OnboardingWalletBalance
+import com.tangem.tap.store
import org.rekotlin.StateType
+import kotlin.properties.ReadOnlyProperty
/**
[REDACTED_AUTHOR]
@@ -52,6 +54,10 @@ data class TwinCardsState(
val showAlert: Boolean
get() = currentStep == TwinCardsStep.CreateSecondWallet || currentStep == TwinCardsStep.CreateThirdWallet
+
+ val isBuyAllowed: Boolean by ReadOnlyProperty { thisRef, property ->
+ store.state.globalState.moonPayUserStatus?.isBuyAllowed ?: false
+ }
}
enum class CreateTwinWalletMode { CreateWallet, RecreateWallet }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
index 81e11f7e47..d0ba56eeb5 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
@@ -14,7 +14,6 @@ import com.tangem.blockchain.common.Blockchain
import com.tangem.common.extensions.VoidCallback
import com.tangem.tap.common.extensions.*
import com.tangem.tap.common.leapfrogWidget.LeapfrogWidget
-import com.tangem.tap.common.postUi
import com.tangem.tap.common.redux.navigation.AppScreen
import com.tangem.tap.common.redux.navigation.NavigationAction
import com.tangem.tap.common.redux.navigation.ShareElement
@@ -38,7 +37,6 @@ import kotlinx.android.synthetic.main.layout_onboarding_container_top.*
import kotlinx.android.synthetic.main.view_bg_twins_welcome.*
import kotlinx.android.synthetic.main.view_onboarding_progress.*
import kotlinx.android.synthetic.main.view_onboarding_tv_balance.*
-import org.rekotlin.Action
class TwinsCardsFragment : BaseOnboardingFragment() {
@@ -102,6 +100,9 @@ class TwinsCardsFragment : BaseOnboardingFragment() {
imv_twin_front_card.transitionName = ShareElement.imvFrontCard
imv_twin_back_card.transitionName = ShareElement.imvBackCard
+
+ // if don't this, the bg_circle_... is overflow the app_bar
+ app_bar.bringToFront()
}
override fun subscribeToStore() {
@@ -148,27 +149,33 @@ class TwinsCardsFragment : BaseOnboardingFragment() {
}
private fun setupWelcomeOnlyState(state: TwinCardsState) {
- setupWelcomeState(state, NavigationAction.NavigateTo(AppScreen.Wallet))
+ setupWelcomeState(state) {
+ store.dispatch(NavigationAction.NavigateTo(AppScreen.Wallet))
+ store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.None))
+ }
}
private fun setupWelcomeState(state: TwinCardsState) {
- setupWelcomeState(state, TwinCardsAction.SetStepOfScreen(TwinCardsStep.CreateFirstWallet))
+ setupWelcomeState(state) { store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.CreateFirstWallet)) }
}
- private fun setupWelcomeState(state: TwinCardsState, mainAction: Action) {
+ private fun setupWelcomeState(state: TwinCardsState, mainAction: VoidCallback) {
twinsWidget.toWelcome(false) { startPostponedEnterTransition() }
+ onboarding_twins_welcome_bg.show()
pb_state.hide()
tv_header.setText(R.string.twins_onboarding_subtitle)
tv_body.text = getString(R.string.twins_onboarding_description_format, state.cardNumber?.pairIndexNumber())
btn_main_action.setText(R.string.common_continue)
- btn_main_action.setOnClickListener { store.dispatch(mainAction) }
+ btn_main_action.setOnClickListener { mainAction() }
}
private fun setupWarningState(state: TwinCardsState) {
twinsWidget.toWelcome(false) { startPostponedEnterTransition() }
+
+ onboarding_twins_welcome_bg.hide()
pb_state.hide()
chb_understand.show()
@@ -186,6 +193,7 @@ class TwinsCardsFragment : BaseOnboardingFragment() {
}
private fun setupCreateFirstWalletState(state: TwinCardsState) {
+ onboarding_twins_welcome_bg.hide()
bg_circle_large.hide()
bg_circle_medium.hide()
bg_circle_min.hide()
@@ -283,15 +291,24 @@ class TwinsCardsFragment : BaseOnboardingFragment() {
}
}
- btn_main_action.setText(R.string.onboarding_top_up_button_but_crypto)
- btn_main_action.setOnClickListener {
- store.dispatch(TwinCardsAction.TopUp)
- }
+ if (state.isBuyAllowed) {
+ btn_main_action.setText(R.string.onboarding_top_up_button_but_crypto)
+ btn_main_action.setOnClickListener {
+ store.dispatch(TwinCardsAction.TopUp)
+ }
- btn_alternative_action.isVisible = true
- btn_alternative_action.setText(R.string.onboarding_top_up_button_show_wallet_address)
- btn_alternative_action.setOnClickListener {
- store.dispatch(TwinCardsAction.ShowAddressInfoDialog)
+ btn_alternative_action.isVisible = true
+ btn_alternative_action.setText(R.string.onboarding_top_up_button_show_wallet_address)
+ btn_alternative_action.setOnClickListener {
+ store.dispatch(TwinCardsAction.ShowAddressInfoDialog)
+ }
+ } else {
+ btn_main_action.setText(R.string.onboarding_button_receive_crypto)
+ btn_main_action.setOnClickListener {
+ store.dispatch(TwinCardsAction.ShowAddressInfoDialog)
+ }
+
+ btn_alternative_action.isVisible = false
}
tv_header.setText(R.string.onboarding_top_up_header)
@@ -299,13 +316,10 @@ class TwinsCardsFragment : BaseOnboardingFragment() {
btnRefreshBalanceWidget.changeState(state.walletBalance.state)
if (btnRefreshBalanceWidget.isShowing != true) {
- postUi(300) {
- btnRefreshBalanceWidget.mainView.setOnClickListener {
- store.dispatch(TwinCardsAction.Balance.Update)
- }
+ btnRefreshBalanceWidget.mainView.setOnClickListener {
+ store.dispatch(TwinCardsAction.Balance.Update)
}
}
-
imv_card_background.setBackgroundDrawable(requireContext().getDrawableCompat(R.drawable.shape_rectangle_rounded_8))
updateConstraints(state.currentStep, R.layout.lp_onboarding_topup_wallet_twins)
}
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt
index 0f164965d4..496a8ff731 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt
@@ -21,7 +21,7 @@ class ScanFailsDialog {
setPositiveButton(R.string.alert_button_request_support) { _, _ ->
store.dispatch(GlobalAction.SendFeedback(ScanFailsEmail()))
}
- setNegativeButton(R.string.common_cancel) { _, _ -> }
+ setNeutralButton(R.string.alert_troubleshooting_scan_card_ok) { _, _ -> }
setOnDismissListener { store.dispatchDialogHide() }
}.create()
}
diff --git a/app/src/main/res/drawable/card_placeholder_black.xml b/app/src/main/res/drawable/card_placeholder_black.xml
index 0fef87ee39..83fab8e0f7 100644
--- a/app/src/main/res/drawable/card_placeholder_black.xml
+++ b/app/src/main/res/drawable/card_placeholder_black.xml
@@ -1,126 +1,88 @@
-
-
-
-
-