diff options
author | Csaba S <csaba.solya@gmail.com> | 2018-02-22 21:55:46 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-22 21:55:46 +0800 |
commit | 2f3463048685759319eb320c916cc7bc23a41649 (patch) | |
tree | e53ac24a1a127f1c684327bca00d23f51b56c542 /mascara/src/app/shapeshift-form/index.js | |
parent | 5ec311ba3e01bd9b0a9ff447fd7639d22a7b3d9c (diff) | |
parent | eed75735b8e90d121537249cf147c1ece60f1e47 (diff) | |
download | tangerine-wallet-browser-2f3463048685759319eb320c916cc7bc23a41649.tar.gz tangerine-wallet-browser-2f3463048685759319eb320c916cc7bc23a41649.tar.zst tangerine-wallet-browser-2f3463048685759319eb320c916cc7bc23a41649.zip |
Merge branch 'master' into edge-support
Diffstat (limited to 'mascara/src/app/shapeshift-form/index.js')
-rw-r--r-- | mascara/src/app/shapeshift-form/index.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mascara/src/app/shapeshift-form/index.js b/mascara/src/app/shapeshift-form/index.js index 15c7e95e1..53a63403a 100644 --- a/mascara/src/app/shapeshift-form/index.js +++ b/mascara/src/app/shapeshift-form/index.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import classnames from 'classnames' import {qrcode} from 'qrcode-npm' import {connect} from 'react-redux' |