Merge pull request #2661 from blockchain/feat/FWLT-682-handle-QR-scan

feat(qr scan): improved way of scanning coinbase QR from ETH
blockchain · Sep 15, 2020 · 0f0fb54 · 0f0fb54
2 parents f06e585 + e5a6698
commit 0f0fb54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/QRCodeCapture/index.js b/packages/blockchain-wallet-v4-frontend/src/components/QRCodeCapture/index.js
@@ -146,7 +146,8 @@ class QRCodeCaptureContainer extends React.PureComponent {
     }
   }
 
-  handleScanEthAddress (data) {
+  handleScanEthAddress (inputAddress) {
+    const data = utils.eth.sanitazeEth(inputAddress)
     if (utils.eth.isValidAddress(data)) {
       this.props.formActions.change(ETH_FORM, 'to', this.createNewValue(data))
     } else {

diff --git a/packages/blockchain-wallet-v4/src/utils/eth.ts b/packages/blockchain-wallet-v4/src/utils/eth.ts
@@ -106,3 +106,5 @@ export const convertFeeToWei = fees => ({
     max: convertGweiToWei(path(['limits', 'max'], fees))
   }
 })
+
+export const sanitazeEth = (data: string) => data.replace(/.*:/, '')