diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index 4dd8c4474..38c51977c 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -182,7 +182,7 @@ Miner - + {{ block.extras.pool.name }} diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html index a60e1db0a..ddb87eae0 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html @@ -61,7 +61,7 @@
- + {{ block.extras.pool.name}}
diff --git a/frontend/src/app/components/blocks-list/blocks-list.component.html b/frontend/src/app/components/blocks-list/blocks-list.component.html index d82472492..84c9ffcee 100644 --- a/frontend/src/app/components/blocks-list/blocks-list.component.html +++ b/frontend/src/app/components/blocks-list/blocks-list.component.html @@ -32,15 +32,13 @@
- + {{ block.extras.pool.name }} {{ block.extras.coinbaseRaw | hex2ascii }}
- + {{ block.extras.pool.name }} {{ block.extras.coinbaseRaw | hex2ascii }}
diff --git a/frontend/src/app/components/blocks-list/blocks-list.component.ts b/frontend/src/app/components/blocks-list/blocks-list.component.ts index 5270ee7be..5eb0cff88 100644 --- a/frontend/src/app/components/blocks-list/blocks-list.component.ts +++ b/frontend/src/app/components/blocks-list/blocks-list.component.ts @@ -126,12 +126,6 @@ export class BlocksList implements OnInit { this.lastBlockHeight = Math.max(...blocks.map(o => o.height)); }), map(blocks => { - if (this.stateService.env.BASE_MODULE === 'mempool') { - for (const block of blocks) { - // @ts-ignore: Need to add an extra field for the template - block.extras.pool.logo = `/resources/mining-pools/` + block.extras.pool.slug + '.svg'; - } - } if (this.widget) { return blocks.slice(0, 6); } diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html index 7600797cb..09835e104 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html @@ -102,7 +102,7 @@ {{ pool.rank }} - + {{ pool.name }} {{ pool.lastEstimatedHashrate | number: '1.2-2' }} {{ diff --git a/frontend/src/app/components/pool/pool.component.html b/frontend/src/app/components/pool/pool.component.html index b74ecdf81..67e8f08b3 100644 --- a/frontend/src/app/components/pool/pool.component.html +++ b/frontend/src/app/components/pool/pool.component.html @@ -5,8 +5,7 @@
- +

{{ poolStats.pool.name }}

diff --git a/frontend/src/app/components/search-form/search-results/search-results.component.html b/frontend/src/app/components/search-form/search-results/search-results.component.html index 400b9a1c3..22414d5ae 100644 --- a/frontend/src/app/components/search-form/search-results/search-results.component.html +++ b/frontend/src/app/components/search-form/search-results/search-results.component.html @@ -47,7 +47,7 @@
Mining Pools
diff --git a/frontend/src/app/components/search-form/search-results/search-results.component.scss b/frontend/src/app/components/search-form/search-results/search-results.component.scss index 569407b00..55edf5189 100644 --- a/frontend/src/app/components/search-form/search-results/search-results.component.scss +++ b/frontend/src/app/components/search-form/search-results/search-results.component.scss @@ -26,11 +26,3 @@ .active { background-color: var(--active-bg); } - -.pool-logo { - width: 15px; - height: 15px; - position: relative; - top: -1px; - margin-right: 10px; -} diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index 557bc1b14..9d8c3eeac 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -677,7 +677,7 @@ @if (pool) { - + {{ pool.name }} diff --git a/frontend/src/app/shared/components/pool-logo/pool-logo.component.html b/frontend/src/app/shared/components/pool-logo/pool-logo.component.html new file mode 100644 index 000000000..e91939289 --- /dev/null +++ b/frontend/src/app/shared/components/pool-logo/pool-logo.component.html @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/frontend/src/app/shared/components/pool-logo/pool-logo.component.scss b/frontend/src/app/shared/components/pool-logo/pool-logo.component.scss new file mode 100644 index 000000000..0bd4d25e6 --- /dev/null +++ b/frontend/src/app/shared/components/pool-logo/pool-logo.component.scss @@ -0,0 +1,6 @@ +.pool-logo { + position: relative; + overflow: hidden; + opacity: 0; + color: transparent; +} \ No newline at end of file diff --git a/frontend/src/app/shared/components/pool-logo/pool-logo.component.ts b/frontend/src/app/shared/components/pool-logo/pool-logo.component.ts new file mode 100644 index 000000000..c0c838abd --- /dev/null +++ b/frontend/src/app/shared/components/pool-logo/pool-logo.component.ts @@ -0,0 +1,26 @@ +import { Component, ElementRef, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core'; +import { nextTick } from 'process'; + +@Component({ + selector: 'app-pool-logo', + templateUrl: './pool-logo.component.html', + styleUrls: ['./pool-logo.component.scss'] +}) +export class PoolLogoComponent implements OnChanges{ + @Input() pool: { slug: string, name: string }; + @Input() width: number = 15; + @Input() height: number = 15; + + @ViewChild('poolImg') img: ElementRef; + + ngOnChanges(changes: SimpleChanges): void { + if (changes.pool) { + if (this.img?.nativeElement) { + this.img.nativeElement.style.opacity = '0'; + setTimeout(() => { + this.img.nativeElement.style.opacity = '1'; + }, 50); + } + } + } +} diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts index 313a43e1f..dc70d524f 100644 --- a/frontend/src/app/shared/shared.module.ts +++ b/frontend/src/app/shared/shared.module.ts @@ -88,6 +88,7 @@ import { BtcComponent } from './components/btc/btc.component'; import { FeeRateComponent } from './components/fee-rate/fee-rate.component'; import { AddressTypeComponent } from './components/address-type/address-type.component'; import { TruncateComponent } from './components/truncate/truncate.component'; +import { PoolLogoComponent } from './components/pool-logo/pool-logo.component'; import { SearchResultsComponent } from '../components/search-form/search-results/search-results.component'; import { TimestampComponent } from './components/timestamp/timestamp.component'; import { ConfirmationsComponent } from './components/confirmations/confirmations.component'; @@ -201,6 +202,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir FeeRateComponent, AddressTypeComponent, TruncateComponent, + PoolLogoComponent, SearchResultsComponent, TimestampComponent, ConfirmationsComponent, @@ -340,6 +342,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir FeeRateComponent, AddressTypeComponent, TruncateComponent, + PoolLogoComponent, SearchResultsComponent, TimestampComponent, ConfirmationsComponent,