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

Search result fix when Lightning not enabled

Browse Source
This commit is contained in:
softsimon 2022-07-06 16:21:14 +02:00
parent 850060cc07
commit 1f2254681a
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,12 @@ export class SearchFormComponent implements OnInit {
} }
]); ]);
} }
if (!this.stateService.env.LIGHTNING) {
return zip(
this.electrsApiService.getAddressesByPrefix$(text).pipe(catchError(() => of([]))),
[{ nodes: [], channels: [] }]
);
}
return zip( return zip(
this.electrsApiService.getAddressesByPrefix$(text).pipe(catchError(() => of([]))), this.electrsApiService.getAddressesByPrefix$(text).pipe(catchError(() => of([]))),
this.apiService.lightningSearch$(text).pipe(catchError(() => of({ this.apiService.lightningSearch$(text).pipe(catchError(() => of({

2
frontend/src/app/components/search-form/search-results/search-results.component.html
View File

@ -1,6 +1,6 @@
<div class="dropdown-menu show" *ngIf="results" [hidden]="!results.addresses.length && !results.nodes.length && !results.channels.length"> <div class="dropdown-menu show" *ngIf="results" [hidden]="!results.addresses.length && !results.nodes.length && !results.channels.length">
<ng-template [ngIf]="results.addresses.length"> <ng-template [ngIf]="results.addresses.length">
<div class="card-title">Bitcoin Addresses</div> <div class="card-title" *ngIf="stateService.env.LIGHTNING">Bitcoin Addresses</div>
<ng-template ngFor [ngForOf]="results.addresses" let-address let-i="index"> <ng-template ngFor [ngForOf]="results.addresses" let-address let-i="index">
<button (click)="clickItem(i)" [class.active]="i === activeIdx" type="button" role="option" class="dropdown-item"> <button (click)="clickItem(i)" [class.active]="i === activeIdx" type="button" role="option" class="dropdown-item">
<ngb-highlight [result]="address | shortenString : isMobile ? 25 : 36" [term]="searchTerm"></ngb-highlight> <ngb-highlight [result]="address | shortenString : isMobile ? 25 : 36" [term]="searchTerm"></ngb-highlight>

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

@ -1,4 +1,5 @@
import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
import { StateService } from 'src/app/services/state.service';
@Component({ @Component({
selector: 'app-search-results', selector: 'app-search-results',
@ -15,7 +16,7 @@ export class SearchResultsComponent implements OnChanges {
activeIdx = 0; activeIdx = 0;
focusFirst = true; focusFirst = true;
constructor() { } constructor(public stateService: StateService) { }
ngOnChanges() { ngOnChanges() {
this.activeIdx = 0; this.activeIdx = 0;