From 6c0cf4d62231531843be19201091fbb7f56dac0f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Wed, 26 Sep 2018 21:35:30 +0200 Subject: [PATCH 1/2] Add a link to shapeshift in case it doesn't work --- src/js/controllers/review.controller.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js index 67a4164c8..40fe81eba 100644 --- a/src/js/controllers/review.controller.js +++ b/src/js/controllers/review.controller.js @@ -6,7 +6,7 @@ angular .module('copayApp.controllers') .controller('reviewController', reviewController); - function reviewController(addressbookService, bitcoinCashJsService, bitcore, bitcoreCash, bwcError, clipboardService, configService, feeService, gettextCatalog, $interval, $ionicHistory, $ionicModal, ionicToast, lodash, $log, ongoingProcess, platformInfo, popupService, profileService, $scope, sendFlowService, shapeshiftService, soundService, $state, $timeout, txConfirmNotification, txFormatService, walletService) { + function reviewController(addressbookService, externalLinkService, bitcoinCashJsService, bitcore, bitcoreCash, bwcError, clipboardService, configService, feeService, gettextCatalog, $interval, $ionicHistory, $ionicModal, ionicToast, lodash, $log, ongoingProcess, platformInfo, popupService, profileService, $scope, sendFlowService, shapeshiftService, soundService, $state, $timeout, txConfirmNotification, txFormatService, walletService) { var vm = this; vm.buttonText = ''; @@ -105,8 +105,12 @@ angular if (err) { // Error stop here ongoingProcess.set('connectingShapeshift', false); - popupService.showAlert(gettextCatalog.getString('Shapeshift Error'), err.toString(), function onAlert() { - $ionicHistory.goBack(); + popupService.showConfirm(gettextCatalog.getString('Shapeshift Error'), err.toString(), gettextCatalog.getString('Open') + " Shapeshift", gettextCatalog.getString('Go Back'), function onConfirm(hasConfirm) { + if (hasConfirm) { + externalLinkService.open("https://shapeshift.io"); + } else { + $ionicHistory.goBack(); + } }); } else { _next(data); From dd61e72bcfaac15b2b9e66c0c12f8021e609e421 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Wed, 26 Sep 2018 21:42:35 +0200 Subject: [PATCH 2/2] Fix go back anyway --- src/js/controllers/review.controller.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js index 40fe81eba..c4923a5f4 100644 --- a/src/js/controllers/review.controller.js +++ b/src/js/controllers/review.controller.js @@ -108,9 +108,8 @@ angular popupService.showConfirm(gettextCatalog.getString('Shapeshift Error'), err.toString(), gettextCatalog.getString('Open') + " Shapeshift", gettextCatalog.getString('Go Back'), function onConfirm(hasConfirm) { if (hasConfirm) { externalLinkService.open("https://shapeshift.io"); - } else { - $ionicHistory.goBack(); } + $ionicHistory.goBack(); }); } else { _next(data);