Merge pull request #47 from DVGY/feature/remove-types

Feature/remove types
DVGY · Oct 21, 2023 · d6d528c · d6d528c
2 parents fa46c81 + ff45f91
commit d6d528c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/client/src/components/bookings/CheckoutForm.tsx b/client/src/components/bookings/CheckoutForm.tsx
@@ -82,11 +82,15 @@ const CheckoutForm: FC<ICheckoutForm> = ({ tripId, price }) => {
       if (responsePaymentResult.error) {
         setError(responsePaymentResult?.error);
       }
-      setLoading(false);
     } catch (error) {
-      setError(error);
-      setLoading(false);
+      if (error instanceof Error) {
+        console.log(error);
+      } else {
+        setError(error as unknown as StripeError);
+      }
       console.log(error);
+    } finally {
+      setLoading(false);
     }
   };
 

diff --git a/client/src/components/trips/FilterTrips.tsx b/client/src/components/trips/FilterTrips.tsx
@@ -135,7 +135,6 @@ const FilterTrips: FC<IFilterTripsProps> = ({
           size='xs'
           rightIcon={<ChevronDownIcon />}
           fontSize={['xs', 'xs', 'xs', 'md', 'md', 'md']}
-          isFullWidth='true'
           textAlign='start'
           fontWeight='medium'
         >

diff --git a/client/src/components/trips/UserReviews.tsx b/client/src/components/trips/UserReviews.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import { FC } from 'react';
 import { Flex, Text } from '@chakra-ui/react';
 import { MdStar } from 'react-icons/md';
 

diff --git a/client/src/components/user-menu/UserSettings.tsx b/client/src/components/user-menu/UserSettings.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import { FC } from 'react';
 import { Box } from '@chakra-ui/react';
 
 const UserSettings: FC = () => {

diff --git a/client/src/hooks/useAPI.tsx b/client/src/hooks/useAPI.tsx
@@ -4,6 +4,7 @@ import Axios from '../utils/Axios';
 import { usePrevious } from './usePrevious';
 import isDeepEqual from 'fast-deep-equal';
 import { localStorageProxy } from '../utils/localStorageProxy';
+import { AxiosError } from 'axios';
 
 export enum AxiosMethods {
   GET = 'get',
@@ -75,11 +76,15 @@ const useAPI = ({
           },
         });
         setResponse(data);
-        setLoading(false);
       } catch (error) {
         console.log(error);
+        if (error instanceof Error) {
+          setError(error.message);
+        } else if (error instanceof AxiosError) {
+          setError(error.response);
+        }
+      } finally {
         setLoading(false);
-        setError(error.response);
       }
     };
     if (!isDeepEqual({ method, resource, query }, previousPropsRef)) {