@@ -14,7 +14,10 @@ import {
1414 getFeatureFlagType ,
1515 isMinimumRequiredVersionSupported ,
1616} from '../util/feature-flags' ;
17- import { ToastContext } from '../component-library/components/Toast' ;
17+ import {
18+ ToastContext ,
19+ ToastVariants ,
20+ } from '../component-library/components/Toast' ;
1821import { MinimumVersionFlagValue } from '../components/Views/FeatureFlagOverride/FeatureFlagOverride' ;
1922
2023interface FeatureFlagOverrides {
@@ -140,32 +143,13 @@ export const FeatureFlagOverrideProvider: React.FC<
140143 a . key . localeCompare ( b . key ) ,
141144 ) ;
142145
143- /**
144- * get a specific feature flag value with overrides applied
145- */
146- const getFeatureFlag = ( key : string ) => {
147- const flag = featureFlags [ key ] ;
148- if ( ! flag ) {
149- return undefined ;
150- }
151-
152- 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- } ;
161146 const validateMinimumVersion = useCallback (
162147 ( flagKey : string , flagValue : MinimumVersionFlagValue ) => {
163148 if (
164149 process . env . NODE_ENV !== 'production' &&
165150 ! isMinimumRequiredVersionSupported ( flagValue . minimumVersion )
166151 ) {
167152 toastRef ?. current ?. showToast ( {
168- variant : 'Icon' as any ,
169153 labelOptions : [
170154 {
171155 label : 'Unsupported version' ,
@@ -175,16 +159,35 @@ export const FeatureFlagOverrideProvider: React.FC<
175159 label : `${ flagKey } is not supported on your version of the app.` ,
176160 } ,
177161 ] ,
178- iconName : 'Warning' as any ,
179162 hasNoTimeout : false ,
163+ variant : ToastVariants . Plain ,
180164 } ) ;
181165 return false ;
182166 }
183167 return flagValue . enabled ;
184168 } ,
185- [ ] ,
169+ [ toastRef ] ,
186170 ) ;
187171
172+ /**
173+ * get a specific feature flag value with overrides applied
174+ */
175+ const getFeatureFlag = ( key : string ) => {
176+ const flag = featureFlags [ key ] ;
177+ if ( ! flag ) {
178+ return undefined ;
179+ }
180+
181+ if ( flag . type === 'boolean with minimumVersion' ) {
182+ return validateMinimumVersion (
183+ flag . key ,
184+ flag . value as unknown as MinimumVersionFlagValue ,
185+ ) ;
186+ }
187+
188+ return flag . value ;
189+ } ;
190+
188191 const getOverrideCount = useCallback (
189192 ( ) : number => Object . keys ( overrides ) . length ,
190193 [ overrides ] ,
0 commit comments