Commit 6fed0c3
committed
Restore PR additions lost during merge resolution
The merge resolution at 84216cc preferred main's version for several files
where the PR-tip had its own additions, leaving dangling references to symbols
that no longer existed:
- ONYXKEYS.CONCIERGE_THINKING_KICKOFF — restore the key + its boolean type
mapping. AgentZeroStatusContext reads it via useOnyx; without the key,
TypeScript and Jest both blew up (TS2339 + runtime undefined.startsWith).
- Report.setConciergeThinkingKickoff / clearConciergeThinkingKickoff — restore
both functions and re-export them. AgentZeroStatusContext imports the clear
helper; useAskConcierge imports the set helper.
- useAskConcierge.tsx — restore the setConciergeThinkingKickoff() call before
addComment(), drop the empty-query early-return so a blank query still
triggers the indicator-kickoff side effect.
Also drop the now-unused @typescript-eslint/naming-convention disable
directive in AgentZeroStatusContextTest.ts (lint flagged it as redundant).1 parent 84216cc commit 6fed0c3
4 files changed
Lines changed: 18 additions & 5 deletions
File tree
- src
- components/Search/SearchRouter
- libs/actions/Report
- tests/unit
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
603 | 603 | | |
604 | 604 | | |
605 | 605 | | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
606 | 609 | | |
607 | 610 | | |
608 | 611 | | |
| |||
1528 | 1531 | | |
1529 | 1532 | | |
1530 | 1533 | | |
| 1534 | + | |
1531 | 1535 | | |
1532 | 1536 | | |
1533 | 1537 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | | - | |
| 26 | + | |
28 | 27 | | |
29 | 28 | | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7659 | 7659 | | |
7660 | 7660 | | |
7661 | 7661 | | |
| 7662 | + | |
| 7663 | + | |
| 7664 | + | |
| 7665 | + | |
| 7666 | + | |
| 7667 | + | |
| 7668 | + | |
| 7669 | + | |
7662 | 7670 | | |
7663 | 7671 | | |
7664 | 7672 | | |
| |||
7741 | 7749 | | |
7742 | 7750 | | |
7743 | 7751 | | |
| 7752 | + | |
| 7753 | + | |
7744 | 7754 | | |
7745 | 7755 | | |
7746 | 7756 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
25 | 24 | | |
26 | 25 | | |
27 | 26 | | |
| |||
0 commit comments