diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-17 07:02:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 07:02:24 +0800 |
| commit | ee62a6a3913967a6840d28ca812b94bbfa7a5779 (patch) | |
| tree | cac32de6cc520917db9621ce93f7f4ad9abd787e /ui/app/components/shapeshift-form.js | |
| parent | e8e06542e47b41668f196b6db54290490003845b (diff) | |
| parent | 88fabdd2de78d0dd4be86b02c94a64d9748667fa (diff) | |
| download | tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.gz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.bz2 tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.lz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.xz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.zst tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.zip | |
Merge pull request #1005 from MetaMask/dev
Merge dev into master!
Diffstat (limited to 'ui/app/components/shapeshift-form.js')
| -rw-r--r-- | ui/app/components/shapeshift-form.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js index 1da549288..383d5b623 100644 --- a/ui/app/components/shapeshift-form.js +++ b/ui/app/components/shapeshift-form.js @@ -8,7 +8,7 @@ const Qr = require('./qr-code') const isValidAddress = require('../util').isValidAddress module.exports = connect(mapStateToProps)(ShapeshiftForm) -function mapStateToProps(state) { +function mapStateToProps (state) { return { selectedAccount: state.selectedAccount, warning: state.appState.warning, @@ -25,7 +25,6 @@ function ShapeshiftForm () { } ShapeshiftForm.prototype.render = function () { - return h(ReactCSSTransitionGroup, { className: 'css-transition-group', transitionName: 'main', @@ -34,7 +33,6 @@ ShapeshiftForm.prototype.render = function () { }, [ this.props.qrRequested ? h(Qr, {key: 'qr'}) : this.renderMain(), ]) - } ShapeshiftForm.prototype.renderMain = function () { |