From dc063873473085f4891038fb492034004e49c11b Mon Sep 17 00:00:00 2001
From: TechMiX <mytechmix@gmail.com>
Date: Wed, 6 Dec 2023 19:50:33 +0100
Subject: [PATCH 1/4] fix: rtl issues related to sidenav and global footer

---
 .../global-footer/global-footer.component.html       |  2 +-
 .../global-footer/global-footer.component.scss       |  1 -
 frontend/src/styles.scss                             | 12 ++++++++++++
 3 files changed, 13 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 676db35e5..fba04e605 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
@@ -11,7 +11,7 @@
           <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="site-options d-flex justify-content-center align-items-center" [class]="{'services': isServicesPage}">
+        <div class="site-options float-right d-flex justify-content-center align-items-center" [class]="{'services': isServicesPage}">
           <div class="selector">
             <app-language-selector></app-language-selector>
           </div>
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 148383cb4..79c7dcfce 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
@@ -63,7 +63,6 @@ footer .row.main .links .category:not(:first-child) {
 }
 
 footer .site-options {
-  float: right;
   margin-top: -20px;
 }
 
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index 0e26c4eb3..48d5b5966 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -996,6 +996,18 @@ th {
   .btn-audit {
     margin-left: .5em;
   }
+
+  .sidenav {
+    @extend .sidenav;
+    margin-left: 0px !important;
+    margin-right: -250px;
+
+    .open {
+      @extend .open;
+      margin-right: 0px;
+      right: 0px;
+    }
+  }
 }
 
 .scriptmessage {

From 9406103ed1d895a15895d0e1d5eada60731b7160 Mon Sep 17 00:00:00 2001
From: TechMiX <mytechmix@gmail.com>
Date: Thu, 7 Dec 2023 22:49:51 +0100
Subject: [PATCH 2/4] fix: adjust the blockchain container with menu in rtl
 mode

---
 frontend/src/styles.scss | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index 48d5b5966..be8cec328 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -1001,12 +1001,21 @@ th {
     @extend .sidenav;
     margin-left: 0px !important;
     margin-right: -250px;
+  }
 
-    .open {
-      @extend .open;
-      margin-right: 0px;
-      right: 0px;
-    }
+  .sidenav.open {
+    margin-right: 0px;
+  }
+
+  .profile_image_container {
+    @extend .profile_image_container;
+    margin-right: 0px !important;
+    margin-left: 15px;
+  }
+
+  #blockchain-container.with-menu {
+    width: calc(100% + 120px);
+    left: 120px;
   }
 }
 

From bbcc683a3c2c9db98b67878d4b09105709c66792 Mon Sep 17 00:00:00 2001
From: TechMiX <mytechmix@gmail.com>
Date: Fri, 8 Dec 2023 14:06:34 +0100
Subject: [PATCH 3/4] fix: use empty sidenav when service is disabled

---
 .../src/app/components/master-page/master-page.component.html   | 2 +-
 .../src/app/components/master-page/master-page.component.scss   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html
index dc1cc2c30..f31e262ce 100644
--- a/frontend/src/app/components/master-page/master-page.component.html
+++ b/frontend/src/app/components/master-page/master-page.component.html
@@ -78,7 +78,7 @@
 
 <div class="d-flex" style="overflow: clip">
   <app-menu *ngIf="servicesEnabled" [navOpen]="menuOpen" (loggedOut)="onLoggedOut()" (menuToggled)="menuToggled($event)"></app-menu>
-  <div *ngIf="!servicesEnabled" class="sidenav"><!-- empty sidenav needed to push footer down the screen --></div>
+  <div *ngIf="!servicesEnabled" class="empty-sidenav"><!-- empty sidenav needed to push footer down the screen --></div>
 
   <div class="flex-grow-1 d-flex flex-column">
     <app-testnet-alert *ngIf="network.val === 'testnet' || network.val === 'signet'"></app-testnet-alert>
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 79f5e8a12..a40b4ec61 100644
--- a/frontend/src/app/components/master-page/master-page.component.scss
+++ b/frontend/src/app/components/master-page/master-page.component.scss
@@ -241,7 +241,7 @@ main {
 }
 
 // empty sidenav
-.sidenav {
+.empty-sidenav {
   z-index: 1;
   background-color: transparent;
   width: 0px;

From 05259e9f81419a51c76d64fec168bed0b1425353 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 02:42:17 +0000
Subject: [PATCH 4/4] Bump dtolnay/rust-toolchain

Bumps [dtolnay/rust-toolchain](https://github.com/dtolnay/rust-toolchain) from f361669954a8ecfc00a3443f35f9ac8e610ffc06 to be73d7920c329f220ce78e0234b8f96b7ae60248.
- [Release notes](https://github.com/dtolnay/rust-toolchain/releases)
- [Commits](https://github.com/dtolnay/rust-toolchain/compare/f361669954a8ecfc00a3443f35f9ac8e610ffc06...be73d7920c329f220ce78e0234b8f96b7ae60248)

---
updated-dependencies:
- dependency-name: dtolnay/rust-toolchain
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d097318ca..0602e916a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Install ${{ steps.gettoolchain.outputs.toolchain }} Rust toolchain
         # Latest version available on this commit is 1.71.1
         # Commit date is Aug 3, 2023
-        uses: dtolnay/rust-toolchain@f361669954a8ecfc00a3443f35f9ac8e610ffc06
+        uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248
         with:
           toolchain: ${{ steps.gettoolchain.outputs.toolchain }}