ECL Remove subscription from payment relayed

backend/controllers/eclair/channels.js

@@ -83,7 +83,13 @@ export const getChannelStats = (req, res, next) => {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
     options.url = req.session.selectedNode.ln_server_url + '/channelstats';
-    options.form = {};
+    const today = new Date(Date.now());
+    const tillToday = (Math.round(today.getTime() / 1000)).toString();
+    const fromLastMonth = (Math.round(new Date(today.getFullYear(), today.getMonth() - 1, today.getDate() + 1, 0, 0, 0).getTime() / 1000)).toString();
+    options.form = {
+        from: fromLastMonth,
+        to: tillToday
+    };
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Channel States Received', data: body });
         res.status(201).json(body);

backend/controllers/eclair/webSocketClient.js

@@ -2,6 +2,7 @@ import WebSocket from 'ws';
 import { Logger } from '../../utils/logger.js';
 import { Common } from '../../utils/common.js';
 import { WSServer } from '../../utils/webSocketServer.js';
+import { ECLWSEventsEnum } from '../../models/ecl.model.js';
 export class ECLWebSocketClient {
     constructor() {
         this.logger = Logger;
@@ -66,9 +67,11 @@ export class ECLWebSocketClient {
             eclWsClt.webSocketClient.onmessage = (msg) => {
                 this.logger.log({ selectedNode: eclWsClt.selectedNode, level: 'DEBUG', fileName: 'ECLWebSocket', msg: 'Received message from the server..', data: msg.data });
                 msg = (typeof msg.data === 'string') ? JSON.parse(msg.data) : msg.data;
-                msg['source'] = 'ECL';
+                if (msg.type && msg.type !== ECLWSEventsEnum.PAY_RELAYED && msg.type !== ECLWSEventsEnum.PAY_SETTLING_ONCHAIN && msg.type !== ECLWSEventsEnum.ONION_MESSAGE_RECEIVED) {
-                const msgStr = JSON.stringify(msg);
+                    msg['source'] = 'ECL';
-                this.wsServer.sendEventsToAllLNClients(msgStr, eclWsClt.selectedNode);
+                    const msgStr = JSON.stringify(msg);
+                    this.wsServer.sendEventsToAllLNClients(msgStr, eclWsClt.selectedNode);
+                }
             };
             eclWsClt.webSocketClient.onerror = (err) => {
                 if (eclWsClt.selectedNode.ln_version === '' || !eclWsClt.selectedNode.ln_version || this.common.isVersionCompatible(eclWsClt.selectedNode.ln, '0.5.0')) {

backend/models/ecl.model.js

@@ -0,0 +1,12 @@
+export var ECLWSEventsEnum;
+(function (ECLWSEventsEnum) {
+    ECLWSEventsEnum["PAY_RECEIVED"] = "payment-received";
+    ECLWSEventsEnum["PAY_RELAYED"] = "payment-relayed";
+    ECLWSEventsEnum["PAY_SENT"] = "payment-sent";
+    ECLWSEventsEnum["PAY_SETTLING_ONCHAIN"] = "payment-settling-onchain";
+    ECLWSEventsEnum["PAY_FAILED"] = "payment-failed";
+    ECLWSEventsEnum["CHANNEL_OPENED"] = "channel-opened";
+    ECLWSEventsEnum["CHANNEL_STATE_CHANGED"] = "channel-state-changed";
+    ECLWSEventsEnum["CHANNEL_CLOSED"] = "channel-closed";
+    ECLWSEventsEnum["ONION_MESSAGE_RECEIVED"] = "onion-message-received";
+})(ECLWSEventsEnum || (ECLWSEventsEnum = {}));

frontend/index.html

@@ -10,10 +10,10 @@
   <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.cf06a3d3a144f8f9.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.cf06a3d3a144f8f9.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.3f91aa9da8de48ca.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.3f91aa9da8de48ca.css"></noscript></head>
 <body>
   <rtl-app></rtl-app>
-<script src="runtime.1dbe591aab818307.js" type="module"></script><script src="polyfills.08e0233279c8a187.js" type="module"></script><script src="main.b312410aefaae817.js" type="module"></script>
+<script src="runtime.b596fe986bf24642.js" type="module"></script><script src="polyfills.08e0233279c8a187.js" type="module"></script><script src="main.5a72aaa7ca7fb8a9.js" type="module"></script>
 <script>window.global = window;</script>
 
 </body></html>

frontend/runtime.b596fe986bf24642.js

@@ -1 +1 @@
-(()=>{"use strict";var e,v={},m={};function r(e){var f=m[e];if(void 0!==f)return f.exports;var t=m[e]={id:e,loaded:!1,exports:{}};return v[e].call(t.exports,t,t.exports,r),t.loaded=!0,t.exports}r.m=v,e=[],r.O=(f,t,i,o)=>{if(!t){var a=1/0;for(n=0;n<e.length;n++){for(var[t,i,o]=e[n],c=!0,l=0;l<t.length;l++)(!1&o||a>=o)&&Object.keys(r.O).every(b=>r.O[b](t[l]))?t.splice(l--,1):(c=!1,o<a&&(a=o));if(c){e.splice(n--,1);var d=i();void 0!==d&&(f=d)}}return f}o=o||0;for(var n=e.length;n>0&&e[n-1][2]>o;n--)e[n]=e[n-1];e[n]=[t,i,o]},r.d=(e,f)=>{for(var t in f)r.o(f,t)&&!r.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:f[t]})},r.f={},r.e=e=>Promise.all(Object.keys(r.f).reduce((f,t)=>(r.f[t](e,f),f),[])),r.u=e=>e+"."+{258:"82f463c92bfb465c",267:"6c439858ec5d06c8",564:"456719c78487c8a1",636:"5b9b8a74b97febb5"}[e]+".js",r.miniCssF=e=>{},r.o=(e,f)=>Object.prototype.hasOwnProperty.call(e,f),(()=>{var e={},f="RTLApp:";r.l=(t,i,o,n)=>{if(e[t])e[t].push(i);else{var a,c;if(void 0!==o)for(var l=document.getElementsByTagName("script"),d=0;d<l.length;d++){var u=l[d];if(u.getAttribute("src")==t||u.getAttribute("data-webpack")==f+o){a=u;break}}a||(c=!0,(a=document.createElement("script")).type="module",a.charset="utf-8",a.timeout=120,r.nc&&a.setAttribute("nonce",r.nc),a.setAttribute("data-webpack",f+o),a.src=r.tu(t)),e[t]=[i];var s=(g,b)=>{a.onerror=a.onload=null,clearTimeout(p);var h=e[t];if(delete e[t],a.parentNode&&a.parentNode.removeChild(a),h&&h.forEach(y=>y(b)),g)return g(b)},p=setTimeout(s.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=s.bind(null,a.onerror),a.onload=s.bind(null,a.onload),c&&document.head.appendChild(a)}}})(),r.r=e=>{typeof Symbol<"u"&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e;r.tt=()=>(void 0===e&&(e={createScriptURL:f=>f},typeof trustedTypes<"u"&&trustedTypes.createPolicy&&(e=trustedTypes.createPolicy("angular#bundler",e))),e)})(),r.tu=e=>r.tt().createScriptURL(e),r.p="",(()=>{var e={666:0};r.f.j=(i,o)=>{var n=r.o(e,i)?e[i]:void 0;if(0!==n)if(n)o.push(n[2]);else if(666!=i){var a=new Promise((u,s)=>n=e[i]=[u,s]);o.push(n[2]=a);var c=r.p+r.u(i),l=new Error;r.l(c,u=>{if(r.o(e,i)&&(0!==(n=e[i])&&(e[i]=void 0),n)){var s=u&&("load"===u.type?"missing":u.type),p=u&&u.target&&u.target.src;l.message="Loading chunk "+i+" failed.\n("+s+": "+p+")",l.name="ChunkLoadError",l.type=s,l.request=p,n[1](l)}},"chunk-"+i,i)}else e[i]=0},r.O.j=i=>0===e[i];var f=(i,o)=>{var l,d,[n,a,c]=o,u=0;if(n.some(p=>0!==e[p])){for(l in a)r.o(a,l)&&(r.m[l]=a[l]);if(c)var s=c(r)}for(i&&i(o);u<n.length;u++)r.o(e,d=n[u])&&e[d]&&e[d][0](),e[d]=0;return r.O(s)},t=self.webpackChunkRTLApp=self.webpackChunkRTLApp||[];t.forEach(f.bind(null,0)),t.push=f.bind(null,t.push.bind(t))})()})();
+(()=>{"use strict";var e,v={},m={};function r(e){var f=m[e];if(void 0!==f)return f.exports;var t=m[e]={id:e,loaded:!1,exports:{}};return v[e].call(t.exports,t,t.exports,r),t.loaded=!0,t.exports}r.m=v,e=[],r.O=(f,t,i,o)=>{if(!t){var a=1/0;for(n=0;n<e.length;n++){for(var[t,i,o]=e[n],c=!0,l=0;l<t.length;l++)(!1&o||a>=o)&&Object.keys(r.O).every(b=>r.O[b](t[l]))?t.splice(l--,1):(c=!1,o<a&&(a=o));if(c){e.splice(n--,1);var d=i();void 0!==d&&(f=d)}}return f}o=o||0;for(var n=e.length;n>0&&e[n-1][2]>o;n--)e[n]=e[n-1];e[n]=[t,i,o]},r.d=(e,f)=>{for(var t in f)r.o(f,t)&&!r.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:f[t]})},r.f={},r.e=e=>Promise.all(Object.keys(r.f).reduce((f,t)=>(r.f[t](e,f),f),[])),r.u=e=>e+"."+{258:"8c905f616b237cf7",267:"6c439858ec5d06c8",564:"e4b10e1a59f4b1fa",636:"a2d00cd50d45fcbf"}[e]+".js",r.miniCssF=e=>{},r.o=(e,f)=>Object.prototype.hasOwnProperty.call(e,f),(()=>{var e={},f="RTLApp:";r.l=(t,i,o,n)=>{if(e[t])e[t].push(i);else{var a,c;if(void 0!==o)for(var l=document.getElementsByTagName("script"),d=0;d<l.length;d++){var u=l[d];if(u.getAttribute("src")==t||u.getAttribute("data-webpack")==f+o){a=u;break}}a||(c=!0,(a=document.createElement("script")).type="module",a.charset="utf-8",a.timeout=120,r.nc&&a.setAttribute("nonce",r.nc),a.setAttribute("data-webpack",f+o),a.src=r.tu(t)),e[t]=[i];var s=(g,b)=>{a.onerror=a.onload=null,clearTimeout(p);var h=e[t];if(delete e[t],a.parentNode&&a.parentNode.removeChild(a),h&&h.forEach(y=>y(b)),g)return g(b)},p=setTimeout(s.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=s.bind(null,a.onerror),a.onload=s.bind(null,a.onload),c&&document.head.appendChild(a)}}})(),r.r=e=>{typeof Symbol<"u"&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e;r.tt=()=>(void 0===e&&(e={createScriptURL:f=>f},typeof trustedTypes<"u"&&trustedTypes.createPolicy&&(e=trustedTypes.createPolicy("angular#bundler",e))),e)})(),r.tu=e=>r.tt().createScriptURL(e),r.p="",(()=>{var e={666:0};r.f.j=(i,o)=>{var n=r.o(e,i)?e[i]:void 0;if(0!==n)if(n)o.push(n[2]);else if(666!=i){var a=new Promise((u,s)=>n=e[i]=[u,s]);o.push(n[2]=a);var c=r.p+r.u(i),l=new Error;r.l(c,u=>{if(r.o(e,i)&&(0!==(n=e[i])&&(e[i]=void 0),n)){var s=u&&("load"===u.type?"missing":u.type),p=u&&u.target&&u.target.src;l.message="Loading chunk "+i+" failed.\n("+s+": "+p+")",l.name="ChunkLoadError",l.type=s,l.request=p,n[1](l)}},"chunk-"+i,i)}else e[i]=0},r.O.j=i=>0===e[i];var f=(i,o)=>{var l,d,[n,a,c]=o,u=0;if(n.some(p=>0!==e[p])){for(l in a)r.o(a,l)&&(r.m[l]=a[l]);if(c)var s=c(r)}for(i&&i(o);u<n.length;u++)r.o(e,d=n[u])&&e[d]&&e[d][0](),e[d]=0;return r.O(s)},t=self.webpackChunkRTLApp=self.webpackChunkRTLApp||[];t.forEach(f.bind(null,0)),t.push=f.bind(null,t.push.bind(t))})()})();

server/controllers/eclair/channels.ts

@@ -81,7 +81,13 @@ export const getChannelStats = (req, res, next) => {
   options = common.getOptions(req);
   if (options.error) { return res.status(options.statusCode).json({ message: options.message, error: options.error }); }
   options.url = req.session.selectedNode.ln_server_url + '/channelstats';
-  options.form = {};
+  const today = new Date(Date.now());
+  const tillToday = (Math.round(today.getTime() / 1000)).toString();
+  const fromLastMonth = (Math.round(new Date(today.getFullYear(), today.getMonth() - 1, today.getDate() + 1, 0, 0, 0).getTime() / 1000)).toString();
+  options.form = {
+    from: fromLastMonth,
+    to: tillToday
+  };
   request.post(options).then((body) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Channel States Received', data: body });
     res.status(201).json(body);

server/controllers/eclair/webSocketClient.ts

@@ -4,6 +4,7 @@ import { Logger, LoggerService } from '../../utils/logger.js';
 import { Common, CommonService } from '../../utils/common.js';
 import { WSServer } from '../../utils/webSocketServer.js';
 import { CommonSelectedNode } from '../../models/config.model.js';
+import { ECLWSEventsEnum } from '../../models/ecl.model.js';
 
 export class ECLWebSocketClient {
 
@@ -77,9 +78,11 @@ export class ECLWebSocketClient {
     eclWsClt.webSocketClient.onmessage = (msg) => {
       this.logger.log({ selectedNode: eclWsClt.selectedNode, level: 'DEBUG', fileName: 'ECLWebSocket', msg: 'Received message from the server..', data: msg.data });
       msg = (typeof msg.data === 'string') ? JSON.parse(msg.data) : msg.data;
-      msg['source'] = 'ECL';
+      if (msg.type && msg.type !== ECLWSEventsEnum.PAY_RELAYED && msg.type !== ECLWSEventsEnum.PAY_SETTLING_ONCHAIN && msg.type !== ECLWSEventsEnum.ONION_MESSAGE_RECEIVED) {
-      const msgStr = JSON.stringify(msg);
+        msg['source'] = 'ECL';
-      this.wsServer.sendEventsToAllLNClients(msgStr, eclWsClt.selectedNode);
+        const msgStr = JSON.stringify(msg);
+        this.wsServer.sendEventsToAllLNClients(msgStr, eclWsClt.selectedNode);
+      }
     };
 
     eclWsClt.webSocketClient.onerror = (err) => {

server/models/ecl.model.ts

@@ -0,0 +1,12 @@
+export enum ECLWSEventsEnum {
+    PAY_RECEIVED = 'payment-received',
+    PAY_RELAYED = 'payment-relayed',
+    PAY_SENT = 'payment-sent',
+    PAY_SETTLING_ONCHAIN = 'payment-settling-onchain',
+    PAY_FAILED = 'payment-failed',
+    CHANNEL_OPENED = 'channel-opened',
+    CHANNEL_STATE_CHANGED = 'channel-state-changed',
+    CHANNEL_CLOSED = 'channel-closed',
+    ONION_MESSAGE_RECEIVED = 'onion-message-received'
+  }
+  

src/app/cln/liquidity-ads/open-liquidity-channel-modal/open-liquidity-channel-modal.component.html

@@ -25,7 +25,7 @@
           <mat-form-field fxLayout="column" fxFlex="30" fxLayoutAlign="start end">
             <mat-label>Local Amount</mat-label>
             <input #lamount="ngModel" matInput type="number" tabindex="3" required name="lamount" [step]="10000" [min]="20000" [max]="totalBalance" [(ngModel)]="localAmount">
-            <mat-hint>Remaining Bal: {{totalBalance - ((localAmount) ? localAmount : 0) | number}}</mat-hint>
+            <mat-hint>Remaining: {{totalBalance - ((localAmount) ? localAmount : 0) | number}}</mat-hint>
             <span matSuffix> Sats </span>
             <mat-error *ngIf="lamount.errors?.required">Local amount is required.</mat-error>
             <mat-error *ngIf="lamount.errors?.min">Local amount must be greater than or equal to 20,000 Sats. It's required to cover the channel force close fee, if needed.</mat-error>

src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html

@@ -130,7 +130,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="no_peer">
-        <td *matFooterCellDef  mat-footer-cell colspan="4">
+        <td *matFooterCellDef  mat-footer-cell colspan="5">
           <p *ngIf="numPeers<1 && (!channels?.data || channels?.data?.length<1) && apiCallStatus.status === apiCallStatusEnum.COMPLETED">No peers connected. Add a peer in order to open a channel.</p>
           <p *ngIf="numPeers>0 && (!channels?.data || channels?.data?.length<1) && apiCallStatus.status === apiCallStatusEnum.COMPLETED">No channel available.</p>
           <p *ngIf="(!channels?.data || channels?.data?.length<1) && apiCallStatus.status === apiCallStatusEnum.INITIATED">Getting channels...</p>

src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html

@@ -115,7 +115,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="no_peer">
-        <td *matFooterCellDef  mat-footer-cell colspan="4">
+        <td *matFooterCellDef  mat-footer-cell colspan="5">
           <p *ngIf="numPeers<1 && (!channels?.data || channels?.data?.length<1) && apiCallStatus.status === apiCallStatusEnum.COMPLETED">No peers connected. Add a peer in order to open a channel.</p>
           <p *ngIf="numPeers>0 && (!channels?.data || channels?.data?.length<1) && apiCallStatus.status === apiCallStatusEnum.COMPLETED">No pending/inactive channel available.</p>
           <p *ngIf="(!channels?.data || channels?.data?.length<1) && apiCallStatus.status === apiCallStatusEnum.INITIATED">Getting pending/inactive channels...</p>

src/app/cln/peers-channels/channels/open-channel-modal/open-channel.component.html

@@ -25,7 +25,7 @@
             <mat-form-field fxLayout="column" fxFlex="70" fxLayoutAlign="start end">
               <mat-label>Amount</mat-label>
               <input #amount="ngModel" matInput type="number" tabindex="1" required name="amount" [step]="1000" [min]="1" [max]="totalBalance" [disabled]="flgUseAllBalance" [(ngModel)]="fundingAmount">
-              <mat-hint>Remaining Bal: {{totalBalance - ((fundingAmount) ? fundingAmount : 0) | number}}{{flgUseAllBalance ? '. Amount replaced by UTXO balance' : ''}}</mat-hint>
+              <mat-hint>Remaining: {{totalBalance - ((fundingAmount) ? fundingAmount : 0) | number}}{{flgUseAllBalance ? '. Amount replaced by UTXO balance' : ''}}</mat-hint>
               <span matSuffix> Sats </span>
               <mat-error *ngIf="amount.errors?.required || !fundingAmount">Amount is required.</mat-error>
               <mat-error *ngIf="amount.errors?.max">Amount must be less than or equal to {{totalBalance}}.</mat-error>

src/app/cln/peers-channels/connect-peer/connect-peer.component.html

@@ -31,21 +31,21 @@
               <ng-template matStepLabel disabled="true">{{channelFormLabel}}</ng-template>
               <div fxLayout="column" fxFlex="100" fxLayoutAlign="start stretch">
                 <div fxLayout="column" fxLayoutAlign="space-between stretch" fxLayout.gt-sm="row" fxFlex="100" fxLayoutAlign.gt-sm="space-between center">
-                  <mat-form-field fxLayout="column" fxFlex="60" fxLayoutAlign="start end">
+                  <mat-form-field fxLayout="column" fxFlex="53" fxLayoutAlign="start end">
                     <mat-label>Amount</mat-label>
                     <input matInput autoFocus formControlName="fundingAmount" type="number" tabindex="1" required [step]="1000">
-                    <mat-hint>Remaining Bal: {{totalBalance - ((channelFormGroup.controls.fundingAmount.value) ? channelFormGroup.controls.fundingAmount.value : 0)}}</mat-hint>
+                    <mat-hint>Remaining: {{totalBalance - ((channelFormGroup.controls.fundingAmount.value) ? channelFormGroup.controls.fundingAmount.value : 0) | number}}</mat-hint>
                     <span matSuffix> Sats </span>
                     <mat-error *ngIf="channelFormGroup.controls.fundingAmount.errors?.required">Amount is required.</mat-error>
                     <mat-error *ngIf="channelFormGroup.controls.fundingAmount.errors?.min">Amount must be a positive number.</mat-error>
                     <mat-error *ngIf="channelFormGroup.controls.fundingAmount.errors?.max">Amount must be less than or equal to {{totalBalance}}.</mat-error>
                   </mat-form-field>
-                  <div fxFlex="35" fxLayoutAlign="start center" class="mb-2">
+                  <div fxFlex="45" fxLayoutAlign="start center">
                     <mat-slide-toggle tabindex="2" color="primary" formControlName="isPrivate" name="isPrivate">Private Channel</mat-slide-toggle>
                   </div>
                 </div>
                 <div fxLayout="column" fxLayoutAlign="space-between stretch" fxLayout.gt-sm="row wrap" fxFlex="100" fxLayoutAlign.gt-sm="space-between center">
-                  <div fxFlex="60" fxLayoutAlign="space-between end">
+                  <div fxFlex="53" fxLayoutAlign="space-between end">
                     <mat-form-field fxLayout="column" fxLayoutAlign="start center" [fxFlex]="channelFormGroup.controls.selFeeRate.value === 'customperkb' && !channelFormGroup.controls.flgMinConf.value ? '48' : '100'">
                       <mat-label>Fee Rate</mat-label>
                       <mat-select tabindex="4" formControlName="selFeeRate">
@@ -54,14 +54,14 @@
                         </mat-option>
                       </mat-select>
                     </mat-form-field>
-                    <mat-form-field *ngIf="channelFormGroup.controls.selFeeRate.value === 'customperkb' && !channelFormGroup.controls.flgMinConf.value" fxFlex="48" fxLayoutAlign="end center">
+                    <mat-form-field *ngIf="channelFormGroup.controls.selFeeRate.value === 'customperkb' && !channelFormGroup.controls.flgMinConf.value" fxLayout="column" fxFlex="48" fxLayoutAlign="end center">
                       <mat-label>Fee Rate (Sats/vByte)</mat-label>
                       <input matInput formControlName="customFeeRate" type="number" name="custFeeRate" tabindex="4" [step]="0.1" [min]="0">
                       <mat-error *ngIf="channelFormGroup.controls.selFeeRate.value === 'customperkb' && !channelFormGroup.controls.flgMinConf.value && !channelFormGroup.controls.customFeeRate.value">Fee Rate is required.</mat-error>
                     </mat-form-field>
                   </div>
-                  <div fxFlex="35" fxLayout="row" fxLayoutAlign="start center">
+                  <div fxFlex="45" fxLayout="row" fxLayoutAlign="start center">
-                    <mat-checkbox fxFlex="7" tabindex="5" color="primary" formControlName="flgMinConf" fxLayoutAlign="stretch start" class="mb-2" [ngClass]="{'mr-6': screenSize === screenSizeEnum.XS || screenSize === screenSizeEnum.SM, 'mr-2': screenSize === screenSizeEnum.MD || screenSize === screenSizeEnum.LG || screenSize === screenSizeEnum.XL}"></mat-checkbox>
+                    <mat-checkbox fxFlex="7" tabindex="5" color="primary" formControlName="flgMinConf" fxLayoutAlign="stretch start" [ngClass]="{'mr-6': screenSize === screenSizeEnum.XS || screenSize === screenSizeEnum.SM, 'mr-2': screenSize === screenSizeEnum.MD || screenSize === screenSizeEnum.LG || screenSize === screenSizeEnum.XL}"></mat-checkbox>
                     <mat-form-field fxLayout="column" fxFlex="93">
                       <mat-label>Min Confirmation Blocks</mat-label>
                       <input matInput formControlName="minConfValue" type="number" name="blocks" tabindex="8" [step]="1" [min]="0" [required]="channelFormGroup.controls.flgMinConf.value">

src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html

@@ -117,8 +117,8 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="no_peer">
-        <td *matFooterCellDef  mat-footer-cell colspan="4">
+        <td *matFooterCellDef  mat-footer-cell colspan="5">
-          <p *ngIf="numPeers<1 && (!channels?.data || channels?.data?.length<1) && apiCallStatus.status === apiCallStatusEnum.COMPLETED">No peers connected. Add a peer in order to open a channel?.</p>
+          <p *ngIf="numPeers<1 && (!channels?.data || channels?.data?.length<1) && apiCallStatus.status === apiCallStatusEnum.COMPLETED">No peers connected. Add a peer in order to open a channel.</p>
           <p *ngIf="numPeers>0 && (!channels?.data || channels?.data?.length<1) && apiCallStatus.status === apiCallStatusEnum.COMPLETED">No channel available.</p>
           <p *ngIf="(!channels?.data || channels?.data?.length<1) && apiCallStatus.status === apiCallStatusEnum.INITIATED">Getting channels...</p>
           <p *ngIf="(!channels?.data || channels?.data?.length<1) && apiCallStatus.status === apiCallStatusEnum.ERROR">{{errorMessage}}</p>

src/app/eclair/peers-channels/channels/open-channel-modal/open-channel.component.html

@@ -25,7 +25,7 @@
             <mat-form-field fxLayout="column" fxFlex="70" fxLayoutAlign="start end">
               <mat-label>Amount</mat-label>
               <input #amount="ngModel" matInput type="number" tabindex="1" required name="amount" [step]="1000" [min]="1" [max]="totalBalance" [(ngModel)]="fundingAmount">
-              <mat-hint>Remaining Bal: {{totalBalance - ((fundingAmount) ? fundingAmount : 0) | number}}</mat-hint>
+              <mat-hint>Remaining: {{totalBalance - ((fundingAmount) ? fundingAmount : 0) | number}}</mat-hint>
               <span matSuffix>  Sats </span>
               <mat-error *ngIf="amount.errors?.required">Amount is required.</mat-error>
               <mat-error *ngIf="amount.errors?.max">Amount must be less than or equal to {{totalBalance}}.</mat-error>

src/app/eclair/peers-channels/connect-peer/connect-peer.component.html

@@ -34,7 +34,7 @@
                   <mat-form-field fxLayout="column" fxFlex="30" fxLayoutAlign="start end">
                     <mat-label>Amount</mat-label>
                     <input matInput autoFocus formControlName="fundingAmount" type="number" tabindex="1" required [step]="1000">
-                    <mat-hint>Remaining Bal: {{totalBalance - ((channelFormGroup.controls.fundingAmount.value) ? channelFormGroup.controls.fundingAmount.value : 0)}}</mat-hint>
+                    <mat-hint>Remaining: {{totalBalance - ((channelFormGroup.controls.fundingAmount.value) ? channelFormGroup.controls.fundingAmount.value : 0) | number}}</mat-hint>
                     <span matSuffix> Sats </span>
                     <mat-error *ngIf="channelFormGroup.controls.fundingAmount.errors?.required">Amount is required.</mat-error>
                     <mat-error *ngIf="channelFormGroup.controls.fundingAmount.errors?.min">Amount must be a positive number.</mat-error>

src/app/eclair/routing/forwarding-history/forwarding-history.component.ts

@@ -79,18 +79,16 @@ export class ECLForwardingHistoryComponent implements OnInit, OnChanges, AfterVi
       });
     this.store.select(payments).pipe(takeUntil(this.unSubs[1])).
       subscribe((paymentsSelector: { payments: Payments, apiCallStatus: ApiCallStatusPayload }) => {
-        if (this.eventsData.length === 0) {
+        this.errorMessage = '';
-          this.errorMessage = '';
+        this.apiCallStatus = paymentsSelector.apiCallStatus;
-          this.apiCallStatus = paymentsSelector.apiCallStatus;
+        if (this.apiCallStatus.status === APICallStatusEnum.ERROR) {
-          if (this.apiCallStatus.status === APICallStatusEnum.ERROR) {
+          this.errorMessage = !this.apiCallStatus.message ? '' : (typeof (this.apiCallStatus.message) === 'object') ? JSON.stringify(this.apiCallStatus.message) : this.apiCallStatus.message;
-            this.errorMessage = !this.apiCallStatus.message ? '' : (typeof (this.apiCallStatus.message) === 'object') ? JSON.stringify(this.apiCallStatus.message) : this.apiCallStatus.message;
-          }
-          this.eventsData = paymentsSelector.payments && paymentsSelector.payments.relayed ? paymentsSelector.payments.relayed : [];
-          if (this.eventsData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) {
-            this.loadForwardingEventsTable(this.eventsData);
-          }
-          this.logger.info(this.eventsData);
         }
+        this.eventsData = paymentsSelector.payments && paymentsSelector.payments.relayed ? paymentsSelector.payments.relayed : [];
+        if (this.eventsData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) {
+          this.loadForwardingEventsTable(this.eventsData);
+        }
+        this.logger.info(this.eventsData);
       });
   }
 

src/app/eclair/store/ecl.effects.ts

@@ -86,6 +86,9 @@ export class ECLEffects implements OnDestroy {
               break;
             case ECLWSEventTypeEnum.PAYMENT_RELAYED:
               delete newMessage.source;
+              newMessage.amountIn = Math.round((newMessage.amountIn || 0) / 1000);
+              newMessage.amountOut = Math.round((newMessage.amountOut || 0) / 1000);
+              if (newMessage.timestamp.unix) { newMessage.timestamp = newMessage.timestamp.unix * 1000; }
               this.store.dispatch(updateRelayedPayment({ payload: newMessage }));
               break;
             case ECLWSEventTypeEnum.CHANNEL_STATE_CHANGED:

src/app/eclair/store/ecl.reducers.ts

@@ -172,8 +172,6 @@ export const ECLReducer = createReducer(initECLState,
   on(updateRelayedPayment, (state, { payload }) => {
     const modifiedPayments = state.payments;
     const updatedPayload = mapAliases(payload, [...state.activeChannels, ...state.pendingChannels, ...state.inactiveChannels]);
-    updatedPayload.amountIn = Math.round((payload.amountIn || 0) / 1000);
-    updatedPayload.amountOut = Math.round((payload.amountOut || 0) / 1000);
     modifiedPayments.relayed?.unshift(updatedPayload);
     const feeSats = (payload.amountIn || 0) - (payload.amountOut || 0);
     const modifiedLightningBalance = { localBalance: (state.lightningBalance.localBalance + feeSats), remoteBalance: (state.lightningBalance.remoteBalance - feeSats) };

src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html

@@ -163,7 +163,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="no_channel">
-        <td *matFooterCellDef  mat-footer-cell colspan="4">
+        <td *matFooterCellDef  mat-footer-cell colspan="5">
           <p *ngIf="numPeers<1 && (!channels?.data || channels?.data?.length<1) && apiCallStatus?.status === apiCallStatusEnum.COMPLETED">No peers connected. Add a peer in order to open a channel.</p>
           <p *ngIf="numPeers>0 && (!channels?.data || channels?.data?.length<1) && apiCallStatus?.status === apiCallStatusEnum.COMPLETED">No channel available.</p>
           <p *ngIf="(!channels?.data || channels?.data?.length<1) && apiCallStatus?.status === apiCallStatusEnum.INITIATED">Getting channels...</p>

src/app/lnd/peers-channels/channels/open-channel-modal/open-channel.component.html

@@ -25,7 +25,7 @@
             <mat-form-field fxLayout="column" fxFlex="60" fxLayoutAlign="start end">
               <mat-label>Amount</mat-label>
               <input #amt="ngModel" matInput type="number" tabindex="1" required name="amnt" [step]="1000" [min]="1" [max]="totalBalance" [(ngModel)]="fundingAmount">
-              <mat-hint>(Remaining Bal: {{totalBalance - ((fundingAmount) ? fundingAmount : 0) | number}})</mat-hint>
+              <mat-hint>(Remaining: {{totalBalance - ((fundingAmount) ? fundingAmount : 0) | number}})</mat-hint>
               <span matSuffix> Sats </span>
               <mat-error *ngIf="amount.errors?.required">Amount is required.</mat-error>
               <mat-error *ngIf="amount.errors?.max">Amount must be less than or equal to {{totalBalance}}.</mat-error>

src/app/lnd/peers-channels/connect-peer/connect-peer.component.html

@@ -34,7 +34,7 @@
                   <mat-form-field fxLayout="column" fxFlex="60" fxLayoutAlign="start end">
                     <mat-label>Amount</mat-label>
                     <input matInput formControlName="fundingAmount" type="number" tabindex="1" required [step]="1000">
-                    <mat-hint>Remaining Bal: {{totalBalance - ((channelFormGroup.controls.fundingAmount.value) ? channelFormGroup.controls.fundingAmount.value : 0)}}</mat-hint>
+                    <mat-hint>Remaining: {{totalBalance - ((channelFormGroup.controls.fundingAmount.value) ? channelFormGroup.controls.fundingAmount.value : 0) | number}}</mat-hint>
                     <span matSuffix> Sats </span>
                     <mat-error *ngIf="channelFormGroup.controls.fundingAmount.errors?.required">Amount is required.</mat-error>
                     <mat-error *ngIf="channelFormGroup.controls.fundingAmount.errors?.min">Amount must be a positive number.</mat-error>

src/app/shared/services/consts-enums-functions.ts

@@ -52,6 +52,7 @@ export const FIAT_CURRENCY_UNITS = [
 ];
 
 export const TIME_UNITS = ['SECS', 'MINS', 'HOURS', 'DAYS'];
+export const DATA_FILTER_RANGE_UNITS = ['HOURS', 'DAYS', 'MONTHS', 'YEARS'];
 
 export const PAGE_SIZE = 10;
 export const PAGE_SIZE_OPTIONS = [5, 10, 25, 100];
@@ -139,6 +140,13 @@ export enum TimeUnitEnum {
   DAYS = 'DAYS'
 }
 
+export enum DataFilterRangeEnum {
+  HOURS = 'HOURS',
+  DAYS = 'DAYS',
+  MONTHS = 'MONTHS',
+  YEARS = 'YEARS'
+}
+
 export enum CurrencyUnitEnum {
   SATS = 'Sats',
   BTC = 'BTC',

src/app/shared/shared.module.ts

@@ -342,7 +342,7 @@ export const DEFAULT_DATE_FORMAT: MatDateFormats = {
     { provide: LoggerService, useClass: ConsoleLoggerService },
     { provide: PERFECT_SCROLLBAR_CONFIG, useValue: DEFAULT_PERFECT_SCROLLBAR_CONFIG },
     { provide: MAT_SNACK_BAR_DEFAULT_OPTIONS, useValue: { duration: 2000, verticalPosition: 'bottom', panelClass: 'rtl-snack-bar' } },
-    { provide: MAT_DIALOG_DEFAULT_OPTIONS, useValue: { hasBackdrop: true, autoFocus: true, disableClose: true, role: 'dialog', width: '45%' } },
+    { provide: MAT_DIALOG_DEFAULT_OPTIONS, useValue: { hasBackdrop: true, autoFocus: true, disableClose: true, role: 'dialog' } },
     { provide: DateAdapter, useClass: DefaultDateAdapter },
     { provide: MAT_DATE_FORMATS, useValue: DEFAULT_DATE_FORMAT },
     { provide: OverlayContainer, useClass: ThemeOverlay },

src/app/shared/theme/styles/root.scss

@@ -1578,6 +1578,7 @@ mat-cell:last-of-type, .mdc-data-table__header-cell:last-of-type, mat-footer-cel
 .mat-mdc-tooltip-panel {
   & .mdc-tooltip__surface {
     min-width: 15rem;
+    max-width: unset;
     text-align: start;
   }
 }

src/app/store/rtl.effects.ts

@@ -207,8 +207,8 @@ export class RTLEffects implements OnDestroy {
           this.alertWidth = '80%';
           this.confirmWidth = '80%';
         } else {
-          this.alertWidth = '45%';
+          this.alertWidth = '50%';
-          this.confirmWidth = '50%';
+          this.confirmWidth = '53%';
         }
         this.store.dispatch(openSpinner({ payload: UI_MESSAGES.GET_RTL_CONFIG }));
         this.store.dispatch(updateRootAPICallStatus({ payload: { action: 'FetchRTLConfig', status: APICallStatusEnum.INITIATED } }));