aragon · WissenIstNacht · Feb 24, 2021 · Feb 11, 2021 · Feb 12, 2021 · Feb 22, 2021
diff --git a/src/App.js b/src/App.js
@@ -17,7 +17,6 @@ import { PermissionsProvider } from './contexts/PermissionsContext'
 import { IdentityProvider } from './components/IdentityManager/IdentityManager'
 import { LocalIdentityModalProvider } from './components/LocalIdentityModal/LocalIdentityModalManager'
 import LocalIdentityModal from './components/LocalIdentityModal/LocalIdentityModal'
-import HelpScoutBeacon from './components/HelpScoutBeacon/HelpScoutBeacon'
 import GlobalPreferences from './components/GlobalPreferences/GlobalPreferences'
 import CustomToast from './components/CustomToast/CustomToast'
 import OrgView from './components/OrgView/OrgView'
@@ -402,8 +401,6 @@ class App extends React.Component {
                           apps={appsWithIdentifiers}
                           wrapper={wrapper}
                         />
-
-                        <HelpScoutBeacon apps={apps} />
                       </ActivityProvider>
                     </FavoriteDaosProvider>
                   </LocalIdentityModalProvider>

diff --git a/src/components/CustomToast/CustomToast.js b/src/components/CustomToast/CustomToast.js
@@ -1,16 +1,14 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { GU, ToastHub, useViewport } from '@aragon/ui'
-import { useHelpScout } from '../HelpScoutBeacon/useHelpScout'
 
 const TIMEOUT_TOAST = 4000
 
 function CustomToast({ children }) {
   const { below } = useViewport()
-  const { optedOut } = useHelpScout()
   return (
     <ToastHub
-      shift={optedOut ? 0 : below('medium') ? 5.5 * GU : 6.5 * GU}
+      shift={true ? 0 : below('medium') ? 5.5 * GU : 6.5 * GU}
       timeout={TIMEOUT_TOAST}
     >
       {children}

diff --git a/src/components/Error/ErrorScreen.js b/src/components/Error/ErrorScreen.js
@@ -1,7 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { Card, GU, useTheme, useViewport } from '@aragon/ui'
-import HelpScoutBeacon from '../HelpScoutBeacon/HelpScoutBeacon'
 import HomeButton from '../HomeButton/HomeButton'
 
 import eagleSvg from '../../assets/eagle.svg'
@@ -57,7 +56,6 @@ function ErrorScreen({ children }) {
           {children}
         </Container>
       </div>
-      <HelpScoutBeacon apps={[]} />
     </div>
   )
 }

diff --git a/src/components/GlobalPreferences/GlobalPreferences.js b/src/components/GlobalPreferences/GlobalPreferences.js
@@ -20,23 +20,20 @@ import { useRouting } from '../../routing'
 import Network from './Network/Network'
 import Notifications from './Notifications/Notifications'
 import CustomLabels from './CustomLabels/CustomLabels'
-import HelpAndFeedback from './HelpAndFeedback/HelpAndFeedback'
 import SharedIdentities from './SharedIdentities/SharedIdentities'
 import useSharedLink from './SharedIdentities/useSharedLink'
 
 const SECTIONS = new Map([
   ['custom-labels', 'Custom Labels'],
   ['network', 'Network'],
-  ['notifications', 'Notifications'],
-  ['help-and-feedback', 'Help and feedback'],
+  ['notifications', 'Notifications']
 ])
 const SECTION_PATHS = Array.from(SECTIONS.keys())
 const SECTION_VALUES = Array.from(SECTIONS.values())
 
 const CUSTOM_LABELS_INDEX = 0
 const NETWORK_INDEX = 1
 const NOTIFICATIONS_INDEX = 2
-const HELP_AND_FEEDBACK_INDEX = 3
 
 const AnimatedDiv = animated.div
 
@@ -136,7 +133,6 @@ function GlobalPreferencesContent({
                   navigationIndex={2}
                 />
               )}
-              {sectionIndex === HELP_AND_FEEDBACK_INDEX && <HelpAndFeedback />}
             </main>
           </React.Fragment>
         )}

diff --git a/src/components/GlobalPreferences/HelpAndFeedback/HelpAndFeedback.js b/src/components/GlobalPreferences/HelpAndFeedback/HelpAndFeedback.js
diff --git a/src/components/GlobalPreferences/HelpAndFeedback/assets/help-and-feedback.png b/src/components/GlobalPreferences/HelpAndFeedback/assets/help-and-feedback.png
diff --git a/src/components/HelpScoutBeacon/BeaconHeadScripts.js b/src/components/HelpScoutBeacon/BeaconHeadScripts.js