diff --git a/invokeai/frontend/web/src/features/parameters/components/Upscale/ParamTileControlNetModel.tsx b/invokeai/frontend/web/src/features/parameters/components/Upscale/ParamTileControlNetModel.tsx index 2806824695..fcdc8ad983 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Upscale/ParamTileControlNetModel.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Upscale/ParamTileControlNetModel.tsx @@ -29,7 +29,7 @@ const ParamTileControlNetModel = () => { return ( - {t('controlLayers.controlNet')} + {t('controlNet')} ); diff --git a/invokeai/frontend/web/src/features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion.tsx b/invokeai/frontend/web/src/features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion.tsx index 37475ad6aa..b74a95ee3f 100644 --- a/invokeai/frontend/web/src/features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion.tsx +++ b/invokeai/frontend/web/src/features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion.tsx @@ -15,7 +15,9 @@ import ParamSeamlessYAxis from 'features/parameters/components/Seamless/ParamSea import ParamFLUXVAEModelSelect from 'features/parameters/components/VAEModel/ParamFLUXVAEModelSelect'; import ParamVAEModelSelect from 'features/parameters/components/VAEModel/ParamVAEModelSelect'; import ParamVAEPrecision from 'features/parameters/components/VAEModel/ParamVAEPrecision'; +import ParamTileControlNetModel from 'features/parameters/components/Upscale/ParamTileControlNetModel'; import { useStandaloneAccordionToggle } from 'features/settingsAccordions/hooks/useStandaloneAccordionToggle'; +import { selectActiveTab } from 'features/ui/store/uiSelectors'; import { memo, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { useGetModelConfigQuery } from 'services/api/endpoints/models'; @@ -33,6 +35,7 @@ export const AdvancedSettingsAccordion = memo(() => { const { currentData: vaeConfig } = useGetModelConfigQuery(vaeKey ?? skipToken); const isFLUX = useAppSelector(selectIsFLUX); const isSD3 = useAppSelector(selectIsSD3); + const activeTab = useAppSelector(selectActiveTab); const selectBadges = useMemo( () => @@ -112,6 +115,7 @@ export const AdvancedSettingsAccordion = memo(() => { )} + {activeTab === 'upscaling' && } ); diff --git a/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleSettingsAccordion.tsx b/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleSettingsAccordion.tsx index 2f3b6ebbfb..34b69e931f 100644 --- a/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleSettingsAccordion.tsx +++ b/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleSettingsAccordion.tsx @@ -5,7 +5,6 @@ import { roundDownToMultiple } from 'common/util/roundDownToMultiple'; import ParamCreativity from 'features/parameters/components/Upscale/ParamCreativity'; import ParamSpandrelModel from 'features/parameters/components/Upscale/ParamSpandrelModel'; import ParamStructure from 'features/parameters/components/Upscale/ParamStructure'; -import ParamTileControlNetModel from 'features/parameters/components/Upscale/ParamTileControlNetModel'; import { selectUpscaleSlice } from 'features/parameters/store/upscaleSlice'; import { getGridSize } from 'features/parameters/util/optimalDimension'; import { UpscaleScaleSlider } from 'features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleScaleSlider'; @@ -71,7 +70,6 @@ export const UpscaleSettingsAccordion = memo(() => { -