diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt index 18ebc3dd4b..e7587a6983 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt @@ -12,6 +12,7 @@ import com.tangem.tap.common.extensions.show import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsState import com.tangem.tap.features.wallet.models.Currency import com.tangem.tap.features.wallet.models.PendingTransaction +import com.tangem.tap.features.wallet.models.PendingTransactionType import com.tangem.tap.features.wallet.redux.WalletAction import com.tangem.tap.features.wallet.redux.WalletData import com.tangem.tap.features.wallet.redux.WalletMainButton @@ -72,8 +73,11 @@ class SingleWalletView : WalletView() { } private fun showPendingTransactionsIfPresent(pendingTransactions: List) { - pendingTransactionAdapter.submitList(pendingTransactions) - binding?.rvPendingTransaction?.show(pendingTransactions.isNotEmpty()) + val knownTransactions = pendingTransactions.filterNot { + it.type == PendingTransactionType.Unknown + } + pendingTransactionAdapter.submitList(knownTransactions) + binding?.rvPendingTransaction?.show(knownTransactions.isNotEmpty()) } private fun setupBalance(state: WalletState, primaryWallet: WalletData) { diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index b3d1b54730..50b77c777f 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -151,13 +151,12 @@ android:id="@+id/rv_pending_transaction" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="16dp" + android:layout_marginTop="12dp" android:nestedScrollingEnabled="false" android:overScrollMode="never" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/l_card_total_balance" - app:layout_goneMarginTop="12dp" /> + app:layout_constraintTop_toBottomOf="@id/rv_warning_messages" /> + app:layout_constraintTop_toBottomOf="@id/l_card_total_balance" /> + app:layout_constraintTop_toBottomOf="@id/rv_warning_messages" />