aboutsummaryrefslogtreecommitdiffstats
path: root/old-ui/app/components
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2017-11-16 01:35:18 +0800
committerDan <danjm.com@gmail.com>2017-12-05 10:38:23 +0800
commitf7ad015f5bd3b037b73d7792d0a09d7e0382a511 (patch)
treef17d0975fc410216404fd1b8c75dd2ec9dc2a69c /old-ui/app/components
parent7f795240706c013dc4a9ece0e9c9e33897c7fc71 (diff)
downloadtangerine-wallet-browser-f7ad015f5bd3b037b73d7792d0a09d7e0382a511.tar.gz
tangerine-wallet-browser-f7ad015f5bd3b037b73d7792d0a09d7e0382a511.tar.zst
tangerine-wallet-browser-f7ad015f5bd3b037b73d7792d0a09d7e0382a511.zip
Use newui actions in old-ui
Diffstat (limited to 'old-ui/app/components')
-rw-r--r--old-ui/app/components/account-dropdowns.js2
-rw-r--r--old-ui/app/components/account-export.js2
-rw-r--r--old-ui/app/components/buy-button-subview.js3
-rw-r--r--old-ui/app/components/coinbase-form.js2
-rw-r--r--old-ui/app/components/pending-tx.js2
-rw-r--r--old-ui/app/components/qr-code.js1
-rw-r--r--old-ui/app/components/shapeshift-form.js2
-rw-r--r--old-ui/app/components/shift-list-item.js2
8 files changed, 9 insertions, 7 deletions
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')