machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into nymkappa/feature/channel-node-page-title

Browse Source
This commit is contained in:
wiz 2022-08-23 00:43:57 +09:00 committed by GitHub
commit 8fa65f170d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/api/explorer/channels.api.ts
View File

@ -225,7 +225,7 @@ class ChannelsApi {
let query = ` let query = `
SELECT COALESCE(node2.alias, SUBSTRING(node2_public_key, 0, 20)) AS alias, COALESCE(node2.public_key, node2_public_key) AS public_key, SELECT COALESCE(node2.alias, SUBSTRING(node2_public_key, 0, 20)) AS alias, COALESCE(node2.public_key, node2_public_key) AS public_key,
channels.status, channels.node1_fee_rate, channels.status, channels.node1_fee_rate,
channels.capacity, channels.short_id, channels.id channels.capacity, channels.short_id, channels.id, channels.closing_reason
FROM channels FROM channels
LEFT JOIN nodes AS node2 ON node2.public_key = channels.node2_public_key LEFT JOIN nodes AS node2 ON node2.public_key = channels.node2_public_key
WHERE node1_public_key = ? AND channels.status ${channelStatusFilter} WHERE node1_public_key = ? AND channels.status ${channelStatusFilter}
@ -236,7 +236,7 @@ class ChannelsApi {
query = ` query = `
SELECT COALESCE(node1.alias, SUBSTRING(node1_public_key, 0, 20)) AS alias, COALESCE(node1.public_key, node1_public_key) AS public_key, SELECT COALESCE(node1.alias, SUBSTRING(node1_public_key, 0, 20)) AS alias, COALESCE(node1.public_key, node1_public_key) AS public_key,
channels.status, channels.node2_fee_rate, channels.status, channels.node2_fee_rate,
channels.capacity, channels.short_id, channels.id channels.capacity, channels.short_id, channels.id, channels.closing_reason
FROM channels FROM channels
LEFT JOIN nodes AS node1 ON node1.public_key = channels.node1_public_key LEFT JOIN nodes AS node1 ON node1.public_key = channels.node1_public_key
WHERE node2_public_key = ? AND channels.status ${channelStatusFilter} WHERE node2_public_key = ? AND channels.status ${channelStatusFilter}
@ -254,6 +254,7 @@ class ChannelsApi {
const activeChannelsStats: any = await nodesApi.$getActiveChannelsStats(row.public_key); const activeChannelsStats: any = await nodesApi.$getActiveChannelsStats(row.public_key);
channels.push({ channels.push({
status: row.status, status: row.status,
closing_reason: row.closing_reason,
capacity: row.capacity ?? 0, capacity: row.capacity ?? 0,
short_id: row.short_id, short_id: row.short_id,
id: row.id, id: row.id,

2
frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts
View File

@ -74,7 +74,7 @@ export class NodesChannelsMap implements OnInit {
switchMap((params: ParamMap) => { switchMap((params: ParamMap) => {
return zip( return zip(
this.assetsService.getWorldMapJson$, this.assetsService.getWorldMapJson$,
this.apiService.getChannelsGeo$(params.get('public_key') ?? undefined), this.style !== 'channelpage' ? this.apiService.getChannelsGeo$(params.get('public_key') ?? undefined) : [''],
[params.get('public_key') ?? undefined] [params.get('public_key') ?? undefined]
).pipe(tap((data) => { ).pipe(tap((data) => {
registerMap('world', data[0]); registerMap('world', data[0]);

2
frontend/src/app/services/state.service.ts
View File

@ -153,7 +153,7 @@ export class StateService {
if (this.env.BASE_MODULE !== 'mempool' && this.env.BASE_MODULE !== 'liquid') { if (this.env.BASE_MODULE !== 'mempool' && this.env.BASE_MODULE !== 'liquid') {
return; return;
} }
const networkMatches = url.match(/\/(bisq|testnet|liquidtestnet|liquid|signet)/); const networkMatches = url.match(/^\/(bisq|testnet|liquidtestnet|liquid|signet)/);
switch (networkMatches && networkMatches[1]) { switch (networkMatches && networkMatches[1]) {
case 'liquid': case 'liquid':
if (this.network !== 'liquid') { if (this.network !== 'liquid') {