From 8a6365b914c8bf5d20094f8098d712a8979b72fb Mon Sep 17 00:00:00 2001 From: MuhammadUmer44 Date: Fri, 12 Apr 2024 20:55:44 +0500 Subject: [PATCH 1/2] fix(setting-modal): scrollbar overflowing and syntax of buttons different columns --- src/components/SettingsModal/SettingsView/Appearance/index.tsx | 2 +- src/components/SettingsModal/SettingsView/General/index.tsx | 2 +- src/components/SettingsModal/SettingsView/index.tsx | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/SettingsModal/SettingsView/Appearance/index.tsx b/src/components/SettingsModal/SettingsView/Appearance/index.tsx index 88619bc9b..ab2ad4bfc 100644 --- a/src/components/SettingsModal/SettingsView/Appearance/index.tsx +++ b/src/components/SettingsModal/SettingsView/Appearance/index.tsx @@ -24,7 +24,7 @@ export const Appearance: FC = ({ onClose }) => { diff --git a/src/components/SettingsModal/SettingsView/General/index.tsx b/src/components/SettingsModal/SettingsView/General/index.tsx index b4a34ef7d..5cf3a2247 100644 --- a/src/components/SettingsModal/SettingsView/General/index.tsx +++ b/src/components/SettingsModal/SettingsView/General/index.tsx @@ -66,7 +66,7 @@ export const General: FC = ({ initialValues }) => { ) : ( )} diff --git a/src/components/SettingsModal/SettingsView/index.tsx b/src/components/SettingsModal/SettingsView/index.tsx index 72acfd404..1e9071888 100644 --- a/src/components/SettingsModal/SettingsView/index.tsx +++ b/src/components/SettingsModal/SettingsView/index.tsx @@ -133,6 +133,8 @@ const TabPanelWrapper = styled(Flex)` max-height: 495px; height: fit-content; min-width: 480px; + overflow: hidden; + border-radius: 9px; ` const Wrapper = styled(Flex)` From 641253239f2734bbb3fda7dcc165ba1239c7a903 Mon Sep 17 00:00:00 2001 From: MuhammadUmer44 Date: Fri, 12 Apr 2024 21:22:10 +0500 Subject: [PATCH 2/2] fix(setting-modal): fix unrelated unit test --- .../SettingsModal/SettingsView/utils/__tests__/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/SettingsModal/SettingsView/utils/__tests__/index.tsx b/src/components/SettingsModal/SettingsView/utils/__tests__/index.tsx index 063eaccc7..2a4fd5757 100644 --- a/src/components/SettingsModal/SettingsView/utils/__tests__/index.tsx +++ b/src/components/SettingsModal/SettingsView/utils/__tests__/index.tsx @@ -1,5 +1,7 @@ +/* eslint-disable padding-line-between-statements */ import { fireEvent, render, screen } from '@testing-library/react' import * as React from 'react' +import '@testing-library/jest-dom' import { SettingsView } from '../../index' import * as useUserStoreModule from '../../../../../stores/useUserStore'