From 99219230b8c2898979632cf679f7bd7d4c81fd9f Mon Sep 17 00:00:00 2001
From: MinseoLee <mmmm@ajou.ac.kr>
Date: Thu, 7 Dec 2023 20:35:26 +0900
Subject: [PATCH] fix: merge conflicts
---
src/common/utils/api.ts | 1 -
src/pages/history-page/modules/order-box/OrderBox.tsx | 7 ++++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/common/utils/api.ts b/src/common/utils/api.ts
index b6c4cbe..c0afbd8 100644
--- a/src/common/utils/api.ts
+++ b/src/common/utils/api.ts
@@ -26,7 +26,6 @@ const SOCKET_URL = process.env.NODE_ENV === 'production' ? PROD_SOCKET_URL : DEV
* @name fetchData
* @param url
* @param method
- * @param setLogin
* @param payload
* @description for body
*/
diff --git a/src/pages/history-page/modules/order-box/OrderBox.tsx b/src/pages/history-page/modules/order-box/OrderBox.tsx
index c8c695b..60c28f9 100644
--- a/src/pages/history-page/modules/order-box/OrderBox.tsx
+++ b/src/pages/history-page/modules/order-box/OrderBox.tsx
@@ -8,7 +8,7 @@ import S from "./OrderBox.module.css";
import type Connector from "../../../../common/instances/Connector";
import type { MenuPageData } from "../../../menu-page/config/type";
import type { HistoryPageData } from "../../config/type";
-import type { FC } from "react";
+import type { FC , MutableRefObject } from "react";
interface Props {
shop : string;
@@ -17,16 +17,17 @@ interface Props {
price : HistoryPageData['totalPrice'];
takeout : HistoryPageData['takeout'];
status : HistoryPageData['status'];
- connector : Connector;
+ connector : MutableRefObject<Connector | null>;
}
const OrderBox : FC<Props> = ({ shop, items, waitingCount, price, takeout, status, connector }) => {
const [_name, setName] = useState<string>('');
useEffect(() => {
+ if (!connector) return;
void (async () => {
try{
- const response = await connector.get<MenuPageData>(`/menu/${items[0].menuId}`);
+ const response = await connector.current!.get<MenuPageData>(`/menu/${items[0].menuId}`);
setName(response.name);
} catch {
alert(ALERT.REQ_FAIL);
--
GitLab