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

fixed request specific amount

Browse source
This commit is contained in:
Kadir Sekha 2018-01-15 17:45:06 +09:00
commit 404a694c55
3 changed files with 50 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/js/controllers/customAmount.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('customAmountController', function($scope, $ionicHistory, txFormatService, platformInfo, configService, profileService, walletService, popupService) {
angular.module('copayApp.controllers').controller('customAmountController', function($scope, $ionicHistory, txFormatService, platformInfo, configService, profileService, walletService, popupService, bitcoinCashJsService) {
var showErrorAndBack = function(title, msg) {
popupService.showAlert(title, msg, function() {
@ -32,7 +32,20 @@ angular.module('copayApp.controllers').controller('customAmountController', func
return;
}
$scope.address = addr;
$scope.bchAddressType = 'cashaddr';
var bchAddresses = {};
if ($scope.wallet.coin == 'bch') {
bchAddresses = bitcoinCashJsService.translateAddresses(addr);
$scope.address = bchAddresses[$scope.bchAddressType];
} else {
$scope.address = addr;
}
$scope.displayAddress = function(type) {
$scope.bchAddressType = type;
$scope.address = bchAddresses[$scope.bchAddressType];
}
$scope.coin = data.stateParams.coin;
var parsedAmount = txFormatService.parseAmount(
@ -76,9 +89,11 @@ angular.module('copayApp.controllers').controller('customAmountController', func
}
$scope.copyToClipboard = function() {
var protocol = 'bitcoin';
if ($scope.wallet.coin == 'bch') protocol += 'cash';
return protocol + ':' + $scope.address + '?amount=' + $scope.amountBtc;
var protocol = '';
if ($scope.wallet.coin == 'bch' && $scope.bchAddressType == 'cashaddr') {
protocol = 'bitcoincash:';
}
return protocol + $scope.address + '?amount=' + $scope.amountBtc;
};
});