@hedia/recommendation-screen 2.2.0-alpha.36 → 2.2.0-alpha.38

package/dist/src/components/RecentInsulin.js

@@ -1,73 +1,93 @@
-import { t } from "@lingui/macro";
 import React from "react";
 import { Dimensions, StyleSheet, TouchableOpacity, View } from "react-native";
-import LinearGradient from "react-native-linear-gradient";
-import { i18n } from "../locale/i18nUtils";
+import { translate } from "../locales/translate";
 import { Testing } from "../types/enum";
-import { colors } from "../utils/Constants";
 import { infoStyles } from "./InfoBars";
 import TextBold from "./text/TextBold";
 /** Display a card that prompts the user to recall if they injected insulin recently. */
 export default class RecentInsulin extends React.Component {
     /**
      *
-     * @returns JSX element that displays a card with the question “Have you taken rapid-acting insulin within the last 4 hours? Along with two buttons labeled “Yes” and “No” respectively.
+     * @returns JSX element that displays a card with the question “Have you taken insulin within the last 4 hours? Along with two buttons labeled “Yes” and “No” respectively.
      * If the user taps the “Yes” button, the onRecentInsulinYes prop callback function should be called.
      * If the user taps the “No” button, the onRecentInsulinNo prop callback function should be called.
      */
     render = () => {
-        const { container, title, buttonContainer, yesNoContainer, yesNoText } = styles;
-        return (<LinearGradient style={container} colors={colors.gradientWithOpacity} useAngle={true} angle={170}>
-				<TextBold style={title}>
-					{i18n._(t `Have you taken rapid-acting insulin within the last 4 hours?`)}
-				</TextBold>
-
-				<View style={buttonContainer}>
-					<TouchableOpacity testID={Testing.Id.RecentInsulinTestIds.Yes} onPress={this.props.onRecentInsulinYes} style={[yesNoContainer, { marginRight: `2%` }]}>
-						<TextBold style={yesNoText}>{i18n._(t `Yes`)}</TextBold>
+        return (<View style={recentInsulinStyles.container}>
+				<View style={recentInsulinStyles.titleContainer}>
+					<TextBold style={recentInsulinStyles.recommended}>
+						{translate(`Recommended amount of insulin`)}
+					</TextBold>
+				</View>
+				<View style={recentInsulinStyles.takenInsulinContainer}>
+					<TextBold style={recentInsulinStyles.takenInsulin}>
+						{translate(`Have you taken insulin within the last 4 hours?`)}
+					</TextBold>
+				</View>
+				<View style={recentInsulinStyles.buttonContainer}>
+					<View style={recentInsulinStyles.filler}/>
+					<TouchableOpacity testID={Testing.Id.RecentInsulinTestIds.Yes} onPress={this.props.onRecentInsulinYes} style={[recentInsulinStyles.yesNoContainer, { marginRight: `2%` }]}>
+						<TextBold style={recentInsulinStyles.yesNoText}>{translate(`Yes`)}</TextBold>
 					</TouchableOpacity>
-					<TouchableOpacity testID={Testing.Id.RecentInsulinTestIds.No} onPress={this.props.onRecentInsulinNo} style={[yesNoContainer, { marginLeft: `2%` }]}>
-						<TextBold style={yesNoText}>{i18n._(t `No`)}</TextBold>
+					<TouchableOpacity testID={Testing.Id.RecentInsulinTestIds.No} onPress={this.props.onRecentInsulinNo} style={[recentInsulinStyles.yesNoContainer, { marginLeft: `2%` }]}>
+						<TextBold style={recentInsulinStyles.yesNoText}>{translate(`No`)}</TextBold>
 					</TouchableOpacity>
+					<View style={recentInsulinStyles.filler}/>
 				</View>
-			</LinearGradient>);
+			</View>);
     };
 }
