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

routes, renames and flow

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-07-23 16:58:32 +02:00
commit 3604ee3c3c
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
9 changed files with 160 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
// Timeout is required to enable the "Back" button
$timeout(function() {
if (amount) {
$state.transitionTo('tabs.send.confirm', {
$state.transitionTo('tabs.send.origin', {
toAmount: amount,
toAddress: addr,
displayAddress: originalAddress ? originalAddress : addr,
@ -102,8 +102,10 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
params['minShapeshiftAmount'] = shapeshiftData.minAmount;
params['maxShapeshiftAmount'] = shapeshiftData.maxAmount;
params['shapeshiftOrderId'] = shapeshiftData.orderId;
$state.transitionTo('tabs.send.amount', params);
} else {
$state.transitionTo('tabs.send.origin', params);
}
$state.transitionTo('tabs.send.amount', params);
}
}, 100);
}