- removed unnecessary code.

Author: YossiGreen

src/actions/ExposuresActions.ts

@@ -19,44 +19,40 @@ interface dismissedExposures {
 }
 
 
-
 export const setExposures = (exposures: Exposure[]) => async (dispatch: any) => {
   const dismissedExposures = await AsyncStorage.getItem(DISMISSED_EXPOSURES);
 
   let filteredExposures;
-  let pastExposures: Exposure[] = exposures
+  let pastExposures: Exposure[] = exposures;
 
   if (dismissedExposures) {
     const parsedDismissedExposures: number[] | dismissedExposures[] = JSON.parse(dismissedExposures);
     filteredExposures = exposures.filter((exposure: Exposure) => parsedDismissedExposures.some((item: number | dismissedExposures) => {
-        if (typeof item === 'number') {
-          return item !== exposure.properties.OBJECTID
-        } else {
-          return item.OBJECTID !== exposure.properties.OBJECTID
-        }
-      })
-    )
+      if (typeof item === 'number') {
+        return item !== exposure.properties.OBJECTID;
+      }
+      return item.OBJECTID !== exposure.properties.OBJECTID;
+    }));
     pastExposures = exposures.map((expo) => {
       if (parsedDismissedExposures.some((item: number | dismissedExposures) => {
         if (typeof item === 'number') {
-          return item === expo.properties.OBJECTID
-        } else {
-          return item.OBJECTID === expo.properties.OBJECTID
+          return item === expo.properties.OBJECTID;
         }
+        return item.OBJECTID === expo.properties.OBJECTID;
       })) {
         if (typeof parsedDismissedExposures === 'number') {
-          expo.properties.wasThere = parsedDismissedExposures ? true :  false
+          expo.properties.wasThere = !!parsedDismissedExposures;
         } else {
-          const {wasThere} = parsedDismissedExposures.find(({OBJECTID}) => expo.properties.OBJECTID === OBJECTID )
-          expo.properties.wasThere = wasThere ?? false
+          const { wasThere } = parsedDismissedExposures.find(({ OBJECTID }) => expo.properties.OBJECTID === OBJECTID);
+          expo.properties.wasThere = wasThere ?? false;
         }
       }
-      return expo
-    })
+      return expo;
+    });
   }
 
-  console.log("length", filteredExposures?.length, pastExposures.length);
-  
+  console.log('length', filteredExposures?.length, pastExposures.length);
+
   dispatch({ type: UPDATE_EXPOSURES, payload: { exposures: filteredExposures || exposures } });
   dispatch({ type: UPDATE_PAST_EXPOSURES, payload: { pastExposures } });
 
@@ -65,17 +61,17 @@ export const setExposures = (exposures: Exposure[]) => async (dispatch: any) =>
     // check if first item in array is number
     if (typeof parsedDismissedExposures[0] === 'number') {
       const convertExposureToString: string = JSON.stringify(parsedDismissedExposures.map((OBJECTID: number) => {
-        if (typeof OBJECTID !== 'number') return OBJECTID
+        if (typeof OBJECTID !== 'number') return OBJECTID;
         return ({
           OBJECTID,
           wasThere: false
-        })
-      }))
+        });
+      }));
 
-      await AsyncStorage.setItem(DISMISSED_EXPOSURES, convertExposureToString)
+      await AsyncStorage.setItem(DISMISSED_EXPOSURES, convertExposureToString);
     }
   }
