Merge pull request #63 from bokobza/master

Fixed problem happening when user paid to himself

Breeze/src/Breeze.Wallet/Controllers/WalletController.cs

@@ -229,6 +229,8 @@ namespace Breeze.Wallet.Controllers
                         {
                             item.Type = TransactionItemType.Send;
                             item.Amount = Money.Zero;
+                            if (transaction.Payments != null)
+                            {
                                 item.Payments = new List<PaymentDetailModel>();
                                 foreach (var payment in transaction.Payments)
                                 {
@@ -240,6 +242,7 @@ namespace Breeze.Wallet.Controllers
 
                                     item.Amount += payment.Amount;
                                 }
+                            }
 
                             var changeAddress = addresses.Single(a => a.IsChangeAddress() && a.Transactions.Any(t => t.Id == transaction.Id));
                             item.Fee =  transaction.Amount.Abs() - item.Amount - changeAddress.Transactions.First(t => t.Id == transaction.Id).Amount;

Breeze/src/Breeze.Wallet/WalletManager.cs

@@ -479,8 +479,9 @@ namespace Breeze.Wallet
                 // find the script this input references
                 var keyToSpend = this.keysLookup.Single(v => v.Value.Transactions.Contains(tTx)).Key;
 
-                // get the details of the outputs paid out
-                IEnumerable<TxOut> paidoutto = transaction.Outputs.Where(o => !this.keysLookup.Keys.Contains(o.ScriptPubKey));
+                // get the details of the outputs paid out. 
+                // We first include the keys we don't hold and then we include the keys we do hold but that are for receiving addresses (which would mean the user paid itself).
+                IEnumerable<TxOut> paidoutto = transaction.Outputs.Where(o => !this.keysLookup.Keys.Contains(o.ScriptPubKey) || (this.keysLookup.ContainsKey(o.ScriptPubKey) && !this.keysLookup[o.ScriptPubKey].IsChangeAddress()));
 
                 AddTransactionToWallet(transaction.GetHash(), transaction.Time, null, -tTx.Amount, keyToSpend, blockHeight, blockTime, tTx.Id, tTx.Index, paidoutto);                
             }