@hedia/recommendation-screen 2.2.0-alpha.22 → 2.2.0-alpha.24

package/dist/src/RecommendationScreen.d.ts

@@ -16,15 +16,13 @@ export interface IForecast {
     forecastedGlucose: number;
     /** Forecasted time value to display. */
     forecastTime: string;
-    /** Latest CGM reading. */
-    latestCGMReading: ICGMReading;
 }
 /** Represents CGM data */
 export interface ICGMReading {
     /** Latest CGM reading time value. */
     CGMTime: string;
     /** Latest CGM reading value to display. */
-    glucoseMmoll: number;
+    latestCGMReading: number;
 }
 export interface IRecommendationProps {
     /** The blood glucose measurement unit that the user prefers. */
@@ -47,6 +45,8 @@ export interface IRecommendationProps {
     activityDisplayProps: IActivityDisplayProps | null;
     /** Forecast data received from the app */
     forecast: IForecast | null;
+    /** CGM data received from the app */
+    cgm: ICGMReading | null;
     /**
      * Callback function taking a single boolean argument and returning nothing.
      * To be called when the user decides on a presented carbohydrate recommendation.

package/dist/src/RecommendationScreen.js

@@ -460,7 +460,7 @@ export default class RecommendationScreen extends React.Component {
         const carbRecommendation = carbRecommendationProp !== null ? Math.round(carbRecommendationProp) : null;
         const recommendedCarbs = enteredCarbs ?? carbRecommendation;
         const isModalOpen = showExitModal || showLimitationMessage || showTimeoutModal;
-        const { activityDisplayProps, bloodGlucoseUnit, bloodKetoneUnit, calculatorParams, currentBKL, injectionMethod, language, onRecentInsulinYes, forecast, } = this.props;
+        const { activityDisplayProps, bloodGlucoseUnit, bloodKetoneUnit, calculatorParams, cgm, currentBKL, injectionMethod, language, onRecentInsulinYes, forecast, } = this.props;
         const { activity, currentBGL, carbohydrates: providedCarbs } = calculatorParams;
         const displayedBGL = currentBGL ? Utils.displayedBGLValue(currentBGL, bloodGlucoseUnit) : null;
         const displayedBKL = currentBKL !== null && bloodKetoneUnit ? Utils.displayedBKLValue(currentBKL, bloodKetoneUnit) : null;
@@ -474,7 +474,7 @@ export default class RecommendationScreen extends React.Component {
             }}>
 						<Header exitCallback={this.onExit}/>
 						<InfoBars label={i18n._(t `Active Insulin`)} value={activeInsulin ? `${activeInsulin.toFixed(1)}` : null} unit={i18n._(t `units`)} showNullAsDash={false} testID={{ unitID: ActiveInsulinUnitTestID, valueID: ActiveInsulinValueTestID }}/>
-						{forecast ? (<ForecastInfoBar label={i18n._(t `Forecasted Glucose`)} forecast={forecast} unit={bloodGlucoseUnit} testID={{ unitID: FGUnitTestID, valueID: FGValueTestID }}/>) : (<InfoBars label={i18n._(t `Blood Glucose Level`)} value={displayedBGL} unit={bloodGlucoseUnit} showNullAsDash={true} testID={{ unitID: BGUnitTestID, valueID: BGValueTestID }}/>)}
+						{forecast && cgm ? (<ForecastInfoBar label={i18n._(t `Forecasted Glucose`)} forecast={forecast} cgm={cgm} unit={bloodGlucoseUnit} testID={{ unitID: FGUnitTestID, valueID: FGValueTestID }}/>) : (<InfoBars label={i18n._(t `Blood Glucose Level`)} value={displayedBGL} unit={bloodGlucoseUnit} showNullAsDash={true} testID={{ unitID: BGUnitTestID, valueID: BGValueTestID }}/>)}
 						<InfoBars label={i18n._(t `Blood Ketone Level`)} value={displayedBKL} unit={bloodKetoneUnit} showNullAsDash={true} testID={{ unitID: BKUnitTestID, valueID: BKValueTestID }}/>
 						<View style={containerStyles.calcContainer}>
 							<View style={containerStyles.calcMargin}>

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

@@ -1,12 +1,14 @@
 /// <reference types="react" />
 import { BloodGlucoseUnit } from "@hedia/types";
-import { IForecast } from "../RecommendationScreen";
+import { ICGMReading, IForecast } from "../RecommendationScreen";
 import { Testing } from "../types/enum";
 export interface IProps {
     /** The display label that describes the value to the user. */
     label: string;
-    /** The value to display. */
+    /** The forecast value to display. */
     forecast: IForecast;
+    /** The cgm value to display. */
+    cgm: ICGMReading;
     /** Unit label to print after the value. */
     unit: BloodGlucoseUnit;
     /**  optional object that contains as properties a valueID and a unitID */

package/dist/src/components/ForecastInfoBar.js

@@ -9,7 +9,7 @@ import TextBold from "./text/TextBold";
 import TextRegular from "./text/TextRegular";
 /** A standard panel to display some data that the user entered. */
 const ForecastInfoBar = (props) => {
-    const { testID, label, unit, forecast } = props;
+    const { testID, label, unit, cgm, forecast } = props;
     /**
      * Determine the unit string to be displayed in the infobar.
      *
@@ -52,7 +52,7 @@ const ForecastInfoBar = (props) => {
 
 					<View style={row}>
 						<TextRegular style={infoStyles.currentCGM}>
-							{i18n._(t `Current glucose: ${forecast.latestCGMReading.glucoseMmoll} ${displayUnit(unit)}`)}
+							{i18n._(t `Current glucose: ${cgm.latestCGMReading} ${displayUnit(unit)}`)}
 						</TextRegular>
 					</View>
 				</View>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedia/recommendation-screen",
-  "version": "2.2.0-alpha.22",
+  "version": "2.2.0-alpha.24",
   "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
   "main": "dist/index.js",
   "files": [