2 files changed, 10 insertions, 23 deletions
diff --git a/extension/react-app/src/pages/gui.tsx b/extension/react-app/src/pages/gui.tsx
index 02b903f7..ff113636 100644
--- a/extension/react-app/src/pages/gui.tsx
+++ b/extension/react-app/src/pages/gui.tsx
@@ -24,7 +24,7 @@ import {
 import RingLoader from "../components/RingLoader";
 import {
   setServerState,
-  temporarilySetUserInputQueue,
+  temporarilyPushToUserInputQueue,
 } from "../redux/slices/serverStateReducer";
 
 const UserInputQueueItem = styled.div`
@@ -208,11 +208,7 @@ function GUI(props: GUIProps) {
       }
       (mainTextInputRef.current as any).setInputValue("");
       if (!client) {
-        dispatch(
-          temporarilySetUserInputQueue((queue: string[]) => {
-            return [...queue, input];
-          })
-        );
+        dispatch(temporarilyPushToUserInputQueue(input));
         return;
       }
 
@@ -241,11 +237,7 @@ function GUI(props: GUIProps) {
       if (input.trim() === "") return;
 
       client.sendMainInput(input);
-      dispatch(
-        temporarilySetUserInputQueue((queue: string[]) => {
-          return [...queue, input];
-        })
-      );
+      dispatch(temporarilyPushToUserInputQueue(input));
 
       // Increment localstorage counter
       const counter = localStorage.getItem("mainTextEntryCounter");
diff --git a/extension/react-app/src/redux/slices/serverStateReducer.ts b/extension/react-app/src/redux/slices/serverStateReducer.ts
index f9f37aeb..22f6935e 100644
--- a/extension/react-app/src/redux/slices/serverStateReducer.ts
+++ b/extension/react-app/src/redux/slices/serverStateReducer.ts
@@ -35,22 +35,17 @@ export const serverStateSlice = createSlice({
   initialState,
   reducers: {
     setServerState: (state, action) => {
-      return {
-        selected_context_items: [],
-        user_input_queue: [],
-        slash_commands: [],
-        ...action.payload,
-      };
+      state.selected_context_items = [];
+      state.user_input_queue = [];
+      state.slash_commands = [];
+      Object.assign(state, action.payload);
     },
-    temporarilySetUserInputQueue: (state, action) => {
-      return {
-        ...state,
-        user_input_queue: action.payload,
-      };
+    temporarilyPushToUserInputQueue: (state, action) => {
+      state.user_input_queue = [...state.user_input_queue, action.payload];
     },
   },
 });
 
-export const { setServerState, temporarilySetUserInputQueue } =
+export const { setServerState, temporarilyPushToUserInputQueue } =
   serverStateSlice.actions;
 export default serverStateSlice.reducer;