fix: 🐛 fix existing if checking

yeukfei02 · Dec 12, 2020 · 30ceb67 · 30ceb67
1 parent cc10014
commit 30ceb67
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 27 deletions.
diff --git a/src/common/Common.tsx b/src/common/Common.tsx
@@ -28,7 +28,7 @@ export const getFirebaseConfig = (): FirebaseConfig => {
 export const getStripeApiKey = (): string | undefined => {
   let result: string | undefined = '';
 
-  if (window.location.href.includes('localhost')) {
+  if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
     result = process.env['REACT_APP_STRIPE_TEST_API_KEY'];
   } else {
     result = process.env['REACT_APP_STRIPE_API_KEY'];
@@ -39,7 +39,7 @@ export const getStripeApiKey = (): string | undefined => {
 
 export const getRootUrl = (): string => {
   let ROOT_URL = '';
-  if (window.location.href.includes('localhost')) {
+  if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
     ROOT_URL = 'http://localhost:3000/api';
   } else {
     ROOT_URL = 'https://www.lunch-picker-api.com/api';

diff --git a/src/components/cardView/CardView.tsx b/src/components/cardView/CardView.tsx
@@ -65,7 +65,7 @@ function CardView(props: any): JSX.Element {
   const [message, setMessage] = useState<string>('');
 
   useEffect(() => {
-    if (openSuccessAlert === true) {
+    if (openSuccessAlert) {
       setOpenSuccessAlert(false);
     }
     if (!_.isEmpty(message)) {
@@ -110,7 +110,7 @@ function CardView(props: any): JSX.Element {
   const handleExpandClick = () => {
     setExpanded(!expanded);
 
-    if (expanded === false) getRestaurantsDetailsReviewById(id);
+    if (!expanded) getRestaurantsDetailsReviewById(id);
   };
 
   const getRestaurantsDetailsReviewById = async (id: string) => {

diff --git a/src/components/favourites/Favourites.tsx b/src/components/favourites/Favourites.tsx
@@ -40,7 +40,7 @@ function Favourites(): JSX.Element {
   }, []);
 
   useEffect(() => {
-    if (openSuccessAlert === true) {
+    if (openSuccessAlert) {
       setOpenSuccessAlert(false);
     }
     if (!_.isEmpty(message)) {
@@ -49,7 +49,7 @@ function Favourites(): JSX.Element {
   }, [openSuccessAlert, message]);
 
   useEffect(() => {
-    if (deleteAllFavouritesStatus === true) {
+    if (deleteAllFavouritesStatus) {
       setTimeout(() => {
         getFavourites();
         setDeleteAllFavouritesStatus(false);
@@ -75,7 +75,7 @@ function Favourites(): JSX.Element {
   const renderDeleteAllFavouritesButton = () => {
     let deleteAllFavouritesButton: any = null;
 
-    if (deleteAllFavouritesButtonClicked === true) {
+    if (deleteAllFavouritesButtonClicked) {
       deleteAllFavouritesButton = (
         <div className="mt-3 d-flex justify-content-end" style={{ marginRight: '2.5em' }}>
           <Button variant="contained" color="primary" disabled={true} onClick={handleDeleteAllFavourites}>

diff --git a/src/components/floatingActionButton/FloatingActionButton.tsx b/src/components/floatingActionButton/FloatingActionButton.tsx
@@ -35,7 +35,7 @@ function FloatingActionButton(): JSX.Element {
   const renderFab = () => {
     let fab: any = null;
 
-    if (showFab === true) {
+    if (showFab) {
       fab = (
         <Fab className={classes.fab} style={{ zIndex: 999 }} color="primary" aria-label="up" onClick={scrollToTop}>
           <UpIcon />

diff --git a/src/components/mainPage/MainPage.tsx b/src/components/mainPage/MainPage.tsx
@@ -517,7 +517,7 @@ function MainPage(): JSX.Element {
 
     if (_.isEqual(radioButtonValue, 'places')) {
       if (!_.isEmpty(location)) {
-        if (submitButtonClicked === true) {
+        if (submitButtonClicked) {
           submitButton = (
             <Button className="w-100" variant="outlined" color="secondary" disabled={true} onClick={handleSubmit}>
               {t('loading...')}
@@ -534,7 +534,7 @@ function MainPage(): JSX.Element {
     }
 
     if (_.isEqual(radioButtonValue, 'useCurrentLocation')) {
-      if (submitButtonClicked === true) {
+      if (submitButtonClicked) {
         submitButton = (
           <Button className="w-100" variant="outlined" color="secondary" disabled={true} onClick={handleSubmit}>
             {t('loading...')}
@@ -565,7 +565,7 @@ function MainPage(): JSX.Element {
   const renderRandomButton = () => {
     let randomButton: any = null;
 
-    if (randomButtonClicked === true) {
+    if (randomButtonClicked) {
       randomButton = (
         <Bounce>
           <Tooltip title="Let's eat" placement="bottom">

diff --git a/src/components/myStoreCheckout/CheckoutForm.tsx b/src/components/myStoreCheckout/CheckoutForm.tsx
@@ -50,10 +50,10 @@ function CheckoutForm(props: any) {
   }, [amount, currency, token, card]);
 
   useEffect(() => {
-    if (openSuccessAlert === true) {
+    if (openSuccessAlert) {
       setOpenSuccessAlert(false);
     }
-    if (openErrorAlert === true) {
+    if (openErrorAlert) {
       setOpenErrorAlert(false);
     }
     if (!_.isEmpty(message)) {

diff --git a/src/components/randomFood/RandomFood.tsx b/src/components/randomFood/RandomFood.tsx
@@ -74,7 +74,7 @@ function RandomFood(): JSX.Element {
   }, [useRandomFoodCategory, randomFoodList, latitude, longitude]);
 
   useEffect(() => {
-    if (openSuccessAlert === true) {
+    if (openSuccessAlert) {
       setOpenSuccessAlert(false);
     }
     if (!_.isEmpty(message)) {
@@ -130,7 +130,7 @@ function RandomFood(): JSX.Element {
   ) => {
     const response = await axios.get(`${ROOT_URL}/restaurant/find-restaurants-by-lat-long`, {
       params: {
-        term: useRandomFoodCategory === true ? selectedTerm : '',
+        term: useRandomFoodCategory ? selectedTerm : '',
         latitude: latitude,
         longitude: longitude,
       },
@@ -150,7 +150,7 @@ function RandomFood(): JSX.Element {
   const renderRefreshButton = () => {
     let refreshButton: any = null;
 
-    if (refreshButtonClicked === true) {
+    if (refreshButtonClicked) {
       refreshButton = (
         <div className="d-flex justify-content-end" style={{ marginRight: '2.5em' }}>
           <Button variant="contained" color="primary" disabled={true} onClick={handleRefresh}>
@@ -253,7 +253,7 @@ function RandomFood(): JSX.Element {
     <div>
       <div className="mt-4 d-flex justify-content-end" style={{ marginRight: '2.5em' }}>
         <Typography component={'span'}>
-          {useRandomFoodCategory === true && !_.isEmpty(selectedTerm) ? (
+          {useRandomFoodCategory && !_.isEmpty(selectedTerm) ? (
             <div>
               <b>{t('currentFoodCategory')}</b> {selectedTerm}
             </div>

diff --git a/src/components/randomFoodMapView/RandomFoodMapView.tsx b/src/components/randomFoodMapView/RandomFoodMapView.tsx
@@ -41,7 +41,7 @@ function RandomFoodMapView(): JSX.Element {
   }, [randomFoodList, latitude, longitude]);
 
   useEffect(() => {
-    if (openSuccessAlert === true) {
+    if (openSuccessAlert) {
       setOpenSuccessAlert(false);
     }
     if (!_.isEmpty(message)) {
@@ -148,7 +148,7 @@ function RandomFoodMapView(): JSX.Element {
   const renderRefreshButton = () => {
     let refreshButton: any = null;
 
-    if (refreshButtonClicked === true) {
+    if (refreshButtonClicked) {
       refreshButton = (
         <div className="mt-3 d-flex justify-content-end" style={{ marginRight: '2.5em' }}>
           <Button variant="contained" color="primary" disabled={true} onClick={handleRefresh}>

diff --git a/src/components/restaurantDetails/RestaurantDetails.tsx b/src/components/restaurantDetails/RestaurantDetails.tsx
@@ -45,7 +45,7 @@ function RestaurantDetails(props: any) {
   }, [props.match.params.id]);
 
   useEffect(() => {
-    if (openSuccessAlert === true) {
+    if (openSuccessAlert) {
       setOpenSuccessAlert(false);
     }
     if (!_.isEmpty(message)) {

diff --git a/src/components/settings/Settings.tsx b/src/components/settings/Settings.tsx
@@ -65,13 +65,13 @@ function Settings(): JSX.Element {
 
   useEffect(() => {
     if (!_.isEmpty(currentToken)) {
-      if (subscribeStatus === true) subscribeTopic(currentToken);
+      if (subscribeStatus) subscribeTopic(currentToken);
       else unsubscribeTopic(currentToken);
     }
   }, [subscribeStatus, currentToken]);
 
   useEffect(() => {
-    if (openSuccessAlert === true) {
+    if (openSuccessAlert) {
       setOpenSuccessAlert(false);
     }
     if (!_.isEmpty(message)) {
@@ -98,7 +98,7 @@ function Settings(): JSX.Element {
     setSubscribeStatus(e.target.checked);
 
     setOpenSuccessAlert(true);
-    if (e.target.checked === true) {
+    if (e.target.checked) {
       setMessage('Subscribe message success!');
     } else {
       setMessage('Unsubscribe message success!');

diff --git a/src/components/snackBar/SnackBar.tsx b/src/components/snackBar/SnackBar.tsx
@@ -76,13 +76,13 @@ function SnackBar(props: any): JSX.Element {
   const [message, setMessage] = useState<string>('');
 
   useEffect(() => {
-    if (props.openSuccessAlert === true) {
+    if (props.openSuccessAlert) {
       setOpenSuccessAlert(true);
     }
   }, [props.openSuccessAlert]);
 
   useEffect(() => {
-    if (props.openErrorAlert === true) {
+    if (props.openErrorAlert) {
       setOpenErrorAlert(true);
     }
   }, [props.openErrorAlert]);
@@ -105,7 +105,7 @@ function SnackBar(props: any): JSX.Element {
   const renderSnackBar = () => {
     let snackBar: any = null;
 
-    if (openSuccessAlert === true) {
+    if (openSuccessAlert) {
       snackBar = (
         <Snackbar
           anchorOrigin={{
@@ -120,7 +120,7 @@ function SnackBar(props: any): JSX.Element {
         </Snackbar>
       );
     }
-    if (openErrorAlert === true) {
+    if (openErrorAlert) {
       snackBar = (
         <Snackbar
           anchorOrigin={{