Merge pull request #686 from stakwork/bugfix/fix-tabs

fix: fix tabs
stakwork · Dec 13, 2023 · 59701b6 · 59701b6
2 parents 076114a + 30dd89f
commit 59701b6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 27 deletions.
diff --git a/src/components/SettingsModal/SettingsView/index.tsx b/src/components/SettingsModal/SettingsView/index.tsx
@@ -6,7 +6,7 @@ import { useEffect, useState } from 'react'
 import styled from 'styled-components'
 import { Flex } from '~/components/common/Flex'
 import { Text } from '~/components/common/Text'
-import { getAboutData, TAboutParams } from '~/network/fetchSourcesData'
+import { TAboutParams, getAboutData } from '~/network/fetchSourcesData'
 import { useUserStore } from '~/stores/useUserStore'
 import { colors } from '~/utils/colors'
 import { UserPermissions } from '../UserPermissions'
@@ -101,16 +101,14 @@ export const SettingsView: React.FC<Props> = ({ onClose }) => {
           {isAdmin && <StyledTab disableRipple label="User Permissions" {...a11yProps(2)} />}
         </StyledTabs>
       </SettingsHeader>
-      {isAdmin && (
-        <>
-          <TabPanel index={0} value={value}>
-            {!loading ? <General initialValues={initialValues} /> : <></>}
-          </TabPanel>
-          <TabPanel index={2} value={value}>
-            {!loading ? <UserPermissions initialValues={initialValues} /> : <></>}
-          </TabPanel>
-        </>
-      )}
+
+      <TabPanel index={0} value={value}>
+        {!loading ? <General initialValues={initialValues} /> : <></>}
+      </TabPanel>
+      <TabPanel index={2} value={value}>
+        {!loading ? <UserPermissions initialValues={initialValues} /> : <></>}
+      </TabPanel>
+
       <TabPanel index={isAdmin ? 1 : 0} value={value}>
         <Appearance onClose={onClose} />
       </TabPanel>

diff --git a/src/components/SourcesTableModal/SourcesView/index.tsx b/src/components/SourcesTableModal/SourcesView/index.tsx
@@ -50,26 +50,18 @@ export const SourcesView = () => {
     <Wrapper direction="column">
       <StyledTabs aria-label="basic tabs example" onChange={handleChange} value={value}>
         <StyledTab disableRipple label="Sources table" {...a11yProps(0)} />
-        {isAdmin && (
-          <>
-            <StyledTab color={colors.white} disableRipple label="Queued sources" {...a11yProps(1)} />
-            <StyledTab color={colors.white} disableRipple label="Topics" {...a11yProps(1)} />
-          </>
-        )}
+        {isAdmin && <StyledTab color={colors.white} disableRipple label="Queued sources" {...a11yProps(1)} />}
+        {isAdmin && <StyledTab color={colors.white} disableRipple label="Topics" {...a11yProps(1)} />}
       </StyledTabs>
       <TabPanel index={0} value={value}>
         <Sources />
       </TabPanel>
-      {isAdmin && (
-        <>
-          <TabPanel index={1} value={value}>
-            <QueuedSources />
-          </TabPanel>
-          <TabPanel index={2} value={value}>
-            <TopicSources />
-          </TabPanel>
-        </>
-      )}
+      <TabPanel index={1} value={value}>
+        <QueuedSources />
+      </TabPanel>
+      <TabPanel index={2} value={value}>
+        <TopicSources />
+      </TabPanel>
     </Wrapper>
   )
 }