clean up txv2

Author: julian-CStack

lib/models/isar/models/blockchain_data/v2/transaction_v2.dart

@@ -271,40 +271,6 @@ class TransactionV2 {
         return "Restored Funds";
       }
 
-      if (isCancelled) {
-        return "Cancelled";
-      } else if (type == TransactionType.incoming) {
-        if (isConfirmed(currentChainHeight, minConfirms, minCoinbaseConfirms)) {
-          return "Received";
-        } else {
-          if (numberOfMessages == 1) {
-            return "Receiving (waiting for sender)";
-          } else if ((numberOfMessages ?? 0) > 1) {
-            return "Receiving (waiting for confirmations)"; // TODO test if the sender still has to open again after the receiver has 2 messages present, ie. sender->receiver->sender->node (yes) vs. sender->receiver->node (no)
-          } else {
-            return "Receiving ${prettyConfirms()}";
-          }
-        }
-      } else if (type == TransactionType.outgoing) {
-        if (isConfirmed(currentChainHeight, minConfirms, minCoinbaseConfirms)) {
-          return "Sent (confirmed)";
-        } else {
-          if (numberOfMessages == 1) {
-            return "Sending (waiting for receiver)";
-          } else if ((numberOfMessages ?? 0) > 1) {
-            return "Sending (waiting for confirmations)";
-          } else {
-            return "Sending ${prettyConfirms()}";
-          }
-        }
-      }
-    }
-
-    if (isMimblewimblecoinTransaction) {
-      if (slateId == null) {
-        return "Restored Funds";
-      }
-
       if (isCancelled) {
         return "Cancelled";
       } else if (type == TransactionType.incoming) {
@@ -347,7 +313,8 @@ class TransactionV2 {
         if (isConfirmed(currentChainHeight, minConfirms, minCoinbaseConfirms)) {
           return "Received";
         } else {
-          if (numberOfMessages == 1) {
+          if ((onChainNote == null && numberOfMessages == 1) |
+              (onChainNote != null && numberOfMessages == 2)) {
             return "Receiving (waiting for sender)";
           } else if ((numberOfMessages ?? 0) > 1) {
             return "Receiving (waiting for confirmations)"; // TODO test if the sender still has to open again after the receiver has 2 messages present, ie. sender->receiver->sender->node (yes) vs. sender->receiver->node (no)
@@ -359,7 +326,8 @@ class TransactionV2 {
         if (isConfirmed(currentChainHeight, minConfirms, minCoinbaseConfirms)) {
           return "Sent (confirmed)";
         } else {
-          if (numberOfMessages == 1) {
+          if ((onChainNote == null && numberOfMessages == 1) |
+              (onChainNote != null && numberOfMessages == 2)) {
             return "Sending (waiting for receiver)";
           } else if ((numberOfMessages ?? 0) > 1) {
             return "Sending (waiting for confirmations)";