diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 7c4e11218..866a23b33 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -428,12 +428,20 @@
-

Powered By

+

Powered By

+
+
+

Managed By

+
+ + + +
diff --git a/frontend/src/app/components/address/address.component.html b/frontend/src/app/components/address/address.component.html index 836d52d5f..b0d4c73da 100644 --- a/frontend/src/app/components/address/address.component.html +++ b/frontend/src/app/components/address/address.component.html @@ -237,28 +237,29 @@
-
Error loading address data.
+ ({{ error | httpErrorMsg }}) +
+ @if (!officialMempoolSpace && (error.status === 413 || error.status === 405 || error.status === 504)) { +
There are too many transactions on this address, more than your backend can handle. See more on setting up a stronger backend.

Consider viewing this address on the official Mempool website instead: -
- https://mempool.space/address/{{ addressString }} -
- http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/address/{{ addressString }} -

- ({{ error | httpErrorMsg }}) + } @else if (!officialMempoolSpace) { +
+ Consider viewing this address on the official Mempool website instead: + } + @if (!officialMempoolSpace) { +
+ https://mempool.space/address/{{ addressString }} +
+ http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/address/{{ addressString }} + }
- - - - Error loading address data. - -
diff --git a/frontend/src/app/components/address/address.component.ts b/frontend/src/app/components/address/address.component.ts index 729a869da..e11d7cfa4 100644 --- a/frontend/src/app/components/address/address.component.ts +++ b/frontend/src/app/components/address/address.component.ts @@ -102,6 +102,7 @@ export class AddressComponent implements OnInit, OnDestroy { isMobile: boolean; showQR: boolean = false; + officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE; address: Address; addressString: string; diff --git a/frontend/src/app/components/master-page/master-page.component.scss b/frontend/src/app/components/master-page/master-page.component.scss index 65f45b64c..7bb529f59 100644 --- a/frontend/src/app/components/master-page/master-page.component.scss +++ b/frontend/src/app/components/master-page/master-page.component.scss @@ -200,9 +200,9 @@ nav { } .subdomain_logo { - height: 35px; + max-height: 35px; overflow: clip; - max-width: 140px; + max-width: 100%; margin: auto; align-self: center; .rounded { @@ -210,7 +210,7 @@ nav { } &.custom_logo { - height: 48px; + max-height: 48px; margin-right: 1em; } @@ -219,7 +219,7 @@ nav { } &.custom_logo.mobile_logo { - height: 42px; + max-height: 42px; } } diff --git a/frontend/src/app/components/server-health/server-health.component.html b/frontend/src/app/components/server-health/server-health.component.html index a6e799026..c0150f5a7 100644 --- a/frontend/src/app/components/server-health/server-health.component.html +++ b/frontend/src/app/components/server-health/server-health.component.html @@ -36,12 +36,11 @@ {{ host.rtt | number : '1.0-0' }} {{ host.rtt == null ? '' : 'ms'}} {{ !host.checked ? '⏳' : (host.unreachable ? '🔥' : '✅') }} {{ host.latestHeight }} {{ !host.checked ? '⏳' : (host.outOfSync ? '🚫' : (host.latestHeight && host.latestHeight < maxHeight ? '🟧' : '✅')) }} - + @if (type !== 'core' && type !== 'os' && host.hashes?.[type]) { {{ host.hashes[type].slice(0, 8) || '?' }} } @else if (host.hashes?.[type]) { - {{ host.hashes[type] || '?' }} - {{ shortenVersion(host.hashes[type]) || '?' }} + {{ shortenVersion(host.hashes[type]) || '?' }} } @else { ? } diff --git a/frontend/src/app/components/server-health/server-health.component.scss b/frontend/src/app/components/server-health/server-health.component.scss index bb5fd1a84..f741cb3db 100644 --- a/frontend/src/app/components/server-health/server-health.component.scss +++ b/frontend/src/app/components/server-health/server-health.component.scss @@ -52,6 +52,11 @@ text-overflow: ellipsis; white-space: nowrap; } + &.hash, &.version { + font-size: 11px; + vertical-align: middle; + text-align: center; + } span { &.only-small { diff --git a/frontend/src/app/shared/pipes/http-error-pipe/http-error.pipe.ts b/frontend/src/app/shared/pipes/http-error-pipe/http-error.pipe.ts index 540e284f1..19aa840e1 100644 --- a/frontend/src/app/shared/pipes/http-error-pipe/http-error.pipe.ts +++ b/frontend/src/app/shared/pipes/http-error-pipe/http-error.pipe.ts @@ -7,6 +7,7 @@ import { Pipe, PipeTransform } from '@angular/core'; }) export class HttpErrorPipe implements PipeTransform { transform(e: HttpErrorResponse | null): string { - return e ? `${e.status} ${e.statusText}: ${e.error}` : ''; + const errorMsg = typeof e.error === 'string' ? e.error : e.error?.error ?? ''; + return e ? `${e.status} ${e.statusText}: ${errorMsg}` : ''; } } diff --git a/frontend/src/resources/mempool-holdings.png b/frontend/src/resources/mempool-holdings.png new file mode 100644 index 000000000..69d459aef Binary files /dev/null and b/frontend/src/resources/mempool-holdings.png differ