@hedia/recommendation-screen 1.8.2 → 2.0.2

package/src/__tests__/Validations.test.js

@@ -14,23 +14,26 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const RecommendationCalculator_1 = require("@hedia/recommendation-calculator/src/RecommendationCalculator");
 const types_1 = require("@hedia/types");
-const enum_1 = require("../types/enum");
 const Constants_1 = require("../utils/Constants");
 const Errors = __importStar(require("../utils/RecommendationError"));
 const Validations = __importStar(require("../utils/Validations"));
+const utils_1 = require("./utils");
+const ActivityEnum = types_1.Activity.Enums.ActivityEnum;
+const ActivityIntensity = types_1.Activity.Enums.ActivityIntensity;
+const InjectionMethod = types_1.UserSettings.Enums.InjectionMethod;
+const { light, moderate, hard } = ActivityIntensity;
 describe(`Test validations functions for the recommendation props`, () => {
     test.each `
 		validInjectionMethod
-		${enum_1.InjectionMethod.PenHalf}
-		${enum_1.InjectionMethod.PenWhole}
-		${enum_1.InjectionMethod.Pump}
+		${InjectionMethod.PenHalf}
+		${InjectionMethod.PenWhole}
+		${InjectionMethod.Pump}
 	`(`Validation checking on treatment types $validInjectionMethod `, ({ validInjectionMethod }) => {
         expect(() => Validations.checkInjectionMethod(validInjectionMethod)).not.toThrowError(Errors.InjectionMethodError());
     });
@@ -74,12 +77,12 @@ describe(`Test validations functions for the recommendation props`, () => {
     });
     test.each `
 		validLanguage
-		${enum_1.Language.da}
-		${enum_1.Language.en}
-		${enum_1.Language.de}
-		${enum_1.Language.es}
-		${enum_1.Language.it}
-		${enum_1.Language.fr}
+		${types_1.Languages.da}
+		${types_1.Languages.en}
+		${types_1.Languages.de}
+		${types_1.Languages.es}
+		${types_1.Languages.it}
+		${types_1.Languages.fr}
 	`(`Validation checking on supported languages types $validLanguage`, ({ validLanguage }) => {
         expect(() => Validations.checkLanguage(validLanguage)).not.toThrowError(Errors.LanguageError());
     });
@@ -92,13 +95,30 @@ describe(`Test validations functions for the recommendation props`, () => {
 	`(`Validation checking on supported languages types $invalidLanguage throws error`, (invalidLanguage) => {
         expect(() => Validations.checkLanguage(invalidLanguage)).toThrowError(Errors.LanguageError());
     });
+    it.each `
+		validLatestLogbookFrom6Hours
+		${utils_1.generateDefaultLogbook()}
+		${null}
+	`(`Validation checking on the latest logbook from the latest 6 hours with a valid logbook`, ({ validLatestLogbookFrom6Hours }) => {
+        expect(() => Validations.checkLatestLogbook6Hours(validLatestLogbookFrom6Hours)).not.toThrowError(Errors.LatestLogbook6HoursBGLError());
+    });
+    it.each `
+		invalidLatestLogbookFrom6Hours
+		${undefined}
+		${{}}
+		${[]}
+		${{ ...utils_1.generateDefaultLogbook(), blood_glucose_millimolar: 1 }}
+		${{ ...utils_1.generateDefaultLogbook(), blood_glucose_millimolar: 33.4 }}
+	`(`Validation checking on the latest logbook from the latest 6 hours with an invalid logbook `, ({ invalidLatestLogbookFrom6Hours }) => {
+        expect(() => Validations.checkLatestLogbook6Hours(invalidLatestLogbookFrom6Hours)).toThrowError(Errors.LatestLogbook6HoursBGLError());
+    });
     test.each `
 		validActivityType
-		${enum_1.ActivityEnum.Walk}
-		${enum_1.ActivityEnum.Swim}
-		${enum_1.ActivityEnum.Run}
-		${enum_1.ActivityEnum.Other}
-		${enum_1.ActivityEnum.Cycling}
+		${ActivityEnum.Walk}
+		${ActivityEnum.Swim}
+		${ActivityEnum.Run}
+		${ActivityEnum.Other}
+		${ActivityEnum.Cycling}
 	`(`Validation checking on activity types $validActivityType `, ({ validActivityType }) => {
         expect(() => Validations.checkActivityType(validActivityType)).not.toThrowError(Errors.ActivityTypeError());
     });
@@ -152,28 +172,22 @@ describe(`Test validations for the calculator parameters`, () => {
     });
     test.each `
 		validIntensity
-		${RecommendationCalculator_1.ActivityIntensity.Hard}
-		${RecommendationCalculator_1.ActivityIntensity.Light}
-		${RecommendationCalculator_1.ActivityIntensity.Moderate}
+		${hard}
+		${light}
+		${moderate}
 	`(`Validation checking on activity $validIntensity`, ({ validIntensity }) => {
         expect(() => Validations.checkActivityIntensity(validIntensity)).not.toThrowError(Errors.ActivityIntensityError());
     });
     test.each `
 		invalidIntensity
-		${`hard`}
+		${`Hard`}
 		${`easy`}
 		${undefined}
 		${null}
 	`(`Validation checking on activity $invalidIntensity throws error`, ({ invalidIntensity }) => {
         expect(() => Validations.checkActivityIntensity(invalidIntensity)).toThrowError(Errors.ActivityIntensityError());
     });
-    const validActivitySettings1 = {
-        light: { fromZero: 0.25, fromThirty: 0.9, fromFortysix: 0.25 },
-        moderate: { fromZero: 0.25, fromThirty: 0.99, fromFortysix: 0.25 },
-        hard: { fromZero: 0.25, fromThirty: 0.9, fromFortysix: 1 },
-        post: { fromZero: 0, fromThirty: 0, fromFortysix: 0.25 },
-        target: 8.3,
-    };
+    const validActivitySettings1 = utils_1.generateDefaultActivitySettings();
     const validActivitySettings2 = {
         ...validActivitySettings1,
         hard: { fromZero: 1, fromThirty: 0.99, fromFortysix: null },
@@ -184,10 +198,12 @@ describe(`Test validations for the calculator parameters`, () => {
     };
     const invalidActivitySettings1 = {
         ...validActivitySettings1,
+        // @ts-ignore Purposefully invalid settings
         hard: { fromZero: 0, fromThirty: null, fromFortysix: null },
     };
     const invalidActivitySettings2 = {
         ...validActivitySettings1,
+        // @ts-ignore Purposefully invalid settings
         light: { fromZero: undefined, fromThirty: 0.99, fromFortysix: 0.25 },
     };
     const invalidActivitySettings3 = {
@@ -195,24 +211,24 @@ describe(`Test validations for the calculator parameters`, () => {
         hard: { fromZero: 1, fromThirty: 0.99, fromFortysix: 1.1 },
     };
     const validActivity1 = {
-        activityDate: new Date(Date.now() - enum_1.Milliseconds.Hour * 5 - enum_1.Milliseconds.Minute * 9.9),
+        activityDate: new Date(Date.now() - types_1.Milliseconds.Hour * 5 - types_1.Milliseconds.Minute * 9.9),
         activityDuration: 60,
-        activityIntensity: RecommendationCalculator_1.ActivityIntensity.Moderate,
+        activityIntensity: moderate,
         activitySettings: validActivitySettings1,
     };
     const validActivity2 = {
         ...validActivity1,
-        activityDate: new Date(Date.now() - enum_1.Milliseconds.Hour * 4.5 - enum_1.Milliseconds.Minute * 9.9),
+        activityDate: new Date(Date.now() - types_1.Milliseconds.Hour * 4.5 - types_1.Milliseconds.Minute * 9.9),
         activityDuration: 30,
     };
     const invalidActivity1 = {
         ...validActivity1,
-        activityDate: new Date(Date.now() - enum_1.Milliseconds.Hour * 4.5 - enum_1.Milliseconds.Minute * 10),
+        activityDate: new Date(Date.now() - types_1.Milliseconds.Hour * 4.5 - types_1.Milliseconds.Minute * 10),
         activityDuration: 30,
     };
     const invalidActivity2 = {
         ...validActivity1,
-        activityDate: new Date(Date.now() - enum_1.Milliseconds.Hour * 4.25 - enum_1.Milliseconds.Minute * 10),
+        activityDate: new Date(Date.now() - types_1.Milliseconds.Hour * 4.25 - types_1.Milliseconds.Minute * 10),
         activityDuration: 15,
     };
     test(`Can call checkActivity with a valid activity`, () => {
@@ -368,10 +384,13 @@ describe(`Test validations for the calculator parameters`, () => {
         secondsPassed: Constants_1.FOUR_HOURS_SECONDS,
     };
     const invalidBolus1 = {
+        // @ts-ignore Forcefully incorrect.
         insulinDose: null,
+        // @ts-ignore Forcefully incorrect.
         secondsPassed: null,
     };
     const invalidBolus2 = {
+        // @ts-ignore Forcefully incorrect.
         insulinDose: undefined,
         secondsPassed: Constants_1.FOUR_HOURS_SECONDS + 1,
     };
@@ -411,6 +430,13 @@ describe(`Test validations for the calculator parameters`, () => {
 	`(`Validation checking on Recent Boluses seconds passed throws error`, ({ invalidRecentBoluses }) => {
         expect(() => Validations.checkRecentBolusesSecondsPassed(invalidRecentBoluses)).toThrowError(Errors.BolusInsulinSecondsPassedError());
     });
+    test.each `
+		invalidRecentBoluses
+		${null}
+		${undefined}
+	`(`Validation checking on Recent Boluses: null and undefined throws error`, ({ invalidRecentBoluses }) => {
+        expect(() => Validations.checkRecentBolus(invalidRecentBoluses)).toThrowError(Errors.RecentBolusError());
+    });
     test.each `
 		validCurrentBKL
 		${0}

package/src/__tests__/Validations.test.ts

@@ -1,14 +1,15 @@
-import {
-	ActivityIntensity,
-	IActivityParams,
-	IActivitySettings,
-	IRecentBolus,
-} from "@hedia/recommendation-calculator/src/RecommendationCalculator";
-import { BloodGlucoseUnit, BloodKetonesUnit } from "@hedia/types";
-import { ActivityEnum, InjectionMethod, Language, Milliseconds } from "../types/enum";
+import { Activity, BloodGlucoseUnit, BloodKetonesUnit, Languages, Milliseconds, UserSettings } from "@hedia/types";
+import { ActivitySettings, IActivityParams, IRecentBolus, logbookEntry } from "../types/types";
 import { FOUR_HOURS_SECONDS } from "../utils/Constants";
 import * as Errors from "../utils/RecommendationError";
 import * as Validations from "../utils/Validations";
+import { generateDefaultActivitySettings, generateDefaultLogbook } from "./utils";
+
+const ActivityEnum = Activity.Enums.ActivityEnum;
+const ActivityIntensity = Activity.Enums.ActivityIntensity;
+const InjectionMethod = UserSettings.Enums.InjectionMethod;
+
+const { light, moderate, hard } = ActivityIntensity;
 
 describe(`Test validations functions for the recommendation props`, (): void => {
 	test.each`
@@ -18,7 +19,7 @@ describe(`Test validations functions for the recommendation props`, (): void =>
 		${InjectionMethod.Pump}
 	`(
 		`Validation checking on treatment types $validInjectionMethod `,
-		({ validInjectionMethod }: { validInjectionMethod: InjectionMethod }): void => {
+		({ validInjectionMethod }: { validInjectionMethod: UserSettings.Enums.InjectionMethod }): void => {
 			expect((): void => Validations.checkInjectionMethod(validInjectionMethod)).not.toThrowError(
 				Errors.InjectionMethodError(),
 			);
@@ -32,7 +33,7 @@ describe(`Test validations functions for the recommendation props`, (): void =>
 		${`Hedia`}
 	`(
 		`Validation checking on treatment types $invalidInjectionMethod throws error`,
-		(invalidInjectionMethod: InjectionMethod): void => {
+		(invalidInjectionMethod: UserSettings.Enums.InjectionMethod): void => {
 			expect((): void => Validations.checkInjectionMethod(invalidInjectionMethod)).toThrowError(
 				Errors.InjectionMethodError(),
 			);
@@ -86,15 +87,15 @@ describe(`Test validations functions for the recommendation props`, (): void =>
 
 	test.each`
 		validLanguage
-		${Language.da}
-		${Language.en}
-		${Language.de}
-		${Language.es}
-		${Language.it}
-		${Language.fr}
+		${Languages.da}
+		${Languages.en}
+		${Languages.de}
+		${Languages.es}
+		${Languages.it}
+		${Languages.fr}
 	`(
 		`Validation checking on supported languages types $validLanguage`,
-		({ validLanguage }: { validLanguage: Language }): void => {
+		({ validLanguage }: { validLanguage: Languages }): void => {
 			expect((): void => Validations.checkLanguage(validLanguage)).not.toThrowError(Errors.LanguageError());
 		},
 	);
@@ -107,11 +108,39 @@ describe(`Test validations functions for the recommendation props`, (): void =>
 		${`Deutsch`}
 	`(
 		`Validation checking on supported languages types $invalidLanguage throws error`,
-		(invalidLanguage: Language): void => {
+		(invalidLanguage: Languages): void => {
 			expect((): void => Validations.checkLanguage(invalidLanguage)).toThrowError(Errors.LanguageError());
 		},
 	);
 
+	it.each`
+		validLatestLogbookFrom6Hours
+		${generateDefaultLogbook()}
+		${null}
+	`(
+		`Validation checking on the latest logbook from the latest 6 hours with a valid logbook`,
+		({ validLatestLogbookFrom6Hours }: { validLatestLogbookFrom6Hours: logbookEntry }): void => {
+			expect((): void => Validations.checkLatestLogbook6Hours(validLatestLogbookFrom6Hours)).not.toThrowError(
+				Errors.LatestLogbook6HoursBGLError(),
+			);
+		},
+	);
+	it.each`
+		invalidLatestLogbookFrom6Hours
+		${undefined}
+		${{}}
+		${[]}
+		${{ ...generateDefaultLogbook(), blood_glucose_millimolar: 1 }}
+		${{ ...generateDefaultLogbook(), blood_glucose_millimolar: 33.4 }}
+	`(
+		`Validation checking on the latest logbook from the latest 6 hours with an invalid logbook `,
+		({ invalidLatestLogbookFrom6Hours }: { invalidLatestLogbookFrom6Hours: logbookEntry }): void => {
+			expect((): void => Validations.checkLatestLogbook6Hours(invalidLatestLogbookFrom6Hours)).toThrowError(
+				Errors.LatestLogbook6HoursBGLError(),
+			);
+		},
+	);
+
 	test.each`
 		validActivityType
 		${ActivityEnum.Walk}
@@ -121,7 +150,7 @@ describe(`Test validations functions for the recommendation props`, (): void =>
 		${ActivityEnum.Cycling}
 	`(
 		`Validation checking on activity types $validActivityType `,
-		({ validActivityType }: { validActivityType: ActivityEnum }): void => {
+		({ validActivityType }: { validActivityType: Activity.Enums.ActivityEnum }): void => {
 			expect((): void => Validations.checkActivityType(validActivityType)).not.toThrowError(
 				Errors.ActivityTypeError(),
 			);
@@ -137,7 +166,7 @@ describe(`Test validations functions for the recommendation props`, (): void =>
 		${`Cycle`}
 	`(
 		`Validation checking on activity types $invalidActivityType throws error`,
-		(invalidActivityType: ActivityEnum): void => {
+		(invalidActivityType: Activity.Enums.ActivityEnum): void => {
 			expect((): void => Validations.checkActivityType(invalidActivityType)).toThrowError(
 				Errors.ActivityTypeError(),
 			);
@@ -201,12 +230,12 @@ describe(`Test validations for the calculator parameters`, (): void => {
 
 	test.each`
 		validIntensity
-		${ActivityIntensity.Hard}
-		${ActivityIntensity.Light}
-		${ActivityIntensity.Moderate}
+		${hard}
+		${light}
+		${moderate}
 	`(
 		`Validation checking on activity $validIntensity`,
-		({ validIntensity }: { validIntensity: ActivityIntensity }): void => {
+		({ validIntensity }: { validIntensity: Activity.Enums.ActivityIntensity }): void => {
 			expect((): void => Validations.checkActivityIntensity(validIntensity)).not.toThrowError(
 				Errors.ActivityIntensityError(),
 			);
@@ -215,48 +244,44 @@ describe(`Test validations for the calculator parameters`, (): void => {
 
 	test.each`
 		invalidIntensity
-		${`hard`}
+		${`Hard`}
 		${`easy`}
 		${undefined}
 		${null}
 	`(
 		`Validation checking on activity $invalidIntensity throws error`,
-		({ invalidIntensity }: { invalidIntensity: ActivityIntensity }): void => {
+		({ invalidIntensity }: { invalidIntensity: Activity.Enums.ActivityIntensity }): void => {
 			expect((): void => Validations.checkActivityIntensity(invalidIntensity)).toThrowError(
 				Errors.ActivityIntensityError(),
 			);
 		},
 	);
 
-	const validActivitySettings1: IActivitySettings = {
-		light: { fromZero: 0.25, fromThirty: 0.9, fromFortysix: 0.25 },
-		moderate: { fromZero: 0.25, fromThirty: 0.99, fromFortysix: 0.25 },
-		hard: { fromZero: 0.25, fromThirty: 0.9, fromFortysix: 1 },
-		post: { fromZero: 0, fromThirty: 0, fromFortysix: 0.25 },
-		target: 8.3,
-	};
+	const validActivitySettings1: ActivitySettings = generateDefaultActivitySettings();
 
-	const validActivitySettings2: IActivitySettings = {
+	const validActivitySettings2: ActivitySettings = {
 		...validActivitySettings1,
 		hard: { fromZero: 1, fromThirty: 0.99, fromFortysix: null },
 	};
 
-	const validActivitySettings3: IActivitySettings = {
+	const validActivitySettings3: ActivitySettings = {
 		...validActivitySettings1,
 		hard: { fromZero: 0, fromThirty: 0, fromFortysix: 0 },
 	};
 
-	const invalidActivitySettings1: IActivitySettings = {
+	const invalidActivitySettings1: ActivitySettings = {
 		...validActivitySettings1,
+		// @ts-ignore Purposefully invalid settings
 		hard: { fromZero: 0, fromThirty: null, fromFortysix: null },
 	};
 
-	const invalidActivitySettings2: IActivitySettings = {
+	const invalidActivitySettings2: ActivitySettings = {
 		...validActivitySettings1,
+		// @ts-ignore Purposefully invalid settings
 		light: { fromZero: undefined, fromThirty: 0.99, fromFortysix: 0.25 },
 	};
 
-	const invalidActivitySettings3: IActivitySettings = {
+	const invalidActivitySettings3: ActivitySettings = {
 		...validActivitySettings1,
 		hard: { fromZero: 1, fromThirty: 0.99, fromFortysix: 1.1 },
 	};
@@ -264,7 +289,7 @@ describe(`Test validations for the calculator parameters`, (): void => {
 	const validActivity1: IActivityParams = {
 		activityDate: new Date(Date.now() - Milliseconds.Hour * 5 - Milliseconds.Minute * 9.9),
 		activityDuration: 60,
-		activityIntensity: ActivityIntensity.Moderate,
+		activityIntensity: moderate,
 		activitySettings: validActivitySettings1,
 	};
 
@@ -325,7 +350,7 @@ describe(`Test validations for the calculator parameters`, (): void => {
 		${validActivitySettings3}
 	`(
 		`Validation checking on validActivitySettings`,
-		({ validActivitySettings }: { validActivitySettings: IActivitySettings }): void => {
+		({ validActivitySettings }: { validActivitySettings: ActivitySettings }): void => {
 			expect((): void => Validations.checkActivitySettings(validActivitySettings)).not.toThrowError(
 				Errors.ActivitySettingsError(),
 			);
@@ -339,7 +364,7 @@ describe(`Test validations for the calculator parameters`, (): void => {
 		${invalidActivitySettings3}
 	`(
 		`Validation checking on invalidActivitySettings throws error`,
-		({ invalidActivitySettings }: { invalidActivitySettings: IActivitySettings }): void => {
+		({ invalidActivitySettings }: { invalidActivitySettings: ActivitySettings }): void => {
 			expect((): void => Validations.checkActivitySettings(invalidActivitySettings)).toThrowError(
 				Errors.ActivitySettingsError(),
 			);
@@ -512,10 +537,13 @@ describe(`Test validations for the calculator parameters`, (): void => {
 		secondsPassed: FOUR_HOURS_SECONDS,
 	};
 	const invalidBolus1: IRecentBolus = {
+		// @ts-ignore Forcefully incorrect.
 		insulinDose: null,
+		// @ts-ignore Forcefully incorrect.
 		secondsPassed: null,
 	};
 	const invalidBolus2: IRecentBolus = {
+		// @ts-ignore Forcefully incorrect.
 		insulinDose: undefined,
 		secondsPassed: FOUR_HOURS_SECONDS + 1,
 	};
@@ -577,6 +605,20 @@ describe(`Test validations for the calculator parameters`, (): void => {
 			);
 		},
 	);
+
+	test.each`
+		invalidRecentBoluses
+		${null}
+		${undefined}
+	`(
+		`Validation checking on Recent Boluses: null and undefined throws error`,
+		({ invalidRecentBoluses }: { invalidRecentBoluses: Array<IRecentBolus> }): void => {
+			expect((): void => Validations.checkRecentBolus(invalidRecentBoluses)).toThrowError(
+				Errors.RecentBolusError(),
+			);
+		},
+	);
+
 	test.each`
 		validCurrentBKL
 		${0}

package/src/__tests__/components/Activity.test.jsx

@@ -3,33 +3,36 @@ 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 = require("@lingui/react");
 const react_2 = __importDefault(require("react"));
 const react_native_testing_library_1 = require("react-native-testing-library");
 const Activity_1 = __importDefault(require("../../components/activity/Activity"));
 const i18nUtils_1 = require("../../locale/i18nUtils");
 const enum_1 = require("../../types/enum");
+const Translations_1 = require("../../utils/Translations");
 const utils_1 = require("../utils");
+const ActivityIntensity = types_1.Activity.Enums.ActivityIntensity;
+const { light, moderate, hard } = ActivityIntensity;
 describe(`Activity - Component`, () => {
     afterEach(react_native_testing_library_1.cleanup);
     beforeEach(() => {
-        i18nUtils_1.i18n.activate(`en`);
+        i18nUtils_1.i18n.activate(types_1.Languages.en);
     });
     test.each `
 		activityIntensity
-		${RecommendationCalculator_1.ActivityIntensity.Light}
-		${RecommendationCalculator_1.ActivityIntensity.Moderate}
-		${RecommendationCalculator_1.ActivityIntensity.Hard}
+		${light}
+		${moderate}
+		${hard}
 	`(`Renders $activityIntensity`, ({ activityIntensity }) => {
         const { activityDisplayProps } = utils_1.getRecommendationProps();
         const activity = utils_1.generateActivityProps();
-        const wrapper = react_native_testing_library_1.render(utils_1.i18nProvided(<Activity_1.default activity={{ ...activity, activityIntensity }} activityType={activityDisplayProps.activityType} activityTitle={activityDisplayProps.activityTitle} activityReduction={0}/>));
+        const wrapper = react_native_testing_library_1.render(utils_1.i18nProvided(<Activity_1.default activity={{ ...activity, activityIntensity }} activityType={activityDisplayProps?.activityType ?? null} activityTitle={activityDisplayProps?.activityTitle ?? null} activityReduction={0}/>));
         utils_1.expectTextExists(wrapper, `Activity`);
         utils_1.expectTextExists(wrapper, `30`);
         utils_1.expectTextExists(wrapper, `min`);
         utils_1.expectTextExists(wrapper, `Based on the selected activity your insulin recommendation is reduced by:`);
-        utils_1.expectTextExists(wrapper, activityIntensity);
+        utils_1.expectTextExists(wrapper, Translations_1.ActivityIntensityTranslations[activityIntensity]());
     });
     test.each `
 		reduction
@@ -41,30 +44,48 @@ describe(`Activity - Component`, () => {
 	`(`Renders activity reduction from decimal: $reduction to percentage`, ({ reduction }) => {
         const { activityDisplayProps } = utils_1.getRecommendationProps();
         const activity = utils_1.generateActivityProps();
-        const wrapper = react_native_testing_library_1.render(utils_1.i18nProvided(<Activity_1.default activity={activity} activityType={activityDisplayProps.activityType} activityReduction={reduction} activityTitle={activityDisplayProps.activityTitle}/>));
+        const wrapper = react_native_testing_library_1.render(utils_1.i18nProvided(<Activity_1.default activity={activity} activityType={activityDisplayProps?.activityType ?? null} activityReduction={reduction} activityTitle={activityDisplayProps?.activityTitle ?? null}/>));
         utils_1.expectTextExists(wrapper, `${reduction * 100}%`);
     });
+    test(`Renders activity reduction as 0 when null is passed`, () => {
+        const { activityDisplayProps } = utils_1.getRecommendationProps();
+        const activity = utils_1.generateActivityProps();
+        const reduction = null;
+        const wrapper = react_native_testing_library_1.render(utils_1.i18nProvided(<Activity_1.default activity={activity} activityType={activityDisplayProps?.activityType ?? null} activityReduction={reduction} activityTitle={activityDisplayProps?.activityTitle ?? null}/>));
+        const text = utils_1.queryTextFromComponent(wrapper, enum_1.ActivityTestIds.ActivityReduction);
+        expect(text).toBe(`0%`);
+    });
     test(`Can render activity title`, () => {
         const { activityDisplayProps } = utils_1.getRecommendationProps();
         const activity = utils_1.generateActivityProps();
-        const wrapper = react_native_testing_library_1.render(utils_1.i18nProvided(<Activity_1.default activity={{ ...activity }} activityType={activityDisplayProps.activityType} activityTitle={activityDisplayProps.activityTitle} activityReduction={0}/>));
-        utils_1.expectTextExists(wrapper, activityDisplayProps.activityTitle);
+        const wrapper = react_native_testing_library_1.render(utils_1.i18nProvided(<Activity_1.default activity={{ ...activity }} activityType={activityDisplayProps?.activityType ?? null} activityTitle={activityDisplayProps?.activityTitle ?? null} activityReduction={0}/>));
+        utils_1.expectTextExists(wrapper, activityDisplayProps?.activityTitle);
     });
     test.each `
-		language     | locale         | message
-		${`English`} | ${enum_1.Language.en} | ${`Activity`}
-		${`Danish`}  | ${enum_1.Language.da} | ${`Aktivitet`}
-		${`German`}  | ${enum_1.Language.de} | ${`Aktivität`}
-		${`Spanish`} | ${enum_1.Language.es} | ${`Actividad`}
-		${`Italian`} | ${enum_1.Language.it} | ${`Attività fisica`}
-		${`French`}  | ${enum_1.Language.fr} | ${`Activité`}
+		language     | locale          | message
+		${`English`} | ${types_1.Languages.en} | ${`Activity`}
+		${`Danish`}  | ${types_1.Languages.da} | ${`Aktivitet`}
+		${`German`}  | ${types_1.Languages.de} | ${`Aktivität`}
+		${`Spanish`} | ${types_1.Languages.es} | ${`Actividad`}
+		${`Italian`} | ${types_1.Languages.it} | ${`Attività fisica`}
+		${`French`}  | ${types_1.Languages.fr} | ${`Activité`}
 	`(`Can render in $language`, ({ message, locale }) => {
         const { activityDisplayProps } = utils_1.getRecommendationProps();
         const activity = utils_1.generateActivityProps();
         i18nUtils_1.i18n.activate(locale);
         const wrapper = react_native_testing_library_1.render(<react_1.I18nProvider language={locale} i18n={i18nUtils_1.i18n}>
-				<Activity_1.default activity={activity} activityType={activityDisplayProps.activityType} activityTitle={activityDisplayProps.activityTitle} activityReduction={0}/>
+				<Activity_1.default activity={activity} activityType={activityDisplayProps?.activityType ?? null} activityTitle={activityDisplayProps?.activityTitle ?? null} activityReduction={0}/>
 			</react_1.I18nProvider>);
         utils_1.expectTextExists(wrapper, message);
     });
+    test(`ActivityIcon defaults to other if activityType is null`, () => {
+        const { activityDisplayProps } = utils_1.getRecommendationProps();
+        const activity = utils_1.generateActivityProps();
+        const wrapper = react_native_testing_library_1.render(utils_1.i18nProvided(<Activity_1.default activity={{ ...activity }} activityType={null} activityTitle={activityDisplayProps?.activityTitle ?? null} activityReduction={0}/>));
+        utils_1.expectTextExists(wrapper, activityDisplayProps?.activityTitle);
+        const existingLabel = `${types_1.Activity.Enums.ActivityEnum[types_1.Activity.Enums.ActivityEnum.Other]}_activity`;
+        const nonExistingLabel = `${types_1.Activity.Enums.ActivityEnum[types_1.Activity.Enums.ActivityEnum.Run]}_activity`;
+        expect(wrapper.queryByA11yLabel(existingLabel)).not.toBeNull();
+        expect(wrapper.queryByA11yLabel(nonExistingLabel)).toBeNull();
+    });
 });