allow completely disabling torchy

Author: Titanium2099

src/addons/settings/settings.jsx

@@ -572,7 +572,7 @@ const Addon = ({
                 <div className={styles.addonSwitch}>
                     <Switch
                         value={settings.enabled}
-                        disabled={id === 'ai-integration' || id === 'collaboration'}
+                        disabled={id === 'collaboration'}
                         onChange={value => {
                             if (
                                 !value ||

src/components/menu-bar/menu-bar.jsx

@@ -76,6 +76,7 @@ import {
     closeErrorsMenu
 } from '../../reducers/menus';
 import {setFileHandle} from '../../reducers/tw.js';
+import SettingsStore from '../../addons/settings-store-singleton';
 
 import collectMetadata from '../../lib/collect-metadata';
 
@@ -101,6 +102,9 @@ import SeeInsideButton from './tw-see-inside.jsx';
 import {APP_NAME} from '../../lib/brand.js';
 import {showStandardAlert} from '../../reducers/alerts';
 
+const isTorchyEnabled = SettingsStore.store['ai-integration'] &&
+                        SettingsStore.store['ai-integration'].enabled;
+
 const twMessages = defineMessages({
     compileError: {
         id: 'tw.menuBar.compileError',
@@ -806,25 +810,28 @@ class MenuBar extends React.Component {
                             </div>
                         )}
                     </div>
-                    <Divider className={styles.divider} />
-
-                    <div className={styles.menuBarItem}>
-                        <Button
-                            className={classNames(styles.torchyButton, styles.feedbackLink)}
-                            iconSrc={aiIcon}
-                            onClick={this.handleClickTorchy}
-                        >
-                            <FormattedMessage
-                                defaultMessage="Torchy"
-                                description="Button to open the Torchy Popup"
-                                id="tw.topMenuTorchyButton"
-                                values={{
-                                    APP_NAME
-                                }}
-                            />
-                        </Button>
-                    </div>
+                    {isTorchyEnabled && (
+                        <React.Fragment>
 
+                            <Divider className={styles.divider} />
+                            <div className={styles.menuBarItem}>
+                                <Button
+                                    className={classNames(styles.torchyButton, styles.feedbackLink)}
+                                    iconSrc={aiIcon}
+                                    onClick={this.handleClickTorchy}
+                                >
+                                    <FormattedMessage
+                                        defaultMessage="Torchy"
+                                        description="Button to open the Torchy Popup"
+                                        id="tw.topMenuTorchyButton"
+                                        values={{
+                                            APP_NAME
+                                        }}
+                                    />
+                                </Button>
+                            </div>
+                        </React.Fragment>
+                    )}
                     <Divider className={styles.divider} />
 
                     {this.props.canEditTitle ? (

src/containers/blocks.jsx

@@ -47,6 +47,10 @@ import AddonHooks from '../addons/hooks.js';
 import LoadScratchBlocksHOC from '../lib/tw-load-scratch-blocks-hoc.jsx';
 import {findTopBlock} from '../lib/backpack/code-payload.js';
 import {gentlyRequestPersistentStorage} from '../lib/tw-persistent-storage.js';
+import SettingsStore from '../addons/settings-store-singleton';
+
+const showAI = SettingsStore.store['ai-integration'] &&
+               SettingsStore.store['ai-integration'].enabled;
 
 // TW: Strings we add to scratch-blocks are localized here
 const messages = defineMessages({
@@ -161,6 +165,7 @@ class Blocks extends React.Component {
                 rtl: this.props.isRtl,
                 toolbox: this.props.toolboxXML,
                 colours: this.props.theme.getBlockColors(),
+                showAIButton: showAI,
                 grid: {
                     colour: this.props.theme.getBlockColors().gridColor
                 }