fix(Usage): do not show a blank screen while loading

benji6 · Dec 6, 2023 · 2972731 · 2972731
1 parent ba6a3b8
commit 2972731
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/client/src/components/pages/About/Usage/index.tsx b/client/src/components/pages/About/Usage/index.tsx
@@ -35,8 +35,6 @@ export default function Usage() {
     { label: "More than a year ago", key: ">=365 days" },
   ] as const;
 
-  if (data === undefined || !("expires" in data) || !("usage" in data)) return;
-
   const titleEl = <h2>Usage</h2>;
 
   if (isPending)

diff --git a/client/src/components/shared/LocationString.tsx b/client/src/components/shared/LocationString.tsx
@@ -23,7 +23,7 @@ export default function LocationString({
 
   if (isPending) return <Spinner inline />;
   if (isError) return errorFallback ?? null;
-  const Place = data?.Results?.[0]?.Place;
+  const Place = data.Results?.[0]?.Place;
   const locationName = Place?.Municipality ?? Place?.Label;
   if (!locationName) {
     captureException(

diff --git a/client/src/components/shared/MoodCard/MoodCardWeather/index.tsx b/client/src/components/shared/MoodCard/MoodCardWeather/index.tsx
@@ -26,7 +26,7 @@ export default function MoodCardWeather({ date, latitude, longitude }: Props) {
       </div>
     );
 
-  const weatherData = data!.data[0];
+  const weatherData = data.data[0];
   const weatherIconData = weatherData?.weather[0];
 
   const { iconName, weatherColor } = getWeatherDisplayData({