Update release to use tags for hotfix

.github/workflows/update-release.yml

@@ -0,0 +1,40 @@
+name: Workflow for Release
+
+on:
+  push:
+    tags:
+      - 'release/v*'
+      - 'hotfix/v*'
+
+jobs:
+  sync-release-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Setup Git
+        run: |
+          git config user.name "github-actions"
+          git config user.email "actions@github.com"
+
+      - name: Fetch all history
+        run: git fetch --unshallow || git fetch --all
+
+       - name: Determine Tag Type
+        id: tagtype
+        run: |
+          if [[ ${{ github.ref }} == refs/tags/release/v* ]]; then
+            echo "::set-output name=type::release"
+          elif [[ ${{ github.ref }} == refs/tags/hotfix/v* ]]; then
+            echo "::set-output name=type::hotfix"
+          fi
+
+      - name: Check out the release branch
+        run: |
+          git checkout release || git checkout -b release
+
+      - name: Sync release branch to tag
+        run: |
+          git reset --hard ${{ github.ref }}
+          git push -f origin release

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.35",
+    "@dydxprotocol/v4-localization": "^1.1.34",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@radix-ui/react-accordion": "^1.1.2",

pnpm-lock.yaml

@@ -36,8 +36,8 @@ dependencies:
     specifier: ^1.0.20
     version: 1.0.20
   '@dydxprotocol/v4-localization':
-    specifier: ^1.1.35
-    version: 1.1.35
+    specifier: ^1.1.34
+    version: 1.1.34
   '@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.35:
-    resolution: {integrity: sha512-q5JFYoL/QanHXOtFqRa2owBZJibi1sMpSm3dAcxs9x0/xe8mo6fWcnbQfhl8k7g0/tv7PsBc+e3rbWD0EfvGiA==}
+  /@dydxprotocol/v4-localization@1.1.34:
+    resolution: {integrity: sha512-I7zivjv8gS+6b9n7/wh7PY9QEUDIIyLx9ugZ5K6ybar0xT/06yupOVdVE6iLivQ/IAsVi/RFHkD8bQd0DWCetg==}
     dev: false
 
   /@dydxprotocol/v4-proto@4.0.0-dev.0:

src/constants/analytics.ts

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

@@ -143,11 +143,6 @@ 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, TokenRoute } from '@/constants/routes';
+import { AppRoute } from '@/constants/routes';
 import { DydxChainAsset } from '@/constants/wallets';
 
 import {
@@ -20,10 +20,9 @@ import {
   NotificationType,
   DEFAULT_TOAST_AUTO_CLOSE_MS,
   TransferNotificationTypes,
-  ReleaseUpdateNotificationIds,
 } from '@/constants/notifications';
 
-import { useStringGetter, useTokenConfigs } from '@/hooks';
+import { useStringGetter } from '@/hooks';
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';
 
 import { AssetIcon } from '@/components/AssetIcon';
@@ -239,16 +238,13 @@ 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(
-          ReleaseUpdateNotificationIds.RewardsAndFullTradingLive,
+          'rewards-and-full-trading-live',
           {
-            icon: <AssetIcon symbol={chainTokenLabel} />,
+            icon: <AssetIcon symbol="DYDX" />,
             title: stringGetter({ key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.TITLE' }),
             body: stringGetter({
               key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.BODY',
@@ -274,41 +270,14 @@ export const notificationTypes: NotificationTypeConfig[] = [
               },
             }),
             toastSensitivity: 'foreground',
-            groupKey: ReleaseUpdateNotificationIds.RewardsAndFullTradingLive,
+            groupKey: NotificationType.ReleaseUpdates,
           },
           []
         );
-        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: () => {
-      const { chainTokenLabel } = useTokenConfigs();
-      const navigate = useNavigate();
-      return (notificationId: string) => {
-        if (notificationId === ReleaseUpdateNotificationIds.IncentivesS3) {
-          navigate(`${chainTokenLabel}/${TokenRoute.TradingRewards}`);
-        }
-      };
+      return () => {};
     },
   },
 ];

src/hooks/useNotifications.tsx

@@ -1,6 +1,5 @@
 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,
@@ -14,8 +13,7 @@ import {
 import { useLocalStorage } from './useLocalStorage';
 import { notificationTypes } from './useNotificationTypes';
 
-import { track } from '@/lib/analytics';
-import { renderSvgToDataUrl } from '@/lib/renderSvgToDataUrl';
+import { renderSvgToDataUrl } from '../lib/renderSvgToDataUrl';
 
 type NotificationsContextType = ReturnType<typeof useNotificationsContext>;
 
@@ -50,7 +48,6 @@ const useNotificationsContext = () => {
       defaultValue: {
         [NotificationType.AbacusGenerated]: true,
         [NotificationType.SquidTransfer]: true,
-        [NotificationType.ReleaseUpdates]: true,
         version: LOCAL_STORAGE_VERSIONS[LocalStorageKey.NotificationPreferences],
       },
     });
@@ -179,10 +176,8 @@ const useNotificationsContext = () => {
     )
   );
 
-  const onNotificationAction = async (notification: Notification) => {
-    track(AnalyticsEvent.NotificationAction, { type: notification.type, id: notification.id });
-    return await actions[notification.type]?.(notification.id);
-  };
+  const onNotificationAction = async (notification: Notification) =>
+    await actions[notification.type]?.(notification.id);
 
   // Push notifications
   const [hasEnabledPush, setHasEnabledPush] = useLocalStorage({