Merge branch 'dev' into simple-keystore-fix

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Current Master
 
+- Fix seed word account generation (https://medium.com/metamask/metamask-3-migration-guide-914b79533cdd#.t4i1qmmsz).
 - Fix Bug where you see a empty transaction flash by on the confirm transaction view.
 - Create visible difference in transaction history between a approved but not yet included in a block transaction and a transaction who has been confirmed.
 - Fix memory leak in RPC Cache
@@ -16,6 +17,8 @@
 
 ## 2.14.1 2016-12-20
 
+- Update Coinbase info. and increase the buy amount to $15
+- Fixed ropsten transaction links
 - Temporarily disable extension reload detection causing infinite reload bug.
 - Implemented basic checking for valid RPC URIs.
 

test/unit/explorer-link-test.js

@@ -4,7 +4,7 @@ var linkGen = require('../../ui/lib/explorer-link')
 describe('explorer-link', function() {
 
   it('adds testnet prefix to morden test network', function() {
-    var result = linkGen('hash', '2')
+    var result = linkGen('hash', '3')
     assert.notEqual(result.indexOf('testnet'), -1, 'testnet injected')
   })
 

ui/app/components/coinbase-form.js

@@ -72,7 +72,7 @@ CoinbaseForm.prototype.render = function () {
         lineHeight: '13px',
       },
     },
-      `there is a USD$ 5 a day max and a USD$ 50
+      `there is a USD$ 15 a day max and a USD$ 50
           dollar limit per the life time of an account without a
           coinbase account. A fee of 3.75% will be aplied to debit/credit cards.`),
 
@@ -136,14 +136,14 @@ CoinbaseForm.prototype.renderLoading = function () {
 function isValidAmountforCoinBase (amount) {
   amount = parseFloat(amount)
   if (amount) {
-    if (amount <= 5 && amount > 0) {
+    if (amount <= 15 && amount > 0) {
       return {
         valid: true,
       }
-    } else if (amount > 5) {
+    } else if (amount > 15) {
       return {
         valid: false,
-        message: 'The amount can not be greater then $5',
+        message: 'The amount can not be greater then $15',
       }
     } else {
       return {

ui/app/components/transaction-list-item.js

@@ -28,7 +28,7 @@ TransactionListItem.prototype.render = function () {
 
   let isLinkable = false
   const numericNet = parseInt(network)
-  isLinkable = numericNet === 1 || numericNet === 2
+  isLinkable = numericNet === 1 || numericNet === 3
 
   var isMsg = ('msgParams' in transaction)
   var isTx = ('txParams' in transaction)
@@ -42,7 +42,6 @@ TransactionListItem.prototype.render = function () {
   }
 
   const isClickable = ('hash' in transaction && isLinkable) || isPending
-
   return (
     h(`.transaction-list-item.flex-row.flex-space-between${isClickable ? '.pointer' : ''}`, {
       onClick: (event) => {

ui/app/reducers/app.js

@@ -446,7 +446,7 @@ function reduceApp (state, action) {
         },
         buyView: {
           subview: 'buyForm',
-          amount: '5.00',
+          amount: '15.00',
           buyAddress: action.value,
           formView: {
             coinbase: true,

ui/lib/explorer-link.js

@@ -5,7 +5,7 @@ module.exports = function (hash, network) {
     case 1: // main net
       prefix = ''
       break
-    case 2: // morden test net
+    case 3: // morden test net
       prefix = 'testnet.'
       break
     default: