@hedia/recommendation-screen 1.8.2 → 2.0.2

package/src/__tests__/RecommendationScreen.test.tsx

@@ -1,31 +1,52 @@
-import { IRecommendationParams } from "@hedia/recommendation-calculator";
-import { ActivityIntensity } from "@hedia/recommendation-calculator/src/RecommendationCalculator";
-import { BloodGlucoseUnit, BloodKetonesUnit } from "@hedia/types";
+import {
+	Activity,
+	BloodGlucoseUnit,
+	BloodKetonesUnit,
+	BolusCalculator,
+	Languages,
+	Logbook,
+	Milliseconds,
+	UserSettings,
+} from "@hedia/types";
 import React from "react";
 import { AppStateEvent, AppStateStatus } from "react-native";
 import { cleanup, fireEvent, render } from "react-native-testing-library";
-import InvisibleNumberInput from "../components/InvisibleNumberInput";
 import { i18n } from "../locale/i18nUtils";
-import RecommendationScreen from "../RecommendationScreen";
+import RecommendationScreen, { IRecommendationProps } from "../RecommendationScreen";
 import {
-	ActivityEnum,
-	InjectionMethod,
-	Language,
-	Milliseconds,
-	MoodEnum,
+	HeaderTestIds,
+	LimitationMessageTestIds,
+	RecentInsulinTestIds,
+	RecommendationModalTestIds,
 	RecommendationReminders,
+	RecommendedCarbsTestIds,
+	RecommendedInsulinTestIds,
+	RemeasureTestIds,
+	TransferToLogbookTestIds,
+	TwoOptionModalTestIds,
 } from "../types/enum";
+import { IRecommendationParams } from "../types/types";
 import { Messages } from "../utils/AttentionMessages";
 import { LanguageError } from "../utils/RecommendationError";
+import { ActivityIntensityTranslations } from "../utils/Translations";
 import { Utils } from "../utils/Utils";
 import {
 	expectTextExists,
 	expectTextNotExists,
 	generateActivityProps,
 	generateDefaultCalculatorParams,
+	getIcon,
 	getRecommendationProps,
+	queryTextFromComponent,
 } from "./utils";
 
+const ActivityIntensity = Activity.Enums.ActivityIntensity;
+const ActivityEnum = Activity.Enums.ActivityEnum;
+const InjectionMethod = UserSettings.Enums.InjectionMethod;
+const MoodEnum = Logbook.Enums.MoodEnum;
+
+const { light, moderate, hard } = ActivityIntensity;
+
 interface IMockAppState {
 	addEventListener: jest.Mock;
 	removeEventListener(): void;
@@ -35,7 +56,7 @@ describe(`RecommendationScreen`, (): void => {
 	jest.useFakeTimers();
 
 	beforeEach((): void => {
-		i18n.activate(Language.en);
+		i18n.activate(Languages.en);
 		global.Date.now = (): number => 1;
 	});
 
@@ -53,11 +74,13 @@ describe(`RecommendationScreen`, (): void => {
 				insulinSensitivity: 5,
 				targetBGL: 7,
 				recentBoluses: [],
+				activity: null,
 			},
 			userReminder: 5,
 		});
 		const wrapper = render(<RecommendationScreen {...props} />);
-		const okButton = wrapper.queryByA11yLabel(`yesButtonModal`);
+		const okButton = wrapper.getByTestId(RecommendationModalTestIds.AcceptCarbs);
+
 		fireEvent(okButton, `onPress`);
 
 		expectTextExists(wrapper, `Food`);
@@ -76,7 +99,8 @@ describe(`RecommendationScreen`, (): void => {
 			},
 		});
 		const wrapper = render(<RecommendationScreen {...props} />);
-		const okButton = wrapper.queryByA11yLabel(`yesButtonModal`);
+		const okButton = wrapper.getByTestId(RecommendationModalTestIds.AcceptCarbs);
+
 		fireEvent(okButton, `onPress`);
 
 		expectTextExists(wrapper, `Food`);
@@ -85,7 +109,8 @@ describe(`RecommendationScreen`, (): void => {
 		expectTextExists(wrapper, `Remind me to remeasure in`);
 		expectTextExists(wrapper, `0.25`);
 
-		const textInput = wrapper.queryByA11yLabel(`InvisibleNumberInput`);
+		const textInput = wrapper.getByTestId(RecommendedCarbsTestIds.InvisibleCarbInput);
+
 		fireEvent(textInput, `onChangeText`, `85`);
 
 		expectTextNotExists(wrapper, `6`);
@@ -101,11 +126,13 @@ describe(`RecommendationScreen`, (): void => {
 				insulinSensitivity: 5,
 				targetBGL: 7,
 				recentBoluses: [],
+				activity: null,
 			},
 			userReminder: 6,
 		});
 		const wrapper = render(<RecommendationScreen {...props} />);
-		const okayButton = wrapper.queryByA11yLabel(`okayButtonModal`);
+		const okayButton = wrapper.getByTestId(RecommendationModalTestIds.OkButton);
+
 		fireEvent(okayButton, `onPress`);
 
 		expectTextExists(wrapper, `Food`);
@@ -123,6 +150,7 @@ describe(`RecommendationScreen`, (): void => {
 				insulinSensitivity: 5,
 				targetBGL: 7,
 				recentBoluses: [],
+				activity: null,
 			},
 		});
 		const wrapper = render(<RecommendationScreen {...props} />);
@@ -141,18 +169,20 @@ describe(`RecommendationScreen`, (): void => {
 				insulinSensitivity: 5,
 				targetBGL: 7,
 				recentBoluses: [],
+				activity: null,
 			},
 		});
 		const wrapper = render(<RecommendationScreen {...props} />);
 