-}
+};
 
 export const setValidExposure = (exposure: Exposure) => async (dispatch: any) => {
   try {
@@ -109,44 +105,40 @@ export const dismissExposure = (exposureId: number) => async (dispatch: any) =>
 };
 
 export const setExposureSelected = ({ index, wasThere }) => async (dispatch: any, getState: any) => {
+  const exposures = [...getState().exposures.exposures];
+  exposures[index].properties.wasThere = wasThere;
 
-  const exposures = [...getState().exposures.exposures]
-  exposures[index].properties.wasThere = wasThere
-
-  dispatch({ type: REPLACE_EXPOSURES, payload: { exposures } })
+  dispatch({ type: REPLACE_EXPOSURES, payload: { exposures } });
   const dismissedExposures = await AsyncStorage.getItem(DISMISSED_EXPOSURES);
   if (dismissedExposures) {
     const parsedDismissedExposures: number[] | dismissedExposures[] = JSON.parse(dismissedExposures);
     // avoid duplicates
     const idx: number = parsedDismissedExposures.findIndex((item: number | dismissedExposures) => {
-        if(typeof item ==='number'){
-          return exposures[index].properties.OBJECTID === item
-        } else {
-          return exposures[index].properties.OBJECTID === item.OBJECTID
-        }
-    })
-    if(idx > -1) {
-      if(typeof parsedDismissedExposures[idx] === 'number') {
-        parsedDismissedExposures[idx] = { OBJECTID: exposures[index].properties.OBJECTID, wasThere }
+      if (typeof item === 'number') {
+        return exposures[index].properties.OBJECTID === item;
+      }
+      return exposures[index].properties.OBJECTID === item.OBJECTID;
+    });
+    if (idx > -1) {
+      if (typeof parsedDismissedExposures[idx] === 'number') {
+        parsedDismissedExposures[idx] = { OBJECTID: exposures[index].properties.OBJECTID, wasThere };
       } else {
-
-        parsedDismissedExposures[idx].wasThere = wasThere
+        parsedDismissedExposures[idx].wasThere = wasThere;
       }
     } else {
-      parsedDismissedExposures.push({ OBJECTID: exposures[index].properties.OBJECTID, wasThere })
+      parsedDismissedExposures.push({ OBJECTID: exposures[index].properties.OBJECTID, wasThere });
     }
     await AsyncStorage.setItem(DISMISSED_EXPOSURES, JSON.stringify(parsedDismissedExposures));
   } else {
     await AsyncStorage.setItem(DISMISSED_EXPOSURES, JSON.stringify([{ OBJECTID: exposures[index].properties.OBJECTID, wasThere }]));
   }
-}
+};
 
 export const replacePastExposureSelected = (payload: Exposure[]) => async (dispatch: any) => {
-
-  dispatch({ type: REPLACE_PAST_EXPOSURES, payload })
+  dispatch({ type: REPLACE_PAST_EXPOSURES, payload });
 
   await AsyncStorage.setItem(DISMISSED_EXPOSURES, JSON.stringify(payload.map((exposure: Exposure) => ({
     OBJECTID: exposure.properties.OBJECTID,
     wasThere: exposure.properties.wasThere
   }))));
-}
+};

src/components/Drawer/Home.tsx

@@ -8,38 +8,38 @@ import DrawerContent from './DrawerContent';
 import ExposuresHistory from '../Main/ExposuresHistory/ExposuresHistory';
 import ExposuresHistoryEdit from '../Main/ExposuresHistory/ExposuresHistoryEdit';
 import ExposureHistoryRelief from '../Main/ExposuresHistory/ExposureHistoryRelief';
-import ExposureDetected from '../Main/ExposuresDetected'
-import ExposureInstructions from '../Main/ExposureInstructions'
-import ExposureRelief from '../Main/ExposureRelief'
+import ExposureDetected from '../Main/ExposuresDetected';
+import ExposureInstructions from '../Main/ExposureInstructions';
+import ExposureRelief from '../Main/ExposureRelief';
 import ChangeLanguageScreen from '../ChangeLanguage/ChangeLanguageScreen';
 import LocationHistory from '../Main/LocationHistory/LocationHistory';
 import FilterDriving from '../Main/FilterDriving/FilterDriving';
 import ShareLocations from '../ShareLocations/ShareLocations';
-import { LocaleReducer,ExposuresReducer, Store, Exposure } from '../../types';
+import { LocaleReducer, ExposuresReducer, Store, Exposure } from '../../types';
 import MapModal from '../Main/MapModal';
 
 
 const Stack = createStackNavigator();
 
