Bump typescript from 3.9.3 to 4.2.4 (#1320)

* bump typescript from 3.9.3 to 4.2.4 * fix typing + bug in legacy Playa component * fix typing in VenueEntrancePage
sparkletown · Apr 14, 2021 · d24f784 · d24f784
1 parent bc96111
commit d24f784
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -153,7 +153,7 @@
     "gifwrap": "^0.9.2",
     "phin": "^3.5.0",
     "ts-node": "^9.1.1",
-    "typescript": "^3.9.3",
+    "typescript": "^4.2.4",
     "uuidv4": "^6.2.3"
   }
 }
diff --git a/src/components/templates/Playa/Playa.tsx b/src/components/templates/Playa/Playa.tsx
@@ -376,14 +376,14 @@ const Playa = () => {
     return Math.hypot(venuePlacement.x - x, venuePlacement.y - y);
   };
 
-  const { camp } = useParams();
+  const { camp } = useParams<{ camp?: string }>();
   useEffect(() => {
     if (camp) {
       const campVenue = venues?.find((venue) => venue.id === camp);
       if (campVenue && !PLAYA_TEMPLATES.includes(campVenue.template)) {
-        if (camp.placement) {
-          setCenterX(camp.placement.x);
-          setCenterY(camp.placement.y);
+        if (campVenue.placement !== undefined) {
+          setCenterX(campVenue.placement.x);
+          setCenterY(campVenue.placement.y);
         }
         showVenue(campVenue);
       }

diff --git a/src/pages/VenueEntrancePage/VenueEntrancePage.tsx b/src/pages/VenueEntrancePage/VenueEntrancePage.tsx
@@ -16,7 +16,7 @@ import { showZendeskWidget } from "utils/zendesk";
 export const VenueEntrancePage: React.FunctionComponent<{}> = () => {
   const { user, profile } = useUser();
   const history = useHistory();
-  const { step } = useParams();
+  const { step } = useParams<{ step?: string }>();
   const venueId = useVenueId();
   useConnectCurrentVenue();
   const venue = useSelector(currentVenueSelectorData);
@@ -32,6 +32,7 @@ export const VenueEntrancePage: React.FunctionComponent<{}> = () => {
   }
 
   if (
+    step === undefined ||
     !(parseInt(step) > 0) ||
     !venue.entrance ||
     !venue.entrance.length ||