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

Merge branch 'wallet/task/537' of https://github.com/Bitcoin-com/Wallet into wallet/task/537

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-09 13:15:29 +09:00
commit a964b2d967
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/controllers/review.controller.js
View file

@ -88,11 +88,9 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
coin = vm.originWallet.coin; coin = vm.originWallet.coin;
if (sendFlowData.thirdParty) { if (sendFlowData.thirdParty) {
// vm.thirdParty = JSON.parse(sendFlowData.thirdParty); // Parse stringified JSON-object vm.thirdParty = sendFlowData.thirdParty;
if (vm.thirdParty) { handleThirdPartyInitIfBip70();
handleThirdPartyInitIfBip70(); handleThirdPartyInitIfShapeshift();
handleThirdPartyInitIfShapeshift();
}
} }
configService.get(function onConfig(err, configCache) { configService.get(function onConfig(err, configCache) {

2
src/js/controllers/shapeshift.js
View file

@ -69,6 +69,8 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
} }
}; };
// Starting new send flow, so ensure everything is reset
sendFlowService.clear();
$state.go('tabs.home').then(function() { $state.go('tabs.home').then(function() {
$ionicHistory.clearHistory(); $ionicHistory.clearHistory();
$state.go('tabs.send').then(function() { $state.go('tabs.send').then(function() {