diff --git a/src/app/clightning/home/channel-capacity-info/channel-capacity-info.component.html b/src/app/clightning/home/channel-capacity-info/channel-capacity-info.component.html index 1a0922fa..da427b1b 100644 --- a/src/app/clightning/home/channel-capacity-info/channel-capacity-info.component.html +++ b/src/app/clightning/home/channel-capacity-info/channel-capacity-info.component.html @@ -15,9 +15,7 @@
- - {{(channel.alias || channel.id) | slice:0:24}}{{(channel.alias || channel.id).length > 25 ? '...' : ''}} - + {{(channel.alias || channel.id) | slice:0:24}}{{(channel.alias || channel.id).length > 25 ? '...' : ''}}
Local:{{channel.msatoshi_to_us/1000 || 0 | number:'1.0-0'}} Sats diff --git a/src/app/clightning/home/channel-liquidity-info/channel-liquidity-info.component.html b/src/app/clightning/home/channel-liquidity-info/channel-liquidity-info.component.html index 446e2a47..c94e3b6f 100644 --- a/src/app/clightning/home/channel-liquidity-info/channel-liquidity-info.component.html +++ b/src/app/clightning/home/channel-liquidity-info/channel-liquidity-info.component.html @@ -8,9 +8,7 @@
- - {{(channel.alias || channel.id) | slice:0:24}}{{(channel.alias || channel.id).length > 25 ? '...' : ''}} - + {{(channel.alias || channel.id) | slice:0:24}}{{(channel.alias || channel.id).length > 25 ? '...' : ''}}
Capacity: {{channel.msatoshi_to_them/1000 || 0 | number:'1.0-0'}} Sats Capacity: {{channel.msatoshi_to_us/1000 || 0 | number:'1.0-0'}} Sats diff --git a/src/app/clightning/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts b/src/app/clightning/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts index b668b4e7..600d95da 100644 --- a/src/app/clightning/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts +++ b/src/app/clightning/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit, OnDestroy, ViewChild, AfterViewInit } from '@angular/core'; -import { Router } from '@angular/router'; import { Subject } from 'rxjs'; import { take, takeUntil } from 'rxjs/operators'; import { Store } from '@ngrx/store'; @@ -54,10 +53,9 @@ export class CLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDes public errorMessage = ''; public apiCallStatus: ApiCallStatusPayload = null; public apiCallStatusEnum = APICallStatusEnum; - public channelId = null; private unSubs: Array> = [new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject()]; - constructor(private logger: LoggerService, private store: Store, private rtlEffects: RTLEffects, private clEffects: CLEffects, private commonService: CommonService, private router: Router) { + constructor(private logger: LoggerService, private store: Store, private rtlEffects: RTLEffects, private clEffects: CLEffects, private commonService: CommonService) { this.screenSize = this.commonService.getScreenSize(); if (this.screenSize === ScreenSizeEnum.XS) { this.flgSticky = false; @@ -72,7 +70,6 @@ export class CLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDes this.flgSticky = true; this.displayedColumns = ['short_channel_id', 'alias', 'msatoshi_to_us', 'msatoshi_to_them', 'balancedness', 'actions']; } - this.channelId = this.router.getCurrentNavigation().extras?.state?.channelId; } ngOnInit() { @@ -96,11 +93,6 @@ export class CLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDes } this.logger.info(channelsSeletor); }); - - if (this.channelId) { - this.selFilter = this.channelId; - this.applyFilter(); - } } ngAfterViewInit() { diff --git a/src/app/eclair/home/channel-capacity-info/channel-capacity-info.component.html b/src/app/eclair/home/channel-capacity-info/channel-capacity-info.component.html index aca750dd..260025be 100644 --- a/src/app/eclair/home/channel-capacity-info/channel-capacity-info.component.html +++ b/src/app/eclair/home/channel-capacity-info/channel-capacity-info.component.html @@ -15,9 +15,7 @@
- - {{(channel?.alias || channel?.shortChannelId) | slice:0:24}}{{(channel?.alias || channel?.shortChannelId).length > 25 ? '...' : ''}} - + {{(channel?.alias || channel?.shortChannelId) | slice:0:24}}{{(channel?.alias || channel?.shortChannelId).length > 25 ? '...' : ''}}
Local:{{channel?.toLocal || 0 | number:'1.0-0'}} Sats diff --git a/src/app/eclair/home/channel-liquidity-info/channel-liquidity-info.component.html b/src/app/eclair/home/channel-liquidity-info/channel-liquidity-info.component.html index bd194909..510b1383 100644 --- a/src/app/eclair/home/channel-liquidity-info/channel-liquidity-info.component.html +++ b/src/app/eclair/home/channel-liquidity-info/channel-liquidity-info.component.html @@ -8,9 +8,7 @@
- - {{(channel.alias || channel.shortChannelId) | slice:0:24}}{{(channel.alias || channel.shortChannelId).length > 25 ? '...' : ''}} - + {{(channel.alias || channel.shortChannelId) | slice:0:24}}{{(channel.alias || channel.shortChannelId).length > 25 ? '...' : ''}}
Capacity: {{channel.toRemote || 0 | number:'1.0-0'}} Sats Capacity: {{channel.toLocal || 0 | number:'1.0-0'}} Sats diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts index 5b1221ab..6a3e0aeb 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit, OnDestroy, ViewChild, AfterViewInit } from '@angular/core'; -import { Router } from '@angular/router'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { Store } from '@ngrx/store'; @@ -52,10 +51,9 @@ export class ECLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe public errorMessage = ''; public apiCallStatus: ApiCallStatusPayload = null; public apiCallStatusEnum = APICallStatusEnum; - public channelId = null; private unSubs: Array> = [new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject()]; - constructor(private logger: LoggerService, private store: Store, private rtlEffects: RTLEffects, private commonService: CommonService, private router: Router) { + constructor(private logger: LoggerService, private store: Store, private rtlEffects: RTLEffects, private commonService: CommonService) { this.screenSize = this.commonService.getScreenSize(); if (this.screenSize === ScreenSizeEnum.XS) { this.flgSticky = false; @@ -70,7 +68,6 @@ export class ECLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe this.flgSticky = true; this.displayedColumns = ['shortChannelId', 'alias', 'feeBaseMsat', 'feeProportionalMillionths', 'toLocal', 'toRemote', 'balancedness', 'actions']; } - this.channelId = this.router.getCurrentNavigation().extras?.state?.channelId; } ngOnInit() { @@ -99,11 +96,6 @@ export class ECLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe subscribe((ocBalSelector: { onchainBalance: OnChainBalance, apiCallStatus: ApiCallStatusPayload }) => { this.totalBalance = ocBalSelector.onchainBalance.total; }); - - if (this.channelId) { - this.selFilter = this.channelId; - this.applyFilter(); - } } ngAfterViewInit() { diff --git a/src/app/lnd/home/channel-capacity-info/channel-capacity-info.component.html b/src/app/lnd/home/channel-capacity-info/channel-capacity-info.component.html index 1328bb32..741b87f1 100644 --- a/src/app/lnd/home/channel-capacity-info/channel-capacity-info.component.html +++ b/src/app/lnd/home/channel-capacity-info/channel-capacity-info.component.html @@ -15,9 +15,7 @@
- - {{(channel.remote_alias || channel.remote_pubkey) | slice:0:24}}{{(channel.remote_alias || channel.remote_pubkey).length > 25 ? '...' : ''}} - + {{(channel.remote_alias || channel.remote_pubkey) | slice:0:24}}{{(channel.remote_alias || channel.remote_pubkey).length > 25 ? '...' : ''}}
Local:{{channel.local_balance || 0 | number}} Sats diff --git a/src/app/lnd/home/channel-liquidity-info/channel-liquidity-info.component.html b/src/app/lnd/home/channel-liquidity-info/channel-liquidity-info.component.html index 6d921fc8..6839bcfd 100644 --- a/src/app/lnd/home/channel-liquidity-info/channel-liquidity-info.component.html +++ b/src/app/lnd/home/channel-liquidity-info/channel-liquidity-info.component.html @@ -7,9 +7,7 @@
- - {{(channel.remote_alias || channel.remote_pubkey) | slice:0:24}}{{(channel.remote_alias || channel.remote_pubkey).length > 25 ? '...' : ''}} - + {{(channel.remote_alias || channel.remote_pubkey) | slice:0:24}}{{(channel.remote_alias || channel.remote_pubkey).length > 25 ? '...' : ''}}
Capacity: {{channel.remote_balance || 0 | number}} Sats
diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts index ca5917de..8ae39b87 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit, OnDestroy, ViewChild, AfterViewInit } from '@angular/core'; -import { Router } from '@angular/router'; import { DecimalPipe } from '@angular/common'; import { Subject } from 'rxjs'; import { take, takeUntil } from 'rxjs/operators'; @@ -63,10 +62,9 @@ export class ChannelOpenTableComponent implements OnInit, AfterViewInit, OnDestr public errorMessage = ''; public apiCallStatus: ApiCallStatusPayload = null; public apiCallStatusEnum = APICallStatusEnum; - public channelId = null; private unSubs: Array> = [new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject()]; - constructor(private logger: LoggerService, private store: Store, private lndEffects: LNDEffects, private commonService: CommonService, private rtlEffects: RTLEffects, private decimalPipe: DecimalPipe, private loopService: LoopService, private router: Router) { + constructor(private logger: LoggerService, private store: Store, private lndEffects: LNDEffects, private commonService: CommonService, private rtlEffects: RTLEffects, private decimalPipe: DecimalPipe, private loopService: LoopService) { this.screenSize = this.commonService.getScreenSize(); if (this.screenSize === ScreenSizeEnum.XS) { this.flgSticky = false; @@ -81,7 +79,6 @@ export class ChannelOpenTableComponent implements OnInit, AfterViewInit, OnDestr this.flgSticky = true; this.displayedColumns = ['remote_alias', 'uptime', 'total_satoshis_sent', 'total_satoshis_received', 'local_balance', 'remote_balance', 'balancedness', 'actions']; } - this.channelId = this.router.getCurrentNavigation().extras?.state?.channelId; } ngOnInit() { @@ -123,11 +120,6 @@ export class ChannelOpenTableComponent implements OnInit, AfterViewInit, OnDestr if (this.channelsData.length > 0) { this.loadChannelsTable(this.channelsData); } - - if (this.channelId) { - this.selFilter = this.channelId; - this.applyFilter(); - } } onViewRemotePolicy(selChannel: Channel) {