ensure cannon season is not null

uniQIndividual · Dec 25, 2024 · f92469c · f92469c
1 parent c7a0f8e
commit f92469c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/src/components/profile/CannonCollection.tsx b/src/components/profile/CannonCollection.tsx
@@ -6,33 +6,38 @@ import SCORCHED_CANNONS from "../../lib/cannons";
 export const CannonCollection = (props: Scorcher) => {
 
     React.useEffect(() => {
-        try {    
-          // Load Scorched Cannon progress
-          
+        try {
+            // Load Scorched Cannon progress
+
         } catch (error) {
 
         }
-      }, []);
+    }, []);
 
     const seasons = Object.keys(SCORCHED_CANNONS)
 
-    return (
-        <div>
-            <div className="text-5xl text-gray-100 flex justify-center mt-2 font-semibold">Scorched Cannon Progress</div>
-            {seasons.map(season => {
-                return <div className="w-full mt-10 " key={season +  "_profile_showcase"}>
-                    <div className="text-3xl text-gray-100 mb-4">{SCORCHED_CANNONS[season]?.name}</div>
-                    <div className="flex flex-wrap"> 
-                    {SCORCHED_CANNONS[season]?.cannons.map(cannon => {
-                        return <div key={cannon.name + "_profile_season_showcase"}>
-                            <img src={cannon.image.replace("/cannons/",props.minigame.ownedCannons.hasOwnProperty(season) && props.minigame.ownedCannons[season].some(c=>c.base_cannon_hash == cannon.hash) ? "/cannons/smaller/" : "/cannons/missing/")} className={(props.minigame.ownedCannons.hasOwnProperty(season) && props.minigame.ownedCannons[season].some(c=>c.base_cannon_hash == cannon.hash) ? "" : "grayscale brightness-75 ") + " max-h-28 object-scale-down w-[200px]"} />
+    try {
+        return (
+            <div>
+                <div className="text-5xl text-gray-100 flex justify-center mt-2 font-semibold">Scorched Cannon Progress</div>
+                {seasons.map(season => {
+                    return <div className="w-full mt-10 " key={season + "_profile_showcase"}>
+                        <div className="text-3xl text-gray-100 mb-4">{SCORCHED_CANNONS[season]?.name}</div>
+                        <div className="flex flex-wrap">
+                            {SCORCHED_CANNONS[season]?.cannons.map(cannon => {
+                                return <div key={cannon.name + "_profile_season_showcase"}>
+                                    <img src={cannon.image.replace("/cannons/", props.minigame.ownedCannons.hasOwnProperty(season) && props.minigame.ownedCannons[season] != null && props.minigame.ownedCannons[season].some(c => c.base_cannon_hash == cannon.hash) ? "/cannons/smaller/" : "/cannons/missing/")} className={(props.minigame.ownedCannons.hasOwnProperty(season) && props.minigame.ownedCannons[season] && props.minigame.ownedCannons[season].some(c => c.base_cannon_hash == cannon.hash) ? "" : "grayscale brightness-75 ") + " max-h-28 object-scale-down w-[200px]"} />
+                                </div>
+                            })}
                         </div>
-                    })}
                     </div>
+                })}
+                <div className="flex justify-center mt-8">
                 </div>
-            })}
-            <div className="flex justify-center mt-8">
             </div>
-        </div>
-    )
+        )
+    } catch (error) {
+        console.log(error);
+
+    }
 }
diff --git a/src/modules/ReportLookup.tsx b/src/modules/ReportLookup.tsx
@@ -291,11 +291,11 @@ const ReportLookup = () => {
                 const data = response.data
 
 
-                newStats = update(newStats, { minigame: { selectedSeason: { $set: data.selected_season } } })
-                newStats = update(newStats, { minigame: { ownedSeasons: { $set: data.owned_seasons } } })
-                newStats = update(newStats, { minigame: { ownedCannons: { $set: data.owned_cannons } } })
-                newStats = update(newStats, { minigame: { equippedCannons: { $set: data.current_cannon } } })
-                newStats = update(newStats, { minigame: { scoins: { $set: data.scoins } } })
+                newStats = update(newStats, { minigame: { selectedSeason: { $set: data.selected_season || newStats.minigame.selectedSeason } } })
+                newStats = update(newStats, { minigame: { ownedSeasons: { $set: data.owned_seasons || newStats.minigame.ownedSeasons } } })
+                newStats = update(newStats, { minigame: { ownedCannons: { $set: data.owned_cannons || newStats.minigame.ownedCannons } } })
+                newStats = update(newStats, { minigame: { equippedCannons: { $set: data.current_cannon || newStats.minigame.equippedCannons } } })
+                newStats = update(newStats, { minigame: { scoins: { $set: data.scoins || newStats.minigame.scoins } } })
 
                 setStats(newStats)
               }