Merge pull request #1237 from MuhammadUmer44/fix-ui-setting-modal

Fix: Syntax Updates for `Button/Column` Labels and Resolved `Scrollbar Overflow` in Settings Modal
stakwork · Apr 15, 2024 · a8115a7 · a8115a7
2 parents ad2c6b3 + 6412532
commit a8115a7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/components/SettingsModal/SettingsView/Appearance/index.tsx b/src/components/SettingsModal/SettingsView/Appearance/index.tsx
@@ -24,7 +24,7 @@ export const Appearance: FC<Props> = ({ onClose }) => {
       <GraphViewControl />
       <Flex mt={308}>
         <Button kind="big" onClick={handleSave}>
-          Save changes
+          Save Changes
         </Button>
       </Flex>
     </Wrapper>

diff --git a/src/components/SettingsModal/SettingsView/General/index.tsx b/src/components/SettingsModal/SettingsView/General/index.tsx
@@ -66,7 +66,7 @@ export const General: FC<Props> = ({ initialValues }) => {
               </SubmitLoader>
             ) : (
               <Button disabled={isSubmitting} id="add-node-submit-cta" kind="big" type="submit">
-                Save changes
+                Save Changes
               </Button>
             )}
           </Flex>

diff --git 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)`

diff --git 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'