Merge pull request #10582 from DestinyItemManager/vendor-icon

Clearer vendor item icon
DestinyItemManager · Jun 28, 2024 · d80e934 · d80e934
2 parents aa03ad7 + 1600585
commit d80e934
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/config/i18n.json b/config/i18n.json
@@ -104,8 +104,7 @@
     "CompareBaseStats": "Show Base Stats",
     "AssumeMasterworked": "Assume Masterworked",
     "InitialItem": "This is the item the Compare tool was launched from",
-    "IsVendorItem": "This item is not owned. This is in a vendor's inventory and may be for sale.",
-    "SoldBy": "Sold by: {{vendorName}}",
+    "IsVendorItem": "This item is not in your inventory, but {{vendorName}} sells it.",
     "Error": {
       "Unmatched": "This item doesn't match the type of items being compared.",
       "Invalid": "There are no valid items for comparison."
@@ -631,6 +630,7 @@
     "ExcludedItems": "Excluded Items",
     "Exotic": "Exotic Armor",
     "MwExotic": "Exotic",
+    "ExcludeVendors": "Search \"-is:vendor\" to exclude vendor items from Loadout Optimizer.",
     "ExistingLoadout": "Existing Loadout",
     "ExoticSpecialCategory": "Special",
     "Filter": "Settings",

diff --git a/src/app/compare/CompareItem.tsx b/src/app/compare/CompareItem.tsx
@@ -129,13 +129,7 @@ function VendorItemWarning({ item }: { item: DimItem }) {
       tooltip={() => {
         const vendorName =
           replacer(defs.Vendor.get(item.vendor!.vendorHash)?.displayProperties?.name) || '--';
-        return (
-          <>
-            {t('Compare.IsVendorItem')}
-            <br />
-            {t('Compare.SoldBy', { vendorName })}
-          </>
-        );
+        return <>{t('Compare.IsVendorItem', { vendorName })}</>;
       }}
     >
       <ActionButton onClick={noop} disabled>

diff --git a/src/app/loadout/loadout-ui/Sockets.m.scss b/src/app/loadout/loadout-ui/Sockets.m.scss
@@ -24,7 +24,7 @@
   align-items: center;
   justify-content: center;
   > span {
-    color: lightgray;
+    color: var(--theme-accent-secondary);
     font-size: calc(var(--item-icon-size) * 2 / 3);
   }
 }
diff --git a/src/app/loadout/loadout-ui/Sockets.tsx b/src/app/loadout/loadout-ui/Sockets.tsx
@@ -130,17 +130,15 @@ function Sockets({
 function VendorItemPlug({ item }: { item: DimItem }) {
   const defs = useD2Definitions()!;
   const replacer = useDynamicStringReplacer(item.owner);
+  const vendorDef = defs.Vendor.get(item.vendor!.vendorHash);
   return (
     <PressTip
       elementType="span"
       tooltip={() => {
-        const vendorName =
-          replacer(defs.Vendor.get(item.vendor!.vendorHash)?.displayProperties?.name) || '--';
+        const vendorName = replacer(vendorDef?.displayProperties?.name) || '--';
         return (
           <>
-            {t('Compare.IsVendorItem')}
-            <br />
-            {t('Compare.SoldBy', { vendorName })}
+            {t('Compare.IsVendorItem', { vendorName })} {t('LoadoutBuilder.ExcludeVendors')}
           </>
         );
       }}

diff --git a/src/locale/en.json b/src/locale/en.json
@@ -106,9 +106,8 @@
       "Unmatched": "This item doesn't match the type of items being compared."
     },
     "InitialItem": "This is the item the Compare tool was launched from",
-    "IsVendorItem": "This item is not owned. This is in a vendor's inventory and may be for sale.",
-    "NoModArmor": "Pre-mods",
-    "SoldBy": "Sold by: {{vendorName}}"
+    "IsVendorItem": "This item is not in your inventory, but {{vendorName}} sells it.",
+    "NoModArmor": "Pre-mods"
   },
   "Cooldown": {
     "Grenade": "Grenade cooldown: {{cooldown}}",
@@ -664,6 +663,7 @@
     "DisabledDueToMaintenance": "The Loadout Optimizer is currently disabled due to Bungie API maintenance.",
     "EquipItems": "Equip",
     "ExcludeItem": "Exclude Item",
+    "ExcludeVendors": "Search \"-is:vendor\" to exclude vendor items from Loadout Optimizer.",
     "ExcludedItems": "Excluded Items",
     "ExistingLoadout": "Existing Loadout",
     "Exotic": "Exotic Armor",