Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

chore(teams): remove feature flag (#4947)

dev-rb7dbf61a89b11
diff --git a/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsx b/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsx
index 7ddba56300..f9c03d703c 100644
--- a/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsx
+++ b/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsx
@@ -1,7 +1,5 @@
-import { ShowFeatureFlag } from '@app/lib/analytics/posthog';
import { LoadingBlock } from '@core/component/LoadingBlock';
import { PcNoiseGrid } from '@core/component/PcNoiseGrid';
-import { ENABLE_TEAMS_OVERRIDE } from '@core/constant/featureFlags';
import { tryMacroId, useDisplayName } from '@core/user';
import LogoIcon from '@icon/macro-logo.svg';
import EnvelopeIcon from '@phosphor/envelope.svg';
@@ -14,23 +12,11 @@ import {
useUserInvitesQuery,
} from '@queries/team/invitations';
import { useTeamQuery } from '@queries/team/teams';
-import { Navigate, useNavigate, useSearchParams } from '@solidjs/router';
+import { useNavigate, useSearchParams } from '@solidjs/router';
import { Button, Surface } from '@ui';
import { createMemo, Match, Show, Switch } from 'solid-js';
export function TeamInviteAcceptance() {
- return (
- <ShowFeatureFlag
- key="enable-teams-settings"
- enabledOverride={ENABLE_TEAMS_OVERRIDE}
- fallback={<Navigate href="/" />}
- >
- <TeamInviteAcceptanceContent />
- </ShowFeatureFlag>
- );
-}
-
-function TeamInviteAcceptanceContent() {
const [searchParams] = useSearchParams();
const navigate = useNavigate();
const userInfo = useUserInfo();
diff --git a/apps/web/src/lib/core/constant/featureFlags.ts b/apps/web/src/lib/core/constant/featureFlags.ts
index 2ef8f433bc..f0bcb48ba2 100644
--- a/apps/web/src/lib/core/constant/featureFlags.ts
+++ b/apps/web/src/lib/core/constant/featureFlags.ts
@@ -373,11 +373,6 @@ export const USE_MACRO_PR_SUMMARY_BLOCK = resolveFeatureFlag(
true
);
-// skips over posthog and sets the ENABLE_TEAMS feature to true if we are in dev mode
-// can also be overridden via VITE_ENABLE_TEAMS env var
-export const ENABLE_TEAMS_OVERRIDE =
- resolveFeatureFlag('ENABLE_TEAMS', DEV_MODE_ENV) || undefined;
-
// skips over posthog and sets the ENABLE_CALLS feature to true if we are in dev mode
const ENABLE_CALLS_OVERRIDE = DEV_MODE_ENV ? true : undefined;
diff --git a/apps/web/src/lib/core/constant/settingsTabsConfig.tsx b/apps/web/src/lib/core/constant/settingsTabsConfig.tsx
index 861dfb16b5..6ae7b88cca 100644
--- a/apps/web/src/lib/core/constant/settingsTabsConfig.tsx
+++ b/apps/web/src/lib/core/constant/settingsTabsConfig.tsx
@@ -21,7 +21,6 @@ import {
ENABLE_APP_STORE_QR_CODE,
ENABLE_CRM_FLAG,
ENABLE_CRM_OVERRIDE,
- ENABLE_TEAMS_OVERRIDE,
} from './featureFlags';
import { PERMISSION_IDS } from './permissions';
import type { SettingsTab } from './SettingsState';
@@ -139,9 +138,6 @@ export const getSettingsTabItem = (
* surface a tab the panel won't render.
*/
export const useSettingsTabAvailable = () => {
- const teamsFlag = useFeatureFlag('enable-teams-settings', {
- enabledOverride: ENABLE_TEAMS_OVERRIDE,
- });
const botManagementFlag = useFeatureFlag(BOT_MANAGEMENT_FLAG, {
enabledOverride: BOT_MANAGEMENT_OVERRIDE,
});
@@ -157,12 +153,12 @@ export const useSettingsTabAvailable = () => {
case 'Billing':
return true;
case 'Team':
- return teamsFlag().enabled;
+ return true;
// CRM is still rolling out (Macro-internal only); keep the settings tab
// behind the same enable-crm gate as every other CRM surface so it never
// leaks into teams that can't actually use the CRM.
case 'CRM':
- return teamsFlag().enabled && crmFlag().enabled;
+ return crmFlag().enabled;
case 'Connected':
return true;
case 'Shortcuts':