From 1d60635e3bb960ee1cac5704471e9746c13b59d7 Mon Sep 17 00:00:00 2001
From: Sean Tsai <aleetsaiya@gmail.com>
Date: Mon, 24 Jul 2023 00:12:22 +0800
Subject: [PATCH] Remove double scrollbar as the screen is big enough (#1385)
---
packages/desktop-client/src/components/FixedSizeList.js | 2 +-
packages/desktop-client/src/style/styles.ts | 4 +++-
upcoming-release-notes/1385.md | 5 +++++
3 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 upcoming-release-notes/1385.md
diff --git a/packages/desktop-client/src/components/FixedSizeList.js b/packages/desktop-client/src/components/FixedSizeList.js
index fa4a47cce..62ad8b81e 100644
--- a/packages/desktop-client/src/components/FixedSizeList.js
+++ b/packages/desktop-client/src/components/FixedSizeList.js
@@ -206,7 +206,7 @@ export default class FixedSizeList extends PureComponent {
style={{
height,
width,
- overflow: 'auto',
+ overflow: 'hidden auto',
...style,
}}
>
diff --git a/packages/desktop-client/src/style/styles.ts b/packages/desktop-client/src/style/styles.ts
index a90283339..335565690 100644
--- a/packages/desktop-client/src/style/styles.ts
+++ b/packages/desktop-client/src/style/styles.ts
@@ -31,7 +31,9 @@ export const styles = {
},
page: {
flex: 1,
- minHeight: 700, // ensure we can scroll on small screens
+ '@media (max-height: 550px)': {
+ minHeight: 700, // ensure we can scroll on small screens
+ },
paddingTop: 8, // height of the titlebar
[`@media (min-width: ${tokens.breakpoint_small})`]: {
paddingTop: 36,
diff --git a/upcoming-release-notes/1385.md b/upcoming-release-notes/1385.md
new file mode 100644
index 000000000..e1cd69909
--- /dev/null
+++ b/upcoming-release-notes/1385.md
@@ -0,0 +1,5 @@
+---
+category: Bugfix
+authors: [aleetsaiya]
+---
+Remove double scrollbar while the viewport is big enough and remove the horizontal scrollbar under the transaction table.
\ No newline at end of file
--
GitLab