address comments

* bump abacus for new env config path usage

* bump abacus + localization for good til date

package.json

@@ -40,9 +40,9 @@
     "@cosmjs/proto-signing": "^0.32.1",
     "@cosmjs/stargate": "^0.32.1",
     "@cosmjs/tendermint-rpc": "^0.32.1",
-    "@dydxprotocol/v4-abacus": "^1.4.6",
+    "@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",

pnpm-lock.yaml

@@ -30,14 +30,14 @@ dependencies:
     specifier: ^0.32.1
     version: 0.32.2
   '@dydxprotocol/v4-abacus':
-    specifier: ^1.4.6
-    version: 1.4.6
+    specifier: ^1.4.9
+    version: 1.4.9
   '@dydxprotocol/v4-client-js':
     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
@@ -1290,8 +1290,8 @@ packages:
     resolution: {integrity: sha512-Gg5t+eR7vPJMAmhkFt6CZrzPd0EKpAslWwk5rFVYZpJsM8JG5KT9XQ99hgNM3Ov6ScNoIWbXkpX27F6A9cXR4Q==}
     dev: false
 
-  /@dydxprotocol/v4-abacus@1.4.6:
-    resolution: {integrity: sha512-qYq+4TizcMMxYVXckn0LCucWBe5N9ZNtD1XnowCAuBUUifHSgMGvao5OeZIKMgNM/udSKOXLss4zLy6dH/G2SA==}
+  /@dydxprotocol/v4-abacus@1.4.9:
+    resolution: {integrity: sha512-OnrD5Db7AGSxyQE+gWRmkBuXbkZMfSEDB+v2s+ft0zgd4D5j/WTZkk1RG0fn8ISV4AffoN5T24jBWxLfqVlmZw==}
     dev: false
 
   /@dydxprotocol/v4-client-js@1.0.20:
@@ -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:

src/constants/analytics.ts

@@ -81,6 +81,9 @@ export enum AnalyticsEvent {
   TradePlaceOrderConfirmed = 'TradePlaceOrderConfirmed',
   TradeCancelOrder = 'TradeCancelOrder',
   TradeCancelOrderConfirmed = 'TradeCancelOrderConfirmed',
+
+  // Notification
+  NotificationAction = 'NotificationAction',
 }
 
 export type AnalyticsEventData<T extends AnalyticsEvent> =
@@ -180,6 +183,12 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
         /** 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)';

src/constants/dialogs.ts

@@ -11,7 +11,6 @@ export enum DialogTypes {
   ExternalNavKeplr = 'ExternalNavKeplr',
   MnemonicExport = 'MnemonicExport',
   MobileSignIn = 'MobileSignIn',
-  MobileDownload = 'MobileDownload',
   Onboarding = 'Onboarding',
   OrderDetails = 'OrderDetails',
   Preferences = 'Preferences',

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
  */

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: <AssetIcon symbol="DYDX" />,
+            icon: <AssetIcon symbol={chainTokenLabel} />,
             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: <AssetIcon symbol={chainTokenLabel} />,
