Fix incoming transfers display (#2012)

safe-global · Sep 7, 2023 · 4d77e35 · 4d77e35
1 parent 6e2e218
commit 4d77e35
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/java/io/gnosis/safe/ui/transactions/TransactionListViewModel.kt b/app/src/main/java/io/gnosis/safe/ui/transactions/TransactionListViewModel.kt
@@ -116,9 +116,9 @@ class TransactionListViewModel
             is TxListEntry.Transaction -> {
                 // conflict is resolved if there is local tx with same nonce
                 // that was submitted for execution
-                if (txLocal?.safeTxNonce == txListEntry.transaction.executionInfo?.nonce) {
+                if (txLocal != null && txLocal.safeTxNonce == txListEntry.transaction.executionInfo?.nonce) {
                     // use submittedAt timestamp to distinguish between conflicting transactions
-                    if ((txLocal?.submittedAt == null || txLocal?.submittedAt == txListEntry.transaction.timestamp.time) && txListEntry.transaction.txStatus == TransactionStatus.AWAITING_EXECUTION) {
+                    if (txLocal.submittedAt == txListEntry.transaction.timestamp.time && txListEntry.transaction.txStatus == TransactionStatus.AWAITING_EXECUTION) {
                         val tx = txListEntry.transaction.copy(txStatus = TransactionStatus.PENDING)
                         getTransactionView(
                             chain = safe.chain,