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

Adds bitcoin cash basic support (unit convertion, integrations, request specific amount, etc)

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-08-24 17:02:49 -03:00
commit 94363704ab
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
24 changed files with 376 additions and 302 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ angular.module('copayApp.controllers').controller('customAmountController', func
showErrorAndBack('Error', 'No wallet selected');
return;
}
$scope.showShareButton = platformInfo.isCordova ? (platformInfo.isIOS ? 'iOS' : 'Android') : null;
$scope.wallet = profileService.getWallet(walletId);
@ -25,11 +25,13 @@ angular.module('copayApp.controllers').controller('customAmountController', func
showErrorAndBack('Error', 'Could not get the address');
return;
}
$scope.address = addr;
$scope.chain = (data.stateParams.chain).toLowerCase();
var parsedAmount = txFormatService.parseAmount(
data.stateParams.amount,
$scope.wallet,
data.stateParams.amount,
data.stateParams.currency);
// Amount in USD or BTC
@ -37,16 +39,16 @@ angular.module('copayApp.controllers').controller('customAmountController', func
var currency = parsedAmount.currency;
$scope.amountUnitStr = parsedAmount.amountUnitStr;
if (currency != 'BTC') {
// Convert to BTC
if (currency != 'BTC' && currency != 'BCH') {
// Convert to BTC or BCH
var config = configService.getSync().wallet.settings;
var amountUnit = txFormatService.satToUnit(parsedAmount.amountSat);
var btcParsedAmount = txFormatService.parseAmount(amountUnit, config.unitName);
var btcParsedAmount = txFormatService.parseAmount($scope.wallet, amountUnit, $scope.wallet.chain);
$scope.amountBtc = btcParsedAmount.amount;
$scope.altAmountStr = btcParsedAmount.amountUnitStr;
} else {
$scope.amountBtc = amount; // BTC
$scope.amountBtc = amount; // BTC or BCH
$scope.altAmountStr = txFormatService.formatAlternativeStr(parsedAmount.amountSat);
}
});
@ -66,7 +68,7 @@ angular.module('copayApp.controllers').controller('customAmountController', func
}
$scope.copyToClipboard = function() {
return 'bitcoin:' + $scope.address + '?amount=' + $scope.amountBtc;
return 'bitcoin:' + $scope.address + '?amount=' + $scope.amountBtc + '&chain=' + $scope.chain;
};
});