Skip to content

Commit

Permalink
Merge branch 'main' into 1035-notification-sent-to-all-users
Browse files Browse the repository at this point in the history
  • Loading branch information
f1sh1918 authored Jun 30, 2023
2 parents 890bb33 + 9353212 commit 6be380a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 26 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { WhoAmIContext } from '../../WhoAmIProvider'
import { Role } from '../../generated/graphql'
import { ProjectConfigContext } from '../../project-configs/ProjectConfigContext'
import ActivityLogCard from './ActivityLogCard'
import ApplicationLinkCard from './ApplicationLinkCard'
import ChangePasswordForm from './ChangePasswordForm'
import NotificationSettings from './NotificationSettings'

Expand All @@ -24,8 +23,6 @@ const UserSettingsController = () => {
<UserSettingsContainer>
{applicationFeatureEnabled && role !== Role.ProjectAdmin && <NotificationSettings projectId={projectId} />}
<ChangePasswordForm />
{/* TODO #897: [Application] Remove Redirect for bayern */}
{applicationFeatureEnabled && <ApplicationLinkCard />}
{activityLogConfig && <ActivityLogCard activityLogConfig={activityLogConfig} />}
</UserSettingsContainer>
)
Expand Down

0 comments on commit 6be380a

Please sign in to comment.