Merge pull request #125 from MetaMask/TransactionList

Add transaction history to account detail view

2 files changed, 51 insertions, 27 deletions

diff --git a/test/unit/config-manager-test.js b/test/unit/config-manager-test.js
index 84632b0ea..e414ecb9e 100644
--- a/test/unit/config-manager-test.js
+++ b/test/unit/config-manager-test.js
@@ -126,6 +126,16 @@ describe('config-manager', function() {
       })
     })
 
+    describe('#updateTx', function() {
+      it('replaces the tx with the same id', function() {
+        configManager.addTx({ id: '1', status: 'unconfirmed' })
+        configManager.addTx({ id: '2', status: 'confirmed' })
+        configManager.updateTx({ id: '1', status: 'blah', hash: 'foo' })
+        var result = configManager.getTx('1')
+        assert.equal(result.hash, 'foo')
+      })
+    })
+
     describe('#unconfirmedTxs', function() {
       it('returns unconfirmed txs in a hash', function() {
         configManager.addTx({ id: '1', status: 'unconfirmed' })
diff --git a/test/unit/util_test.js b/test/unit/util_test.js
index 7f8103d3b..3f46d4e9b 100644
--- a/test/unit/util_test.js
+++ b/test/unit/util_test.js
@@ -82,33 +82,47 @@ describe('util', function() {
 
   })
 
-  describe('#normalizeToWei', function() {
-    it('should convert an eth to the appropriate equivalent values', function() {
-      var valueTable = {
-        wei:   '1000000000000000000',
-        kwei:  '1000000000000000',
-        mwei:  '1000000000000',
-        gwei:  '1000000000',
-        szabo: '1000000',
-        finney:'1000',
-        ether: '1',
-        kether:'0.001',
-        mether:'0.000001',
-        // AUDIT: We're getting BN numbers on these ones.
-        // I think they're big enough to ignore for now.
-        // gether:'0.000000001',
-        // tether:'0.000000000001',
-      }
-      var oneEthBn = new ethUtil.BN(ethInWei, 10)
-
-      for(var currency in valueTable) {
-
-        var value = new ethUtil.BN(valueTable[currency], 10)
-        var output = util.normalizeToWei(value, currency)
-        assert.equal(output.toString(10), valueTable.wei, `value of ${output.toString(10)} ${currency} should convert to ${oneEthBn}`)
-
-      }
+  describe('normalizing values', function() {
+
+    describe('#normalizeToWei', function() {
+      it('should convert an eth to the appropriate equivalent values', function() {
+        var valueTable = {
+          wei:   '1000000000000000000',
+          kwei:  '1000000000000000',
+          mwei:  '1000000000000',
+          gwei:  '1000000000',
+          szabo: '1000000',
+          finney:'1000',
+          ether: '1',
+          // kether:'0.001',
+          // mether:'0.000001',
+          // AUDIT: We're getting BN numbers on these ones.
+          // I think they're big enough to ignore for now.
+          // gether:'0.000000001',
+          // tether:'0.000000000001',
+        }
+        var oneEthBn = new ethUtil.BN(ethInWei, 10)
+
+        for(var currency in valueTable) {
+
+          var value = new ethUtil.BN(valueTable[currency], 10)
+          var output = util.normalizeToWei(value, currency)
+          assert.equal(output.toString(10), valueTable.wei, `value of ${output.toString(10)} ${currency} should convert to ${oneEthBn}`)
+        }
+      })
     })
-  })
 
+    describe('#normalizeNumberToWei', function() {
+
+      it('should convert a kwei number to the appropriate equivalent wei', function() {
+        var result = util.normalizeNumberToWei(1.111, 'kwei')
+        assert.equal(result.toString(10), '1111', 'accepts decimals')
+      })
+
+      it('should convert a ether number to the appropriate equivalent wei', function() {
+        var result = util.normalizeNumberToWei(1.111, 'ether')
+        assert.equal(result.toString(10), '1111000000000000000', 'accepts decimals')
+      })
+    })
+  })
 })