From eb32ccb0c77c6e480c93f02c29faafec3cd93ec0 Mon Sep 17 00:00:00 2001
From: Dan Miller <danjm.com@gmail.com>
Date: Tue, 11 Sep 2018 12:51:49 -0230
Subject: [PATCH] Ensure account-tracker currentBlockNumber is set on first
 block update.

---
 app/scripts/lib/account-tracker.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/scripts/lib/account-tracker.js b/app/scripts/lib/account-tracker.js
index 3a52d5e8d..2e9340018 100644
--- a/app/scripts/lib/account-tracker.js
+++ b/app/scripts/lib/account-tracker.js
@@ -45,6 +45,9 @@ class AccountTracker {
     this._blockTracker = opts.blockTracker
     // blockTracker.currentBlock may be null
     this._currentBlockNumber = this._blockTracker.getCurrentBlock()
+    this._blockTracker.once('latest', blockNumber => {
+      this._currentBlockNumber = blockNumber
+    })
     // bind function for easier listener syntax
     this._updateForBlock = this._updateForBlock.bind(this)
   }