Skip to content

Commit ab9b518

Browse files
author
“chae-dahee”
committed
fix: conflict
1 parent f54c099 commit ab9b518

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

packages/view/src/App.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { RefreshButton } from "components/RefreshButton";
1010
import type { IDESentEvents } from "types/IDESentEvents";
1111
import { useBranchStore, useDataStore, useGithubInfo, useLoadingStore, useThemeStore } from "store";
1212
import { THEME_INFO } from "components/ThemeSelector/ThemeSelector.const";
13-
import { initializeIDEConnection } from "services";
13+
import { initializeIDEConnection, sendFetchAnalyzedDataCommand } from "services";
1414
import { COMMIT_COUNT_PER_PAGE } from "constants/constants";
1515

1616
const App = () => {
@@ -35,10 +35,6 @@ const App = () => {
3535
handleGithubInfo,
3636
};
3737
setLoading(true);
38-
ideAdapter.addIDESentEventListener(callbacks);
39-
ideAdapter.sendFetchAnalyzedDataMessage({ commitCountPerPage: COMMIT_COUNT_PER_PAGE });
40-
ideAdapter.sendFetchBranchListMessage();
41-
ideAdapter.sendFetchGithubInfo();
4238
initializeIDEConnection(callbacks);
4339
initRef.current = true;
4440
}
@@ -48,7 +44,7 @@ const App = () => {
4844
if (loading || isLastPage) return;
4945

5046
setLoading(true);
51-
ideAdapter.sendFetchAnalyzedDataMessage({
47+
sendFetchAnalyzedDataCommand({
5248
commitCountPerPage: COMMIT_COUNT_PER_PAGE,
5349
lastCommitId: nextCommitId,
5450
});

packages/view/src/services/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { FetchDataRequestPayload, RefreshDataRequestPayload } from "types";
33
import { diContainer } from "container";
44
import { DI_IDENTIFIERS } from "container/identifiers";
55
import type { IDESentEvents } from "types";
6+
import { COMMIT_COUNT_PER_PAGE } from "constants/constants";
67

78
export const sendUpdateThemeCommand = (theme: string) => {
89
const ideAdapter = diContainer.get<IDEPort>(DI_IDENTIFIERS.IDEAdapter);
@@ -28,7 +29,7 @@ export const sendFetchBranchListCommand = () => {
2829
export const initializeIDEConnection = (callbacks: IDESentEvents) => {
2930
const ideAdapter = diContainer.get<IDEPort>(DI_IDENTIFIERS.IDEAdapter);
3031
ideAdapter.addIDESentEventListener(callbacks);
31-
ideAdapter.sendFetchAnalyzedDataMessage();
32+
ideAdapter.sendFetchAnalyzedDataMessage({ commitCountPerPage: COMMIT_COUNT_PER_PAGE });
3233
ideAdapter.sendFetchBranchListMessage();
3334
ideAdapter.sendFetchGithubInfo();
3435
};

0 commit comments

Comments
 (0)