diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-02-22 07:46:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 07:46:31 +0800 |
| commit | eed75735b8e90d121537249cf147c1ece60f1e47 (patch) | |
| tree | c7cfc9bea782df7035761caa8c1809d8fde58824 /mascara/src/app/shapeshift-form/index.js | |
| parent | 16754fa30744df8b3b3edc0e5229db29f3ad23ec (diff) | |
| parent | e27a3823ba2595baa7c3378e6a6f2aa5dae30250 (diff) | |
| download | tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.tar.gz tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.tar.zst tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.zip | |
Merge pull request #3050 from MetaMask/uat
[EPIC] Merge UAT into master
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' |