consolidating the load methods b/c they're always called together

client/src/domain/gameStore.js

@@ -4,10 +4,9 @@ import { joinGame, sendGuess, getCurrentRound } from "./apiMethods";
 import {
   saveGameInfoToLocalStorage,
   clearGameInfoFromLocalStorage,
-  getGameInfoFromLocalStorage,
   saveTimerToLocalStorage,
   clearRoundInfoFromLocalStorage,
-  getRoundInfoFromLocalStorage,
+  getInfoFromLocalStorage,
 } from "./localStorageMethods";
 
 export const [
@@ -72,10 +71,9 @@ export const [
     saveGameInfoToLocalStorage(gameId, name, playerId);
   },
   rejoinGame: async ([set, get]) => {
-    const { gameId, playerName, playerId } = getGameInfoFromLocalStorage();
+    const { gameId, playerName, playerId, timer, position, pov } = getInfoFromLocalStorage();
     set({ gameId, playerName, playerId });
     await dispatch.updateCurrentRound();
-    const { timer, position, pov } = getRoundInfoFromLocalStorage();
     set({
       roundSeconds: timer ?? get.roundSeconds(),
       panoStartPosition: position ?? get.panoStartPosition(),

client/src/domain/localStorageMethods.js

@@ -51,18 +51,12 @@ export const clearRoundInfoFromLocalStorage = () => {
   localStorage.removeItem(localStoragePanoPitch);
 }
 
-export const getGameInfoFromLocalStorage = () => ({
-  gameId: localStorage.getItem(localStorageGameId),
-  playerName: localStorage.getItem(localStoragePlayerName),
-  playerId: localStorage.getItem(localStoragePlayerId),
-})
-
 const parseFloatFromStorage = key => {
   const val = localStorage.getItem(key);
   return val === null ? null : Number.parseFloat(val);
 }
 
-export const getRoundInfoFromLocalStorage = () => {
+export const getInfoFromLocalStorage = () => {
   const timer = localStorage.getItem(localStorageTimer);
   const position = {
     lat: parseFloatFromStorage(localStoragePanoLat),
@@ -74,6 +68,9 @@ export const getRoundInfoFromLocalStorage = () => {
   };
 
   return {
+    gameId: localStorage.getItem(localStorageGameId),
+    playerName: localStorage.getItem(localStoragePlayerName),
+    playerId: localStorage.getItem(localStoragePlayerId),
     timer: timer !== null ? Number.parseInt(timer) : null,
     position: position.lat !== null && position.lng !== null ? position : null,
     pov: pov.heading !== null && pov.pitch !== null ? pov : null,