Merge pull request #10833 from DestinyItemManager/no-tag-catalysts

Don't allow catalysts to be tagged
DestinyItemManager · Dec 8, 2024 · b33b39a · b33b39a
2 parents a98fb94 + f911b84
commit b33b39a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/app/inventory/store/d2-item-factory.ts b/src/app/inventory/store/d2-item-factory.ts
@@ -43,7 +43,7 @@ import enhancedIntrinsics from 'data/d2/crafting-enhanced-intrinsics';
 import extendedBreaker from 'data/d2/extended-breaker.json';
 import extendedFoundry from 'data/d2/extended-foundry.json';
 import extendedICH from 'data/d2/extended-ich.json';
-import { BucketHashes, ItemCategoryHashes, StatHashes } from 'data/d2/generated-enums';
+import { BucketHashes, ItemCategoryHashes, StatHashes, TraitHashes } from 'data/d2/generated-enums';
 import { keyBy, memoize } from 'es-toolkit';
 import { Draft } from 'immer';
 import memoizeOne from 'memoize-one';
@@ -536,8 +536,12 @@ export function makeItem(
   createdItem.taggable = Boolean(
     createdItem.lockable ||
       createdItem.classified ||
+      // Shaders can be tagged from collections
       itemDef.itemSubType === DestinyItemSubType.Shader ||
-      createdItem.itemCategoryHashes.includes(ItemCategoryHashes.Mods_Mod),
+      // Mods can be tagged from collections...
+      (createdItem.itemCategoryHashes.includes(ItemCategoryHashes.Mods_Mod) &&
+        // ... but not catalysts
+        !itemDef.traitHashes?.includes(TraitHashes.ItemExoticCatalyst)),
   );
   createdItem.comparable = Boolean(
     createdItem.equipment &&

diff --git a/src/app/item-popup/ItemDetails.m.scss b/src/app/item-popup/ItemDetails.m.scss
@@ -29,6 +29,7 @@
 }
 
 .fullImage {
+  max-width: 100%;
   aspect-ratio: auto 16/9;
 
   &.milestoneImage {

diff --git a/src/app/item-popup/ItemDetails.tsx b/src/app/item-popup/ItemDetails.tsx
@@ -81,7 +81,6 @@ export default function ItemDetails({
         item.secondaryIcon && (
           <BungieImage
             src={item.secondaryIcon}
-            width="100%"
             className={clsx(styles.fullImage, {
               [styles.milestoneImage]: item.bucket.hash === BucketHashes.Quests,
             })}