Merge pull request #1207 from Ride-The-Lightning/Release-0.13.6

Release 0.13.6
Ride-The-Lightning · Feb 22, 2023 · ea75a70 · ea75a70
2 parents ffdcd2c + 813eb21
commit ea75a70
Show file tree

Hide file tree

Showing 31 changed files with 108 additions and 104 deletions.
diff --git a/backend/controllers/cln/payments.js b/backend/controllers/cln/payments.js
@@ -104,8 +104,8 @@ export const postPayment = (req, res, next) => {
         if (req.body.paymentType === 'OFFER') {
             if (req.body.saveToDB && req.body.bolt12) {
                 const offerToUpdate = { 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.issuer) {
+                    offerToUpdate['issuer'] = req.body.issuer;
                 }
                 if (req.body.description) {
                     offerToUpdate['description'] = req.body.description;

diff --git a/backend/models/database.model.js b/backend/models/database.model.js
@@ -3,15 +3,15 @@ export var OfferFieldsEnum;
     OfferFieldsEnum["BOLT12"] = "bolt12";
     OfferFieldsEnum["AMOUNTMSAT"] = "amountMSat";
     OfferFieldsEnum["TITLE"] = "title";
-    OfferFieldsEnum["VENDOR"] = "vendor";
+    OfferFieldsEnum["ISSUER"] = "issuer";
     OfferFieldsEnum["DESCRIPTION"] = "description";
 })(OfferFieldsEnum || (OfferFieldsEnum = {}));
 export class Offer {
-    constructor(bolt12, amountMSat, title, vendor, description, lastUpdatedAt) {
+    constructor(bolt12, amountMSat, title, issuer, description, lastUpdatedAt) {
         this.bolt12 = bolt12;
         this.amountMSat = amountMSat;
         this.title = title;
-        this.vendor = vendor;
+        this.issuer = issuer;
         this.description = description;
         this.lastUpdatedAt = lastUpdatedAt;
     }

diff --git a/backend/utils/common.js b/backend/utils/common.js
@@ -221,7 +221,7 @@ export class CommonService {
         };
         this.handleError = (errRes, fileName, errMsg, selectedNode) => {
             let err = JSON.parse(JSON.stringify(errRes));
-            if (Object.keys(err.error).length === 0 && errRes.error && (errRes.error.stack || errRes.error.message)) {
+            if (err && err.error && Object.keys(err.error).length === 0 && errRes.error && (errRes.error.stack || errRes.error.message)) {
                 errRes.error = errRes.error.stack || errRes.error.message;
                 err = JSON.parse(JSON.stringify(errRes));
             }

diff --git a/frontend/564.34d502899be1574e.js b/frontend/564.34d502899be1574e.js
diff --git a/frontend/564.f4d4e152dc4f0a63.js b/frontend/564.f4d4e152dc4f0a63.js
diff --git a/frontend/index.html b/frontend/index.html
@@ -10,9 +10,9 @@
     <link i18n-rel="" rel="mask-icon" href="assets/images/favicon-light/safari-pinned-tab.svg" color="#5bbad5">
     <meta i18n-content="" name="msapplication-TileColor" content="#da532c">
     <meta i18n-content="" name="theme-color" content="#ffffff">
-  <style>html{width:100%;height:99%;line-height:1.5;overflow-x:hidden;font-family:Roboto,sans-serif!important;font-size:100%}@media only screen and (max-width: 56.25em){html{font-size:90%}}@media only screen and (max-width: 37.5em){html{font-size:80%}}body{box-sizing:border-box;height:100%;margin:0;overflow:hidden}*{margin:0;padding:0}@font-face{font-family:Roboto;src:url(Roboto-Thin.f7a95c9c5999532c.woff2) format("woff2"),url(Roboto-Thin.c13c157cb81e8ebb.woff) format("woff");font-weight:100;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-ThinItalic.b0e084abf689f393.woff2) format("woff2"),url(Roboto-ThinItalic.1111028df6cea564.woff) format("woff");font-weight:100;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Light.0e01b6cd13b3857f.woff2) format("woff2"),url(Roboto-Light.603ca9a537b88428.woff) format("woff");font-weight:300;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-LightItalic.232ef4b20215f720.woff2) format("woff2"),url(Roboto-LightItalic.1b5e142f787151c8.woff) format("woff");font-weight:300;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Regular.475ba9e4e2d63456.woff2) format("woff2"),url(Roboto-Regular.bcefbfee882bc1cb.woff) format("woff");font-weight:400;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-RegularItalic.e3a9ebdaac06bbc4.woff2) format("woff2"),url(Roboto-RegularItalic.0668fae6af0cf8c2.woff) format("woff");font-weight:400;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Medium.457532032ceb0168.woff2) format("woff2"),url(Roboto-Medium.6e1ae5f0b324a0aa.woff) format("woff");font-weight:500;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-MediumItalic.872f7060602d55d2.woff2) format("woff2"),url(Roboto-MediumItalic.e06fb533801cbb08.woff) format("woff");font-weight:500;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Bold.447291a88c067396.woff2) format("woff2"),url(Roboto-Bold.fc482e6133cf5e26.woff) format("woff");font-weight:700;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-BoldItalic.1b15168ef6fa4e16.woff2) format("woff2"),url(Roboto-BoldItalic.e26ba339b06f09f7.woff) format("woff");font-weight:700;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Black.2eaa390d458c877d.woff2) format("woff2"),url(Roboto-Black.b25f67ad8583da68.woff) format("woff");font-weight:900;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-BlackItalic.7dc03ee444552bc5.woff2) format("woff2"),url(Roboto-BlackItalic.c8dc642467cb3099.woff) format("woff");font-weight:900;font-style:italic}</style><link rel="stylesheet" href="styles.c7a6e1a24b7a5469.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.c7a6e1a24b7a5469.css"></noscript></head>
+  <style>html{width:100%;height:99%;line-height:1.5;overflow-x:hidden;font-family:Roboto,sans-serif!important;font-size:100%}@media only screen and (max-width: 56.25em){html{font-size:90%}}@media only screen and (max-width: 37.5em){html{font-size:80%}}body{box-sizing:border-box;height:100%;margin:0;overflow:hidden}*{margin:0;padding:0}@font-face{font-family:Roboto;src:url(Roboto-Thin.f7a95c9c5999532c.woff2) format("woff2"),url(Roboto-Thin.c13c157cb81e8ebb.woff) format("woff");font-weight:100;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-ThinItalic.b0e084abf689f393.woff2) format("woff2"),url(Roboto-ThinItalic.1111028df6cea564.woff) format("woff");font-weight:100;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Light.0e01b6cd13b3857f.woff2) format("woff2"),url(Roboto-Light.603ca9a537b88428.woff) format("woff");font-weight:300;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-LightItalic.232ef4b20215f720.woff2) format("woff2"),url(Roboto-LightItalic.1b5e142f787151c8.woff) format("woff");font-weight:300;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Regular.475ba9e4e2d63456.woff2) format("woff2"),url(Roboto-Regular.bcefbfee882bc1cb.woff) format("woff");font-weight:400;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-RegularItalic.e3a9ebdaac06bbc4.woff2) format("woff2"),url(Roboto-RegularItalic.0668fae6af0cf8c2.woff) format("woff");font-weight:400;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Medium.457532032ceb0168.woff2) format("woff2"),url(Roboto-Medium.6e1ae5f0b324a0aa.woff) format("woff");font-weight:500;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-MediumItalic.872f7060602d55d2.woff2) format("woff2"),url(Roboto-MediumItalic.e06fb533801cbb08.woff) format("woff");font-weight:500;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Bold.447291a88c067396.woff2) format("woff2"),url(Roboto-Bold.fc482e6133cf5e26.woff) format("woff");font-weight:700;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-BoldItalic.1b15168ef6fa4e16.woff2) format("woff2"),url(Roboto-BoldItalic.e26ba339b06f09f7.woff) format("woff");font-weight:700;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Black.2eaa390d458c877d.woff2) format("woff2"),url(Roboto-Black.b25f67ad8583da68.woff) format("woff");font-weight:900;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-BlackItalic.7dc03ee444552bc5.woff2) format("woff2"),url(Roboto-BlackItalic.c8dc642467cb3099.woff) format("woff");font-weight:900;font-style:italic}</style><link rel="stylesheet" href="styles.69f6c7558eabf011.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.69f6c7558eabf011.css"></noscript></head>
   <body>
     <rtl-app></rtl-app>
