diff --git a/src/js/controllers/modals/search.js b/src/js/controllers/modals/search.js index 12899deaf..082ef52cc 100644 --- a/src/js/controllers/modals/search.js +++ b/src/js/controllers/modals/search.js @@ -52,10 +52,14 @@ angular.module('copayApp.controllers').controller('searchController', function($ return lodash.includes(tx.searcheableString, search.toLowerCase()); }); - if (search && (search.indexOf('bitcoincash:') >= 0 || search[0] === 'C' || search[0] === 'H' || search[0] === 'p' || search[0] === 'q') && search.replace('bitcoincash:', '').length === 42) { - $scope.searchTermIsAddress = true; - } else if (search && search.lengh === 64) { - $scope.searchTermIsTxId = true; + if (search) { + if ((search.indexOf('bitcoincash:') >= 0 || search[0] === 'C' || search[0] === 'H' || search[0] === 'p' || search[0] === 'q') && search.replace('bitcoincash:', '').length === 42) { // CashAddr + $scope.searchTermIsAddress = true; + } else if ((search[0] === "1" || search[0] === "3" || search.substring(0, 3) === "bc1") && search.length >= 26 && search.length <= 35) { // Legacy Addresses + $scope.searchTermIsAddress = true; + } else if (search.lengh === 64) { + $scope.searchTermIsTxId = true; + } } if ($scope.filteredTxHistory.length > HISTORY_SHOW_LIMIT) $scope.txHistoryShowMore = true; @@ -87,7 +91,7 @@ angular.module('copayApp.controllers').controller('searchController', function($ }; $scope.searchOnBlockchain = function(searchTerm) { - var url = 'https://explorer.bitcoin.com/bch/search/' + searchTerm; + var url = 'https://explorer.bitcoin.com/'+$scope.wallet.coin+'/search/' + searchTerm; var optIn = true; var title = null; var message = gettextCatalog.getString('Search on Explorer.Bitcoin.com'); diff --git a/www/views/modals/search.html b/www/views/modals/search.html index efa3f84f7..877173e73 100644 --- a/www/views/modals/search.html +++ b/www/views/modals/search.html @@ -4,7 +4,7 @@ Close
- Search Transactions + Search Transactions ({{wallet.coin}})
@@ -23,18 +23,10 @@ {{'No results found'|translate}}
- -
-
- -
-
-