Merge branch 'master' into nymkappa/accelerator-rev-share

frontend/src/app/components/about/about.component.html

@@ -428,12 +428,20 @@
   </ng-container>
 
   <div class="managers" id="project-managers">
-    <h3 i18n="about.project-manager">Powered By</h3>
+    <h3 i18n="about.powered-by">Powered By</h3>
     <div class="wrapper">
         <a href="https://wiz.biz" target="_blank" title="wiz & associates">
           <img class="wiz-logo" src="/resources/wiz.png" />
         </a>
     </div>
+    <br>
+    <br>
+    <h3 i18n="about.managed-by">Managed By</h3>
+    <div class="wrapper">
+        <a href="https://mempool.holdings" target="_blank" title="Mempool Holdings">
+          <img class="wiz-logo" src="/resources/mempool-holdings.png" />
+        </a>
+    </div>
   </div>
 
   <div class="copyright">

frontend/src/app/components/address/address.component.html

@@ -237,28 +237,29 @@
 
   <ng-template [ngIf]="error">
     <br>
-    <ng-template [ngIf]="error.status === 413 || error.status === 405 || error.status === 504" [ngIfElse]="displayServerError">
       <div class="text-center">
         <span i18n="address.error.loading-address-data">Error loading address data.</span>
         <br>
+        <i class="small">({{ error | httpErrorMsg }})</i>
+        <br>
+        @if (!officialMempoolSpace && (error.status === 413 || error.status === 405 || error.status === 504)) {
         <ng-container i18n="Electrum server limit exceeded error">
+          <br>
           <i>There are too many transactions on this address, more than your backend can handle. See more on <a href="/docs/faq#address-lookup-issues">setting up a stronger backend</a>.</i>
           <br><br>
           Consider viewing this address on the official Mempool website instead:
         </ng-container>
-        <br>
-        <a href="https://mempool.space/address/{{ addressString }}" target="_blank">https://mempool.space/address/{{ addressString }}</a>
-        <br>
-        <a href="http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/address/{{ addressString }}" target="_blank">http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/address/{{ addressString }}</a>
-        <br><br>
-        <i class="small">({{ error | httpErrorMsg }})</i>
+        } @else if (!officialMempoolSpace) {
+          <br>
+          Consider viewing this address on the official Mempool website instead:
+        }
+        @if (!officialMempoolSpace) {
+          <br>
+          <a href="https://mempool.space/address/{{ addressString }}" target="_blank">https://mempool.space/address/{{ addressString }}</a>
+          <br>
+          <a href="http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/address/{{ addressString }}" target="_blank">http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/address/{{ addressString }}</a>
+        }
       </div>
-    </ng-template>
-    <ng-template #displayServerError>
-      <app-http-error [error]="error">
-        <span i18n="address.error.loading-address-data">Error loading address data.</span>
-      </app-http-error>
-    </ng-template>
   </ng-template>
 
 </div>

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;

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;
   }
 }
 

frontend/src/app/components/server-health/server-health.component.html

@@ -36,12 +36,11 @@
             <td class="rtt only-large">{{ host.rtt | number : '1.0-0' }} {{ host.rtt == null ? '' : 'ms'}} {{ !host.checked ? '⏳' : (host.unreachable ? '🔥' : '✅') }}</td>
             <td class="height">{{ host.latestHeight }} {{ !host.checked ? '⏳' : (host.outOfSync ? '🚫' : (host.latestHeight && host.latestHeight < maxHeight ? '🟧' : '✅')) }}</td>
             <ng-container *ngFor="let type of ['hybrid', 'frontend', 'backend', 'electrs', 'ssr', 'core', 'os']">
-              <td class="{{type}}" [class.hash]="type !== 'core' && type !== 'os'" [style.background-color]="colors[host.host][type]">
+              <td class="{{type}}" [class.hash]="type !== 'core' && type !== 'os'" [class.version]="type === 'core' || type === 'os'" [style.background-color]="colors[host.host][type]">
                 @if (type !== 'core' && type !== 'os' && host.hashes?.[type]) {
                   <a [style.color]="'white'" href="https://github.com/mempool/{{repoMap[type]}}/commit/{{ host.hashes[type] }}" target="_blank">{{ host.hashes[type].slice(0, 8) || '?' }}</a>
                 } @else if (host.hashes?.[type]) {
-                  <span [style.color]="'white'" class="only-large" style="font-size: 10px;">{{ host.hashes[type] || '?' }}</span>
-                  <span [style.color]="'white'" class="only-small" style="font-size: 10px;">{{ shortenVersion(host.hashes[type]) || '?' }}</span>
+                  <span [style.color]="'white'" ngbTooltip="{{ host.hashes[type] }}" placement="top">{{ shortenVersion(host.hashes[type]) || '?' }}</span>
                 } @else {
                   <span>?</span>
                 }

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 {

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}` : '';
   }
 }