From 2e54ba92acb49784fbc7e50bb07fe3d08d3b2785 Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Fri, 28 Oct 2022 09:41:38 -0700 Subject: [PATCH] Fixed grid paddings --- backend/controllers/cln/offers.js | 2 +- backend/models/database.model.js | 3 + backend/utils/database.js | 84 +++++++++++++++---- server/controllers/cln/offers.ts | 4 +- server/models/database.model.ts | 4 + server/utils/database.ts | 84 +++++++++++++++---- .../cln/graph/lookups/lookups.component.scss | 4 - .../node-lookup/node-lookup.component.html | 4 +- .../query-routes/query-routes.component.html | 24 +++--- .../liquidity-ads-list.component.html | 36 ++++---- .../utxo-tables/utxos/utxos.component.html | 6 +- .../channel-open-table.component.html | 56 ++++++------- .../channel-pending-table.component.html | 48 +++++------ .../peers-channels/peers/peers.component.html | 12 +-- .../failed-transactions.component.html | 4 +- .../forwarding-history.component.html | 40 ++++----- .../local-failed-transactions.component.html | 12 +-- src/app/cln/store/cln.reducers.ts | 2 +- .../lightning-invoices-table.component.html | 4 +- .../offer-bookmarks-table.component.html | 12 +-- .../offer-bookmarks-table.component.ts | 4 +- .../offers-table/offers-table.component.html | 4 +- .../offers-table/offers-table.component.ts | 4 +- .../lightning-payments.component.html | 22 ++--- .../lightning-payments.component.scss | 3 + .../graph/lookups/lookups.component.scss | 4 - .../node-lookup/node-lookup.component.html | 4 +- .../query-routes/query-routes.component.html | 4 +- ...n-chain-transaction-history.component.html | 8 +- .../channel-inactive-table.component.html | 8 +- .../channel-open-table.component.html | 8 +- .../channel-pending-table.component.html | 4 +- .../peers-channels/peers/peers.component.html | 20 ++--- .../forwarding-history.component.html | 24 +++--- .../forwarding-history.component.scss | 6 +- src/app/eclair/store/ecl.reducers.ts | 2 +- .../lightning-invoices.component.html | 34 ++++---- .../lightning-payments.component.html | 8 +- .../lightning-payments.component.scss | 5 +- .../lnd/graph/lookups/lookups.component.scss | 4 - .../node-lookup/node-lookup.component.html | 4 +- .../query-routes/query-routes.component.html | 8 +- ...n-chain-transaction-history.component.html | 4 +- .../utxo-tables/utxos/utxos.component.html | 12 +-- .../channel-active-htlcs-table.component.html | 10 +-- .../channel-active-htlcs-table.component.scss | 3 + .../channel-closed-table.component.html | 4 +- .../channel-open-table.component.html | 8 +- .../channel-open-table.component.scss | 2 - .../channel-pending-table.component.html | 58 ++++++------- .../peers-channels/peers/peers.component.html | 36 ++++---- .../forwarding-history.component.html | 20 ++--- .../non-routing-peers.component.html | 4 +- .../routing-peers.component.html | 4 +- src/app/lnd/store/lnd.effects.ts | 4 +- src/app/lnd/store/lnd.reducers.ts | 2 +- .../lightning-invoices.component.html | 8 +- .../lightning-invoices.component.scss | 2 - .../lookup-transactions.component.scss | 4 - .../lightning-payments.component.html | 10 +-- .../lightning-payments.component.scss | 6 +- .../boltz/swaps/swaps.component.html | 60 ++++++------- .../loop/swaps/swaps.component.html | 16 ++-- .../transactions-report-table.component.html | 4 +- .../shared/services/consts-enums-functions.ts | 4 +- src/app/shared/theme/styles/root.scss | 16 +++- src/app/shared/theme/styles/theme-color.scss | 3 + 67 files changed, 528 insertions(+), 413 deletions(-) diff --git a/backend/controllers/cln/offers.js b/backend/controllers/cln/offers.js index ad158bcb..7a0fd2fb 100644 --- a/backend/controllers/cln/offers.js +++ b/backend/controllers/cln/offers.js @@ -11,7 +11,7 @@ export const listOfferBookmarks = (req, res, next) => { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Getting Offer Bookmarks..' }); databaseService.find(req.session.selectedNode, CollectionsEnum.OFFERS).then((offers) => { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Offer Bookmarks Received', data: offers }); - res.status(200).json(offers); + res.status(200).json(offers.Offers); }).catch((errRes) => { const err = common.handleError(errRes, 'Offers', 'Offer Bookmarks Error', req.session.selectedNode); return res.status(err.statusCode).json({ message: err.message, error: err.error }); diff --git a/backend/models/database.model.js b/backend/models/database.model.js index 5ab624bb..7938ef04 100644 --- a/backend/models/database.model.js +++ b/backend/models/database.model.js @@ -134,3 +134,6 @@ export var CollectionsEnum; CollectionsEnum["PAGE_SETTINGS"] = "PageSettings"; })(CollectionsEnum || (CollectionsEnum = {})); export const CollectionFieldsEnum = Object.assign(Object.assign(Object.assign({}, OfferFieldsEnum), PageSettingsFieldsEnum), TableSettingsFieldsEnum); +export const LNDCollection = [CollectionsEnum.PAGE_SETTINGS]; +export const ECLCollection = [CollectionsEnum.PAGE_SETTINGS]; +export const CLNCollection = [CollectionsEnum.PAGE_SETTINGS, CollectionsEnum.OFFERS]; diff --git a/backend/utils/database.js b/backend/utils/database.js index 088566c7..23a22b44 100644 --- a/backend/utils/database.js +++ b/backend/utils/database.js @@ -3,7 +3,7 @@ import { join, dirname, sep } from 'path'; import { fileURLToPath } from 'url'; import { Common } from '../utils/common.js'; import { Logger } from '../utils/logger.js'; -import { validateDocument } from '../models/database.model.js'; +import { validateDocument, LNDCollection, ECLCollection, CLNCollection } from '../models/database.model.js'; export class DatabaseService { constructor() { this.common = Common; @@ -15,9 +15,10 @@ export class DatabaseService { const { id, selectedNode } = session; try { if (!this.nodeDatabase[selectedNode.index]) { - this.nodeDatabase[selectedNode.index] = { adapter: null, data: null }; - this.nodeDatabase[selectedNode.index].adapter = new DatabaseAdapter(this.dbDirectory, 'rtldb', selectedNode, id); - this.nodeDatabase[selectedNode.index].data = this.nodeDatabase[selectedNode.index].adapter.fetchData(); + this.nodeDatabase[selectedNode.index] = { adapter: null, data: {} }; + this.nodeDatabase[selectedNode.index].adapter = new DatabaseAdapter(this.dbDirectory, selectedNode, id); + this.fetchNodeData(selectedNode); + this.logger.log({ selectedNode: selectedNode, level: 'DEBUG', fileName: 'Database', msg: 'Database Loaded', data: this.nodeDatabase[selectedNode.index].data }); } else { this.nodeDatabase[selectedNode.index].adapter.insertSession(id); @@ -27,6 +28,31 @@ export class DatabaseService { this.logger.log({ selectedNode: selectedNode, level: 'ERROR', fileName: 'Database', msg: 'Database Load Error', error: err }); } } + fetchNodeData(selectedNode) { + switch (selectedNode.ln_implementation) { + case 'CLN': + for (const collectionName in CLNCollection) { + if (CLNCollection.hasOwnProperty(collectionName)) { + this.nodeDatabase[selectedNode.index].data[CLNCollection[collectionName]] = this.nodeDatabase[selectedNode.index].adapter.fetchData(CLNCollection[collectionName]); + } + } + break; + case 'ECL': + for (const collectionName in ECLCollection) { + if (ECLCollection.hasOwnProperty(collectionName)) { + this.nodeDatabase[selectedNode.index].data[ECLCollection[collectionName]] = this.nodeDatabase[selectedNode.index].adapter.fetchData(ECLCollection[collectionName]); + } + } + break; + default: + for (const collectionName in LNDCollection) { + if (LNDCollection.hasOwnProperty(collectionName)) { + this.nodeDatabase[selectedNode.index].data[LNDCollection[collectionName]] = this.nodeDatabase[selectedNode.index].adapter.fetchData(LNDCollection[collectionName]); + } + } + break; + } + } validateDocument(collectionName, newDocument) { return new Promise((resolve, reject) => { const validationRes = validateDocument(collectionName, newDocument); @@ -161,36 +187,53 @@ export class DatabaseService { } } export class DatabaseAdapter { - constructor(dbDirectoryPath, fileName, selNode = null, id = '') { + constructor(dbDirectoryPath, selNode = null, id = '') { this.dbDirectoryPath = dbDirectoryPath; - this.fileName = fileName; this.selNode = selNode; this.id = id; - this.dbFile = ''; + this.logger = Logger; + this.common = Common; + this.dbFilePath = ''; this.userSessions = []; - this.dbFile = dbDirectoryPath + sep + fileName + '-node-' + selNode.index + '.json'; + this.dbFilePath = dbDirectoryPath + sep + 'node-' + selNode.index; + const oldFileName = dbDirectoryPath + sep + 'rtldb-node-' + selNode.index + '.json'; + if (selNode.ln_implementation === 'CLN' && fs.existsSync(oldFileName)) { + this.renameOldDB(oldFileName, selNode); + } this.insertSession(id); } - fetchData() { + renameOldDB(oldFileName, selNode = null) { + const newFileName = this.dbFilePath + sep + 'rtldb-' + selNode.ln_implementation + '-Offers.json'; try { - if (!fs.existsSync(this.dbDirectoryPath)) { - fs.mkdirSync(this.dbDirectoryPath); + this.common.createDirectory(this.dbFilePath); + fs.renameSync(oldFileName, newFileName); + } + catch (err) { + this.logger.log({ selectedNode: selNode, level: 'ERROR', fileName: 'Database', msg: 'Rename Old Database Error', error: err }); + } + } + fetchData(collectionName) { + try { + if (!fs.existsSync(this.dbFilePath)) { + fs.mkdirSync(this.dbFilePath); } } catch (err) { return new Error('Unable to Create Directory Error ' + JSON.stringify(err)); } + const collectionFileName = this.dbFilePath + sep + 'rtldb-' + this.selNode.ln_implementation + '-' + collectionName + '.json'; try { - if (!fs.existsSync(this.dbFile)) { - fs.writeFileSync(this.dbFile, '{}'); + if (!fs.existsSync(collectionFileName)) { + fs.writeFileSync(collectionFileName, '{}'); } } catch (err) { return new Error('Unable to Create Database File Error ' + JSON.stringify(err)); } try { - const dataFromFile = fs.readFileSync(this.dbFile, 'utf-8'); - return !dataFromFile ? null : JSON.parse(dataFromFile); + const dataFromFile = fs.readFileSync(collectionFileName, 'utf-8'); + const dataObj = !dataFromFile ? null : JSON.parse(dataFromFile); + return dataObj; } catch (err) { return new Error('Database Read Error ' + JSON.stringify(err)); @@ -202,9 +245,14 @@ export class DatabaseAdapter { saveData(data) { try { if (data) { - const tempFile = this.dbFile + '.tmp'; - fs.writeFileSync(tempFile, JSON.stringify(data, null, 2)); - fs.renameSync(tempFile, this.dbFile); + for (const collectionName in data) { + if (data.hasOwnProperty(collectionName)) { + const collectionFileName = this.dbFilePath + sep + 'rtldb-' + this.selNode.ln_implementation + '-' + collectionName + '.json'; + const tempFile = collectionFileName + '.tmp'; + fs.writeFileSync(tempFile, JSON.stringify(data, null, 2)); + fs.renameSync(tempFile, collectionFileName); + } + } } return true; } diff --git a/server/controllers/cln/offers.ts b/server/controllers/cln/offers.ts index 671a81dc..5b85834c 100644 --- a/server/controllers/cln/offers.ts +++ b/server/controllers/cln/offers.ts @@ -11,9 +11,9 @@ const databaseService: DatabaseService = Database; export const listOfferBookmarks = (req, res, next) => { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Getting Offer Bookmarks..' }); - databaseService.find(req.session.selectedNode, CollectionsEnum.OFFERS).then((offers: Offer[]) => { + databaseService.find(req.session.selectedNode, CollectionsEnum.OFFERS).then((offers: any) => { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Offer Bookmarks Received', data: offers }); - res.status(200).json(offers); + res.status(200).json(offers.Offers); }).catch((errRes) => { const err = common.handleError(errRes, 'Offers', 'Offer Bookmarks Error', req.session.selectedNode); return res.status(err.statusCode).json({ message: err.message, error: err.error }); diff --git a/server/models/database.model.ts b/server/models/database.model.ts index 8bdc06d8..8a223a9f 100644 --- a/server/models/database.model.ts +++ b/server/models/database.model.ts @@ -150,3 +150,7 @@ export type Collections = { } export const CollectionFieldsEnum = { ...OfferFieldsEnum, ...PageSettingsFieldsEnum, ...TableSettingsFieldsEnum }; + +export const LNDCollection = [CollectionsEnum.PAGE_SETTINGS]; +export const ECLCollection = [CollectionsEnum.PAGE_SETTINGS]; +export const CLNCollection = [CollectionsEnum.PAGE_SETTINGS, CollectionsEnum.OFFERS]; diff --git a/server/utils/database.ts b/server/utils/database.ts index 331e7499..475353fb 100644 --- a/server/utils/database.ts +++ b/server/utils/database.ts @@ -3,7 +3,7 @@ import { join, dirname, sep } from 'path'; import { fileURLToPath } from 'url'; import { Common, CommonService } from '../utils/common.js'; import { Logger, LoggerService } from '../utils/logger.js'; -import { Collections, CollectionsEnum, validateDocument } from '../models/database.model.js'; +import { Collections, CollectionsEnum, validateDocument, LNDCollection, ECLCollection, CLNCollection } from '../models/database.model.js'; import { CommonSelectedNode } from '../models/config.model.js'; export class DatabaseService { @@ -19,9 +19,10 @@ export class DatabaseService { const { id, selectedNode } = session; try { if (!this.nodeDatabase[selectedNode.index]) { - this.nodeDatabase[selectedNode.index] = { adapter: null, data: null }; - this.nodeDatabase[selectedNode.index].adapter = new DatabaseAdapter(this.dbDirectory, 'rtldb', selectedNode, id); - this.nodeDatabase[selectedNode.index].data = this.nodeDatabase[selectedNode.index].adapter.fetchData(); + this.nodeDatabase[selectedNode.index] = { adapter: null, data: {} }; + this.nodeDatabase[selectedNode.index].adapter = new DatabaseAdapter(this.dbDirectory, selectedNode, id); + this.fetchNodeData(selectedNode); + this.logger.log({ selectedNode: selectedNode, level: 'DEBUG', fileName: 'Database', msg: 'Database Loaded', data: this.nodeDatabase[selectedNode.index].data }); } else { this.nodeDatabase[selectedNode.index].adapter.insertSession(id); } @@ -30,6 +31,34 @@ export class DatabaseService { } } + fetchNodeData(selectedNode: CommonSelectedNode) { + switch (selectedNode.ln_implementation) { + case 'CLN': + for (const collectionName in CLNCollection) { + if (CLNCollection.hasOwnProperty(collectionName)) { + this.nodeDatabase[selectedNode.index].data[CLNCollection[collectionName]] = this.nodeDatabase[selectedNode.index].adapter.fetchData(CLNCollection[collectionName]); + } + } + break; + + case 'ECL': + for (const collectionName in ECLCollection) { + if (ECLCollection.hasOwnProperty(collectionName)) { + this.nodeDatabase[selectedNode.index].data[ECLCollection[collectionName]] = this.nodeDatabase[selectedNode.index].adapter.fetchData(ECLCollection[collectionName]); + } + } + break; + + default: + for (const collectionName in LNDCollection) { + if (LNDCollection.hasOwnProperty(collectionName)) { + this.nodeDatabase[selectedNode.index].data[LNDCollection[collectionName]] = this.nodeDatabase[selectedNode.index].adapter.fetchData(LNDCollection[collectionName]); + } + } + break; + } + } + validateDocument(collectionName, newDocument) { return new Promise((resolve, reject) => { const validationRes = validateDocument(collectionName, newDocument); @@ -164,32 +193,48 @@ export class DatabaseService { export class DatabaseAdapter { - private dbFile = ''; + private logger: LoggerService = Logger; + private common: CommonService = Common; + private dbFilePath = ''; private userSessions = []; - constructor(public dbDirectoryPath: string, public fileName: string, private selNode: CommonSelectedNode = null, private id: string = '') { - this.dbFile = dbDirectoryPath + sep + fileName + '-node-' + selNode.index + '.json'; + constructor(public dbDirectoryPath: string, private selNode: CommonSelectedNode = null, private id: string = '') { + this.dbFilePath = dbDirectoryPath + sep + 'node-' + selNode.index; + const oldFileName = dbDirectoryPath + sep + 'rtldb-node-' + selNode.index + '.json'; + if (selNode.ln_implementation === 'CLN' && fs.existsSync(oldFileName)) { this.renameOldDB(oldFileName, selNode); } this.insertSession(id); } - fetchData() { + renameOldDB(oldFileName: string, selNode: CommonSelectedNode = null) { + const newFileName = this.dbFilePath + sep + 'rtldb-' + selNode.ln_implementation + '-Offers.json'; try { - if (!fs.existsSync(this.dbDirectoryPath)) { - fs.mkdirSync(this.dbDirectoryPath); + this.common.createDirectory(this.dbFilePath); + fs.renameSync(oldFileName, newFileName); + } catch (err) { + this.logger.log({ selectedNode: selNode, level: 'ERROR', fileName: 'Database', msg: 'Rename Old Database Error', error: err }); + } + } + + fetchData(collectionName: string) { + try { + if (!fs.existsSync(this.dbFilePath)) { + fs.mkdirSync(this.dbFilePath); } } catch (err) { return new Error('Unable to Create Directory Error ' + JSON.stringify(err)); } + const collectionFileName = this.dbFilePath + sep + 'rtldb-' + this.selNode.ln_implementation + '-' + collectionName + '.json'; try { - if (!fs.existsSync(this.dbFile)) { - fs.writeFileSync(this.dbFile, '{}'); + if (!fs.existsSync(collectionFileName)) { + fs.writeFileSync(collectionFileName, '{}'); } } catch (err) { return new Error('Unable to Create Database File Error ' + JSON.stringify(err)); } try { - const dataFromFile = fs.readFileSync(this.dbFile, 'utf-8'); - return !dataFromFile ? null : (JSON.parse(dataFromFile)); + const dataFromFile = fs.readFileSync(collectionFileName, 'utf-8'); + const dataObj = !dataFromFile ? null : (JSON.parse(dataFromFile)); + return dataObj; } catch (err) { return new Error('Database Read Error ' + JSON.stringify(err)); } @@ -202,9 +247,14 @@ export class DatabaseAdapter { saveData(data: any) { try { if (data) { - const tempFile = this.dbFile + '.tmp'; - fs.writeFileSync(tempFile, JSON.stringify(data, null, 2)); - fs.renameSync(tempFile, this.dbFile); + for (const collectionName in data) { + if (data.hasOwnProperty(collectionName)) { + const collectionFileName = this.dbFilePath + sep + 'rtldb-' + this.selNode.ln_implementation + '-' + collectionName + '.json'; + const tempFile = collectionFileName + '.tmp'; + fs.writeFileSync(tempFile, JSON.stringify(data, null, 2)); + fs.renameSync(tempFile, collectionFileName); + } + } } return true; } catch (err) { diff --git a/src/app/cln/graph/lookups/lookups.component.scss b/src/app/cln/graph/lookups/lookups.component.scss index d45059cb..51956474 100644 --- a/src/app/cln/graph/lookups/lookups.component.scss +++ b/src/app/cln/graph/lookups/lookups.component.scss @@ -8,7 +8,3 @@ margin-bottom: 0; list-style-type: none; } - -.pl-3 { - padding-left: 3rem; -} \ No newline at end of file diff --git a/src/app/cln/graph/lookups/node-lookup/node-lookup.component.html b/src/app/cln/graph/lookups/node-lookup/node-lookup.component.html index 9b52ab15..cc4478de 100644 --- a/src/app/cln/graph/lookups/node-lookup/node-lookup.component.html +++ b/src/app/cln/graph/lookups/node-lookup/node-lookup.component.html @@ -39,10 +39,10 @@ {{address?.port}} - +
Actions
- + diff --git a/src/app/cln/graph/query-routes/query-routes.component.html b/src/app/cln/graph/query-routes/query-routes.component.html index 474edf88..db5fa183 100644 --- a/src/app/cln/graph/query-routes/query-routes.component.html +++ b/src/app/cln/graph/query-routes/query-routes.component.html @@ -35,34 +35,34 @@ - Alias - + Alias +
{{hop?.alias}}
- Channel - {{hop?.channel}} + Channel + {{hop?.channel}} - Direction - {{hop?.direction}} + Direction + {{hop?.direction}} - Delay - {{hop?.delay | number}} + Delay + {{hop?.delay | number}} - Amount (Sats) - {{hop?.msatoshi/1000 | number}} + Amount (Sats) + {{hop?.msatoshi/1000 | number}} - +
Actions
- + diff --git a/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html b/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html index c9ad321f..f6ee814e 100644 --- a/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html +++ b/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html @@ -74,57 +74,57 @@ - Node Id - + Node Id +
{{lqNode?.nodeid}}
- Last Announcement At - {{((lqNode?.last_timestamp * 1000) | date:'dd/MMM/y HH:mm') || '-'}} + Last Announcement At + {{((lqNode?.last_timestamp * 1000) | date:'dd/MMM/y HH:mm') || '-'}} - Compact Lease - {{ lqNode?.option_will_fund?.compact_lease }} + Compact Lease + {{ lqNode?.option_will_fund?.compact_lease }} - Lease Fee - + Lease Fee + {{lqNode?.option_will_fund?.lease_fee_base_msat/1000 | number:'1.0-0'}} Sats + {{(lqNode?.option_will_fund?.lease_fee_basis/100) | number:'1.2-2'}}% - Routing Fee - + Routing Fee + {{lqNode?.option_will_fund?.channel_fee_max_base_msat/1000 | number:'1.0-0'}} Sats + {{lqNode?.option_will_fund?.channel_fee_max_proportional_thousandths * 1000 | number:'1.0-0'}} ppm - Channel Opening Fee (Sats) - + Channel Opening Fee (Sats) + {{lqNode.channel_opening_fee | number:'1.0-0'}} - Funding Weight - + Funding Weight + {{lqNode?.option_will_fund?.funding_weight | number:'1.0-0'}} - +
@@ -132,7 +132,7 @@
- +
diff --git a/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.html b/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.html index e1db0d9f..a97c252c 100644 --- a/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.html +++ b/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.html @@ -65,13 +65,13 @@ {{utxo?.blockheight | number}} - Reserved - + Reserved + {{utxo.reserved ? 'Yes' : 'No'}} - +
diff --git a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html index 9ec6a4d8..b8706e2a 100644 --- a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html +++ b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html @@ -16,82 +16,82 @@ - Short Channel ID - + Short Channel ID +
{{channel?.short_channel_id}}
- Alias - + Alias +
{{channel?.alias}}
- Id - + Id +
{{channel?.id}}
- Channel Id - + Channel Id +
{{channel?.channel_id}}
- Funding Transaction Id - + Funding Transaction Id +
{{channel?.funding_txid}}
- Connected - {{(channel?.connected) ? 'Connected' : 'Disconnected'}} + Connected + {{(channel?.connected) ? 'Connected' : 'Disconnected'}} - Local Reserve (Sats) - + Local Reserve (Sats) + {{channel?.our_channel_reserve_satoshis | number:'1.0-0'}} - Remote Reserve (Sats) - + Remote Reserve (Sats) + {{channel?.their_channel_reserve_satoshis | number:'1.0-0'}} - Total (Sats) - + Total (Sats) + {{channel?.msatoshi_total/1000 | number:channel?.msatoshi_to_us < 1000 ? '1.0-4' : '1.0-0'}} - Spendable (Sats) - + Spendable (Sats) + {{channel?.spendable_msatoshi/1000 | number:channel?.msatoshi_to_us < 1000 ? '1.0-4' : '1.0-0'}} - Local Balance (Sats) - + Local Balance (Sats) + {{channel?.msatoshi_to_us/1000 | number:channel?.msatoshi_to_us < 1000 ? '1.0-4' : '1.0-0'}} - Remote Balance (Sats) - + Remote Balance (Sats) + {{channel?.msatoshi_to_them/1000 | number:channel?.msatoshi_to_them < 1000 ? '1.0-4' : '1.0-0'}} - Balance Score - + Balance Score +
{{channel.balancedness || 0 | number}}
@@ -99,7 +99,7 @@ - +
@@ -108,7 +108,7 @@
- +
diff --git a/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html b/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html index 51012cf0..6c0b8053 100644 --- a/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html +++ b/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html @@ -16,77 +16,77 @@ - Alias - + Alias +
{{channel?.alias}}
- Id - + Id +
{{channel?.id}}
- Channel Id - + Channel Id +
{{channel?.channel_id}}
- Funding Transaction Id - + Funding Transaction Id +
{{channel?.funding_txid}}
- Connected - {{(channel?.connected) ? 'Connected' : 'Disconnected'}} + Connected + {{(channel?.connected) ? 'Connected' : 'Disconnected'}} State {{CLNChannelPendingState[channel?.state]}} - Local Reserve (Sats) - + Local Reserve (Sats) + {{channel?.our_channel_reserve_satoshis | number:'1.0-0'}} - Remote Reserve (Sats) - + Remote Reserve (Sats) + {{channel?.their_channel_reserve_satoshis | number:'1.0-0'}} - Total (Sats) - + Total (Sats) + {{channel?.msatoshi_total/1000 | number:channel?.msatoshi_to_us < 1000 ? '1.0-4' : '1.0-0'}} - Spendable (Sats) - + Spendable (Sats) + {{channel?.spendable_msatoshi/1000 | number:channel?.msatoshi_to_us < 1000 ? '1.0-4' : '1.0-0'}} - Local Balance (Sats) - + Local Balance (Sats) + {{channel?.msatoshi_to_us/1000 | number:channel?.msatoshi_to_us < 1000 ? '1.0-4' : '1.0-0'}} - Remote Balance (Sats) - + Remote Balance (Sats) + {{channel?.msatoshi_to_them/1000 | number:channel?.msatoshi_to_them < 1000 ? '1.0-4' : '1.0-0'}} - +
@@ -94,7 +94,7 @@
- +
diff --git a/src/app/cln/peers-channels/peers/peers.component.html b/src/app/cln/peers-channels/peers/peers.component.html index 2639eb4a..2002335e 100644 --- a/src/app/cln/peers-channels/peers/peers.component.html +++ b/src/app/cln/peers-channels/peers/peers.component.html @@ -33,23 +33,23 @@ - ID - + ID +
{{peer?.id}}
- Network Address - + Network Address +
{{addr}},
- +
@@ -57,7 +57,7 @@
- +
diff --git a/src/app/cln/routing/failed-transactions/failed-transactions.component.html b/src/app/cln/routing/failed-transactions/failed-transactions.component.html index 3af0f89f..12417f27 100644 --- a/src/app/cln/routing/failed-transactions/failed-transactions.component.html +++ b/src/app/cln/routing/failed-transactions/failed-transactions.component.html @@ -60,7 +60,7 @@ {{fhEvent?.fee | number:'1.0-0'}} - +
@@ -68,7 +68,7 @@
- + diff --git a/src/app/cln/routing/forwarding-history/forwarding-history.component.html b/src/app/cln/routing/forwarding-history/forwarding-history.component.html index 11cdfebc..3c02885c 100644 --- a/src/app/cln/routing/forwarding-history/forwarding-history.component.html +++ b/src/app/cln/routing/forwarding-history/forwarding-history.component.html @@ -14,55 +14,55 @@ {{(fhEvent?.received_time * 1000) | date:'dd/MMM/y HH:mm'}} - Resolved Time - {{(fhEvent?.resolved_time * 1000) | date:'dd/MMM/y HH:mm'}} + Resolved Time + {{(fhEvent?.resolved_time * 1000) | date:'dd/MMM/y HH:mm'}} - In Channel Id - {{fhEvent?.in_channel}} + In Channel Id + {{fhEvent?.in_channel}} - In Channel - + In Channel +
{{fhEvent?.in_channel_alias}}
- Out Channel Id - {{fhEvent?.out_channel}} + Out Channel Id + {{fhEvent?.out_channel}} - Out Channel - + Out Channel +
{{fhEvent?.out_channel_alias}}
- Payment Hash - + Payment Hash +
{{fhEvent?.payment_hash}}
- Amount In (Sats) - {{fhEvent?.in_msatoshi/1000 | number:fhEvent?.in_msatoshi < 1000 ? '1.0-4' : '1.0-0'}} + Amount In (Sats) + {{fhEvent?.in_msatoshi/1000 | number:fhEvent?.in_msatoshi < 1000 ? '1.0-4' : '1.0-0'}} - Amount Out (Sats) - {{fhEvent?.out_msatoshi/1000 | number:fhEvent?.out_msatoshi < 1000 ? '1.0-4' : '1.0-0'}} + Amount Out (Sats) + {{fhEvent?.out_msatoshi/1000 | number:fhEvent?.out_msatoshi < 1000 ? '1.0-4' : '1.0-0'}} - Fee (mSat) - {{fhEvent?.fee | number}} + Fee (mSat) + {{fhEvent?.fee | number}} - +
@@ -70,7 +70,7 @@
- + diff --git a/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html b/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html index 8e38e332..169ef55f 100644 --- a/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html +++ b/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html @@ -48,15 +48,15 @@ {{fhEvent?.in_msatoshi/1000 | number:fhEvent?.in_msatoshi < 1000 ? '1.0-4' : '1.0-0'}} - Style - {{fhEvent?.style}} + Style + {{fhEvent?.style}} - Fail Reason - {{CLNFailReason[fhEvent?.failreason]}} + Fail Reason + {{CLNFailReason[fhEvent?.failreason]}} - +
@@ -64,7 +64,7 @@
- + diff --git a/src/app/cln/store/cln.reducers.ts b/src/app/cln/store/cln.reducers.ts index d3b76f59..b5f1daaf 100644 --- a/src/app/cln/store/cln.reducers.ts +++ b/src/app/cln/store/cln.reducers.ts @@ -221,7 +221,7 @@ export const CLNReducer = createReducer(initCLNState, on(setPageSettings, (state, { payload }) => { const newPageSettings: PageSettings[] = []; CLN_DEFAULT_PAGE_SETTINGS.forEach((defaultPage) => { - const pageSetting = payload.find((p) => p.pageId === defaultPage.pageId) || null; + const pageSetting = payload && Object.keys(payload).length > 0 ? payload.find((p) => p.pageId === defaultPage.pageId) : null; if (pageSetting) { const tablesSettings = JSON.parse(JSON.stringify(pageSetting.tables)); pageSetting.tables = []; // To maintain settings order diff --git a/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.html b/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.html index 91f6944c..855e5716 100644 --- a/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.html +++ b/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.html @@ -93,7 +93,7 @@ {{invoice?.msatoshi_received/1000 | number:invoice?.msatoshi_received < 1000 ? '1.0-4' : '1.0-0'}} - +
@@ -101,7 +101,7 @@
- +
diff --git a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html index ea658cff..3f704ea0 100644 --- a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html +++ b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html @@ -26,8 +26,8 @@ - Amount (Sats) - {{(offersbookmark.amountMSat === 0) ? 'Open' : (offersbookmark.amountMSat / 1000) | number}} + Amount (Sats) + {{(offersbookmark.amountMSat === 0) ? 'Open' : (offersbookmark.amountMSat / 1000) | number}} Description @@ -42,15 +42,15 @@ {{offersbookmark.vendor}} - Invoice - + Invoice +
{{offersbookmark.bolt12}}
- +
@@ -58,7 +58,7 @@
- +
diff --git a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.ts b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.ts index 939eb9ed..1f5fe27d 100644 --- a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.ts +++ b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.ts @@ -80,7 +80,7 @@ export class CLNOfferBookmarksTableComponent implements OnInit, AfterViewInit, O this.errorMessage = !this.apiCallStatus.message ? '' : (typeof (this.apiCallStatus.message) === 'object') ? JSON.stringify(this.apiCallStatus.message) : this.apiCallStatus.message; } this.offersBookmarksJSONArr = offerBMsSeletor.offersBookmarks || []; - if (this.offersBookmarksJSONArr && this.offersBookmarksJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.offersBookmarksJSONArr && this.offersBookmarksJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadOffersTable(this.offersBookmarksJSONArr); } this.logger.info(offerBMsSeletor); @@ -88,7 +88,7 @@ export class CLNOfferBookmarksTableComponent implements OnInit, AfterViewInit, O } ngAfterViewInit() { - if (this.offersBookmarksJSONArr && this.offersBookmarksJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.offersBookmarksJSONArr && this.offersBookmarksJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadOffersTable(this.offersBookmarksJSONArr); } } diff --git a/src/app/cln/transactions/offers/offers-table/offers-table.component.html b/src/app/cln/transactions/offers/offers-table/offers-table.component.html index 5e1e32c3..4858344c 100644 --- a/src/app/cln/transactions/offers/offers-table/offers-table.component.html +++ b/src/app/cln/transactions/offers/offers-table/offers-table.component.html @@ -53,7 +53,7 @@ - +
@@ -61,7 +61,7 @@
- +
diff --git a/src/app/cln/transactions/offers/offers-table/offers-table.component.ts b/src/app/cln/transactions/offers/offers-table/offers-table.component.ts index 33e53f3d..8e371d91 100644 --- a/src/app/cln/transactions/offers/offers-table/offers-table.component.ts +++ b/src/app/cln/transactions/offers/offers-table/offers-table.component.ts @@ -105,7 +105,7 @@ export class CLNOffersTableComponent implements OnInit, AfterViewInit, OnDestroy this.errorMessage = !this.apiCallStatus.message ? '' : (typeof (this.apiCallStatus.message) === 'object') ? JSON.stringify(this.apiCallStatus.message) : this.apiCallStatus.message; } this.offerJSONArr = offersSeletor.offers || []; - if (this.offerJSONArr && this.offerJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.offerJSONArr && this.offerJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadOffersTable(this.offerJSONArr); } this.logger.info(offersSeletor); @@ -113,7 +113,7 @@ export class CLNOffersTableComponent implements OnInit, AfterViewInit, OnDestroy } ngAfterViewInit() { - if (this.offerJSONArr && this.offerJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.offerJSONArr && this.offerJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadOffersTable(this.offerJSONArr); } } diff --git a/src/app/cln/transactions/payments/lightning-payments.component.html b/src/app/cln/transactions/payments/lightning-payments.component.html index 7ad77ce6..fe723ae2 100644 --- a/src/app/cln/transactions/payments/lightning-payments.component.html +++ b/src/app/cln/transactions/payments/lightning-payments.component.html @@ -85,15 +85,15 @@ - Sats Sent - {{payment?.msatoshi_sent/1000 | number:payment?.msatoshi_sent < 1000 ? '1.0-4' : '1.0-0'}} + Sats Sent + {{payment?.msatoshi_sent/1000 | number:payment?.msatoshi_sent < 1000 ? '1.0-4' : '1.0-0'}} - Sats Received - {{payment?.msatoshi/1000 | number:payment?.msatoshi < 1000 ? '1.0-4' : '1.0-0'}} + Sats Received + {{payment?.msatoshi/1000 | number:payment?.msatoshi < 1000 ? '1.0-4' : '1.0-0'}} - +
@@ -101,7 +101,7 @@
- + @@ -121,7 +121,7 @@ - + @@ -134,7 +134,7 @@ Total Attempts: {{payment?.total_parts}} - + {{(mpp.created_at * 1000) | date:'dd/MMM/y HH:mm'}} @@ -207,7 +207,7 @@ - + {{payment?.msatoshi_sent/1000 | number:payment?.msatoshi_sent < 1000 ? '1.0-4' : '1.0-0'}} @@ -217,7 +217,7 @@ - + {{payment?.msatoshi/1000 | number:payment?.msatoshi < 1000 ? '1.0-4' : '1.0-0'}} @@ -227,7 +227,7 @@ - + diff --git a/src/app/cln/transactions/payments/lightning-payments.component.scss b/src/app/cln/transactions/payments/lightning-payments.component.scss index 8a4449d8..f37059a8 100644 --- a/src/app/cln/transactions/payments/lightning-payments.component.scss +++ b/src/app/cln/transactions/payments/lightning-payments.component.scss @@ -34,6 +34,9 @@ min-height: 4.2rem; place-content: center flex-start; align-items: center; + &:not(:first-of-type) { + padding-left: 3rem; + } &.ellipsis-parent { display: flex; } diff --git a/src/app/eclair/graph/lookups/lookups.component.scss b/src/app/eclair/graph/lookups/lookups.component.scss index d45059cb..51956474 100644 --- a/src/app/eclair/graph/lookups/lookups.component.scss +++ b/src/app/eclair/graph/lookups/lookups.component.scss @@ -8,7 +8,3 @@ margin-bottom: 0; list-style-type: none; } - -.pl-3 { - padding-left: 3rem; -} \ No newline at end of file diff --git a/src/app/eclair/graph/lookups/node-lookup/node-lookup.component.html b/src/app/eclair/graph/lookups/node-lookup/node-lookup.component.html index e3550690..b32baf95 100644 --- a/src/app/eclair/graph/lookups/node-lookup/node-lookup.component.html +++ b/src/app/eclair/graph/lookups/node-lookup/node-lookup.component.html @@ -38,10 +38,10 @@ {{address}} - +
Actions
- + diff --git a/src/app/eclair/graph/query-routes/query-routes.component.html b/src/app/eclair/graph/query-routes/query-routes.component.html index 982d728e..76859e0c 100644 --- a/src/app/eclair/graph/query-routes/query-routes.component.html +++ b/src/app/eclair/graph/query-routes/query-routes.component.html @@ -50,10 +50,10 @@ - +
Actions
- + diff --git a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html index 0a726e75..959f07bd 100644 --- a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html +++ b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html @@ -29,8 +29,8 @@ {{transaction?.fees | number}} - Confirmations - + Confirmations + {{transaction?.confirmations | number}} @@ -58,7 +58,7 @@ - +
@@ -66,7 +66,7 @@
- + diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html index 1ac2653f..7e006744 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html @@ -71,8 +71,8 @@ {{channel?.feeRatePerKw | number:'1.0-0'}} - Balance Score - + Balance Score +
{{channel?.balancedness || 0 | number}}
@@ -80,7 +80,7 @@ - +
@@ -88,7 +88,7 @@
- +
diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html index ee7bca3f..a9cd70e4 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html @@ -77,8 +77,8 @@ {{channel?.feeRatePerKw | number:'1.0-0'}} - Balance Score - + Balance Score +
{{channel?.balancedness || 0 | number}}
@@ -86,7 +86,7 @@ - +
@@ -95,7 +95,7 @@
- +
diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html index 73cb9bc1..b766207b 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html @@ -63,7 +63,7 @@ {{channel?.feeRatePerKw | number:'1.0-0'}} - +
@@ -71,7 +71,7 @@
- + diff --git a/src/app/eclair/peers-channels/peers/peers.component.html b/src/app/eclair/peers-channels/peers/peers.component.html index a44b0938..def67dbe 100644 --- a/src/app/eclair/peers-channels/peers/peers.component.html +++ b/src/app/eclair/peers-channels/peers/peers.component.html @@ -25,33 +25,33 @@ - Alias - + Alias +
{{peer?.alias}}
- ID - + ID +
{{peer?.nodeId}}
- Network Address - + Network Address + {{peer?.address}} - Channels - {{peer?.channels}} + Channels + {{peer?.channels}} - +
@@ -59,7 +59,7 @@
- +
diff --git a/src/app/eclair/routing/forwarding-history/forwarding-history.component.html b/src/app/eclair/routing/forwarding-history/forwarding-history.component.html index 18a69084..b5e72cff 100644 --- a/src/app/eclair/routing/forwarding-history/forwarding-history.component.html +++ b/src/app/eclair/routing/forwarding-history/forwarding-history.component.html @@ -26,8 +26,8 @@ {{fhEvent?.fromChannelId}} - In Channel Short Id - {{fhEvent?.fromShortChannelId}} + In Channel Short Id + {{fhEvent?.fromShortChannelId}} In Channel @@ -38,31 +38,31 @@ {{fhEvent?.toChannelId}} - Out Channel Short Id - {{fhEvent?.toShortChannelId}} + Out Channel Short Id + {{fhEvent?.toShortChannelId}} Out Channel {{fhEvent?.toChannelAlias}} - Amount In (Sats) - {{fhEvent?.amountIn | number}} + Amount In (Sats) + {{fhEvent?.amountIn | number}} - Amount Out (Sats) - {{fhEvent?.amountOut | number}} + Amount Out (Sats) + {{fhEvent?.amountOut | number}} - Fee Earned (Sats) - {{(fhEvent?.amountIn - fhEvent?.amountOut) | number}} + Fee Earned (Sats) + {{(fhEvent?.amountIn - fhEvent?.amountOut) | number}} Payment Hash {{fhEvent?.paymentHash}} - +
@@ -70,7 +70,7 @@
- + diff --git a/src/app/eclair/routing/forwarding-history/forwarding-history.component.scss b/src/app/eclair/routing/forwarding-history/forwarding-history.component.scss index d4c2f009..a6c93495 100644 --- a/src/app/eclair/routing/forwarding-history/forwarding-history.component.scss +++ b/src/app/eclair/routing/forwarding-history/forwarding-history.component.scss @@ -7,10 +7,10 @@ } } -.mat-column-fromChannelId, .mat-column-fromAlias, .mat-column-toChannelId, .mat-column-toAlias, .mat-column-paymentHash { +.mat-column-fromChannelId, .mat-column-fromChannelAlias, .mat-column-toChannelId, .mat-column-toChannelAlias, .mat-column-paymentHash { padding-left: 1rem; - flex: 1 1 15%; - width: 15%; + flex: 0 0 25%; + width: 25%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/src/app/eclair/store/ecl.reducers.ts b/src/app/eclair/store/ecl.reducers.ts index 883edf6c..0d35ea04 100644 --- a/src/app/eclair/store/ecl.reducers.ts +++ b/src/app/eclair/store/ecl.reducers.ts @@ -218,7 +218,7 @@ export const ECLReducer = createReducer(initECLState, on(setPageSettings, (state, { payload }) => { const newPageSettings: PageSettings[] = []; ECL_DEFAULT_PAGE_SETTINGS.forEach((defaultPage) => { - const pageSetting = payload.find((p) => p.pageId === defaultPage.pageId) || null; + const pageSetting = payload && Object.keys(payload).length > 0 ? payload.find((p) => p.pageId === defaultPage.pageId) : null; if (pageSetting) { const tablesSettings = JSON.parse(JSON.stringify(pageSetting.tables)); pageSetting.tables = []; // To maintain settings order diff --git a/src/app/eclair/transactions/invoices/lightning-invoices.component.html b/src/app/eclair/transactions/invoices/lightning-invoices.component.html index 319e8c2c..c21d12fb 100644 --- a/src/app/eclair/transactions/invoices/lightning-invoices.component.html +++ b/src/app/eclair/transactions/invoices/lightning-invoices.component.html @@ -39,55 +39,55 @@ - Date Created - {{(invoice?.timestamp * 1000) | date:'dd/MMM/y HH:mm'}} + Date Created + {{(invoice?.timestamp * 1000) | date:'dd/MMM/y HH:mm'}} - Date Expiry - {{((invoice?.expiresAt * 1000) | date:'dd/MMM/y HH:mm') || '-'}} + Date Expiry + {{((invoice?.expiresAt * 1000) | date:'dd/MMM/y HH:mm') || '-'}} - Date Settled - {{((invoice?.receivedAt * 1000) | date:'dd/MMM/y HH:mm') || '-'}} + Date Settled + {{((invoice?.receivedAt * 1000) | date:'dd/MMM/y HH:mm') || '-'}} - Node Id - + Node Id +
{{invoice?.nodeId}}
- Description - + Description +
{{invoice?.description}}
- Payment Hash - + Payment Hash +
{{invoice?.paymentHash}}
- Amount (Sats) - + Amount (Sats) + {{invoice?.amount ? (invoice?.amount | number:'1.0-0') : '-'}} Amount Settled (Sats) - + {{invoice?.amountSettled ? (invoice?.amountSettled | number:'1.0-0') : '-'}} - +
@@ -95,7 +95,7 @@
- +
diff --git a/src/app/eclair/transactions/payments/lightning-payments.component.html b/src/app/eclair/transactions/payments/lightning-payments.component.html index f4e7415b..be4f6e02 100644 --- a/src/app/eclair/transactions/payments/lightning-payments.component.html +++ b/src/app/eclair/transactions/payments/lightning-payments.component.html @@ -84,7 +84,7 @@ - +
@@ -92,7 +92,7 @@
- + @@ -111,7 +111,7 @@ Total Attempts: {{payment?.parts?.length || 0}} - + {{part.timestamp | date:'dd/MMM/y HH:mm'}} @@ -212,7 +212,7 @@ - + diff --git a/src/app/eclair/transactions/payments/lightning-payments.component.scss b/src/app/eclair/transactions/payments/lightning-payments.component.scss index 4fad5665..680b2c04 100644 --- a/src/app/eclair/transactions/payments/lightning-payments.component.scss +++ b/src/app/eclair/transactions/payments/lightning-payments.component.scss @@ -34,7 +34,10 @@ .part-row-span { min-height: 4.2rem; place-content: center flex-start; - align-items: center; + align-items: center; + &:not(:first-of-type) { + padding-left: 3rem; + } &.ellipsis-parent { display: flex; } diff --git a/src/app/lnd/graph/lookups/lookups.component.scss b/src/app/lnd/graph/lookups/lookups.component.scss index d45059cb..51956474 100644 --- a/src/app/lnd/graph/lookups/lookups.component.scss +++ b/src/app/lnd/graph/lookups/lookups.component.scss @@ -8,7 +8,3 @@ margin-bottom: 0; list-style-type: none; } - -.pl-3 { - padding-left: 3rem; -} \ No newline at end of file diff --git a/src/app/lnd/graph/lookups/node-lookup/node-lookup.component.html b/src/app/lnd/graph/lookups/node-lookup/node-lookup.component.html index 84cfe291..0533ca97 100644 --- a/src/app/lnd/graph/lookups/node-lookup/node-lookup.component.html +++ b/src/app/lnd/graph/lookups/node-lookup/node-lookup.component.html @@ -46,10 +46,10 @@ {{address?.addr}} - +
Actions
- + diff --git a/src/app/lnd/graph/query-routes/query-routes.component.html b/src/app/lnd/graph/query-routes/query-routes.component.html index 85217e8e..437fe869 100644 --- a/src/app/lnd/graph/query-routes/query-routes.component.html +++ b/src/app/lnd/graph/query-routes/query-routes.component.html @@ -39,8 +39,8 @@ {{hop?.pub_key}} - Channel - {{hop?.chan_id}} + Channel + {{hop?.chan_id}} TLV Payload @@ -65,10 +65,10 @@ - +
Actions
- + diff --git a/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.html b/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.html index 2020ee1d..b64a42db 100644 --- a/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.html +++ b/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.html @@ -45,7 +45,7 @@ {{transaction?.num_confirmations | number}} - +
@@ -53,7 +53,7 @@
- + diff --git a/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.html b/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.html index af9ae90d..5c455705 100644 --- a/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.html +++ b/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.html @@ -32,8 +32,8 @@ - Label - + Label + {{utxo.label}} @@ -48,8 +48,8 @@ - Address - + Address + {{utxo?.address}} @@ -66,7 +66,7 @@ {{(utxo.confirmations || 0) | number}} - +
@@ -74,7 +74,7 @@
- +
diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.html index 37eaeb03..71af1f88 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.html +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.html @@ -16,7 +16,7 @@ Active HTLCs: {{channel?.pending_htlcs?.length}} - + {{htlc?.amount | number}} @@ -84,10 +84,10 @@ - + Hash Lock - + {{' '}} @@ -97,7 +97,7 @@ - +
@@ -105,7 +105,7 @@
- + diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss index a8e90fdb..64cc3ed4 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss @@ -13,6 +13,9 @@ min-height: 4.2rem; place-content: center flex-start; align-items: center; + &:not(:first-of-type) { + padding-left: 3rem; + } } .mat-column-actions { diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html index 804475c5..00e76d31 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html @@ -70,7 +70,7 @@ - +
@@ -78,7 +78,7 @@
- + diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html index a3f83793..d225b315 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html @@ -119,8 +119,8 @@ {{channel.remote_balance | number}} - Balance Score - + Balance Score +
{{channel.balancedness || 0 | number}}
@@ -128,7 +128,7 @@ - +
@@ -137,7 +137,7 @@
- +
diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss index da47a031..cb0650b2 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss @@ -3,11 +3,9 @@ .mat-column-active { max-width: 1.2rem; width:1.2rem; - padding-right: 0.5rem; } .mat-column-private { - padding-right: 0.5rem; max-width: 1.6rem; width:1.6rem; } diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html index 416867c2..77b9fe32 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html @@ -43,37 +43,37 @@ Confirmation Height - {{channel.confirmation_height | number}} + {{channel.confirmation_height | number}} Commit Fee (Sats) - {{channel.commit_fee | number}} + {{channel.commit_fee | number}} Commit Weight - {{channel.commit_weight | number}} + {{channel.commit_weight | number}} Fee/KW - {{channel.fee_per_kw | number}} + {{channel.fee_per_kw | number}} Capacity (Sats) - {{channel.channel.capacity | number}} + {{channel.channel.capacity | number}} Local Balance (Sats) - {{channel.channel.local_balance | number}} + {{channel.channel.local_balance | number}} Remote Balance (Sats) - {{channel.channel.remote_balance | number}} + {{channel.channel.remote_balance | number}} - +
Actions
- +
@@ -145,37 +145,37 @@ Limbo Balance (Sats) - {{channel.limbo_balance | number}} + {{channel.limbo_balance | number}} Maturity Height - {{channel.maturity_height | number}} + {{channel.maturity_height | number}} Blocks till Maturity - {{channel.blocks_til_maturity | number}} + {{channel.blocks_til_maturity | number}} Recovered Balance (Sats) - {{channel.recovered_balance | number}} + {{channel.recovered_balance | number}} Capacity (Sats) - {{channel.channel.capacity | number}} + {{channel.channel.capacity | number}} Local Balance (Sats) - {{channel.channel.local_balance | number}} + {{channel.channel.local_balance | number}} Remote Balance (Sats) - {{channel.channel.remote_balance | number}} + {{channel.channel.remote_balance | number}} - +
Actions
- + @@ -241,21 +241,21 @@ Capacity (Sats) - {{channel.channel.capacity | number}} + {{channel.channel.capacity | number}} Local Balance (Sats) - {{channel.channel.local_balance | number}} + {{channel.channel.local_balance | number}} Remote Balance (Sats) - {{channel.channel.remote_balance | number}} + {{channel.channel.remote_balance | number}} - +
Actions
- + @@ -313,25 +313,25 @@ Limbo Balance (Sats) - {{channel.limbo_balance | number}} + {{channel.limbo_balance | number}} Capacity (Sats) - {{channel.channel.capacity | number}} + {{channel.channel.capacity | number}} Local Balance (Sats) - {{channel.channel.local_balance | number}} + {{channel.channel.local_balance | number}} Remote Balance (Sats) - {{channel.channel.remote_balance | number}} + {{channel.channel.remote_balance | number}} - +
Actions
- + diff --git a/src/app/lnd/peers-channels/peers/peers.component.html b/src/app/lnd/peers-channels/peers/peers.component.html index 33b03dd2..da5dec79 100644 --- a/src/app/lnd/peers-channels/peers/peers.component.html +++ b/src/app/lnd/peers-channels/peers/peers.component.html @@ -24,41 +24,41 @@ {{peer?.pub_key}} - Address - {{peer?.address}} + Address + {{peer?.address}} - Sync Type - {{peer?.sync_type | camelcaseWithReplace:'sync':'_'}} + Sync Type + {{peer?.sync_type | camelcaseWithReplace:'sync':'_'}} - Inbound - {{peer?.inbound ? 'Yes' : 'No'}} + Inbound + {{peer?.inbound ? 'Yes' : 'No'}} - Bytes Sent - {{peer?.bytes_sent | number}} + Bytes Sent + {{peer?.bytes_sent | number}} - Bytes Received - {{peer?.bytes_recv | number}} + Bytes Received + {{peer?.bytes_recv | number}} - Sats Sent - {{peer?.sat_sent | number}} + Sats Sent + {{peer?.sat_sent | number}} - + Sats Received - {{peer?.sat_recv | number}} + {{peer?.sat_recv | number}} - Ping Time (µs) - {{peer?.ping_time | number}} + Ping Time (µs) + {{peer?.ping_time | number}} - +
@@ -66,7 +66,7 @@
- +
diff --git a/src/app/lnd/routing/forwarding-history/forwarding-history.component.html b/src/app/lnd/routing/forwarding-history/forwarding-history.component.html index 5b0950bb..3465c992 100644 --- a/src/app/lnd/routing/forwarding-history/forwarding-history.component.html +++ b/src/app/lnd/routing/forwarding-history/forwarding-history.component.html @@ -14,20 +14,20 @@ {{(fhEvent.timestamp * 1000) | date:'dd/MMM/y HH:mm'}} - Inbound Alias - {{fhEvent.alias_in}} + Inbound Alias + {{fhEvent.alias_in}} - Inbound Channel - {{fhEvent.chan_id_in}} + Inbound Channel + {{fhEvent.chan_id_in}} - Outbound Alias - {{fhEvent.alias_out}} + Outbound Alias + {{fhEvent.alias_out}} - Outbound Channel - {{fhEvent.chan_id_out}} + Outbound Channel + {{fhEvent.chan_id_out}} Inbound Amount (Sats) @@ -42,7 +42,7 @@ {{fhEvent.fee_msat | number}} - +
@@ -50,7 +50,7 @@
- + diff --git a/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.html b/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.html index 55f2ac31..7264b7b9 100644 --- a/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.html +++ b/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.html @@ -85,10 +85,10 @@ {{nonRPeer.remote_balance | number}} - +
Actions
- + diff --git a/src/app/lnd/routing/routing-peers/routing-peers.component.html b/src/app/lnd/routing/routing-peers/routing-peers.component.html index 8165fff1..779c89a7 100644 --- a/src/app/lnd/routing/routing-peers/routing-peers.component.html +++ b/src/app/lnd/routing/routing-peers/routing-peers.component.html @@ -29,10 +29,10 @@ {{rPeer.total_amount | number}} - +
Actions
- + diff --git a/src/app/lnd/store/lnd.effects.ts b/src/app/lnd/store/lnd.effects.ts index ca91fbe0..c33982ef 100644 --- a/src/app/lnd/store/lnd.effects.ts +++ b/src/app/lnd/store/lnd.effects.ts @@ -1200,8 +1200,8 @@ export class LNDEffects implements OnDestroy { map((settings: any) => { this.logger.info(settings); this.store.dispatch(updateLNDAPICallStatus({ payload: { action: 'FetchPageSettings', status: APICallStatusEnum.COMPLETED } })); - this.invoicesPageSize = (settings ? (settings.find((page) => page.pageId === 'transactions')?.tables.find((table) => table.tableId === 'invoices')) : LND_DEFAULT_PAGE_SETTINGS.find((page) => page.pageId === 'transactions')?.tables.find((table) => table.tableId === 'invoices')).recordsPerPage; - this.paymentsPageSize = (settings ? (settings.find((page) => page.pageId === 'transactions')?.tables.find((table) => table.tableId === 'payments')) : LND_DEFAULT_PAGE_SETTINGS.find((page) => page.pageId === 'transactions')?.tables.find((table) => table.tableId === 'payments')).recordsPerPage; + this.invoicesPageSize = (settings && Object.keys(settings).length > 0 ? (settings.find((page) => page.pageId === 'transactions')?.tables.find((table) => table.tableId === 'invoices')) : LND_DEFAULT_PAGE_SETTINGS.find((page) => page.pageId === 'transactions')?.tables.find((table) => table.tableId === 'invoices')).recordsPerPage; + this.paymentsPageSize = (settings && Object.keys(settings).length > 0 ? (settings.find((page) => page.pageId === 'transactions')?.tables.find((table) => table.tableId === 'payments')) : LND_DEFAULT_PAGE_SETTINGS.find((page) => page.pageId === 'transactions')?.tables.find((table) => table.tableId === 'payments')).recordsPerPage; this.store.dispatch(fetchInvoices({ payload: { num_max_invoices: this.invoicesPageSize, reversed: true } })); // this.store.dispatch(fetchPayments({ payload: { max_payments: 100000, reversed: true } })); return { diff --git a/src/app/lnd/store/lnd.reducers.ts b/src/app/lnd/store/lnd.reducers.ts index f80115a6..8e4381cf 100644 --- a/src/app/lnd/store/lnd.reducers.ts +++ b/src/app/lnd/store/lnd.reducers.ts @@ -226,7 +226,7 @@ export const LNDReducer = createReducer(initLNDState, on(setPageSettings, (state, { payload }) => { const newPageSettings: PageSettings[] = []; LND_DEFAULT_PAGE_SETTINGS.forEach((defaultPage) => { - const pageSetting = payload.find((p) => p.pageId === defaultPage.pageId) || null; + const pageSetting = payload && Object.keys(payload).length > 0 ? payload.find((p) => p.pageId === defaultPage.pageId) : null; if (pageSetting) { const tablesSettings = JSON.parse(JSON.stringify(pageSetting.tables)); pageSetting.tables = []; // To maintain settings order diff --git a/src/app/lnd/transactions/invoices/lightning-invoices.component.html b/src/app/lnd/transactions/invoices/lightning-invoices.component.html index aa445027..2b86596d 100644 --- a/src/app/lnd/transactions/invoices/lightning-invoices.component.html +++ b/src/app/lnd/transactions/invoices/lightning-invoices.component.html @@ -64,8 +64,8 @@ {{(invoice?.creation_date * 1000) | date:'dd/MMM/y HH:mm'}} - Date Settled - {{(+invoice?.settle_date !== 0 ? ((+invoice?.settle_date * 1000) | date:'dd/MMM/y HH:mm') : '-')}} + Date Settled + {{(+invoice?.settle_date !== 0 ? ((+invoice?.settle_date * 1000) | date:'dd/MMM/y HH:mm') : '-')}} Memo @@ -140,7 +140,7 @@ {{invoice?.amt_paid_sat | number}} - +
@@ -148,7 +148,7 @@
- +
diff --git a/src/app/lnd/transactions/invoices/lightning-invoices.component.scss b/src/app/lnd/transactions/invoices/lightning-invoices.component.scss index de41a0c5..83cc56a3 100644 --- a/src/app/lnd/transactions/invoices/lightning-invoices.component.scss +++ b/src/app/lnd/transactions/invoices/lightning-invoices.component.scss @@ -1,11 +1,9 @@ .mat-column-state { max-width: 1.2rem; width:1.2rem; - padding-right: 0.5rem; } .mat-column-private, .mat-column-is_keysend, .mat-column-is_amp { - padding-right: 0.5rem; max-width: 1.6rem; width:1.6rem; } diff --git a/src/app/lnd/transactions/lookup-transactions/lookup-transactions.component.scss b/src/app/lnd/transactions/lookup-transactions/lookup-transactions.component.scss index d45059cb..51956474 100644 --- a/src/app/lnd/transactions/lookup-transactions/lookup-transactions.component.scss +++ b/src/app/lnd/transactions/lookup-transactions/lookup-transactions.component.scss @@ -8,7 +8,3 @@ margin-bottom: 0; list-style-type: none; } - -.pl-3 { - padding-left: 3rem; -} \ No newline at end of file diff --git a/src/app/lnd/transactions/payments/lightning-payments.component.html b/src/app/lnd/transactions/payments/lightning-payments.component.html index 42f87219..1d5ba129 100644 --- a/src/app/lnd/transactions/payments/lightning-payments.component.html +++ b/src/app/lnd/transactions/payments/lightning-payments.component.html @@ -103,7 +103,7 @@ {{payment?.htlcs[0]?.route?.hops?.length || 0}} - +
@@ -111,7 +111,7 @@
- + @@ -130,7 +130,7 @@ - + @@ -143,7 +143,7 @@ Total Attempts: {{payment?.htlcs?.length}} - + {{(htlc.attempt_time_ns / 1000000) | date:'dd/MMM/y HH:mm'}} @@ -258,7 +258,7 @@ - + diff --git a/src/app/lnd/transactions/payments/lightning-payments.component.scss b/src/app/lnd/transactions/payments/lightning-payments.component.scss index 7876676c..5ac5845a 100644 --- a/src/app/lnd/transactions/payments/lightning-payments.component.scss +++ b/src/app/lnd/transactions/payments/lightning-payments.component.scss @@ -1,5 +1,6 @@ .mat-column-status, .mat-column-group_status { - width: 1.5rem; + max-width: 1.2rem; + width: 1.2rem; } .mat-column-payment_hash, .mat-column-payment_request, .mat-column-payment_preimage, .mat-column-description, .mat-column-description_hash { @@ -33,6 +34,9 @@ min-height: 4.2rem; place-content: center flex-start; align-items: center; + &:not(:first-of-type) { + padding-left: 3rem; + } &.ellipsis-parent { display: flex; } diff --git a/src/app/shared/components/ln-services/boltz/swaps/swaps.component.html b/src/app/shared/components/ln-services/boltz/swaps/swaps.component.html index e4505360..706397a7 100755 --- a/src/app/shared/components/ln-services/boltz/swaps/swaps.component.html +++ b/src/app/shared/components/ln-services/boltz/swaps/swaps.component.html @@ -17,97 +17,97 @@ {{swapStateEnum[swap?.status]}} - Swap ID - {{swap?.id}} + Swap ID + {{swap?.id}} - Claim Address - + Claim Address + {{swap?.claimAddress}} - Lockup Address - + Lockup Address + {{swap?.lockupAddress}} - Onchain Amount (Sats) - + Onchain Amount (Sats) + {{swap?.onchainAmount | number}} - Expected Amount (Sats) - + Expected Amount (Sats) + {{swap?.expectedAmount | number}} - Error - + Error + {{swap?.error}} - Private Key - + Private Key + {{swap?.privateKey}} - Preimage - + Preimage + {{swap?.preimage}} - Redeem Script - + Redeem Script + {{swap?.redeemScript}} - Invoice - + Invoice + {{swap?.invoice}} - Timeout Block Height - + Timeout Block Height + {{swap?.timeoutBlockHeight | number}} - Lockup Tx ID - {{swap?.lockupTransactionId}} + Lockup Tx ID + {{swap?.lockupTransactionId}} - Claim Tx ID - {{swap?.claimTransactionId}} + Claim Tx ID + {{swap?.claimTransactionId}} - Refund Tx ID - {{swap?.refundTransactionId}} + Refund Tx ID + {{swap?.refundTransactionId}} - +
@@ -115,7 +115,7 @@
- + diff --git a/src/app/shared/components/ln-services/loop/swaps/swaps.component.html b/src/app/shared/components/ln-services/loop/swaps/swaps.component.html index ef044f56..140be2b4 100755 --- a/src/app/shared/components/ln-services/loop/swaps/swaps.component.html +++ b/src/app/shared/components/ln-services/loop/swaps/swaps.component.html @@ -44,31 +44,31 @@ {{swap?.cost_onchain | number}} - HTLC Address - + HTLC Address + {{swap?.htlc_address}} - ID - + ID + {{swap?.id}} - ID (Bytes) - + ID (Bytes) + {{swap?.id_bytes}} - +
@@ -76,7 +76,7 @@
- + diff --git a/src/app/shared/components/transactions-report-table/transactions-report-table.component.html b/src/app/shared/components/transactions-report-table/transactions-report-table.component.html index 886db114..bcf8b4e9 100644 --- a/src/app/shared/components/transactions-report-table/transactions-report-table.component.html +++ b/src/app/shared/components/transactions-report-table/transactions-report-table.component.html @@ -30,7 +30,7 @@ {{transaction?.num_invoices | number}} - +
@@ -38,7 +38,7 @@
- + diff --git a/src/app/shared/services/consts-enums-functions.ts b/src/app/shared/services/consts-enums-functions.ts index 2f0737f7..0ac796ef 100644 --- a/src/app/shared/services/consts-enums-functions.ts +++ b/src/app/shared/services/consts-enums-functions.ts @@ -718,7 +718,7 @@ export const CLN_DEFAULT_PAGE_SETTINGS: PageSettings[] = [ columnSelection: ['offer_id', 'single_use', 'used'] }, { tableId: 'offer_bookmarks', recordsPerPage: PAGE_SIZE, sortBy: 'lastUpdatedAt', sortOrder: SortOrderEnum.DESCENDING, columnSelectionSM: ['lastUpdatedAt', 'amountMSat'], - columnSelection: ['lastUpdatedAt', 'title', 'amountMSat', 'description'] } + columnSelection: ['lastUpdatedAt', 'title', 'description', 'amountMSat'] } ] }, { pageId: 'routing', tables: [ { tableId: 'forwarding_history', recordsPerPage: PAGE_SIZE, sortBy: 'received_time', sortOrder: SortOrderEnum.DESCENDING, @@ -800,7 +800,7 @@ export const CLN_TABLES_DEF = { }, offer_bookmarks: { maxColumns: 6, - allowedColumns: ['lastUpdatedAt', 'title', 'amountMSat', 'description', 'vendor', 'bolt12'] + allowedColumns: ['lastUpdatedAt', 'title', 'description', 'vendor', 'bolt12', 'amountMSat'] } }, routing: { diff --git a/src/app/shared/theme/styles/root.scss b/src/app/shared/theme/styles/root.scss index 77125686..a9c37a0d 100644 --- a/src/app/shared/theme/styles/root.scss +++ b/src/app/shared/theme/styles/root.scss @@ -652,6 +652,16 @@ mat-cell:last-of-type, mat-header-cell:last-of-type, mat-footer-cell:last-of-typ } } +.pl-5px { + padding-left: 0.5rem !important; + @include for_screensize(tab-port) { + padding-left: 0.4rem !important; + } + @include for_screensize(phone) { + padding-left: 0.3rem !important; + } +} + .pl-1 { padding-left: 1rem !important; @include for_screensize(tab-port) { @@ -710,6 +720,10 @@ mat-cell:last-of-type, mat-header-cell:last-of-type, mat-footer-cell:last-of-typ padding-right: 0.4rem !important; } +.pr-6px { + padding-right: 0.6rem !important; +} + .p-0 { padding: 0 !important; } @@ -1343,7 +1357,7 @@ th.mat-header-cell:last-of-type, td.mat-cell:last-of-type, td.mat-footer-cell:la width: $dot-size; height: $dot-size; border-radius: $dot-size; - margin: 0.4rem 1rem 0 0; + margin: 0.4rem 0 0 0; &.tiny-dot { width: $tiny-dot-size; height: $tiny-dot-size; diff --git a/src/app/shared/theme/styles/theme-color.scss b/src/app/shared/theme/styles/theme-color.scss index a1dcd8db..68fd2f89 100644 --- a/src/app/shared/theme/styles/theme-color.scss +++ b/src/app/shared/theme/styles/theme-color.scss @@ -190,6 +190,9 @@ thead tr th { color: $foreground-base; } + thead tr th:not(:first-of-type), tbody tr td:not(:first-of-type) { + padding-left: 1rem; + } &.error-border { border: 1px solid red; box-shadow: 0 3px 1px -2px rgba(255,0,0,.2), 0 2px 2px 0 rgba(255,0,0,.14), 0 1px 5px 0 rgba(255,0,0,.12) !important;