Use newui actions in old-ui

26 files changed, 28 insertions, 25 deletions

diff --git a/old-ui/app/account-detail.js b/old-ui/app/account-detail.js
index d4f707e0b..933f6d6a4 100644
--- a/old-ui/app/account-detail.js
+++ b/old-ui/app/account-detail.js
@@ -3,7 +3,7 @@ const extend = require('xtend')
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
-const actions = require('./actions')
+const actions = require('../../ui/app/actions')
 const valuesFor = require('./util').valuesFor
 const Identicon = require('./components/identicon')
 const EthBalance = require('./components/eth-balance')
diff --git a/old-ui/app/accounts/import/index.js b/old-ui/app/accounts/import/index.js
index 46260c3e7..3502efe93 100644
--- a/old-ui/app/accounts/import/index.js
+++ b/old-ui/app/accounts/import/index.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
-const actions = require('../../actions')
+const actions = require('../../../../ui/app/actions')
 import Select from 'react-select'
 
 // Subviews
diff --git a/old-ui/app/accounts/import/json.js b/old-ui/app/accounts/import/json.js
index 158a3c923..8d6bd7f7b 100644
--- a/old-ui/app/accounts/import/json.js
+++ b/old-ui/app/accounts/import/json.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
-const actions = require('../../actions')
+const actions = require('../../../../ui/app/actions')
 const FileInput = require('react-simple-file-input').default
 
 const HELP_LINK = 'https://github.com/MetaMask/faq/blob/master/README.md#q-i-cant-use-the-import-feature-for-uploading-a-json-file-the-window-keeps-closing-when-i-try-to-select-a-file'
diff --git a/old-ui/app/accounts/import/private-key.js b/old-ui/app/accounts/import/private-key.js
index 68ccee58e..105191105 100644
--- a/old-ui/app/accounts/import/private-key.js
+++ b/old-ui/app/accounts/import/private-key.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
-const actions = require('../../actions')
+const actions = require('../../../../ui/app/actions')
 
 module.exports = connect(mapStateToProps)(PrivateKeyImportView)
 
diff --git a/old-ui/app/add-token.js b/old-ui/app/add-token.js
index 9354a4cad..8778f312e 100644
--- a/old-ui/app/add-token.js
+++ b/old-ui/app/add-token.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
-const actions = require('./actions')
+const actions = require('../../ui/app/actions')
 const Tooltip = require('./components/tooltip.js')
 
 
diff --git a/old-ui/app/app.js b/old-ui/app/app.js
index dcf19a0a9..b1a9d68ba 100644
--- a/old-ui/app/app.js
+++ b/old-ui/app/app.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const connect = require('react-redux').connect
 const h = require('react-hyperscript')
-const actions = require('./actions')
+const actions = require('../../ui/app/actions')
 // mascara
 const MascaraFirstTime = require('../../mascara/src/app/first-time').default
 const MascaraBuyEtherScreen = require('../../mascara/src/app/first-time/buy-ether-screen').default
