@hedia/recommendation-screen 2.1.13 → 2.1.14

package/index.d.ts

@@ -1,5 +1,5 @@
 import RecommendationScreen from "./src/RecommendationScreen";
-import { RecommendationErrorEnum } from "./src/types/enum";
 import * as Errors from "./src/utils/RecommendationError";
 export default RecommendationScreen;
-export { Errors, RecommendationErrorEnum };
+export { Errors };
+export * from "./src/types/enum";

package/index.js

@@ -1,5 +1,5 @@
 import RecommendationScreen from "./src/RecommendationScreen";
-import { RecommendationErrorEnum } from "./src/types/enum";
 import * as Errors from "./src/utils/RecommendationError";
 export default RecommendationScreen;
-export { Errors, RecommendationErrorEnum };
+export { Errors };
+export * from "./src/types/enum";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedia/recommendation-screen",
-  "version": "2.1.13",
+  "version": "2.1.14",
   "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
   "main": "index.js",
   "scripts": {

package/src/RecommendationScreen.js

@@ -18,11 +18,12 @@ import LimitationMessage from "./components/LimitationMessage";
 import RecommendationModal from "./components/RecommendationModal";
 import TwoOptionModal, { modalStyle } from "./components/TwoOptionModal";
 import { changeLanguage, i18n } from "./locale/i18nUtils";
-import { InfoBarTestIds, RecommendationScreenTestIds } from "./types/enum";
+import { Testing } from "./types/enum";
 import { Messages } from "./utils/AttentionMessages";
 import { getAttentionMessage, getBGLevel, getLimitationMessage, getReminder } from "./utils/RecommendationUtils";
 import { Utils } from "./utils/Utils";
 import { validateParams } from "./utils/Validations";
+const { InfoBarTestIds, RecommendationScreenTestIds } = Testing.Id;
 // Ignoring long timer warnings
 // https://github.com/facebook/react-native/issues/12981#issuecomment-652745831
 YellowBox.ignoreWarnings([`Setting a timer`]);

package/src/__tests__/RecommendationScreen.test.js

@@ -3,7 +3,7 @@ import React from "react";
 import { cleanup, fireEvent, render } from "react-native-testing-library";
 import { i18n } from "../locale/i18nUtils";
 import RecommendationScreen from "../RecommendationScreen";
-import { HeaderTestIds, InfoBarTestIds, LimitationMessageTestIds, RecentInsulinTestIds, RecommendationModalTestIds, RecommendationReminders, RecommendedCarbsTestIds, RecommendedInsulinTestIds, RemeasureTestIds, TransferToLogbookTestIds, TwoOptionModalTestIds, } from "../types/enum";
+import { RecommendationReminders, Testing } from "../types/enum";
 import { Messages } from "../utils/AttentionMessages";
 import { LanguageError } from "../utils/RecommendationError";
 import { ActivityIntensityTranslations } from "../utils/Translations";
@@ -14,6 +14,7 @@ const ActivityEnum = Activity.Enums.ActivityEnum;
 const InjectionMethod = UserSettings.Enums.InjectionMethod;
 const MoodEnum = Logbook.Enums.MoodEnum;
 const { light, moderate, hard } = ActivityIntensity;
+const { HeaderTestIds, InfoBarTestIds, LimitationMessageTestIds, RecentInsulinTestIds, RecommendationModalTestIds, RecommendedCarbsTestIds, RecommendedInsulinTestIds, RemeasureTestIds, TransferToLogbookTestIds, TwoOptionModalTestIds, } = Testing.Id;
 describe(`RecommendationScreen`, () => {
     jest.useFakeTimers();
     beforeEach(() => {

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

@@ -4,7 +4,7 @@ import React from "react";
 import { cleanup, render } from "react-native-testing-library";
 import { default as ActivityComponent } from "../../components/activity/Activity";
 import { i18n } from "../../locale/i18nUtils";
-import { ActivityTestIds } from "../../types/enum";
+import { Testing } from "../../types/enum";
 import { ActivityIntensityTranslations } from "../../utils/Translations";
 import { expectTextExists, generateActivityProps, getRecommendationProps, i18nProvided, queryTextFromComponent, } from "../utils";
 const ActivityIntensity = Activity.Enums.ActivityIntensity;
@@ -47,7 +47,7 @@ describe(`Activity - Component`, () => {
         const activity = generateActivityProps();
         const reduction = null;
         const wrapper = render(i18nProvided(<ActivityComponent activity={activity} activityType={activityDisplayProps?.activityType ?? null} activityReduction={reduction} activityTitle={activityDisplayProps?.activityTitle ?? null}/>));
-        const text = queryTextFromComponent(wrapper, ActivityTestIds.ActivityReduction);
+        const text = queryTextFromComponent(wrapper, Testing.Id.ActivityTestIds.ActivityReduction);
         expect(text).toBe(`0%`);
     });
     test(`Can render activity title`, () => {

package/src/__tests__/components/Header.test.js

@@ -5,14 +5,14 @@ import { I18nProvider } from "@lingui/react";
 import Header from "../../components/Header";
 import { Languages } from "@hedia/types";
 import { i18n } from "../../locale/i18nUtils";
-import { HeaderTestIds } from "../../types/enum";
+import { Testing } from "../../types/enum";
 describe(`Header Component`, () => {
     afterEach(cleanup);
     test(`Exit button calls exitCallback`, () => {
         const props = getRecommendationProps();
         const { getByTestId } = render(<Header exitCallback={props.exitCallback}/>);
         expect(props.exitCallback).not.toBeCalled();
-        fireEvent.press(getByTestId(HeaderTestIds.ExitCalculation));
+        fireEvent.press(getByTestId(Testing.Id.HeaderTestIds.ExitCalculation));
         expect(props.exitCallback).toBeCalled();
     });
     test.each `

package/src/__tests__/components/LimitationMessage.test.js

@@ -4,7 +4,7 @@ import React from "react";
 import { cleanup, fireEvent, render } from "react-native-testing-library";
 import LimitationMessage from "../../components/LimitationMessage";
 import { i18n } from "../../locale/i18nUtils";
-import { LimitationMessageTestIds } from "../../types/enum";
+import { Testing } from "../../types/enum";
 import { Messages } from "../../utils/AttentionMessages";
 import { expectTextExists } from "../utils";
 const SAFETY_INSULIN_LIMIT = BolusCalculator.Constants.SAFETY_INSULIN_LIMIT;
@@ -20,7 +20,7 @@ describe(`Info Bars Component`, () => {
             onPressNextButton,
         };
         const limitationMessage = render(<LimitationMessage {...props}/>);
-        const nextButton = limitationMessage.getByTestId(LimitationMessageTestIds.OkButton);
+        const nextButton = limitationMessage.getByTestId(Testing.Id.LimitationMessageTestIds.OkButton);
         fireEvent(nextButton, `onPress`);
         expect(onPressNextButton).toBeCalled();
     });

package/src/__tests__/components/RecommendationModal.test.js

@@ -4,9 +4,10 @@ import React from "react";
 import { cleanup, fireEvent, render } from "react-native-testing-library";
 import RecommendationModal from "../../components/RecommendationModal";
 import { i18n } from "../../locale/i18nUtils";
-import { LimitationMessageTestIds, RecommendationModalTestIds } from "../../types/enum";
+import { Testing } from "../../types/enum";
 import { Messages } from "../../utils/AttentionMessages";
 import { expectTextExists, expectTextNotExists } from "../utils";
+const { LimitationMessageTestIds, RecommendationModalTestIds } = Testing.Id;
 describe(`RecommendationModal Component`, () => {
     afterEach(cleanup);
     beforeEach(() => {

package/src/__tests__/components/RecommendedCarbs.test.js

@@ -2,8 +2,9 @@ import React from "react";
 import { cleanup, fireEvent, render } from "react-native-testing-library";
 import InvisibleNumberInput from "../../components/InvisibleNumberInput";
 import RecommendedCarbs from "../../components/RecommendedCarbs";
-import { RecommendedCarbsTestIds } from "../../types/enum";
+import { Testing } from "../../types/enum";
 import { expectTextExists, expectTextNotExists } from "../utils";
+const { RecommendedCarbsTestIds } = Testing.Id;
 describe(`Calculation Component`, () => {
     afterEach(cleanup);
     test(`calculate total carbs`, () => {

package/src/__tests__/components/RecommendedInsulin.test.js

@@ -3,8 +3,9 @@ import React from "react";
 import { Platform } from "react-native";
 import { cleanup, fireEvent, render } from "react-native-testing-library";
 import RecommendedInsulin from "../../components/RecommendedInsulin";
-import { RecommendedInsulinTestIds } from "../../types/enum";
+import { Testing } from "../../types/enum";
 import { expectTextExists, expectTextNotExists } from "../utils";
+const { RecommendedInsulinTestIds } = Testing.Id;
 const SAFETY_INSULIN_LIMIT = BolusCalculator.Constants.SAFETY_INSULIN_LIMIT;
 const InjectionMethod = UserSettings.Enums.InjectionMethod;
 const { PenHalf, PenWhole, Pump } = InjectionMethod;

package/src/__tests__/components/Remeasure.test.js

@@ -2,8 +2,9 @@ import React from "react";
 import { Platform } from "react-native";
 import { cleanup, fireEvent, render } from "react-native-testing-library";
 import Remeasure from "../../components/Remeasure";
-import { RemeasureTestIds } from "../../types/enum";
+import { Testing } from "../../types/enum";
 import { expectTextExists, expectTextNotExists } from "../utils";
+const { RemeasureTestIds } = Testing.Id;
 describe(`Remeasure Component`, () => {
     afterEach(cleanup);
     test.each `

package/src/__tests__/components/TransferToLogbook.test.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { fireEvent, render } from "react-native-testing-library";
 import TransferToLogbook from "../../components/TransferToLogbook";
-import { TransferToLogbookTestIds } from "../../types/enum";
+import { Testing } from "../../types/enum";
 import { expectTextExists, expectTextNotExists } from "../utils";
 describe(`TransferToLogbook - Component`, () => {
     test(`Is null when visible not visible`, () => {
@@ -20,7 +20,7 @@ describe(`TransferToLogbook - Component`, () => {
         const transferMock = jest.fn();
         const wrapper = render(<TransferToLogbook visible={true} transfer={transferMock}/>);
         expectTextExists(wrapper, `Transfer to logbook`);
-        const button = wrapper.getByTestId(TransferToLogbookTestIds.TransferButton);
+        const button = wrapper.getByTestId(Testing.Id.TransferToLogbookTestIds.TransferButton);
         expect(transferMock).not.toBeCalled();
         fireEvent(button, `onPress`);
         expectTextNotExists(wrapper, `Transfer to logbook`);

package/src/__tests__/components/TwoOptionModal.test.js

@@ -1,8 +1,9 @@
 import React from "react";
 import { cleanup, fireEvent, render } from "react-native-testing-library";
 import TwoOptionModal from "../../components/TwoOptionModal";
-import { TwoOptionModalTestIds } from "../../types/enum";
+import { Testing } from "../../types/enum";
 import { expectTextExists } from "../utils";
+const { TwoOptionModalTestIds } = Testing.Id;
 describe(`TwoOptionModal Component`, () => {
     afterEach(cleanup);
     test(`Can can show text `, () => {

package/src/__tests__/utils.d.ts

@@ -2,7 +2,7 @@
 import { RenderAPI } from "react-native-testing-library";
 import { ReactTestInstance } from "react-test-renderer";
 import { IRecommendationProps } from "../RecommendationScreen";
-import { TestIdEnum } from "../types/enum";
+import { Testing } from "../types/enum";
 import { IActivityParams, IRecommendationParams, logbookEntry } from "../types/types";
 export declare function getRecommendationProps(partials?: Partial<IRecommendationProps>): IRecommendationProps;
 export declare function generateDefaultCalculatorParams(): IRecommendationParams;
@@ -10,7 +10,7 @@ export declare function generateActivityProps(): IActivityParams;
 export declare function generateDefaultActivitySettings(): IActivityParams["activitySettings"];
 export declare function generateDefaultLogbook(): logbookEntry;
 export declare function expectTextExists(component: RenderAPI, text: string | RegExp): void;
-export declare function queryTextFromComponent(wrapper: RenderAPI, testID: TestIdEnum): string;
+export declare function queryTextFromComponent(wrapper: RenderAPI, testID: Testing.Types.TestIdEnum): string;
 export declare function expectTextNotExists(component: RenderAPI, text: string | RegExp): void;
 export declare function i18nProvided(element: JSX.Element): JSX.Element;
 export declare function getIcon(wrapper: RenderAPI, name: string, active: boolean): ReactTestInstance | null;

package/src/components/Header.js

@@ -2,7 +2,7 @@ import { t } from "@lingui/macro";
 import React from "react";
 import { Dimensions, SafeAreaView, StyleSheet, Text, TouchableOpacity, View } from "react-native";
 import { i18n } from "../locale/i18nUtils";
-import { HeaderTestIds } from "../types/enum";
+import { Testing } from "../types/enum";
 import { BACKGROUND_COLOUR_PURPLE, BORDER_COLOUR_GREY } from "../utils/Constants";
 import Icon from "./Icon";
 export default class Header extends React.Component {
@@ -13,7 +13,7 @@ export default class Header extends React.Component {
 					<View style={headerStyles.margin}>
 						<View style={headerStyles.exitButtonContainer}>
 							<View style={headerStyles.exitButton}>
-								<TouchableOpacity testID={HeaderTestIds.ExitCalculation} accessibilityLabel="exitButton" style={headerStyles.exitButton} onPress={this.props.exitCallback}>
+								<TouchableOpacity testID={Testing.Id.HeaderTestIds.ExitCalculation} accessibilityLabel="exitButton" style={headerStyles.exitButton} onPress={this.props.exitCallback}>
 									<Icon iconIdentifier={`Ionicons/ios-close-circle-outline`} style={headerStyles.iconStyle}/>
 								</TouchableOpacity>
 								<View style={headerStyles.headerFiller}/>

package/src/components/InfoBars.d.ts

@@ -1,14 +1,14 @@
 import { BloodGlucoseUnit, BloodKetonesUnit } from "@hedia/types";
 import React from "react";
-import { InfoBarTestIds } from "../types/enum";
+import { Testing } from "../types/enum";
 export interface IProps {
     label: string;
     value: string | null;
     unit: string | BloodGlucoseUnit | BloodKetonesUnit | null;
     showNullAsDash: boolean;
     testID?: {
-        valueID: InfoBarTestIds.Value;
-        unitID: InfoBarTestIds.Unit;
+        valueID: Testing.Id.InfoBarTestIds.Value;
+        unitID: Testing.Id.InfoBarTestIds.Unit;
     };
 }
 export default class InfoBars extends React.Component<IProps> {

package/src/components/LimitationMessage.js

@@ -2,7 +2,7 @@ import { t } from "@lingui/macro";
 import * as React from "react";
 import { Text, TouchableOpacity, View } from "react-native";
 import { i18n } from "../locale/i18nUtils";
-import { LimitationMessageTestIds } from "../types/enum";
+import { Testing } from "../types/enum";
 import { stylesModal } from "./RecommendationModal";
 export default class LimitationMessage extends React.Component {
     constructor() {
@@ -17,7 +17,7 @@ export default class LimitationMessage extends React.Component {
 					<Text style={stylesModal.textMessage}>{limitationMessage}</Text>
 				</View>
 				<View style={stylesModal.containerAcceptButton}>
-					<TouchableOpacity testID={LimitationMessageTestIds.OkButton} accessibilityLabel="nextButtonModal" style={stylesModal.okButton} onPress={this.props.onPressNextButton}>
+					<TouchableOpacity testID={Testing.Id.LimitationMessageTestIds.OkButton} accessibilityLabel="nextButtonModal" style={stylesModal.okButton} onPress={this.props.onPressNextButton}>
 						<Text style={stylesModal.buttonText}>{i18n._(t `OK`)}</Text>
 					</TouchableOpacity>
 				</View>

package/src/components/RecentInsulin.js

@@ -2,7 +2,7 @@ import { t } from "@lingui/macro";
 import React from "react";
 import { Dimensions, StyleSheet, Text, TouchableOpacity, View } from "react-native";
 import { i18n } from "../locale/i18nUtils";
-import { RecentInsulinTestIds } from "../types/enum";
+import { Testing } from "../types/enum";
 import { infoStyles } from "./InfoBars";
 export default class RecentInsulin extends React.Component {
     constructor() {
@@ -19,10 +19,10 @@ export default class RecentInsulin extends React.Component {
 				</View>
 				<View style={recentInsulinStyles.buttonContainer}>
 					<View style={recentInsulinStyles.filler}/>
-					<TouchableOpacity testID={RecentInsulinTestIds.Yes} onPress={this.props.onRecentInsulinYes} style={[recentInsulinStyles.yesNoContainer, { marginRight: `2%` }]}>
+					<TouchableOpacity testID={Testing.Id.RecentInsulinTestIds.Yes} onPress={this.props.onRecentInsulinYes} style={[recentInsulinStyles.yesNoContainer, { marginRight: `2%` }]}>
 						<Text style={recentInsulinStyles.yesNoText}>{i18n._(t `Yes`)}</Text>
 					</TouchableOpacity>
-					<TouchableOpacity testID={RecentInsulinTestIds.No} onPress={this.props.onRecentInsulinNo} style={[recentInsulinStyles.yesNoContainer, { marginLeft: `2%` }]}>
+					<TouchableOpacity testID={Testing.Id.RecentInsulinTestIds.No} onPress={this.props.onRecentInsulinNo} style={[recentInsulinStyles.yesNoContainer, { marginLeft: `2%` }]}>
 						<Text style={recentInsulinStyles.yesNoText}>{i18n._(t `No`)}</Text>
 					</TouchableOpacity>
 					<View style={recentInsulinStyles.filler}/>

package/src/components/RecommendationModal.js

@@ -3,9 +3,10 @@ import * as React from "react";
 import { Dimensions, StyleSheet, Text, TouchableOpacity, View } from "react-native";
 import ReactNativeModal from "react-native-modal";
 import { i18n } from "../locale/i18nUtils";
-import { RecommendationModalTestIds } from "../types/enum";
+import { Testing } from "../types/enum";
 import { BORDER_COLOUR_TEAL } from "../utils/Constants";
 import LimitationMessage from "./LimitationMessage";
+const { RecommendationModalTestIds } = Testing.Id;
 export default class RecommendationModal extends React.Component {
     constructor(props) {
         super(props);

package/src/components/RecommendedCarbs.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { RecommendedCarbsTestIds } from "../types/enum";
+import { Testing } from "../types/enum";
 interface ICalculationRow {
     label: string;
     value: string;
@@ -21,7 +21,7 @@ export default class RecommendedCarbs extends React.Component<IProps, IState> {
     handlePartialInput: (partialInput: string) => void;
     handleChangedCarbs: (carbs: number) => void;
     renderRecommendedCarbs: () => JSX.Element;
-    renderRow: (row: ICalculationRow, testID: RecommendedCarbsTestIds) => JSX.Element;
+    renderRow: (row: ICalculationRow, testID: Testing.Id.RecommendedCarbsTestIds) => JSX.Element;
     render(): JSX.Element;
 }
 export {};

package/src/components/RecommendedCarbs.js

@@ -2,13 +2,14 @@ import { t } from "@lingui/macro";
 import React from "react";
 import { Alert, Dimensions, StyleSheet, Text, TouchableOpacity, View } from "react-native";
 import { i18n } from "../locale/i18nUtils";
-import { RecommendedCarbsTestIds } from "../types/enum";
+import { Testing } from "../types/enum";
 import { BORDER_COLOUR_GREY, BORDER_COLOUR_TEAL } from "../utils/Constants";
 import { CarbohydrateLimitError } from "../utils/RecommendationError";
 import Icon from "./Icon";
 import { infoStyles } from "./InfoBars";
 import InvisibleNumberInput from "./InvisibleNumberInput";
 import LineSeparator from "./LineSeparator";
+const { RecommendedCarbsTestIds } = Testing.Id;
 export default class RecommendedCarbs extends React.Component {
     constructor() {
         super(...arguments);

package/src/components/RecommendedInsulin.js

@@ -4,12 +4,13 @@ import React from "react";
 import { Alert, Dimensions, Platform, StyleSheet, Text, TouchableOpacity, View } from "react-native";
 import LinearGradient from "react-native-linear-gradient";
 import { i18n } from "../locale/i18nUtils";
-import { RecommendedInsulinTestIds } from "../types/enum";
+import { Testing } from "../types/enum";
 import { Messages } from "../utils/AttentionMessages";
 import { Utils } from "../utils/Utils";
 import Icon from "./Icon";
 import { infoStyles } from "./InfoBars";
 import InvisibleNumberInput from "./InvisibleNumberInput";
+const { RecommendedInsulinTestIds } = Testing.Id;
 const SAFETY_INSULIN_LIMIT = BolusCalculator.Constants.SAFETY_INSULIN_LIMIT;
 export default class RecommendedInsulin extends React.Component {
     constructor(props) {

package/src/components/Remeasure.js

@@ -3,7 +3,7 @@ import Slider from "@react-native-community/slider";
 import React from "react";
 import { Dimensions, Platform, StyleSheet, Text, View } from "react-native";
 import { i18n } from "../locale/i18nUtils";
-import { RemeasureTestIds } from "../types/enum";
+import { Testing } from "../types/enum";
 import { BORDER_COLOUR_GREY, BORDER_COLOUR_TEAL } from "../utils/Constants";
 import { infoStyles } from "./InfoBars";
 export default class Remeasure extends React.Component {
@@ -45,7 +45,7 @@ export default class Remeasure extends React.Component {
             if (slider !== null) {
                 this.slider = slider;
             }
-        }} testID={RemeasureTestIds.RemeasureSlider} accessibilityLabel="remeasureSlider" maximumTrackTintColor={BORDER_COLOUR_GREY} minimumTrackTintColor={BORDER_COLOUR_TEAL} thumbTintColor={BORDER_COLOUR_TEAL} maximumValue={6} minimumValue={0} step={0.5} style={[remeasureStyles.sliderStyle, { marginHorizontal }]} onValueChange={this.handleSliderChange}/>
+        }} testID={Testing.Id.RemeasureTestIds.RemeasureSlider} accessibilityLabel="remeasureSlider" maximumTrackTintColor={BORDER_COLOUR_GREY} minimumTrackTintColor={BORDER_COLOUR_TEAL} thumbTintColor={BORDER_COLOUR_TEAL} maximumValue={6} minimumValue={0} step={0.5} style={[remeasureStyles.sliderStyle, { marginHorizontal }]} onValueChange={this.handleSliderChange}/>
 			</View>);
     }
 }

package/src/components/TransferToLogbook.js

@@ -2,7 +2,7 @@ import React from "react";
 import { Dimensions, StyleSheet, Text, TouchableOpacity, View } from "react-native";
 import { t } from "@lingui/macro";
 import { i18n } from "../locale/i18nUtils";
-import { TransferToLogbookTestIds } from "../types/enum";
+import { Testing } from "../types/enum";
 import Icon from "./Icon";
 export default class TransferToLogbook extends React.Component {
     constructor() {
@@ -21,7 +21,7 @@ export default class TransferToLogbook extends React.Component {
         if (!this.props.visible) {
             return <View style={addToLogbookStyles.marginContainer}/>;
         }
-        return (<TouchableOpacity testID={TransferToLogbookTestIds.TransferButton} onPress={this.handlePress} disabled={this.state.pressed} style={addToLogbookStyles.container} accessibilityLabel="transferToLogbook">
+        return (<TouchableOpacity testID={Testing.Id.TransferToLogbookTestIds.TransferButton} onPress={this.handlePress} disabled={this.state.pressed} style={addToLogbookStyles.container} accessibilityLabel="transferToLogbook">
 				{!this.state.pressed ? (<View style={addToLogbookStyles.textContainer}>
 						<Text style={addToLogbookStyles.transferText}>{i18n._(t `Transfer to logbook`)}</Text>
 					</View>) : (<View style={addToLogbookStyles.textContainerActive}>

package/src/components/TwoOptionModal.js

@@ -1,9 +1,10 @@
 import * as React from "react";
 import { Dimensions, StatusBar, StyleSheet, Text, TouchableOpacity, View } from "react-native";
-import { TwoOptionModalTestIds } from "../types/enum";
+import { Testing } from "../types/enum";
 import { BACKGROUND_COLOUR_PURPLE, BORDER_COLOUR_GREY, BORDER_COLOUR_TEAL } from "../utils/Constants";
 import Icon from "./Icon";
 import { stylesModal } from "./RecommendationModal";
+const { TwoOptionModalTestIds } = Testing.Id;
 export default class TwoOptionModal extends React.Component {
     constructor(props) {
         super(props);

package/src/components/activity/Activity.js

@@ -2,7 +2,7 @@ import { t } from "@lingui/macro";
 import React from "react";
 import { Dimensions, StyleSheet, Text, View } from "react-native";
 import { i18n } from "../../locale/i18nUtils";
-import { ActivityTestIds } from "../../types/enum";
+import { Testing } from "../../types/enum";
 import { infoStyles } from "../InfoBars";
 import ActivityIcon from "./ActivityIcon";
 import ActivityIntensity from "./ActivityIntensity";
@@ -34,7 +34,7 @@ export default class Activity extends React.Component {
 							</Text>
 						</View>
 						<View style={[infoStyles.borderContainer, activityStyles.verticalMargin]}>
-							<Text style={activityStyles.reductionPercentage} testID={ActivityTestIds.ActivityReduction}>
+							<Text style={activityStyles.reductionPercentage} testID={Testing.Id.ActivityTestIds.ActivityReduction}>
 								{reductionPercentage}%
 							</Text>
 						</View>

package/src/types/enum.d.ts

@@ -1,67 +1,73 @@
-export declare enum RecommendationScreenTestIds {
-    RecommendationScrollView = "recommendation-screen-scroll-view"
-}
-export declare enum ActivityTestIds {
-    ActivityReduction = "activity-reduction-percentage"
-}
-export declare enum HeaderTestIds {
-    ExitCalculation = "exit-calculation-button"
-}
-export declare enum LimitationMessageTestIds {
-    OkButton = "limitation-message-ok-button"
-}
-export declare enum RecentInsulinTestIds {
-    No = "recent-insulin-no",
-    Yes = "recent-insulin-yes"
-}
-export declare enum RecommendedCarbsTestIds {
-    RecommendedCarbs = "recommended-carbs",
-    EditRecommendedCarbs = "edit-recommended-carbs",
-    InvisibleCarbInput = "invisible-recommended-carbs-input",
-    EnteredCarbs = "entered-carbs",
-    RemoveRecommendation = "remove-carb-recommendation",
-    TotalCarbs = "total-carbs"
-}
-export declare enum RecommendedInsulinTestIds {
-    EditRecommendedInsulin = "edit-recommended-insulin",
-    InvisibleInsulinInput = "invisible-recommended-insulin-input",
-    ShownInsulinText = "shown-insulin-text"
-}
-export declare enum RecommendationModalTestIds {
-    DeclineCarbs = "recommendation-modal-decline-carbs",
-    AcceptCarbs = "recommendation-modal-accept-carbs",
-    OkButton = "recommendation-modal-ok-button",
-    SuggestedCarbs = "recommendation-modal-suggested-carbs"
-}
-export declare enum RemeasureTestIds {
-    RemeasureSlider = "remeasure-slider"
-}
-export declare enum TransferToLogbookTestIds {
-    TransferButton = "transfer-to-logbook-button"
-}
-export declare enum TwoOptionModalTestIds {
-    ExitButton = "exit-two-option-modal",
-    FirstOption = "first-option-button",
-    SecondOption = "second-option-button"
-}
-export declare namespace InfoBarTestIds {
-    enum Value {
-        BloodGlucose = "BloodGlucoseValue",
-        BloodKetone = "BloodKetoneValue",
-        ActiveInsulin = "ActiveInsulinValue"
-    }
-    enum Label {
-        BloodKetone = "BloodKetoneLabel",
-        BloodGlucose = "BloodGlucoseLabel",
-        ActiveInsulin = "ActiveInsulinLabel"
+export declare namespace Testing {
+    namespace Id {
+        enum RecommendationScreenTestIds {
+            RecommendationScrollView = "recommendation-screen-scroll-view"
+        }
+        enum ActivityTestIds {
+            ActivityReduction = "activity-reduction-percentage"
+        }
+        enum HeaderTestIds {
+            ExitCalculation = "exit-calculation-button"
+        }
+        enum LimitationMessageTestIds {
+            OkButton = "limitation-message-ok-button"
+        }
+        enum RecentInsulinTestIds {
+            No = "recent-insulin-no",
+            Yes = "recent-insulin-yes"
+        }
+        enum RecommendedCarbsTestIds {
+            RecommendedCarbs = "recommended-carbs",
+            EditRecommendedCarbs = "edit-recommended-carbs",
+            InvisibleCarbInput = "invisible-recommended-carbs-input",
+            EnteredCarbs = "entered-carbs",
+            RemoveRecommendation = "remove-carb-recommendation",
+            TotalCarbs = "total-carbs"
+        }
+        enum RecommendedInsulinTestIds {
+            EditRecommendedInsulin = "edit-recommended-insulin",
+            InvisibleInsulinInput = "invisible-recommended-insulin-input",
+            ShownInsulinText = "shown-insulin-text"
+        }
+        enum RecommendationModalTestIds {
+            DeclineCarbs = "recommendation-modal-decline-carbs",
+            AcceptCarbs = "recommendation-modal-accept-carbs",
+            OkButton = "recommendation-modal-ok-button",
+            SuggestedCarbs = "recommendation-modal-suggested-carbs"
+        }
+        enum RemeasureTestIds {
+            RemeasureSlider = "remeasure-slider"
+        }
+        enum TransferToLogbookTestIds {
+            TransferButton = "transfer-to-logbook-button"
+        }
+        enum TwoOptionModalTestIds {
+            ExitButton = "exit-two-option-modal",
+            FirstOption = "first-option-button",
+            SecondOption = "second-option-button"
+        }
+        namespace InfoBarTestIds {
+            enum Value {
+                BloodGlucose = "BloodGlucoseValue",
+                BloodKetone = "BloodKetoneValue",
+                ActiveInsulin = "ActiveInsulinValue"
+            }
+            enum Label {
+                BloodKetone = "BloodKetoneLabel",
+                BloodGlucose = "BloodGlucoseLabel",
+                ActiveInsulin = "ActiveInsulinLabel"
+            }
+            enum Unit {
+                BloodKetone = "BloodKetoneUnit",
+                BloodGlucose = "BloodGlucoseUnit",
+                ActiveInsulin = "ActiveInsulinUnit"
+            }
+        }
     }
-    enum Unit {
-        BloodKetone = "BloodKetoneUnit",
-        BloodGlucose = "BloodGlucoseUnit",
-        ActiveInsulin = "ActiveInsulinUnit"
+    namespace Types {
+        type TestIdEnum = Id.ActivityTestIds | Id.HeaderTestIds | Id.LimitationMessageTestIds | Id.RecentInsulinTestIds | Id.RecommendedCarbsTestIds | Id.RecommendedInsulinTestIds | Id.RecommendationModalTestIds | Id.RemeasureTestIds | Id.TransferToLogbookTestIds | Id.TwoOptionModalTestIds | Id.InfoBarTestIds.Unit | Id.InfoBarTestIds.Value | Id.InfoBarTestIds.Label;
     }
 }
-export declare type TestIdEnum = ActivityTestIds | HeaderTestIds | LimitationMessageTestIds | RecentInsulinTestIds | RecommendedCarbsTestIds | RecommendedInsulinTestIds | RecommendationModalTestIds | RemeasureTestIds | TransferToLogbookTestIds | TwoOptionModalTestIds | InfoBarTestIds.Unit | InfoBarTestIds.Value | InfoBarTestIds.Label;
 export declare enum RecommendationErrorEnum {
     ActivityDuration = 0,
     ActivityTargetBGL = 1,