@hedia/recommendation-screen 1.8.2 → 2.0.2

package/src/__tests__/RecommendationScreen.test.jsx

@@ -3,22 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const RecommendationCalculator_1 = require("@hedia/recommendation-calculator/src/RecommendationCalculator");
 const types_1 = require("@hedia/types");
 const react_1 = __importDefault(require("react"));
 const react_native_testing_library_1 = require("react-native-testing-library");
-const InvisibleNumberInput_1 = __importDefault(require("../components/InvisibleNumberInput"));
 const i18nUtils_1 = require("../locale/i18nUtils");
 const RecommendationScreen_1 = __importDefault(require("../RecommendationScreen"));
 const enum_1 = require("../types/enum");
 const AttentionMessages_1 = require("../utils/AttentionMessages");
 const RecommendationError_1 = require("../utils/RecommendationError");
+const Translations_1 = require("../utils/Translations");
 const Utils_1 = require("../utils/Utils");
 const utils_1 = require("./utils");
+const ActivityIntensity = types_1.Activity.Enums.ActivityIntensity;
+const ActivityEnum = types_1.Activity.Enums.ActivityEnum;
+const InjectionMethod = types_1.UserSettings.Enums.InjectionMethod;
+const MoodEnum = types_1.Logbook.Enums.MoodEnum;
+const { light, moderate, hard } = ActivityIntensity;
 describe(`RecommendationScreen`, () => {
     jest.useFakeTimers();
     beforeEach(() => {
-        i18nUtils_1.i18n.activate(enum_1.Language.en);
+        i18nUtils_1.i18n.activate(types_1.Languages.en);
         global.Date.now = () => 1;
     });
     afterEach(() => {
@@ -34,11 +38,12 @@ describe(`RecommendationScreen`, () => {
                 insulinSensitivity: 5,
                 targetBGL: 7,
                 recentBoluses: [],
+                activity: null,
             },
             userReminder: 5,
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
-        const okButton = wrapper.queryByA11yLabel(`yesButtonModal`);
+        const okButton = wrapper.getByTestId(enum_1.RecommendationModalTestIds.AcceptCarbs);
         react_native_testing_library_1.fireEvent(okButton, `onPress`);
         utils_1.expectTextExists(wrapper, `Food`);
         utils_1.expectTextExists(wrapper, `Additional`);
@@ -55,14 +60,14 @@ describe(`RecommendationScreen`, () => {
             },
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
-        const okButton = wrapper.queryByA11yLabel(`yesButtonModal`);
+        const okButton = wrapper.getByTestId(enum_1.RecommendationModalTestIds.AcceptCarbs);
         react_native_testing_library_1.fireEvent(okButton, `onPress`);
         utils_1.expectTextExists(wrapper, `Food`);
         utils_1.expectTextExists(wrapper, `Additional`);
         utils_1.expectTextExists(wrapper, `5`);
         utils_1.expectTextExists(wrapper, `Remind me to remeasure in`);
         utils_1.expectTextExists(wrapper, `0.25`);
-        const textInput = wrapper.queryByA11yLabel(`InvisibleNumberInput`);
+        const textInput = wrapper.getByTestId(enum_1.RecommendedCarbsTestIds.InvisibleCarbInput);
         react_native_testing_library_1.fireEvent(textInput, `onChangeText`, `85`);
         utils_1.expectTextNotExists(wrapper, `6`);
         utils_1.expectTextExists(wrapper, `85`);
@@ -76,11 +81,12 @@ describe(`RecommendationScreen`, () => {
                 insulinSensitivity: 5,
                 targetBGL: 7,
                 recentBoluses: [],
+                activity: null,
             },
             userReminder: 6,
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
-        const okayButton = wrapper.queryByA11yLabel(`okayButtonModal`);
+        const okayButton = wrapper.getByTestId(enum_1.RecommendationModalTestIds.OkButton);
         react_native_testing_library_1.fireEvent(okayButton, `onPress`);
         utils_1.expectTextExists(wrapper, `Food`);
         utils_1.expectTextNotExists(wrapper, `Additional`);
@@ -96,6 +102,7 @@ describe(`RecommendationScreen`, () => {
                 insulinSensitivity: 5,
                 targetBGL: 7,
                 recentBoluses: [],
+                activity: null,
             },
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
@@ -112,15 +119,16 @@ describe(`RecommendationScreen`, () => {
                 insulinSensitivity: 5,
                 targetBGL: 7,
                 recentBoluses: [],
+                activity: null,
             },
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
-        const okButton = wrapper.queryByA11yLabel(`yesButtonModal`);
+        const okButton = wrapper.getByTestId(enum_1.RecommendationModalTestIds.AcceptCarbs);
         react_native_testing_library_1.fireEvent(okButton, `onPress`);
         utils_1.expectTextExists(wrapper, `Food`);
         utils_1.expectTextExists(wrapper, `Additional`);
         utils_1.expectTextExists(wrapper, `1`);
-        const removeButton = wrapper.queryByA11yLabel(`removeRecommendedCarbs`);
+        const removeButton = wrapper.getByTestId(enum_1.RecommendedCarbsTestIds.RemoveRecommendation);
         react_native_testing_library_1.fireEvent(removeButton, `onPress`);
         utils_1.expectTextNotExists(wrapper, `Additional`);
         utils_1.expectTextNotExists(wrapper, `1`);
@@ -129,7 +137,7 @@ describe(`RecommendationScreen`, () => {
         const props = utils_1.getRecommendationProps();
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         utils_1.expectTextExists(wrapper, `hours`);
-        const slider = wrapper.queryByA11yLabel(`remeasureSlider`);
+        const slider = wrapper.getByTestId(enum_1.RemeasureTestIds.RemeasureSlider);
         react_native_testing_library_1.fireEvent(slider, `onValueChange`, 3.2);
         utils_1.expectTextExists(wrapper, `3.2`);
         utils_1.expectTextExists(wrapper, `hours`);
@@ -138,7 +146,7 @@ describe(`RecommendationScreen`, () => {
         const props = utils_1.getRecommendationProps();
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         utils_1.expectTextExists(wrapper, `hours`);
-        const slider = wrapper.queryByA11yLabel(`remeasureSlider`);
+        const slider = wrapper.getByTestId(enum_1.RemeasureTestIds.RemeasureSlider);
         react_native_testing_library_1.fireEvent(slider, `onValueChange`, 0);
         utils_1.expectTextExists(wrapper, `OFF`);
         utils_1.expectTextNotExists(wrapper, `hours`);
@@ -153,7 +161,7 @@ describe(`RecommendationScreen`, () => {
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         expect(props.onRecentInsulinYes).not.toBeCalled();
         utils_1.expectTextExists(wrapper, `Recommended amount of insulin`);
-        const button = wrapper.queryByText(`Yes`);
+        const button = wrapper.getByTestId(enum_1.RecentInsulinTestIds.Yes);
         react_native_testing_library_1.fireEvent(button, `onPress`);
         utils_1.expectTextExists(wrapper, `Recommended amount of insulin`);
         expect(props.onRecentInsulinYes).toBeCalled();
@@ -167,7 +175,7 @@ describe(`RecommendationScreen`, () => {
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         utils_1.expectTextExists(wrapper, `Have you taken insulin within the last 4 hours?`);
-        const button = wrapper.queryByText(`No`);
+        const button = wrapper.getByTestId(enum_1.RecentInsulinTestIds.No);
         react_native_testing_library_1.fireEvent(button, `onPress`);
         utils_1.expectTextNotExists(wrapper, `Have you taken insulin within the last 4 hours?`);
         utils_1.expectTextExists(wrapper, `Recommended amount of insulin`);
@@ -176,19 +184,17 @@ describe(`RecommendationScreen`, () => {
     test(`Selecting neutral will set neutral to active`, () => {
         const props = utils_1.getRecommendationProps();
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
-        const getIcon = (name, active) => wrapper.queryByA11yLabel(`${name}_${active}`);
-        const neutral = enum_1.MoodEnum[enum_1.MoodEnum.Neutral];
-        expect(getIcon(neutral, false)).not.toBeNull();
-        react_native_testing_library_1.fireEvent(getIcon(neutral, false), `onPress`);
-        expect(getIcon(neutral, false)).toBeNull();
-        expect(getIcon(neutral, true)).not.toBeNull();
+        const neutral = MoodEnum[MoodEnum.Neutral];
+        const icon = utils_1.getIcon(wrapper, neutral, false);
+        if (icon === null) {
+            return fail(`No icon found for queryByA11yLabel: ${neutral}_${false}`);
+        }
+        react_native_testing_library_1.fireEvent(icon, `onPress`);
+        expect(utils_1.getIcon(wrapper, neutral, false)).toBeNull();
+        expect(utils_1.getIcon(wrapper, neutral, true)).not.toBeNull();
     });
     test(`Updating carb recommendation & transfer`, () => {
-        const result = {
-            carbs: null,
-            insulin: null,
-            reminder: null,
-        };
+        const result = {};
         const props = utils_1.getRecommendationProps({
             calculatorParams: {
                 currentBGL: 1.1,
@@ -197,6 +203,7 @@ describe(`RecommendationScreen`, () => {
                 insulinSensitivity: 5,
                 targetBGL: 7,
                 recentBoluses: [],
+                activity: null,
             },
             transferToLogbook: jest.fn((carbs, insulin, reminder) => {
                 result.carbs = carbs;
@@ -209,42 +216,37 @@ describe(`RecommendationScreen`, () => {
             suggested: 1,
         };
         const insulinExpected = {
-            entered: undefined,
+            entered: null,
             suggested: 0,
         };
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.EnteredCarbs)).toBe(`25`);
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.RecommendedCarbs)).toBe(`1`);
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.TotalCarbs)).toBe(`26`);
         // Expect text from carbs -> change -> Expect text updated -> Transfer -> Expect callback
-        utils_1.expectTextExists(wrapper, `1`);
-        const carbInput = wrapper.UNSAFE_queryByType(InvisibleNumberInput_1.default);
-        expect(carbInput).not.toBeNull();
+        const carbInput = wrapper.getByTestId(enum_1.RecommendedCarbsTestIds.InvisibleCarbInput);
         // Input 3 into the carbs field
         react_native_testing_library_1.fireEvent(carbInput, `onEnd`, carbsExpected.entered);
-        // Expect text updated
-        utils_1.expectTextNotExists(wrapper, `1`);
-        utils_1.expectTextExists(wrapper, `3`);
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.EnteredCarbs)).toBe(`25`);
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.RecommendedCarbs)).toBe(`3`);
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.TotalCarbs)).toBe(`28`);
         // To make the transfer button visible we need to press the "no" option
         utils_1.expectTextNotExists(wrapper, `Transfer to logbook`);
-        const noButton = wrapper.queryByText(`No`);
-        expect(noButton).not.toBeNull();
+        const noButton = wrapper.getByTestId(enum_1.RecentInsulinTestIds.No);
         react_native_testing_library_1.fireEvent(noButton, `onPress`);
         utils_1.expectTextExists(wrapper, `Transfer to logbook`);
-        const transfer = wrapper.queryByA11yLabel(`transferToLogbook`);
-        expect(transfer).not.toBeNull();
+        const transfer = wrapper.getByTestId(enum_1.TransferToLogbookTestIds.TransferButton);
         // Press transfer
         react_native_testing_library_1.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(enum_1.RecommendationReminders.Reminder15Minutes);
     });
     test(`Removing carb recommendation still returns suggested in transfer`, () => {
-        const result = {
-            carbs: null,
-            insulin: null,
-            reminder: null,
-        };
+        const result = {};
         const props = utils_1.getRecommendationProps({
             calculatorParams: {
                 currentBGL: 1.1,
@@ -253,6 +255,7 @@ describe(`RecommendationScreen`, () => {
                 insulinSensitivity: 5,
                 targetBGL: 7,
                 recentBoluses: [],
+                activity: null,
             },
             transferToLogbook: jest.fn((carbs, insulin, reminder) => {
                 result.carbs = carbs;
@@ -265,26 +268,23 @@ describe(`RecommendationScreen`, () => {
             suggested: 1,
         };
         const insulinExpected = {
-            entered: undefined,
+            entered: null,
             suggested: 0,
         };
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         // Expect text from carbs -> change -> Expect text updated -> Transfer -> Expect callback
         utils_1.expectTextExists(wrapper, `1`);
-        const removeButton = wrapper.getByA11yLabel(`removeRecommendedCarbs`);
-        expect(removeButton).not.toBeNull();
+        const removeButton = wrapper.getByTestId(enum_1.RecommendedCarbsTestIds.RemoveRecommendation);
         // Input 3 into the carbs field
         react_native_testing_library_1.fireEvent(removeButton, `onPress`);
         // Expect text updated
         utils_1.expectTextNotExists(wrapper, `1`);
         // To make the transfer button visible we need to press the "no" option
         utils_1.expectTextNotExists(wrapper, `Transfer to logbook`);
-        const noButton = wrapper.queryByText(`No`);
-        expect(noButton).not.toBeNull();
+        const noButton = wrapper.getByTestId(enum_1.RecentInsulinTestIds.No);
         react_native_testing_library_1.fireEvent(noButton, `onPress`);
         utils_1.expectTextExists(wrapper, `Transfer to logbook`);
-        const transfer = wrapper.queryByA11yLabel(`transferToLogbook`);
-        expect(transfer).not.toBeNull();
+        const transfer = wrapper.getByTestId(enum_1.TransferToLogbookTestIds.TransferButton);
         // Press transfer
         react_native_testing_library_1.fireEvent(transfer, `onPress`);
         expect(props.transferToLogbook).toBeCalled();
@@ -320,12 +320,13 @@ describe(`RecommendationScreen`, () => {
                 insulinSensitivity: 5,
                 targetBGL: 7,
                 recentBoluses: [],
+                activity: null,
             },
             userReminder: 3,
-            injectionMethod: enum_1.InjectionMethod.Pump,
+            injectionMethod: InjectionMethod.Pump,
         });
         const carbsExpected = {
-            entered: undefined,
+            entered: null,
             suggested: 0,
         };
         const insulinExpected = {
@@ -336,18 +337,16 @@ describe(`RecommendationScreen`, () => {
         // Expect text from insulin -> change -> Expect text updated -> Transfer -> Expect callback
         utils_1.expectTextNotExists(wrapper, `Additional`);
         utils_1.expectTextNotExists(wrapper, `Transfer to logbook`);
-        const noButton = wrapper.queryByText(`No`);
-        expect(noButton).not.toBeNull();
+        const noButton = wrapper.getByTestId(enum_1.RecentInsulinTestIds.No);
         react_native_testing_library_1.fireEvent(noButton, `onPress`);
         utils_1.expectTextExists(wrapper, `Transfer to logbook`);
-        const insulinInput = wrapper.UNSAFE_queryByType(InvisibleNumberInput_1.default);
+        const insulinInput = wrapper.getByTestId(enum_1.RecommendedInsulinTestIds.InvisibleInsulinInput);
         // Input 7 into the insulin field
         react_native_testing_library_1.fireEvent(insulinInput, `onEnd`, insulinExpected.entered);
         // Expect text updated
         utils_1.expectTextNotExists(wrapper, `${insulinExpected.suggested}`);
         utils_1.expectTextExists(wrapper, `${insulinExpected.entered}`);
-        const transfer = wrapper.queryByA11yLabel(`transferToLogbook`);
-        expect(transfer).not.toBeNull();
+        const transfer = wrapper.getByTestId(enum_1.TransferToLogbookTestIds.TransferButton);
         // Press transfer
         react_native_testing_library_1.fireEvent(transfer, `onPress`);
         expect(props.transferToLogbook).toBeCalledWith(carbsExpected, insulinExpected, 3, new Date(global.Date.now()), null);
@@ -361,12 +360,13 @@ describe(`RecommendationScreen`, () => {
                 insulinSensitivity: 5,
                 targetBGL: 7,
                 recentBoluses: [],
+                activity: null,
             },
             userReminder: 3,
-            injectionMethod: enum_1.InjectionMethod.Pump,
+            injectionMethod: InjectionMethod.Pump,
         });
         const carbsExpected = {
-            entered: undefined,
+            entered: null,
             suggested: 0,
         };
         const insulinExpected = {
@@ -376,21 +376,19 @@ describe(`RecommendationScreen`, () => {
         const invalidInsulin = 300;
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         // Answer "No" to recent insulin
-        const noButton = wrapper.queryByText(`No`);
-        expect(noButton).not.toBeNull();
+        const noButton = wrapper.getByTestId(enum_1.RecentInsulinTestIds.No);
         react_native_testing_library_1.fireEvent(noButton, `onPress`);
         // Verify initial insulin suggestion matches expected
         utils_1.expectTextExists(wrapper, `${insulinExpected.suggested}`);
         // Type invalid value - 300 - on insulinInput
-        const insulinInput = wrapper.UNSAFE_queryByType(InvisibleNumberInput_1.default);
+        const insulinInput = wrapper.getByTestId(enum_1.RecommendedInsulinTestIds.InvisibleInsulinInput);
         react_native_testing_library_1.fireEvent(insulinInput, `onEnd`, invalidInsulin);
         // After onEnd event, verify the invalid entered value doesn't exist.
         utils_1.expectTextNotExists(wrapper, `${invalidInsulin}`);
         // Value has been reset to initial suggestion
         utils_1.expectTextExists(wrapper, `${insulinExpected.suggested}`);
         // Press transfer to logbook button
-        const transfer = wrapper.queryByA11yLabel(`transferToLogbook`);
-        expect(transfer).not.toBeNull();
+        const transfer = wrapper.getByTestId(enum_1.TransferToLogbookTestIds.TransferButton);
         react_native_testing_library_1.fireEvent(transfer, `onPress`);
         // Verify the transferred data
         expect(props.transferToLogbook).toBeCalledWith(carbsExpected, insulinExpected, 3, new Date(global.Date.now()), null);
@@ -404,47 +402,47 @@ describe(`RecommendationScreen`, () => {
                 insulinSensitivity: 5,
                 targetBGL: 7,
                 recentBoluses: [],
+                activity: null,
             },
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...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(enum_1.RecentInsulinTestIds.No);
         react_native_testing_library_1.fireEvent(noButton, `onPress`);
         utils_1.expectTextExists(wrapper, `Transfer to logbook`);
-        const slider = wrapper.queryByA11yLabel(`remeasureSlider`);
-        expect(slider).not.toBeNull();
+        const slider = wrapper.getByTestId(enum_1.RemeasureTestIds.RemeasureSlider);
         // Input 2.5 in remeasure slider
         react_native_testing_library_1.fireEvent(slider, `onValueChange`, 2.5);
         // Expect text updated
         utils_1.expectTextNotExists(wrapper, `1.5`);
         utils_1.expectTextExists(wrapper, `2.5`);
-        const getIcon = (name, active) => wrapper.queryByA11yLabel(`${name}_${active}`);
-        const sad = enum_1.MoodEnum[enum_1.MoodEnum.Sad];
-        expect(getIcon(sad, false)).not.toBeNull();
-        react_native_testing_library_1.fireEvent(getIcon(sad, false), `onPress`);
-        const transfer = wrapper.queryByA11yLabel(`transferToLogbook`);
-        expect(transfer).not.toBeNull();
+        const sad = MoodEnum[MoodEnum.Sad];
+        const icon = utils_1.getIcon(wrapper, sad, false);
+        if (icon === null) {
+            return fail(`Could not find icon from queryByA11yLabel: ${sad}_${false}`);
+        }
+        react_native_testing_library_1.fireEvent(icon, `onPress`);
+        const transfer = wrapper.getByTestId(enum_1.TransferToLogbookTestIds.TransferButton);
         // Press transfer
         react_native_testing_library_1.fireEvent(transfer, `onPress`);
         const carbsExpected = {
-            entered: undefined,
+            entered: null,
             suggested: 0,
         };
         const insulinExpected = {
-            entered: undefined,
+            entered: null,
             suggested: 2,
         };
-        expect(props.transferToLogbook).toBeCalledWith(carbsExpected, insulinExpected, 2.5, new Date(global.Date.now()), enum_1.MoodEnum.Sad);
+        expect(props.transferToLogbook).toBeCalledWith(carbsExpected, insulinExpected, 2.5, new Date(global.Date.now()), MoodEnum.Sad);
     });
     test.each `
-		locale         | text
-		${enum_1.Language.da} | ${`INSULIN\nANBEFALING`}
-		${enum_1.Language.en} | ${`INSULIN\nRECOMMENDATION`}
-		${enum_1.Language.de} | ${`INSULIN\nEMPFEHLUNG`}
-		${enum_1.Language.es} | ${`RECOMENDACIÓN\nDE INSULINA`}
-		${enum_1.Language.it} | ${`PRESCRIZIONE DI\nINSULINA`}
-		${enum_1.Language.fr} | ${`RECOMMANDATION\nD’INSULINE`}
+		locale          | text
+		${types_1.Languages.da} | ${`INSULIN\nANBEFALING`}
+		${types_1.Languages.en} | ${`INSULIN\nRECOMMENDATION`}
+		${types_1.Languages.de} | ${`INSULIN\nEMPFEHLUNG`}
+		${types_1.Languages.es} | ${`RECOMENDACIÓN\nDE INSULINA`}
+		${types_1.Languages.it} | ${`PRESCRIZIONE DI\nINSULINA`}
+		${types_1.Languages.fr} | ${`RECOMMANDATION\nD’INSULINE`}
 	`(`Language props determine language shown; $locale`, ({ locale, text }) => {
         const props = utils_1.getRecommendationProps({
             language: locale,
@@ -458,14 +456,24 @@ describe(`RecommendationScreen`, () => {
         utils_1.expectTextNotExists(wrapper, `INSULIN\nRECOMMENDATION`);
         expect(props.onError).toBeCalledWith(RecommendationError_1.LanguageError());
     });
+    test(`Error is thrown when passing an unsupported activity settings`, () => {
+        const props = utils_1.getRecommendationProps({
+            calculatorParams: {
+                ...utils_1.generateDefaultCalculatorParams(),
+                activity: { ...utils_1.generateActivityProps(), activityIntensity: hard, activityDuration: 46 },
+            },
+        });
+        react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
+        expect(props.onError).toBeCalledWith(new Error(types_1.BolusCalculator.Enums.ActivityErrors.InvalidInterval));
+    });
     test.each `
-		initialLocale  | locale         | initialText                     | text
-		${enum_1.Language.en} | ${enum_1.Language.da} | ${`INSULIN\nRECOMMENDATION`}    | ${`INSULIN\nANBEFALING`}
-		${enum_1.Language.da} | ${enum_1.Language.de} | ${`INSULIN\nANBEFALING`}        | ${`INSULIN\nEMPFEHLUNG`}
-		${enum_1.Language.de} | ${enum_1.Language.es} | ${`INSULIN\nEMPFEHLUNG`}        | ${`RECOMENDACIÓN\nDE INSULINA`}
-		${enum_1.Language.es} | ${enum_1.Language.it} | ${`RECOMENDACIÓN\nDE INSULINA`} | ${`PRESCRIZIONE DI\nINSULINA`}
-		${enum_1.Language.it} | ${enum_1.Language.fr} | ${`PRESCRIZIONE DI\nINSULINA`}  | ${`RECOMMANDATION\nD’INSULINE`}
-		${enum_1.Language.fr} | ${enum_1.Language.en} | ${`RECOMMANDATION\nD’INSULINE`} | ${`INSULIN\nRECOMMENDATION`}
+		initialLocale   | locale          | initialText                     | text
+		${types_1.Languages.en} | ${types_1.Languages.da} | ${`INSULIN\nRECOMMENDATION`}    | ${`INSULIN\nANBEFALING`}
+		${types_1.Languages.da} | ${types_1.Languages.de} | ${`INSULIN\nANBEFALING`}        | ${`INSULIN\nEMPFEHLUNG`}
+		${types_1.Languages.de} | ${types_1.Languages.es} | ${`INSULIN\nEMPFEHLUNG`}        | ${`RECOMENDACIÓN\nDE INSULINA`}
+		${types_1.Languages.es} | ${types_1.Languages.it} | ${`RECOMENDACIÓN\nDE INSULINA`} | ${`PRESCRIZIONE DI\nINSULINA`}
+		${types_1.Languages.it} | ${types_1.Languages.fr} | ${`PRESCRIZIONE DI\nINSULINA`}  | ${`RECOMMANDATION\nD’INSULINE`}
+		${types_1.Languages.fr} | ${types_1.Languages.en} | ${`RECOMMANDATION\nD’INSULINE`} | ${`INSULIN\nRECOMMENDATION`}
 	`(`Changing language changes header text; initial-language:$initialLocale to changed-language:$locale`, ({ initialLocale, locale, initialText, text }) => {
         const props = utils_1.getRecommendationProps({ language: initialLocale });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
@@ -489,7 +497,8 @@ describe(`RecommendationScreen`, () => {
             calculatorParams: {
                 ...utils_1.getRecommendationProps().calculatorParams,
                 currentBGL: 8,
-                recentBoluses: null,
+                targetBGL: 8,
+                recentBoluses: [],
             },
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
@@ -501,11 +510,13 @@ describe(`RecommendationScreen`, () => {
             ...utils_1.getRecommendationProps({
                 calculatorParams: {
                     ...utils_1.getRecommendationProps().calculatorParams,
+                    // @ts-ignore
                     currentBGL: null,
                 },
             }),
             currentBKL: null,
         };
+        // @ts-ignore
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         utils_1.expectTextExists(wrapper, /2\./);
         expect(wrapper.queryAllByText(`-.-`)).toHaveLength(2);
@@ -547,16 +558,17 @@ describe(`RecommendationScreen`, () => {
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         utils_1.expectTextExists(wrapper, `INSULIN\nRECOMMENDATION`);
-        utils_1.expectTextExists(wrapper, `0`);
+        const shownInsulin = utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedInsulinTestIds.ShownInsulinText);
+        expect(shownInsulin).toBe(`0`);
     });
     test.each `
-		intensity                     | translation
-		${RecommendationCalculator_1.ActivityIntensity.Light}    | ${`Let`}
-		${RecommendationCalculator_1.ActivityIntensity.Moderate} | ${`Moderat`}
-		${RecommendationCalculator_1.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 }) => {
         const props = utils_1.getRecommendationProps({
-            activityDisplayProps: { activityType: enum_1.ActivityEnum.Run },
+            activityDisplayProps: { activityType: ActivityEnum.Run, activityTitle: null },
             calculatorParams: {
                 ...utils_1.getRecommendationProps().calculatorParams,
                 activity: {
@@ -566,12 +578,13 @@ describe(`RecommendationScreen`, () => {
             },
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
-        utils_1.expectTextExists(wrapper, intensity);
+        const englishText = Translations_1.ActivityIntensityTranslations[intensity]();
+        utils_1.expectTextExists(wrapper, englishText);
         utils_1.expectTextNotExists(wrapper, translation);
-        i18nUtils_1.i18n.activate(enum_1.Language.da);
+        i18nUtils_1.i18n.activate(types_1.Languages.da);
         wrapper.rerender(<RecommendationScreen_1.default {...props}/>);
         utils_1.expectTextExists(wrapper, translation);
-        utils_1.expectTextNotExists(wrapper, intensity);
+        utils_1.expectTextNotExists(wrapper, englishText);
     });
     test(`Show limitation page at recalculation`, () => {
         const carbRecommendationAnswer = jest.fn();
@@ -583,26 +596,32 @@ describe(`RecommendationScreen`, () => {
                 insulinSensitivity: 0.3,
                 targetBGL: 8.3,
                 recentBoluses: [],
+                activity: null,
             },
             userReminder: 5,
             carbRecommendationAnswer,
         });
+        // Render the screen, expecting a carb recommendation modal.
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         utils_1.expectTextExists(wrapper, `We recommend eating an additional:`);
-        const yesButton = wrapper.queryByA11yLabel(`yesButtonModal`);
+        // Get the yes button from the modal
+        const yesButton = wrapper.getByTestId(enum_1.RecommendationModalTestIds.AcceptCarbs);
         react_native_testing_library_1.fireEvent(yesButton, `onPress`);
         expect(carbRecommendationAnswer).toBeCalledWith(true);
         utils_1.expectTextExists(wrapper, `Additional`);
-        utils_1.expectTextExists(wrapper, `1`);
-        const carbInput = wrapper.UNSAFE_queryByType(InvisibleNumberInput_1.default);
-        expect(carbInput).not.toBeNull();
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.EnteredCarbs)).toBe(`1`);
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.RecommendedCarbs)).toBe(`3`);
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.TotalCarbs)).toBe(`4`);
+        const carbInput = wrapper.getByTestId(enum_1.RecommendedCarbsTestIds.InvisibleCarbInput);
+        const manualCarbInput = 299;
         // Input 299 into the carbs field
-        react_native_testing_library_1.fireEvent(carbInput, `onEnd`, 299);
-        utils_1.expectTextExists(wrapper, `299`);
+        react_native_testing_library_1.fireEvent(carbInput, `onEnd`, manualCarbInput);
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.EnteredCarbs)).toBe(`1`);
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.RecommendedCarbs)).toBe(`299`);
+        expect(utils_1.queryTextFromComponent(wrapper, enum_1.RecommendedCarbsTestIds.TotalCarbs)).toBe(`300`);
         // Expect text from limitation message after recalculation
         utils_1.expectTextExists(wrapper, `${AttentionMessages_1.Messages.RecommendationWasLimited()}`);
-        const nextButton = wrapper.queryByA11yLabel(`nextButtonModal`);
-        expect(nextButton).not.toBeNull();
+        const nextButton = wrapper.getByTestId(enum_1.LimitationMessageTestIds.OkButton);
         react_native_testing_library_1.fireEvent(nextButton, `onPress`);
         utils_1.expectTextNotExists(wrapper, `${AttentionMessages_1.Messages.RecommendationWasLimited()}`);
     });
@@ -618,12 +637,13 @@ describe(`Recommendation Screen - RecommendationModal related tests`, () => {
                 insulinSensitivity: 5,
                 targetBGL: 7,
                 recentBoluses: [],
+                activity: null,
             },
             userReminder: 5,
             carbRecommendationAnswer,
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
-        const noButton = wrapper.queryByA11yLabel(`noButtonModal`);
+        const noButton = wrapper.getByTestId(enum_1.RecommendationModalTestIds.DeclineCarbs);
         react_native_testing_library_1.fireEvent(noButton, `onPress`);
         expect(carbRecommendationAnswer).toBeCalledWith(false);
         utils_1.expectTextExists(wrapper, `Food`);
@@ -639,13 +659,14 @@ describe(`Recommendation Screen - RecommendationModal related tests`, () => {
                 insulinSensitivity: 5,
                 targetBGL: 7,
                 recentBoluses: [],
+                activity: null,
             },
             userReminder: 5,
             carbRecommendationAnswer,
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         utils_1.expectTextExists(wrapper, `We recommend eating an additional:`);
-        const yesButton = wrapper.queryByA11yLabel(`yesButtonModal`);
+        const yesButton = wrapper.getByTestId(enum_1.RecommendationModalTestIds.AcceptCarbs);
         react_native_testing_library_1.fireEvent(yesButton, `onPress`);
         expect(carbRecommendationAnswer).toBeCalledWith(true);
         utils_1.expectTextExists(wrapper, `Food`);
@@ -666,9 +687,9 @@ describe(`Recommendation Screen - RecommendationModal related tests`, () => {
             userReminder: 5,
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
-        const nextButton = wrapper.queryByA11yLabel(`nextButtonModal`);
+        const nextButton = wrapper.getByTestId(enum_1.LimitationMessageTestIds.OkButton);
         react_native_testing_library_1.fireEvent(nextButton, `onPress`);
-        const yesButton = wrapper.queryByA11yLabel(`okayButtonModal`);
+        const yesButton = wrapper.getByTestId(enum_1.RecommendationModalTestIds.OkButton);
         react_native_testing_library_1.fireEvent(yesButton, `onPress`);
         utils_1.expectTextExists(wrapper, `Food`);
         utils_1.expectTextNotExists(wrapper, `Additional`);
@@ -681,10 +702,10 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
         const props = utils_1.getRecommendationProps();
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         //press exit button
-        const exitButton = wrapper.queryByA11yLabel(`exitButton`);
+        const exitButton = wrapper.getByTestId(enum_1.HeaderTestIds.ExitCalculation);
         react_native_testing_library_1.fireEvent(exitButton, `onPress`);
         expect(props.showBolusBar).toBeCalledWith(false);
-        const saveToLogbookModalButton = wrapper.queryByA11yLabel(`firstOptionButton`);
+        const saveToLogbookModalButton = wrapper.getByTestId(enum_1.TwoOptionModalTestIds.FirstOption);
         react_native_testing_library_1.fireEvent(saveToLogbookModalButton, `onPress`);
         expect(props.transferToLogbook).toBeCalled();
         utils_1.expectTextNotExists(wrapper, `Save to logbook`);
@@ -694,10 +715,10 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
         const props = utils_1.getRecommendationProps();
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         //press exit button
-        const exitButton = wrapper.queryByA11yLabel(`exitButton`);
+        const exitButton = wrapper.getByTestId(enum_1.HeaderTestIds.ExitCalculation);
         react_native_testing_library_1.fireEvent(exitButton, `onPress`);
         expect(props.showBolusBar).toBeCalledWith(false);
-        const closeCalculation = wrapper.queryByA11yLabel(`secondOptionButton`);
+        const closeCalculation = wrapper.getByTestId(enum_1.TwoOptionModalTestIds.SecondOption);
         react_native_testing_library_1.fireEvent(closeCalculation, `onPress`);
         expect(props.closeCalculationCallback).toBeCalled();
         utils_1.expectTextNotExists(wrapper, `Save to logbook`);
@@ -708,7 +729,7 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
             calculatorParams: { ...utils_1.generateDefaultCalculatorParams(), recentBoluses: [] },
         });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
-        const exitButton = wrapper.queryByA11yLabel(`exitButton`);
+        const exitButton = wrapper.getByTestId(enum_1.HeaderTestIds.ExitCalculation);
         react_native_testing_library_1.fireEvent(exitButton, `onPress`);
         utils_1.expectTextExists(wrapper, `Have you taken insulin within the last 4 hours?`);
         expect(props.showBolusBar).not.toBeCalled();
@@ -717,22 +738,22 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
     test(`Test triggering on/off the ExitModal`, async () => {
         const props = utils_1.getRecommendationProps();
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
-        const exitButton = wrapper.queryByA11yLabel(`exitButton`);
+        const exitButton = wrapper.getByTestId(enum_1.HeaderTestIds.ExitCalculation);
         react_native_testing_library_1.fireEvent(exitButton, `onPress`);
         expect(props.showBolusBar).toBeCalledWith(false);
         utils_1.expectTextExists(wrapper, `Save to logbook`);
         utils_1.expectTextExists(wrapper, `Close calculation`);
-        const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+        const modalExitIcon = wrapper.getByTestId(enum_1.TwoOptionModalTestIds.ExitButton);
         react_native_testing_library_1.fireEvent(modalExitIcon, `onPress`);
         expect(props.showBolusBar).toBeCalledWith(true);
         utils_1.expectTextNotExists(wrapper, `Save to logbook`);
         utils_1.expectTextNotExists(wrapper, `Close calculation`);
     });
     test(`Can translate ExitModal option`, () => {
-        const props = utils_1.getRecommendationProps({ language: enum_1.Language.da });
+        const props = utils_1.getRecommendationProps({ language: types_1.Languages.da });
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
         //press exit button
-        const exitButton = wrapper.queryByA11yLabel(`exitButton`);
+        const exitButton = wrapper.getByTestId(enum_1.HeaderTestIds.ExitCalculation);
         react_native_testing_library_1.fireEvent(exitButton, `onPress`);
         expect(props.showBolusBar).toBeCalledWith(false);
         utils_1.expectTextExists(wrapper, `Luk beregning`);
@@ -746,17 +767,17 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
         expect(props.onError).not.toBeCalled();
         jest.runAllTimers();
         expect(props.onError).not.toBeCalled();
-        const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+        const modalExitIcon = wrapper.queryByTestId(enum_1.TwoOptionModalTestIds.ExitButton);
         expect(modalExitIcon).toBeNull();
         expect(props.showBolusBar).toBeCalledWith(false);
         utils_1.expectTextExists(wrapper, `More than 15 minutes has passed since this calculation was started.`);
         utils_1.expectTextExists(wrapper, `Yes, save to logbook`);
         utils_1.expectTextExists(wrapper, `No, return to dashboard`);
-        i18nUtils_1.i18n.activate(enum_1.Language.da);
+        i18nUtils_1.i18n.activate(types_1.Languages.da);
         wrapper.rerender(<RecommendationScreen_1.default {...props}/>);
         jest.runAllTimers();
         utils_1.expectTextExists(wrapper, `Der er gået mere end 15 minutter siden udregningen blev startet.`);
-        const saveToLogbook = wrapper.queryByA11yLabel(`firstOptionButton`);
+        const saveToLogbook = wrapper.getByTestId(enum_1.TwoOptionModalTestIds.FirstOption);
         react_native_testing_library_1.fireEvent(saveToLogbook, `onPress`);
         expect(props.transferToLogbook).toBeCalled();
     });
@@ -766,13 +787,13 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
         expect(props.onError).not.toBeCalled();
         jest.runAllTimers();
         expect(props.onError).not.toBeCalled();
-        const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+        const modalExitIcon = wrapper.queryByTestId(enum_1.TwoOptionModalTestIds.ExitButton);
         expect(modalExitIcon).toBeNull();
         expect(props.showBolusBar).toBeCalledWith(false);
         utils_1.expectTextExists(wrapper, `More than 15 minutes has passed since this calculation was started.`);
         utils_1.expectTextExists(wrapper, `Yes, save to logbook`);
         utils_1.expectTextExists(wrapper, `No, return to dashboard`);
-        const returnToDashboard = wrapper.queryByA11yLabel(`secondOptionButton`);
+        const returnToDashboard = wrapper.getByTestId(enum_1.TwoOptionModalTestIds.SecondOption);
         react_native_testing_library_1.fireEvent(returnToDashboard, `onPress`);
         expect(props.closeCalculationCallback).toBeCalled();
     });
@@ -784,13 +805,13 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
         expect(props.onError).not.toBeCalled();
         jest.runAllTimers();
         expect(props.onError).not.toBeCalled();
-        const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+        const modalExitIcon = wrapper.queryByTestId(enum_1.TwoOptionModalTestIds.ExitButton);
         expect(modalExitIcon).toBeNull();
         expect(props.showBolusBar).toBeCalledWith(false);
         utils_1.expectTextExists(wrapper, `More than 15 minutes has passed since this calculation was started.`);
         utils_1.expectTextExists(wrapper, `Start new calculation`);
         utils_1.expectTextExists(wrapper, `Return to dashboard`);
-        const returnToDashboard = wrapper.queryByA11yLabel(`secondOptionButton`);
+        const returnToDashboard = wrapper.getByTestId(enum_1.TwoOptionModalTestIds.SecondOption);
         react_native_testing_library_1.fireEvent(returnToDashboard, `onPress`);
         expect(props.closeCalculationCallback).toBeCalled();
         utils_1.expectTextNotExists(wrapper, `Start new calculation`);
@@ -804,17 +825,17 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
         expect(props.onError).not.toBeCalled();
         jest.runAllTimers();
         expect(props.onError).not.toBeCalled();
-        const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+        const modalExitIcon = wrapper.queryByTestId(enum_1.TwoOptionModalTestIds.ExitButton);
         expect(modalExitIcon).toBeNull();
         expect(props.showBolusBar).toBeCalledWith(false);
         utils_1.expectTextExists(wrapper, `More than 15 minutes has passed since this calculation was started.`);
         utils_1.expectTextExists(wrapper, `Start new calculation`);
         utils_1.expectTextExists(wrapper, `Return to dashboard`);
-        i18nUtils_1.i18n.activate(enum_1.Language.da);
+        i18nUtils_1.i18n.activate(types_1.Languages.da);
         wrapper.rerender(<RecommendationScreen_1.default {...props}/>);
         jest.runAllTimers();
         utils_1.expectTextExists(wrapper, `Der er gået mere end 15 minutter siden udregningen blev startet.`);
-        const returnToDashboard = wrapper.queryByA11yLabel(`firstOptionButton`);
+        const returnToDashboard = wrapper.getByTestId(enum_1.TwoOptionModalTestIds.FirstOption);
         react_native_testing_library_1.fireEvent(returnToDashboard, `onPress`);
         expect(props.restartCalculation).toBeCalled();
         utils_1.expectTextNotExists(wrapper, `Der er gået mere end 15 minutter siden udregningen blev startet.`);
@@ -833,19 +854,22 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
             removeEventListener: jest.fn(),
         }));
         const wrapper = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
-        appStateListener(`active`);
+        // @ts-ignore
+        appStateListener?.(`active`);
         // Run twice to test else path
-        global.Date.now = () => new Date().getTime() + enum_1.Milliseconds.Minute * 14;
-        appStateListener(`active`);
+        global.Date.now = () => new Date().getTime() + types_1.Milliseconds.Minute * 14;
+        // @ts-ignore
+        appStateListener?.(`active`);
         wrapper.rerender(<RecommendationScreen_1.default {...props}/>);
         expect(props.showBolusBar).not.toBeCalledWith(false);
         utils_1.expectTextNotExists(wrapper, `No, return to dashboard`);
-        global.Date.now = () => new Date().getTime() + enum_1.Milliseconds.Minute * 15;
+        global.Date.now = () => new Date().getTime() + types_1.Milliseconds.Minute * 15;
+        // @ts-ignore
         appStateListener(`active`);
         wrapper.rerender(<RecommendationScreen_1.default {...props}/>);
         expect(props.showBolusBar).toBeCalledWith(false);
         utils_1.expectTextExists(wrapper, `No, return to dashboard`);
-        const closeModalButton = wrapper.queryByText(`No, return to dashboard`);
+        const closeModalButton = wrapper.getByTestId(enum_1.TwoOptionModalTestIds.SecondOption);
         react_native_testing_library_1.fireEvent(closeModalButton, `secondOption`);
         wrapper.rerender(<RecommendationScreen_1.default {...props}/>);
         utils_1.expectTextNotExists(wrapper, `No, return to dashboard`);
@@ -865,6 +889,7 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
             removeEventListener: jest.fn(),
         }));
         const rendered = react_native_testing_library_1.render(<RecommendationScreen_1.default {...props}/>);
+        // @ts-ignore
         appStateListener(`NotAnAppStateStatus`);
         rendered.rerender(<RecommendationScreen_1.default {...props}/>);
         expect(props.showBolusBar).not.toBeCalled();