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

Merge remote-tracking branch 'origin/master' into v2.1

Browse Source
This commit is contained in:
wiz
2021-02-10 22:58:45 +09:00
parent cc3d7be5c3 2085833720
commit 51816e9938
34 changed files with 265 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/Dockerfile
View File

@@ -1,37 +0,0 @@
FROM node:12-buster-slim AS builder
WORKDIR /build
COPY . .
RUN apt-get update
RUN apt-get install -y build-essential rsync
RUN npm i
RUN npm run build
RUN mv ./docker/* .
FROM nginx:1.17.8-alpine
WORKDIR /patch
COPY --from=builder /build/entrypoint.sh .
COPY --from=builder /build/wait-for .
COPY --from=builder /build/dist/mempool /var/www/mempool
COPY --from=builder /build/nginx.conf /etc/nginx/
COPY --from=builder /build/nginx-mempool.conf /etc/nginx/conf.d/
RUN chmod +x /patch/entrypoint.sh
RUN chmod +x /patch/wait-for
RUN chown -R 1000:1000 /patch && chmod -R 755 /patch && \
chown -R 1000:1000 /var/cache/nginx && \
chown -R 1000:1000 /var/log/nginx && \
chown -R 1000:1000 /etc/nginx/conf.d
RUN touch /var/run/nginx.pid && \
chown -R 1000:1000 /var/run/nginx.pid
USER 1000
EXPOSE 8080
ENTRYPOINT ["/patch/entrypoint.sh"]
CMD ["nginx", "-g", "daemon off;"]

8
frontend/docker/entrypoint.sh
View File

@@ -1,8 +0,0 @@
#!/bin/sh
__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__=${BACKEND_MAINNET_HTTP_HOST:=127.0.0.1}
__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__=${BACKEND_MAINNET_HTTP_PORT:=8999}
sed -i "s/__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__/${__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__}/g" /etc/nginx/conf.d/nginx-mempool.conf
sed -i "s/__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__/${__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__}/g" /etc/nginx/conf.d/nginx-mempool.conf
exec "$@"

62
frontend/docker/nginx-mempool.conf
View File

@@ -1,62 +0,0 @@
access_log /var/log/nginx/access_mempool.log;
error_log /var/log/nginx/error_mempool.log;
root /var/www/mempool/browser;
index index.html;
# fallback for all URLs i.e. /address/foo /tx/foo /block/000
location / {
try_files /$lang/$uri /$lang/$uri/ $uri $uri/ /en-US/$uri @index-redirect;
}
location @index-redirect {
add_header vary accept-language;
rewrite (.*) /$lang/index.html;
}
# location block using regex are matched in order
# used to rewrite resources from /<lang>/ to /en-US/
location ~ ^/(ar|bg|bs|ca|cs|da|de|et|el|es|eo|eu|fa|fr|gl|ko|hr|id|it|he|ka|lv|lt|hu|mk|ms|nl|ja|ka|no|nb|nn|pl|pt|pt-BR|ro|ru|sk|sl|sr|sh|fi|sv|th|tr|uk|vi|zh)/resources/ {
rewrite ^/[a-zA-Z-]*/resources/(.*) /en-US/resources/$1;
}
# used for cookie override
location ~ ^/(ar|bg|bs|ca|cs|da|de|et|el|es|eo|eu|fa|fr|gl|ko|hr|id|it|he|ka|lv|lt|hu|mk|ms|nl|ja|ka|no|nb|nn|pl|pt|pt-BR|ro|ru|sk|sl|sr|sh|fi|sv|th|tr|uk|vi|zh)/ {
try_files $uri $uri/ /$1/index.html =404;
}
# static API docs
location = /api {
try_files $uri $uri/ /en-US/index.html =404;
}
location = /api/ {
try_files $uri $uri/ /en-US/index.html =404;
}
# mainnet API
location /api/v1/donations {
proxy_pass https://mempool.space;
}
location /api/v1/donations/images {
proxy_pass https://mempool.space;
}
location /api/v1/ws {
proxy_pass http://__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__:__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
}
location /api/v1 {
proxy_pass http://__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__:__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__/api/v1;
}
location /api/ {
proxy_pass http://__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__:__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__/api/v1/;
}
# mainnet API
location /ws {
proxy_pass http://__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__:__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
}

