Merge pull request #100 from cds-snc/bluetooth-en-work

Fixes for Bluetooth enable / EN enable flow
cds-snc · Jun 22, 2020 · abc3d97 · abc3d97
2 parents ba3c8e8 + 8ff48fc
commit abc3d97
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/src/components/InfoBlock.tsx b/src/components/InfoBlock.tsx
@@ -17,6 +17,7 @@ export interface InfoBlockProps {
     text: string;
     action: () => void;
   };
+  showButton?: boolean;
 }
 
 export const InfoBlock = ({
@@ -27,6 +28,7 @@ export const InfoBlock = ({
   backgroundColor,
   title,
   titleBolded,
+  showButton,
 }: InfoBlockProps) => {
   return (
     <Box borderRadius={10} backgroundColor={backgroundColor} padding="m" alignItems="flex-start">
@@ -58,9 +60,15 @@ export const InfoBlock = ({
       <Text variant="bodyText" fontSize={16} color={color} marginBottom="m">
         {text}
       </Text>
-      <Box marginHorizontal="none" alignSelf="stretch">
-        <Button text={buttonText} onPress={action} variant="bigFlat" color={color} />
-      </Box>
+      {showButton ? (
+        <Box marginHorizontal="none" alignSelf="stretch">
+          <Button text={buttonText} onPress={action} variant="bigFlat" color={color} />
+        </Box>
+      ) : null}
     </Box>
   );
 };
+
+InfoBlock.defaultProps = {
+  showButton: true,
+};
diff --git a/src/screens/home/views/BluetoothDisabledView.tsx b/src/screens/home/views/BluetoothDisabledView.tsx
@@ -11,10 +11,10 @@ export const BluetoothDisabledView = () => {
       <Box marginBottom="l">
         <Icon name="icon-bluetooth-disabled" size={44} />
       </Box>
-      <Text textAlign="center" variant="bodyTitle" color="bodyText" marginBottom="l" accessibilityRole="header">
+      <Text variant="bodyTitle" color="bodyText" marginBottom="l" accessibilityRole="header">
         {i18n.translate('Home.BluetoothDisabled')}
       </Text>
-      <Text variant="bodyText" color="bodyText" textAlign="center">
+      <Text variant="bodyText" color="bodyText" marginBottom="l">
         {i18n.translate('Home.EnableBluetoothCTA')}
       </Text>
     </BaseHomeView>

diff --git a/src/screens/home/views/OverlayView.tsx b/src/screens/home/views/OverlayView.tsx
@@ -2,32 +2,30 @@ import React, {useCallback} from 'react';
 import {useNavigation} from '@react-navigation/native';
 import {Box, InfoBlock, BoxProps} from 'components';
 import {useI18n, I18n} from '@shopify/react-i18n';
-import {SystemStatus, useStartExposureNotificationService} from 'services/ExposureNotificationService';
+import {SystemStatus} from 'services/ExposureNotificationService';
+import {Linking} from 'react-native';
 
 import {InfoShareView} from './InfoShareView';
 import {StatusHeaderView} from './StatusHeaderView';
 
 const SystemStatusOff = ({i18n}: {i18n: I18n}) => {
-  const startExposureNotificationService = useStartExposureNotificationService();
-
-  const enableExposureNotifications = useCallback(() => {
-    startExposureNotificationService();
-  }, [startExposureNotificationService]);
+  const toSettings = useCallback(() => {
+    Linking.openSettings();
+  }, []);
 
   return (
     <InfoBlock
       icon="icon-exposure-notifications-off"
       title={i18n.translate('OverlayOpen.ExposureNotificationCardStatus')}
       titleBolded={i18n.translate('OverlayOpen.ExposureNotificationCardStatusOff')}
       text={i18n.translate('OverlayOpen.ExposureNotificationCardBody')}
-      button={{text: i18n.translate('OverlayOpen.ExposureNotificationCardAction'), action: enableExposureNotifications}}
+      button={{text: i18n.translate('OverlayOpen.ExposureNotificationCardAction'), action: toSettings}}
       backgroundColor="errorBackground"
       color="errorText"
     />
   );
 };
 
-/*
 const BluetoothStatusOff = ({i18n}: {i18n: I18n}) => {
   const toSettings = useCallback(() => {
     Linking.openSettings();
@@ -41,10 +39,10 @@ const BluetoothStatusOff = ({i18n}: {i18n: I18n}) => {
       button={{text: i18n.translate('OverlayOpen.BluetoothCardAction'), action: toSettings}}
       backgroundColor="errorBackground"
       color="errorText"
+      showButton={false}
     />
   );
 };
-*/
 
 const NotificationStatusOff = ({action, i18n}: {action: () => void; i18n: I18n}) => {
   return (
@@ -75,16 +73,16 @@ export const OverlayView = ({status, notificationWarning, turnNotificationsOn, m
       <Box marginBottom="l">
         <StatusHeaderView enabled={status === SystemStatus.Active} />
       </Box>
-      {status !== SystemStatus.Active && (
+      {(status === SystemStatus.Disabled || status === SystemStatus.Restricted) && (
         <Box marginBottom="m" marginHorizontal="m">
           <SystemStatusOff i18n={i18n} />
         </Box>
       )}
-      {/* {status !== SystemStatus.Active && (
+      {status === SystemStatus.BluetoothOff && (
         <Box marginBottom="m" marginHorizontal="m">
           <BluetoothStatusOff i18n={i18n} />
         </Box>
-      )}*/}
+      )}
       {notificationWarning && (
         <Box marginBottom="m" marginHorizontal="m">
           <NotificationStatusOff action={turnNotificationsOn} i18n={i18n} />