From 71249b45148613d3d89d9b0cb6064fc242766b2a Mon Sep 17 00:00:00 2001
From: Michal <miso.szorad@gmail.com>
Date: Mon, 23 Sep 2024 19:50:00 +0100
Subject: [PATCH] WIP

---
 .../useCases/NotificationsDevScreen.tsx       | 218 +++++-----------
 .../Notifications/useCases/common/hooks.ts    | 242 ++++++++++++++++++
 .../SelectWalletFromListScreen.tsx            |   2 +
 .../yoroi-wallets/cardano/cardano-wallet.ts   |   6 +-
 .../src/yoroi-wallets/cardano/types.ts        |   3 +
 .../messages/src/AppNavigator.json            |  32 +--
 packages/types/src/index.ts                   |   5 +
 packages/types/src/notifications/manager.ts   |  13 +
 8 files changed, 352 insertions(+), 169 deletions(-)
 create mode 100644 apps/wallet-mobile/src/features/Notifications/useCases/common/hooks.ts

diff --git a/apps/wallet-mobile/src/features/Notifications/useCases/NotificationsDevScreen.tsx b/apps/wallet-mobile/src/features/Notifications/useCases/NotificationsDevScreen.tsx
index 92ea021218..a8346d5ed4 100644
--- a/apps/wallet-mobile/src/features/Notifications/useCases/NotificationsDevScreen.tsx
+++ b/apps/wallet-mobile/src/features/Notifications/useCases/NotificationsDevScreen.tsx
@@ -1,153 +1,25 @@
-import {Notification, Notifications} from '@jamsinclair/react-native-notifications'
-import {useAsyncStorage, useMutationWithInvalidations} from '@yoroi/common'
-import {notificationManagerMaker} from '@yoroi/notifications'
 import {useTheme} from '@yoroi/theme'
 import {Notifications as NotificationTypes} from '@yoroi/types'
 import * as React from 'react'
 import {StyleSheet, Switch as RNSwitch, Text, View} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
-import {UseMutationOptions, useQuery, UseQueryOptions} from 'react-query'
-import {Subject} from 'rxjs'
-import uuid from 'uuid'
 
 import {Button} from '../../../components/Button/Button'
