From d2b06f7e88480ee2ccd6e2e1b673384074288073 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 7 Oct 2026 09:47:38 +0000 Subject: [PATCH] feat: fold poisons into the Potions trade filter and rename Misc/Gems The trade picker drops its separate Poisons filter; poisons already show under Potions. The Misc/Gems filter is now labelled Misc (soul gems still appear there). Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_01SSW5HGXzi9kAVm4zdsSaid --- Code/skyrim_ui/src/app/models/trade-category.ts | 6 +++--- Code/skyrim_ui/src/assets/i18n/en.json | 2 +- Code/skyrim_ui/test/trade-ui.test.cjs | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Code/skyrim_ui/src/app/models/trade-category.ts b/Code/skyrim_ui/src/app/models/trade-category.ts index 1f2eab0d4..997060f78 100644 --- a/Code/skyrim_ui/src/app/models/trade-category.ts +++ b/Code/skyrim_ui/src/app/models/trade-category.ts @@ -1,11 +1,11 @@ export const tradeCategories = [ - 'all', 'weapons', 'armor', 'potions', 'poisons', 'scrolls', + 'all', 'weapons', 'armor', 'potions', 'scrolls', 'food', 'ingredients', 'books', 'keys', 'misc', ] as const; export type TradeCategory = typeof tradeCategories[number]; -const tradeItemCategories = [...tradeCategories.filter(category => category !== 'all'), 'ammunition', 'soul_gems'] as const; -export type TradeItemCategory = Exclude | 'ammunition' | 'soul_gems'; +const tradeItemCategories = [...tradeCategories.filter(category => category !== 'all'), 'ammunition', 'poisons', 'soul_gems'] as const; +export type TradeItemCategory = Exclude | 'ammunition' | 'poisons' | 'soul_gems'; export function normalizeTradeCategory(value: unknown): TradeItemCategory { return tradeItemCategories.includes(value as TradeItemCategory) diff --git a/Code/skyrim_ui/src/assets/i18n/en.json b/Code/skyrim_ui/src/assets/i18n/en.json index fc912a002..3745ceabd 100644 --- a/Code/skyrim_ui/src/assets/i18n/en.json +++ b/Code/skyrim_ui/src/assets/i18n/en.json @@ -166,7 +166,7 @@ "books": "Books", "keys": "Keys", "soul_gems": "Soul Gems", - "misc": "Misc/Gems" + "misc": "Misc" }, "EQUIPPED_ITEM_WARNING": "Unequip this item before trading it.", "INVITES_TITLE": "Trade invitations", diff --git a/Code/skyrim_ui/test/trade-ui.test.cjs b/Code/skyrim_ui/test/trade-ui.test.cjs index 2b4287301..011fe3ff7 100644 --- a/Code/skyrim_ui/test/trade-ui.test.cjs +++ b/Code/skyrim_ui/test/trade-ui.test.cjs @@ -240,6 +240,7 @@ test('broad categories include ammo, poisons and soul gems; unknown types remain assert.equal(visible.length, 2); assert.equal(fixture.service.categories.includes('soul_gems'), false); assert.equal(fixture.service.categories.includes('ammunition'), false); + assert.equal(fixture.service.categories.includes('poisons'), false); subscription.unsubscribe(); fixture.service.ngOnDestroy(); });