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

Fixes for CashAddr, includes validation of address, adds cashaddr to search string next to legacy address

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-05-16 13:50:25 +02:00 • committed by Sebastiaan Pasma
commit 31f50ad0cb
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/js/controllers/modals/search.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('searchController', function($scope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicScrollDelegate, bwcError, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService) { angular.module('copayApp.controllers').controller('searchController', function($scope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicScrollDelegate, bwcError, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService, bitcoinCashJsService) {
var HISTORY_SHOW_LIMIT = 10; var HISTORY_SHOW_LIMIT = 10;
var currentTxHistoryPage = 0; var currentTxHistoryPage = 0;
@ -29,7 +29,16 @@ angular.module('copayApp.controllers').controller('searchController', function($
var message = tx.message ? tx.message : ''; var message = tx.message ? tx.message : '';
var comment = tx.note ? tx.note.body : ''; var comment = tx.note ? tx.note.body : '';
var addressTo = tx.addressTo ? tx.addressTo : ''; var addressTo = tx.addressTo ? tx.addressTo : '';
if (tx.amountUnitStr === 'BCH' && addressTo) addressTo = 'bitcoincash:'+addressTo;
if ($scope.wallet.coin === 'bch' && addressTo) {
try {
var addr = bitcoinCashJsService.readAddress(addressTo);
if (addr !== null) addressTo = addressTo + ' bitcoincash:'+addr.cashaddr;
} catch (e) {
$log.debug(addressTo+' not a valid address.. continuing..');
}
}
var txid = tx.txid ? tx.txid : ''; var txid = tx.txid ? tx.txid : '';
return ((tx.amountStr + message + addressTo + addrbook + searchableDate + comment + txid).toString()).toLowerCase(); return ((tx.amountStr + message + addressTo + addrbook + searchableDate + comment + txid).toString()).toLowerCase();
} }