@@ -15,6 +15,7 @@ import {
1515 isMinimumRequiredVersionSupported ,
1616} from '../util/feature-flags' ;
1717import { ToastContext } from '../component-library/components/Toast' ;
18+ import { MinimumVersionFlagValue } from '../components/Views/FeatureFlagOverride/FeatureFlagOverride' ;
1819
1920interface FeatureFlagOverrides {
2021 [ key : string ] : unknown ;
@@ -149,9 +150,19 @@ export const FeatureFlagOverrideProvider: React.FC<
149150 }
150151
151152 if ( flag . type === 'boolean with minimumVersion' ) {
153+ return validateMinimumVersion (
154+ flag . key ,
155+ flag . value as unknown as MinimumVersionFlagValue ,
156+ ) ;
157+ }
158+
159+ return flag . value ;
160+ } ;
161+ const validateMinimumVersion = useCallback (
162+ ( flagKey : string , flagValue : MinimumVersionFlagValue ) => {
152163 if (
153164 process . env . NODE_ENV !== 'production' &&
154- ! isMinimumRequiredVersionSupported ( flag . value ? .minimumVersion )
165+ ! isMinimumRequiredVersionSupported ( flagValue . minimumVersion )
155166 ) {
156167 toastRef ?. current ?. showToast ( {
157168 variant : 'Icon' as any ,
@@ -161,19 +172,18 @@ export const FeatureFlagOverrideProvider: React.FC<
161172 isBold : true ,
162173 } ,
163174 {
164- label : `${ flag . key } is not supported on your version of the app.` ,
175+ label : `${ flagKey } is not supported on your version of the app.` ,
165176 } ,
166177 ] ,
167178 iconName : 'Warning' as any ,
168179 hasNoTimeout : false ,
169180 } ) ;
170181 return false ;
171182 }
172- return flag . value . enabled ;
173- }
174-
175- return flag . value ;
176- } ;
183+ return flagValue . enabled ;
184+ } ,
185+ [ ] ,
186+ ) ;
177187
178188 const getOverrideCount = useCallback (
179189 ( ) : number => Object . keys ( overrides ) . length ,
0 commit comments