aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-03-30 10:30:31 +0800
committerDan <danjm.com@gmail.com>2018-03-30 10:30:31 +0800
commit717623e2e388f488d71bd6e19095645cd8095a99 (patch)
tree7c16960c017585e2823c927199c4b98b93aecbbd /ui/app/conf-tx.js
parent01e3293b65bb153325479f7366113e037fee659b (diff)
parent9d4be1842e7c56e3bfde529ff555dcae8dec3dbd (diff)
downloadtangerine-wallet-browser-717623e2e388f488d71bd6e19095645cd8095a99.tar.gz
tangerine-wallet-browser-717623e2e388f488d71bd6e19095645cd8095a99.tar.zst
tangerine-wallet-browser-717623e2e388f488d71bd6e19095645cd8095a99.zip
Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 03848f490..1070436c3 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -1,7 +1,7 @@
const inherits = require('util').inherits
const Component = require('react').Component
const h = require('react-hyperscript')
-const connect = require('./metamask-connect')
+const connect = require('react-redux').connect
const actions = require('./actions')
const txHelper = require('../lib/tx-helper')