-		const okButton = wrapper.queryByA11yLabel(`yesButtonModal`);
+		const okButton = wrapper.getByTestId(RecommendationModalTestIds.AcceptCarbs);
+
 		fireEvent(okButton, `onPress`);
 
 		expectTextExists(wrapper, `Food`);
 		expectTextExists(wrapper, `Additional`);
 		expectTextExists(wrapper, `1`);
 
-		const removeButton = wrapper.queryByA11yLabel(`removeRecommendedCarbs`);
+		const removeButton = wrapper.getByTestId(RecommendedCarbsTestIds.RemoveRecommendation);
 
 		fireEvent(removeButton, `onPress`);
 
@@ -165,7 +195,8 @@ describe(`RecommendationScreen`, (): void => {
 		const wrapper = render(<RecommendationScreen {...props} />);
 
 		expectTextExists(wrapper, `hours`);
-		const slider = wrapper.queryByA11yLabel(`remeasureSlider`);
+		const slider = wrapper.getByTestId(RemeasureTestIds.RemeasureSlider);
+
 		fireEvent(slider, `onValueChange`, 3.2);
 		expectTextExists(wrapper, `3.2`);
 		expectTextExists(wrapper, `hours`);
@@ -176,7 +207,8 @@ describe(`RecommendationScreen`, (): void => {
 		const wrapper = render(<RecommendationScreen {...props} />);
 
 		expectTextExists(wrapper, `hours`);
-		const slider = wrapper.queryByA11yLabel(`remeasureSlider`);
+		const slider = wrapper.getByTestId(RemeasureTestIds.RemeasureSlider);
+
 		fireEvent(slider, `onValueChange`, 0);
 		expectTextExists(wrapper, `OFF`);
 		expectTextNotExists(wrapper, `hours`);
@@ -193,7 +225,8 @@ describe(`RecommendationScreen`, (): void => {
 
 		expect(props.onRecentInsulinYes).not.toBeCalled();
 		expectTextExists(wrapper, `Recommended amount of insulin`);
-		const button = wrapper.queryByText(`Yes`);
+		const button = wrapper.getByTestId(RecentInsulinTestIds.Yes);
+
 		fireEvent(button, `onPress`);
 		expectTextExists(wrapper, `Recommended amount of insulin`);
 		expect(props.onRecentInsulinYes).toBeCalled();
@@ -209,7 +242,8 @@ describe(`RecommendationScreen`, (): void => {
 		const wrapper = render(<RecommendationScreen {...props} />);
 
 		expectTextExists(wrapper, `Have you taken insulin within the last 4 hours?`);
-		const button = wrapper.queryByText(`No`);
+		const button = wrapper.getByTestId(RecentInsulinTestIds.No);
+
 		fireEvent(button, `onPress`);
 
 		expectTextNotExists(wrapper, `Have you taken insulin within the last 4 hours?`);
@@ -221,33 +255,32 @@ describe(`RecommendationScreen`, (): void => {
 		const props = getRecommendationProps();
 		const wrapper = render(<RecommendationScreen {...props} />);
 
-		const getIcon = (name: string, active: boolean): void => wrapper.queryByA11yLabel(`${name}_${active}`);
-
 		const neutral = MoodEnum[MoodEnum.Neutral];
 
-		expect(getIcon(neutral, false)).not.toBeNull();
-		fireEvent(getIcon(neutral, false), `onPress`);
+		const icon = getIcon(wrapper, neutral, false);
+
+		if (icon === null) {
+			return fail(`No icon found for queryByA11yLabel: ${neutral}_${false}`);
+		}
 
-		expect(getIcon(neutral, false)).toBeNull();
-		expect(getIcon(neutral, true)).not.toBeNull();
+		fireEvent(icon, `onPress`);
+
+		expect(getIcon(wrapper, neutral, false)).toBeNull();
+		expect(getIcon(wrapper, neutral, true)).not.toBeNull();
 	});
 
 	test(`Updating carb recommendation & transfer`, (): void => {
 		const result: {
-			carbs: {
-				entered?: number;
+			carbs?: {
+				entered: number | null;
 				suggested: number;
 			};
-			insulin: {
-				entered?: number;
+			insulin?: {
+				entered?: number | null;
 				suggested: number;
 			};
-			reminder: number;
-		} = {
-			carbs: null,
-			insulin: null,
-			reminder: null,
-		};
+			reminder?: number;
+		} = {};
 
 		const props = getRecommendationProps({
 			calculatorParams: {
@@ -257,6 +290,7 @@ describe(`RecommendationScreen`, (): void => {
 				insulinSensitivity: 5,
 				targetBGL: 7,
 				recentBoluses: [],
+				activity: null,
 			},
 			transferToLogbook: jest.fn((carbs, insulin, reminder): void => {
 				result.carbs = carbs;
@@ -270,63 +304,59 @@ describe(`RecommendationScreen`, (): void => {
 			suggested: 1,
 		};
 		const insulinExpected = {
-			entered: undefined,
+			entered: null,
 			suggested: 0,
 		};
 
 		const wrapper = render(<RecommendationScreen {...props} />);
 
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.EnteredCarbs)).toBe(`25`);
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.RecommendedCarbs)).toBe(`1`);
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.TotalCarbs)).toBe(`26`);
 		// Expect text from carbs -> change -> Expect text updated -> Transfer -> Expect callback
-		expectTextExists(wrapper, `1`);
 
-		const carbInput = wrapper.UNSAFE_queryByType(InvisibleNumberInput);
-		expect(carbInput).not.toBeNull();
+		const carbInput = wrapper.getByTestId(RecommendedCarbsTestIds.InvisibleCarbInput);
 
 		// Input 3 into the carbs field
 		fireEvent(carbInput, `onEnd`, carbsExpected.entered);
 
-		// Expect text updated
-		expectTextNotExists(wrapper, `1`);
-		expectTextExists(wrapper, `3`);
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.EnteredCarbs)).toBe(`25`);
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.RecommendedCarbs)).toBe(`3`);
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.TotalCarbs)).toBe(`28`);
 
 		// To make the transfer button visible we need to press the "no" option
 		expectTextNotExists(wrapper, `Transfer to logbook`);
-		const noButton = wrapper.queryByText(`No`);
-		expect(noButton).not.toBeNull();
+		const noButton = wrapper.getByTestId(RecentInsulinTestIds.No);
 
 		fireEvent(noButton, `onPress`);
+
 		expectTextExists(wrapper, `Transfer to logbook`);
 
-		const transfer = wrapper.queryByA11yLabel(`transferToLogbook`);
-		expect(transfer).not.toBeNull();
+		const transfer = wrapper.getByTestId(TransferToLogbookTestIds.TransferButton);
 
 		// Press transfer
 		fireEvent(transfer, `onPress`);
 
 		expect(props.transferToLogbook).toBeCalled();
-		expect(result.carbs.entered).toBeCloseTo(carbsExpected.entered, 1);
-		expect(result.carbs.suggested).toBeCloseTo(carbsExpected.suggested, 1);
-		expect(result.insulin.entered).toBe(insulinExpected.entered);
-		expect(result.insulin.suggested).toBeCloseTo(insulinExpected.suggested, 1);
+		expect(result.carbs?.entered).toBeCloseTo(carbsExpected.entered, 1);
+		expect(result.carbs?.suggested).toBeCloseTo(carbsExpected.suggested, 1);
+		expect(result.insulin?.entered).toBe(insulinExpected.entered);
+		expect(result.insulin?.suggested).toBeCloseTo(insulinExpected.suggested, 1);
 		expect(result.reminder).toBe(RecommendationReminders.Reminder15Minutes);
 	});
 
 	test(`Removing carb recommendation still returns suggested in transfer`, (): void => {
 		const result: {
-			carbs: {
-				entered?: number;
+			carbs?: {
+				entered: number | null;
 				suggested: number;
 			};
-			insulin: {
-				entered?: number;
+			insulin?: {
+				entered: number | null;
 				suggested: number;
 			};
-			reminder: number;
-		} = {
-			carbs: null,
-			insulin: null,
-			reminder: null,
-		};
+			reminder?: number;
+		} = {};
 
 		const props = getRecommendationProps({
 			calculatorParams: {
@@ -336,6 +366,7 @@ describe(`RecommendationScreen`, (): void => {
 				insulinSensitivity: 5,
 				targetBGL: 7,
 				recentBoluses: [],
+				activity: null,
 			},
 			transferToLogbook: jest.fn((carbs, insulin, reminder): void => {
 				result.carbs = carbs;
@@ -349,7 +380,7 @@ describe(`RecommendationScreen`, (): void => {
 			suggested: 1,
 		};
 		const insulinExpected = {
-			entered: undefined,
+			entered: null,
 			suggested: 0,
 		};
 
@@ -358,8 +389,7 @@ describe(`RecommendationScreen`, (): void => {
 		// Expect text from carbs -> change -> Expect text updated -> Transfer -> Expect callback
 		expectTextExists(wrapper, `1`);
 
-		const removeButton = wrapper.getByA11yLabel(`removeRecommendedCarbs`);
-		expect(removeButton).not.toBeNull();
+		const removeButton = wrapper.getByTestId(RecommendedCarbsTestIds.RemoveRecommendation);
 
 		// Input 3 into the carbs field
 		fireEvent(removeButton, `onPress`);
@@ -369,23 +399,21 @@ describe(`RecommendationScreen`, (): void => {
 
 		// To make the transfer button visible we need to press the "no" option
 		expectTextNotExists(wrapper, `Transfer to logbook`);
-		const noButton = wrapper.queryByText(`No`);
-		expect(noButton).not.toBeNull();
+		const noButton = wrapper.getByTestId(RecentInsulinTestIds.No);
 
 		fireEvent(noButton, `onPress`);
 		expectTextExists(wrapper, `Transfer to logbook`);
 
-		const transfer = wrapper.queryByA11yLabel(`transferToLogbook`);
-		expect(transfer).not.toBeNull();
+		const transfer = wrapper.getByTestId(TransferToLogbookTestIds.TransferButton);
 
 		// Press transfer
 		fireEvent(transfer, `onPress`);
 
 		expect(props.transferToLogbook).toBeCalled();
-		expect(result.carbs.entered).toBe(carbsExpected.entered);
-		expect(result.carbs.suggested).toBeCloseTo(carbsExpected.suggested, 1);
-		expect(result.insulin.entered).toBe(insulinExpected.entered);
-		expect(result.insulin.suggested).toBeCloseTo(insulinExpected.suggested, 1);
+		expect(result.carbs!.entered).toBe(carbsExpected.entered);
+		expect(result.carbs!.suggested).toBeCloseTo(carbsExpected.suggested, 1);
+		expect(result.insulin!.entered).toBe(insulinExpected.entered);
+		expect(result.insulin!.suggested).toBeCloseTo(insulinExpected.suggested, 1);
 		expect(result.reminder).toBe(RecommendationReminders.Reminder15Minutes);
 	});
 
@@ -420,13 +448,14 @@ describe(`RecommendationScreen`, (): void => {
 				insulinSensitivity: 5,
 				targetBGL: 7,
 				recentBoluses: [],
+				activity: null,
 			},
 			userReminder: 3,
 			injectionMethod: InjectionMethod.Pump,
 		});
 
 		const carbsExpected = {
-			entered: undefined,
+			entered: null,
 			suggested: 0,
 		};
 		const insulinExpected = {
@@ -441,13 +470,12 @@ describe(`RecommendationScreen`, (): void => {
 
 		expectTextNotExists(wrapper, `Transfer to logbook`);
 
-		const noButton = wrapper.queryByText(`No`);
-		expect(noButton).not.toBeNull();
+		const noButton = wrapper.getByTestId(RecentInsulinTestIds.No);
 
 		fireEvent(noButton, `onPress`);
 		expectTextExists(wrapper, `Transfer to logbook`);
 
-		const insulinInput = wrapper.UNSAFE_queryByType(InvisibleNumberInput);
+		const insulinInput = wrapper.getByTestId(RecommendedInsulinTestIds.InvisibleInsulinInput);
 
 		// Input 7 into the insulin field
 		fireEvent(insulinInput, `onEnd`, insulinExpected.entered);
@@ -457,8 +485,7 @@ describe(`RecommendationScreen`, (): void => {
 
 		expectTextExists(wrapper, `${insulinExpected.entered}`);
 
-		const transfer = wrapper.queryByA11yLabel(`transferToLogbook`);
-		expect(transfer).not.toBeNull();
+		const transfer = wrapper.getByTestId(TransferToLogbookTestIds.TransferButton);
 
 		// Press transfer
 		fireEvent(transfer, `onPress`);
@@ -481,13 +508,14 @@ describe(`RecommendationScreen`, (): void => {
 				insulinSensitivity: 5,
 				targetBGL: 7,
 				recentBoluses: [],
+				activity: null,
 			},
 			userReminder: 3,
 			injectionMethod: InjectionMethod.Pump,
 		});
 
 		const carbsExpected = {
-			entered: undefined,
+			entered: null,
 			suggested: 0,
 		};
 		const insulinExpected = {
@@ -499,15 +527,17 @@ describe(`RecommendationScreen`, (): void => {
 		const wrapper = render(<RecommendationScreen {...props} />);
 
 		// Answer "No" to recent insulin
-		const noButton = wrapper.queryByText(`No`);
-		expect(noButton).not.toBeNull();
+		const noButton = wrapper.getByTestId(RecentInsulinTestIds.No);
+
 		fireEvent(noButton, `onPress`);
 
 		// Verify initial insulin suggestion matches expected
 		expectTextExists(wrapper, `${insulinExpected.suggested}`);
 
 		// Type invalid value - 300 - on insulinInput
-		const insulinInput = wrapper.UNSAFE_queryByType(InvisibleNumberInput);
+
+		const insulinInput = wrapper.getByTestId(RecommendedInsulinTestIds.InvisibleInsulinInput);
+
 		fireEvent(insulinInput, `onEnd`, invalidInsulin);
 
 		// After onEnd event, verify the invalid entered value doesn't exist.
@@ -517,8 +547,8 @@ describe(`RecommendationScreen`, (): void => {
 		expectTextExists(wrapper, `${insulinExpected.suggested}`);
 
 		// Press transfer to logbook button
-		const transfer = wrapper.queryByA11yLabel(`transferToLogbook`);
-		expect(transfer).not.toBeNull();
+		const transfer = wrapper.getByTestId(TransferToLogbookTestIds.TransferButton);
+
 		fireEvent(transfer, `onPress`);
 
 		// Verify the transferred data
@@ -540,20 +570,19 @@ describe(`RecommendationScreen`, (): void => {
 				insulinSensitivity: 5,
 				targetBGL: 7,
 				recentBoluses: [],
+				activity: null,
 			},
 		});
 
 		const wrapper = render(<RecommendationScreen {...props} />);
 
 		// Expect text from insulin -> change -> Expect text updated -> Transfer -> Expect callback
-		const noButton = wrapper.queryByText(`No`);
-		expect(noButton).not.toBeNull();
+		const noButton = wrapper.getByTestId(RecentInsulinTestIds.No);
 
 		fireEvent(noButton, `onPress`);
 		expectTextExists(wrapper, `Transfer to logbook`);
 
-		const slider = wrapper.queryByA11yLabel(`remeasureSlider`);
-		expect(slider).not.toBeNull();
+		const slider = wrapper.getByTestId(RemeasureTestIds.RemeasureSlider);
 
 		// Input 2.5 in remeasure slider
 		fireEvent(slider, `onValueChange`, 2.5);
@@ -562,23 +591,27 @@ describe(`RecommendationScreen`, (): void => {
 		expectTextNotExists(wrapper, `1.5`);
 		expectTextExists(wrapper, `2.5`);
 
-		const getIcon = (name: string, active: boolean): void => wrapper.queryByA11yLabel(`${name}_${active}`);
 		const sad = MoodEnum[MoodEnum.Sad];
-		expect(getIcon(sad, false)).not.toBeNull();
-		fireEvent(getIcon(sad, false), `onPress`);
 
-		const transfer = wrapper.queryByA11yLabel(`transferToLogbook`);
-		expect(transfer).not.toBeNull();
+		const icon = getIcon(wrapper, sad, false);
+
+		if (icon === null) {
+			return fail(`Could not find icon from queryByA11yLabel: ${sad}_${false}`);
+		}
+
+		fireEvent(icon, `onPress`);
+
+		const transfer = wrapper.getByTestId(TransferToLogbookTestIds.TransferButton);
 
 		// Press transfer
 		fireEvent(transfer, `onPress`);
 
 		const carbsExpected = {
-			entered: undefined,
+			entered: null,
 			suggested: 0,
 		};
 		const insulinExpected = {
-			entered: undefined,
+			entered: null,
 			suggested: 2,
 		};
 
@@ -592,16 +625,16 @@ describe(`RecommendationScreen`, (): void => {
 	});
 
 	test.each`
-		locale         | text
-		${Language.da} | ${`INSULIN\nANBEFALING`}
-		${Language.en} | ${`INSULIN\nRECOMMENDATION`}
-		${Language.de} | ${`INSULIN\nEMPFEHLUNG`}
-		${Language.es} | ${`RECOMENDACIÓN\nDE INSULINA`}
-		${Language.it} | ${`PRESCRIZIONE DI\nINSULINA`}
-		${Language.fr} | ${`RECOMMANDATION\nD’INSULINE`}
+		locale          | text
+		${Languages.da} | ${`INSULIN\nANBEFALING`}
+		${Languages.en} | ${`INSULIN\nRECOMMENDATION`}
+		${Languages.de} | ${`INSULIN\nEMPFEHLUNG`}
+		${Languages.es} | ${`RECOMENDACIÓN\nDE INSULINA`}
+		${Languages.it} | ${`PRESCRIZIONE DI\nINSULINA`}
+		${Languages.fr} | ${`RECOMMANDATION\nD’INSULINE`}
 	`(
 		`Language props determine language shown; $locale`,
-		({ locale, text }: { locale: Language; text: string }): void => {
+		({ locale, text }: { locale: Languages; text: string }): void => {
 			const props = getRecommendationProps({
 				language: locale,
 			});
@@ -615,25 +648,36 @@ describe(`RecommendationScreen`, (): void => {
 	test(`Error is thrown when passing an unsupported language`, (): void => {
 		const props = getRecommendationProps();
 
-		const wrapper = render(<RecommendationScreen {...props} language={`INVALID_LANGUAGE` as Language} />);
+		const wrapper = render(<RecommendationScreen {...props} language={`INVALID_LANGUAGE` as Languages} />);
 		expectTextNotExists(wrapper, `INSULIN\nRECOMMENDATION`);
 		expect(props.onError).toBeCalledWith(LanguageError());
 	});
+	test(`Error is thrown when passing an unsupported activity settings`, (): void => {
+		const props: IRecommendationProps = getRecommendationProps({
+			calculatorParams: {
+				...generateDefaultCalculatorParams(),
+				activity: { ...generateActivityProps(), activityIntensity: hard, activityDuration: 46 },
+			},
+		});
+
+		render(<RecommendationScreen {...props} />);
+		expect(props.onError).toBeCalledWith(new Error(BolusCalculator.Enums.ActivityErrors.InvalidInterval));
+	});
 
 	interface IChangeLanguageProps {
-		initialLocale: Language;
-		locale: Language;
+		initialLocale: Languages;
+		locale: Languages;
 		initialText: string;
 		text: string;
 	}
 	test.each`
-		initialLocale  | locale         | initialText                     | text
-		${Language.en} | ${Language.da} | ${`INSULIN\nRECOMMENDATION`}    | ${`INSULIN\nANBEFALING`}
-		${Language.da} | ${Language.de} | ${`INSULIN\nANBEFALING`}        | ${`INSULIN\nEMPFEHLUNG`}
-		${Language.de} | ${Language.es} | ${`INSULIN\nEMPFEHLUNG`}        | ${`RECOMENDACIÓN\nDE INSULINA`}
-		${Language.es} | ${Language.it} | ${`RECOMENDACIÓN\nDE INSULINA`} | ${`PRESCRIZIONE DI\nINSULINA`}
-		${Language.it} | ${Language.fr} | ${`PRESCRIZIONE DI\nINSULINA`}  | ${`RECOMMANDATION\nD’INSULINE`}
-		${Language.fr} | ${Language.en} | ${`RECOMMANDATION\nD’INSULINE`} | ${`INSULIN\nRECOMMENDATION`}
+		initialLocale   | locale          | initialText                     | text
+		${Languages.en} | ${Languages.da} | ${`INSULIN\nRECOMMENDATION`}    | ${`INSULIN\nANBEFALING`}
+		${Languages.da} | ${Languages.de} | ${`INSULIN\nANBEFALING`}        | ${`INSULIN\nEMPFEHLUNG`}
+		${Languages.de} | ${Languages.es} | ${`INSULIN\nEMPFEHLUNG`}        | ${`RECOMENDACIÓN\nDE INSULINA`}
+		${Languages.es} | ${Languages.it} | ${`RECOMENDACIÓN\nDE INSULINA`} | ${`PRESCRIZIONE DI\nINSULINA`}
+		${Languages.it} | ${Languages.fr} | ${`PRESCRIZIONE DI\nINSULINA`}  | ${`RECOMMANDATION\nD’INSULINE`}
+		${Languages.fr} | ${Languages.en} | ${`RECOMMANDATION\nD’INSULINE`} | ${`INSULIN\nRECOMMENDATION`}
 	`(
 		`Changing language changes header text; initial-language:$initialLocale to changed-language:$locale`,
 		({ initialLocale, locale, initialText, text }: IChangeLanguageProps): void => {
@@ -667,7 +711,8 @@ describe(`RecommendationScreen`, (): void => {
 			calculatorParams: {
 				...getRecommendationProps().calculatorParams,
 				currentBGL: 8,
-				recentBoluses: null,
+				targetBGL: 8,
+				recentBoluses: [],
 			},
 		});
 		const wrapper = render(<RecommendationScreen {...props} />);
@@ -680,16 +725,19 @@ describe(`RecommendationScreen`, (): void => {
 			...getRecommendationProps({
 				calculatorParams: {
 					...getRecommendationProps().calculatorParams,
+					// @ts-ignore
 					currentBGL: null,
 				},
 			}),
 			currentBKL: null,
 		};
+		// @ts-ignore
 		const wrapper = render(<RecommendationScreen {...props} />);
 
 		expectTextExists(wrapper, /2\./);
 		expect(wrapper.queryAllByText(`-.-`)).toHaveLength(2);
 	});
+
 	test(`InfoBars displays bgl and ketones  in mg/dL`, (): void => {
 		const props = getRecommendationProps({
 			calculatorParams: {
@@ -707,6 +755,7 @@ describe(`RecommendationScreen`, (): void => {
 		expectTextExists(wrapper, `${bglMGDL}`);
 		expectTextExists(wrapper, `${bklMGDL}`);
 	});
+
 	test(`InfoBars displays negative level currentBKL as 0`, (): void => {
 		const props = getRecommendationProps({
 			calculatorParams: {
@@ -730,19 +779,20 @@ describe(`RecommendationScreen`, (): void => {
 		const wrapper = render(<RecommendationScreen {...props} />);
 
 		expectTextExists(wrapper, `INSULIN\nRECOMMENDATION`);
-		expectTextExists(wrapper, `0`);
+		const shownInsulin = queryTextFromComponent(wrapper, RecommendedInsulinTestIds.ShownInsulinText);
+		expect(shownInsulin).toBe(`0`);
 	});
 
 	test.each`
-		intensity                     | translation
-		${ActivityIntensity.Light}    | ${`Let`}
-		${ActivityIntensity.Moderate} | ${`Moderat`}
-		${ActivityIntensity.Hard}     | ${`Hård`}
+		intensity   | translation
+		${light}    | ${`Let`}
+		${moderate} | ${`Moderat`}
+		${hard}     | ${`Hård`}
 	`(
 		`Activity screen is displayed and intensity: $intensity can be translated`,
-		({ intensity, translation }: { intensity: ActivityIntensity; translation: string }): void => {
+		({ intensity, translation }: { intensity: Activity.Enums.ActivityIntensity; translation: string }): void => {
 			const props = getRecommendationProps({
-				activityDisplayProps: { activityType: ActivityEnum.Run },
+				activityDisplayProps: { activityType: ActivityEnum.Run, activityTitle: null },
 				calculatorParams: {
 					...getRecommendationProps().calculatorParams,
 					activity: {
@@ -753,14 +803,16 @@ describe(`RecommendationScreen`, (): void => {
 			});
 			const wrapper = render(<RecommendationScreen {...props} />);
 
-			expectTextExists(wrapper, intensity);
+			const englishText = ActivityIntensityTranslations[intensity]();
+
+			expectTextExists(wrapper, englishText);
 			expectTextNotExists(wrapper, translation);
 
-			i18n.activate(Language.da);
+			i18n.activate(Languages.da);
 			wrapper.rerender(<RecommendationScreen {...props} />);
 
 			expectTextExists(wrapper, translation);
-			expectTextNotExists(wrapper, intensity);
+			expectTextNotExists(wrapper, englishText);
 		},
 	);
 
@@ -774,29 +826,43 @@ describe(`RecommendationScreen`, (): void => {
 				insulinSensitivity: 0.3,
 				targetBGL: 8.3,
 				recentBoluses: [],
+				activity: null,
 			},
 			userReminder: 5,
 			carbRecommendationAnswer,
 		});
+
+		// Render the screen, expecting a carb recommendation modal.
 		const wrapper = render(<RecommendationScreen {...props} />);
 		expectTextExists(wrapper, `We recommend eating an additional:`);
-		const yesButton = wrapper.queryByA11yLabel(`yesButtonModal`);
+
+		// Get the yes button from the modal
+		const yesButton = wrapper.getByTestId(RecommendationModalTestIds.AcceptCarbs);
+
 		fireEvent(yesButton, `onPress`);
 		expect(carbRecommendationAnswer).toBeCalledWith(true);
 		expectTextExists(wrapper, `Additional`);
-		expectTextExists(wrapper, `1`);
 
-		const carbInput = wrapper.UNSAFE_queryByType(InvisibleNumberInput);
-		expect(carbInput).not.toBeNull();
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.EnteredCarbs)).toBe(`1`);
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.RecommendedCarbs)).toBe(`3`);
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.TotalCarbs)).toBe(`4`);
+
+		const carbInput = wrapper.getByTestId(RecommendedCarbsTestIds.InvisibleCarbInput);
+
+		const manualCarbInput = 299;
 
 		// Input 299 into the carbs field
-		fireEvent(carbInput, `onEnd`, 299);
-		expectTextExists(wrapper, `299`);
+		fireEvent(carbInput, `onEnd`, manualCarbInput);
+
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.EnteredCarbs)).toBe(`1`);
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.RecommendedCarbs)).toBe(`299`);
+		expect(queryTextFromComponent(wrapper, RecommendedCarbsTestIds.TotalCarbs)).toBe(`300`);
+
 		// Expect text from limitation message after recalculation
 		expectTextExists(wrapper, `${Messages.RecommendationWasLimited()}`);
 
-		const nextButton = wrapper.queryByA11yLabel(`nextButtonModal`);
-		expect(nextButton).not.toBeNull();
+		const nextButton = wrapper.getByTestId(LimitationMessageTestIds.OkButton);
+
 		fireEvent(nextButton, `onPress`);
 		expectTextNotExists(wrapper, `${Messages.RecommendationWasLimited()}`);
 	});
@@ -813,12 +879,15 @@ describe(`Recommendation Screen - RecommendationModal related tests`, (): void =
 				insulinSensitivity: 5,
 				targetBGL: 7,
 				recentBoluses: [],
+				activity: null,
 			},
 			userReminder: 5,
 			carbRecommendationAnswer,
 		});
 		const wrapper = render(<RecommendationScreen {...props} />);
-		const noButton = wrapper.queryByA11yLabel(`noButtonModal`);
+
+		const noButton = wrapper.getByTestId(RecommendationModalTestIds.DeclineCarbs);
+
 		fireEvent(noButton, `onPress`);
 
 		expect(carbRecommendationAnswer).toBeCalledWith(false);
@@ -836,13 +905,16 @@ describe(`Recommendation Screen - RecommendationModal related tests`, (): void =
 				insulinSensitivity: 5,
 				targetBGL: 7,
 				recentBoluses: [],
+				activity: null,
 			},
 			userReminder: 5,
 			carbRecommendationAnswer,
 		});
 		const wrapper = render(<RecommendationScreen {...props} />);
 		expectTextExists(wrapper, `We recommend eating an additional:`);
-		const yesButton = wrapper.queryByA11yLabel(`yesButtonModal`);
+
+		const yesButton = wrapper.getByTestId(RecommendationModalTestIds.AcceptCarbs);
+
 		fireEvent(yesButton, `onPress`);
 		expect(carbRecommendationAnswer).toBeCalledWith(true);
 		expectTextExists(wrapper, `Food`);
@@ -864,9 +936,12 @@ describe(`Recommendation Screen - RecommendationModal related tests`, (): void =
 			userReminder: 5,
 		});
 		const wrapper = render(<RecommendationScreen {...props} />);
-		const nextButton = wrapper.queryByA11yLabel(`nextButtonModal`);
+		const nextButton = wrapper.getByTestId(LimitationMessageTestIds.OkButton);
+
 		fireEvent(nextButton, `onPress`);
-		const yesButton = wrapper.queryByA11yLabel(`okayButtonModal`);
+
+		const yesButton = wrapper.getByTestId(RecommendationModalTestIds.OkButton);
+
 		fireEvent(yesButton, `onPress`);
 		expectTextExists(wrapper, `Food`);
 		expectTextNotExists(wrapper, `Additional`);
@@ -881,11 +956,13 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 		const wrapper = render(<RecommendationScreen {...props} />);
 
 		//press exit button
-		const exitButton = wrapper.queryByA11yLabel(`exitButton`);
+		const exitButton = wrapper.getByTestId(HeaderTestIds.ExitCalculation);
+
 		fireEvent(exitButton, `onPress`);
 		expect(props.showBolusBar).toBeCalledWith(false);
 
-		const saveToLogbookModalButton = wrapper.queryByA11yLabel(`firstOptionButton`);
+		const saveToLogbookModalButton = wrapper.getByTestId(TwoOptionModalTestIds.FirstOption);
+
 		fireEvent(saveToLogbookModalButton, `onPress`);
 		expect(props.transferToLogbook).toBeCalled();
 
@@ -898,11 +975,13 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 		const wrapper = render(<RecommendationScreen {...props} />);
 
 		//press exit button
-		const exitButton = wrapper.queryByA11yLabel(`exitButton`);
+		const exitButton = wrapper.getByTestId(HeaderTestIds.ExitCalculation);
+
 		fireEvent(exitButton, `onPress`);
 		expect(props.showBolusBar).toBeCalledWith(false);
 
-		const closeCalculation = wrapper.queryByA11yLabel(`secondOptionButton`);
+		const closeCalculation = wrapper.getByTestId(TwoOptionModalTestIds.SecondOption);
+
 		fireEvent(closeCalculation, `onPress`);
 		expect(props.closeCalculationCallback).toBeCalled();
 
@@ -916,7 +995,8 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 		});
 		const wrapper = render(<RecommendationScreen {...props} />);
 
-		const exitButton = wrapper.queryByA11yLabel(`exitButton`);
+		const exitButton = wrapper.getByTestId(HeaderTestIds.ExitCalculation);
+
 		fireEvent(exitButton, `onPress`);
 		expectTextExists(wrapper, `Have you taken insulin within the last 4 hours?`);
 		expect(props.showBolusBar).not.toBeCalled();
@@ -927,13 +1007,15 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 		const props = getRecommendationProps();
 		const wrapper = render(<RecommendationScreen {...props} />);
 
-		const exitButton = wrapper.queryByA11yLabel(`exitButton`);
+		const exitButton = wrapper.getByTestId(HeaderTestIds.ExitCalculation);
+
 		fireEvent(exitButton, `onPress`);
 		expect(props.showBolusBar).toBeCalledWith(false);
 		expectTextExists(wrapper, `Save to logbook`);
 		expectTextExists(wrapper, `Close calculation`);
 
-		const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+		const modalExitIcon = wrapper.getByTestId(TwoOptionModalTestIds.ExitButton);
+
 		fireEvent(modalExitIcon, `onPress`);
 		expect(props.showBolusBar).toBeCalledWith(true);
 		expectTextNotExists(wrapper, `Save to logbook`);
@@ -941,11 +1023,12 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 	});
 
 	test(`Can translate ExitModal option`, (): void => {
-		const props = getRecommendationProps({ language: Language.da });
+		const props = getRecommendationProps({ language: Languages.da });
 		const wrapper = render(<RecommendationScreen {...props} />);
 
 		//press exit button
-		const exitButton = wrapper.queryByA11yLabel(`exitButton`);
+		const exitButton = wrapper.getByTestId(HeaderTestIds.ExitCalculation);
+
 		fireEvent(exitButton, `onPress`);
 		expect(props.showBolusBar).toBeCalledWith(false);
 
@@ -963,7 +1046,8 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 
 		jest.runAllTimers();
 		expect(props.onError).not.toBeCalled();
-		const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+
+		const modalExitIcon = wrapper.queryByTestId(TwoOptionModalTestIds.ExitButton);
 		expect(modalExitIcon).toBeNull();
 		expect(props.showBolusBar).toBeCalledWith(false);
 
@@ -971,12 +1055,13 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 		expectTextExists(wrapper, `Yes, save to logbook`);
 		expectTextExists(wrapper, `No, return to dashboard`);
 
-		i18n.activate(Language.da);
+		i18n.activate(Languages.da);
 		wrapper.rerender(<RecommendationScreen {...props} />);
 		jest.runAllTimers();
 		expectTextExists(wrapper, `Der er gået mere end 15 minutter siden udregningen blev startet.`);
 
-		const saveToLogbook = wrapper.queryByA11yLabel(`firstOptionButton`);
+		const saveToLogbook = wrapper.getByTestId(TwoOptionModalTestIds.FirstOption);
+
 		fireEvent(saveToLogbook, `onPress`);
 		expect(props.transferToLogbook).toBeCalled();
 	});
@@ -989,7 +1074,8 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 
 		jest.runAllTimers();
 		expect(props.onError).not.toBeCalled();
-		const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+
+		const modalExitIcon = wrapper.queryByTestId(TwoOptionModalTestIds.ExitButton);
 		expect(modalExitIcon).toBeNull();
 		expect(props.showBolusBar).toBeCalledWith(false);
 
@@ -997,7 +1083,8 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 		expectTextExists(wrapper, `Yes, save to logbook`);
 		expectTextExists(wrapper, `No, return to dashboard`);
 
-		const returnToDashboard = wrapper.queryByA11yLabel(`secondOptionButton`);
+		const returnToDashboard = wrapper.getByTestId(TwoOptionModalTestIds.SecondOption);
+
 		fireEvent(returnToDashboard, `onPress`);
 		expect(props.closeCalculationCallback).toBeCalled();
 	});
@@ -1013,7 +1100,8 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 
 		jest.runAllTimers();
 		expect(props.onError).not.toBeCalled();
-		const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+
+		const modalExitIcon = wrapper.queryByTestId(TwoOptionModalTestIds.ExitButton);
 		expect(modalExitIcon).toBeNull();
 		expect(props.showBolusBar).toBeCalledWith(false);
 
@@ -1021,7 +1109,8 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 		expectTextExists(wrapper, `Start new calculation`);
 		expectTextExists(wrapper, `Return to dashboard`);
 
-		const returnToDashboard = wrapper.queryByA11yLabel(`secondOptionButton`);
+		const returnToDashboard = wrapper.getByTestId(TwoOptionModalTestIds.SecondOption);
+
 		fireEvent(returnToDashboard, `onPress`);
 		expect(props.closeCalculationCallback).toBeCalled();
 
@@ -1040,7 +1129,8 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 
 		jest.runAllTimers();
 		expect(props.onError).not.toBeCalled();
-		const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+
+		const modalExitIcon = wrapper.queryByTestId(TwoOptionModalTestIds.ExitButton);
 		expect(modalExitIcon).toBeNull();
 		expect(props.showBolusBar).toBeCalledWith(false);
 
@@ -1048,12 +1138,13 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 		expectTextExists(wrapper, `Start new calculation`);
 		expectTextExists(wrapper, `Return to dashboard`);
 
-		i18n.activate(Language.da);
+		i18n.activate(Languages.da);
 		wrapper.rerender(<RecommendationScreen {...props} />);
 		jest.runAllTimers();
 		expectTextExists(wrapper, `Der er gået mere end 15 minutter siden udregningen blev startet.`);
 
-		const returnToDashboard = wrapper.queryByA11yLabel(`firstOptionButton`);
+		const returnToDashboard = wrapper.getByTestId(TwoOptionModalTestIds.FirstOption);
+
 		fireEvent(returnToDashboard, `onPress`);
 		expect(props.restartCalculation).toBeCalled();
 
@@ -1081,22 +1172,27 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 		);
 
 		const wrapper = render(<RecommendationScreen {...props} />);
-		appStateListener(`active`);
+		// @ts-ignore
+		appStateListener?.(`active`);
 		// Run twice to test else path
 		global.Date.now = (): number => new Date().getTime() + Milliseconds.Minute * 14;
-		appStateListener(`active`);
+		// @ts-ignore
+		appStateListener?.(`active`);
 
 		wrapper.rerender(<RecommendationScreen {...props} />);
 		expect(props.showBolusBar).not.toBeCalledWith(false);
 		expectTextNotExists(wrapper, `No, return to dashboard`);
 
 		global.Date.now = (): number => new Date().getTime() + Milliseconds.Minute * 15;
+		// @ts-ignore
 		appStateListener(`active`);
 
 		wrapper.rerender(<RecommendationScreen {...props} />);
 		expect(props.showBolusBar).toBeCalledWith(false);
 		expectTextExists(wrapper, `No, return to dashboard`);
-		const closeModalButton = wrapper.queryByText(`No, return to dashboard`);
+
+		const closeModalButton = wrapper.getByTestId(TwoOptionModalTestIds.SecondOption);
+
 		fireEvent(closeModalButton, `secondOption`);
 
 		wrapper.rerender(<RecommendationScreen {...props} />);
@@ -1126,6 +1222,7 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, (): void => {
 		);
 
 		const rendered = render(<RecommendationScreen {...props} />);
+		// @ts-ignore
 		appStateListener(`NotAnAppStateStatus` as AppStateStatus);
 		rendered.rerender(<RecommendationScreen {...props} />);
 		expect(props.showBolusBar).not.toBeCalled();