-
-const useRequestPermissions = () => {
-  React.useEffect(() => {
-    Notifications.registerRemoteNotifications()
-  }, [])
-}
-
-const useHandleNotification = () => {
-  React.useEffect(() => {
-    const s = Notifications.events().registerNotificationReceivedForeground(
-      (notification: Notification, completion) => {
-        console.log(`Notification received in foreground: ${notification.title} : ${notification.body}`)
-        completion({alert: true, sound: true, badge: true})
-      },
-    )
-    return () => {
-      s.remove()
-    }
-  }, [])
-}
-
-const useNotificationsConfig = () => {
-  const manager = useNotificationsManager()
-  return useQuery(['notificationsConfig'], () => manager.config.read())
-}
-
-const useUpdateNotificationsConfig = () => {
-  const manager = useNotificationsManager()
-  const mutationFn = async (newConfig: NotificationTypes.Config) => {
-    await manager.config.save(newConfig)
-  }
-
-  return useMutationWithInvalidations({
-    mutationFn,
-    invalidateQueries: [['notificationsConfig']],
-  })
-}
-
-const useResetNotificationsConfig = (options: UseMutationOptions<NotificationTypes.Config, Error> = {}) => {
-  const manager = useNotificationsManager()
-  const mutationFn = async () => {
-    await manager.config.reset()
-    return manager.config.read()
-  }
-
-  return useMutationWithInvalidations({
-    mutationFn,
-    invalidateQueries: [['notificationsConfig']],
-    ...options,
-  })
-}
-
-const useReceivedNotificationEvents = (
-  options: UseQueryOptions<ReadonlyArray<NotificationTypes.Event>, Error> = {},
-) => {
-  const manager = useNotificationsManager()
-  const queryFn = () => manager.events.read()
-  return useQuery({
-    queryKey: ['receivedNotificationEvents'],
-    queryFn,
-    ...options,
-  })
-}
-
-const useSendNotification = () => {
-  const sendNotification = React.useCallback((title: string, body: string) => {
-    const notification = new Notification({
-      title,
-      body,
-      sound: 'default',
-    })
-    Notifications.postLocalNotification(notification.payload)
-  }, [])
-
-  return {send: sendNotification}
-}
-
-const useNotificationsManager = (options?: {subscriptions?: NotificationTypes.ManagerMakerProps['subscriptions']}) => {
-  const storage = useAsyncStorage()
-  const subscriptions = options?.subscriptions
-
-  const manager = React.useMemo(() => {
-    const eventsStorage = storage.join('events/')
-    const configStorage = storage.join('settings/')
-
-    return notificationManagerMaker({
-      eventsStorage,
-      configStorage,
-      subscriptions,
-    })
-  }, [storage, subscriptions])
-
-  React.useEffect(() => {
-    manager.hydrate()
-    return () => {
-      manager.destroy()
-    }
-  }, [manager])
-
-  return manager
-}
-
-const useNotifications = () => {
-  const {send} = useSendNotification()
-  const [transactionReceivedSubject] = React.useState(new Subject<NotificationTypes.TransactionReceivedEvent>())
-  const manager = useNotificationsManager({
-    subscriptions: {[NotificationTypes.Trigger.TransactionReceived]: transactionReceivedSubject},
-  })
-  React.useEffect(() => {
-    const subscription = manager.notification$.subscribe((notificationEvent) => {
-      if (notificationEvent.trigger === NotificationTypes.Trigger.TransactionReceived) {
-        send('Transaction received', 'You have received a new transaction')
-      }
-    })
-    return () => {
-      subscription.unsubscribe()
-    }
-  }, [manager, send])
-
-  const triggerTransactionReceived = (metadata: NotificationTypes.TransactionReceivedEvent['metadata']) => {
-    transactionReceivedSubject.next({
-      id: uuid.v4(),
-      date: new Date().toISOString(),
-      isRead: false,
-      trigger: NotificationTypes.Trigger.TransactionReceived,
-      metadata,
-    })
-  }
-
-  return {triggerTransactionReceived}
-}
+import {ScrollableView} from '../../../components/ScrollableView'
+import {
+  useHandleNotification,
+  useMockedNotifications,
+  useNotificationsConfig,
+  useReceivedNotificationEvents,
+  useRequestPermissions,
+  useResetNotificationsConfig,
+  useUpdateNotificationsConfig,
+} from './common/hooks'
 
 export const NotificationsDevScreen = () => {
   useRequestPermissions()
   useHandleNotification()
-  const {triggerTransactionReceived} = useNotifications()
-  const {data: receivedNotifications} = useReceivedNotificationEvents()
+  const {triggerTransactionReceived} = useMockedNotifications()
 
   const handleOnTriggerTransactionReceived = () => {
     triggerTransactionReceived({
@@ -160,26 +32,68 @@ export const NotificationsDevScreen = () => {
 
   return (
     <SafeAreaView edges={['bottom', 'top', 'left', 'right']}>
-      <View style={{padding: 16, gap: 8}}>
-        <Text style={{fontSize: 24}}>Notifications Playground</Text>
+      <ScrollableView>
+        <View style={{padding: 16, gap: 8}}>
+          <Text style={{fontSize: 24}}>Notifications Playground</Text>
 
-        <Button
-          title={`Trigger ${NotificationTypes.Trigger.TransactionReceived}`}
-          shelleyTheme
-          onPress={handleOnTriggerTransactionReceived}
-        />
+          <Button
+            title={`Trigger Transacrion Received Notification`}
+            shelleyTheme
+            onPress={handleOnTriggerTransactionReceived}
+          />
 
-        <View>
-          <Text>Received Notifications</Text>
+          <Text style={{fontSize: 24}}>Settings</Text>
 
-          <Text>{JSON.stringify(receivedNotifications)}</Text>
+          <NotificationSettings />
+
+          <ReceivedNotificationsList />
         </View>
+      </ScrollableView>
+    </SafeAreaView>
+  )
+}
 
-        <Text style={{fontSize: 24}}>Settings</Text>
+const ReceivedNotificationsList = () => {
+  const {data: receivedNotifications} = useReceivedNotificationEvents()
+  return (
+    <View>
+      <Text
+        style={{
+          fontSize: 24,
+          marginTop: 16,
+        }}
+      >
+        Received Notifications
+      </Text>
+
+      {receivedNotifications?.map((notification) => (
+        <ReceivedNotification key={notification.id} notification={notification} />
+      ))}
+    </View>
+  )
+}
+
+const ReceivedNotification = ({notification}: {notification: NotificationTypes.Event}) => {
+  const readStatus = notification.isRead ? 'Read' : 'Unread'
+
+  if (notification.trigger === NotificationTypes.Trigger.TransactionReceived) {
+    const title = `You received a transaction at ${new Date(notification.date).toLocaleString()}`
 
-        <NotificationSettings />
+    return (
+      <View>
+        <Text>{title}</Text>
+        <Text>{notification.metadata.txId}</Text>
+        <Text>{readStatus}</Text>
       </View>
-    </SafeAreaView>
+    )
+  }
+
+  return (
+    <View>
+      <Text>{notification.trigger}</Text>
+      <Text>{notification.date}</Text>
+      <Text>{readStatus}</Text>
+    </View>
   )
 }
 
diff --git a/apps/wallet-mobile/src/features/Notifications/useCases/common/hooks.ts b/apps/wallet-mobile/src/features/Notifications/useCases/common/hooks.ts
new file mode 100644
index 0000000000..59dc6a2b5a
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Notifications/useCases/common/hooks.ts
@@ -0,0 +1,242 @@
+import * as React from 'react'
+import {Notification, Notifications} from '@jamsinclair/react-native-notifications'
+import {UseMutationOptions, useQuery, UseQueryOptions} from 'react-query'
+import {Notifications as NotificationTypes} from '@yoroi/types'
+import {isNonNullable, useAsyncStorage, useMutationWithInvalidations} from '@yoroi/common'
+import {notificationManagerMaker} from '@yoroi/notifications'
+import {merge, Subject, switchMap} from 'rxjs'
+import uuid from 'uuid'
+import {useWalletManager} from '../../../WalletManager/context/WalletManagerProvider'
+import {useEffect} from 'react'
+
+export const useRequestPermissions = () => {
+  React.useEffect(() => {
+    Notifications.registerRemoteNotifications()
+  }, [])
+}
+
+export const useHandleNotification = () => {
+  React.useEffect(() => {
+    const s = Notifications.events().registerNotificationReceivedForeground(
+      (notification: Notification, completion) => {
+        console.log(`Notification received in foreground: ${notification.title} : ${notification.body}`)
+        completion({alert: true, sound: true, badge: true})
+      },
+    )
+    return () => {
+      s.remove()
+    }
+  }, [])
+}
+
+export const useNotificationsConfig = () => {
+  const manager = useNotificationsManager()
+  return useQuery(['notificationsConfig'], () => manager.config.read())
+}
+
+export const useUpdateNotificationsConfig = () => {
+  const manager = useNotificationsManager()
+  const mutationFn = async (newConfig: NotificationTypes.Config) => {
+    await manager.config.save(newConfig)
+  }
+
+  return useMutationWithInvalidations({
+    mutationFn,
+    invalidateQueries: [['notificationsConfig']],
+  })
+}
+
+export const useResetNotificationsConfig = (options: UseMutationOptions<NotificationTypes.Config, Error> = {}) => {
+  const manager = useNotificationsManager()
+  const mutationFn = async () => {
+    await manager.config.reset()
+    return manager.config.read()
+  }
+
+  return useMutationWithInvalidations({
+    mutationFn,
+    invalidateQueries: [['notificationsConfig']],
+    ...options,
+  })
+}
+
+export const useReceivedNotificationEvents = (
+  options: UseQueryOptions<ReadonlyArray<NotificationTypes.Event>, Error> = {},
+) => {
+  const manager = useNotificationsManager()
+  const queryFn = () => manager.events.read()
+  return useQuery({
+    queryKey: ['receivedNotificationEvents'],
+    queryFn,
+    ...options,
+  })
+}
+
+export const useSendNotification = () => {
+  const sendNotification = React.useCallback((title: string, body: string) => {
+    const notification = new Notification({
+      title,
+      body,
+      sound: 'default',
+    })
+    Notifications.postLocalNotification(notification.payload)
+  }, [])
+
+  return {send: sendNotification}
+}
+
+export const useNotificationsManager = (options?: {
+  subscriptions?: NotificationTypes.ManagerMakerProps['subscriptions']
+}) => {
+  const storage = useAsyncStorage()
+  const subscriptions = options?.subscriptions
+
+  const manager = React.useMemo(() => {
+    const eventsStorage = storage.join('events/')
+    const configStorage = storage.join('settings/')
+
+    return notificationManagerMaker({
+      eventsStorage,
+      configStorage,
+      subscriptions,
+    })
+  }, [storage, subscriptions])
+
+  React.useEffect(() => {
+    manager.hydrate()
+    return () => {
+      manager.destroy()
+    }
+  }, [manager])
+
+  return manager
+}
+
+export const useMockedNotifications = () => {
+  const {send} = useSendNotification()
+  const [transactionReceivedSubject] = React.useState(new Subject<NotificationTypes.TransactionReceivedEvent>())
+  const manager = useNotificationsManager({
+    subscriptions: {[NotificationTypes.Trigger.TransactionReceived]: transactionReceivedSubject},
+  })
+  React.useEffect(() => {
+    const subscription = manager.notification$.subscribe((notificationEvent) => {
+      if (notificationEvent.trigger === NotificationTypes.Trigger.TransactionReceived) {
+        send('Transaction received', 'You have received a new transaction')
+      }
+    })
+    return () => {
+      subscription.unsubscribe()
+    }
+  }, [manager, send])
+
+  const triggerTransactionReceived = (metadata: NotificationTypes.TransactionReceivedEvent['metadata']) => {
+    transactionReceivedSubject.next({
+      id: uuid.v4(),
+      date: new Date().toISOString(),
+      isRead: false,
+      trigger: NotificationTypes.Trigger.TransactionReceived,
+      metadata,
+    })
+  }
+
+  return {triggerTransactionReceived}
+}
+
+export const useNotifications = () => {
+  useRequestPermissions()
+  useHandleNotification()
+  const {send} = useSendNotification()
+  const transactionReceivedSubject = useTransactionReceivedNotificationSubject()
+  const rewardsUpdatedSubject = useRewardsUpdatedNotificationSubject()
+  const primaryTokenPriceChangedSubject = usePrimaryTokenPriceChangedNotificationSubject()
+  const manager = useNotificationsManager({
+    subscriptions: {
+      [NotificationTypes.Trigger.TransactionReceived]: transactionReceivedSubject,
+      [NotificationTypes.Trigger.RewardsUpdated]: rewardsUpdatedSubject,
+      [NotificationTypes.Trigger.PrimaryTokenPriceChanged]: primaryTokenPriceChangedSubject,
+    },
+  })
+  React.useEffect(() => {
+    const subscription = manager.notification$.subscribe((notificationEvent) => {
+      if (notificationEvent.trigger === NotificationTypes.Trigger.TransactionReceived) {
+        console.log('Transaction received', notificationEvent.metadata)
+        send('Transaction received', 'You have received a new transaction')
+      }
+    })
+    return () => {
+      subscription.unsubscribe()
+    }
+  }, [manager, send])
+}
+
+const useTransactionReceivedNotificationSubject = () => {
+  const {walletManager} = useWalletManager()
+  const asyncStorage = useAsyncStorage()
+  const notificationsAsyncStorage = asyncStorage.join('notifications-transacrion-received-subject/')
+  const [transactionReceivedSubject] = React.useState(new Subject<NotificationTypes.TransactionReceivedEvent>())
+
+  useEffect(() => {
+    const s1 = walletManager.syncWalletInfos$.subscribe(async (status) => {
+      const walletInfos = Array.from(status.values())
+      const walletsDoneSyncing = walletInfos.filter((info) => info.status === 'done')
+
+      console.log('walletsDoneSyncing', walletsDoneSyncing)
+      for (const info of walletsDoneSyncing) {
+        const walletId = info.id
+        const processed = (await notificationsAsyncStorage.getItem<string[]>(walletId)) || []
+        const wallet = walletManager.getWalletById(walletId)
+        if (!wallet) return
+        const utxos = wallet.allUtxos
+
+        console.log('processed', processed)
+        if (processed.length === 0) {
+          await notificationsAsyncStorage.setItem(
+            walletId,
+            utxos.map((utxo) => utxo.utxo_id),
+          )
+          return
+        }
+        const newUtxos = utxos.filter((utxo) => !processed.includes(utxo.utxo_id))
+        if (newUtxos.length === 0) return
+        console.log('newUtxos', newUtxos)
+        const newIds = newUtxos.map((utxo) => utxo.utxo_id)
+        await notificationsAsyncStorage.setItem(walletId, [...processed, ...newIds])
+        newUtxos.forEach((utxo) => {
+          const metadata: NotificationTypes.TransactionReceivedEvent['metadata'] = {
+            walletId,
+            txId: utxo.tx_hash,
+            amount: utxo.amount,
+            isSentByUser: false,
+            nextTxsCounter: 1,
+            previousTxsCounter: 0,
+          }
+          transactionReceivedSubject.next({
+            id: uuid.v4(),
+            date: new Date().toISOString(),
+            isRead: false,
+            trigger: NotificationTypes.Trigger.TransactionReceived,
+            metadata,
+          })
+        })
+      }
+      // console.log('syncWalletInfos', {status})
+    })
+
+    return () => {
+      s1.unsubscribe()
+    }
+  }, [])
+  return transactionReceivedSubject
+}
+
+const useRewardsUpdatedNotificationSubject = () => {
+  const [rewardsUpdatedSubject] = React.useState(new Subject<NotificationTypes.RewardsUpdatedEvent>())
+  return rewardsUpdatedSubject
+}
+
+const usePrimaryTokenPriceChangedNotificationSubject = () => {
+  const [primaryTokenPriceChangedSubject] = React.useState(
+    new Subject<NotificationTypes.PrimaryTokenPriceChangedEvent>(),
+  )
+  return primaryTokenPriceChangedSubject
+}
diff --git a/apps/wallet-mobile/src/features/WalletManager/useCases/SelectWalletFromListScreen/SelectWalletFromListScreen.tsx b/apps/wallet-mobile/src/features/WalletManager/useCases/SelectWalletFromListScreen/SelectWalletFromListScreen.tsx
index 2e2caa7748..1d7133155f 100644
--- a/apps/wallet-mobile/src/features/WalletManager/useCases/SelectWalletFromListScreen/SelectWalletFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/WalletManager/useCases/SelectWalletFromListScreen/SelectWalletFromListScreen.tsx
@@ -20,9 +20,11 @@ import {useWalletManager} from '../../context/WalletManagerProvider'
 import {SupportIllustration} from '../../illustrations/SupportIllustration'
 import {AggregatedBalance} from './AggregatedBalance'
 import {WalletListItem} from './WalletListItem'
+import {useNotifications} from '../../../Notifications/useCases/common/hooks'
 
 export const SelectWalletFromList = () => {
   useLinksRequestWallet()
+  useNotifications()
   const {styles, colors} = useStyles()
   const {walletManager} = useWalletManager()
   const {navigateToTxHistory} = useWalletNavigation()
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts
index 52df12db52..72abf34973 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts
@@ -12,7 +12,7 @@ import {Buffer} from 'buffer'
 import {freeze} from 'immer'
 import _ from 'lodash'
 import {defaultMemoize} from 'reselect'
-import {Observable} from 'rxjs'
+import {Observable, Subject} from 'rxjs'
 
 import {buildPortfolioBalanceManager} from '../../features/Portfolio/common/helpers/build-balance-manager'
 import {toBalanceManagerSyncArgs} from '../../features/Portfolio/common/transformers/toBalanceManagerSyncArgs'
@@ -87,6 +87,7 @@ export const makeCardanoWallet = (networkManager: Network.Manager, implementatio
     readonly accountVisual: number
     private readonly utxoManager: UtxoManager
     private _utxos: RawUtxo[]
+    readonly utxos$: Subject<{utxos: RawUtxo[]}>
     private _collateralId = ''
 
     private readonly transactionManager: TransactionManager
@@ -141,6 +142,7 @@ export const makeCardanoWallet = (networkManager: Network.Manager, implementatio
         storage: accountStorage.join('utxos/'),
         apiUrl: legacyApiBaseUrl,
       })
+
       const transactionManager = await TransactionManager.create(accountStorage.join('txs/'))
       // TODO: revisit memos should be per network and shouldn't be cleared on wallet clear (unless user selects it)
       const memosManager = await makeMemosManager(accountStorage.join('memos/'))
@@ -222,6 +224,7 @@ export const makeCardanoWallet = (networkManager: Network.Manager, implementatio
       this.memosManager = memosManager
       this.balanceManager = balanceManager
       this.balance$ = balanceManager.observable$
+      this.utxos$ = new Subject()
       this.accountManager = accountManager
       this.portfolioPrimaryTokenInfo = portfolioPrimaryTokenInfo
 
@@ -1002,6 +1005,7 @@ export const makeCardanoWallet = (networkManager: Network.Manager, implementatio
         this.balanceManager.syncBalances(balancesToSync)
 
         this._utxos = newUtxos
+        this.utxos$.next({utxos: newUtxos})
         this.notify({type: 'utxos', utxos: this.utxos})
         return true
       }
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
index d80576eb94..d325afcf86 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
@@ -31,6 +31,7 @@ import {
 } from '../types/staking'
 import {YoroiEntry, YoroiSignedTx, YoroiUnsignedTx} from '../types/yoroi'
 import type {Addresses} from './account-manager/account-manager'
+import {Subject} from 'rxjs'
 
 export type WalletEvent =
   | {type: 'initialize'}
@@ -75,6 +76,8 @@ export interface YoroiWallet {
   get isEmpty(): boolean
   get hasOnlyPrimary(): boolean
 
+  readonly utxos$: Subject<{utxos: RawUtxo[]}>
+
   // account
   readonly accountVisual: number
 
diff --git a/apps/wallet-mobile/translations/messages/src/AppNavigator.json b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
index 04368d7964..b5003a031d 100644
--- a/apps/wallet-mobile/translations/messages/src/AppNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Enter PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 233,
+      "line": 236,
       "column": 17,
-      "index": 8555
+      "index": 8739
     },
     "end": {
-      "line": 236,
+      "line": 239,
       "column": 3,
-      "index": 8645
+      "index": 8829
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Set PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 237,
+      "line": 240,
       "column": 18,
-      "index": 8665
+      "index": 8849
     },
     "end": {
-      "line": 240,
+      "line": 243,
       "column": 3,
-      "index": 8763
+      "index": 8947
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Auth with OS changes",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 241,
+      "line": 244,
       "column": 25,
-      "index": 8790
+      "index": 8974
     },
     "end": {
-      "line": 244,
+      "line": 247,
       "column": 3,
-      "index": 8904
+      "index": 9088
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Auth with OS changed detected",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 245,
+      "line": 248,
       "column": 27,
-      "index": 8933
+      "index": 9117
     },
     "end": {
-      "line": 248,
+      "line": 251,
       "column": 3,
-      "index": 9054
+      "index": 9238
     }
   }
 ]
\ No newline at end of file
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index f99e83a784..fd84b4f30a 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -264,6 +264,8 @@ import {
   NotificationGroup,
   NotificationManager,
   NotificationManagerMakerProps,
+  NotificationPrimaryTokenPriceChangedEvent,
+  NotificationRewardsUpdatedEvent,
   NotificationTransactionReceivedEvent,
   NotificationTrigger,
 } from './notifications/manager'
@@ -661,6 +663,9 @@ export namespace Notifications {
   export type Manager = NotificationManager
   export type ManagerMakerProps = NotificationManagerMakerProps
   export type TransactionReceivedEvent = NotificationTransactionReceivedEvent
+  export type RewardsUpdatedEvent = NotificationRewardsUpdatedEvent
+  export type PrimaryTokenPriceChangedEvent =
+    NotificationPrimaryTokenPriceChangedEvent
   export const Trigger = NotificationTrigger
   export type Trigger = NotificationTrigger
 }
diff --git a/packages/types/src/notifications/manager.ts b/packages/types/src/notifications/manager.ts
index b354855f16..de74784da8 100644
--- a/packages/types/src/notifications/manager.ts
+++ b/packages/types/src/notifications/manager.ts
@@ -26,6 +26,19 @@ export interface NotificationTransactionReceivedEvent
   }
 }
 
+export interface NotificationRewardsUpdatedEvent extends NotificationEventBase {
+  trigger: NotificationTrigger.RewardsUpdated
+}
+
+export interface NotificationPrimaryTokenPriceChangedEvent
+  extends NotificationEventBase {
+  trigger: NotificationTrigger.PrimaryTokenPriceChanged
+  metadata: {
+    previousPrice: number
+    nextPrice: number
+  }
+}
+
 export type NotificationGroup = 'transaction-history' | 'portfolio'
 
 export type NotificationEvent = NotificationTransactionReceivedEvent