128
frontend/docker/nginx.conf
View File

@@ -1,128 +0,0 @@
pid /var/run/nginx.pid;
worker_processes auto;
worker_rlimit_nofile 100000;
events {
worker_connections 9000;
multi_accept on;
}
http {
sendfile on;
tcp_nopush on;
tcp_nodelay on;
server_tokens off;
server_name_in_redirect off;
include /etc/nginx/mime.types;
default_type application/octet-stream;
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log;
# reset timed out connections freeing ram
reset_timedout_connection on;
# maximum time between packets the client can pause when sending nginx any data
client_body_timeout 10s;
# maximum time the client has to send the entire header to nginx
client_header_timeout 10s;
# timeout which a single keep-alive client connection will stay open
keepalive_timeout 69s;
# maximum time between packets nginx is allowed to pause when sending the client data
send_timeout 10s;
# number of requests per connection, does not affect SPDY
keepalive_requests 100;
# enable gzip compression
gzip on;
gzip_vary on;
gzip_comp_level 6;
gzip_min_length 1000;
gzip_proxied expired no-cache no-store private auth;
# text/html is always compressed by gzip module
gzip_types application/javascript application/json application/ld+json application/manifest+json application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard;
# limit request body size
client_max_body_size 10m;
# proxy cache
proxy_cache off;
proxy_cache_path /var/cache/nginx keys_zone=cache:20m levels=1:2 inactive=600s max_size=500m;
types_hash_max_size 2048;
# exempt localhost from rate limit
geo $limited_ip {
default 1;
0.0.0.0 0;
}
map $limited_ip $limited_ip_key {
1 $binary_remote_addr;
0 '';
}
# rate limit requests
limit_req_zone $limited_ip_key zone=api:5m rate=200r/m;
limit_req_zone $limited_ip_key zone=electrs:5m rate=2000r/m;
limit_req_status 429;
# rate limit connections
limit_conn_zone $limited_ip_key zone=websocket:10m;
limit_conn_status 429;
map $http_accept_language $header_lang {
default en-US;
~*^en-US en-US;
~*^en en-US;
~*^ar ar;
~*^cs cs;
~*^de de;
~*^es es;
~*^fa fa;
~*^fr fr;
~*^ja ja;
~*^ka ka;
~*^hu hu;
~*^nl nl;
~*^nn nn;
~*^pt pt;
~*^sl sl;
~*^sv sv;
~*^tr tr;
~*^uk uk;
~*^vi vi;
~*^zh zh;
}
map $cookie_lang $lang {
default $header_lang;
~*^en-US en-US;
~*^en en-US;
~*^ar ar;
~*^cs cs;
~*^de de;
~*^es es;
~*^fa fa;
~*^fr fr;
~*^ja ja;
~*^ka ka;
~*^hu hu;
~*^nl nl;
~*^nn nn;
~*^pt pt;
~*^sl sl;
~*^sv sv;
~*^tr tr;
~*^uk uk;
~*^vi vi;
~*^zh zh;
}
server {
listen 0.0.0.0:8080;
include /etc/nginx/conf.d/nginx-mempool.conf;
}
}

84
frontend/docker/wait-for
View File

