Merge branch 'master' into wiz/inline-enterprise-sponsor-logos

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

@@ -8,13 +8,10 @@
     </div>
   </div>
 
-  <div class="about-text" *ngIf="stateService.env.BASE_MODULE === 'mempool'; else marginBox">
+  <div class="about-text">
     <h5><ng-container i18n="about.about-the-project">The Mempool Open Source Project</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &trade;</ng-template></h5>
-    <p i18n>Building a mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, without any advertising, altcoins, or third-party trackers.</p>
+    <p i18n>Our mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, completely self-hosted without any trusted third-parties.</p>
   </div>
-  <ng-template #marginBox>
-    <div class="no-about-margin"></div>
-  </ng-template>
 
   <div class="social-icons">
     <a target="_blank" href="https://github.com/mempool/mempool">
@@ -31,6 +28,12 @@
     </a>
   </div>
 
+  <br><br>
+  <div class="sponsor-button">
+    <button [hidden]="showNavigateToSponsor" type="button" class="btn btn-primary" (click)="sponsor()" i18n="about.become-a-sponsor">Become a sponsor ❤️</button>
+    <ng-container *ngIf="showNavigateToSponsor" i18n="about.navigate-to-sponsor">Navigate to <a href="https://mempool.space/sponsor" target="_blank">https://mempool.space/sponsor</a> to sponsor</ng-container>
+  </div>
+
   <div class="enterprise-sponsor">
     <h3 i18n="about.sponsors.enterprise.withRocket">Enterprise Sponsors 🚀</h3>
     <div class="wrapper">
@@ -164,9 +167,6 @@
         </ng-template>
       </ng-container>
     </div>
-
-    <button [hidden]="showNavigateToSponsor" type="button" class="btn btn-primary" (click)="sponsor()" i18n="about.become-a-sponsor">Become a sponsor ❤️</button>
-    <ng-container *ngIf="showNavigateToSponsor" i18n="about.navigate-to-sponsor">Navigate to <a href="https://mempool.space/sponsor" target="_blank">https://mempool.space/sponsor</a> to sponsor</ng-container>
   </div>
 
   <div class="community-integrations-sponsor">
@@ -197,6 +197,10 @@
         <img class="image" src="/resources/profile/runcitadel.svg" />
         <span>Citadel</span>
       </a>
+      <a href="https://github.com/fort-nix/nix-bitcoin" target="_blank" title="nix-bitcoin">
+        <img class="image" src="/resources/profile/nix-bitcoin.png" />
+        <span>NixOS</span>
+      </a>
       <a href="https://github.com/spesmilo/electrum" target="_blank" title="Electrum Wallet">
         <img class="image" src="/resources/profile/electrum.jpg" />
         <span>Electrum</span>
@@ -233,10 +237,6 @@
         <img class="image" src="/resources/profile/marina.svg" />
         <span>Marina</span>
       </a>
-      <a href="https://github.com/Satpile/satpile" target="_blank" title="Satpile Watch-Only Wallet">
-        <img class="image" src="/resources/profile/satpile.jpg" />
-        <span>Satpile</span>
-      </a>
     </div>
   </div>
 
@@ -268,7 +268,7 @@
     </div>
     <br>
   </ng-container>
-  
+
   <ng-container *ngIf="allContributors$ | async as contributors else loadingSponsors">
     <div class="contributors">
       <h3 i18n="about.contributors">Project Contributors</h3>
@@ -343,7 +343,7 @@
     <a href="/3rdpartylicenses.txt">Third-party Licenses</a>
     <a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
   </div>
-  
+
   <div class="footer-version" *ngIf="officialMempoolSpace">
     {{ (backendInfo$ | async)?.hostname }} (v{{ (backendInfo$ | async )?.version }}) [<a href="https://github.com/mempool/mempool/commit/{{ (backendInfo$ | async )?.gitCommit | slice:0:8 }}">{{ (backendInfo$ | async )?.gitCommit | slice:0:8 }}</a>]
   </div>