diff --git a/backend/controllers/cln/payments.js b/backend/controllers/cln/payments.js index 62d364de..09f01dcc 100644 --- a/backend/controllers/cln/payments.js +++ b/backend/controllers/cln/payments.js @@ -111,8 +111,9 @@ export const postPayment = (req, res, next) => { if (req.body.description) { offerToUpdate['description'] = req.body.description; } + // eslint-disable-next-line arrow-body-style return databaseService.validateDocument(CollectionsEnum.OFFERS, offerToUpdate).then((validated) => { - databaseService.update(req.session.selectedNode, CollectionsEnum.OFFERS, offerToUpdate, CollectionFieldsEnum.BOLT12, req.body.bolt12).then((updatedOffer) => { + return databaseService.update(req.session.selectedNode, CollectionsEnum.OFFERS, offerToUpdate, CollectionFieldsEnum.BOLT12, req.body.bolt12).then((updatedOffer) => { logger.log({ level: 'DEBUG', fileName: 'Payments', msg: 'Offer Updated', data: updatedOffer }); return res.status(201).json({ paymentResponse: body, saveToDBResponse: updatedOffer }); }).catch((errDB) => { diff --git a/server/controllers/cln/payments.ts b/server/controllers/cln/payments.ts index df004a0a..222b2db1 100644 --- a/server/controllers/cln/payments.ts +++ b/server/controllers/cln/payments.ts @@ -94,8 +94,9 @@ export const postPayment = (req, res, next) => { const offerToUpdate: Offer = { bolt12: req.body.bolt12, amountMSat: (req.body.zeroAmtOffer ? 0 : req.body.amount), title: req.body.title, lastUpdatedAt: new Date(Date.now()).getTime() }; if (req.body.vendor) { offerToUpdate['vendor'] = req.body.vendor; } if (req.body.description) { offerToUpdate['description'] = req.body.description; } + // eslint-disable-next-line arrow-body-style return databaseService.validateDocument(CollectionsEnum.OFFERS, offerToUpdate).then((validated) => { - databaseService.update(req.session.selectedNode, CollectionsEnum.OFFERS, offerToUpdate, CollectionFieldsEnum.BOLT12, req.body.bolt12).then((updatedOffer) => { + return databaseService.update(req.session.selectedNode, CollectionsEnum.OFFERS, offerToUpdate, CollectionFieldsEnum.BOLT12, req.body.bolt12).then((updatedOffer) => { logger.log({ level: 'DEBUG', fileName: 'Payments', msg: 'Offer Updated', data: updatedOffer }); return res.status(201).json({ paymentResponse: body, saveToDBResponse: updatedOffer }); }).catch((errDB) => { diff --git a/src/app/cln/routing/routing-peers/routing-peers.component.scss b/src/app/cln/routing/routing-peers/routing-peers.component.scss index fcd63fdf..e69de29b 100644 --- a/src/app/cln/routing/routing-peers/routing-peers.component.scss +++ b/src/app/cln/routing/routing-peers/routing-peers.component.scss @@ -1,6 +0,0 @@ -.mat-column-channelId, .mat-column-alias { - flex: 1 1 10%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} diff --git a/src/app/cln/sign-verify-message/sign/sign.component.scss b/src/app/cln/sign-verify-message/sign/sign.component.scss index d67b1ba8..e69de29b 100644 --- a/src/app/cln/sign-verify-message/sign/sign.component.scss +++ b/src/app/cln/sign-verify-message/sign/sign.component.scss @@ -1,6 +0,0 @@ -.mat-column-channel_point { - flex: 1 1 25%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} diff --git a/src/app/cln/sign-verify-message/verify/verify.component.scss b/src/app/cln/sign-verify-message/verify/verify.component.scss index d67b1ba8..e69de29b 100644 --- a/src/app/cln/sign-verify-message/verify/verify.component.scss +++ b/src/app/cln/sign-verify-message/verify/verify.component.scss @@ -1,6 +0,0 @@ -.mat-column-channel_point { - flex: 1 1 25%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} 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 797547ad..9b6ddff1 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 @@ -7,7 +7,7 @@ import { MatPaginator, MatPaginatorIntl } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; -import { PAGE_SIZE, PAGE_SIZE_OPTIONS, getPaginatorLabel, ScreenSizeEnum, APICallStatusEnum, PaymentTypes, AlertTypeEnum, SortOrderEnum, CLN_DEFAULT_PAGE_SETTINGS } from '../../../../shared/services/consts-enums-functions'; +import { PAGE_SIZE, PAGE_SIZE_OPTIONS, getPaginatorLabel, ScreenSizeEnum, APICallStatusEnum, PaymentTypes, AlertTypeEnum, SortOrderEnum, CLN_DEFAULT_PAGE_SETTINGS, UI_MESSAGES } from '../../../../shared/services/consts-enums-functions'; import { ApiCallStatusPayload } from '../../../../shared/models/apiCallsPayload'; import { OfferBookmark } from '../../../../shared/models/clnModels'; import { LoggerService } from '../../../../shared/services/logger.service'; @@ -19,7 +19,7 @@ import { openAlert, openConfirmation } from '../../../../store/rtl.actions'; import { clnPageSettings, offerBookmarks } from '../../../store/cln.selector'; import { CLNOfferInformationComponent } from '../offer-information-modal/offer-information.component'; import { CLNLightningSendPaymentsComponent } from '../../send-payment-modal/send-payment.component'; -import { deleteOfferBookmark } from '../../../store/cln.actions'; +import { deleteOfferBookmark, sendPayment } from '../../../store/cln.actions'; import { PageSettings, TableSetting } from '../../../../shared/models/pageSettings'; @Component({ @@ -82,7 +82,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.sort && this.paginator && this.displayedColumns.length > 0) { this.loadOffersTable(this.offersBookmarksJSONArr); } this.logger.info(offerBMsSeletor); @@ -90,7 +90,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.sort && this.paginator && this.displayedColumns.length > 0) { this.loadOffersTable(this.offersBookmarksJSONArr); } } diff --git a/src/app/cln/transactions/send-payment-modal/send-payment.component.html b/src/app/cln/transactions/send-payment-modal/send-payment.component.html index 165703e7..f05d4455 100644 --- a/src/app/cln/transactions/send-payment-modal/send-payment.component.html +++ b/src/app/cln/transactions/send-payment-modal/send-payment.component.html @@ -4,7 +4,7 @@