diff --git a/invokeai/frontend/web/src/app/types/invokeai.ts b/invokeai/frontend/web/src/app/types/invokeai.ts index 8ec968e269..39b9fea1fa 100644 --- a/invokeai/frontend/web/src/app/types/invokeai.ts +++ b/invokeai/frontend/web/src/app/types/invokeai.ts @@ -25,9 +25,7 @@ export type AppFeature = | 'invocationCache' | 'bulkDownload' | 'starterModels' - | 'hfToken' - | 'invocationProgressAlert'; - + | 'hfToken'; /** * A disable-able Stable Diffusion feature */ diff --git a/invokeai/frontend/web/src/features/controlLayers/components/CanvasAlerts/CanvasAlertsInvocationProgress.tsx b/invokeai/frontend/web/src/features/controlLayers/components/CanvasAlerts/CanvasAlertsInvocationProgress.tsx index ca09b10cff..26a475469b 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/CanvasAlerts/CanvasAlertsInvocationProgress.tsx +++ b/invokeai/frontend/web/src/features/controlLayers/components/CanvasAlerts/CanvasAlertsInvocationProgress.tsx @@ -2,7 +2,6 @@ import { Alert, AlertDescription, AlertIcon, AlertTitle } from '@invoke-ai/ui-li import { useStore } from '@nanostores/react'; import { useAppSelector } from 'app/store/storeHooks'; import { useDeferredModelLoadingInvocationProgressMessage } from 'features/controlLayers/hooks/useDeferredModelLoadingInvocationProgressMessage'; -import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus'; import { selectIsLocal } from 'features/system/store/configSlice'; import { selectSystemShouldShowInvocationProgressDetail } from 'features/system/store/systemSlice'; import { memo } from 'react'; @@ -44,20 +43,14 @@ const CanvasAlertsInvocationProgressContentCommercial = memo(() => { CanvasAlertsInvocationProgressContentCommercial.displayName = 'CanvasAlertsInvocationProgressContentCommercial'; export const CanvasAlertsInvocationProgress = memo(() => { - const isProgressMessageAlertEnabled = useFeatureStatus('invocationProgressAlert'); const shouldShowInvocationProgressDetail = useAppSelector(selectSystemShouldShowInvocationProgressDetail); const isLocal = useAppSelector(selectIsLocal); - // The alert is disabled at the system level - if (!isProgressMessageAlertEnabled) { - return null; - } - if (!isLocal) { return ; } - // The alert is disabled at the user level + // OSS user setting if (!shouldShowInvocationProgressDetail) { return null; } diff --git a/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsModal.tsx b/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsModal.tsx index 3117a39a8e..4816cb928b 100644 --- a/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsModal.tsx +++ b/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsModal.tsx @@ -26,7 +26,6 @@ import { SettingsDeveloperLogLevel } from 'features/system/components/SettingsMo import { SettingsDeveloperLogNamespaces } from 'features/system/components/SettingsModal/SettingsDeveloperLogNamespaces'; import { useClearIntermediates } from 'features/system/components/SettingsModal/useClearIntermediates'; import { StickyScrollable } from 'features/system/components/StickyScrollable'; -import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus'; import { selectSystemShouldAntialiasProgressImage, selectSystemShouldConfirmOnDelete, @@ -59,6 +58,7 @@ type ConfigOptions = { shouldShowResetWebUiText?: boolean; shouldShowClearIntermediates?: boolean; shouldShowLocalizationToggle?: boolean; + shouldShowInvocationProgressDetailSetting?: boolean; }; const defaultConfig: ConfigOptions = { @@ -66,6 +66,7 @@ const defaultConfig: ConfigOptions = { shouldShowResetWebUiText: true, shouldShowClearIntermediates: true, shouldShowLocalizationToggle: true, + shouldShowInvocationProgressDetailSetting: true, }; type SettingsModalProps = { @@ -107,7 +108,6 @@ const SettingsModal = ({ config = defaultConfig, children }: SettingsModalProps) const shouldEnableModelDescriptions = useAppSelector(selectSystemShouldEnableModelDescriptions); const shouldConfirmOnNewSession = useAppSelector(selectSystemShouldConfirmOnNewSession); const shouldShowInvocationProgressDetail = useAppSelector(selectSystemShouldShowInvocationProgressDetail); - const isInvocationProgressAlertEnabled = useFeatureStatus('invocationProgressAlert'); const onToggleConfirmOnNewSession = useCallback(() => { dispatch(shouldConfirmOnNewSessionToggled()); }, [dispatch]); @@ -233,7 +233,7 @@ const SettingsModal = ({ config = defaultConfig, children }: SettingsModalProps) onChange={handleChangeShouldAntialiasProgressImage} /> - {isInvocationProgressAlertEnabled && ( + {Boolean(config?.shouldShowInvocationProgressDetailSetting) && ( {t('settings.showDetailedInvocationProgress')}