diff --git a/frontend/src/app/components/asset/asset.component.ts b/frontend/src/app/components/asset/asset.component.ts index ecb216052..e57bbee7a 100644 --- a/frontend/src/app/components/asset/asset.component.ts +++ b/frontend/src/app/components/asset/asset.component.ts @@ -63,6 +63,7 @@ export class AssetComponent implements OnInit, OnDestroy { .pipe( switchMap((params: ParamMap) => { this.error = undefined; + this.imageError = false; this.isLoadingAsset = true; this.loadedConfirmedTxCount = 0; this.asset = null; diff --git a/frontend/src/app/components/assets/asset-group/asset-group.component.ts b/frontend/src/app/components/assets/asset-group/asset-group.component.ts index 0143121b5..29cb10dc7 100644 --- a/frontend/src/app/components/assets/asset-group/asset-group.component.ts +++ b/frontend/src/app/components/assets/asset-group/asset-group.component.ts @@ -32,9 +32,8 @@ export class AssetGroupComponent implements OnInit { const items = []; // @ts-ignore for (const item of group.assets) { - items.push(assets[item]); + items.push(assets.objects[item]); } - console.log(group); return { group: group, assets: items diff --git a/frontend/src/app/components/assets/assets-featured/assets-featured.component.html b/frontend/src/app/components/assets/assets-featured/assets-featured.component.html index bb5ab7f3c..937ca8113 100644 --- a/frontend/src/app/components/assets/assets-featured/assets-featured.component.html +++ b/frontend/src/app/components/assets/assets-featured/assets-featured.component.html @@ -1,6 +1,6 @@
-
+
diff --git a/frontend/src/app/components/assets/assets-featured/assets-featured.component.ts b/frontend/src/app/components/assets/assets-featured/assets-featured.component.ts index 23c84679b..db16a8f2b 100644 --- a/frontend/src/app/components/assets/assets-featured/assets-featured.component.ts +++ b/frontend/src/app/components/assets/assets-featured/assets-featured.component.ts @@ -1,8 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { combineLatest, Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { Observable } from 'rxjs'; import { ApiService } from 'src/app/services/api.service'; -import { AssetsService } from 'src/app/services/assets.service'; @Component({ selector: 'app-assets-featured', @@ -14,21 +12,10 @@ export class AssetsFeaturedComponent implements OnInit { constructor( private apiService: ApiService, - private assetsService: AssetsService, ) { } ngOnInit(): void { - this.featuredAssets$ = combineLatest([ - this.assetsService.getAssetsJson$, - this.apiService.listFeaturedAssets$(), - ]).pipe( - map(([assetsJson, featured]) => { - return { - assetsJson: assetsJson, - featured: featured, - }; - }) - ); + this.featuredAssets$ = this.apiService.listFeaturedAssets$(); } } diff --git a/frontend/src/app/components/assets/assets-nav/assets-nav.component.ts b/frontend/src/app/components/assets/assets-nav/assets-nav.component.ts index d7280d50b..ac8dded67 100644 --- a/frontend/src/app/components/assets/assets-nav/assets-nav.component.ts +++ b/frontend/src/app/components/assets/assets-nav/assets-nav.component.ts @@ -39,6 +39,7 @@ export class AssetsNavComponent implements OnInit { ) { } ngOnInit(): void { + this.seoService.setTitle($localize`:@@ee8f8008bae6ce3a49840c4e1d39b4af23d4c263:Assets`); this.typeaheadSearchFn = this.typeaheadSearch; this.searchForm = this.formBuilder.group({ @@ -62,13 +63,12 @@ export class AssetsNavComponent implements OnInit { return this.assetsService.getAssetsJson$.pipe( map((assets) => { if (searchText.length ) { - const filteredAssets = assets.filter((asset) => asset.name.toLowerCase().indexOf(searchText.toLowerCase()) > -1 + const filteredAssets = assets.array.filter((asset) => asset.name.toLowerCase().indexOf(searchText.toLowerCase()) > -1 || (asset.ticker || '').toLowerCase().indexOf(searchText.toLowerCase()) > -1 || (asset.entity && asset.entity.domain || '').toLowerCase().indexOf(searchText.toLowerCase()) > -1); - assets = filteredAssets; return filteredAssets.slice(0, this.itemsPerPage); } else { - return assets.slice(0, this.itemsPerPage); + return assets.array.slice(0, this.itemsPerPage); } }) ) diff --git a/frontend/src/app/components/assets/assets.component.ts b/frontend/src/app/components/assets/assets.component.ts index 542765033..b6a8a8f1b 100644 --- a/frontend/src/app/components/assets/assets.component.ts +++ b/frontend/src/app/components/assets/assets.component.ts @@ -49,7 +49,7 @@ export class AssetsComponent implements OnInit { .pipe( take(1), switchMap(([assets, qp]) => { - this.assets = assets; + this.assets = assets.array; return this.route.queryParams .pipe( diff --git a/frontend/src/app/services/assets.service.ts b/frontend/src/app/services/assets.service.ts index d5693abf8..9454ef7e2 100644 --- a/frontend/src/app/services/assets.service.ts +++ b/frontend/src/app/services/assets.service.ts @@ -12,7 +12,7 @@ import { AssetExtended } from '../interfaces/electrs.interface'; export class AssetsService { nativeAssetId = this.stateService.network === 'liquidtestnet' ? environment.nativeTestAssetId : environment.nativeAssetId; - getAssetsJson$: Observable; + getAssetsJson$: Observable<{ array: AssetExtended[]; objects: any}>; getAssetsMinimalJson$: Observable; getMiningPools$: Observable; @@ -47,7 +47,10 @@ export class AssetsService { }); } - return assets.sort((a: any, b: any) => a.name.localeCompare(b.name)); + return { + objects: rawAssets, + array: assets.sort((a: any, b: any) => a.name.localeCompare(b.name)), + }; }), shareReplay(1), );