-const DEFAULT_SCREEN = "ScanHome"
+const DEFAULT_SCREEN = 'ScanHome';
 
-const DrawerStack = ({navigation}) => {
-  const { exposures } = useSelector<Store, ExposuresReducer>(state => state.exposures)
-  const [initialRouteName, setInitialRouteName] = useState('')
+const DrawerStack = ({ navigation }) => {
+  const { exposures } = useSelector<Store, ExposuresReducer>(state => state.exposures);
+  const [initialRouteName, setInitialRouteName] = useState('');
 
   useEffect(() => {
     AsyncStorage.getItem('INIT_ROUTE_NAME')
       .then(initRouteString => setInitialRouteName(initRouteString ?? DEFAULT_SCREEN))
-      .catch(() => setInitialRouteName(DEFAULT_SCREEN))
-  },[])
+      .catch(() => setInitialRouteName(DEFAULT_SCREEN));
+  }, []);
 
   useEffect(() => {
-    if(exposures.some((exposure: Exposure) => exposure.properties.wasThere === undefined && initialRouteName !== '')){
-      navigation.navigate('ExposureDetected')
+    if (exposures.some((exposure: Exposure) => exposure.properties.wasThere === undefined && initialRouteName !== '')) {
+      navigation.navigate('ExposureDetected');
     }
-  }, [exposures, initialRouteName])
-  
-  if(!initialRouteName) return null
+  }, [exposures, initialRouteName]);
+
+  if (!initialRouteName) return null;
 
   return (
     <Stack.Navigator mode="modal" headerMode="none" initialRouteName={initialRouteName}>
@@ -62,7 +62,7 @@ const Drawer = createDrawerNavigator();
 
 const Home = () => {
   const { isRTL } = useSelector<Store, LocaleReducer>(state => state.locale);
-  
+
   return (
     <>
       <Drawer.Navigator

src/components/Loading.tsx

@@ -1,7 +1,6 @@
 import React, { useEffect, useRef, useState, FunctionComponent } from 'react';
 import { View, StyleSheet } from 'react-native';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
 import { CardStyleInterpolators, createStackNavigator } from '@react-navigation/stack';
 import AsyncStorage from '@react-native-community/async-storage';
 import moment from 'moment';
@@ -20,7 +19,7 @@ import { purgeSamplesDB, startSampling } from '../services/SampleService';
 import { updateLocationsTimesToUTC } from '../services/LocationService';
 import { startForegroundTimer } from '../services/Tracker';
 import { clusterLocationsOnAppUpdate } from '../services/ClusteringService';
-import { addDataToBLEDB, initBLETracing, registerBLEListeners } from '../services/BLEService';
+import { initBLETracing, registerBLEListeners } from '../services/BLEService';
 import { IntersectionSickDatabase } from '../database/Database';
 import { initConfig } from '../config/config';
 import store from '../store';
@@ -82,19 +81,15 @@ const Loading : FunctionComponent<Props> = (
     showForceTerms,
     checkForceUpdate,
     termsVersion
-  } 
+  }
 ) => {
   const shouldShowForceTerms = useRef(false);
 
   const [initialRoute, setInitialRoute] = useState('');
 
   useEffect(() => {
-    // TODO remove once functionality implemented
-    addDataToBLEDB();
-
     registerBLEListeners();
     appLoadingActions();
-
   }, []);
 
   useEffect(() => {
@@ -172,9 +167,9 @@ const Loading : FunctionComponent<Props> = (
       }
 
       const dbSick = new IntersectionSickDatabase();
-      await dbSick.purgeIntersectionSickTable(moment().subtract(2, 'week').unix() * 1000)
+      await dbSick.purgeIntersectionSickTable(moment().subtract(2, 'week').unix() * 1000);
       const exposures = await dbSick.listAllRecords();
-      
+
       await store().dispatch(setExposures(exposures.map((exposure: any) => ({ properties: { ...exposure } }))));
 
       const firstPointTS = JSON.parse(await AsyncStorage.getItem(FIRST_POINT_TS) || 'false');