diff --git a/invokeai/frontend/web/src/features/parameters/components/MainModel/DisabledModelWarning.tsx b/invokeai/frontend/web/src/features/parameters/components/MainModel/DisabledModelWarning.tsx index c2ec27d367..87871387be 100644 --- a/invokeai/frontend/web/src/features/parameters/components/MainModel/DisabledModelWarning.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/MainModel/DisabledModelWarning.tsx @@ -11,7 +11,7 @@ export const DisabledModelWarning = () => { const model = useAppSelector(selectModel); const accountSettingsLink = useStore($accountSettingsLink); - const isChatGPT4oHighModelDisabled = useIsModelDisabled('chatGPT4oHigh'); + const { isChatGPT4oHighModelDisabled } = useIsModelDisabled(); if (!model || !isChatGPT4oHighModelDisabled(model)) { return null; diff --git a/invokeai/frontend/web/src/features/parameters/hooks/useIsModelDisabled.ts b/invokeai/frontend/web/src/features/parameters/hooks/useIsModelDisabled.ts index a554e1a628..dfd4e823a5 100644 --- a/invokeai/frontend/web/src/features/parameters/hooks/useIsModelDisabled.ts +++ b/invokeai/frontend/web/src/features/parameters/hooks/useIsModelDisabled.ts @@ -1,17 +1,16 @@ -import type { AppFeature } from 'app/types/invokeai'; import type { ParameterModel } from 'features/parameters/types/parameterSchemas'; import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus'; import { useCallback } from 'react'; -export const useIsModelDisabled = (feature: AppFeature) => { - const isEnabled = useFeatureStatus(feature); +export const useIsModelDisabled = () => { + const isChatGPT4oHighEnabled = useFeatureStatus('chatGPT4oHigh'); - const isModelDisabled = useCallback( + const isChatGPT4oHighModelDisabled = useCallback( (model: ParameterModel) => { - return model?.base === 'chatgpt-4o' && model.name.toLowerCase().includes('high') && !isEnabled; + return model?.base === 'chatgpt-4o' && model.name.toLowerCase().includes('high') && !isChatGPT4oHighEnabled; }, - [isEnabled] + [isChatGPT4oHighEnabled] ); - return isModelDisabled; + return { isChatGPT4oHighModelDisabled }; }; diff --git a/invokeai/frontend/web/src/features/queue/store/readiness.ts b/invokeai/frontend/web/src/features/queue/store/readiness.ts index ffc8f4ecd8..a546f15ecf 100644 --- a/invokeai/frontend/web/src/features/queue/store/readiness.ts +++ b/invokeai/frontend/web/src/features/queue/store/readiness.ts @@ -153,7 +153,7 @@ export const useReadinessWatcher = () => { const canvasIsSelectingObject = useStore(canvasManager?.stateApi.$isSegmenting ?? $true); const canvasIsCompositing = useStore(canvasManager?.compositor.$isBusy ?? $true); const isInPublishFlow = useStore($isInPublishFlow); - const isChatGPT4oHighModelDisabled = useIsModelDisabled('chatGPT4oHigh'); + const { isChatGPT4oHighModelDisabled } = useIsModelDisabled(); useEffect(() => { debouncedUpdateReasons(