diff options
author | kumavis <aaron@kumavis.me> | 2017-08-08 01:52:08 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2017-08-08 01:52:08 +0800 |
commit | 78aa957e5ab5bd3e7f7fb4628c82de8ae312750f (patch) | |
tree | ffe2ece4164b9d6c70196dd3ab608244bdf95281 /ui/app/components/shapeshift-form.js | |
parent | 82ba2c95ee98487dd465e5aabd45f18d46e89727 (diff) | |
parent | 57abc58d623b66a091987a944d8c45737f4feabe (diff) | |
download | tangerine-wallet-browser-78aa957e5ab5bd3e7f7fb4628c82de8ae312750f.tar.gz tangerine-wallet-browser-78aa957e5ab5bd3e7f7fb4628c82de8ae312750f.tar.zst tangerine-wallet-browser-78aa957e5ab5bd3e7f7fb4628c82de8ae312750f.zip |
Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial
Diffstat (limited to 'ui/app/components/shapeshift-form.js')
-rw-r--r-- | ui/app/components/shapeshift-form.js | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js index e0a720426..76a265d63 100644 --- a/ui/app/components/shapeshift-form.js +++ b/ui/app/components/shapeshift-form.js @@ -2,7 +2,6 @@ const PersistentForm = require('../../lib/persistent-form') const h = require('react-hyperscript') const inherits = require('util').inherits const connect = require('react-redux').connect -const ReactCSSTransitionGroup = require('react-addons-css-transition-group') const actions = require('../actions') const Qr = require('./qr-code') const isValidAddress = require('../util').isValidAddress @@ -24,14 +23,7 @@ function ShapeshiftForm () { } ShapeshiftForm.prototype.render = function () { - return h(ReactCSSTransitionGroup, { - className: 'css-transition-group', - transitionName: 'main', - transitionEnterTimeout: 300, - transitionLeaveTimeout: 300, - }, [ - this.props.qrRequested ? h(Qr, {key: 'qr'}) : this.renderMain(), - ]) + return this.props.qrRequested ? h(Qr, {key: 'qr'}) : this.renderMain() } ShapeshiftForm.prototype.renderMain = function () { |