Use newui actions in old-ui

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')

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

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'

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)
 

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')
 
 

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',

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

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
 

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())
   }
 }

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)
 

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')

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)

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)

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')

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')

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())
     })

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')
 

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)
 

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)

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)
 

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)
 

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

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

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

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)
 

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