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

confirm screen: display address + back button logic in origin/destination screens

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-07-25 16:05:07 +02:00
commit 79d6b4d7ad
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/controllers/confirm.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, $ionicLoading, gettextCatalog, walletService, platformInfo, lodash, configService, $stateParams, $window, $state, $log, profileService, bitcore, bitcoreCash, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, bwcError, txConfirmNotification, externalLinkService, firebaseEventsService, soundService) { angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, $ionicLoading, gettextCatalog, walletService, platformInfo, lodash, configService, $stateParams, $window, $state, $log, profileService, bitcore, bitcoreCash, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, bitcoinCashJsService, bwcError, txConfirmNotification, externalLinkService, firebaseEventsService, soundService) {
var countDown = null; var countDown = null;
var FEE_TOO_HIGH_LIMIT_PER = 15; var FEE_TOO_HIGH_LIMIT_PER = 15;
@ -173,6 +173,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
setupTx(tx); setupTx(tx);
} }
} catch (e) { } catch (e) {
console.log(e);
var message = gettextCatalog.getString('Invalid address'); var message = gettextCatalog.getString('Invalid address');
popupService.showAlert(null, message, function () { popupService.showAlert(null, message, function () {
$ionicHistory.nextViewOptions({ $ionicHistory.nextViewOptions({
@ -187,7 +188,12 @@ angular.module('copayApp.controllers').controller('confirmController', function(
} }
}); });
var setupTx = function(networkName, data) { var setupTx = function(tx) {
if (tx.coin === 'bch') {
tx.displayAddress = bitcoinCashJsService.readAddress(tx.toAddress).cashaddr;
} else {
tx.displayAddress = entry.address;
}
// Other Scope vars // Other Scope vars
$scope.isCordova = isCordova; $scope.isCordova = isCordova;

7
src/js/controllers/sendFlowController.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('sendFlowController', function($scope, $rootScope, $state, $stateParams, $log, configService, gettextCatalog, profileService) { angular.module('copayApp.controllers').controller('sendFlowController', function($scope, $rootScope, $state, $stateParams, $log, $ionicHistory, configService, gettextCatalog, profileService) {
$scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {
var config = configService.getSync().wallet.settings; var config = configService.getSync().wallet.settings;
@ -60,4 +60,9 @@ angular.module('copayApp.controllers').controller('sendFlowController', function
} }
$state.transitionTo(getNextStep(), $scope.params); $state.transitionTo(getNextStep(), $scope.params);
}; };
$scope.goBack = function() {
$ionicHistory.goBack();
}
}); });