From a1af41804a6a8f2a0d61b5ad6fe814c40d2fd837 Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Tue, 1 Aug 2023 16:00:16 +0900
Subject: [PATCH 1/6] Implement wiz footer suggestions

---
 .../global-footer/global-footer.component.html         | 10 ++++++----
 .../global-footer/global-footer.component.scss         |  5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html
index b1ba84109..58b7c5b1e 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.html
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html
@@ -2,7 +2,10 @@
     <div class="container-fluid">
     <div class="row main">
       <div class="offset-lg-1 col-lg-4 col align-self-center branding">
-        <h5><ng-container i18n="about.about-the-project">The Mempool Open Source Project</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &reg;</ng-template></h5>
+        <div class="main-logo">
+          <app-svg-images *ngIf="officialMempoolSpace" name="officialMempoolSpace" viewBox="0 0 500 126"></app-svg-images>
+          <app-svg-images *ngIf="!officialMempoolSpace" name="mempoolSpace" viewBox="0 0 500 126"></app-svg-images>
+        </div>
         <p><ng-container i18n="@@7deec1c1520f06170e1f8e8ddfbe4532312f638f">Explore the full Bitcoin ecosystem</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &trade;</ng-template></p>
         <div class="selector">
           <app-language-selector></app-language-selector>
@@ -17,9 +20,6 @@
           <a *ngIf="officialMempoolSpace" class="cta btn btn-purple sponsor" [routerLink]="['/signup' | relativeUrl]">Support the Project</a>
           <p *ngIf="officialMempoolSpace && env.BASE_MODULE === 'mempool'" class="cta-secondary"><a [routerLink]="['/signin' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Sign In</a></p>
         </ng-template>