-  <script src="runtime.865dd8ddb1f98109.js" type="module"></script><script src="polyfills.9720483e1820202a.js" type="module"></script><script src="main.e9d7a82157c70703.js" type="module"></script>
+  <script src="runtime.4565d399c2c0ce89.js" type="module"></script><script src="polyfills.9720483e1820202a.js" type="module"></script><script src="main.828ba9b6ca158ec5.js" type="module"></script>
 
 </body></html>
diff --git a/frontend/main.828ba9b6ca158ec5.js b/frontend/main.828ba9b6ca158ec5.js
diff --git a/frontend/main.e9d7a82157c70703.js b/frontend/main.e9d7a82157c70703.js
diff --git a/frontend/runtime.4565d399c2c0ce89.js b/frontend/runtime.4565d399c2c0ce89.js
diff --git a/frontend/runtime.865dd8ddb1f98109.js b/frontend/runtime.865dd8ddb1f98109.js
diff --git a/frontend/styles.69f6c7558eabf011.css b/frontend/styles.69f6c7558eabf011.css
diff --git a/frontend/styles.c7a6e1a24b7a5469.css b/frontend/styles.c7a6e1a24b7a5469.css
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rtl",
-  "version": "0.13.5-beta",
+  "version": "0.13.6-beta",
   "license": "MIT",
   "type": "module",
   "scripts": {

diff --git a/server/controllers/cln/payments.ts b/server/controllers/cln/payments.ts
@@ -92,7 +92,7 @@ export const postPayment = (req, res, next) => {
     if (req.body.paymentType === 'OFFER') {
       if (req.body.saveToDB && req.body.bolt12) {
         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.issuer) { offerToUpdate['issuer'] = req.body.issuer; }
         if (req.body.description) { offerToUpdate['description'] = req.body.description; }
         // eslint-disable-next-line arrow-body-style
         return databaseService.validateDocument(CollectionsEnum.OFFERS, offerToUpdate).then((validated) => {

diff --git a/server/models/database.model.ts b/server/models/database.model.ts
@@ -2,7 +2,7 @@ export enum OfferFieldsEnum {
   BOLT12 = 'bolt12',
   AMOUNTMSAT = 'amountMSat',
   TITLE = 'title',
-  VENDOR = 'vendor',
+  ISSUER = 'issuer',
   DESCRIPTION = 'description'
 }
 
@@ -12,7 +12,7 @@ export class Offer {
     public bolt12: string,
     public amountMSat: number,
     public title: string,
-    public vendor?: string,
+    public issuer?: string,
     public description?: string,
     public lastUpdatedAt?: number
   ) { }

diff --git a/server/utils/common.ts b/server/utils/common.ts
@@ -238,7 +238,7 @@ export class CommonService {
 
   public handleError = (errRes, fileName, errMsg, selectedNode: CommonSelectedNode) => {
     let err = JSON.parse(JSON.stringify(errRes));
-    if (Object.keys(err.error).length === 0 && errRes.error && (errRes.error.stack || errRes.error.message)) {
+    if (err && err.error && Object.keys(err.error).length === 0 && errRes.error && (errRes.error.stack || errRes.error.message)) {
       errRes.error = errRes.error.stack || errRes.error.message;
       err = JSON.parse(JSON.stringify(errRes));
     }

diff --git a/src/app/cln/store/cln.actions.ts b/src/app/cln/store/cln.actions.ts
@@ -121,7 +121,7 @@ export const fetchOffers = createAction(CLNActions.FETCH_OFFERS_CLN);
 
 export const setOffers = createAction(CLNActions.SET_OFFERS_CLN, props<{ payload: Offer[] }>());
 
-export const saveNewOffer = createAction(CLNActions.SAVE_NEW_OFFER_CLN, props<{ payload: { amount: string, description: string, vendor: string } }>());
+export const saveNewOffer = createAction(CLNActions.SAVE_NEW_OFFER_CLN, props<{ payload: { amount: string, description: string, issuer: string } }>());
 
 export const addOffer = createAction(CLNActions.ADD_OFFER_CLN, props<{ payload: Offer }>());
 

diff --git a/src/app/cln/store/cln.effects.ts b/src/app/cln/store/cln.effects.ts
@@ -752,11 +752,11 @@ export class CLNEffects implements OnDestroy {
 
   saveNewOfferCL = createEffect(() => this.actions.pipe(
     ofType(CLNActions.SAVE_NEW_OFFER_CLN),
-    mergeMap((action: { type: string, payload: { amount: string, description: string, vendor: string } }) => {
+    mergeMap((action: { type: string, payload: { amount: string, description: string, issuer: string } }) => {
       this.store.dispatch(openSpinner({ payload: UI_MESSAGES.CREATE_OFFER }));
       this.store.dispatch(updateCLAPICallStatus({ payload: { action: 'SaveNewOffer', status: APICallStatusEnum.INITIATED } }));
       return this.httpClient.post(this.CHILD_API_URL + API_END_POINTS.OFFERS_API, {
-        amount: action.payload.amount, description: action.payload.description, vendor: action.payload.vendor
+        amount: action.payload.amount, description: action.payload.description, issuer: action.payload.issuer
       }).pipe(map((postRes: Offer) => {
         this.logger.info(postRes);
         this.store.dispatch(updateCLAPICallStatus({ payload: { action: 'SaveNewOffer', status: APICallStatusEnum.COMPLETED } }));

diff --git a/src/app/cln/store/cln.reducers.ts b/src/app/cln/store/cln.reducers.ts
@@ -199,7 +199,7 @@ export const CLNReducer = createReducer(initCLNState,
       updatedOffer.amountMSat = payload.amountMSat;
       updatedOffer.lastUpdatedAt = payload.lastUpdatedAt;
       updatedOffer.description = payload.description;
-      updatedOffer.vendor = payload.vendor;
+      updatedOffer.issuer = payload.issuer;
       newOfferBMs.splice(offerBMExistsIdx, 1, updatedOffer);
     }
     return {

diff --git a/src/app/cln/transactions/offers/create-offer-modal/create-offer.component.html b/src/app/cln/transactions/offers/create-offer-modal/create-offer.component.html
@@ -20,8 +20,8 @@
             <mat-hint>{{offerValueHint}}</mat-hint>
           </mat-form-field>
           <mat-form-field fxLayout="column" fxFlex="58" fxLayoutAlign="start end">
-            <mat-label>Vendor</mat-label>
-            <input matInput tabindex="3" name="vendor" [(ngModel)]="vendor">
+            <mat-label>Issuer</mat-label>
+            <input matInput tabindex="3" name="issuer" [(ngModel)]="issuer">
           </mat-form-field>
           </div>
         <div *ngIf="offerError !== ''" fxFlex="100" class="alert alert-danger mt-1">