aboutsummaryrefslogtreecommitdiffstats
path: root/mascara
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2019-02-26 03:10:13 +0800
committerWhymarrh Whitby <whymarrh.whitby@gmail.com>2019-02-26 03:10:13 +0800
commitf507f2a92710285679123c9429a37c9e330c7cac (patch)
tree30225a55e9d8fc273304f4e2548413a08f008aef /mascara
parentfdc7eb211340b3af035a7f7c023155a8f1b1675d (diff)
downloadtangerine-wallet-browser-f507f2a92710285679123c9429a37c9e330c7cac.tar
tangerine-wallet-browser-f507f2a92710285679123c9429a37c9e330c7cac.tar.gz
tangerine-wallet-browser-f507f2a92710285679123c9429a37c9e330c7cac.tar.bz2
tangerine-wallet-browser-f507f2a92710285679123c9429a37c9e330c7cac.tar.lz
tangerine-wallet-browser-f507f2a92710285679123c9429a37c9e330c7cac.tar.xz
tangerine-wallet-browser-f507f2a92710285679123c9429a37c9e330c7cac.tar.zst
tangerine-wallet-browser-f507f2a92710285679123c9429a37c9e330c7cac.zip
Feature Flag + Mobile Sync (#5955)
Diffstat (limited to 'mascara')
-rw-r--r--mascara/src/app/buy-ether-widget/index.js2
-rw-r--r--mascara/src/app/shapeshift-form/index.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/mascara/src/app/buy-ether-widget/index.js b/mascara/src/app/buy-ether-widget/index.js
index c60221a0a..c8530ba4c 100644
--- a/mascara/src/app/buy-ether-widget/index.js
+++ b/mascara/src/app/buy-ether-widget/index.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
import PropTypes from 'prop-types'
import classnames from 'classnames'
import {connect} from 'react-redux'
-import {qrcode} from 'qrcode-npm'
+import {qrcode} from 'qrcode-generator'
import copyToClipboard from 'copy-to-clipboard'
import ShapeShiftForm from '../shapeshift-form'
import {buyEth, showAccountDetail} from '../../../../ui/app/actions'
diff --git a/mascara/src/app/shapeshift-form/index.js b/mascara/src/app/shapeshift-form/index.js
index 6f3307487..fe7f7ffcb 100644
--- a/mascara/src/app/shapeshift-form/index.js
+++ b/mascara/src/app/shapeshift-form/index.js
@@ -1,7 +1,7 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import classnames from 'classnames'
-import {qrcode} from 'qrcode-npm'
+import qrcode from 'qrcode-generator'
import {connect} from 'react-redux'
import {shapeShiftSubview, pairUpdate, buyWithShapeShift} from '../../../../ui/app/actions'
import {isValidAddress} from '../../../../ui/app/util'