From c57d4570ee381043ded4c9dfa0b03d81f319f2ee Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 3 Feb 2020 14:02:26 -0800
Subject: payments fixes

---
 liquidPayments.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'liquidPayments.js')

diff --git a/liquidPayments.js b/liquidPayments.js
index afa33466..dda85232 100644
--- a/liquidPayments.js
+++ b/liquidPayments.js
@@ -77,7 +77,7 @@ module.exports = (app, db, addresses, payments, emit) => {
             hash: blinded.txid,
             amount: value,
             currency: liquid.currency,
-            rate: app.get("ask"),
+            rate: app.get("rates")[user.currency],
             received: true,
             tip,
             confirmed,
@@ -131,7 +131,12 @@ module.exports = (app, db, addresses, payments, emit) => {
       await p.save();
 
       let payments = await db.Payment.findAll({
-        where: { user_id: user.id },
+        where: { 
+          user_id: user.id,
+          received: { 
+            [Sequelize.Op.ne]: null
+          },
+        },
         order: [['id', 'DESC']],
         limit: 12
       });
-- 
cgit v1.2.3