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

thirdParty updates + shapeshift screens + merged with review transaction

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-08-02 15:15:23 +02:00
commit 01dd774fae
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
8 changed files with 187 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,7 +86,6 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
$state.transitionTo('tabs.send.origin', {
amount: amount,
toAddress: addr,
displayAddress: originalAddress ? originalAddress : addr,
description: message,
coin: coin
});
@ -109,6 +108,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
// params['thirdParty']['minShapeshiftAmount'] = serviceData.minAmount;
// params['thirdParty']['maxShapeshiftAmount'] = serviceData.maxAmount;
// params['thirdParty']['shapeshiftOrderId'] = serviceData.orderId;
params['thirdParty'] = JSON.stringify(params['thirdParty']);
$state.transitionTo('tabs.send.amount', params);
} else {
$state.transitionTo('tabs.send.origin', params);