From d1fa3c6de16e5335ea9c21938029312df95c3d51 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Mon, 12 Jun 2017 14:37:32 -0700
Subject: [PATCH] only prefix ethereum address

---
 ui/app/components/qr-code.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/app/components/qr-code.js b/ui/app/components/qr-code.js
index ac40e9ced..06b9aed9b 100644
--- a/ui/app/components/qr-code.js
+++ b/ui/app/components/qr-code.js
@@ -3,6 +3,7 @@ const h = require('react-hyperscript')
 const qrCode = require('qrcode-npm').qrcode
 const inherits = require('util').inherits
 const connect = require('react-redux').connect
+const isHexPrefixed = require('ethereumjs-util').isHexPrefixed
 const CopyButton = require('./copyButton')
 
 module.exports = connect(mapStateToProps)(QrCodeView)
@@ -22,12 +23,12 @@ function QrCodeView () {
 }
 
 QrCodeView.prototype.render = function () {
-  var props = this.props
-  var Qr = props.Qr
-  var qrImage = qrCode(4, 'M')
-  qrImage.addData(`ethereum:${Qr.data}`)
+  const props = this.props
+  const Qr = props.Qr
+  const address = `${isHexPrefixed(Qr.data) ? 'ethereum:' : ''}${Qr.data}`
+  const qrImage = qrCode(4, 'M')
+  qrImage.addData(address)
   qrImage.make()
-
   return h('.main-container.flex-column', {
     key: 'qr',
     style: {