From 3a99b7a6bc0ae19e466adbe7bddbc26a430d8286 Mon Sep 17 00:00:00 2001
From: Josh Harvey <josh@lamassu.is>
Date: Sun, 27 Nov 2016 17:06:46 +0200
Subject: [PATCH] WIPP

---
 lib/plugins.js | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/plugins.js b/lib/plugins.js
index 15500130..fd2d4c27 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -257,8 +257,8 @@ function fiatBalance (settings, fiatCode, cryptoCode, deviceId) {
   })
 }
 
-function processTxStatus (tx) {
-  return wallet.getStatus(tx.toAddress, tx.cryptoAtoms, tx.cryptoCode)
+function processTxStatus (settings, tx) {
+  return wallet.getStatus(settings, tx.toAddress, tx.cryptoAtoms, tx.cryptoCode)
   .then(res => db.updateTxStatus(tx, res.status))
 }
 
@@ -279,16 +279,24 @@ function notifyConfirmation (tx) {
 
 function monitorLiveIncoming () {
   const statuses = ['notSeen', 'published', 'insufficientFunds']
-  db.fetchOpenTxs(statuses, STALE_LIVE_INCOMING_TX_AGE)
-  .then(txs => Promise.all(txs.map(processTxStatus)))
-  .catch(err => logger.error(err))
+
+  return settingsLoader.settings()
+  .then(settings => {
+    return db.fetchOpenTxs(statuses, STALE_LIVE_INCOMING_TX_AGE)
+    .then(txs => Promise.all(txs.map(r => processTxStatus(settings, r))))
+  })
+  .catch(logger.error)
 }
 
 function monitorIncoming () {
   const statuses = ['notSeen', 'published', 'authorized', 'instant', 'rejected', 'insufficientFunds']
-  db.fetchOpenTxs(statuses, STALE_INCOMING_TX_AGE)
-  .then(txs => Promise.all(txs.map(processTxStatus)))
-  .catch(err => logger.error(err))
+
+  return settingsLoader.settings()
+  .then(settings => {
+    db.fetchOpenTxs(statuses, STALE_INCOMING_TX_AGE)
+    .then(txs => Promise.all(txs.map(r => processTxStatus(settings, r))))
+  })
+  .catch(logger.error)
 }
 
 function monitorUnnotified () {