Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: console warnings and errors related to event timeline and strategy form #8692

Merged
merged 1 commit into from
Nov 8, 2024
+6 −6
Merged

fix: console warnings and errors related to event timeline and strategy form #8692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/component/events/EventTimeline/EventTimelineHeader/EventTimelineHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export const EventTimelineHeader = ({
<EventTimelineHeaderTip />
<StyledCol>
<ConditionallyRender
condition={Boolean(environment)}
condition={Boolean(environment) && environments.length > 0}
show={() => (
<StyledFilter
select
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/component/feature/FeatureStrategy/FeatureStrategyForm/FeatureStrategyForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ const EnvironmentIconBox = styled(Box)(({ theme }) => ({
alignItems: 'center',
}));

const EnvironmentTypography = styled(Typography)<{ enabled: boolean }>(
({ theme, enabled }) => ({
fontWeight: enabled ? 'bold' : 'normal',
}),
);
const EnvironmentTypography = styled(Typography, {
shouldForwardProp: (prop) => prop !== 'enabled',
})<{ enabled: boolean }>(({ enabled }) => ({
fontWeight: enabled ? 'bold' : 'normal',
}));

const EnvironmentTypographyHeader = styled(Typography)(({ theme }) => ({
marginRight: theme.spacing(0.5),
Expand Down
Loading