diff --git a/api/adapters.py b/api/adapters.py index 4924d28..cc66d2d 100644 --- a/api/adapters.py +++ b/api/adapters.py @@ -524,23 +524,21 @@ def _apply_branch_rules( # Resort-mode override: the user has explicitly picked branches via # the picker. Replace the rules' kept_set with the user's selection - # restricted to this group, and update the matching auto-picked- - # branch warning's `picked` field so the picker UI shows their - # current choice ticked. Without this, narrowing a multi-branch - # wsid to one branch erases the picker section because the warning - # was tied to the rule's auto-pick, not the user's pick. + # restricted to this group, and DROP the matching auto-picked-branch + # warning — the user has already chosen, and the BranchPicker in the + # ModTable expansion (frontend sortof-app.jsx ~818) keeps the picker + # accessible if they want to revisit. Leaving the amber warning in + # place after an explicit pick reads as "you should review this" + # which is exactly wrong — they already did. if is_resort and selected_modids is not None: user_picks = [m.id for m in group if m.id in selected_modids] if user_picks: kept_set = set(user_picks) - for w in warnings: - if (w.get("tag") == "auto-picked-branch" - and w.get("wsid") == wsid): - w["picked"] = user_picks[0] - w["msg"] = ( - f"{title} ({wsid}) ships {len(group)} branches; " - f"selected {user_picks[0]}. Pick another:" - ) + warnings = [ + w for w in warnings + if not (w.get("tag") == "auto-picked-branch" + and w.get("wsid") == wsid) + ] for m in group: if m.id not in kept_set: