Fix double toasts

Author: 1337LutZ

assets/locales/en/translation.json

@@ -771,6 +771,7 @@
 			"no_results": "No results found.",
 			"showing_results": "Showing {{max}} of {{total}} total results.",
 			"item_added": "{{itemName}} was added to the batch.",
+			"item_removed": "{{itemName}} was removed from the batch.",
 			"item_unique": "{{itemName}} is unique and already added."
 		},
 		"settings": {

assets/locales/fr/translation.json

@@ -769,12 +769,13 @@
 			"min_ilvl": "ILvl min",
 			"max_ilvl": "ILvl max",
 			"no_results": "Aucun résultat trouvé.",
-			"showing_results": "Affichage de {max} sur {total} résultats totaux.",
-			"item_added": "{itemName} a été ajouté au lot.",
-			"item_unique": "{itemName} est unique et a déjà été ajouté."
+			"showing_results": "Affichage de {{max}} sur {{total}} résultats totaux.",
+			"item_added": "{{itemName}} a été ajouté au lot.",
+			"item_removed": "{{itemName}} a été retiré du lot.",
+			"item_unique": "{{itemName}} est unique et a déjà été ajouté."
 		},
 		"settings": {
-			"combinations_count": "{count} Combinaisons",
+			"combinations_count": "{{count}} Combinaisons",
 			"combination_singular": "1 Combinaison",
 			"iterations": "Itérations",
 			"default_gems": "Gemmes par défaut",

schemas/translation.schema.json

@@ -3200,6 +3200,9 @@
             "item_added": {
               "type": "string"
             },
+            "item_removed": {
+              "type": "string"
+            },
             "item_unique": {
               "type": "string"
             }
@@ -3214,6 +3217,7 @@
             "no_results",
             "showing_results",
             "item_added",
+            "item_removed",
             "item_unique"
           ]
         },

ui/core/components/gear_picker/item_list.tsx

@@ -613,17 +613,6 @@ export default class ItemList<T extends ItemListType> {
 				compareButton.value!.addEventListener('click', () => {
 					const hasItem = checkHasItem();
 					simUI.bt?.[hasItem ? 'removeItem' : 'addItem'](ItemSpec.create({ id: itemData.id }));
-
-					new Toast({
-						delay: 1000,
-						variant: 'success',
-						body: (
-							<>
-								<strong>{itemData.name}</strong> was {hasItem ? <>removed from the batch</> : <>added to the batch</>}.
-							</>
-						),
-					});
-					// TODO: should we open the bulk sim UI or should we run in the background showing progress, and then sort the items in the picker?
 				});
 			}
 		}

ui/core/components/individual_sim_ui/bulk/bulk_item_picker_group.tsx

@@ -77,20 +77,28 @@ export default class BulkItemPickerGroup extends ContentBlock {
 		picker.setItem(newItem);
 	}
 
-	remove(idx: number) {
+	remove(idx: number, silent = false) {
 		const picker = this.pickers.get(idx);
 		if (!picker) {
-			new Toast({
-				variant: 'error',
-				body: 'Failed to remove item, please report this issue.',
-			});
+			if (!silent)
+				new Toast({
+					variant: 'error',
+					body: 'Failed to remove item, please report this issue.',
+				});
 			return;
 		}
 
 		picker.dispose();
 		this.pickers.delete(idx);
 
 		if (!this.pickers.size) this.addEmptyElement();
+
+		if (!silent)
+			new Toast({
+				delay: 1000,
+				variant: 'success',
+				body: <>{i18n.t('bulk_tab.search.item_removed', { itemName: picker.item._item.name })}</>,
+			});
 	}
 
 	private addEmptyElement() {

ui/core/components/individual_sim_ui/bulk_tab.tsx

@@ -197,10 +197,10 @@ export class BulkTab extends SimTab {
 				// Clear all previously equipped items from the pickers
 				for (const group of this.pickerGroups.values()) {
 					if (group.has(-1)) {
-						group.remove(-1);
+						group.remove(-1, true);
 					}
 					if (group.has(-2)) {
-						group.remove(-2);
+						group.remove(-2, true);
 					}
 				}
 
@@ -400,7 +400,7 @@ export class BulkTab extends SimTab {
 			}
 		});
 	}
-	removeItemByIndex(idx: number) {
+	removeItemByIndex(idx: number, silent = false) {
 		if (idx < 0 || this.items.length < idx || !this.items[idx]) {
 			new Toast({
 				variant: 'error',
@@ -419,15 +419,15 @@ export class BulkTab extends SimTab {
 				if (!canEquipItem(equippedItem.item, this.simUI.player.getPlayerSpec(), slot)) return;
 				const bulkSlot = getBulkItemSlotFromSlot(slot, this.playerCanDualWield);
 				const group = this.pickerGroups.get(bulkSlot)!;
-				group.remove(idx);
+				group.remove(idx, silent);
 			});
 			this.itemsChangedEmitter.emit(TypedEvent.nextEventID());
 		}
 	}
 
 	clearItems() {
 		for (let idx = 0; idx < this.items.length; idx++) {
-			this.removeItemByIndex(idx);
+			this.removeItemByIndex(idx, true);
 		}
 		this.items = new Array<ItemSpec>();
 		this.itemsChangedEmitter.emit(TypedEvent.nextEventID());