diff --git a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.ts b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.ts index 5d45aad0..f2d85fec 100644 --- a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.ts +++ b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.ts @@ -19,7 +19,7 @@ import { openAlert } from '../../../store/rtl.actions'; import { fetchTransactions } from '../../store/ecl.actions'; import { eclPageSettings, transactions } from '../../store/ecl.selector'; import { ColumnDefinition, PageSettings, TableSetting } from '../../../shared/models/pageSettings'; -import { CamelCaseWithReplacePipe } from '../../../shared/pipes/app.pipe'; +import { CamelCaseWithSpacesPipe } from '../../../shared/pipes/app.pipe'; @Component({ selector: 'rtl-ecl-on-chain-transaction-history', @@ -51,7 +51,7 @@ export class ECLOnChainTransactionHistoryComponent implements OnInit, OnDestroy public apiCallStatusEnum = APICallStatusEnum; private unSubs: Array> = [new Subject(), new Subject(), new Subject()]; - constructor(private logger: LoggerService, private commonService: CommonService, private store: Store, private datePipe: DatePipe, private camelCaseWithReplace: CamelCaseWithReplacePipe) { + constructor(private logger: LoggerService, private commonService: CommonService, private store: Store, private datePipe: DatePipe, private camelCaseWithSpaces: CamelCaseWithSpacesPipe) { this.screenSize = this.commonService.getScreenSize(); } @@ -95,7 +95,7 @@ export class ECLOnChainTransactionHistoryComponent implements OnInit, OnDestroy getLabel(column: string) { const returnColumn: ColumnDefinition = this.nodePageDefs[this.PAGE_ID][this.tableSetting.tableId].allowedColumns.find((col) => col.column === column); - return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithReplace.transform(returnColumn.column, '_') : this.commonService.titleCase(column); + return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithSpaces.transform(returnColumn.column, '_') : this.commonService.titleCase(column); } setFilterPredicate() { diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.ts b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.ts index 23833a23..f0c7407c 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.ts +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.ts @@ -20,7 +20,7 @@ import { RTLState } from '../../../../../store/rtl.state'; import { closeChannel } from '../../../../store/ecl.actions'; import { allChannelsInfo, eclNodeInformation, eclPageSettings, onchainBalance, peers } from '../../../../store/ecl.selector'; import { ColumnDefinition, PageSettings, TableSetting } from '../../../../../shared/models/pageSettings'; -import { CamelCaseWithReplacePipe } from '../../../../../shared/pipes/app.pipe'; +import { CamelCaseWithSpacesPipe } from '../../../../../shared/pipes/app.pipe'; @Component({ selector: 'rtl-ecl-channel-inactive-table', @@ -59,7 +59,7 @@ export class ECLChannelInactiveTableComponent implements OnInit, AfterViewInit, public apiCallStatusEnum = APICallStatusEnum; private unSubs: Array> = [new Subject(), new Subject(), 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 camelCaseWithReplace: CamelCaseWithReplacePipe) { + constructor(private logger: LoggerService, private store: Store, private rtlEffects: RTLEffects, private commonService: CommonService, private camelCaseWithSpaces: CamelCaseWithSpacesPipe) { this.screenSize = this.commonService.getScreenSize(); } @@ -162,7 +162,7 @@ export class ECLChannelInactiveTableComponent implements OnInit, AfterViewInit, getLabel(column: string) { const returnColumn: ColumnDefinition = this.nodePageDefs[this.PAGE_ID][this.tableSetting.tableId].allowedColumns.find((col) => col.column === column); - return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithReplace.transform(returnColumn.column, '_') : column === 'announceChannel' ? 'Private' : this.commonService.titleCase(column); + return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithSpaces.transform(returnColumn.column, '_') : column === 'announceChannel' ? 'Private' : this.commonService.titleCase(column); } setFilterPredicate() { 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 d0d90a7e..ceff038c 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 @@ -21,7 +21,7 @@ import { RTLState } from '../../../../../store/rtl.state'; import { closeChannel, updateChannel } from '../../../../store/ecl.actions'; import { allChannelsInfo, eclNodeInformation, eclPageSettings, onchainBalance, peers } from '../../../../store/ecl.selector'; import { ColumnDefinition, PageSettings, TableSetting } from '../../../../../shared/models/pageSettings'; -import { CamelCaseWithReplacePipe } from '../../../../../shared/pipes/app.pipe'; +import { CamelCaseWithSpacesPipe } from '../../../../../shared/pipes/app.pipe'; @Component({ selector: 'rtl-ecl-channel-open-table', @@ -60,7 +60,7 @@ export class ECLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe public apiCallStatusEnum = APICallStatusEnum; 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 rtlEffects: RTLEffects, private commonService: CommonService, private router: Router, private camelCaseWithReplace: CamelCaseWithReplacePipe) { + constructor(private logger: LoggerService, private store: Store, private rtlEffects: RTLEffects, private commonService: CommonService, private router: Router, private camelCaseWithSpaces: CamelCaseWithSpacesPipe) { this.screenSize = this.commonService.getScreenSize(); this.selFilter = this.router.getCurrentNavigation()?.extras?.state?.filter ? this.router.getCurrentNavigation()?.extras?.state?.filter : ''; } @@ -232,7 +232,7 @@ export class ECLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe getLabel(column: string) { const returnColumn: ColumnDefinition = this.nodePageDefs[this.PAGE_ID][this.tableSetting.tableId].allowedColumns.find((col) => col.column === column); - return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithReplace.transform(returnColumn.column, '_') : column === 'announceChannel' ? 'Private' : this.commonService.titleCase(column); + return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithSpaces.transform(returnColumn.column, '_') : column === 'announceChannel' ? 'Private' : this.commonService.titleCase(column); } setFilterPredicate() { diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts index dfd0f092..b9b450b3 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts @@ -19,7 +19,7 @@ import { openAlert } from '../../../../../store/rtl.actions'; import { RTLState } from '../../../../../store/rtl.state'; import { allChannelsInfo, eclNodeInformation, eclPageSettings, onchainBalance, peers } from '../../../../store/ecl.selector'; import { ColumnDefinition, PageSettings, TableSetting } from '../../../../../shared/models/pageSettings'; -import { CamelCaseWithReplacePipe } from '../../../../../shared/pipes/app.pipe'; +import { CamelCaseWithSpacesPipe } from '../../../../../shared/pipes/app.pipe'; @Component({ @@ -59,7 +59,7 @@ export class ECLChannelPendingTableComponent implements OnInit, AfterViewInit, O public apiCallStatusEnum = APICallStatusEnum; private unSubs: Array> = [new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject()]; - constructor(private logger: LoggerService, private store: Store, private commonService: CommonService, private camelCaseWithReplace: CamelCaseWithReplacePipe) { + constructor(private logger: LoggerService, private store: Store, private commonService: CommonService, private camelCaseWithSpaces: CamelCaseWithSpacesPipe) { this.screenSize = this.commonService.getScreenSize(); } @@ -132,7 +132,7 @@ export class ECLChannelPendingTableComponent implements OnInit, AfterViewInit, O getLabel(column: string) { const returnColumn: ColumnDefinition = this.nodePageDefs[this.PAGE_ID][this.tableSetting.tableId].allowedColumns.find((col) => col.column === column); - return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithReplace.transform(returnColumn.column, '_') : column === 'announceChannel' ? 'Private' : this.commonService.titleCase(column); + return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithSpaces.transform(returnColumn.column, '_') : column === 'announceChannel' ? 'Private' : this.commonService.titleCase(column); } setFilterPredicate() { diff --git a/src/app/eclair/peers-channels/peers/peers.component.ts b/src/app/eclair/peers-channels/peers/peers.component.ts index 8bbce62d..bf6d7966 100644 --- a/src/app/eclair/peers-channels/peers/peers.component.ts +++ b/src/app/eclair/peers-channels/peers/peers.component.ts @@ -23,7 +23,7 @@ import { openAlert, openConfirmation } from '../../../store/rtl.actions'; import { disconnectPeer } from '../../store/ecl.actions'; import { eclNodeInformation, eclPageSettings, onchainBalance, peers } from '../../store/ecl.selector'; import { ColumnDefinition, PageSettings, TableSetting } from '../../../shared/models/pageSettings'; -import { CamelCaseWithReplacePipe } from '../../../shared/pipes/app.pipe'; +import { CamelCaseWithSpacesPipe } from '../../../shared/pipes/app.pipe'; @Component({ selector: 'rtl-ecl-peers', @@ -60,7 +60,7 @@ export class ECLPeersComponent implements OnInit, AfterViewInit, OnDestroy { public apiCallStatusEnum = APICallStatusEnum; private unSubs: Array> = [new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject()]; - constructor(private logger: LoggerService, private store: Store, private rtlEffects: RTLEffects, private actions: Actions, private commonService: CommonService, private camelCaseWithReplace: CamelCaseWithReplacePipe) { + constructor(private logger: LoggerService, private store: Store, private rtlEffects: RTLEffects, private actions: Actions, private commonService: CommonService, private camelCaseWithSpaces: CamelCaseWithSpacesPipe) { this.screenSize = this.commonService.getScreenSize(); } @@ -209,7 +209,7 @@ export class ECLPeersComponent implements OnInit, AfterViewInit, OnDestroy { getLabel(column: string) { const returnColumn: ColumnDefinition = this.nodePageDefs[this.PAGE_ID][this.tableSetting.tableId].allowedColumns.find((col) => col.column === column); - return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithReplace.transform(returnColumn.column, '_') : this.commonService.titleCase(column); + return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithSpaces.transform(returnColumn.column, '_') : this.commonService.titleCase(column); } setFilterPredicate() { diff --git a/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts b/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts index 145661d9..7a125bd9 100644 --- a/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts +++ b/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts @@ -17,7 +17,7 @@ import { RTLState } from '../../../store/rtl.state'; import { openAlert } from '../../../store/rtl.actions'; import { eclPageSettings, payments } from '../../store/ecl.selector'; import { ColumnDefinition, PageSettings, TableSetting } from '../../../shared/models/pageSettings'; -import { CamelCaseWithReplacePipe } from '../../../shared/pipes/app.pipe'; +import { CamelCaseWithSpacesPipe } from '../../../shared/pipes/app.pipe'; @Component({ selector: 'rtl-ecl-forwarding-history', @@ -50,7 +50,7 @@ export class ECLForwardingHistoryComponent implements OnInit, OnChanges, AfterVi public apiCallStatusEnum = APICallStatusEnum; private unSubs: Array> = [new Subject(), new Subject(), new Subject()]; - constructor(private logger: LoggerService, private commonService: CommonService, private store: Store, private datePipe: DatePipe, private camelCaseWithReplace: CamelCaseWithReplacePipe) { + constructor(private logger: LoggerService, private commonService: CommonService, private store: Store, private datePipe: DatePipe, private camelCaseWithSpaces: CamelCaseWithSpacesPipe) { this.screenSize = this.commonService.getScreenSize(); } @@ -148,7 +148,7 @@ export class ECLForwardingHistoryComponent implements OnInit, OnChanges, AfterVi getLabel(column: string) { const returnColumn: ColumnDefinition = this.nodePageDefs[this.pageId][this.tableSetting.tableId].allowedColumns.find((col) => col.column === column); - return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithReplace.transform(returnColumn.column, '_') : this.commonService.titleCase(column); + return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithSpaces.transform(returnColumn.column) : this.commonService.titleCase(column); } setFilterPredicate() { diff --git a/src/app/eclair/routing/routing-peers/routing-peers.component.ts b/src/app/eclair/routing/routing-peers/routing-peers.component.ts index 1a710e2d..08bef9c0 100644 --- a/src/app/eclair/routing/routing-peers/routing-peers.component.ts +++ b/src/app/eclair/routing/routing-peers/routing-peers.component.ts @@ -15,7 +15,7 @@ import { CommonService } from '../../../shared/services/common.service'; import { RTLState } from '../../../store/rtl.state'; import { eclPageSettings, payments } from '../../store/ecl.selector'; import { ColumnDefinition, PageSettings, TableSetting } from '../../../shared/models/pageSettings'; -import { CamelCaseWithReplacePipe } from '../../../shared/pipes/app.pipe'; +import { CamelCaseWithSpacesPipe } from '../../../shared/pipes/app.pipe'; @Component({ selector: 'rtl-ecl-routing-peers', @@ -52,7 +52,7 @@ export class ECLRoutingPeersComponent implements OnInit, AfterViewInit, OnDestro public apiCallStatusEnum = APICallStatusEnum; private unSubs: Array> = [new Subject(), new Subject(), new Subject()]; - constructor(private logger: LoggerService, private commonService: CommonService, private store: Store, private camelCaseWithReplace: CamelCaseWithReplacePipe) { + constructor(private logger: LoggerService, private commonService: CommonService, private store: Store, private camelCaseWithSpaces: CamelCaseWithSpacesPipe) { this.screenSize = this.commonService.getScreenSize(); } @@ -105,7 +105,7 @@ export class ECLRoutingPeersComponent implements OnInit, AfterViewInit, OnDestro getLabel(column: string) { const returnColumn: ColumnDefinition = this.nodePageDefs[this.PAGE_ID][this.tableSetting.tableId].allowedColumns.find((col) => col.column === column); - return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithReplace.transform(returnColumn.column, '_') : this.commonService.titleCase(column); + return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithSpaces.transform(returnColumn.column, '_') : this.commonService.titleCase(column); } setFilterPredicate() { diff --git a/src/app/eclair/transactions/invoices/lightning-invoices.component.ts b/src/app/eclair/transactions/invoices/lightning-invoices.component.ts index 1dcf1086..b4adc966 100644 --- a/src/app/eclair/transactions/invoices/lightning-invoices.component.ts +++ b/src/app/eclair/transactions/invoices/lightning-invoices.component.ts @@ -24,7 +24,7 @@ import { openAlert } from '../../../store/rtl.actions'; import { createInvoice, invoiceLookup } from '../../store/ecl.actions'; import { eclNodeInformation, eclNodeSettings, eclPageSettings, invoices } from '../../store/ecl.selector'; import { ColumnDefinition, PageSettings, TableSetting } from '../../../shared/models/pageSettings'; -import { CamelCaseWithReplacePipe } from '../../../shared/pipes/app.pipe'; +import { CamelCaseWithSpacesPipe } from '../../../shared/pipes/app.pipe'; @Component({ selector: 'rtl-ecl-lightning-invoices', @@ -67,7 +67,7 @@ export class ECLLightningInvoicesComponent implements OnInit, AfterViewInit, OnD public apiCallStatusEnum = APICallStatusEnum; private unSubs: Array> = [new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject(), new Subject()]; - constructor(private logger: LoggerService, private store: Store, private decimalPipe: DecimalPipe, private commonService: CommonService, private datePipe: DatePipe, private actions: Actions, private camelCaseWithReplace: CamelCaseWithReplacePipe) { + constructor(private logger: LoggerService, private store: Store, private decimalPipe: DecimalPipe, private commonService: CommonService, private datePipe: DatePipe, private actions: Actions, private camelCaseWithSpaces: CamelCaseWithSpacesPipe) { this.screenSize = this.commonService.getScreenSize(); } @@ -183,7 +183,7 @@ export class ECLLightningInvoicesComponent implements OnInit, AfterViewInit, OnD getLabel(column: string) { const returnColumn: ColumnDefinition = this.nodePageDefs[this.PAGE_ID][this.tableSetting.tableId].allowedColumns.find((col) => col.column === column); - return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithReplace.transform(returnColumn.column, '_') : this.commonService.titleCase(column); + return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithSpaces.transform(returnColumn.column, '_') : this.commonService.titleCase(column); } setFilterPredicate() { diff --git a/src/app/eclair/transactions/payments/lightning-payments.component.ts b/src/app/eclair/transactions/payments/lightning-payments.component.ts index abcc167e..67cf8601 100644 --- a/src/app/eclair/transactions/payments/lightning-payments.component.ts +++ b/src/app/eclair/transactions/payments/lightning-payments.component.ts @@ -25,7 +25,7 @@ import { openAlert, openConfirmation } from '../../../store/rtl.actions'; import { sendPayment } from '../../store/ecl.actions'; import { eclNodeInformation, eclNodeSettings, eclPageSettings, payments } from '../../store/ecl.selector'; import { ColumnDefinition, PageSettings, TableSetting } from '../../../shared/models/pageSettings'; -import { CamelCaseWithReplacePipe } from '../../../shared/pipes/app.pipe'; +import { CamelCaseWithSpacesPipe } from '../../../shared/pipes/app.pipe'; @Component({ selector: 'rtl-ecl-lightning-payments', @@ -67,7 +67,7 @@ export class ECLLightningPaymentsComponent implements OnInit, AfterViewInit, OnD public apiCallStatusEnum = APICallStatusEnum; 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 commonService: CommonService, private store: Store, private rtlEffects: RTLEffects, private decimalPipe: DecimalPipe, private dataService: DataService, private datePipe: DatePipe, private camelCaseWithReplace: CamelCaseWithReplacePipe) { + constructor(private logger: LoggerService, private commonService: CommonService, private store: Store, private rtlEffects: RTLEffects, private decimalPipe: DecimalPipe, private dataService: DataService, private datePipe: DatePipe, private camelCaseWithSpaces: CamelCaseWithSpacesPipe) { this.screenSize = this.commonService.getScreenSize(); } @@ -127,7 +127,7 @@ export class ECLLightningPaymentsComponent implements OnInit, AfterViewInit, OnD getLabel(column: string) { const returnColumn: ColumnDefinition = this.nodePageDefs[this.PAGE_ID][this.tableSetting.tableId].allowedColumns.find((col) => col.column === column); - return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithReplace.transform(returnColumn.column, '_') : this.commonService.titleCase(column); + return returnColumn ? returnColumn.label ? returnColumn.label : this.camelCaseWithSpaces.transform(returnColumn.column, '_') : this.commonService.titleCase(column); } setFilterPredicate() {