diff --git a/app/build.gradle b/app/build.gradle index f9fe70e593..ff53e7b789 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,8 +78,8 @@ dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' implementation 'com.tangem:blockchain:develop-52' - implementation 'com.tangem.tangem-sdk-kotlin:core:develop-114' - implementation 'com.tangem.tangem-sdk-kotlin:android:develop-114' + implementation 'com.tangem.tangem-sdk-kotlin:core:develop-115' + implementation 'com.tangem.tangem-sdk-kotlin:android:develop-115' // WebView implementation "androidx.browser:browser:1.3.0" diff --git a/app/src/main/assets/bsc_tokens.json b/app/src/main/assets/bsc_tokens.json index 712d35c6dd..9859e13f27 100644 --- a/app/src/main/assets/bsc_tokens.json +++ b/app/src/main/assets/bsc_tokens.json @@ -778,5 +778,16 @@ "curve" : "secp256k1", "testnet" : false } + }, + { + "decimalCount" : 18, + "symbol" : "VOYRME", + "name" : "VOYR", + "contractAddress" : "0x33a887Cf76383be39DC51786e8f641c9D6665D84", + "blockchain" : { + "key" : "bsc", + "curve" : "secp256k1", + "testnet" : false + } } ] diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Picasso.kt b/app/src/main/java/com/tangem/tap/common/extensions/Picasso.kt index be71883ecc..60c8a1ec9d 100644 --- a/app/src/main/java/com/tangem/tap/common/extensions/Picasso.kt +++ b/app/src/main/java/com/tangem/tap/common/extensions/Picasso.kt @@ -32,6 +32,9 @@ fun Picasso.loadCurrenciesIcon( token?.symbol == QCX -> { this.load(R.drawable.ic_qcx)?.into(imageView) } + token?.symbol == VOYR -> { + this.load(R.drawable.ic_voyr)?.into(imageView) + } url != null -> { if (token != null) { setTokenImage(imageView, textView, token) @@ -60,6 +63,7 @@ fun Picasso.loadCurrenciesIcon( } private const val QCX = "QCX" +private const val VOYR = "VOYRME" private fun setOfflineCurrencyImage( imageView: ImageView, 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 449e1735ff..4c3f0c78d4 100644 --- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt @@ -10,6 +10,7 @@ import com.tangem.common.CompletionResult import com.tangem.common.SuccessResponse import com.tangem.common.card.Card import com.tangem.common.card.FirmwareVersion +import com.tangem.common.core.CardIdDisplayFormat import com.tangem.common.core.CardSessionRunnable import com.tangem.common.core.Config import com.tangem.common.core.TangemSdkError @@ -137,7 +138,11 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co } fun changeDisplayedCardIdNumbersCount(scanResponse: ScanResponse) { - tangemSdk.config.cardIdDisplayedNumbersCount = if (scanResponse.isTangemTwins()) 4 else null + tangemSdk.config.cardIdDisplayFormat = if (scanResponse.isTangemTwins()) { + CardIdDisplayFormat.LastLunh(4) + } else { + CardIdDisplayFormat.Full + } } companion object { 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 0ae3d143a8..6da60e3904 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 @@ -40,7 +40,7 @@ class FeedbackManager( val fileLog = if (emailData is ScanFailsEmail) createLogFile() else null activity.sendEmail( email = getSupportEmail(), - subject = emailData.subject, message = emailData.joinTogether(infoHolder), + subject = emailData.subject, message = emailData.joinTogether(infoHolder, emailData !is ScanFailsEmail), file = fileLog, onFail = onFail ) @@ -216,8 +216,14 @@ interface EmailData { fun createOptionalMessage(infoHolder: AdditionalEmailInfo): String - fun joinTogether(infoHolder: AdditionalEmailInfo): String { + fun joinTogether(infoHolder: AdditionalEmailInfo, allowToErasePhoneInfo: Boolean): String { + val allowToErasePhoneInfoDisclaimer = if (allowToErasePhoneInfo) { + "Following information is optional. You can erase it if you don’t want to share it.\n\n" + } else { + "" + } return "$mainMessage\n\n\n\n" + + allowToErasePhoneInfoDisclaimer + createOptionalMessage(infoHolder) } } diff --git a/app/src/main/res/drawable/ic_voyr.png b/app/src/main/res/drawable/ic_voyr.png new file mode 100644 index 0000000000..545990d041 Binary files /dev/null and b/app/src/main/res/drawable/ic_voyr.png differ