diff --git a/.eslintrc.json b/.eslintrc.json
index a277c50dc..89fe5429c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -61,7 +61,8 @@
                                 "onlyDependOnLibsWithTags": [
                                     "library:utils",
                                     "components:icons",
-                                    "components:ui"
+                                    "components:ui",
+                                    "library:feature-flags"
                                 ]
                             },
                             {
diff --git a/libs/components/common/src/lib/comming-soon/CommingSoon.tsx b/libs/components/common/src/lib/comming-soon/CommingSoon.tsx
new file mode 100644
index 000000000..cf088a567
--- /dev/null
+++ b/libs/components/common/src/lib/comming-soon/CommingSoon.tsx
@@ -0,0 +1,13 @@
+import { Tooltip } from '@toeverything/components/ui';
+import { useFlag } from '@toeverything/datasource/feature-flags';
+function CommingSoon(props: { children: JSX.Element }) {
+    const BooleanCommingSoon = useFlag('BooleanCommingSoon', false);
+    if (!BooleanCommingSoon) return <></>;
+    return (
+        <Tooltip content={'Comming Soon'} placement="top">
+            {props.children}
+        </Tooltip>
+    );
+}
+
+export { CommingSoon };
diff --git a/libs/components/common/src/lib/index.ts b/libs/components/common/src/lib/index.ts
index 928992e1c..9a1eea519 100644
--- a/libs/components/common/src/lib/index.ts
+++ b/libs/components/common/src/lib/index.ts
@@ -49,3 +49,5 @@ export {
     FullScreenIcon,
     UnGroupIcon,
 } from './icon';
+
+export * from './comming-soon/CommingSoon';
diff --git a/libs/components/editor-blocks/src/blocks/group/GroupMenu.tsx b/libs/components/editor-blocks/src/blocks/group/GroupMenu.tsx
index 7ee5c2292..967b9b3af 100644
--- a/libs/components/editor-blocks/src/blocks/group/GroupMenu.tsx
+++ b/libs/components/editor-blocks/src/blocks/group/GroupMenu.tsx
@@ -29,6 +29,7 @@ import type { ActivePanel } from './types';
 import { useFlag } from '@toeverything/datasource/feature-flags';
 import { GroupBy } from './components/group-by/GroupBy';
 
+import { CommingSoon } from '@toeverything/components/common';
 const GroupMenuWrapper = ({
     block,
     editor,
@@ -107,7 +108,7 @@ const GroupMenuWrapper = ({
                         //         Table View
                         //     </IconButton>
                         // )
-                        <Tooltip content={'Comming Soon'} placement="top">
+                        <CommingSoon>
                             <IconButton
                                 active={scene === SCENE_CONFIG.TABLE}
                                 style={{ cursor: 'not-allowed' }}
@@ -115,9 +116,9 @@ const GroupMenuWrapper = ({
                                 <TableIcon fontSize="small" />
                                 Table
                             </IconButton>
-                        </Tooltip>
+                        </CommingSoon>
                     }
-                    <Tooltip content={'Comming Soon'} placement="top">
+                    <CommingSoon>
                         <IconButton
                             active={scene === SCENE_CONFIG.TABLE}
                             style={{ cursor: 'not-allowed' }}
@@ -125,8 +126,8 @@ const GroupMenuWrapper = ({
                             <KanBanIcon fontSize="small" />
                             Calendar
                         </IconButton>
-                    </Tooltip>
-                    <Tooltip content={'Comming Soon'} placement="top">
+                    </CommingSoon>
+                    <CommingSoon>
                         <IconButton
                             active={scene === SCENE_CONFIG.TABLE}
                             style={{ cursor: 'not-allowed' }}
@@ -134,8 +135,8 @@ const GroupMenuWrapper = ({
                             <TableIcon fontSize="small" />
                             Timeline
                         </IconButton>
-                    </Tooltip>
-                    <Tooltip content={'Comming Soon'} placement="top">
+                    </CommingSoon>
+                    <CommingSoon>
                         <IconButton
                             active={scene === SCENE_CONFIG.TABLE}
                             style={{ cursor: 'not-allowed' }}
@@ -143,7 +144,7 @@ const GroupMenuWrapper = ({
                             <KanBanIcon fontSize="small" />
                             BI
                         </IconButton>
-                    </Tooltip>
+                    </CommingSoon>
 
                     {
                         // Closed beta period temporarily