diff --git a/app/src/main/java/com/tangem/ui/fragment/id/IdFragment.kt b/app/src/main/java/com/tangem/ui/fragment/id/IdFragment.kt index 3b7e7cb1a3..76f14bc2bc 100644 --- a/app/src/main/java/com/tangem/ui/fragment/id/IdFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/id/IdFragment.kt @@ -47,7 +47,6 @@ class IdFragment : BaseFragment(), NfcAdapter.ReaderCallback, override val layoutId = R.layout.fragment_id - private lateinit var viewModel: LoadedWalletViewModel private lateinit var ctx: TangemContext private lateinit var mpSecondScanSound: MediaPlayer private var serverApiCommon: ServerApiCommon = ServerApiCommon() @@ -121,7 +120,6 @@ class IdFragment : BaseFragment(), NfcAdapter.ReaderCallback, if (hasIdInfo == null) tvBalanceLine1?.text = "Reading... Hold the card firmly" btnNewScan.setOnClickListener { - // navigateToDestination(R.id.action_loadedWalletFragment_to_main) navigateUp() } @@ -328,7 +326,7 @@ class IdFragment : BaseFragment(), NfcAdapter.ReaderCallback, 5000) } - if (srl.isRefreshing && hasIdInfo != null && hasIdInfo != false) { + if (srl.isRefreshing && ctx.card?.hasIDCardData() != false) { tvBalanceLine1.setTextColor(resources.getColor(R.color.primary)) tvBalanceLine1.text = getString(R.string.loaded_wallet_verifying_in_blockchain) tvBalanceLine2.text = "" @@ -376,9 +374,6 @@ class IdFragment : BaseFragment(), NfcAdapter.ReaderCallback, if (ctx.card.hasIDCardData()) requestBalanceAndUnspentTransactions() - if (::viewModel.isInitialized) - viewModel.requestRateInfo(ctx) - if (requestCounter == 0) { // if no connection and no requests posted srl?.isRefreshing = false diff --git a/app/src/main/res/layout/fragment_camera.xml b/app/src/main/res/layout/fragment_camera.xml index 438f604955..96170adca9 100644 --- a/app/src/main/res/layout/fragment_camera.xml +++ b/app/src/main/res/layout/fragment_camera.xml @@ -2,7 +2,6 @@ @@ -33,7 +32,7 @@ android:id="@+id/ivTakePicture" android:layout_width="100dp" android:layout_height="100dp" - android:layout_marginTop="80dp" + android:layout_marginTop="16dp" android:src="@drawable/ic_take_picture" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_id.xml b/app/src/main/res/layout/fragment_id.xml index b2d59e2db5..ab10c02869 100644 --- a/app/src/main/res/layout/fragment_id.xml +++ b/app/src/main/res/layout/fragment_id.xml @@ -55,7 +55,6 @@ android:fontFamily="@font/maaxmedium" android:textAlignment="center" android:visibility="visible" - tools:text="Verified in blockchain" tools:textColor="@color/confirmed" />