Merge pull request #1119 from The-Commit-Company/1117-unable-to-delet…

…e-the-archived-channel fix: allow admins to delete archived channels
The-Commit-Company · Oct 18, 2024 · 53fc73e · 53fc73e
2 parents 0f100fc + c6ef2e2
commit 53fc73e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/frontend/src/components/feature/channels/ViewChannelDetailsModal.tsx b/frontend/src/components/feature/channels/ViewChannelDetailsModal.tsx
@@ -63,8 +63,7 @@ const ViewChannelDetailsModalContent = ({ setOpen, channelData }: ViewChannelDet
     }, [setOpen])
 
     // channel settings are only available for admins 
-    // the general channel is the default channel and cannot be deleted or archived 
-    const allowSettingChange = (channelMembers[currentUser]?.is_admin == 1 && channelData.name != 'general' && channelData.is_archived == 0) || false
+    const allowSettingChange = (channelMembers[currentUser]?.is_admin == 1) || false
 
     return (
         <>

diff --git a/frontend/src/utils/channel/ChannelRedirect.tsx b/frontend/src/utils/channel/ChannelRedirect.tsx
@@ -12,7 +12,7 @@ import { ChannelListProvider } from './ChannelListProvider'
  */
 export const ChannelRedirect = () => {
 
-    const lastChannel = localStorage.getItem('ravenLastChannel') ?? 'general'
+    const lastChannel = localStorage.getItem('ravenLastChannel') ?? ''
 
     const navigate = useNavigate()
     const { pathname } = useLocation()