Improvement/Add-external-links (#947)

* Add new context and component folder refactor, adds external link component
* Prettify
* Fix factories

App.tsx

@@ -12,7 +12,7 @@ import {
   OnboardingProvider,
   determineIsOnboardingComplete,
 } from "./src/OnboardingContext"
-import { ConfigurationProvider } from "./src/ConfigurationContext"
+import { ConfigurationProvider } from "./src/configuration/configurationProvider";
 import { PermissionsProvider } from "./src/Device/PermissionsContext"
 import { initializei18next, loadUserLocale } from "./src/locales/languages"
 import Logger from "./src/logger"

example.env.bt

@@ -78,6 +78,9 @@ DISPLAY_DEBUG_MENU=false
 DISPLAY_COVID_DATA=false
 STATE_ABBREVIATION=
 COVID_ACT_NOW_API_KEY=
+EXTERNAL_COVID_DATA_LINK=https://google.com
+EXTERNAL_COVID_DATA_LABEL=Covid Data Label
+EXTERNAL_TRAVEL_GUIDENCE_LINK="https://maps.google.com
 
 // Age Verification
 DISPLAY_AGE_VERIFICATION=true

src/Activation/AcceptTermsOfService.spec.tsx

@@ -4,7 +4,7 @@ import { useNavigation } from "@react-navigation/native"
 import { Linking } from "react-native"
 
 import AcceptTermsOfService from "./AcceptTermsOfService"
-import { ConfigurationContext } from "../ConfigurationContext"
+import { ConfigurationContext } from "../configuration"
 import { factories } from "../factories"
 import { OnboardingProvider } from "../OnboardingContext"
 

src/Activation/AcceptTermsOfService.tsx

@@ -12,7 +12,7 @@ import { SvgXml } from "react-native-svg"
 import { Icons } from "../assets"
 import { Text } from "../components"
 import { useStatusBarEffect } from "../navigation"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 import { useActivationNavigation } from "./useActivationNavigation"
 
 import {

src/Activation/ProductAnalyticsConsentForm.tsx

@@ -8,7 +8,7 @@ import {
 } from "react-native"
 import { useTranslation } from "react-i18next"
 
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 import { useProductAnalyticsContext } from "../ProductAnalytics/Context"
 import { useStatusBarEffect } from "../navigation"
 import { useCustomCopy } from "../configuration/useCustomCopy"

src/Activation/useActivationNavigation.ts

@@ -1,7 +1,7 @@
 import { Platform } from "react-native"
 import { useNavigation } from "@react-navigation/native"
 
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 import {
   ENPermissionStatus,
   usePermissionsContext,

src/AffectedUserFlow/CodeInput/CodeInputForm.tsx

@@ -27,7 +27,7 @@ import {
   AffectedUserFlowStackScreens,
 } from "../../navigation"
 import Logger from "../../logger"
-import { useConfigurationContext } from "../../ConfigurationContext"
+import { useConfigurationContext } from "../../configuration"
 
 import {
   Spacing,

src/AffectedUserFlow/PublishConsent/PublishConsentScreen.tsx

@@ -6,7 +6,7 @@ import { useStatusBarEffect } from "../../navigation"
 import { useAffectedUserContext } from "../AffectedUserContext"
 import PublishConsentForm from "./PublishConsentForm"
 import { useExposureContext } from "../../ExposureContext"
-import { useConfigurationContext } from "../../ConfigurationContext"
+import { useConfigurationContext } from "../../configuration"
 
 import { Colors } from "../../styles"
 

src/AffectedUserFlow/Start.tsx

@@ -19,7 +19,7 @@ import { Text } from "../components"
 
 import { Spacing, Colors, Typography, Buttons, Iconography } from "../styles"
 import { Icons, Images } from "../assets"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 
 export const AffectedUserFlowIntro: FunctionComponent = () => {
   useStatusBarEffect("dark-content", Colors.background.primaryLight)

src/AffectedUserFlow/SymptomOnsetDate.tsx

@@ -17,7 +17,7 @@ import StaticSafeAreaInsets from "react-native-static-safe-area-insets"
 
 import { AffectedUserFlowStackScreens, useStatusBarEffect } from "../navigation"
 import { useAffectedUserContext } from "./AffectedUserContext"
-import Checkbox from "../components/Checkbox"
+import { CheckBox } from "../components"
 
 import { Buttons, Colors, Forms, Spacing, Typography } from "../styles"
 import { Icons } from "../assets"
@@ -131,14 +131,14 @@ const SymptomOnsetDate: FunctionComponent = () => {
             {t("export.symptom_onset.did_you_have_symptoms")}
           </Text>
           <View style={noSymptomsContainerStyle}>
-            <Checkbox
+            <CheckBox
               label={t("export.symptom_onset.no_i_didnt_have")}
               onPress={handleOnPressNoSymptoms}
               checked={Boolean(!localSymptomOnsetDate)}
             />
           </View>
           <View style={hasSymptomsContainerStyle}>
-            <Checkbox
+            <CheckBox
               label={t("export.symptom_onset.yes_i_did_have")}
               onPress={handleOnPressHasSymptoms}
               checked={Boolean(localSymptomOnsetDate)}

src/AffectedUserFlow/VerificationCodeInfo.tsx

@@ -7,7 +7,7 @@ import { SvgXml } from "react-native-svg"
 import env from "react-native-config"
 
 import { Text } from "../components"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 
 import { Spacing, Typography, Colors, Buttons } from "../styles"
 import { Icons } from "../assets"

src/CallEmergencyServices.tsx

@@ -9,7 +9,7 @@ import {
 import { useTranslation } from "react-i18next"
 import { SvgXml } from "react-native-svg"
 
-import { useConfigurationContext } from "./ConfigurationContext"
+import { useConfigurationContext } from "./configuration"
 import { Text } from "./components"
 
 import { Buttons, Colors, Iconography, Spacing, Typography } from "./styles"

src/Callback/Form.tsx

@@ -21,7 +21,7 @@ import { useCustomCopy } from "../configuration/useCustomCopy"
 import { LoadingIndicator, Text } from "../components"
 import * as API from "./callbackAPI"
 import Logger from "../logger"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 
 import { Spacing, Forms, Colors, Typography, Buttons } from "../styles"
 

src/CovidData/Context.spec.tsx

@@ -3,7 +3,7 @@ import { Text } from "react-native"
 import { render, waitFor } from "@testing-library/react-native"
 
 import { factories } from "../factories"
-import { ConfigurationContext } from "../ConfigurationContext"
+import { ConfigurationContext } from "../configuration"
 import { useCovidDataContext, CovidDataContextProvider } from "./Context"
 import { fetchStateTimeseries } from "./API/covidActNow"
 

src/CovidData/Context.tsx

@@ -6,7 +6,7 @@ import React, {
   useCallback,
   useContext,
 } from "react"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 
 import * as CovidData from "./covidData"
 import { fetchStateTimeseries, NetworkResponse } from "./API/covidActNow"

src/CovidData/Dashboard/index.tsx

@@ -9,7 +9,7 @@ import {
 import { useTranslation } from "react-i18next"
 import StaticSafeAreaInsets from "react-native-static-safe-area-insets"
 
-import { useConfigurationContext } from "../../ConfigurationContext"
+import { useConfigurationContext } from "../../configuration"
 import { Text } from "../../components"
 import { useCovidDataContext } from "../Context"
 import StateData from "./StateData"

src/CovidRecommendation.tsx

@@ -13,7 +13,7 @@ import { SvgXml } from "react-native-svg"
 
 import { useStatusBarEffect } from "./navigation"
 import { Text } from "./components"
-import { useConfigurationContext } from "./ConfigurationContext"
+import { useConfigurationContext } from "./configuration"
 
 import { Buttons, Colors, Spacing, Typography } from "./styles"
 import { Images, Icons } from "./assets"

src/EscrowVerification/Complete.tsx

@@ -14,7 +14,7 @@ import { SvgXml } from "react-native-svg"
 
 import { StatusBar, Text } from "../components"
 import { useStatusBarEffect, Stacks } from "../navigation"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 import Logger from "../logger"
 
 import { Images, Icons } from "../assets"

src/EscrowVerification/MoreInfo.tsx

@@ -12,7 +12,7 @@ import { useCustomCopy } from "../configuration/useCustomCopy"
 import { SvgXml } from "react-native-svg"
 
 import { Text } from "../components"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 
 import { Spacing, Typography, Colors, Buttons } from "../styles"
 import { Icons } from "../assets"

src/ExposureHistory/History/HasExposures.tsx

@@ -2,7 +2,7 @@ import React, { FunctionComponent } from "react"
 import { StyleSheet, View } from "react-native"
 import { useTranslation } from "react-i18next"
 
-import { useConfigurationContext } from "../../ConfigurationContext"
+import { useConfigurationContext } from "../../configuration"
 import { ExposureDatum } from "../../exposure"
 import ExposureListItem from "./ExposureListItem"
 import ExposureSummary from "./ExposureSummary"

src/ExposureHistory/History/NextSteps.tsx

@@ -12,7 +12,7 @@ import { useProductAnalyticsContext } from "../../ProductAnalytics/Context"
 
 import { Buttons, Colors, Spacing, Typography } from "../../styles"
 import { Icons } from "../../assets"
-import { useConfigurationContext } from "../../ConfigurationContext"
+import { useConfigurationContext } from "../../configuration"
 
 type Posix = number
 

src/ExposureHistory/History/NoExposures.spec.tsx

@@ -2,7 +2,7 @@ import React from "react"
 import { render, cleanup, fireEvent } from "@testing-library/react-native"
 import NoExposures from "./NoExposures"
 import { Linking } from "react-native"
-import { ConfigurationContext } from "../../ConfigurationContext"
+import { ConfigurationContext } from "../../configuration"
 import { factories } from "../../factories"
 
 afterEach(cleanup)

src/ExposureHistory/History/NoExposures.tsx

@@ -4,7 +4,7 @@ import { SvgXml } from "react-native-svg"
 import { useTranslation } from "react-i18next"
 
 import { Text } from "../../components"
-import { useConfigurationContext } from "../../ConfigurationContext"
+import { useConfigurationContext } from "../../configuration"
 
 import { Outlines, Colors, Typography, Spacing, Buttons } from "../../styles"
 import { Icons } from "../../assets"

src/Home/index.spec.tsx

@@ -7,7 +7,7 @@ import "@testing-library/jest-native/extend-expect"
 import Home from "./index"
 import { HomeStackScreens } from "../navigation"
 import { factories } from "../factories"
-import { ConfigurationContext } from "../ConfigurationContext"
+import { ConfigurationContext } from "../configuration"
 import { PermissionsContext } from "../Device/PermissionsContext"
 
 jest.mock("@react-navigation/native")

src/Home/index.tsx

@@ -20,7 +20,7 @@ import {
   EscrowVerificationRoutes,
   useStatusBarEffect,
 } from "../navigation"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 import { StatusBar, Text } from "../components"
 
 import CovidDataCard from "../CovidData/Card"
@@ -43,6 +43,7 @@ import {
   Iconography,
   Buttons,
 } from "../styles"
+import { ExternalLink } from "../components/ExternalLink"
 
 const IMAGE_HEIGHT = 170
 
@@ -57,6 +58,9 @@ const Home: FunctionComponent = () => {
     displaySelfAssessment,
     displaySymptomHistory,
     emergencyPhoneNumber,
+    externalCovidDataLink,
+    externalCovidDataLabel,
+    externalTravelGuidanceLink,
     healthAuthorityHealthCheckUrl,
     verificationStrategy,
   } = useConfigurationContext()
@@ -81,6 +85,22 @@ const Home: FunctionComponent = () => {
           <HealthCheckLink healthCheckUrl={healthAuthorityHealthCheckUrl} />
         )}
         {displayCovidDataWebView && <CovidDataWebViewLink />}
+        {externalCovidDataLink && (
+          <ExternalLink
+            icon={Icons.QuestionMark}
+            label={t("home.covid_data_specific", {
+              label: externalCovidDataLabel,
+            })}
+            link={externalCovidDataLink}
+          />
+        )}
+        {externalTravelGuidanceLink && (
+          <ExternalLink
+            icon={Icons.QuestionMark}
+            label={t("home.safe_travel_guidence")}
+            link={externalTravelGuidanceLink}
+          />
+        )}
         {appDownloadUrl && <ShareLink appDownloadUrl={appDownloadUrl} />}
         {env.VERIFICATION_CODE_INFO_URL && <FaqButton />}
         {displaySelfAssessment && <SelfAssessment />}

src/Onboarding/useOnboardingNavigation.tsx

@@ -1,6 +1,6 @@
 import { useNavigation } from "@react-navigation/native"
 
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 import {
   OnboardingRoutes,
   Stacks,

src/SelfAssessment/Guidance.tsx

@@ -13,7 +13,7 @@ import { SvgXml } from "react-native-svg"
 
 import { StatusBar, Text } from "../components"
 import { useSelfAssessmentContext } from "./Context"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 import { SymptomGroup } from "./selfAssessment"
 import { Stack, Stacks, useStatusBarEffect } from "../navigation"
 

src/SelfAssessment/SelfAssessmentIntro.tsx

@@ -14,7 +14,7 @@ import { SvgXml } from "react-native-svg"
 import { useCustomCopy } from "../configuration/useCustomCopy"
 import { SelfAssessmentStackScreens, useStatusBarEffect } from "../navigation"
 import { Text } from "../components"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 
 import { Icons, Images } from "../assets"
 import { Buttons, Colors, Outlines, Spacing, Typography } from "../styles"

src/Settings/DeleteConfirmation.tsx

@@ -13,7 +13,7 @@ import { showMessage } from "react-native-flash-message"
 import { useOnboardingContext } from "../OnboardingContext"
 import { useProductAnalyticsContext } from "../ProductAnalytics/Context"
 import { useSymptomHistoryContext } from "../SymptomHistory/SymptomHistoryContext"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 import { useApplicationName } from "../Device/useApplicationInfo"
 import { resetUserLocale } from "../locales/languages"
 

src/Settings/Legal.spec.tsx

@@ -6,7 +6,7 @@ import "@testing-library/jest-native/extend-expect"
 import { useNavigation, useFocusEffect } from "@react-navigation/native"
 
 import { useApplicationName } from "../Device/useApplicationInfo"
-import { ConfigurationContext } from "../ConfigurationContext"
+import { ConfigurationContext } from "../configuration"
 import { factories } from "../factories"
 import {
   loadAuthorityLinks,

src/Settings/Legal.tsx

@@ -3,7 +3,7 @@ import { ScrollView, StyleSheet } from "react-native"
 import { useTranslation } from "react-i18next"
 
 import { useApplicationName } from "../Device/useApplicationInfo"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 import ExternalLink from "./ExternalLink"
 import { useCustomCopy } from "../configuration/useCustomCopy"
 import {

src/Settings/ProductAnalyticsConsentScreen.tsx

@@ -9,7 +9,7 @@ import {
 import { useNavigation } from "@react-navigation/native"
 import { useTranslation } from "react-i18next"
 
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 import { useProductAnalyticsContext } from "../ProductAnalytics/Context"
 import { useStatusBarEffect } from "../navigation"
 import { useCustomCopy } from "../configuration/useCustomCopy"

src/Settings/index.tsx

@@ -12,7 +12,7 @@ import {
   SettingsStackScreens,
   HowItWorksStackScreens,
 } from "../navigation"
-import { useConfigurationContext } from "../ConfigurationContext"
+import { useConfigurationContext } from "../configuration"
 import { Text, ListItem, ListItemSeparator, StatusBar } from "../components"
 import { useApplicationInfo } from "../Device/useApplicationInfo"
 import ExternalLink from "../Settings/ExternalLink"

src/SymptomHistory/Form/SelectSymptoms.tsx

@@ -18,7 +18,7 @@ import {
   hasEmergencySymptoms,
   SymptomEntry,
 } from "../symptomHistory"
-import Checkbox from "../../components/Checkbox"
+import { CheckBox } from "../../components"
 
 import {
   Affordances,
@@ -117,7 +117,7 @@ const SelectSymptomsForm: FunctionComponent<SelectSymptomsFormProps> = ({
         <View style={style.symptomButtonsContainer}>
           {showNoSymptoms ? (
             <View style={style.noSymptomsCheckbox}>
-              <Checkbox
+              <CheckBox
                 key={"no_symptoms"}
                 label={t("symptom_history.no_symptoms")}
                 onPress={handleOnPressNoSymptoms}
@@ -128,7 +128,7 @@ const SelectSymptomsForm: FunctionComponent<SelectSymptomsFormProps> = ({
           {Symptom.all.map((symptom: Symptom.Symptom) => {
             const translation = Symptom.toTranslation(t, symptom)
             return (
-              <Checkbox
+              <CheckBox
                 key={symptom}
                 label={translation}
                 onPress={() => handleOnPressSymptom(symptom)}