Merge branch 'inbox-watchlist' into kyberai-filter-sort

KyberNetwork · Sep 28, 2023 · 8fd4ff7 · 8fd4ff7
2 parents 643c92f + 0f75f8c
commit 8fd4ff7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/src/components/Announcement/PrivateAnnoucement/NotificationCenter/KyberAIWatchlist.tsx b/src/components/Announcement/PrivateAnnoucement/NotificationCenter/KyberAIWatchlist.tsx
@@ -31,6 +31,8 @@ export default function AnnouncementItem({
   const theme = useTheme()
   const navigate = useNavigate()
   const [expand, setExpand] = useState(false)
+  const slice = 3
+  const minimalAssets = assets.slice(0, slice)
 
   return (
     <Wrapper onClick={() => setExpand(!expand)}>
@@ -49,10 +51,10 @@ export default function AnnouncementItem({
       <Desc style={{ gap: 6, flexWrap: 'wrap', color: theme.subText }}>
         <Trans>Here is an update on the tokens in your watchlist:</Trans>
         {!expand &&
-          assets.slice(0, 3).map((token, i) => (
+          minimalAssets.map((token, i) => (
             <Fragment key={i}>
               <TokenInfo token={token} showPrice={false} key={i} logoSize={'14px'} />
-              {i === 2 ? ', ...' : ', '}
+              {i === minimalAssets.length - 1 ? (minimalAssets.length < slice ? '' : ', ...') : ', '}
             </Fragment>
           ))}
       </Desc>

diff --git a/src/constants/env.ts b/src/constants/env.ts
@@ -63,7 +63,7 @@ type FirebaseConfig = {
   measurementId?: string
 }
 
-export const FIREBASE: { [key: string]: { DEFAULT: FirebaseConfig; LIMIT_ORDER?: FirebaseConfig } } = {
+export const FIREBASE: { [key in EnvKeys]: { DEFAULT: FirebaseConfig; LIMIT_ORDER?: FirebaseConfig } } = {
   development: {
     LIMIT_ORDER: {
       apiKey: 'AIzaSyBHRrinrQ3CXVrevZN442fjG0EZ-nYNNaU',
@@ -113,14 +113,17 @@ export const FIREBASE: { [key: string]: { DEFAULT: FirebaseConfig; LIMIT_ORDER?:
   },
 }
 
-const ANNOUNCEMENT_TEMPLATE_IDS: { [key: string]: { [type: string]: string } } = {
+type Config = { [type in PrivateAnnouncementType]: string } & { EXCLUDE: string }
+const ANNOUNCEMENT_TEMPLATE_IDS: { [key in EnvKeys]: Config } = {
   development: {
     [PrivateAnnouncementType.PRICE_ALERT]: '53',
     [PrivateAnnouncementType.LIMIT_ORDER]: '8,9,10,11,33,34,35,36',
     [PrivateAnnouncementType.BRIDGE_ASSET]: '37,38',
     [PrivateAnnouncementType.CROSS_CHAIN]: '48,49',
     [PrivateAnnouncementType.KYBER_AI]: '46',
+    [PrivateAnnouncementType.KYBER_AI_WATCHLIST]: '54',
     [PrivateAnnouncementType.ELASTIC_POOLS]: '39,40',
+    [PrivateAnnouncementType.DIRECT_MESSAGE]: '',
     EXCLUDE: '2,29,1,47,50,44,45',
   },
   staging: {
@@ -129,7 +132,9 @@ const ANNOUNCEMENT_TEMPLATE_IDS: { [key: string]: { [type: string]: string } } =
     [PrivateAnnouncementType.BRIDGE_ASSET]: '12,13',
     [PrivateAnnouncementType.CROSS_CHAIN]: '25,26',
     [PrivateAnnouncementType.KYBER_AI]: '27',
+    [PrivateAnnouncementType.KYBER_AI_WATCHLIST]: '54', // todo
     [PrivateAnnouncementType.ELASTIC_POOLS]: '20,21',
+    [PrivateAnnouncementType.DIRECT_MESSAGE]: '',
     EXCLUDE: '2,11,1,28,29,22,23',
   },
   production: {
@@ -138,7 +143,9 @@ const ANNOUNCEMENT_TEMPLATE_IDS: { [key: string]: { [type: string]: string } } =
     [PrivateAnnouncementType.BRIDGE_ASSET]: '10,11',
     [PrivateAnnouncementType.CROSS_CHAIN]: '27,28',
     [PrivateAnnouncementType.KYBER_AI]: '26',
+    [PrivateAnnouncementType.KYBER_AI_WATCHLIST]: '54', // todo
     [PrivateAnnouncementType.ELASTIC_POOLS]: '17,18',
+    [PrivateAnnouncementType.DIRECT_MESSAGE]: '',
     EXCLUDE: '2,16,19,9,25,24,21,22',
   },
 }

diff --git a/src/hooks/useNotification/index.ts b/src/hooks/useNotification/index.ts
@@ -29,6 +29,7 @@ export type Topic = {
   type: TopicType
   isKyberAI: boolean
   isPriceAlert: boolean
+  isPriceElasticPool: boolean
 }
 
 type SaveNotificationParam = {
@@ -58,8 +59,10 @@ const useNotification = () => {
       ...e,
       id: Date.now() + i,
       isSubscribed: e?.topics?.every(e => e.isSubscribed),
+      // special topic ids
       isKyberAI: e?.topics?.some(e => e.id + '' === KYBER_AI_TOPIC_ID),
       isPriceAlert: e?.topics?.some(e => e.id + '' === PRICE_ALERT_TOPIC_ID),
+      isPriceElasticPool: e?.topics?.some(e => e.id + '' === ELASTIC_POOL_TOPIC_ID),
     }))
     dispatch(setSubscribedNotificationTopic({ topicGroups }))
   }, [resp, dispatch])

diff --git a/src/pages/NotificationCenter/NotificationPreference/index.tsx b/src/pages/NotificationCenter/NotificationPreference/index.tsx
@@ -11,6 +11,7 @@ import Loader from 'components/Loader'
 import Row from 'components/Row'
 import { MouseoverTooltip } from 'components/Tooltip'
 import { PRICE_ALERT_TOPIC_ID } from 'constants/env'
+import { useActiveWeb3React } from 'hooks'
 import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel'
 import useNotification, { Topic, TopicType } from 'hooks/useNotification'
 import useTheme from 'hooks/useTheme'
@@ -141,6 +142,7 @@ function NotificationPreference({ toggleModal = noop }: { toggleModal?: () => vo
   const theme = useTheme()
   const { isLoading, saveNotification, topicGroups: topicGroupsGlobal, unsubscribeAll } = useNotification()
 
+  const { account } = useActiveWeb3React()
   const { userInfo, isLogin } = useSessionInfo()
   const { isSignInEmail } = useSignedAccountInfo()
   const { isWhiteList } = useIsWhiteListKyberAI()
@@ -386,7 +388,7 @@ function NotificationPreference({ toggleModal = noop }: { toggleModal?: () => vo
         <ListGroupWrapper>
           <GroupColum>
             {commons.map(topic => {
-              const isDisabled = topic.isPriceAlert ? false : disableCheckbox
+              const isDisabled = topic.isPriceElasticPool ? !account : topic.isPriceAlert ? false : disableCheckbox
               return renderTopic(
                 topic,
                 isDisabled,