@@ -1,84 +0,0 @@
#!/bin/sh
TIMEOUT=15
QUIET=0
echoerr() {
if [ "$QUIET" -ne 1 ]; then printf "%s\n" "$*" 1>&2; fi
}
usage() {
exitcode="$1"
cat << USAGE >&2
Usage:
$cmdname host:port [-t timeout] [-- command args]
-q | --quiet Do not output any status messages
-t TIMEOUT | --timeout=timeout Timeout in seconds, zero for no timeout
-- COMMAND ARGS Execute command with args after the test finishes
USAGE
exit "$exitcode"
}
wait_for() {
if ! command -v nc >/dev/null; then
echoerr 'nc command is missing!'
exit 1
fi
for i in `seq $TIMEOUT` ; do
nc -z "$HOST" "$PORT" > /dev/null 2>&1
result=$?
if [ $result -eq 0 ] ; then
if [ $# -gt 0 ] ; then
exec "$@"
fi
exit 0
fi
sleep 1
done
echo "Operation timed out" >&2
exit 1
}
while [ $# -gt 0 ]
do
case "$1" in
*:* )
HOST=$(printf "%s\n" "$1"| cut -d : -f 1)
PORT=$(printf "%s\n" "$1"| cut -d : -f 2)
shift 1
;;
-q | --quiet)
QUIET=1
shift 1
;;
-t)
TIMEOUT="$2"
if [ "$TIMEOUT" = "" ]; then break; fi
shift 2
;;
--timeout=*)
TIMEOUT="${1#*=}"
shift 1
;;
--)
shift
break
;;
--help)
usage 0
;;
*)
echoerr "Unknown argument: $1"
usage 1
;;
esac
done
if [ "$HOST" = "" -o "$PORT" = "" ]; then
echoerr "Error: you need to provide a host and port to test."
usage 2
fi
wait_for "$@"

4
frontend/proxy.conf.json
View File

