diff --git a/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.tsx b/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.tsx index 2f460ab67b..b7cef5c9a2 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.tsx @@ -81,17 +81,7 @@ export const ChangeRequest: VFC = ({ ))} {feature.defaultChange ? ( - {feature.defaultChange.action === - 'addStrategy' - ? 'Default strategy will be added' - : 'Feature status will change'} - - } + isDefaultChange index={feature.changes.length} changeRequest={changeRequest} change={feature.defaultChange} diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx index 5b7ca6fe40..13524b0dd6 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx @@ -89,7 +89,8 @@ const ChangeInnerBox = styled(Box)(({ theme }) => ({ })); export const FeatureChange: FC<{ - actions: ReactNode; + isDefaultChange?: boolean; + actions?: ReactNode; index: number; changeRequest: ChangeRequestType; change: IFeatureChange; @@ -189,6 +190,7 @@ export const FeatureChange: FC<{ )} {change.action === 'updateEnabled' && ( diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ToggleStatusChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ToggleStatusChange.tsx index c49ad4831b..7640e0a5c9 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ToggleStatusChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ToggleStatusChange.tsx @@ -1,5 +1,5 @@ import type { FC, ReactNode } from 'react'; -import { Box } from '@mui/material'; +import { Box, Typography } from '@mui/material'; import { Badge } from 'component/common/Badge/Badge'; import { ChangeItemWrapper as LegacyChangeItemWrapper } from './LegacyStrategyChange.tsx'; import { Action, ChangeItemInfo, ChangeItemWrapper } from './Change.styles'; @@ -7,14 +7,27 @@ import { Action, ChangeItemInfo, ChangeItemWrapper } from './Change.styles'; interface IToggleStatusChange { enabled: boolean; actions?: ReactNode; + isDefaultChange?: boolean; } +const StatusWillChange = () => ( + + Feature status will change + +); + /** * @deprecated use ToggleStatusChange instead; remove with flag crDiffView */ export const LegacyToggleStatusChange: FC = ({ enabled, actions, + isDefaultChange, }) => { return ( @@ -27,6 +40,7 @@ export const LegacyToggleStatusChange: FC = ({ {enabled ? ' Enabled' : 'Disabled'} + {isDefaultChange ? : null} {actions} ); @@ -35,6 +49,7 @@ export const LegacyToggleStatusChange: FC = ({ export const ToggleStatusChange: FC = ({ enabled, actions, + isDefaultChange, }) => { return ( @@ -43,6 +58,7 @@ export const ToggleStatusChange: FC = ({ {enabled ? ' Enabled' : 'Disabled'} + {isDefaultChange ? : null} {actions}