machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parse TXID, hash or address strings from search bar and allow searching for TXID:OUTPUT. (#578)

Browse Source 
fixes #450
fixes #415
This commit is contained in:
softsimon
2021-07-06 19:43:18 +03:00
committed by GitHub
parent 1e9f131a2a
commit 2e2e6aa01f
5 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
frontend/src/app/components/search-form/search-form.component.ts
View File

@@ -23,9 +23,9 @@ export class SearchFormComponent implements OnInit {
searchForm: FormGroup;
@Output() searchTriggered = new EventEmitter();
regexAddress = /^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[bB]?[a-z]{2,5}1[ac-hj-np-z02-9]{8,87})$/;
regexBlockhash = /^[0]{8}[a-fA-F0-9]{56}$/;
regexTransaction = /^[a-fA-F0-9]{64}$/;
regexAddress = /([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[bB]?[a-z]{2,5}1[ac-hj-np-z02-9]{8,87})/;
regexBlockhash = /[0]{8}[a-fA-F0-9]{56}/;
regexTransaction = /([a-fA-F0-9]{64}):?(\d+)?/;
regexBlockheight = /^[0-9]+$/;
@ViewChild('instance', {static: true}) instance: NgbTypeahead;
@@ -96,21 +96,26 @@ export class SearchFormComponent implements OnInit {
if (searchText) {
this.isSearching = true;
if (this.regexAddress.test(searchText)) {
this.navigate('/address/', searchText);
} else if (this.regexBlockhash.test(searchText) || this.regexBlockheight.test(searchText)) {
const matches = this.regexAddress.exec(searchText);
this.navigate('/address/', matches[0]);
} else if (this.regexBlockhash.test(searchText)) {
const matches = this.regexBlockhash.exec(searchText);
this.navigate('/block/', matches[0]);
} else if (this.regexBlockheight.test(searchText)) {
this.navigate('/block/', searchText);
} else if (this.regexTransaction.test(searchText)) {
const matches = this.regexTransaction.exec(searchText);
if (this.network === 'liquid') {
if (this.assets[searchText]) {
this.navigate('/asset/', searchText);
if (this.assets[matches[0]]) {
this.navigate('/asset/', matches[0]);
}
this.electrsApiService.getAsset$(searchText)
this.electrsApiService.getAsset$(matches[0])
.subscribe(
() => { this.navigate('/asset/', searchText); },
() => { this.navigate('/tx/', searchText); }
() => { this.navigate('/asset/', matches[0]); },
() => { this.navigate('/tx/', matches[0]); }
);
} else {
this.navigate('/tx/', searchText);
this.navigate('/tx/', matches[0]);
}
} else {
this.isSearching = false;