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

Fix state pop on the send flow

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-09 13:14:44 +09:00
commit 0ea97fc1c6
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -398,7 +398,6 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
}
function goBack() {
sendFlowService.popState();
$ionicHistory.goBack();
}

16
src/js/controllers/walletSelectorController.js
View file

@ -7,9 +7,16 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
var unitDecimals = 0;
var unitsFromSatoshis = 0;
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.$on("$ionicView.beforeEnter", onBeforeEnter);
$scope.$on("$ionicView.enter", onEnter);
function onBeforeEnter(event, data) {
console.log('walletSelector onBeforeEnter sendflow', sendFlowService.getState());
if (data.direction == "back") {
sendFlowService.popState();
}
var stateParams = sendFlowService.getState();
var config = configService.getSync().wallet.settings;
@ -51,9 +58,9 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
if ($scope.params.thirdParty) {
$scope.thirdParty = $scope.params.thirdParty;
}
});
};
$scope.$on("$ionicView.enter", function(event, data) {
function onEnter (event, data) {
configService.whenAvailable(function(config) {
$scope.selectedPriceDisplay = config.wallet.settings.priceDisplay;
});
@ -65,7 +72,7 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
prepareWalletLists();
formatRequestedAmount();
});
};
function formatRequestedAmount() {
if ($scope.params.amount) {
@ -197,7 +204,6 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
};
$scope.goBack = function() {
sendFlowService.popState();
$ionicHistory.goBack();
}