From 7768fba19479fca4aa8815d38274e1abef1616fa Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 29 Mar 2024 11:32:18 +0800
Subject: [PATCH 1/2] depreciate features fields in get user api in web

---
 .../networking/queries/useGetViewerQuery.tsx   |  2 --
 packages/web/pages/settings/account.tsx        | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/web/lib/networking/queries/useGetViewerQuery.tsx b/packages/web/lib/networking/queries/useGetViewerQuery.tsx
index 60649a8d5..9fbb84906 100644
--- a/packages/web/lib/networking/queries/useGetViewerQuery.tsx
+++ b/packages/web/lib/networking/queries/useGetViewerQuery.tsx
@@ -22,7 +22,6 @@ export type UserBasicData = {
   email: string
   source: string
   intercomHash: string
-  features: string[]
   featureList: Feature[]
 }
 
@@ -49,7 +48,6 @@ export function useGetViewerQuery(): ViewerQueryResponse {
         email
         source
         intercomHash
-        features
         featureList {
           ...FeatureFields
         }
diff --git a/packages/web/pages/settings/account.tsx b/packages/web/pages/settings/account.tsx
index ec494c918..56a974aff 100644
--- a/packages/web/pages/settings/account.tsx
+++ b/packages/web/pages/settings/account.tsx
@@ -6,9 +6,12 @@ import {
   SpanBox,
   VStack,
 } from '../../components/elements/LayoutPrimitives'
+import { ProgressBar } from '../../components/elements/ProgressBar'
 import { StyledText } from '../../components/elements/StyledText'
+import { ConfirmationModal } from '../../components/patterns/ConfirmationModal'
 import { SettingsLayout } from '../../components/templates/SettingsLayout'
 import { styled, theme } from '../../components/tokens/stitches.config'
+import { emptyTrashMutation } from '../../lib/networking/mutations/emptyTrashMutation'
 import { updateEmailMutation } from '../../lib/networking/mutations/updateEmailMutation'
 import { updateUserMutation } from '../../lib/networking/mutations/updateUserMutation'
 import { updateUserProfileMutation } from '../../lib/networking/mutations/updateUserProfileMutation'
@@ -17,9 +20,6 @@ import { useGetViewerQuery } from '../../lib/networking/queries/useGetViewerQuer
 import { useValidateUsernameQuery } from '../../lib/networking/queries/useValidateUsernameQuery'
 import { applyStoredTheme } from '../../lib/themeUpdater'
 import { showErrorToast, showSuccessToast } from '../../lib/toastHelpers'
-import { ConfirmationModal } from '../../components/patterns/ConfirmationModal'
-import { ProgressBar } from '../../components/elements/ProgressBar'
-import { emptyTrashMutation } from '../../lib/networking/mutations/emptyTrashMutation'
 
 const ACCOUNT_LIMIT = 50_000
 
@@ -441,19 +441,23 @@ export default function Account(): JSX.Element {
             <StyledLabel>Beta features</StyledLabel>
             {!isValidating && (
               <>
-                {viewerData?.me?.features.map((feature) => {
+                {viewerData?.me?.featureList.map((feature) => {
                   return (
                     <StyledText
-                      key={`feature-${feature}`}
+                      key={`feature-${feature.name}`}
                       style="footnote"
                       css={{ display: 'flex', gap: '5px' }}
                     >
                       <input
                         type="checkbox"
-                        checked={true}
+                        checked={userHasFeature(viewerData?.me, feature.name)}
                         disabled={true}
                       ></input>
-                      {feature}
+                      {`${feature.name}${
+                        userHasFeature(viewerData?.me, feature.name)
+                          ? ''
+                          : ' - Requested'
+                      }`}
                     </StyledText>
                   )
                 })}

From 6335fbb517d7cd58e2e88958071afc767de138ab Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 29 Mar 2024 11:37:33 +0800
Subject: [PATCH 2/2] fix dependecies

---
 packages/web/pages/settings/account.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/web/pages/settings/account.tsx b/packages/web/pages/settings/account.tsx
index 56a974aff..9ea8b774d 100644
--- a/packages/web/pages/settings/account.tsx
+++ b/packages/web/pages/settings/account.tsx
@@ -11,6 +11,7 @@ import { StyledText } from '../../components/elements/StyledText'
 import { ConfirmationModal } from '../../components/patterns/ConfirmationModal'
 import { SettingsLayout } from '../../components/templates/SettingsLayout'
 import { styled, theme } from '../../components/tokens/stitches.config'
+import { userHasFeature } from '../../lib/featureFlag'
 import { emptyTrashMutation } from '../../lib/networking/mutations/emptyTrashMutation'
 import { updateEmailMutation } from '../../lib/networking/mutations/updateEmailMutation'
 import { updateUserMutation } from '../../lib/networking/mutations/updateUserMutation'