[GUI] Finally, fix duplicate records.

furszy · furszy · commit f54c20617cc1 · 2020-12-22T02:02:11.000-03:00
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
@@ -343,7 +343,7 @@ bool TransactionRecord::decomposeDebitTransaction(const CWallet* wallet, const C
     }
 
     // Decompose shielded debit
-    return decomposeShieldedDebitTransaction(wallet, wtx, nTxFee, involvesWatchAddress, parts);
+    return decomposeShieldedDebitTransaction(wallet, wtx, nTxFee, involvesWatchAddress, parts) || !parts.empty();
 }
 
 // Check whether all the shielded inputs and outputs are from and send to this wallet
@@ -445,10 +445,14 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet*
         }
     }
 
-    // if we get to this point, we have a mixed debit transaction, can't break down payees.
-    TransactionRecord record(wtx.GetHash(), wtx.GetTxTime(), wtx.GetTotalSize(), TransactionRecord::Other, "", nNet, 0);
-    record.involvesWatchAddress = involvesWatchAddress;
-    parts.append(record);
+    // Check if wasn't able to decompose the transaction
+    if (parts.empty()) {
+        // if we get to this point, we have a mixed debit transaction, can't break down payees.
+        TransactionRecord record(wtx.GetHash(), wtx.GetTxTime(), wtx.GetTotalSize(), TransactionRecord::Other, "", nNet,
+                                 0);
+        record.involvesWatchAddress = involvesWatchAddress;
+        parts.append(record);
+    }
     return parts;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ bool TransactionRecord::decomposeDebitTransaction(const CWallet* wallet, const C`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`// Decompose shielded debit`
`346`		`- return decomposeShieldedDebitTransaction(wallet, wtx, nTxFee, involvesWatchAddress, parts);`
	`346`	`+ return decomposeShieldedDebitTransaction(wallet, wtx, nTxFee, involvesWatchAddress, parts) \|\| !parts.empty();`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`// Check whether all the shielded inputs and outputs are from and send to this wallet`
`@@ -445,10 +445,14 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet*`
`445`	`445`	`}`
`446`	`446`	`}`
`447`	`447`
`448`		`- // if we get to this point, we have a mixed debit transaction, can't break down payees.`
`449`		`- TransactionRecord record(wtx.GetHash(), wtx.GetTxTime(), wtx.GetTotalSize(), TransactionRecord::Other, "", nNet, 0);`
`450`		`- record.involvesWatchAddress = involvesWatchAddress;`
`451`		`- parts.append(record);`
	`448`	`+ // Check if wasn't able to decompose the transaction`
	`449`	`+ if (parts.empty()) {`
	`450`	`+ // if we get to this point, we have a mixed debit transaction, can't break down payees.`
	`451`	`+ TransactionRecord record(wtx.GetHash(), wtx.GetTxTime(), wtx.GetTotalSize(), TransactionRecord::Other, "", nNet,`
	`452`	`+ 0);`
	`453`	`+ record.involvesWatchAddress = involvesWatchAddress;`
	`454`	`+ parts.append(record);`
	`455`	`+ }`
`452`	`456`	`return parts;`
`453`	`457`	`}`
`454`	`458`