-const { width } = Dimensions.get(`screen`);
-const styles = StyleSheet.create({
+const recentInsulinStyles = StyleSheet.create({
     container: {
         ...infoStyles.margin,
+        backgroundColor: `rgba(118, 82, 255, 0.5)`,
         borderRadius: 5,
     },
-    title: {
-        fontFamily: `Poppins-Bold`,
+    titleContainer: {
+        flex: 1,
+        justifyContent: `center`,
+        alignItems: `center`,
+        marginTop: `4%`,
+        marginBottom: `4%`,
+    },
+    recommended: {
         ...infoStyles.label,
-        fontSize: width / 24,
-        lineHeight: width / 16,
+    },
+    takenInsulinContainer: {
+        flex: 1,
+        justifyContent: `center`,
+        alignItems: `center`,
+        marginTop: `2%`,
+    },
+    takenInsulin: {
+        ...infoStyles.label,
+        fontSize: Dimensions.get(`screen`).width / 27,
         textAlign: `center`,
-        paddingHorizontal: width / 13,
-        marginTop: width / 32,
     },
     buttonContainer: {
         flex: 1,
         flexDirection: `row`,
-        justifyContent: `center`,
-        marginVertical: width / 26,
+        justifyContent: `space-evenly`,
+        marginTop: `4%`,
+        marginBottom: `5%`,
     },
     yesNoContainer: {
         flex: 1,
-        maxWidth: width / 4,
-        backgroundColor: colors.teal,
-        borderColor: colors.teal,
-        borderRadius: 50,
+        borderColor: `white`,
+        borderRadius: 100,
         borderWidth: 2,
+        paddingHorizontal: `2%`,
+        paddingVertical: `1%`,
     },
     yesNoText: {
         textAlign: `center`,
-        paddingVertical: width / 43,
-        color: colors.darkBlue,
-        fontSize: width / 25,
-        lineHeight: width / 16,
-        fontFamily: `Poppins-Bold`,
+        paddingTop: `1%`,
+        paddingBottom: `1%`,
+        color: `white`,
+        fontSize: Dimensions.get(`screen`).width / 25,
+    },
+    filler: {
+        flex: 1,
     },
 });
+//# sourceMappingURL=RecentInsulin.js.map

package/dist/src/components/RecentInsulin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RecentInsulin.js","sourceRoot":"","sources":["../../../src/components/RecentInsulin.tsx"],"names":[],"mappings":"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"}

package/dist/src/components/RecommendationModal.d.ts

@@ -82,15 +82,16 @@ export default class RecommendationModal extends React.Component<IModalProps, IM
 export declare const stylesModal: {
     modalStyle: {
         margin: number;
-        backgroundColor: string;
     };
     container: {
         flex: number;
+        backgroundColor: string;
         justifyContent: "center";
         paddingHorizontal: string;
     };
     containerAcceptButton: {
         flex: number;
+        backgroundColor: string;
         justifyContent: "flex-start";
     };
     titleContainer: {

package/dist/src/components/RecommendationModal.js

@@ -1,10 +1,9 @@
-import { t } from "@lingui/macro";
 import * as React from "react";
 import { Dimensions, StyleSheet, TouchableOpacity, View } from "react-native";
 import ReactNativeModal from "react-native-modal";
-import { i18n } from "../locale/i18nUtils";
+import { translate } from "../locales/translate";
 import { Testing } from "../types/enum";
-import { colors } from "../utils/Constants";
+import { BORDER_COLOUR_TEAL } from "../utils/Constants";
 import LimitationMessage from "./LimitationMessage";
 import TextBold from "./text/TextBold";
 import TextRegular from "./text/TextRegular";
@@ -51,10 +50,10 @@ export default class RecommendationModal extends React.Component {
     recommendationButtons = () => {
         return (<View style={stylesModal.recommendationButtonsContainer}>
 				<TouchableOpacity testID={RecommendationModalTestIds.AcceptCarbs} style={stylesModal.affirmativeCarbsButton} onPress={this.props.onAcceptCarbohydrates}>
-					<TextRegular style={stylesModal.affirmativeCarbsText}>{i18n._(t `OK`)}</TextRegular>
+					<TextRegular style={stylesModal.affirmativeCarbsText}>{translate(`OK`)}</TextRegular>
 				</TouchableOpacity>
 				<TouchableOpacity testID={RecommendationModalTestIds.DeclineCarbs} style={stylesModal.negativeCarbsButton} onPress={this.props.onDeclineCarbohydrates}>
-					<TextRegular style={stylesModal.negativeCarbsText}>{i18n._(t `NO`)}</TextRegular>
+					<TextRegular style={stylesModal.negativeCarbsText}>{translate(`NO`)}</TextRegular>
 				</TouchableOpacity>
 			</View>);
     };
@@ -69,7 +68,7 @@ export default class RecommendationModal extends React.Component {
 				<View style={stylesModal.innerView}>
 					<View style={stylesModal.recommendationRow}>
 						<TextRegular style={stylesModal.recommendEatingText}>
-							{i18n._(t `We recommend eating an additional:`)}
+							{translate(`We recommend eating an additional:`)}
 						</TextRegular>
 					</View>
 					<View style={stylesModal.suggestedContainer}>
@@ -78,19 +77,19 @@ export default class RecommendationModal extends React.Component {
 								{`${displayCarbs} `}
 							</TextBold>
 							<TextRegular style={stylesModal.carbohydrateText}>
-								{i18n._(t `grams of carbohydrates`)}
+								{translate(`grams of carbohydrates`)}
 							</TextRegular>
 						</TextRegular>
 					</View>
 					<View style={stylesModal.recommendationRow}>
 						<TextRegular style={stylesModal.recommendEatingText}>
-							{i18n._(t `Instead of taking insulin`)}
+							{translate(`Instead of taking insulin`)}
 						</TextRegular>
 					</View>
 				</View>
 				<View style={stylesModal.addToCalculationContainer}>
 					<TextRegular style={stylesModal.addToCalculation}>
-						{i18n._(t `Would you like to add this to your current calculation?`)}
+						{translate(`Would you like to add this to your current calculation?`)}
 					</TextRegular>
 					{this.recommendationButtons()}
 				</View>
@@ -105,14 +104,14 @@ export default class RecommendationModal extends React.Component {
         return (<React.Fragment>
 				<View style={stylesModal.container}>
 					<View style={stylesModal.titleContainer}>
-						<TextBold style={stylesModal.textTittleMessage}>{i18n._(t `Attention`)}</TextBold>
+						<TextBold style={stylesModal.textTittleMessage}>{translate(`Attention`)}</TextBold>
 					</View>
 					<TextRegular style={stylesModal.textMessage}>{attentionMessage}</TextRegular>
 					{willRecommendCarbs ? this.recommendCarbohydrates(suggestedCarbohydrates) : null}
 				</View>
 				{willRecommendCarbs ? null : (<View style={stylesModal.containerAcceptButton}>
 						<TouchableOpacity testID={RecommendationModalTestIds.OkButton} style={stylesModal.okButton} onPress={this.props.onClickOkButton}>
-							<TextRegular style={stylesModal.buttonText}>{i18n._(t `OK`)}</TextRegular>
+							<TextRegular style={stylesModal.buttonText}>{translate(`OK`)}</TextRegular>
 						</TouchableOpacity>
 					</View>)}
 			</React.Fragment>);
@@ -150,24 +149,23 @@ const textFontSize = width / 20;
 const titleFontSize = width / 13;
 /** @internal */
 export const stylesModal = StyleSheet.create({
-    modalStyle: {
-        margin: 0,
-        backgroundColor: colors.darkBlue,
-    },
+    modalStyle: { margin: 0 },
     container: {
         flex: 4,
+        backgroundColor: `rgba(30, 35, 87, 0.9)`,
         justifyContent: `center`,
         paddingHorizontal: `4%`,
     },
     containerAcceptButton: {
         flex: 1,
+        backgroundColor: `rgba(30, 35, 87, 0.9)`,
         justifyContent: `flex-start`,
     },
     titleContainer: { marginBottom: `5%` },
     recommendationRow: { justifyContent: `center`, alignContent: `center`, marginBottom: `3%` },
     textTittleMessage: { color: `white`, fontSize: titleFontSize, textAlign: `center` },
     textMessage: { color: `white`, fontSize: textFontSize, textAlign: `center` },
-    buttonText: { color: colors.teal, fontSize: buttonFontSize, textAlign: `center` },
+    buttonText: { color: BORDER_COLOUR_TEAL, fontSize: buttonFontSize, textAlign: `center` },
     addToCalculationContainer: { justifyContent: `flex-start`, marginVertical: `5%` },
     innerView: {
         alignContent: `center`,
@@ -176,26 +174,22 @@ export const stylesModal = StyleSheet.create({
         marginTop: `5%`,
         borderRadius: height / 80,
         borderWidth: height / 300,
-        borderColor: colors.teal,
+        borderColor: BORDER_COLOUR_TEAL,
     },
     suggestedContainer: { justifyContent: `center`, flexDirection: `row`, marginBottom: `3%` },
     suggestedCarbs: { color: `white`, fontSize: sugestionFontSize },
     textCenter: { textAlign: `center` },
-    recommendEatingText: {
-        color: colors.dustyBlue,
-        fontSize: recommendEatingFontSize,
-        textAlign: `center`,
-    },
+    recommendEatingText: { color: `#C5D0E7`, fontSize: recommendEatingFontSize, textAlign: `center` },
     carbohydrateText: { color: `white`, fontSize: sugestionFontSize },
     addToCalculation: { color: `white`, fontSize: textFontSize, textAlign: `center` },
     recommendationButtonsContainer: { justifyContent: `center`, flexDirection: `row`, margin: `3%` },
-    affirmativeCarbsText: { color: colors.teal, fontSize: buttonFontSize, textAlign: `center` },
+    affirmativeCarbsText: { color: BORDER_COLOUR_TEAL, fontSize: buttonFontSize, textAlign: `center` },
     negativeCarbsText: { color: `white`, fontSize: buttonFontSize, textAlign: `center` },
     affirmativeCarbsButton: {
         marginTop: `2%`,
         borderRadius: buttonBorderRadius,
         borderWidth: buttonBorderWidth,
-        borderColor: colors.teal,
+        borderColor: BORDER_COLOUR_TEAL,
         width: buttonWidth,
         height: buttonHeight,
         alignSelf: `center`,
@@ -217,10 +211,11 @@ export const stylesModal = StyleSheet.create({
         marginTop: `6%`,
         borderRadius: buttonBorderRadius,
         borderWidth: buttonBorderWidth,
-        borderColor: colors.teal,
+        borderColor: BORDER_COLOUR_TEAL,
         width: buttonWidth,
         height: buttonHeight,
         alignSelf: `center`,
         justifyContent: `center`,
     },
 });
+//# sourceMappingURL=RecommendationModal.js.map

package/dist/src/components/RecommendationModal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RecommendationModal.js","sourceRoot":"","sources":["../../../src/components/RecommendationModal.tsx"],"names":[],"mappings":"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"}

package/dist/src/components/RecommendedCarbs.d.ts

@@ -1,5 +1,6 @@
 import React from "react";
 import { Testing } from "../types/enum";
+declare const RecommendedCarbsTestIds: typeof Testing.Id.RecommendedCarbsTestIds;
 export interface ICalculationRow {
     label: string;
     value: string;
@@ -92,3 +93,4 @@ export default class RecommendedCarbs extends React.Component<IProps, IState> {
      */
     render(): JSX.Element;
 }
+export {};

package/dist/src/components/RecommendedCarbs.js

@@ -1,10 +1,8 @@
-import { t } from "@lingui/macro";
 import React from "react";
 import { Alert, Dimensions, StyleSheet, TouchableOpacity, View } from "react-native";
-import EditIcon from "../assets/icons/Edit";
-import { i18n } from "../locale/i18nUtils";
+import { translate } from "../locales/translate";
 import { Testing } from "../types/enum";
-import { colors } from "../utils/Constants";
+import { BORDER_COLOUR_GREY, BORDER_COLOUR_TEAL } from "../utils/Constants";
 import { CarbohydrateLimitError } from "../utils/RecommendationError";
 import Icon from "./Icon";
 import { infoStyles } from "./InfoBars";
@@ -65,10 +63,8 @@ export default class RecommendedCarbs extends React.Component {
         if (carbs >= 0) {
             if (carbs > 300) {
                 this.setState({ partialInput: this.props.recommendedCarbs });
-                return Alert.alert(i18n._(t `Attention`), CarbohydrateLimitError().message, [
-                    {
-                        text: i18n._(t `OK`),
-                    },
+                return Alert.alert(translate(`Attention`), CarbohydrateLimitError().message, [
+                    { text: translate(`OK`) },
                 ]);
             }
             this.props.changedRecommendedCarbs(carbs);
@@ -90,46 +86,46 @@ export default class RecommendedCarbs extends React.Component {
     renderRecommendedCarbs = () => {
         const shownCarbs = this.state.partialInput ?? Math.round(Number(this.props.recommendedCarbs));
         const totalCarbs = Math.round(parseFloat(this.props.enteredCarbs) + Number(shownCarbs));
-        return (<>
-				<LineSeparator color={colors.fadeBlue}/>
+        return (<React.Fragment>
+				<LineSeparator color={BORDER_COLOUR_GREY}/>
 				<View style={calculationStyles.borderContainer}>
 					<View style={calculationStyles.recommendedContainer}>
 						<TouchableOpacity testID={RecommendedCarbsTestIds.RemoveRecommendation} style={calculationStyles.removeRecommended} onPress={this.props.removeRecommendedCarbs}>
 							<Icon iconIdentifier={`Ionicons/ios-close-circle-outline`} style={calculationStyles.removeRecommendedIcon}/>
 						</TouchableOpacity>
-						<TextBold style={calculationStyles.recommendedLabel}>{i18n._(t `Recommended`)}</TextBold>
+						<TextBold style={calculationStyles.recommendedLabel}>{translate(`Recommended`)}</TextBold>
 					</View>
 				</View>
 				<View style={calculationStyles.borderContainer}>
 					<View style={calculationStyles.recommendedContainer}>
-						<TextBold style={calculationStyles.recommendedLabel}>{i18n._(t `Additional`)}</TextBold>
+						<TextBold style={calculationStyles.recommendedLabel}>{translate(`Additional`)}</TextBold>
 					</View>
 					<View style={calculationStyles.valueUnitContainer}>
 						<TouchableOpacity testID={RecommendedCarbsTestIds.EditRecommendedCarbs} onPress={this.showTextInput} style={[calculationStyles.valueUnitContainer]}>
 							<View style={calculationStyles.valueContainer}>
-								<TextBold testID={RecommendedCarbsTestIds.RecommendedCarbs} style={{ ...calculationStyles.value, color: colors.teal }}>
+								<TextBold testID={RecommendedCarbsTestIds.RecommendedCarbs} style={{ ...calculationStyles.value, color: BORDER_COLOUR_TEAL }}>
 									{shownCarbs}
 								</TextBold>
 							</View>
 							<View style={[calculationStyles.unitContainer]}>
 								<View style={calculationStyles.editIconContainer}>
-									<EditIcon />
+									<Icon style={calculationStyles.editIcon} iconIdentifier={`Feather/edit`}/>
 								</View>
-								<TextRegular style={{ ...calculationStyles.units, color: colors.teal }}>
-									{i18n._(t `grams`)}
+								<TextRegular style={{ ...calculationStyles.units, color: BORDER_COLOUR_TEAL }}>
+									{translate(`grams`)}
 								</TextRegular>
 							</View>
 						</TouchableOpacity>
 					</View>
 				</View>
-				<LineSeparator color={colors.fadeBlue}/>
+				<LineSeparator color={BORDER_COLOUR_TEAL}/>
 				{this.renderRow({
-                label: i18n._(t `Total`),
+                label: translate(`Total`),
                 value: totalCarbs.toString(),
-                units: i18n._(t `grams`),
+                units: translate(`grams`),
             }, RecommendedCarbsTestIds.TotalCarbs)}
 				<InvisibleNumberInput testID={RecommendedCarbsTestIds.InvisibleCarbInput} negativeAllowed={false} cleanPartialInput={true} decimalPlaces={0} visible={(callback) => (this.callbackInput = callback)} partialInput={this.handlePartialInput} onEnd={this.handleChangedCarbs} startValue={this.props.recommendedCarbs} maxLength={3}/>
-			</>);
+			</React.Fragment>);
     };
     /**
      * Display a row of information for the user. Specifically used to display the amount of carbohydrates that the user has entered.
@@ -138,7 +134,7 @@ export default class RecommendedCarbs extends React.Component {
      * @returns A JSX element to display 3 strings on the screen: label, value, and a unit.
      */
     renderRow = (row, testID) => {
-        return (<View style={calculationStyles.borderContainer}>
+        return (<View style={[calculationStyles.borderContainer, { paddingVertical: `1%` }]}>
 				<View style={calculationStyles.rowContainer}>
 					<TextBold style={calculationStyles.rowLabel}>{row.label}</TextBold>
 				</View>
@@ -162,23 +158,20 @@ export default class RecommendedCarbs extends React.Component {
      */
     render() {
         const carbs = Number(this.props.recommendedCarbs);
-        return (<>
+        return (<React.Fragment>
 				<View style={calculationStyles.foodTitleContainer}>
-					<TextBold style={infoStyles.label}>{i18n._(t `Food`)}</TextBold>
-					<TextRegular style={calculationStyles.foodUnitsLabel}>
-						{`(${i18n._(t `Carbohydrates`)})`}
-					</TextRegular>
+					<TextBold style={infoStyles.label}>{translate(`Food`)}</TextBold>
+					<TextRegular style={calculationStyles.foodUnitsLabel}>{translate(`Carbohydrates`)}</TextRegular>
 				</View>
 				{this.renderRow({
-                label: i18n._(t `Entered`),
+                label: translate(`Entered`),
                 value: this.props.enteredCarbs,
-                units: i18n._(t `grams`),
+                units: translate(`grams`),
             }, RecommendedCarbsTestIds.EnteredCarbs)}
 				{!isNaN(carbs) && carbs > 0 ? this.renderRecommendedCarbs() : null}
-			</>);
+			</React.Fragment>);
     }
 }
-const { width } = Dimensions.get(`screen`);
 const calculationStyles = StyleSheet.create({
     borderContainer: {
         ...infoStyles.borderContainer,
@@ -193,7 +186,7 @@ const calculationStyles = StyleSheet.create({
     },
     foodUnitsLabel: {
         ...infoStyles.units,
-        color: colors.fadeBlue,
+        color: `rgba(160, 180, 240, 1)`,
         paddingLeft: `1%`,
     },
     rowContainer: {
@@ -201,7 +194,7 @@ const calculationStyles = StyleSheet.create({
     },
     rowLabel: {
         color: `white`,
-        fontSize: width / 25,
+        fontSize: Dimensions.get(`screen`).width / 25,
     },
     enteredContainer: {
         flex: 3,
@@ -209,7 +202,7 @@ const calculationStyles = StyleSheet.create({
     },
     entered: {
         color: `white`,
-        fontSize: width / 23,
+        fontSize: Dimensions.get(`screen`).width / 23,
     },
     valueUnitContainer: {
         ...infoStyles.valueUnitContainer,
@@ -227,15 +220,21 @@ const calculationStyles = StyleSheet.create({
         ...infoStyles.units,
     },
     editIconContainer: {
-        paddingLeft: `20%`,
+        justifyContent: `flex-end`,
+        paddingRight: `20%`,
+        flexDirection: `row`,
+    },
+    editIcon: {
+        color: BORDER_COLOUR_TEAL,
+        fontSize: Dimensions.get(`screen`).width / 30,
     },
     recommendedContainer: {
         flex: 7,
         flexDirection: `row`,
     },
     recommendedLabel: {
-        color: colors.teal,
-        fontSize: width / 25,
+        color: BORDER_COLOUR_TEAL,
+        fontSize: Dimensions.get(`screen`).width / 25,
         alignSelf: `center`,
     },
     removeRecommended: {
@@ -244,8 +243,9 @@ const calculationStyles = StyleSheet.create({
         marginTop: `1%`,
     },
     removeRecommendedIcon: {
-        color: colors.teal,
-        fontSize: width / 20,
+        color: BORDER_COLOUR_TEAL,
+        fontSize: Dimensions.get(`screen`).width / 20,
         paddingBottom: `0.5%`,
     },
 });
+//# sourceMappingURL=RecommendedCarbs.js.map

package/dist/src/components/RecommendedCarbs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RecommendedCarbs.js","sourceRoot":"","sources":["../../../src/components/RecommendedCarbs.tsx"],"names":[],"mappings":"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"}

package/dist/src/components/RecommendedInsulin.d.ts

@@ -1,5 +1,5 @@
-import { Logbook, UserSettings } from "@hedia/types";
 import React from "react";
+import { UserSettings } from "@hedia/types";
 export interface IProps {
     /** The amount of insulin in units to display to the user as a recommendation. */
     insulinRecommendation: number;
@@ -13,8 +13,6 @@ export interface IProps {
     activityReduction: number | null;
     /** Used to determine how the insulin amount should be rounded. */
     injectionMethod: UserSettings.Enums.InjectionMethod;
-    /** Used to show different text depending on different insulin ranges. */
-    forecast?: Logbook.Types.ILogbookEntry[`forecast_glucose`];
     /**
      * Callback function taking a number as argument and giving no return value.
      * To be called with the new value every time the content of the insulin input field gets changed.