@@ -1,4 +1,8 @@
{
"/api/v1/donations": {
"target": "http://localhost:9000/",
"secure": false
},
"/api/v1": {
"target": "http://localhost:8999/",
"secure": false

4
frontend/src/app/bisq/bisq-stats/bisq-stats.component.html
View File

@@ -38,7 +38,7 @@
</tr>
<tr>
<td i18n="BSQ token market cap">Market cap</td>
<td><app-fiat [value]="price * (stats.minted - stats.burnt) / 100"></app-fiat></td>
<td><app-fiat [value]="price * (stats.minted - stats.burnt)"></app-fiat></td>
</tr>
</tbody>
</table>
@@ -83,4 +83,4 @@
<td><span class="skeleton-loader"></span></td>
</tr>
</tbody>
</ng-template>
</ng-template>

5
frontend/src/app/components/about/about.component.html
View File

@@ -5,7 +5,7 @@
<br>
<div class="text-small text-center offset-md-1">
v2.1.0
v2.1-SNAPSHOT ({{ gitCommit$ | async }})
</div>
<br>
@@ -173,10 +173,9 @@
<div *ngIf="donationStatus === 4" class="text-center">
<h2><span i18n="about.sponsor.donation-confirmed">Donation confirmed!</span><br><span i18n="about.sponsor.thank-you">Thank you!</span></h2>
<p i18n="about.sponsor.sponsor-completed">If you specified a Twitter handle, the profile photo should now be visible on this page when you reload.</p>
</div>
<br><br><br><br>
<br><br><br>
<a target="_blank" class="m-2 fw6 mb3 mt2 truncate black-80 f4 link" href="https://github.com/mempool/mempool">
<span class="dib v-mid">

37
frontend/src/app/components/about/about.component.ts
View File

@@ -1,19 +1,19 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnDestroy, OnInit } from '@angular/core';
import { WebsocketService } from '../../services/websocket.service';
import { SeoService } from 'src/app/services/seo.service';
import { StateService } from 'src/app/services/state.service';
import { Observable } from 'rxjs';
import { Observable, Subscription } from 'rxjs';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { ApiService } from 'src/app/services/api.service';
import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
import { map } from 'rxjs/operators';
import { delay, map, retryWhen, switchMap, tap } from 'rxjs/operators';
@Component({
selector: 'app-about',
templateUrl: './about.component.html',
styleUrls: ['./about.component.scss'],
})
export class AboutComponent implements OnInit {
export class AboutComponent implements OnInit, OnDestroy {
gitCommit$: Observable<string>;
donationForm: FormGroup;
paymentForm: FormGroup;
@@ -22,6 +22,7 @@ export class AboutComponent implements OnInit {
donationObj: any;
sponsorsEnabled = this.stateService.env.SPONSORS_ENABLED;
sponsors = null;
requestSubscription: Subscription | undefined;
constructor(
private websocketService: WebsocketService,
@@ -50,23 +51,37 @@ export class AboutComponent implements OnInit {
.subscribe((sponsors) => {
this.sponsors = sponsors;
});
}
this.apiService.getDonation$()
this.stateService.donationConfirmed$.subscribe(() => this.donationStatus = 4);
ngOnDestroy() {
if (this.requestSubscription) {
this.requestSubscription.unsubscribe();
}
}
submitDonation() {
if (this.donationForm.invalid) {
return;
}
this.apiService.requestDonation$(
this.requestSubscription = this.apiService.requestDonation$(
this.donationForm.get('amount').value,
this.donationForm.get('handle').value
)
.subscribe((response) => {
this.websocketService.trackDonation(response.id);
this.donationObj = response;
this.donationStatus = 3;
.pipe(
tap((response) => {
this.donationObj = response;
this.donationStatus = 3;
}),
switchMap(() => this.apiService.checkDonation$(this.donationObj.id)
.pipe(
retryWhen((errors) => errors.pipe(delay(2000)))
)
)
).subscribe(() => {
this.donationStatus = 4;
if (this.donationForm.get('handle').value) {
this.sponsors.unshift({ handle: this.donationForm.get('handle').value });
}
});
}

8
frontend/src/app/components/address-labels/address-labels.component.ts
View File

@@ -43,19 +43,23 @@ export class AddressLabelsComponent implements OnInit {
} else {
this.liquid = 'Emergency Peg Out';
}
return;
}
[
{regexp: /^OP_DUP OP_HASH160/, label: 'HTLC'},
// {regexp: /^OP_DUP OP_HASH160/, label: 'HTLC'},
{regexp: /^OP_IF OP_PUSHBYTES_33 \w{33} OP_ELSE OP_PUSHBYTES_2 \w{2} OP_CSV OP_DROP/, label: 'Force Close'}
].forEach((item) => {
if (item.regexp.test(this.vin.inner_witnessscript_asm)) {
this.lightning = item.label;
return;
}
}
);
if (this.lightning) {
return;
}
if (this.vin.inner_witnessscript_asm.indexOf('OP_CHECKMULTISIG') > -1) {
const matches = this.getMatches(this.vin.inner_witnessscript_asm, /OP_PUSHNUM_([0-9])/g, 1);
this.multisig = true;

2
frontend/src/app/interfaces/websocket.interface.ts
View File

@@ -15,13 +15,11 @@ export interface WebsocketResponse {
tx?: Transaction;
rbfTransaction?: Transaction;
transactions?: TransactionStripped[];
donationConfirmed?: boolean;
loadingIndicators?: ILoadingIndicators;
'track-tx'?: string;
'track-address'?: string;
'track-asset'?: string;
'watch-mempool'?: boolean;
'track-donation'?: string;
}
export interface MempoolBlock {

4
frontend/src/app/services/api.service.ts
View File

@@ -77,6 +77,10 @@ export class ApiService {
return this.httpClient.get<any[]>(this.apiBaseUrl + this.apiBasePath + '/api/v1/donations');
}
checkDonation$(orderId: string): Observable<any[]> {
return this.httpClient.get<any[]>(this.apiBaseUrl + this.apiBasePath + '/api/v1/donations/check?order_id=' + orderId);
}
getInitData$(): Observable<WebsocketResponse> {
return this.httpClient.get<WebsocketResponse>(this.apiBaseUrl + this.apiBasePath + '/api/v1/init-data');
}

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

@@ -64,7 +64,6 @@ export class StateService {
vbytesPerSecond$ = new ReplaySubject<number>(1);
lastDifficultyAdjustment$ = new ReplaySubject<number>(1);
gitCommit$ = new ReplaySubject<string>(1);
donationConfirmed$ = new Subject();
loadingIndicators$ = new ReplaySubject<ILoadingIndicators>(1);
live2Chart$ = new Subject<OptimizedMempoolStats>();

8
frontend/src/app/services/websocket.service.ts
View File

@@ -126,10 +126,6 @@ export class WebsocketService {
this.isTrackingTx = true;
}
trackDonation(id: string) {
this.websocketSubject.next({ 'track-donation': id });
}
stopTrackingTransaction() {
if (!this.isTrackingTx) {
return;
@@ -289,9 +285,5 @@ export class WebsocketService {
if (response['git-commit']) {
this.stateService.gitCommit$.next(response['git-commit']);
}
if (response.donationConfirmed) {
this.stateService.donationConfirmed$.next(true);
}
}
}

104
frontend/src/locale/messages.xlf
View File

@@ -46,7 +46,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">205</context>
<context context-type="linenumber">208</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/bisq/bisq-transfers/bisq-transfers.component.html</context>
@@ -67,7 +67,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">206</context>
<context context-type="linenumber">209</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/bisq/bisq-transfers/bisq-transfers.component.html</context>
@@ -88,7 +88,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">209</context>
<context context-type="linenumber">212</context>
</context-group>
<note priority="1" from="description">Transaction unconfirmed state</note>
<note priority="1" from="meaning">transaction.unconfirmed</note>
@@ -242,7 +242,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">198</context>
<context context-type="linenumber">201</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/block/block.component.html</context>
@@ -468,7 +468,7 @@
<source>nSequence</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">92</context>
<context context-type="linenumber">95</context>
</context-group>
<note priority="1" from="description">transactions-list.nsequence</note>
</trans-unit>
@@ -476,7 +476,7 @@
<source>ScriptSig (ASM)</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">71</context>
<context context-type="linenumber">74</context>
</context-group>
<note priority="1" from="description">ScriptSig (ASM)</note>
<note priority="1" from="meaning">transactions-list.scriptsig.asm</note>
@@ -485,7 +485,7 @@
<source>ScriptSig (HEX)</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">75</context>
<context context-type="linenumber">78</context>
</context-group>
<note priority="1" from="description">ScriptSig (HEX)</note>
<note priority="1" from="meaning">transactions-list.scriptsig.hex</note>
@@ -494,7 +494,7 @@
<source>Witness</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">80</context>
<context context-type="linenumber">83</context>
</context-group>
<note priority="1" from="description">transactions-list.witness</note>
</trans-unit>
@@ -502,7 +502,7 @@
<source>P2SH redeem script</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">84</context>
<context context-type="linenumber">87</context>
</context-group>
<note priority="1" from="description">transactions-list.p2sh-redeem-script</note>
</trans-unit>
@@ -510,7 +510,7 @@
<source>P2WSH witness script</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">88</context>
<context context-type="linenumber">91</context>
</context-group>
<note priority="1" from="description">transactions-list.p2wsh-witness-script</note>
</trans-unit>
@@ -518,7 +518,7 @@
<source>Previous output script</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">96</context>
<context context-type="linenumber">99</context>
</context-group>
<note priority="1" from="description">transactions-list.previous-output-script</note>
</trans-unit>
@@ -526,11 +526,11 @@
<source>Load all</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">106</context>
<context context-type="linenumber">109</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">188</context>
<context context-type="linenumber">191</context>
</context-group>
<note priority="1" from="description">transactions-list.load-all</note>
</trans-unit>
@@ -538,7 +538,7 @@
<source>Peg-out to <x id="START_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;ng-container *ngTemplateOutlet=&quot;pegOutLink&quot;&gt;"/><x id="CLOSE_TAG_NG_CONTAINER" ctype="x-ng_container" equiv-text="&lt;/ng-container&gt;"/></source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">125</context>
<context context-type="linenumber">128</context>
</context-group>
<note priority="1" from="description">transactions-list.peg-out-to</note>
</trans-unit>
@@ -546,7 +546,7 @@
<source>ScriptPubKey (ASM)</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">170</context>
<context context-type="linenumber">173</context>
</context-group>
<note priority="1" from="description">ScriptPubKey (ASM)</note>
<note priority="1" from="meaning">transactions-list.scriptpubkey.asm</note>
@@ -555,7 +555,7 @@
<source>ScriptPubKey (HEX)</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">174</context>
<context context-type="linenumber">177</context>
</context-group>
<note priority="1" from="description">ScriptPubKey (HEX)</note>
<note priority="1" from="meaning">transactions-list.scriptpubkey.hex</note>
@@ -564,7 +564,7 @@
<source>Type</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">166</context>
<context context-type="linenumber">169</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html</context>
@@ -580,7 +580,7 @@
<source>data</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">178</context>
<context context-type="linenumber">181</context>
</context-group>
<note priority="1" from="description">transactions-list.vout.scriptpubkey-type.data</note>
</trans-unit>
@@ -588,7 +588,7 @@
<source>sat</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">198</context>
<context context-type="linenumber">201</context>
</context-group>
<note priority="1" from="description">sat</note>
<note priority="1" from="meaning">shared.sat</note>
@@ -597,7 +597,7 @@
<source>Confidential</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/transactions-list/transactions-list.component.html</context>
<context context-type="linenumber">214</context>
<context context-type="linenumber">217</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/amount/amount.component.html</context>
@@ -605,7 +605,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/address/address.component.html</context>
<context context-type="linenumber">132</context>
<context context-type="linenumber">134</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/asset/asset.component.html</context>
@@ -841,11 +841,23 @@
</context-group>
<note priority="1" from="description">shared.address</note>
</trans-unit>
<trans-unit id="7e69426bd97a606d8ae6026762858e6e7c86a1fd" datatype="html">
<source>Balance</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/address/address.component.html</context>
<context context-type="linenumber">30</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/bisq/bisq-address/bisq-address.component.html</context>
<context context-type="linenumber">28</context>
</context-group>
<note priority="1" from="description">address.balance</note>
</trans-unit>
<trans-unit id="a9b87c3aa4731edee661c8287ef3aab71799c0b8" datatype="html">
<source>Total received</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/address/address.component.html</context>
<context context-type="linenumber">20</context>
<context context-type="linenumber">21</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/bisq/bisq-address/bisq-address.component.html</context>
@@ -857,7 +869,7 @@
<source>Total sent</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/address/address.component.html</context>
<context context-type="linenumber">24</context>
<context context-type="linenumber">25</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/bisq/bisq-address/bisq-address.component.html</context>
@@ -869,23 +881,11 @@
</context-group>
<note priority="1" from="description">address.total-sent</note>
</trans-unit>
<trans-unit id="7e69426bd97a606d8ae6026762858e6e7c86a1fd" datatype="html">
<source>Balance</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/address/address.component.html</context>
<context context-type="linenumber">28</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/bisq/bisq-address/bisq-address.component.html</context>
<context context-type="linenumber">28</context>
</context-group>
<note priority="1" from="description">address.balance</note>
</trans-unit>
<trans-unit id="714e34125b3343df73f19ec800b43be95217d5d4" datatype="html">
<source><x id="INTERPOLATION" equiv-text="{{ (transactions?.length | number) || &apos;?&apos; }}"/> of <x id="INTERPOLATION_1" equiv-text="{{ txCount | number }}"/> transaction</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/address/address.component.html</context>
<context context-type="linenumber">48</context>
<context context-type="linenumber">50</context>
</context-group>
<note priority="1" from="description">X of X Address Transaction</note>
</trans-unit>
@@ -893,7 +893,7 @@
<source><x id="INTERPOLATION" equiv-text="{{ (transactions?.length | number) || &apos;?&apos; }}"/> of <x id="INTERPOLATION_1" equiv-text="{{ txCount | number }}"/> transactions</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/address/address.component.html</context>
<context context-type="linenumber">49</context>
<context context-type="linenumber">51</context>
</context-group>
<note priority="1" from="description">X of X Address Transactions (Plural)</note>
</trans-unit>
@@ -901,7 +901,7 @@
<source>Error loading address data.</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/address/address.component.html</context>
<context context-type="linenumber">113</context>
<context context-type="linenumber">115</context>
</context-group>
<note priority="1" from="description">address.error.loading-address-data</note>
</trans-unit>
@@ -1020,15 +1020,23 @@
<source>multisig <x id="INTERPOLATION" equiv-text="{{ multisigM }}"/> of <x id="INTERPOLATION_1" equiv-text="{{ multisigN }}"/></source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/address-labels/address-labels.component.html</context>
<context context-type="linenumber">1</context>
<context context-type="linenumber">5</context>
</context-group>
<note priority="1" from="description">address-labels.multisig</note>
</trans-unit>
<trans-unit id="aae004b987aaf258dea1829618651427b68283db" datatype="html">
<source>Layer<x id="INTERPOLATION" equiv-text="{{ network === &apos;liquid&apos; ? &apos;3&apos; : &apos;2&apos; }}"/> Peg-out</source>
<trans-unit id="31c09dcc0ab351767631539b208d5f7de4005473" datatype="html">
<source>Lightning <x id="INTERPOLATION" equiv-text="{{ lightning }}"/></source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/address-labels/address-labels.component.html</context>
<context context-type="linenumber">2</context>
<context context-type="linenumber">11</context>
</context-group>
<note priority="1" from="description">address-labels.upper-layer-peg-out</note>
</trans-unit>
<trans-unit id="696ade981a05c12e10df38ba6218c76e318813b3" datatype="html">
<source>Liquid <x id="INTERPOLATION" equiv-text="{{ liquid }}"/></source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/address-labels/address-labels.component.html</context>
<context context-type="linenumber">17</context>
</context-group>
<note priority="1" from="description">address-labels.upper-layer-peg-out</note>
</trans-unit>
@@ -1052,7 +1060,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/about/about.component.ts</context>
<context context-type="linenumber">37</context>
<context context-type="linenumber">38</context>
</context-group>
<note priority="1" from="description">master-page.about</note>
</trans-unit>
@@ -1199,7 +1207,7 @@
<source>Terms of Service</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/about/about.component.html</context>
<context context-type="linenumber">206</context>
<context context-type="linenumber">205</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/dashboard/dashboard.component.html</context>
@@ -1268,14 +1276,6 @@
</context-group>
<note priority="1" from="description">about.sponsor.thank-you</note>
</trans-unit>
<trans-unit id="981a90db6601297002689e5fae09d38b9e374b05" datatype="html">
<source>If you specified a Twitter handle, the profile photo should now be visible on this page when you reload.</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/about/about.component.html</context>
<context context-type="linenumber">176</context>
</context-group>
<note priority="1" from="description">about.sponsor.sponsor-completed</note>
</trans-unit>
<trans-unit id="ff4b7f4070be9e876c7610d99b9dbd53ff19dceb" datatype="html">
<source>Loading graphs...</source>
<context-group purpose="location">

BIN
frontend/src/resources/screenshots/v2.1.0-dashboard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 482 KiB