diff --git a/package.json b/package.json index 6fb1ad3..630b0cf 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@cosmjs/tendermint-rpc": "^0.32.1", "@dydxprotocol/v4-abacus": "^1.4.9", "@dydxprotocol/v4-client-js": "^1.0.20", - "@dydxprotocol/v4-localization": "^1.1.34", + "@dydxprotocol/v4-localization": "^1.1.35", "@ethersproject/providers": "^5.7.2", "@js-joda/core": "^5.5.3", "@radix-ui/react-accordion": "^1.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 53d658a..d34951e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,8 +36,8 @@ dependencies: specifier: ^1.0.20 version: 1.0.20 '@dydxprotocol/v4-localization': - specifier: ^1.1.34 - version: 1.1.34 + specifier: ^1.1.35 + version: 1.1.35 '@ethersproject/providers': specifier: ^5.7.2 version: 5.7.2 @@ -1323,8 +1323,8 @@ packages: - utf-8-validate dev: false - /@dydxprotocol/v4-localization@1.1.34: - resolution: {integrity: sha512-I7zivjv8gS+6b9n7/wh7PY9QEUDIIyLx9ugZ5K6ybar0xT/06yupOVdVE6iLivQ/IAsVi/RFHkD8bQd0DWCetg==} + /@dydxprotocol/v4-localization@1.1.35: + resolution: {integrity: sha512-q5JFYoL/QanHXOtFqRa2owBZJibi1sMpSm3dAcxs9x0/xe8mo6fWcnbQfhl8k7g0/tv7PsBc+e3rbWD0EfvGiA==} dev: false /@dydxprotocol/v4-proto@4.0.0-dev.0: diff --git a/src/constants/analytics.ts b/src/constants/analytics.ts index 4bb9f50..1392cfd 100644 --- a/src/constants/analytics.ts +++ b/src/constants/analytics.ts @@ -81,6 +81,9 @@ export enum AnalyticsEvent { TradePlaceOrderConfirmed = 'TradePlaceOrderConfirmed', TradeCancelOrder = 'TradeCancelOrder', TradeCancelOrderConfirmed = 'TradeCancelOrderConfirmed', + + // Notification + NotificationAction = 'NotificationAction', } export type AnalyticsEventData = @@ -180,6 +183,12 @@ export type AnalyticsEventData = /** URL/IP of node the order was sent to */ validatorUrl: string; } + : // Notifcation + T extends AnalyticsEvent.NotificationAction + ? { + type: string; + id: string; + } : never; export const DEFAULT_TRANSACTION_MEMO = 'dYdX Frontend (web)'; diff --git a/src/constants/notifications.ts b/src/constants/notifications.ts index b876815..6736199 100644 --- a/src/constants/notifications.ts +++ b/src/constants/notifications.ts @@ -143,6 +143,11 @@ export type TransferNotifcation = { isExchange?: boolean; }; +export enum ReleaseUpdateNotificationIds { + RewardsAndFullTradingLive = 'rewards-and-full-trading-live', + IncentivesS3 = 'incentives-s3', +} + /** * @description Struct to store whether a NotificationType should be triggered */ diff --git a/src/hooks/useNotificationTypes.tsx b/src/hooks/useNotificationTypes.tsx index 3063a84..a6c0bb4 100644 --- a/src/hooks/useNotificationTypes.tsx +++ b/src/hooks/useNotificationTypes.tsx @@ -5,7 +5,7 @@ import { isEqual, groupBy } from 'lodash'; import { useNavigate } from 'react-router-dom'; import { DialogTypes } from '@/constants/dialogs'; -import { AppRoute } from '@/constants/routes'; +import { AppRoute, TokenRoute } from '@/constants/routes'; import { DydxChainAsset } from '@/constants/wallets'; import { @@ -20,9 +20,10 @@ import { NotificationType, DEFAULT_TOAST_AUTO_CLOSE_MS, TransferNotificationTypes, + ReleaseUpdateNotificationIds, } from '@/constants/notifications'; -import { useStringGetter } from '@/hooks'; +import { useStringGetter, useTokenConfigs } from '@/hooks'; import { useLocalNotifications } from '@/hooks/useLocalNotifications'; import { AssetIcon } from '@/components/AssetIcon'; @@ -238,13 +239,16 @@ export const notificationTypes: NotificationTypeConfig[] = [ { type: NotificationType.ReleaseUpdates, useTrigger: ({ trigger }) => { + const { chainTokenLabel } = useTokenConfigs(); const stringGetter = useStringGetter(); + const expirationDate = new Date('2024-03-08T23:59:59'); + const currentDate = new Date(); useEffect(() => { trigger( - 'rewards-and-full-trading-live', + ReleaseUpdateNotificationIds.RewardsAndFullTradingLive, { - icon: , + icon: , title: stringGetter({ key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.TITLE' }), body: stringGetter({ key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.BODY', @@ -270,14 +274,41 @@ export const notificationTypes: NotificationTypeConfig[] = [ }, }), toastSensitivity: 'foreground', - groupKey: NotificationType.ReleaseUpdates, + groupKey: ReleaseUpdateNotificationIds.RewardsAndFullTradingLive, }, [] ); + if (currentDate <= expirationDate) { + trigger( + ReleaseUpdateNotificationIds.IncentivesS3, + { + icon: , + title: stringGetter({ key: 'NOTIFICATIONS.INCENTIVES_SEASON_BEGUN.TITLE' }), + body: stringGetter({ + key: 'NOTIFICATIONS.INCENTIVES_SEASON_BEGUN.BODY', + params: { + SEASON_NUMBER: '3', + PREV_SEASON_NUMBER: '1', + DYDX_AMOUNT: '34', + USDC_AMOUNT: '100', + }, + }), + toastSensitivity: 'foreground', + groupKey: ReleaseUpdateNotificationIds.IncentivesS3, + }, + [] + ); + } }, [stringGetter]); }, useNotificationAction: () => { - return () => {}; + const { chainTokenLabel } = useTokenConfigs(); + const navigate = useNavigate(); + return (notificationId: string) => { + if (notificationId === ReleaseUpdateNotificationIds.IncentivesS3) { + navigate(`${chainTokenLabel}/${TokenRoute.TradingRewards}`); + } + }; }, }, ]; diff --git a/src/hooks/useNotifications.tsx b/src/hooks/useNotifications.tsx index 863d0df..ba44b52 100644 --- a/src/hooks/useNotifications.tsx +++ b/src/hooks/useNotifications.tsx @@ -1,5 +1,6 @@ import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react'; +import { AnalyticsEvent } from '@/constants/analytics'; import { LOCAL_STORAGE_VERSIONS, LocalStorageKey } from '@/constants/localStorage'; import { type Notification, @@ -13,7 +14,8 @@ import { import { useLocalStorage } from './useLocalStorage'; import { notificationTypes } from './useNotificationTypes'; -import { renderSvgToDataUrl } from '../lib/renderSvgToDataUrl'; +import { track } from '@/lib/analytics'; +import { renderSvgToDataUrl } from '@/lib/renderSvgToDataUrl'; type NotificationsContextType = ReturnType; @@ -48,6 +50,7 @@ const useNotificationsContext = () => { defaultValue: { [NotificationType.AbacusGenerated]: true, [NotificationType.SquidTransfer]: true, + [NotificationType.ReleaseUpdates]: true, version: LOCAL_STORAGE_VERSIONS[LocalStorageKey.NotificationPreferences], }, }); @@ -176,8 +179,10 @@ const useNotificationsContext = () => { ) ); - const onNotificationAction = async (notification: Notification) => - await actions[notification.type]?.(notification.id); + const onNotificationAction = async (notification: Notification) => { + track(AnalyticsEvent.NotificationAction, { type: notification.type, id: notification.id }); + return await actions[notification.type]?.(notification.id); + }; // Push notifications const [hasEnabledPush, setHasEnabledPush] = useLocalStorage({