From 38b452f7b3dc41095f8b2e406dc5055054f60726 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 9 Apr 2024 20:21:24 +0200
Subject: [PATCH] feat: Release activity library for everyone

---
 .../ActivityLibrary/ActivityLibrary.tsx       |  9 +--
 .../components/Dashboard/DashSidebar.tsx      | 26 ++-------
 .../Dashboard/MobileDashSidebar.tsx           | 19 +++----
 packages/client/components/MeetingsDash.tsx   | 12 +---
 .../components/SideBarStartMeetingButton.tsx  | 12 +---
 .../client/components/StartMeetingFAB.tsx     | 13 +----
 .../components/TeamDashMain/TeamDashMain.tsx  |  5 +-
 .../userDashboard/components/UserDashMain.tsx | 37 ++++++++++++
 .../components/UserDashMain/UserDashMain.tsx  | 57 -------------------
 .../UserDashMain/UserDashMainRoot.tsx         | 14 -----
 .../UserDashboard/UserDashboard.tsx           |  4 +-
 .../mutations/helpers/bootstrapNewUser.ts     | 14 +----
 .../public/mutations/loginWithGoogle.ts       |  4 +-
 .../public/mutations/loginWithMicrosoft.ts    |  4 +-
 .../public/mutations/signUpWithPassword.ts    |  2 +-
 .../public/typeDefs/updateFeatureFlag.graphql |  2 -
 .../graphql/public/types/UserFeatureFlags.ts  |  1 -
 17 files changed, 63 insertions(+), 172 deletions(-)
 create mode 100644 packages/client/modules/userDashboard/components/UserDashMain.tsx
 delete mode 100644 packages/client/modules/userDashboard/components/UserDashMain/UserDashMain.tsx
 delete mode 100644 packages/client/modules/userDashboard/components/UserDashMain/UserDashMainRoot.tsx

