diff --git a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.html b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.html index df915c286..12386e30c 100644 --- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.html +++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.html @@ -16,6 +16,7 @@ Bid Boost Block + Pool Status Requested @@ -49,6 +50,16 @@ {{ acceleration.blockHeight }} ~ + + @if (acceleration.minedByPoolUniqueId && pools[acceleration.minedByPoolUniqueId]) { + + + {{ pools[acceleration.minedByPoolUniqueId].name }} + + } @else { + ~ + } + Pending Completed 🔄 diff --git a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.scss b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.scss index d4579bcf6..56c92ff02 100644 --- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.scss +++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.scss @@ -12,7 +12,7 @@ padding-bottom: 0px; } .container-xl.legacy { - max-width: 1140px; + max-width: 1200px; } .container-xl.widget-container { min-height: 335px; @@ -72,9 +72,25 @@ tr, td, th { .block { width: 15%; + @media (max-width: 900px) { + display: none; + } +} + +.pool { + width: 15%; + @media (max-width: 700px) { display: none; } + + .pool-logo { + width: 22px; + height: 22px; + position: relative; + top: -1px; + margin-right: 2px; + } } .status { diff --git a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts index c236032e2..5b2b30d7a 100644 --- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts +++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts @@ -1,11 +1,12 @@ import { Component, OnInit, ChangeDetectionStrategy, Input, ChangeDetectorRef, OnDestroy, Inject, LOCALE_ID } from '@angular/core'; import { BehaviorSubject, Observable, Subscription, catchError, filter, of, switchMap, tap, throttleTime } from 'rxjs'; -import { Acceleration, BlockExtended } from '../../../interfaces/node-api.interface'; +import { Acceleration, BlockExtended, SinglePoolStats } from '../../../interfaces/node-api.interface'; import { StateService } from '../../../services/state.service'; import { WebsocketService } from '../../../services/websocket.service'; import { ServicesApiServices } from '../../../services/services-api.service'; import { SeoService } from '../../../services/seo.service'; import { ActivatedRoute, Router } from '@angular/router'; +import { MiningService } from '../../../services/mining.service'; @Component({ selector: 'app-accelerations-list', @@ -30,11 +31,13 @@ export class AccelerationsListComponent implements OnInit, OnDestroy { keyNavigationSubscription: Subscription; dir: 'rtl' | 'ltr' = 'ltr'; paramSubscription: Subscription; + pools: { [id: number]: SinglePoolStats } = {}; constructor( private servicesApiService: ServicesApiServices, private websocketService: WebsocketService, public stateService: StateService, + private miningService: MiningService, private cd: ChangeDetectorRef, private seoService: SeoService, private route: ActivatedRoute, @@ -79,6 +82,12 @@ export class AccelerationsListComponent implements OnInit, OnDestroy { ).subscribe(() => { this.pageChange(this.page); }); + + this.miningService.getMiningStats('1m').subscribe(stats => { + for (const pool of stats.pools) { + this.pools[pool.poolUniqueId] = pool; + } + }); } this.skeletonLines = this.widget === true ? [...Array(6).keys()] : [...Array(15).keys()]; diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts index e8fb842ec..9a00faadc 100644 --- a/frontend/src/app/interfaces/node-api.interface.ts +++ b/frontend/src/app/interfaces/node-api.interface.ts @@ -408,6 +408,7 @@ export interface Acceleration { bidBoost?: number; boostCost?: number; boostRate?: number; + minedByPoolUniqueId?: number; } export interface AccelerationHistoryParams {