From 26df4856443ea6e15991f413cb2aec8263cea530 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 2 Oct 2024 08:37:36 +0800
Subject: [PATCH] Update client network serivce URL logic

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

diff --git a/Client/src/Utils/NetworkService.js b/Client/src/Utils/NetworkService.js
index 7e2a56209..a8d2d77c9 100644
--- a/Client/src/Utils/NetworkService.js
+++ b/Client/src/Utils/NetworkService.js
@@ -1,6 +1,6 @@
 import axios from "axios";
-const BASE_URL =
-  import.meta.env.VITE_APP_API_BASE_URL || "http://localhost:5000/api/v1";
+const DEFAULT_API_URL = "http://localhost:5000/api/v1";
+const BASE_URL = import.meta.env.VITE_APP_API_BASE_URL;
 import { logger } from "./Logger";
 class NetworkService {
   constructor(store) {
@@ -10,8 +10,10 @@ class NetworkService {
     this.setBaseUrl(baseURL);
     this.unsubscribe = store.subscribe(() => {
       const state = store.getState();
-      if (state.settings.apiBaseUrl) {
+      if (BASE_URL === "undefined" && state.settings.apiBaseUrl) {
         baseURL = state.settings.apiBaseUrl;
+      } else {
+        baseURL = DEFAULT_URL;
       }
       this.setBaseUrl(baseURL);
     });