diff --git a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
index 2bf9f7cb5ab..efd05c78032 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
@@ -85,9 +85,6 @@ const query = graphql`
           }
         }
       }
-      featureFlags {
-        retrosInDisguise
-      }
       organizations {
         featureFlags {
           aiTemplate
@@ -196,7 +193,7 @@ export const ActivityLibrary = (props: Props) => {
   const {queryRef} = props
   const data = usePreloadedQuery<ActivityLibraryQuery>(query, queryRef)
   const {viewer} = data
-  const {featureFlags, availableTemplates, organizations} = viewer
+  const {availableTemplates, organizations} = viewer
   const hasAITemplateFeatureFlag = !!organizations.find((org) => org.featureFlags.aiTemplate)
 
   const setSearch = (value: string) => {
@@ -269,10 +266,6 @@ export const ActivityLibrary = (props: Props) => {
     return undefined
   }, [categoryId, templatesToRender])
 
-  if (!featureFlags.retrosInDisguise) {
-    return <Redirect to='/404' />
-  }
-
   if (!categoryId || !availableCategoryIds.includes(categoryId)) {
     return <Redirect to={`/activity-library/category/${QUICK_START_CATEGORY_ID}`} />
   }
diff --git a/packages/client/components/Dashboard/DashSidebar.tsx b/packages/client/components/Dashboard/DashSidebar.tsx
index c9fbe1403eb..2f5c78f0cdb 100644
--- a/packages/client/components/Dashboard/DashSidebar.tsx
+++ b/packages/client/components/Dashboard/DashSidebar.tsx
@@ -2,7 +2,7 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {useLocation, useRouteMatch} from 'react-router'
+import {useRouteMatch} from 'react-router'
 import {PALETTE} from '../../styles/paletteV3'
 import {NavSidebar} from '../../types/constEnums'
 import {
@@ -16,7 +16,6 @@ import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.gra
 import DashNavList from '../DashNavList/DashNavList'
 import SideBarStartMeetingButton from '../SideBarStartMeetingButton'
 import LeftDashNavItem from './LeftDashNavItem'
-import getTeamIdFromPathname from '../../utils/getTeamIdFromPathname'
 
 const Nav = styled('nav')<{isOpen: boolean}>(({isOpen}) => ({
   // 78px is total height of 'Add meeting' block
@@ -83,9 +82,6 @@ const DashSidebar = (props: Props) => {
     graphql`
       fragment DashSidebar_viewer on User {
         ...StandardHub_viewer
-        featureFlags {
-          retrosInDisguise
-        }
         organizations {
           ...DashNavList_organization
           id
@@ -97,10 +93,8 @@ const DashSidebar = (props: Props) => {
     viewerRef
   )
 
-  const location = useLocation()
-
   if (!viewer) return null
-  const {featureFlags, organizations} = viewer
+  const {organizations} = viewer
 
   if (match) {
     const {orgId: orgIdFromParams} = match.params
@@ -108,7 +102,7 @@ const DashSidebar = (props: Props) => {
     const {id: orgId, name, isBillingLeader} = currentOrg ?? {}
     return (
       <Wrapper>
-        <SideBarStartMeetingButton isOpen={isOpen} hasRid={featureFlags.retrosInDisguise} />
+        <SideBarStartMeetingButton isOpen={isOpen} />
         <Nav isOpen={isOpen}>
           <Contents>
             <NavItemsWrap>
@@ -153,11 +147,9 @@ const DashSidebar = (props: Props) => {
     )
   }
 
-  const teamId = getTeamIdFromPathname()
-
   return (
     <Wrapper>
-      <SideBarStartMeetingButton isOpen={isOpen} hasRid={featureFlags.retrosInDisguise} />
+      <SideBarStartMeetingButton isOpen={isOpen} />
       <Nav isOpen={isOpen}>
         <Contents>
           <NavItemsWrap>
@@ -174,16 +166,6 @@ const DashSidebar = (props: Props) => {
             <NavItem icon={'add'} href={'/newteam/1'} label={'Add a Team'} />
           </NavItemsWrap>
           <DashHR />
-          <NavItemsWrap>
-            {featureFlags.retrosInDisguise && (
-              <NavItem
-                icon={'magic'}
-                href={`/new-meeting/${teamId}`}
-                navState={{backgroundLocation: location}}
-                label={'Add meeting (legacy)'}
-              />
-            )}
-          </NavItemsWrap>
         </Contents>
       </Nav>
     </Wrapper>
diff --git a/packages/client/components/Dashboard/MobileDashSidebar.tsx b/packages/client/components/Dashboard/MobileDashSidebar.tsx
index fd53e154610..03666b91642 100644
--- a/packages/client/components/Dashboard/MobileDashSidebar.tsx
+++ b/packages/client/components/Dashboard/MobileDashSidebar.tsx
@@ -94,9 +94,6 @@ const MobileDashSidebar = (props: Props) => {
     graphql`
       fragment MobileDashSidebar_viewer on User {
         ...StandardHub_viewer
-        featureFlags {
-          retrosInDisguise
-        }
         organizations {
           ...DashNavList_organization
           id
@@ -108,7 +105,7 @@ const MobileDashSidebar = (props: Props) => {
     viewerRef
   )
   if (!viewer) return null
-  const {featureFlags, organizations} = viewer
+  const {organizations} = viewer
 
   if (match) {
     const {orgId: orgIdFromParams} = match.params
@@ -179,14 +176,12 @@ const MobileDashSidebar = (props: Props) => {
               href={'/meetings'}
               label={'Meetings'}
             />
-            {featureFlags.retrosInDisguise && (
-              <LeftDashNavItem
-                onClick={handleMenuClick}
-                icon={'magic'}
-                href={'/activity-library'}
-                label={'Activity Library'}
-              />
-            )}
+            <LeftDashNavItem
+              onClick={handleMenuClick}
+              icon={'magic'}
+              href={'/activity-library'}
+              label={'Activity Library'}
+            />
             <LeftDashNavItem
               onClick={handleMenuClick}
               icon={'timeline'}
diff --git a/packages/client/components/MeetingsDash.tsx b/packages/client/components/MeetingsDash.tsx
index 5cf2893cc01..e92e3c5db81 100644
--- a/packages/client/components/MeetingsDash.tsx
+++ b/packages/client/components/MeetingsDash.tsx
@@ -48,9 +48,6 @@ const MeetingsDash = (props: Props) => {
         id
         dashSearch
         preferredName
-        featureFlags {
-          retrosInDisguise
-        }
         teams {
           ...MeetingsDashActiveMeetings @relay(mask: false)
         }
@@ -61,12 +58,7 @@ const MeetingsDash = (props: Props) => {
   )
   const atmosphere = useAtmosphere()
   const {teamIds: teamFilterIds} = useQueryParameterParser(atmosphere.viewerId)
-  const {
-    teams = [],
-    preferredName = '',
-    dashSearch,
-    featureFlags = {retrosInDisguise: false}
-  } = viewer ?? {}
+  const {teams = [], preferredName = '', dashSearch} = viewer ?? {}
   const activeMeetings = useMemo(
     () =>
       teams
@@ -151,7 +143,7 @@ const MeetingsDash = (props: Props) => {
           ) : null}
         </EmptyContainer>
       )}
-      <StartMeetingFAB hasRid={featureFlags.retrosInDisguise} />
+      <StartMeetingFAB />
     </>
   )
 }
diff --git a/packages/client/components/SideBarStartMeetingButton.tsx b/packages/client/components/SideBarStartMeetingButton.tsx
index 1803351ce1a..ce67aa73bc8 100644
--- a/packages/client/components/SideBarStartMeetingButton.tsx
+++ b/packages/client/components/SideBarStartMeetingButton.tsx
@@ -1,9 +1,7 @@
 import styled from '@emotion/styled'
 import {Add} from '@mui/icons-material'
 import React from 'react'
-import {useLocation} from 'react-router'
 import useRouter from '~/hooks/useRouter'
-import getTeamIdFromPathname from '~/utils/getTeamIdFromPathname'
 import {BezierCurve} from '../types/constEnums'
 import FlatPrimaryButton from './FlatPrimaryButton'
 
@@ -30,17 +28,11 @@ const MeetingLabel = styled('div')<{isOpen: boolean}>(({isOpen}) => ({
   opacity: isOpen ? 1 : 0
 }))
 
-const SideBarStartMeetingButton = ({isOpen, hasRid}: {isOpen: boolean; hasRid: boolean}) => {
-  const location = useLocation()
-  const teamId = getTeamIdFromPathname()
+const SideBarStartMeetingButton = ({isOpen}: {isOpen: boolean}) => {
   const {history} = useRouter()
 
   const onClick = () => {
-    if (hasRid) {
-      history.push('/activity-library')
-    } else {
-      history.replace(`/new-meeting/${teamId}`, {backgroundLocation: location})
-    }
+    history.push('/activity-library')
   }
   return (
     <Button isOpen={isOpen} onClick={onClick}>
diff --git a/packages/client/components/StartMeetingFAB.tsx b/packages/client/components/StartMeetingFAB.tsx
index c9fdf1339ef..ebc0a3c1208 100644
--- a/packages/client/components/StartMeetingFAB.tsx
+++ b/packages/client/components/StartMeetingFAB.tsx
@@ -1,10 +1,8 @@
 import styled from '@emotion/styled'
 import {Add as AddIcon} from '@mui/icons-material'
 import React, {useEffect, useRef, useState} from 'react'
-import {useLocation} from 'react-router'
 import useRouter from '~/hooks/useRouter'
 import {PALETTE} from '~/styles/paletteV3'
-import getTeamIdFromPathname from '~/utils/getTeamIdFromPathname'
 import useBreakpoint from '../hooks/useBreakpoint'
 import {BezierCurve, Breakpoint, ElementWidth, ZIndex} from '../types/constEnums'
 import FloatingActionButton from './FloatingActionButton'
@@ -51,14 +49,11 @@ const MeetingLabel = styled('div')<{isExpanded: boolean}>(({isExpanded}) => ({
 
 interface Props {
   className?: string
-  hasRid: boolean
 }
 
 const StartMeetingFAB = (props: Props) => {
-  const location = useLocation()
-  const {className, hasRid} = props
+  const {className} = props
   const isDesktop = useBreakpoint(Breakpoint.SIDEBAR_LEFT)
-  const teamId = getTeamIdFromPathname()
   const {history} = useRouter()
   const [isExpanded, setIsExpanded] = useState(true)
   const hoverTimerId = useRef<number | undefined>()
@@ -92,11 +87,7 @@ const StartMeetingFAB = (props: Props) => {
     }
   }
   const onClick = () => {
-    if (hasRid) {
-      history.push('/activity-library')
-    } else {
-      history.replace(`/new-meeting/${teamId}`, {backgroundLocation: location})
-    }
+    history.push('/activity-library')
   }
   // We use the SideBarStartMeetingButton in this case
   if (isDesktop) {
diff --git a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
index 421f34296fd..9d1cb8125de 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
@@ -32,9 +32,6 @@ const TeamDashMain = (props: Props) => {
             ...TeamTasksHeaderContainer_team
             ...TeamDashActivityTab_team
           }
-          featureFlags {
-            retrosInDisguise
-          }
           ...TeamDashTasksTab_viewer
           ...TeamDrawer_viewer
         }
@@ -67,7 +64,7 @@ const TeamDashMain = (props: Props) => {
             <TeamDashActivityTab teamRef={team} />
           </Route>
         </Switch>
-        <AbsoluteFab hasRid={viewer.featureFlags.retrosInDisguise} />
+        <AbsoluteFab />
       </div>
       <TeamDrawer viewer={viewer} />
     </div>
diff --git a/packages/client/modules/userDashboard/components/UserDashMain.tsx b/packages/client/modules/userDashboard/components/UserDashMain.tsx
new file mode 100644
index 00000000000..2d933840e2a
--- /dev/null
+++ b/packages/client/modules/userDashboard/components/UserDashMain.tsx
@@ -0,0 +1,37 @@
+import React, {lazy, Suspense} from 'react'
+import {Route, RouteComponentProps, Switch} from 'react-router'
+import DashContent from '~/components/Dashboard/DashContent'
+import LoadingComponent from '~/components/LoadingComponent/LoadingComponent'
+import StartMeetingFAB from '~/components/StartMeetingFAB'
+import {LoaderSize} from '~/types/constEnums'
+
+interface Props extends RouteComponentProps {}
+
+const UserTaskViewRoot = lazy(
+  () =>
+    import(/* webpackChunkName: 'MyDashboardTasksRoot' */ '../../../components/UserTaskViewRoot')
+)
+const MyDashboardTimelineRoot = lazy(
+  () =>
+    import(
+      /* webpackChunkName: 'MyDashboardTimelineRoot' */ '../../../components/MyDashboardTimelineRoot'
+    )
+)
+
+const UserDashMain = (props: Props) => {
+  const {match} = props
+
+  return (
+    <DashContent>
+      <Suspense fallback={<LoadingComponent spinnerSize={LoaderSize.PANEL} />}>
+        <Switch>
+          <Route path={`${match.url}/tasks`} component={UserTaskViewRoot} />
+          <Route path={match.url} component={MyDashboardTimelineRoot} />
+        </Switch>
+      </Suspense>
+      <StartMeetingFAB />
+    </DashContent>
+  )
+}
+
+export default UserDashMain
diff --git a/packages/client/modules/userDashboard/components/UserDashMain/UserDashMain.tsx b/packages/client/modules/userDashboard/components/UserDashMain/UserDashMain.tsx
deleted file mode 100644
index 05de40f90c8..00000000000
--- a/packages/client/modules/userDashboard/components/UserDashMain/UserDashMain.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React, {lazy, Suspense} from 'react'
-import graphql from 'babel-plugin-relay/macro'
-import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import {UserDashMainQuery} from '~/__generated__/UserDashMainQuery.graphql'
-import {Route, RouteComponentProps, Switch} from 'react-router'
-import DashContent from '~/components/Dashboard/DashContent'
-import LoadingComponent from '../../../../components/LoadingComponent/LoadingComponent'
-import StartMeetingFAB from '../../../../components/StartMeetingFAB'
-import {LoaderSize} from '../../../../types/constEnums'
-
-interface Props extends RouteComponentProps {
-  queryRef: PreloadedQuery<UserDashMainQuery>
-}
-
-const UserTaskViewRoot = lazy(
-  () =>
-    import(/* webpackChunkName: 'MyDashboardTasksRoot' */ '../../../../components/UserTaskViewRoot')
-)
-const MyDashboardTimelineRoot = lazy(
-  () =>
-    import(
-      /* webpackChunkName: 'MyDashboardTimelineRoot' */ '../../../../components/MyDashboardTimelineRoot'
-    )
-)
-
-const UserDashMain = (props: Props) => {
-  const {match, queryRef} = props
-
-  const data = usePreloadedQuery<UserDashMainQuery>(
-    graphql`
-      query UserDashMainQuery {
-        viewer {
-          featureFlags {
-            retrosInDisguise
-          }
-        }
-      }
-    `,
-    queryRef
-  )
-
-  const {viewer} = data
-
-  return (
-    <DashContent>
-      <Suspense fallback={<LoadingComponent spinnerSize={LoaderSize.PANEL} />}>
-        <Switch>
-          <Route path={`${match.url}/tasks`} component={UserTaskViewRoot} />
-          <Route path={match.url} component={MyDashboardTimelineRoot} />
-        </Switch>
-      </Suspense>
-      <StartMeetingFAB hasRid={viewer.featureFlags.retrosInDisguise} />
-    </DashContent>
-  )
-}
-
-export default UserDashMain
diff --git a/packages/client/modules/userDashboard/components/UserDashMain/UserDashMainRoot.tsx b/packages/client/modules/userDashboard/components/UserDashMain/UserDashMainRoot.tsx
deleted file mode 100644
index e1681aee80f..00000000000
--- a/packages/client/modules/userDashboard/components/UserDashMain/UserDashMainRoot.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React, {Suspense} from 'react'
-import useQueryLoaderNow from '~/hooks/useQueryLoaderNow'
-import userDashMainQuery, {UserDashMainQuery} from '~/__generated__/UserDashMainQuery.graphql'
-import UserDashMain from './UserDashMain'
-import {RouteComponentProps} from 'react-router'
-
-const UserDashMainRoot = (props: RouteComponentProps) => {
-  const queryRef = useQueryLoaderNow<UserDashMainQuery>(userDashMainQuery)
-  return (
-    <Suspense fallback={''}>{queryRef && <UserDashMain queryRef={queryRef} {...props} />}</Suspense>
-  )
-}
-
-export default UserDashMainRoot
diff --git a/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx b/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx
index 6b7c686cdf1..9b666042d9d 100644
--- a/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx
+++ b/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx
@@ -14,9 +14,7 @@ const Organization = lazy(
       /* webpackChunkName: 'OrganizationRoot' */ '../../containers/Organization/OrganizationRoot'
     )
 )
-const UserDashMain = lazy(
-  () => import(/* webpackChunkName: 'UserDashMain' */ '../UserDashMain/UserDashMainRoot')
-)
+const UserDashMain = lazy(() => import(/* webpackChunkName: 'UserDashMain' */ '../UserDashMain'))
 const UserProfile = lazy(
   () => import(/* webpackChunkName: 'UserProfileRoot' */ '../UserProfileRoot')
 )
diff --git a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
index cb4fc7095f6..278c71930b7 100644
--- a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
+++ b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
@@ -22,8 +22,7 @@ import getSAMLURLFromEmail from '../../../utils/getSAMLURLFromEmail'
 const bootstrapNewUser = async (
   newUser: User,
   isOrganic: boolean,
-  dataLoader: DataLoaderWorker,
-  searchParams?: string
+  dataLoader: DataLoaderWorker
 ) => {
   const r = await getRethink()
   const {
@@ -49,17 +48,6 @@ const bootstrapNewUser = async (
 
   const experimentalFlags = [...featureFlags]
 
-  // Retros in disguise
-  const domainUserHasRidFlag = usersWithDomain.some((user) =>
-    user.featureFlags.includes('retrosInDisguise')
-  )
-  const params = new URLSearchParams(searchParams)
-  if (Boolean(params.get('rid')) || domainUserHasRidFlag) {
-    experimentalFlags.push('retrosInDisguise')
-  } else if (usersWithDomain.length === 0) {
-    experimentalFlags.push('retrosInDisguise')
-  }
-
   // Add signUpDestinationTeam feature flag to 50% of new accounts
   if (Math.random() < 0.5) {
     experimentalFlags.push('signUpDestinationTeam')
diff --git a/packages/server/graphql/public/mutations/loginWithGoogle.ts b/packages/server/graphql/public/mutations/loginWithGoogle.ts
index bb039acac3b..b2d120c4e7f 100644
--- a/packages/server/graphql/public/mutations/loginWithGoogle.ts
+++ b/packages/server/graphql/public/mutations/loginWithGoogle.ts
@@ -15,7 +15,7 @@ import {MutationResolvers} from '../resolverTypes'
 
 const loginWithGoogle: MutationResolvers['loginWithGoogle'] = async (
   _source,
-  {code, invitationToken, pseudoId, params},
+  {code, invitationToken, pseudoId},
   context
 ) => {
   const {dataLoader} = context
@@ -98,7 +98,7 @@ const loginWithGoogle: MutationResolvers['loginWithGoogle'] = async (
     identities: [identity],
     pseudoId
   })
-  context.authToken = await bootstrapNewUser(newUser, !invitationToken, dataLoader, params)
+  context.authToken = await bootstrapNewUser(newUser, !invitationToken, dataLoader)
   return {
     userId,
     authToken: encodeAuthToken(context.authToken),
diff --git a/packages/server/graphql/public/mutations/loginWithMicrosoft.ts b/packages/server/graphql/public/mutations/loginWithMicrosoft.ts
index 9737193a06d..e41022046d6 100644
--- a/packages/server/graphql/public/mutations/loginWithMicrosoft.ts
+++ b/packages/server/graphql/public/mutations/loginWithMicrosoft.ts
@@ -15,7 +15,7 @@ import {MutationResolvers} from '../resolverTypes'
 
 const loginWithMicrosoft: MutationResolvers['loginWithMicrosoft'] = async (
   _source,
-  {code, invitationToken, pseudoId, params},
+  {code, invitationToken, pseudoId},
   context
 ) => {
   const {dataLoader} = context
@@ -100,7 +100,7 @@ const loginWithMicrosoft: MutationResolvers['loginWithMicrosoft'] = async (
     identities: [identity],
     pseudoId
   })
-  context.authToken = await bootstrapNewUser(newUser, !invitationToken, dataLoader, params)
+  context.authToken = await bootstrapNewUser(newUser, !invitationToken, dataLoader)
   return {
     userId,
     authToken: encodeAuthToken(context.authToken),
diff --git a/packages/server/graphql/public/mutations/signUpWithPassword.ts b/packages/server/graphql/public/mutations/signUpWithPassword.ts
index ea335848a77..0bb1ae2ddd6 100644
--- a/packages/server/graphql/public/mutations/signUpWithPassword.ts
+++ b/packages/server/graphql/public/mutations/signUpWithPassword.ts
@@ -65,7 +65,7 @@ const signUpWithPassword: MutationResolvers['signUpWithPassword'] = async (
   const hashedPassword = await bcrypt.hash(password, Security.SALT_ROUNDS)
   const newUser = createNewLocalUser({email, hashedPassword, isEmailVerified: false, pseudoId})
   // MUTATIVE
-  context.authToken = await bootstrapNewUser(newUser, isOrganic, dataLoader, params)
+  context.authToken = await bootstrapNewUser(newUser, isOrganic, dataLoader)
   return {
     userId: newUser.id,
     authToken: encodeAuthToken(context.authToken),
diff --git a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
index 411d2f484f6..8eefed7fef4 100644
--- a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
+++ b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
@@ -7,7 +7,6 @@ enum UserFlagEnum {
   recurrence
   noAISummary
   noMeetingHistoryLimit
-  retrosInDisguise
   adHocTeams
   noTemplateLimit
   signUpDestinationTeam
@@ -22,7 +21,6 @@ type UserFeatureFlags {
   recurrence: Boolean!
   noAISummary: Boolean!
   noMeetingHistoryLimit: Boolean!
-  retrosInDisguise: Boolean!
   adHocTeams: Boolean!
   noTemplateLimit: Boolean!
   signUpDestinationTeam: Boolean!
diff --git a/packages/server/graphql/public/types/UserFeatureFlags.ts b/packages/server/graphql/public/types/UserFeatureFlags.ts
index f8c72854653..a96af981d89 100644
--- a/packages/server/graphql/public/types/UserFeatureFlags.ts
+++ b/packages/server/graphql/public/types/UserFeatureFlags.ts
@@ -4,7 +4,6 @@ const UserFeatureFlags: UserFeatureFlagsResolvers = {
   insights: ({insights}) => !!insights,
   noAISummary: ({noAISummary}) => !!noAISummary,
   noMeetingHistoryLimit: ({noMeetingHistoryLimit}) => !!noMeetingHistoryLimit,
-  retrosInDisguise: ({retrosInDisguise}) => !!retrosInDisguise,
   adHocTeams: ({adHocTeams}) => !!adHocTeams,
   noTemplateLimit: ({noTemplateLimit}) => !!noTemplateLimit,
   signUpDestinationTeam: ({signUpDestinationTeam}) => !!signUpDestinationTeam