anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix incomingData, expires different depending on btc or bch (bitpay...)

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-07 14:02:53 +09:00
commit a9711c2575
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/services/incomingData.js
View file

@ -400,12 +400,14 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
var toAddr = payProData.toAddress; var toAddr = payProData.toAddress;
var amount = payProData.amount; var amount = payProData.amount;
var paymentUrl = payProData.url; var paymentUrl = payProData.url;
var expires = payProData.expires
if (coin === 'bch') { if (coin === 'bch') {
var displayAddr = payProData.outputs[0].address; var displayAddr = payProData.outputs[0].address;
toAddr = bitcoinCashJsService.readAddress('bitcoincash:' + displayAddr).legacy; toAddr = bitcoinCashJsService.readAddress('bitcoincash:' + displayAddr).legacy;
amount = payProData.outputs[0].amount; amount = payProData.outputs[0].amount;
paymentUrl = payProData.paymentUrl; paymentUrl = payProData.paymentUrl;
expires = Math.floor(new Date(expires).getTime() / 1000)
} }
var name = payProData.domain; var name = payProData.domain;
@ -419,7 +421,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
caTrusted: true, caTrusted: true,
name: name, name: name,
domain: payProData.domain, domain: payProData.domain,
expires: Math.floor(new Date(payProData.expires).getTime() / 1000), expires: expires,
memo: payProData.memo, memo: payProData.memo,
network: 'livenet', network: 'livenet',
requiredFeeRate: payProData.requiredFeeRate, requiredFeeRate: payProData.requiredFeeRate,