From 22cae67ffef202892d0e4cb235a99232645dc8e0 Mon Sep 17 00:00:00 2001
From: YinDongfang <1136005348@qq.com>
Date: Mon, 27 Jan 2025 11:37:44 +0800
Subject: [PATCH 1/2] Fix redundant instantiation of NetworkService

---
 Client/src/Utils/NetworkServiceProvider.jsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Client/src/Utils/NetworkServiceProvider.jsx b/Client/src/Utils/NetworkServiceProvider.jsx
index 9fb65f1ca..12eab48a9 100644
--- a/Client/src/Utils/NetworkServiceProvider.jsx
+++ b/Client/src/Utils/NetworkServiceProvider.jsx
@@ -1,14 +1,16 @@
 import { useDispatch } from "react-redux";
 import { useNavigate } from "react-router";
 import { setNetworkService } from "./NetworkService";
-import NetworkService from "./NetworkService";
+import NetworkService, { networkService } from "./NetworkService";
 import { store } from "../store";
 
 const NetworkServiceProvider = ({ children }) => {
 	const dispatch = useDispatch();
 	const navigate = useNavigate();
-	const networkService = new NetworkService(store, dispatch, navigate);
-	setNetworkService(networkService);
+	if (!networkService) {
+		const networkService = new NetworkService(store, dispatch, navigate);
+		setNetworkService(networkService);
+	}
 	return children;
 };
 

From 7c889dde4788d904218ba90f612e30348a0e7905 Mon Sep 17 00:00:00 2001
From: YinDongfang <1136005348@qq.com>
Date: Mon, 27 Jan 2025 12:21:46 +0800
Subject: [PATCH 2/2] Avoid shadow the networkService

---
 Client/src/Utils/NetworkServiceProvider.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Client/src/Utils/NetworkServiceProvider.jsx b/Client/src/Utils/NetworkServiceProvider.jsx
index 12eab48a9..684152e69 100644
--- a/Client/src/Utils/NetworkServiceProvider.jsx
+++ b/Client/src/Utils/NetworkServiceProvider.jsx
@@ -8,8 +8,7 @@ const NetworkServiceProvider = ({ children }) => {
 	const dispatch = useDispatch();
 	const navigate = useNavigate();
 	if (!networkService) {
-		const networkService = new NetworkService(store, dispatch, navigate);
-		setNetworkService(networkService);
+		setNetworkService(new NetworkService(store, dispatch, navigate));
 	}
 	return children;
 };