@@ -69,14 +69,14 @@
diff --git a/src/app/lnd/routing/routing-peers/routing-peers.component.ts b/src/app/lnd/routing/routing-peers/routing-peers.component.ts
index 5a12c869..aff3648e 100644
--- a/src/app/lnd/routing/routing-peers/routing-peers.component.ts
+++ b/src/app/lnd/routing/routing-peers/routing-peers.component.ts
@@ -71,7 +71,7 @@ export class RoutingPeersComponent implements OnInit, AfterViewInit, OnDestroy {
this.displayedColumns = JSON.parse(JSON.stringify(this.tableSetting.columnSelection));
}
this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE;
- this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem';
+ this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / (this.displayedColumns.length * 2)) / 10) + 'rem' : '20rem';
this.logger.info(this.displayedColumns);
});
this.store.select(forwardingHistory).pipe(takeUntil(this.unSubs[1])).
@@ -125,11 +125,11 @@ export class RoutingPeersComponent implements OnInit, AfterViewInit, OnDestroy {
}
applyFilterIncoming() {
- this.routingPeersIncoming.filter = this.filterIn.toLowerCase();
+ this.routingPeersIncoming.filter = this.filterIn.trim().toLowerCase();
}
applyFilterOutgoing() {
- this.routingPeersOutgoing.filter = this.filterOut.toLowerCase();
+ this.routingPeersOutgoing.filter = this.filterOut.trim().toLowerCase();
}
getLabel(column: string) {
diff --git a/src/app/lnd/transactions/invoices/lightning-invoices.component.ts b/src/app/lnd/transactions/invoices/lightning-invoices.component.ts
index 434d8cfd..0d8192b1 100644
--- a/src/app/lnd/transactions/invoices/lightning-invoices.component.ts
+++ b/src/app/lnd/transactions/invoices/lightning-invoices.component.ts
@@ -209,7 +209,7 @@ export class LightningInvoicesComponent implements OnInit, AfterViewInit, OnDest
break;
default:
- rowToFilter = typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString();
+ rowToFilter = !rowData[this.selFilterBy] ? '' : typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString();
break;
}
return (this.selFilterBy === 'is_keysend' || this.selFilterBy === 'is_amp') ? rowToFilter.indexOf(fltr) === 0 : rowToFilter.includes(fltr);
diff --git a/src/app/lnd/transactions/payments/lightning-payments.component.ts b/src/app/lnd/transactions/payments/lightning-payments.component.ts
index 4fe59b7d..1e246f03 100644
--- a/src/app/lnd/transactions/payments/lightning-payments.component.ts
+++ b/src/app/lnd/transactions/payments/lightning-payments.component.ts
@@ -466,7 +466,7 @@ export class LightningPaymentsComponent implements OnInit, AfterViewInit, OnDest
break;
default:
- rowToFilter = typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString();
+ rowToFilter = !rowData[this.selFilterBy] ? '' : typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString();
break;
}
return rowToFilter.includes(fltr);
diff --git a/src/app/shared/components/ln-services/boltz/swaps/swaps.component.ts b/src/app/shared/components/ln-services/boltz/swaps/swaps.component.ts
index 73f4ec56..f1c6f948 100755
--- a/src/app/shared/components/ln-services/boltz/swaps/swaps.component.ts
+++ b/src/app/shared/components/ln-services/boltz/swaps/swaps.component.ts
@@ -133,7 +133,7 @@ export class BoltzSwapsComponent implements OnInit, AfterViewInit, OnChanges, On
break;
default:
- rowToFilter = typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString();
+ rowToFilter = !rowData[this.selFilterBy] ? '' : typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString();
break;
}
return this.selFilterBy === 'status' ? rowToFilter.indexOf(fltr) === 0 : rowToFilter.includes(fltr);
diff --git a/src/app/shared/components/ln-services/loop/swaps/swaps.component.ts b/src/app/shared/components/ln-services/loop/swaps/swaps.component.ts
index 91c026c8..ebf65362 100755
--- a/src/app/shared/components/ln-services/loop/swaps/swaps.component.ts
+++ b/src/app/shared/components/ln-services/loop/swaps/swaps.component.ts
@@ -115,7 +115,7 @@ export class SwapsComponent implements OnInit, AfterViewInit, OnChanges, OnDestr
break;
default:
- rowToFilter = typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString();
+ rowToFilter = !rowData[this.selFilterBy] ? '' : typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString();
break;
}
return this.selFilterBy === 'state' ? rowToFilter.indexOf(fltr) === 0 : rowToFilter.includes(fltr);
diff --git a/src/app/shared/components/transactions-report-table/transactions-report-table.component.ts b/src/app/shared/components/transactions-report-table/transactions-report-table.component.ts
index 2adf8107..3c8c35ee 100644
--- a/src/app/shared/components/transactions-report-table/transactions-report-table.component.ts
+++ b/src/app/shared/components/transactions-report-table/transactions-report-table.component.ts
@@ -68,6 +68,7 @@ export class TransactionsReportTableComponent implements OnInit, AfterViewInit,
this.loadTransactionsTable(this.dataList);
}
if (changes.selFilter && !changes.selFilter.firstChange) {
+ this.selFilterBy = 'all';
this.applyFilter();
}
}
@@ -115,7 +116,7 @@ export class TransactionsReportTableComponent implements OnInit, AfterViewInit,
break;
default:
- rowToFilter = typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString();
+ rowToFilter = !rowData[this.selFilterBy] ? '' : typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString();
break;
}
return rowToFilter.includes(fltr);