@@ -556,6 +556,7 @@ App.prototype.renderPrimary = function () {
 
     case 'qr':
       log.debug('rendering show qr screen')
+      console.log(`QrView`, QrView);
       return h('div', {
         style: {
           position: 'absolute',
diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js
index 0c34a5154..c0ebe3c60 100644
--- a/old-ui/app/components/account-dropdowns.js
+++ b/old-ui/app/components/account-dropdowns.js
@@ -1,7 +1,7 @@
 const Component = require('react').Component
 const PropTypes = require('react').PropTypes
 const h = require('react-hyperscript')
-const actions = require('../actions')
+const actions = require('../../../ui/app/actions')
 const genAccountLink = require('etherscan-link').createAccountLink
 const connect = require('react-redux').connect
 const Dropdown = require('./dropdown').Dropdown
diff --git a/old-ui/app/components/account-export.js b/old-ui/app/components/account-export.js
index 32b103c86..51b85b786 100644
--- a/old-ui/app/components/account-export.js
+++ b/old-ui/app/components/account-export.js
@@ -3,7 +3,7 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const exportAsFile = require('../util').exportAsFile
 const copyToClipboard = require('copy-to-clipboard')
-const actions = require('../actions')
+const actions = require('../../../ui/app/actions')
 const ethUtil = require('ethereumjs-util')
 const connect = require('react-redux').connect
 
diff --git a/old-ui/app/components/buy-button-subview.js b/old-ui/app/components/buy-button-subview.js
index 15281171c..843627c33 100644
--- a/old-ui/app/components/buy-button-subview.js
+++ b/old-ui/app/components/buy-button-subview.js
@@ -2,7 +2,7 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const connect = require('react-redux').connect
-const actions = require('../actions')
+const actions = require('../../../ui/app/actions')
 const CoinbaseForm = require('./coinbase-form')
 const ShapeshiftForm = require('./shapeshift-form')
 const Loading = require('./loading')
@@ -247,6 +247,7 @@ BuyButtonSubview.prototype.backButtonContext = function () {
   if (this.props.context === 'confTx') {
     this.props.dispatch(actions.showConfTxPage(false))
   } else {
+    console.log(`actions.goHome`, actions.goHome);
     this.props.dispatch(actions.goHome())
   }
 }
diff --git a/old-ui/app/components/coinbase-form.js b/old-ui/app/components/coinbase-form.js
index f44d86045..35b2111ff 100644
--- a/old-ui/app/components/coinbase-form.js
+++ b/old-ui/app/components/coinbase-form.js
@@ -2,7 +2,7 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const connect = require('react-redux').connect
-const actions = require('../actions')
+const actions = require('../../../ui/app/actions')
 
 module.exports = connect(mapStateToProps)(CoinbaseForm)
 
diff --git a/old-ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js
index 5b1b367c6..366121ce0 100644
--- a/old-ui/app/components/pending-tx.js
+++ b/old-ui/app/components/pending-tx.js
@@ -1,7 +1,7 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const actions = require('../actions')
+const actions = require('../../../ui/app/actions')
 const clone = require('clone')
 
 const ethUtil = require('ethereumjs-util')
diff --git a/old-ui/app/components/qr-code.js b/old-ui/app/components/qr-code.js
index 06b9aed9b..fa38dcd92 100644
--- a/old-ui/app/components/qr-code.js
+++ b/old-ui/app/components/qr-code.js
@@ -25,6 +25,7 @@ function QrCodeView () {
 QrCodeView.prototype.render = function () {
   const props = this.props
   const Qr = props.Qr
+  console.log(`QrCodeView Qr`, Qr);
   const address = `${isHexPrefixed(Qr.data) ? 'ethereum:' : ''}${Qr.data}`
   const qrImage = qrCode(4, 'M')
   qrImage.addData(address)
diff --git a/old-ui/app/components/shapeshift-form.js b/old-ui/app/components/shapeshift-form.js
index c5993e3d3..a54987c04 100644
--- a/old-ui/app/components/shapeshift-form.js
+++ b/old-ui/app/components/shapeshift-form.js
@@ -2,7 +2,7 @@ const PersistentForm = require('../../lib/persistent-form')
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const connect = require('react-redux').connect
-const actions = require('../actions')
+const actions = require('../../../ui/app/actions')
 const Qr = require('./qr-code')
 const isValidAddress = require('../util').isValidAddress
 module.exports = connect(mapStateToProps)(ShapeshiftForm)
diff --git a/old-ui/app/components/shift-list-item.js b/old-ui/app/components/shift-list-item.js
index b555dee84..5454a90bc 100644
--- a/old-ui/app/components/shift-list-item.js
+++ b/old-ui/app/components/shift-list-item.js
@@ -4,7 +4,7 @@ const h = require('react-hyperscript')
 const connect = require('react-redux').connect
 const vreme = new (require('vreme'))()
 const explorerLink = require('etherscan-link').createExplorerLink
-const actions = require('../actions')
+const actions = require('../../../ui/app/actions')
 const addressSummary = require('../util').addressSummary
 
 const CopyButton = require('./copyButton')
diff --git a/old-ui/app/conf-tx.js b/old-ui/app/conf-tx.js
index cb1afedfe..15c937b1c 100644
--- a/old-ui/app/conf-tx.js
+++ b/old-ui/app/conf-tx.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
-const actions = require('./actions')
+const actions = require('../../ui/app/actions')
 const NetworkIndicator = require('./components/network')
 const txHelper = require('../lib/tx-helper')
 const isPopupOrNotification = require('../../app/scripts/lib/is-popup-or-notification')
diff --git a/old-ui/app/config.js b/old-ui/app/config.js
index c14fa1d28..c698417ba 100644
--- a/old-ui/app/config.js
+++ b/old-ui/app/config.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
-const actions = require('./actions')
+const actions = require('../../ui/app/actions')
 const infuraCurrencies = require('./infura-conversion.json').objects.sort((a, b) => {
       return a.quote.name.toLocaleLowerCase().localeCompare(b.quote.name.toLocaleLowerCase())
     })
diff --git a/old-ui/app/first-time/init-menu.js b/old-ui/app/first-time/init-menu.js
index cc7c51bd3..4f1d5d186 100644
--- a/old-ui/app/first-time/init-menu.js
+++ b/old-ui/app/first-time/init-menu.js
@@ -4,7 +4,7 @@ const Component = require('react').Component
 const connect = require('react-redux').connect
 const h = require('react-hyperscript')
 const Mascot = require('../components/mascot')
-const actions = require('../actions')
+const actions = require('../../../ui/app/actions')
 const Tooltip = require('../components/tooltip')
 const getCaretCoordinates = require('textarea-caret')
 
diff --git a/old-ui/app/info.js b/old-ui/app/info.js
index 24c211c1f..db9f30f23 100644
--- a/old-ui/app/info.js
+++ b/old-ui/app/info.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
-const actions = require('./actions')
+const actions = require('../../ui/app/actions')
 
 module.exports = connect(mapStateToProps)(InfoScreen)
 
diff --git a/old-ui/app/keychains/hd/create-vault-complete.js b/old-ui/app/keychains/hd/create-vault-complete.js
index 5ab5d4c33..736e922b7 100644
--- a/old-ui/app/keychains/hd/create-vault-complete.js
+++ b/old-ui/app/keychains/hd/create-vault-complete.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const connect = require('react-redux').connect
 const h = require('react-hyperscript')
-const actions = require('../../actions')
+const actions = require('../../../../ui/app/actions')
 const exportAsFile = require('../../util').exportAsFile
 
 module.exports = connect(mapStateToProps)(CreateVaultCompleteScreen)
diff --git a/old-ui/app/keychains/hd/recover-seed/confirmation.js b/old-ui/app/keychains/hd/recover-seed/confirmation.js
index 4335186a5..eb0298a09 100644
--- a/old-ui/app/keychains/hd/recover-seed/confirmation.js
+++ b/old-ui/app/keychains/hd/recover-seed/confirmation.js
@@ -3,7 +3,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const connect = require('react-redux').connect
 const h = require('react-hyperscript')
-const actions = require('../../../actions')
+const actions = require('../../../../../ui/app/actions')
 
 module.exports = connect(mapStateToProps)(RevealSeedConfirmation)
 
diff --git a/old-ui/app/keychains/hd/restore-vault.js b/old-ui/app/keychains/hd/restore-vault.js
index 06e51d9b3..222172dfd 100644
--- a/old-ui/app/keychains/hd/restore-vault.js
+++ b/old-ui/app/keychains/hd/restore-vault.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const PersistentForm = require('../../../lib/persistent-form')
 const connect = require('react-redux').connect
 const h = require('react-hyperscript')
-const actions = require('../../actions')
+const actions = require('../../../../ui/app/actions')
 
 module.exports = connect(mapStateToProps)(RestoreVaultScreen)
 
diff --git a/old-ui/app/reducers/app.js b/old-ui/app/reducers/app.js
index 8558d6dca..0d7419f9a 100644
--- a/old-ui/app/reducers/app.js
+++ b/old-ui/app/reducers/app.js
@@ -1,5 +1,5 @@
 const extend = require('xtend')
-const actions = require('../actions')
+const actions = require('../../../ui/app/actions')
 const txHelper = require('../../lib/tx-helper')
 
 module.exports = reduceApp
diff --git a/old-ui/app/reducers/metamask.js b/old-ui/app/reducers/metamask.js
index 13ac9e611..68ad975a7 100644
--- a/old-ui/app/reducers/metamask.js
+++ b/old-ui/app/reducers/metamask.js
@@ -1,5 +1,5 @@
 const extend = require('xtend')
-const actions = require('../actions')
+const actions = require('../../../ui/app/actions')
 const MetamascaraPlatform = require('../../../app/scripts/platforms/window')
 
 module.exports = reduceMetamask
diff --git a/old-ui/app/send.js b/old-ui/app/send.js
index e59c1130e..9ab064aea 100644
--- a/old-ui/app/send.js
+++ b/old-ui/app/send.js
@@ -3,7 +3,7 @@ const PersistentForm = require('../lib/persistent-form')
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
 const Identicon = require('./components/identicon')
-const actions = require('./actions')
+const actions = require('../../ui/app/actions')
 const util = require('./util')
 const numericBalance = require('./util').numericBalance
 const addressSummary = require('./util').addressSummary
diff --git a/old-ui/app/settings.js b/old-ui/app/settings.js
index 454cc95e0..8df37c555 100644
--- a/old-ui/app/settings.js
+++ b/old-ui/app/settings.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
-const actions = require('./actions')
+const actions = require('../../ui/app/actions')
 
 module.exports = connect(mapStateToProps)(AppSettingsPage)
 
diff --git a/old-ui/app/unlock.js b/old-ui/app/unlock.js
index 4180791c4..a1f791552 100644
--- a/old-ui/app/unlock.js
+++ b/old-ui/app/unlock.js
@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
-const actions = require('./actions')
+const actions = require('../../ui/app/actions')
 const getCaretCoordinates = require('textarea-caret')
 const EventEmitter = require('events').EventEmitter