Merge branch 'decentraland:master' into master

decentraland · Sep 7, 2024 · 45b3723 · 45b3723
2 parents 2e40b6f + 9324501
commit 45b3723
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
     "webpack-cli": "^3.3.2"
   },
   "dependencies": {
-    "@dcl/schemas": "^13.6.2",
+    "@dcl/schemas": "^13.9.0",
     "@dcl/ui-env": "^1.5.1",
     "balloon-css": "^0.5.0",
     "classnames": "^2.3.2",

diff --git a/src/components/Notifications/NotificationsFeed.tsx b/src/components/Notifications/NotificationsFeed.tsx
@@ -121,6 +121,11 @@ const NotificationHandler = ({
   renderProfile?: (address: string) => JSX.Element | string | null
 }) => {
   const NotificationComponent = NotificationComponentByType[notification.type]
+
+  if (!NotificationComponent) {
+    return null
+  }
+
   return (
     <NotificationComponent
       notification={notification}

diff --git a/src/components/Notifications/utils.tsx b/src/components/Notifications/utils.tsx
@@ -50,12 +50,14 @@ export function getBGColorByRarity(rarity: Rarity) {
   return Rarity.getGradient(rarity).join()
 }
 
-export type DecentralandNotificationComponentByType<T> = {
-  [k in NotificationType]: T extends DCLNotification
-    ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      FunctionComponent<CommonNotificationProps<any>>
-    : never
-}
+export type DecentralandNotificationComponentByType<T> = Partial<
+  {
+    [k in NotificationType]: T extends DCLNotification
+      ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        FunctionComponent<CommonNotificationProps<any>>
+      : never
+  }
+>
 
 export const NotificationComponentByType: DecentralandNotificationComponentByType<DCLNotification> =
   {
@@ -101,7 +103,6 @@ export const NotificationComponentByType: DecentralandNotificationComponentByTyp
       CampaignOutOfStockNotification,
     [NotificationType.REWARD_CAMPAIGN_GAS_PRICE_HIGHER_THAN_EXPECTED]:
       CampaignGasPriceHigherThanExpectedNotification,
-    [NotificationType.BADGE_GRANTED]: null,
     [NotificationType.EVENTS_STARTS_SOON]: EventsStartsSoonNotification,
     [NotificationType.EVENTS_STARTED]: EventsStartedNotification,
     [NotificationType.WORLDS_PERMISSION_GRANTED]:
@@ -110,7 +111,9 @@ export const NotificationComponentByType: DecentralandNotificationComponentByTyp
       WorldsPermissionRevokedNotification
   }
 
-export const CURRENT_AVAILABLE_NOTIFICATIONS = Object.values(NotificationType)
+export const CURRENT_AVAILABLE_NOTIFICATIONS = Object.keys(
+  NotificationComponentByType
+)
 
 export const replaceWithValues = (
   str: string,