Merge branch 'develop' into contextTypes

# Conflicts:
#	ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js

3 files changed, 4 insertions, 4 deletions

diff --git a/test/unit/components/balance-component-test.js b/test/unit/components/balance-component-test.js
index 9b1e82acf..81e6fdf9e 100644
--- a/test/unit/components/balance-component-test.js
+++ b/test/unit/components/balance-component-test.js
@@ -8,7 +8,7 @@ const mockState = {
     accounts: { abc: {} },
     network: 1,
     selectedAddress: 'abc',
-  }
+  },
 }
 
 describe('BalanceComponent', function () {
diff --git a/test/unit/components/bn-as-decimal-input-test.js b/test/unit/components/bn-as-decimal-input-test.js
index 7b9d9814f..fab396548 100644
--- a/test/unit/components/bn-as-decimal-input-test.js
+++ b/test/unit/components/bn-as-decimal-input-test.js
@@ -52,13 +52,13 @@ describe('BnInput', function () {
   it('can tolerate wei precision', function (done) {
     const renderer = ReactTestUtils.createRenderer()
 
-    let valueStr = '1000000000'
+    const valueStr = '1000000000'
 
     const value = new BN(valueStr, 10)
     const inputStr = '1.000000001'
 
 
-    let targetStr = '1000000001'
+    const targetStr = '1000000001'
 
     const target = new BN(targetStr, 10)
 
diff --git a/test/unit/components/pending-tx-test.js b/test/unit/components/pending-tx-test.js
index c6c588e1c..c68e013ac 100644
--- a/test/unit/components/pending-tx-test.js
+++ b/test/unit/components/pending-tx-test.js
@@ -13,7 +13,7 @@ const mockState = {
     identities,
     conversionRate: 10,
     selectedAddress: 'abc',
-  }
+  },
 }
 
 describe('PendingTx', function () {