Merge branch 'master' into eyeballs

CHANGELOG.md

@@ -6,6 +6,12 @@
 - Replaced identicons with jazzicons
 - Fixed glitchy transitions
 
+## 1.8.2 2016-05-11
+
+- Fixed bug where send view would not load correctly the first time it was visited per account.
+- Migrated all users to new scalable backend.
+- Fixed `eth_syncing` method response.
+
 ## 1.8.1 2016-05-10
 
 - Initial usage of scalable blockchain backend.

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "Metamask",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "manifest_version": 2,
   "description": "__MSG_appDescription__",
   "icons": {

app/scripts/lib/migrations.js

@@ -1,10 +1,5 @@
-var path = require('path')
-var fs = require('fs')
-
-var migration2 = require('../migrations/002')
-var migration3 = require('../migrations/003')
-
 module.exports = [
-  migration2,
-  migration3,
+  require('../migrations/002'),
+  require('../migrations/003'),
+  require('../migrations/004'),
 ]

app/scripts/migrations/004.js

@@ -0,0 +1,22 @@
+module.exports = {
+  version: 4,
+
+  migrate: function(data) {
+    try {
+      if (data.config.provider.type !== 'rpc') return data
+      switch (data.config.provider.rpcTarget) {
+        case 'https://testrpc.metamask.io/':
+            data.config.provider = {
+              type: 'testnet'
+            }
+          break
+        case 'https://rpc.metamask.io/':
+            data.config.provider = {
+              type: 'mainnet'
+            }
+          break
+      }
+    } catch (_) {}
+    return data
+  }
+}

package.json

@@ -56,7 +56,7 @@
     "three.js": "^0.73.2",
     "through2": "^2.0.1",
     "web3": "^0.15.1",
-    "web3-provider-engine": "^7.6.2",
+    "web3-provider-engine": "^7.6.3",
     "xtend": "^4.0.1"
   },
   "devDependencies": {

test/unit/migrations-test.js

@@ -5,6 +5,7 @@ var wallet1 = require(path.join('..', 'lib', 'migrations', '001.json'))
 
 var migration2 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '002'))
 var migration3 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '003'))
+var migration4 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '004'))
 
 describe('wallet1 is migrated successfully', function() {
 
@@ -23,6 +24,10 @@ describe('wallet1 is migrated successfully', function() {
     var secondResult = migration3.migrate(firstResult)
     assert.equal(secondResult.config.provider.rpcTarget, newTestRpc)
 
+    var thirdResult = migration4.migrate(secondResult)
+    assert.equal(secondResult.config.provider.rpcTarget, null)
+    assert.equal(secondResult.config.provider.type, 'testnet')
+
     done()
   })
 })

ui/app/send.js

@@ -12,7 +12,7 @@ module.exports = connect(mapStateToProps)(SendTransactionScreen)
 
 function mapStateToProps(state) {
   var result = {
-    address: state.appState.currentView.context,
+    address: state.metamask.selectedAccount,
     accounts: state.metamask.accounts,
     identities: state.metamask.identities,
     warning: state.appState.warning,