Merge branch 'master' into wiz/move-sponsor-button-on-about-page

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">
@@ -109,6 +106,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>
@@ -145,10 +146,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>