-        <p class="cta-secondary"><a [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a></p>
-        <p *ngIf="officialMempoolSpace && env.LIGHTNING" class="cta-secondary"><a [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]" i18n="footer.connect-to-our-nodes">Connect to our Nodes</a></p>
-        <p><a [routerLink]="['/about' | relativeUrl]">About The Mempool Open Source Project®</a></p>
       </div>
       <div class="col-lg-6 col-md-10 offset-md-1 links outer">
         <div class="row">
@@ -28,6 +28,8 @@
             <p><a [routerLink]="['/mining' | relativeUrl]">Mining Dashboard</a></p>
             <p><a [routerLink]="['/lightning' | relativeUrl]">Lightning Dashboard</a></p>
             <p><a [routerLink]="['/blocks' | relativeUrl]">Recent Blocks</a></p>
+            <p><a [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a></p>
+            <p *ngIf="officialMempoolSpace && env.LIGHTNING"><a [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]" i18n="footer.connect-to-our-nodes">Connect to our Nodes</a></p>
             <p><a [routerLink]="['/docs/api' | relativeUrl]">API Documentation</a></p>
           </div>
           <div class="col-lg-6 links">
diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.scss b/frontend/src/app/shared/components/global-footer/global-footer.component.scss
index defbe937e..cec41f25b 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.scss
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.scss
@@ -89,6 +89,11 @@ footer .row.version p a {
   color: #09a3ba;
 }
 
+.main-logo {
+  max-width: 220px;
+  margin: 0 auto 20px auto;
+}
+
 @media (max-width: 992px) {
 
   footer .row.main .links.outer {

From 316028fe6633da73d9e816bfb660d6dad41a9771 Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Tue, 1 Aug 2023 17:24:26 +0900
Subject: [PATCH 2/6] Add space below tagline

---
 .../components/global-footer/global-footer.component.scss     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.scss b/frontend/src/app/shared/components/global-footer/global-footer.component.scss
index cec41f25b..387a27ffc 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.scss
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.scss
@@ -21,6 +21,10 @@ footer .row.main .branding {
   text-align: center;
 }
 
+footer .row.main .branding > p {
+  margin-bottom: 45px;
+}
+
 footer .row.main .branding .btn {
   display: inline-block;
   color: #fff !important;

From 4cb379bb0ffc9e3c11578e644d567b057bad7989 Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Tue, 1 Aug 2023 17:26:13 +0900
Subject: [PATCH 3/6] Change more networks to networks

---
 .../components/global-footer/global-footer.component.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html
index 58b7c5b1e..e1d853848 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.html
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html
@@ -52,7 +52,7 @@
         </div>
         <div class="row">
           <div class="col-lg-6 links">
-            <p class="category">More Networks</p>
+            <p class="category">Networks</p>
             <p *ngIf="currentNetwork !== '' && currentNetwork !== 'mainnet'"><a [href]="networkLink('mainnet')">Mainnet Explorer</a></p>
             <p *ngIf="currentNetwork !== 'testnet'"><a [href]="networkLink('testnet')">Testnet Explorer</a></p>
             <p *ngIf="currentNetwork !== 'signet'"><a [href]="networkLink('signet')">Signet Explorer</a></p>

From d3532eb734182d359ff296a56dc2a3be176269ed Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Tue, 1 Aug 2023 17:35:18 +0900
Subject: [PATCH 4/6] Improve show conditions for explore links

---
 .../components/global-footer/global-footer.component.html     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html
index e1d853848..7206cc34f 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.html
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html
@@ -26,10 +26,10 @@
           <div class="col-lg-6">
             <p class="category">Explore</p>
             <p><a [routerLink]="['/mining' | relativeUrl]">Mining Dashboard</a></p>
-            <p><a [routerLink]="['/lightning' | relativeUrl]">Lightning Dashboard</a></p>
+            <p><a *ngIf="env.LIGHTNING" [routerLink]="['/lightning' | relativeUrl]">Lightning Dashboard</a></p>
             <p><a [routerLink]="['/blocks' | relativeUrl]">Recent Blocks</a></p>
             <p><a [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a></p>
-            <p *ngIf="officialMempoolSpace && env.LIGHTNING"><a [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]" i18n="footer.connect-to-our-nodes">Connect to our Nodes</a></p>
+            <p *ngIf="officialMempoolSpace"><a [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]" i18n="footer.connect-to-our-nodes">Connect to our Nodes</a></p>
             <p><a [routerLink]="['/docs/api' | relativeUrl]">API Documentation</a></p>
           </div>
           <div class="col-lg-6 links">

From f166cb79741fb54881054f6803f6889e110438a2 Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Tue, 1 Aug 2023 17:36:12 +0900
Subject: [PATCH 5/6] Remove commented/inactive social links

---
 .../global-footer/global-footer.component.html           | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html
index 7206cc34f..a5792bb17 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.html
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html
@@ -40,15 +40,6 @@
             <p><a [routerLink]="['/docs/faq']" fragment="why-is-transaction-stuck-in-mempool">Why isn't my transaction confirming?</a></p>
             <p><a [routerLink]="['/docs/faq' | relativeUrl]">More FAQs ›</a></p>
           </div>
-          <!--<div class="col-lg-4 links">
-            <p class="category">Connect</p>
-            <p><a href="https://github.com/mempool" target="_blank">GitHub</a></p>
-            <p><a href="https://twitter.com/mempool" target="_blank">Twitter</a></p>
-            <p><a href="nostr:npub18d4r6wanxkyrdfjdrjqzj2ukua5cas669ew2g5w7lf4a8te7awzqey6lt3" target="_blank">Nostr</a></p>
-            <p><a href="https://youtube.com/@mempool" target="_blank">YouTube</a></p>
-            <p><a href="https://bitcointv.com/c/mempool/videos" target="_blank">BitcoinTV</a></p>
-            <p><a href="https://mempool.chat" target="_blank">Matrix</a></p>
-          </div>-->
         </div>
         <div class="row">
           <div class="col-lg-6 links">

From 8fe78fa12b995997cc473db3997d5e284c26a661 Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Tue, 1 Aug 2023 18:08:49 +0900
Subject: [PATCH 6/6] Improve conditions for showing network links

---
 .../global-footer/global-footer.component.html       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html
index a5792bb17..903ba70bd 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.html
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html
@@ -42,13 +42,13 @@
           </div>
         </div>
         <div class="row">
-          <div class="col-lg-6 links">
+          <div class="col-lg-6 links" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
             <p class="category">Networks</p>
-            <p *ngIf="currentNetwork !== '' && currentNetwork !== 'mainnet'"><a [href]="networkLink('mainnet')">Mainnet Explorer</a></p>
-            <p *ngIf="currentNetwork !== 'testnet'"><a [href]="networkLink('testnet')">Testnet Explorer</a></p>
-            <p *ngIf="currentNetwork !== 'signet'"><a [href]="networkLink('signet')">Signet Explorer</a></p>
-            <p *ngIf="currentNetwork !== 'liquid' && currentNetwork !== 'liquidtestnet'"><a [href]="networkLink('liquid')">Liquid Explorer</a></p>
-            <p *ngIf="currentNetwork !== 'bisq'"><a [href]="networkLink('bisq')">Bisq Explorer</a></p>
+            <p *ngIf="(officialMempoolSpace || (env.BASE_MODULE === 'mempool')) && (currentNetwork !== '') && (currentNetwork !== 'mainnet')"><a [href]="networkLink('mainnet')">Mainnet Explorer</a></p>
+            <p *ngIf="(officialMempoolSpace || (env.BASE_MODULE === 'mempool')) && (currentNetwork !== 'testnet') && env.TESTNET_ENABLED"><a [href]="networkLink('testnet')">Testnet Explorer</a></p>
+            <p *ngIf="(officialMempoolSpace || (env.BASE_MODULE === 'mempool')) && (currentNetwork !== 'signet') && env.SIGNET_ENABLED"><a [href]="networkLink('signet')">Signet Explorer</a></p>
+            <p *ngIf="env.LIQUID_ENABLED && (currentNetwork !== 'liquid') && (currentNetwork !== 'liquidtestnet')"><a [href]="networkLink('liquid')">Liquid Explorer</a></p>
+            <p *ngIf="env.BISQ_ENABLED && (currentNetwork !== 'bisq')"><a [href]="networkLink('bisq')">Bisq Explorer</a></p>
           </div>
           <div class="col-lg-6 links">
             <p class="category">Legal</p>