Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ COPY ./src/environments/environment.$environment.ts ./src/environments/environme
RUN npm run build_prod

# build minified version of frontend, served using caddy
FROM caddy:2.3.0-alpine
FROM caddy:2.7.6-alpine

WORKDIR /frontend

Expand Down
42 changes: 42 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ export class TransferLockupDaoCoinModalComponent {
minute: '2-digit',
hour12: false,
};
//@ts-ignore
return new Intl.DateTimeFormat('default', options).format(date)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export class UnlockDaoCoinModalComponent {
minute: '2-digit',
hour12: false,
};
// @ts-ignore
return new Intl.DateTimeFormat('default', options).format(date)
}
}
Expand Down
37 changes: 27 additions & 10 deletions src/app/network-info/network-info.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -213,21 +213,38 @@
</span>
<div class="ml-15px">
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we also want this in the PR that gets merged into main?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both this PR and the one below will merge into main

Remote Node Connections
<table class="fs-12px">
<table class="fs-12px w-100" style="table-layout: fixed;">
<thead>
<td>IP</td>
<td>Status</td>
<td>Validator Info</td>
<td class="w-25">IP</td>
<td class="w-25">Status</td>
<td class="w-50">Validator Info</td>
</thead>
<tbody>
<tr *ngFor="let connection of globalVars.nodeInfo.RemoteNodeConnections">
<td>{{ connection.PeerResponse.IP + ':' + connection.PeerResponse.ProtocolPort }}</td>
<td>
<tr
*ngFor="let connection of globalVars.nodeInfo.RemoteNodeConnections"
class="border-bottom border-color-grey"
>
<td class="w-25">
{{ connection.PeerResponse ? connection.PeerResponse.IP + ':' + connection.PeerResponse.ProtocolPort : 'N/A' }}</td>
<td class="w-25">
<i [ngClass]="connection.PeerConnected ? 'fas fa-solid fa-check fc-green' : 'fas fa-solid fa-x fc-red'"></i>
{{ connection.RemoteNodeStatus }}
<span style="overflow-wrap: break-word">{{ connection.RemoteNodeStatus }}</span>
</td>
<td class="text-truncate">
{{ connection?.ValidatorResponse?.ValidatorPublicKeyBase58Check }}
<td class="w-50">
<span
(click)="_copyPublicKey(connection.ValidatorResponse.ValidatorPublicKeyBase58Check)"
class="d-block text-truncate"
*ngIf="connection.ValidatorResponse"
>
<i
*ngIf="!pubKeyCopiedMap[connection.ValidatorResponse.ValidatorPublicKeyBase58Check]"
class="fas fa-key"></i>
<i
*ngIf="pubKeyCopiedMap[connection.ValidatorResponse.ValidatorPublicKeyBase58Check]"
class="far fa-check-circle fc-blue"
></i>
{{ connection.ValidatorResponse.ValidatorPublicKeyBase58Check }}
</span>
</td>
</tr>
</table>
Expand Down
9 changes: 9 additions & 0 deletions src/app/network-info/network-info.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export class NetworkInfoComponent implements OnInit {
updatingDeSoPeer = false;
manualBitcoinPeer = '';
updatingBitcoinPeer = false;
pubKeyCopiedMap = {};

constructor(
public globalVars: GlobalVarsService,
Expand Down Expand Up @@ -324,4 +325,12 @@ export class NetworkInfoComponent implements OnInit {
},
});
}

_copyPublicKey(publicKey: string) {
this.globalVars._copyText(publicKey);
this.pubKeyCopiedMap[publicKey] = true;
setInterval(() => {
delete this.pubKeyCopiedMap[publicKey];
}, 1000);
}
}