diff options
author | kumavis <aaron@kumavis.me> | 2018-03-30 07:54:00 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-03-30 07:54:00 +0800 |
commit | b49ad750dd87232553a72663af94bb2840c2f2ad (patch) | |
tree | 71e4002e6bc28c42ea227299752814d6f1f10486 /ui/app/conf-tx.js | |
parent | 93c123c6f52b28b525658492ce93fbcc30fc1e7c (diff) | |
parent | 9d4be1842e7c56e3bfde529ff555dcae8dec3dbd (diff) | |
download | tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.gz tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.zst tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.zip |
Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r-- | ui/app/conf-tx.js | 2 |
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') |