+              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}`);
+        }
+      };
     },
   },
 ];

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<typeof useNotificationsContext>;
 
@@ -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({

src/layout/DialogManager.tsx

@@ -31,7 +31,6 @@ import { FillDetailsDialog } from '@/views/dialogs/DetailsDialog/FillDetailsDial
 import { NewMarketMessageDetailsDialog } from '@/views/dialogs/NewMarketMessageDetailsDialog';
 import { NewMarketAgreementDialog } from '@/views/dialogs/NewMarketAgreementDialog';
 import { ExternalNavStrideDialog } from '@/views/dialogs/ExternalNavStrideDialog';
-import { MobileDownloadDialog } from '@/views/dialogs/MobileDownloadDialog';
 
 export const DialogManager = () => {
   const dispatch = useDispatch();
@@ -64,7 +63,6 @@ export const DialogManager = () => {
     [DialogTypes.ExternalNavStride]: <ExternalNavStrideDialog {...modalProps} />,
     [DialogTypes.MnemonicExport]: <MnemonicExportDialog {...modalProps} />,
     [DialogTypes.MobileSignIn]: <MobileSignInDialog {...modalProps} />,
-    [DialogTypes.MobileDownload]: <MobileDownloadDialog {...modalProps} />,
     [DialogTypes.Onboarding]: <OnboardingDialog {...modalProps} />,
     [DialogTypes.OrderDetails]: <OrderDetailsDialog {...modalProps} />,
     [DialogTypes.Preferences]: <PreferencesDialog {...modalProps} />,

src/views/dialogs/MobileDownloadDialog.tsx

@@ -1,140 +0,0 @@
-import styled, { AnyStyledComponent, css } from 'styled-components';
-
-import { layoutMixins } from '@/styles/layoutMixins';
-
-import { Dialog } from '@/components/Dialog';
-import { QrCode } from '@/components/QrCode';
-import { useStringGetter } from '@/hooks';
-import { STRING_KEYS } from '@/constants/localization';
-
-type ElementProps = {
-  setIsOpen: (open: boolean) => void;
-};
-
-/*
-  When/if deployer deploys the web app with smartbanner, "smartbanner:button-url-apple" and/or 
-  "smartbanner:button-url-google" <meta> are set.
-  This implementation assumes "smartbanner:button-url-apple" and "smartbanner:button-url-google" 
-  are set to the same value with onelink or other redirect URL.
-  Since there is no way for the desktop web app to know what mobile device the user is using, 
-  we should give a onelink URL which redirects to either iOS or Android app store depending on 
-  the mobile device used to scan the link.
-*/
-
-// for testing only
-// export const mobileAppUrl = "http://example.com";
-
-let mobileAppUrl: string | undefined | null = undefined;
-
-export const getMobileAppUrl = () => {
-  if (!mobileAppUrl) {
-    mobileAppUrl =
-    // for testing to verify <meta> is retrieved by name, QR code should show "@dYdX" as value
-    // document.querySelector('meta[name="twitter:creator"]')?.getAttribute('content') ??
-    document.querySelector('meta[name="smartbanner:button-url-apple"]')?.getAttribute('content') ?? 
-    document.querySelector('meta[name="smartbanner:button-url-google"]')?.getAttribute('content');
-  }
-  return mobileAppUrl;
-}
-  
-const MobileQrCode = ({
-  url,
-}: {
-  url: string;
-}) => {
-  return (
-    <Styled.QrCodeContainer isShowing={true}>
-      <QrCode hasLogo size={432} value={url} />
-    </Styled.QrCodeContainer>
-  );
-};
-
-/*
-MobileDownloadDialog should only been shown on desktop when mobileAppUrl has value. That's controlled by AccountMenu.tsx.
-*/
-
-export const MobileDownloadDialog = ({ setIsOpen }: ElementProps) => {
-  const stringGetter = useStringGetter();
-  const content = (
-    <MobileQrCode url={mobileAppUrl!} />
-  );
-
-  return (
-    <Dialog isOpen setIsOpen={setIsOpen} title={
-        stringGetter({ key: STRING_KEYS.DOWNLOAD_MOBILE_APP })
-      }>
-      <Styled.Content>{content}</Styled.Content>
-    </Dialog>
-  );
-};
-
-const Styled: Record<string, AnyStyledComponent> = {};
-
-Styled.Content = styled.div`
-  ${layoutMixins.column}
-  gap: 1rem;
-
-  strong {
-    font-weight: 900;
-    color: var(--color-text-2);
-  }
-
-  footer {
-    ${layoutMixins.row}
-    justify-content: space-between;
-
-    svg {
-      width: auto;
-    }
-  }
-`;
-
-Styled.WaitingSpan = styled.span`
-  strong {
-    color: var(--color-warning);
-  }
-`;
-
-Styled.QrCodeContainer = styled.figure<{ isShowing: boolean }>`
-  ${layoutMixins.stack}
-
-  overflow: hidden;
-  border-radius: 0.75em;
-
-  cursor: pointer;
-
-  transition: 0.2s;
-
-  &:hover {
-    filter: brightness(var(--hover-filter-base));
-  }
-
-  > * {
-    position: relative;
-    transition: 0.16s;
-  }
-
-  > :first-child {
-    pointer-events: none;
-
-    ${({ isShowing }) =>
-      !isShowing &&
-      css`
-        filter: blur(1rem) brightness(1.4);
-        will-change: filter;
-      `}
-  }
-
-  > span {
-    place-self: center;
-
-    font-size: 1.4em;
-    color: var(--color-text-2);
-
-    ${({ isShowing }) =>
-      isShowing &&
-      css`
-        opacity: 0;
-      `}
-  }
-`;

src/views/menus/AccountMenu.tsx

@@ -40,7 +40,6 @@ import { getAppTheme } from '@/state/configsSelectors';
 import { isTruthy } from '@/lib/isTruthy';
 import { truncateAddress } from '@/lib/wallet';
 import { MustBigNumber } from '@/lib/numbers';
-import { getMobileAppUrl } from '../dialogs/MobileDownloadDialog';
 
 export const AccountMenu = () => {
   const stringGetter = useStringGetter();
@@ -190,18 +189,6 @@ export const AccountMenu = () => {
           label: stringGetter({ key: STRING_KEYS.DISPLAY_SETTINGS }),
           onSelect: () => dispatch(openDialog({ type: DialogTypes.DisplaySettings })),
         },
-        ...(getMobileAppUrl()
-          ? [
-              {
-                value: 'MobileDownload',
-                icon: <Icon iconName={IconName.Qr} />,
-                label: stringGetter({ key: STRING_KEYS.DOWNLOAD_MOBILE_APP }),
-                onSelect: () => {
-                  dispatch(openDialog({ type: DialogTypes.MobileDownload }));
-                },
-              },
-            ]
-          : []),
         ...(onboardingState === OnboardingState.AccountConnected && hdKey
           ? [
               {