Feature/proximity dates (#1562)

* changed the matching logic to just use the timestamp * remove header from proximity exposed details screen
cds-snc · May 3, 2021 · dc97dd1 · dc97dd1
1 parent 6a94c20
commit dc97dd1
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 37 deletions.
diff --git a/src/navigation/MainNavigator.tsx b/src/navigation/MainNavigator.tsx
@@ -80,7 +80,7 @@ export interface MainStackParamList extends Record<string, object | undefined> {
   Tutorial: undefined;
   QROnboard: undefined;
   RegionSelectExposedNoPT: {drawerMenu: boolean} | undefined;
-  RecentExposureScreen: {id: string; exposureType: ExposureType};
+  RecentExposureScreen: {timestamp: number; exposureType: ExposureType};
 }
 const LandingScreenWithNavBar = withDarkNav(LandingScreen);
 const HomeScreenWithNavBar = withDarkNav(HomeScreen);

diff --git a/src/screens/exposureHistory/ExposureHistoryScreen.tsx b/src/screens/exposureHistory/ExposureHistoryScreen.tsx
@@ -39,27 +39,25 @@ const toOutbreakExposureHistoryData = ({
 }): CombinedExposureHistoryData[] => {
   return history.map(outbreak => {
     return {
-      id: outbreak.locationId,
-      type: ExposureType.Outbreak,
+      exposureType: ExposureType.Outbreak,
       subtitle: severityText({severity: Number(outbreak.severity), i18n}),
       timestamp: outbreak.checkInTimestamp,
     };
   });
 };
 
 const toProximityExposureHistoryData = ({
-  history,
+  proximityExposureTimestamps,
   i18n,
 }: {
-  history: number[];
+  proximityExposureTimestamps: number[];
   i18n: I18n;
 }): CombinedExposureHistoryData[] => {
-  return history.map(outbreak => {
+  return proximityExposureTimestamps.map(timestamp => {
     return {
-      id: outbreak,
-      type: ExposureType.Proximity,
+      exposureType: ExposureType.Proximity,
       subtitle: i18n.translate('QRCode.ProximityExposure'),
-      timestamp: outbreak,
+      timestamp,
     };
   });
 };
@@ -74,10 +72,10 @@ export const ExposureHistoryScreen = () => {
   const outbreaks = useOutbreakService();
   const [clearExposedStatus] = useClearExposedStatus();
   const currentOutbreakHistory = getCurrentOutbreakHistory(outbreaks.outbreakHistory);
-  const proximityExposure = useExposureHistory();
+  const proximityExposureTimestamps = useExposureHistory();
   const mergedArray = [
     ...toOutbreakExposureHistoryData({history: currentOutbreakHistory, i18n}),
-    ...toProximityExposureHistoryData({history: proximityExposure, i18n}),
+    ...toProximityExposureHistoryData({proximityExposureTimestamps, i18n}),
   ];
   const clearProximityExposure = useCallback(() => {
     clearExposedStatus();

diff --git a/src/screens/exposureHistory/RecentExposureView.tsx b/src/screens/exposureHistory/RecentExposureView.tsx
@@ -15,15 +15,11 @@ type RecentExposureScreenProps = RouteProp<MainStackParamList, 'RecentExposureSc
 
 const ExposureView = () => {
   const route = useRoute<RecentExposureScreenProps>();
-  if (!route.params?.id || !route.params?.exposureType) {
-    return null;
-  }
-  const id = route.params.id;
   if (route.params.exposureType === ExposureType.Outbreak) {
-    return <OutbreakExposedView id={id} />;
+    return <OutbreakExposedView timestamp={route.params.timestamp} />;
   }
   if (route.params.exposureType === ExposureType.Proximity) {
-    return <ProximityExposureView />;
+    return <ProximityExposureView timestamp={route.params.timestamp} />;
   }
   return null;
 };

diff --git a/src/screens/exposureHistory/views/ExposureList.tsx b/src/screens/exposureHistory/views/ExposureList.tsx
@@ -11,7 +11,7 @@ export const ExposureList = ({exposureHistoryData}: {exposureHistoryData: Combin
   const dateLocale = i18n.locale === 'fr' ? 'fr-CA' : 'en-CA';
   const navigation = useNavigation();
   const onDetails = useCallback(
-    ({id, exposureType}) => navigation.navigate('RecentExposureScreen', {id, exposureType}),
+    ({timestamp, exposureType}) => navigation.navigate('RecentExposureScreen', {timestamp, exposureType}),
     [navigation],
   );
   exposureHistoryData.sort(function (first, second) {
@@ -28,14 +28,14 @@ export const ExposureList = ({exposureHistoryData}: {exposureHistoryData: Combin
                 <TouchableOpacity
                   style={styles.chevronIcon}
                   onPress={() => {
-                    onDetails({id: `${item.id}-${item.timestamp}`, exposureType: item.type});
+                    onDetails({timestamp: item.timestamp, exposureType: item.exposureType});
                   }}
                 >
                   <Box paddingVertical="m" style={styles.exposureList}>
                     <Box style={styles.typeIconBox}>
                       <Icon
                         size={20}
-                        name={item.type === ExposureType.Proximity ? 'exposure-proximity' : 'exposure-outbreak'}
+                        name={item.exposureType === ExposureType.Proximity ? 'exposure-proximity' : 'exposure-outbreak'}
                       />
                     </Box>
                     <Box style={styles.boxFlex}>

diff --git a/src/screens/home/views/ExposureDateView.tsx b/src/screens/home/views/ExposureDateView.tsx
@@ -7,7 +7,7 @@ import {ForceScreen} from 'shared/ForceScreen';
 import {useCachedStorage} from 'services/StorageService';
 import {log} from 'shared/logging/config';
 
-export const ExposureDateView = () => {
+export const ExposureDateView = ({timestamp}: {timestamp?: number}) => {
   const i18n = useI18n();
   const dateLocale = i18n.locale === 'fr' ? 'fr-CA' : 'en-CA';
   const {forceScreen} = useCachedStorage();
@@ -18,10 +18,13 @@ export const ExposureDateView = () => {
     if (forceScreen && forceScreen !== ForceScreen.None) {
       return [getCurrentDate()];
     }
+    if (timestamp) {
+      return [new Date(timestamp)];
+    }
     const _dates = exposureNotificationService.getExposureDetectedAt();
     log.debug({message: '_dates', payload: {_dates}});
     return _dates;
-  }, [exposureNotificationService, forceScreen]);
+  }, [exposureNotificationService, forceScreen, timestamp]);
 
   const formattedDates = dates.map(date => {
     return formatExposedDate(date, dateLocale);

diff --git a/src/screens/home/views/OutbreakExposedView.tsx b/src/screens/home/views/OutbreakExposedView.tsx
@@ -10,29 +10,25 @@ import {HomeScreenTitle} from '../components/HomeScreenTitle';
 
 import {NegativeOutbreakTestButton} from './ClearOutbreakExposureView';
 
-export const OutbreakExposedView = ({id}: {id?: string}) => {
+export const OutbreakExposedView = ({timestamp}: {timestamp?: number}) => {
   const i18n = useI18n();
   const {outbreakHistory} = useOutbreakService();
   const currentOutbreakHistory = getCurrentOutbreakHistory(outbreakHistory);
   const dateLocale = i18n.locale === 'fr' ? 'fr-CA' : 'en-CA';
 
   let historyItem: OutbreakHistoryItem = currentOutbreakHistory[0];
 
-  if (id) {
+  if (timestamp) {
     currentOutbreakHistory.forEach(item => {
-      if (item.outbreakId === id) {
+      if (item.checkInTimestamp === timestamp) {
         historyItem = item;
       }
     });
   }
 
   const severity = historyItem?.severity;
   const exposureDate = formatExposedDate(new Date(historyItem?.checkInTimestamp), dateLocale);
-  let props = {};
-
-  if (id) {
-    props = {header: false};
-  }
+  const props = timestamp ? {header: false} : {};
 
   return (
     <BaseHomeView iconName="hand-caution-yellow" testID="outbreakExposure" {...props}>

diff --git a/src/screens/home/views/ProximityExposureView.tsx b/src/screens/home/views/ProximityExposureView.tsx
@@ -19,7 +19,7 @@ const ActiveContent = ({text}: {text: string}) => {
   return <Text marginBottom="m">{text}</Text>;
 };
 
-const ExposureText = () => {
+const ExposureText = ({timestamp}: {timestamp?: number}) => {
   const {region} = useCachedStorage();
   const regionalI18n = useRegionalI18n();
   const regionActive = isRegionActive(region, regionalI18n.activeRegions);
@@ -32,7 +32,7 @@ const ExposureText = () => {
         <Text testID="bodyText" marginBottom="m">
           {i18n.translate('Home.ExposureDetected.Body1')}
         </Text>
-        <ExposureDateView />
+        <ExposureDateView timestamp={timestamp} />
       </RoundedBox>
 
       <RoundedBox isFirstBox={false}>
@@ -53,10 +53,11 @@ const ExposureText = () => {
   );
 };
 
-export const ProximityExposureView = () => {
+export const ProximityExposureView = ({timestamp}: {timestamp?: number}) => {
+  const props = timestamp ? {header: false} : {};
   return (
-    <BaseHomeView iconName="hand-caution" testID="exposure">
-      <ExposureText />
+    <BaseHomeView iconName="hand-caution" testID="exposure" {...props}>
+      <ExposureText timestamp={timestamp} />
     </BaseHomeView>
   );
 };
diff --git a/src/shared/qr.ts b/src/shared/qr.ts
@@ -61,9 +61,8 @@ export interface OutbreakHistoryItem {
 }
 
 export interface CombinedExposureHistoryData {
-  id?: string | number;
   timestamp: number;
-  type: ExposureType;
+  exposureType: ExposureType;
   subtitle: string;
 }