Updated on 2026-08-14

app/src/main/java/com/tangem/App.kt

@@ -10,9 +10,7 @@ import com.tangem.di.NavigatorComponent
 import com.tangem.di.NetworkComponent
 import com.tangem.tangemcard.android.data.Firmwares
 import com.tangem.tangemcard.android.data.PINStorage
-import com.tangem.tangemcard.data.Issuer
-import com.tangem.tangemcard.data.external.FirmwaresDigestsProvider
-import com.tangem.tangemcard.data.external.PINsProvider
+import com.tangem.tangemcommon.data.Issuer
 import com.tangem.tangemserver.android.data.LocalStorage
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
@@ -32,9 +30,9 @@ class App : Application() {
         var navigatorComponent: NavigatorComponent? = null
             private set
 
-        lateinit var firmwaresStorage: FirmwaresDigestsProvider
+        lateinit var firmwaresStorage: Firmwares
         lateinit var localStorage: LocalStorage
-        lateinit var pinStorage: PINsProvider
+        lateinit var pinStorage: PINStorage
     }
 
     override fun onCreate() {

app/src/main/java/com/tangem/data/Logger.java

@@ -3,7 +3,7 @@ package com.tangem.data;
 import android.content.Context;
 import android.util.Log;
 
-import com.tangem.tangemcard.util.Util;
+import com.tangem.tangemcommon.util.Util;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java

@@ -11,7 +11,7 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.internal.LinkedTreeMap;
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
-import com.tangem.tangemcard.util.Util;
+import com.tangem.tangemcommon.util.Util;
 import com.tangem.wallet.R;
 
 import java.io.IOException;

app/src/main/java/com/tangem/data/network/Kraken.java

@@ -6,7 +6,7 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
 import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
-import com.tangem.tangemcard.util.Util;
+import com.tangem.tangemcommon.util.Util;
 import com.tangem.wallet.R;
 
 import org.spongycastle.util.encoders.Base64;

app/src/main/java/com/tangem/domain/wallet/BCHUtils.java

@@ -11,7 +11,7 @@ import com.tangem.domain.wallet.btc.BitcoinOutputStream;
 import com.tangem.domain.wallet.btc.BtcData;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.FormatUtil;
-import com.tangem.tangemcard.util.Util;
+import com.tangem.tangemcommon.util.Util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

app/src/main/java/com/tangem/domain/wallet/BTCUtils.java

@@ -11,7 +11,7 @@ import com.tangem.domain.wallet.btc.BitcoinOutputStream;
 import com.tangem.domain.wallet.btc.BtcData;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.FormatUtil;
-import com.tangem.tangemcard.util.Util;
+import com.tangem.tangemcommon.util.Util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java

@@ -1,6 +1,6 @@
 package com.tangem.domain.wallet;
 
-import com.tangem.tangemcard.data.TangemCard;
+import com.tangem.tangemcommon.data.TangemCard;
 import com.tangem.wallet.R;
 
 public class BalanceValidator {

app/src/main/java/com/tangem/domain/wallet/CoinEngine.java

@@ -3,8 +3,8 @@ package com.tangem.domain.wallet;
 import android.net.Uri;
 import android.text.InputFilter;
 
-import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.tasks.SignTask;
+import com.tangem.tangemcommon.reader.CardProtocol;
+import com.tangem.tangemcommon.tasks.SignTask;
 
 import java.io.IOException;
 import java.math.BigDecimal;

app/src/main/java/com/tangem/domain/wallet/TangemContext.java

@@ -6,9 +6,8 @@ import android.os.Bundle;
 
 import com.tangem.Constant;
 import com.tangem.data.Blockchain;
-import com.tangem.tangemcard.data.TangemCard;
 import com.tangem.tangemcard.data.TangemCardExtensionsKt;
-
+import com.tangem.tangemcommon.data.TangemCard;
 
 public class TangemContext {
     //    public static final String EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA";

app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java

@@ -8,20 +8,20 @@ import com.tangem.data.network.ElectrumRequest;
 import com.tangem.data.network.ServerApiElectrum;
 import com.tangem.domain.wallet.BCHUtils;
 import com.tangem.domain.wallet.BTCUtils;
-import com.tangem.tangemcard.reader.CardProtocol;
+import com.tangem.tangemcommon.reader.CardProtocol;
 import com.tangem.domain.wallet.BalanceValidator;
 import com.tangem.domain.wallet.btc.BtcData;
 import com.tangem.domain.wallet.CoinData;
 import com.tangem.domain.wallet.CoinEngine;
-import com.tangem.tangemcard.data.TangemCard;
+import com.tangem.tangemcommon.data.TangemCard;
 import com.tangem.domain.wallet.TangemContext;
 import com.tangem.domain.wallet.Transaction;
 import com.tangem.domain.wallet.UnspentOutputInfo;
-import com.tangem.tangemcard.tasks.SignTask;
+import com.tangem.tangemcommon.tasks.SignTask;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.util.DerEncodingUtil;
-import com.tangem.tangemcard.util.Util;
+import com.tangem.tangemcommon.util.Util;
 import com.tangem.wallet.R;
 
 import org.json.JSONArray;

app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java

@@ -5,22 +5,22 @@ import android.text.InputFilter;
 import android.util.Log;
 
 import com.tangem.data.network.ServerApiCommon;
-import com.tangem.tangemcard.reader.CardProtocol;
+import com.tangem.tangemcommon.reader.CardProtocol;
 import com.tangem.domain.wallet.BalanceValidator;
 import com.tangem.domain.wallet.Base58;
 import com.tangem.data.Blockchain;
 import com.tangem.domain.wallet.CoinData;
 import com.tangem.domain.wallet.CoinEngine;
-import com.tangem.tangemcard.data.TangemCard;
+import com.tangem.tangemcommon.data.TangemCard;
 import com.tangem.domain.wallet.TangemContext;
 import com.tangem.domain.wallet.Transaction;
 import com.tangem.domain.wallet.UnspentOutputInfo;
 import com.tangem.domain.wallet.BTCUtils;
-import com.tangem.tangemcard.tasks.SignTask;
+import com.tangem.tangemcommon.tasks.SignTask;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.util.DerEncodingUtil;
-import com.tangem.tangemcard.util.Util;
+import com.tangem.tangemcommon.util.Util;
 import com.tangem.wallet.R;
 import com.tangem.data.network.ElectrumRequest;
 import com.tangem.data.network.ServerApiElectrum;

app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java

@@ -15,10 +15,10 @@ import com.tangem.domain.wallet.Transaction;
 import com.tangem.domain.wallet.UnspentOutputInfo;
 import com.tangem.domain.wallet.btc.BtcData;
 import com.tangem.domain.wallet.btc.BtcEngine;
-import com.tangem.tangemcard.data.TangemCard;
-import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.tasks.SignTask;
-import com.tangem.tangemcard.util.Util;
+import com.tangem.tangemcommon.data.TangemCard;
+import com.tangem.tangemcommon.reader.CardProtocol;
+import com.tangem.tangemcommon.tasks.SignTask;
+import com.tangem.tangemcommon.util.Util;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.util.DerEncodingUtil;

app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java

@@ -15,8 +15,8 @@ import com.tangem.domain.wallet.ECDSASignatureETH;
 import com.tangem.domain.wallet.EthTransaction;
 import com.tangem.domain.wallet.Keccak256;
 import com.tangem.domain.wallet.TangemContext;
-import com.tangem.tangemcard.data.TangemCard;
-import com.tangem.tangemcard.tasks.SignTask;
+import com.tangem.tangemcommon.data.TangemCard;
+import com.tangem.tangemcommon.tasks.SignTask;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.wallet.R;

app/src/main/java/com/tangem/domain/wallet/ltc/LtcEngine.java

@@ -16,10 +16,10 @@ import com.tangem.domain.wallet.Transaction;
 import com.tangem.domain.wallet.UnspentOutputInfo;
 import com.tangem.domain.wallet.btc.BtcData;
 import com.tangem.domain.wallet.btc.BtcEngine;
-import com.tangem.tangemcard.data.TangemCard;
-import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.tasks.SignTask;
-import com.tangem.tangemcard.util.Util;
+import com.tangem.tangemcommon.data.TangemCard;
+import com.tangem.tangemcommon.reader.CardProtocol;
+import com.tangem.tangemcommon.tasks.SignTask;
+import com.tangem.tangemcommon.util.Util;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.util.DerEncodingUtil;

app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java

@@ -16,13 +16,12 @@ import com.tangem.domain.wallet.Keccak256;
 import com.tangem.domain.wallet.TangemContext;
 import com.tangem.domain.wallet.eth.EthData;
 import com.tangem.domain.wallet.token.TokenData;
-import com.tangem.tangemcard.data.TangemCard;
-import com.tangem.tangemcard.tasks.SignTask;
+import com.tangem.tangemcommon.data.TangemCard;
+import com.tangem.tangemcommon.tasks.SignTask;
 import com.tangem.wallet.R;
 
 import java.math.BigInteger;
 
-
 public class NftTokenEngine extends CoinEngine {
 
     private static final String TAG = NftTokenEngine.class.getSimpleName();

app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java

@@ -18,8 +18,8 @@ import com.tangem.domain.wallet.EthTransaction;
 import com.tangem.domain.wallet.Keccak256;
 import com.tangem.domain.wallet.TangemContext;
 import com.tangem.domain.wallet.eth.EthData;
-import com.tangem.tangemcard.data.TangemCard;
-import com.tangem.tangemcard.tasks.SignTask;
+import com.tangem.tangemcommon.data.TangemCard;
+import com.tangem.tangemcommon.tasks.SignTask;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.wallet.R;

app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt

@@ -14,14 +14,15 @@ import android.view.KeyEvent
 import android.view.View
 import android.widget.Toast
 import com.tangem.Constant
+import com.tangem.data.Blockchain
 import com.tangem.domain.wallet.CoinEngine
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.presentation.event.TransactionFinishWithError
 import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
 import com.tangem.tangemcard.android.reader.NfcManager
-import com.tangem.tangemcard.data.TangemCard
 import com.tangem.tangemcard.data.loadFromBundle
+import com.tangem.tangemcommon.data.TangemCard
 import com.tangem.util.UtilHelper
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_confirm_transaction.*
@@ -71,10 +72,17 @@ class ConfirmTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
         else
             tvIncFee.visibility = View.INVISIBLE
 
-        etAmount.setText(amount.toValueString())
+        if (ctx.card.blockchainID == Blockchain.Token.id) {
+            // for Blockchain.Token limit decimals
+            etAmount.setText(amount.toValueString(ctx.card.tokensDecimal))
+        } else {
+            // for others
+            etAmount.setText(amount.toValueString())
+        }
+
         tvCurrency.text = engine.balanceCurrency
         tvCurrency2.text = engine.feeCurrency
-        tvCardID.text = ctx.card!!.cidDescription
+        tvCardID.text = ctx.card.cidDescription
         etWallet.setText(intent.getStringExtra(Constant.EXTRA_TARGET_ADDRESS))
 
         btnSend.visibility = View.INVISIBLE
@@ -93,8 +101,7 @@ class ConfirmTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
 
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
                 try {
-                    val engine = CoinEngineFactory.create(ctx)
-                    val eqFee = engine?.evaluateFeeEquivalent(etFee!!.text.toString())
+                    val eqFee = engine.evaluateFeeEquivalent(etFee!!.text.toString())
                     tvFeeEquivalent.text = eqFee
 
                     if (!ctx.coinData!!.amountEquivalentDescriptionAvailable) {

app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt

@@ -22,9 +22,9 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
 import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.tangemcard.android.reader.NfcReader
 import com.tangem.tangemcard.data.asBundle
-import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.tasks.CreateNewWalletTask
-import com.tangem.tangemcard.util.Util
+import com.tangem.tangemcommon.reader.CardProtocol
+import com.tangem.tangemcommon.tasks.CreateNewWalletTask
+import com.tangem.tangemcommon.util.Util
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_create_new_wallet.*
 import kotlinx.android.synthetic.main.layout_progress_horizontal.*

app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt

@@ -23,12 +23,12 @@ import com.tangem.presentation.dialog.WaitSecurityDelayDialog
 import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
 import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.tangemcard.android.reader.NfcReader
-import com.tangem.tangemcard.data.TangemCard
 import com.tangem.tangemcard.data.asBundle
 import com.tangem.tangemcard.data.loadFromBundle
-import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.tasks.VerifyCardTask
-import com.tangem.tangemcard.util.Util
+import com.tangem.tangemcommon.data.TangemCard
+import com.tangem.tangemcommon.reader.CardProtocol
+import com.tangem.tangemcommon.tasks.VerifyCardTask
+import com.tangem.tangemcommon.util.Util
 import com.tangem.util.LOG
 import com.tangem.util.UtilHelper
 import com.tangem.wallet.R

app/src/main/java/com/tangem/presentation/activity/MainActivity.kt

@@ -34,11 +34,11 @@ import com.tangem.tangemcard.android.nfc.NfcDeviceAntennaLocation
 import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
 import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.tangemcard.android.reader.NfcReader
-import com.tangem.tangemcard.data.TangemCard
 import com.tangem.tangemcard.data.loadFromBundle
 import com.tangem.tangemcard.data.saveToBundle
-import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.tasks.ReadCardInfoTask
+import com.tangem.tangemcommon.data.TangemCard
+import com.tangem.tangemcommon.reader.CardProtocol
+import com.tangem.tangemcommon.tasks.ReadCardInfoTask
 import com.tangem.util.CommonUtil
 import com.tangem.util.LOG
 import com.tangem.util.PhoneUtility
@@ -112,7 +112,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
         if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action || NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action)) {
             val tag = intent.getParcelableExtra<Tag>(NfcAdapter.EXTRA_TAG)
             if (tag != null && onNfcReaderCallback != null) {
-                onNfcReaderCallback!!.onTagDiscovered(tag)
+                onNfcReaderCallback?.onTagDiscovered(tag)
             }
         }
 
@@ -231,7 +231,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
             lastTag = tag
 
             readCardInfoTask = ReadCardInfoTask(NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage, this)
-            readCardInfoTask!!.start()
+            readCardInfoTask?.start()
 
             LOG.i(TAG, "onTagDiscovered " + Arrays.toString(tag.id))
 

app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt

@@ -26,10 +26,10 @@ import com.tangem.data.fingerprint.FingerprintHelper
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.tangemcard.android.data.PINStorage
 import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
-import com.tangem.tangemcard.data.TangemCard
 import com.tangem.tangemcard.data.loadFromBundle
 import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD
 import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.tangemcommon.data.TangemCard
 import com.tangem.util.LOG
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_pin_request.*

app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt

@@ -21,9 +21,10 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
 import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.tangemcard.android.reader.NfcReader
 import com.tangem.tangemcard.data.*
-import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.tasks.SwapPINTask
-import com.tangem.tangemcard.util.Util
+import com.tangem.tangemcommon.data.TangemCard
+import com.tangem.tangemcommon.reader.CardProtocol
+import com.tangem.tangemcommon.tasks.SwapPINTask
+import com.tangem.tangemcommon.util.Util
 import com.tangem.util.LOG
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_pin_swap.*

app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt

@@ -92,7 +92,6 @@ class PrepareCryptonitWithdrawalActivity : AppCompatActivity(), NfcAdapter.Reade
                 val strAmount: String = etAmount.text.toString().replace(",", ".")
                 val strFee: String = etFee.text.toString().replace(",", ".")
                 val dblAmount: Double = strAmount.toDouble()
-                var dblFee: Double = strFee.toDouble()
                 cryptonit!!.fee = strFee
 
                 rlProgressBar.visibility = View.VISIBLE

app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt

@@ -24,9 +24,9 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
 import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.tangemcard.android.reader.NfcReader
 import com.tangem.tangemcard.data.asBundle
-import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.tasks.PurgeTask
-import com.tangem.tangemcard.util.Util
+import com.tangem.tangemcommon.reader.CardProtocol
+import com.tangem.tangemcommon.tasks.PurgeTask
+import com.tangem.tangemcommon.util.Util
 import com.tangem.util.LOG
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_purge.*

app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Color
+import android.media.MediaPlayer
 import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.nfc.tech.IsoDep
@@ -24,9 +25,9 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
 import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.tangemcard.android.reader.NfcReader
 import com.tangem.tangemcard.data.asBundle
-import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.tasks.SignTask
-import com.tangem.tangemcard.util.Util
+import com.tangem.tangemcommon.reader.CardProtocol
+import com.tangem.tangemcommon.tasks.SignTask
+import com.tangem.tangemcommon.util.Util
 import com.tangem.util.LOG
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_sign_transaction.*
@@ -41,6 +42,7 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
 
     private lateinit var nfcManager: NfcManager
     private lateinit var ctx: TangemContext
+    private lateinit var mpFinishSignSound: MediaPlayer
 
     private lateinit var nfcDeviceAntenna: NfcDeviceAntennaLocation
 
@@ -61,6 +63,8 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
 
         ctx = TangemContext.loadFromBundle(this, intent.extras)
 
+        mpFinishSignSound = MediaPlayer.create(this, R.raw.scan_card_sound)
+
         // init NFC Antenna
         nfcDeviceAntenna = NfcDeviceAntennaLocation(this, ivHandCardHorizontal, ivHandCardVertical, llHand, llNfc)
         nfcDeviceAntenna.init()
@@ -173,22 +177,24 @@ class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
             if (cardProtocol.error == null) {
                 rlProgressBar.post { rlProgressBar.visibility = View.GONE }
 
-                progressBar!!.post {
-                    progressBar!!.progress = 100
-                    progressBar!!.progressTintList = ColorStateList.valueOf(Color.GREEN)
+                progressBar?.post {
+                    progressBar?.progress = 100
+                    progressBar?.progressTintList = ColorStateList.valueOf(Color.GREEN)
                 }
+
+                mpFinishSignSound.start()
             } else {
                 lastReadSuccess = false
                 if (cardProtocol.error.javaClass == CardProtocol.TangemException_InvalidPIN::class.java) {
-                    progressBar!!.post {
-                        progressBar!!.progress = 100
-                        progressBar!!.progressTintList = ColorStateList.valueOf(Color.RED)
+                    progressBar?.post {
+                        progressBar?.progress = 100
+                        progressBar?.progressTintList = ColorStateList.valueOf(Color.RED)
                     }
-                    progressBar!!.postDelayed({
+                    progressBar?.postDelayed({
                         try {
-                            progressBar!!.progress = 0
-                            progressBar!!.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
-                            progressBar!!.visibility = View.INVISIBLE
+                            progressBar?.progress = 0
+                            progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY)
+                            progressBar?.visibility = View.INVISIBLE
                             val intent = Intent()
                             intent.putExtra("message", getString(R.string.cannot_sign_transaction_make_sure_you_enter_correct_pin_2))
                             intent.putExtra("UID", cardProtocol.card.uid)

app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt

@@ -6,6 +6,7 @@ import android.content.*
 import android.content.Context.CLIPBOARD_SERVICE
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
+import android.media.MediaPlayer
 import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.nfc.tech.IsoDep
@@ -43,11 +44,11 @@ import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.tangemcard.android.reader.NfcReader
 import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD
 import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.tangemcard.data.TangemCard
 import com.tangem.tangemcard.data.loadFromBundle
-import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.tasks.VerifyCardTask
-import com.tangem.tangemcard.util.Util
+import com.tangem.tangemcommon.data.TangemCard
+import com.tangem.tangemcommon.reader.CardProtocol
+import com.tangem.tangemcommon.tasks.VerifyCardTask
+import com.tangem.tangemcommon.util.Util
 import com.tangem.tangemserver.android.ServerApiTangem
 import com.tangem.tangemserver.android.model.CardVerifyAndGetInfo
 import com.tangem.util.LOG
@@ -69,6 +70,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
 
     private lateinit var ctx: TangemContext
     private lateinit var nfcManager: NfcManager
+    private lateinit var mpSecondScanSound: MediaPlayer
     private var serverApiCommon: ServerApiCommon = ServerApiCommon()
     private var serverApiTangem: ServerApiTangem = ServerApiTangem()
     private var lastTag: Tag? = null
@@ -105,6 +107,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
                 srl.isRefreshing = true
         }
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         ctx = TangemContext.loadFromBundle(activity, activity?.intent?.extras)
@@ -113,6 +116,8 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
         lifecycle.addObserver(NfcLifecycleObserver(nfcManager))
 
         lastTag = activity?.intent?.getParcelableExtra(Constant.EXTRA_LAST_DISCOVERED_TAG)
+
+        mpSecondScanSound = MediaPlayer.create(activity, R.raw.scan_card_sound)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -138,10 +143,8 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
 
         tvWallet.setOnClickListener { doShareWallet(false) }
 
-        btnExplore.setOnClickListener {
-            val engine = CoinEngineFactory.create(ctx)
-            startActivity(Intent(Intent.ACTION_VIEW, engine?.walletExplorerUri))
-        }
+        btnExplore.setOnClickListener { startActivity(Intent(Intent.ACTION_VIEW, engine?.walletExplorerUri)) }
+
         btnCopy.setOnClickListener { doShareWallet(false) }
 
         btnLoad.setOnClickListener {
@@ -152,8 +155,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
                 when (items[which]) {
                     getString(R.string.in_app) -> {
                         try {
-                            val engine = CoinEngineFactory.create(ctx)
-                            val intent = Intent(Intent.ACTION_VIEW, engine?.shareWalletUri)
+                            val intent = Intent(Intent.ACTION_VIEW, engine.shareWalletUri)
                             intent.addCategory(Intent.CATEGORY_DEFAULT)
                             startActivity(intent)
                         } catch (e: ActivityNotFoundException) {
@@ -166,8 +168,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
                     }
 
                     getString(R.string.load_via_qr) -> {
-                        val engine = CoinEngineFactory.create(ctx)
-                        ShowQRCodeDialog.show(activity as AppCompatActivity?, engine!!.shareWalletUri.toString())
+                        ShowQRCodeDialog.show(activity as AppCompatActivity?, engine.shareWalletUri.toString())
                     }
 
                     getString(R.string.via_cryptonit) -> {
@@ -192,9 +193,8 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
         }
 
         btnExtract.setOnClickListener {
-            val engine = CoinEngineFactory.create(ctx)
             if (UtilHelper.isOnline(context as Activity))
-                if (!engine!!.isExtractPossible)
+                if (!engine.isExtractPossible)
                     UtilHelper.showSingleToast(context, ctx.message)
                 else if (ctx.card!!.remainingSignatures == 0)
                     UtilHelper.showSingleToast(context, getString(R.string.card_has_no_remaining_signature))
@@ -441,14 +441,6 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
                         updatedCard.loadFromBundle(data.getBundleExtra(EXTRA_TANGEM_CARD))
                         ctx.card = updatedCard
                     }
-//                    if (data.extras!!.containsKey("message")) {
-//                        if (resultCode == Activity.RESULT_OK) {
-//                            ctx.message = data.getStringExtra("message")
-//                        } else {
-//                            ctx.error = data.getStringExtra("message")
-//                        }
-//                    }
-//                    updateViews()
                 }
             }
         }
@@ -470,12 +462,15 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
         verifyCardTask = null
         if (cardProtocol != null) {
             if (cardProtocol.error == null) {
-
                 rlProgressBar?.post {
                     rlProgressBar?.visibility = View.GONE
                     this.cardProtocol = cardProtocol
-                    if (!cardProtocol.card.isWalletPublicKeyValid) refresh()
-                    else updateViews()
+                    if (!cardProtocol.card.isWalletPublicKeyValid)
+                        refresh()
+                    else
+                        updateViews()
+
+                    mpSecondScanSound.start()
                 }
             } else {
                 // remove last UIDs because of error and no card read

app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt

@@ -25,9 +25,9 @@ import com.tangem.presentation.event.DeletingWalletFinish
 import com.tangem.tangemcard.android.data.PINStorage
 import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver
 import com.tangem.tangemcard.android.reader.NfcManager
-import com.tangem.tangemcard.data.TangemCard
 import com.tangem.tangemcard.data.loadFromBundle
-import com.tangem.tangemcard.reader.CardProtocol
+import com.tangem.tangemcommon.data.TangemCard
+import com.tangem.tangemcommon.reader.CardProtocol
 import com.tangem.util.LOG
 import com.tangem.wallet.BuildConfig
 import com.tangem.wallet.R

app/src/main/java/com/tangem/util/CryptoUtil.java

@@ -3,7 +3,7 @@ package com.tangem.util;
 import android.util.Log;
 
 import com.tangem.domain.wallet.ECDSASignatureETH;
-import com.tangem.tangemcard.util.Util;
+import com.tangem.tangemcommon.util.Util;
 
 import org.spongycastle.asn1.ASN1EncodableVector;
 import org.spongycastle.asn1.ASN1Integer;