diff --git a/electron/.eslintrc.js b/electron/.eslintrc.js index a8b7c00cb..8b270b52e 100644 --- a/electron/.eslintrc.js +++ b/electron/.eslintrc.js @@ -11,8 +11,9 @@ module.exports = { 'plugin:react/recommended', ], rules: { - '@typescript-eslint/no-non-null-assertion': 'off', 'react/prop-types': 'off', // In favor of strong typing - no need to dedupe + 'react/no-is-mounted': 'off', + '@typescript-eslint/no-non-null-assertion': 'off', '@typescript-eslint/no-var-requires': 'off', '@typescript-eslint/ban-ts-comment': 'off', '@typescript-eslint/no-unused-vars': 'off', diff --git a/web/.eslintrc.js b/web/.eslintrc.js index 2b72273b6..d04e3acb1 100644 --- a/web/.eslintrc.js +++ b/web/.eslintrc.js @@ -71,6 +71,7 @@ module.exports = { '@next/next/no-img-element': 'off', '@next/next/no-html-link-for-pages': 'off', 'react/display-name': 'off', + 'react/no-is-mounted': 'off', 'react-hooks/rules-of-hooks': 'error', '@typescript-eslint/no-unused-vars': ['warn'], 'import/order': [ diff --git a/web/screens/Settings/Advanced/index.tsx b/web/screens/Settings/Advanced/index.tsx index b66dc7b86..f132f81e7 100644 --- a/web/screens/Settings/Advanced/index.tsx +++ b/web/screens/Settings/Advanced/index.tsx @@ -35,7 +35,6 @@ import { proxyEnabledAtom, vulkanEnabledAtom, quickAskEnabledAtom, - preserveModelSettingsAtom, } from '@/helpers/atoms/AppConfig.atom' type GPU = { @@ -65,9 +64,6 @@ const Advanced = () => { const [proxyEnabled, setProxyEnabled] = useAtom(proxyEnabledAtom) const quickAskEnabled = useAtomValue(quickAskEnabledAtom) - const [preserveModelSettings, setPreserveModelSettings] = useAtom( - preserveModelSettingsAtom - ) const [proxy, setProxy] = useAtom(proxyAtom) const [ignoreSSL, setIgnoreSSL] = useAtom(ignoreSslAtom) @@ -389,27 +385,6 @@ const Advanced = () => { )} - {experimentalEnabled && ( -
-
-
-
- Preserve Model Settings -
-
-

- Save model settings changes directly to the model file so that - new threads will reuse the previous settings. -

-
- - setPreserveModelSettings(e.target.checked)} - /> -
- )} - {/* Proxy */}