From b5f503463b55378f52f0f90adad4079bcbe1f5f3 Mon Sep 17 00:00:00 2001 From: michaelftout Date: Sat, 23 Feb 2019 19:54:57 -0800 Subject: [PATCH] Fix Agama QR Code reading and change version numbers --- package-lock.json | 2 +- package.json | 2 +- src/containers/VerusPay.js | 20 +++++++++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8563b08e..1fb6ff79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "verusmobile", - "version": "0.1.1-beta", + "version": "0.1.2-beta", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bc6db353..50a580fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "verusmobile", - "version": "0.1.1-beta", + "version": "0.1.2-beta", "private": true, "scripts": { "start": "meteor run", diff --git a/src/containers/VerusPay.js b/src/containers/VerusPay.js index e35412c4..2cbb2d9f 100644 --- a/src/containers/VerusPay.js +++ b/src/containers/VerusPay.js @@ -21,6 +21,7 @@ import { } from '../actions/actionCreators' import Spinner from 'react-native-loading-spinner-overlay'; import AlertAsync from "react-native-alert-async"; +import { coinsToSats } from '../utils/math' const FORMAT_UNKNOWN = "QR Data format unrecognized" const ADDRESS_ONLY = "Only address detected, please fill out amount field" @@ -72,6 +73,17 @@ class VerusPay extends Component { this.handleVerusQR(resultParsed) } else { //TODO: Handle other style QR codes here + if (resultParsed.address && resultParsed.amount && resultParsed.coin) { + let resultConverted = { + coinTicker: resultParsed.coin, + amount: coinsToSats(resultParsed.amount), + address: resultParsed.address + } + + this.handleVerusQR(resultConverted) + } else { + this.errorHandler(FORMAT_UNKNOWN) + } } } else { if (result.length < 34 || result.length > 35 ) { @@ -102,7 +114,13 @@ class VerusPay extends Component { console.log("Amount: " + amount) console.log("Memo: " + memo) - if (coinTicker && address && amount && address.length >= 34 && address.length <= 35) { + if ( + coinTicker && + address && + amount && + address.length >= 34 && + address.length <= 35 && + amount > 0) { if (this.coinExistsInWallet(coinTicker)) { let activeCoin = this.getCoinFromActiveCoins(coinTicker)