Merge pull request #1873 from OpenBazaar/paymentnotif

(#1809) Set payment notification fundingTotal to CurrencyValue

Author: drwasho

repo/notification.go

@@ -436,7 +436,7 @@ type PaymentNotification struct {
 	ID           string           `json:"notificationId"`
 	Type         NotificationType `json:"type"`
 	OrderId      string           `json:"orderId"`
-	FundingTotal string           `json:"fundingTotal"`
+	FundingTotal *CurrencyValue   `json:"fundingTotal"`
 	CoinType     string           `json:"coinType"`
 }
 

wallet/listeners/transaction_listener.go

@@ -351,11 +351,21 @@ func (l *TransactionListener) processPurchasePayment(txid string, output wallet.
 				}
 			}
 		}
+		def, err := repo.AllCurrencies().Lookup(contract.BuyerOrder.Payment.AmountCurrency.Code)
+		if err != nil {
+			log.Errorf("Error looking up currency: %s", err)
+			return
+		}
+		cv, err := repo.NewCurrencyValue(funding.String(), def)
+		if err != nil {
+			log.Errorf("Error creating currency value: %s", err)
+			return
+		}
 		n := repo.PaymentNotification{
 			ID:           repo.NewNotificationID(),
 			Type:         "payment",
 			OrderId:      orderId,
-			FundingTotal: funding.String(),
+			FundingTotal: cv,
 			CoinType:     contract.BuyerOrder.Payment.AmountCurrency.Code,
 		}
 		l.broadcast <- n