More conflict resolution.

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Current Master
 
+
 - Add two most recently used custom RPCs to network dropdown menu.
 - Add personal_sign method support.
 - Add ability to customize gas and gasPrice on the transaction approval screen.

app/scripts/controllers/preferences.js

@@ -1,5 +1,5 @@
 const ObservableStore = require('obs-store')
-const normalizeAddress = require('../sig-util').normalize
+const normalizeAddress = require('eth-sig-util').normalize
 const extend = require('xtend')
 
 class PreferencesController {

app/scripts/metamask-controller.js

@@ -11,10 +11,10 @@ const streamIntoProvider = require('web3-stream-provider/handler')
 const MetaMaskProvider = require('web3-provider-engine/zero.js')
 const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
 const KeyringController = require('./keyring-controller')
-const PreferencesController = require('./lib/controllers/preferences')
-const CurrencyController = require('./lib/controllers/currency')
+const PreferencesController = require('./controllers/preferences')
+const CurrencyController = require('./controllers/currency')
 const NoticeController = require('./notice-controller')
-const ShapeShiftController = require('./lib/controllers/shapeshift')
+const ShapeShiftController = require('./controllers/shapeshift')
 const MessageManager = require('./lib/message-manager')
 const PersonalMessageManager = require('./lib/personal-message-manager')
 const TxManager = require('./transaction-manager')

test/unit/currency-controller-test.js

@@ -5,7 +5,7 @@ const assert = require('assert')
 const extend = require('xtend')
 const rp = require('request-promise')
 const nock = require('nock')
-const CurrencyController = require('../../app/scripts/lib/controllers/currency')
+const CurrencyController = require('../../app/scripts/controllers/currency')
 
 describe('config-manager', function() {
   var currencyController

ui/app/actions.js

@@ -671,7 +671,7 @@ function markAccountsFound() {
 
 function setRpcTarget (newRpc) {
   return (dispatch) => {
-    if (global.METAMASK_DEBUG) console.log(`background.setRpcTarget`)
+    log.debug(`background.setRpcTarget`)
     background.setRpcTarget(newRpc)
     background.updateFrequentRpcList(newRpc, (frequentRpcList) => {
       const value = {

ui/app/app.js

@@ -501,6 +501,12 @@ App.prototype.renderCustomOption = function (provider) {
   const { rpcTarget, type } = provider
   if (type !== 'rpc') return null
 
+  // Concatenate long URLs
+  let label = rpcTarget
+  if (rpcTarget.length > 31) {
+    label = label.substr(0, 34) + '...'
+  }
+
   switch (rpcTarget) {
 
     case 'http://localhost:8545':
@@ -508,7 +514,8 @@ App.prototype.renderCustomOption = function (provider) {
 
     default:
       return h(DropMenuItem, {
-        label: `${rpcTarget}`,
+        label,
+        key: rpcTarget,
         closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
         icon: h('i.fa.fa-question-circle.fa-lg'),
         activeNetworkRender: 'custom',
@@ -526,6 +533,7 @@ App.prototype.renderCommonRpc = function (rpcList, provider) {
     } else {
       return h(DropMenuItem, {
         label: rpc,
+        key: rpc,
         closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
         action: () => props.dispatch(actions.setRpcTarget(rpc)),
         icon: h('i.fa.fa-question-circle.fa-lg'),