From bc8c1eb1ca76539fa1fcc738123623d2e4b49734 Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Fri, 7 Jan 2022 19:52:25 +0100
Subject: [PATCH 1/2] fix: remove 'UTC' label

---
 .../Machines/MachineComponents/Transactions/Transactions.js     | 2 +-
 .../src/pages/SessionManagement/SessionManagement.js            | 2 +-
 new-lamassu-admin/src/pages/Transactions/Transactions.js        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js
index a5902611..c5e71c95 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js
@@ -145,7 +145,7 @@ const Transactions = ({ id }) => {
       width: 140
     },
     {
-      header: 'Date (UTC)',
+      header: 'Date',
       view: it => formatDate(it.created, timezone, 'yyyy-MM-dd'),
       textAlign: 'left',
       size: 'sm',
diff --git a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js
index 13d1fe0c..83457474 100644
--- a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js
+++ b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js
@@ -79,7 +79,7 @@ const SessionManagement = () => {
       }
     },
     {
-      header: 'Expiration date (UTC)',
+      header: 'Expiration date',
       width: 290,
       textAlign: 'right',
       size: 'sm',
diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Transactions/Transactions.js
index 016c8b37..009335c3 100644
--- a/new-lamassu-admin/src/pages/Transactions/Transactions.js
+++ b/new-lamassu-admin/src/pages/Transactions/Transactions.js
@@ -222,7 +222,7 @@ const Transactions = () => {
       width: 140
     },
     {
-      header: 'Date (UTC)',
+      header: 'Date',
       view: it =>
         timezone && formatDate(it.created, timezone, 'yyyy-MM-dd HH:mm:ss'),
       textAlign: 'right',

From f9d3b4abc0323a9af1b760e24aef3e7886bef991 Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Fri, 7 Jan 2022 19:53:05 +0100
Subject: [PATCH 2/2] fix: add scrollbar gutter

---
 new-lamassu-admin/src/styling/global/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/new-lamassu-admin/src/styling/global/index.js b/new-lamassu-admin/src/styling/global/index.js
index 7c57661e..4e5083ef 100644
--- a/new-lamassu-admin/src/styling/global/index.js
+++ b/new-lamassu-admin/src/styling/global/index.js
@@ -28,7 +28,10 @@ export default {
       pointerEvents: 'none'
     },
     html: {
-      height: fill
+      height: fill,
+      '@media screen and (max-height: 900px)': {
+        scrollbarGutter: 'stable'
+      }
     },
     body: {
       width: mainWidth,