Fixed vehicle type selection (#801)

monkvision · Jun 24, 2024 · edf7ec0 · edf7ec0
1 parent ad65b08
commit edf7ec0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/common-ui-web/src/components/VehicleTypeSelection/VehicleTypeSelection.styles.ts b/packages/common-ui-web/src/components/VehicleTypeSelection/VehicleTypeSelection.styles.ts
@@ -12,10 +12,11 @@ export const styles: Styles = {
   containerSmall: {
     __media: { maxWidth: 500 },
     gridTemplate: `'title' 0
-                  'slider' 1fr 
+                  'slider' 1fr
                   'button' 1fr/ auto`,
   },
   loadingContainer: {
+    display: 'flex',
     justifyContent: 'center',
     alignItems: 'center',
   },

diff --git a/packages/common-ui-web/src/components/VehicleTypeSelection/VehicleTypeSelection.tsx b/packages/common-ui-web/src/components/VehicleTypeSelection/VehicleTypeSelection.tsx
@@ -83,7 +83,7 @@ export const VehicleTypeSelection = i18nWrap((props: VehicleTypeSelectionProps)
     authToken: props.authToken ?? '',
     apiDomain: props.apiDomain ?? '',
   });
-  const loading = useLoadingState(true);
+  const loading = useLoadingState();
   const { handleError, setTags, setUserId } = useMonitoring();
   const analytics = useAnalytics();
   const [initialScroll, setInitialScroll] = useState(true);
@@ -112,17 +112,17 @@ export const VehicleTypeSelection = i18nWrap((props: VehicleTypeSelectionProps)
   }, [props.inspectionId, props.authToken, analytics, setTags, setUserId]);
 
   useEffect(() => {
+    loading.start();
     const fetchInspection = async () => {
       if (!props.inspectionId) {
         loading.onSuccess();
         return;
       }
-      loading.start();
       const fetchedInspection = await getInspection({
         id: props.inspectionId,
       });
       const vehicleType = getVehicleTypeFromInspection(fetchedInspection);
-      if (vehicleType && props.availableVehicleTypes?.includes(vehicleType)) {
+      if (vehicleType && vehicleTypes.includes(vehicleType)) {
         props.onSelectVehicleType?.(vehicleType);
       }
       loading.onSuccess();
@@ -146,8 +146,8 @@ export const VehicleTypeSelection = i18nWrap((props: VehicleTypeSelectionProps)
       style={{
         ...rootStyles,
         ...styles['container'],
-        ...loadingContainer,
         ...responsive(styles['containerSmall']),
+        ...loadingContainer,
       }}
     >
       {loading.isLoading && <Spinner size={80} />}