Merge pull request #10381 from FlaminSarge/comparezerostat

Disallow vendorItems without vendorHash from showing up in compareCategoryItemsSelector

config/i18n.json

@@ -106,7 +106,8 @@
  "IsVendorItem": "This item is not owned. This is in a vendor's inventory and may be for sale.",
  "SoldBy": "Sold by: {{vendorName}}",
  "Error": {
- "Unmatched": "This item doesn't match the type of items being compared."
+ "Unmatched": "This item doesn't match the type of items being compared.",
+ "Invalid": "There are no valid items for comparison."
  }
  },
  "Cooldown": {

src/app/compare/Compare.tsx

@@ -9,6 +9,7 @@ import {
 } from 'app/inventory/store/override-sockets';
 import { recoilValue } from 'app/item-popup/RecoilStat';
 import { useD2Definitions } from 'app/manifest/selectors';
+import { showNotification } from 'app/notifications/notifications';
 import { statLabels } from 'app/organizer/Columns';
 import { weaponMasterworkY2SocketTypeHash } from 'app/search/d2-known-values';
 import Checkbox from 'app/settings/Checkbox';
@@ -119,6 +120,11 @@ export default function Compare({ session }: { session: CompareSession }) {
  const hasItems = compareItems.length > 0;
  useEffect(() => {
  if (!hasItems) {
+ showNotification({
+ type: 'warning',
+ title: t('Compare.Error.Invalid'),
+ body: session.query,
+ });
  cancel();
  }
  }, [cancel, hasItems]);

src/app/compare/selectors.ts

@@ -28,8 +28,10 @@ export const compareCategoryItemsSelector = createSelector(
  if (!itemCategoryHashes) {
  return emptyArray<DimItem>();
  }
- return [...allItems, ...vendorItems].filter((i) =>
- itemCategoryHashes.every((h) => i.itemCategoryHashes.includes(h)),
+ return [...allItems, ...vendorItems].filter(
+ (i) =>
+ (!i.vendor || i.vendor.vendorHash) &&
+ itemCategoryHashes.every((h) => i.itemCategoryHashes.includes(h)),
  );
  },
 );