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

Merge branch 'wallet/sprint/16' into wallet/task/322

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-05-18 15:25:15 +09:00 • committed by GitHub
commit 397b782017
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 41 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
'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, externalLinkService) {
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, externalLinkService, bitcoinCashJsService) {
var HISTORY_SHOW_LIMIT = 10;
var currentTxHistoryPage = 0;
@ -31,6 +31,19 @@ angular.module('copayApp.controllers').controller('searchController', function($
var message = tx.message ? tx.message : '';
var comment = tx.note ? tx.note.body : '';
var addressTo = tx.addressTo ? tx.addressTo : '';
if ($scope.wallet.coin === 'bch') {
/**
* For each address
* I translate the legacy address and add in the searchable string the 3 kind of addresses
*/
lodash.each(tx.outputs, function(output) {
var addr = bitcoinCashJsService.translateAddresses(output.address);
addressTo += addr.legacy + addr.bitpay + 'bitcoincash:' + addr.cashaddr
});
}
var txid = tx.txid ? tx.txid : '';
return ((tx.amountStr + message + addressTo + addrbook + searchableDate + comment + txid).toString()).toLowerCase();
}