Skip to content

Commit 0b67d57

Browse files
after sync with roopan's main branch conflicts resolved and added code
1 parent ee5317f commit 0b67d57

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

frontend/src/components/ChatHistory/ChatHistoryListItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ export const ChatHistoryListItemGroups: React.FC<ChatHistoryListItemGroupsProps>
391391
onRenderCell={onRenderCell}
392392
className={styles.chatList}
393393
/>
394-
<div ref={observerTarget} />
394+
<div ref={observerTarget} role="scrollDiv"/>
395395
<Separator
396396
styles={{
397397
root: {

frontend/src/components/DraftCards/SectionCard.test.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ const mockState = {
5858
},
5959
frontendSettings: null,
6060
feedbackState: {},
61-
draftedDocumentTitle: ''
61+
draftedDocumentTitle: '',
62+
63+
isGenerating: false,
64+
isRequestInitiated: false,
6265
}
6366

6467
const renderWithContext = (idx = 0) =>

0 commit comments

Comments
 (0)