@hedia/recommendation-screen 1.4.4 → 1.5.1

package/ios/HediaRecommendationScreen.xcodeproj/project.pbxproj

@@ -20,6 +20,18 @@
 		67B736B68E6CE9470594F423 /* libPods-HediaRecommendationScreen-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C6208DA582D28E78321BE4C /* libPods-HediaRecommendationScreen-tvOSTests.a */; };
 		7B5B860F1F9B42AA34AC5152 /* libPods-HediaRecommendationScreen-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EFC57BC9FB3B2C296DEE36A4 /* libPods-HediaRecommendationScreen-tvOS.a */; };
 		9EC25A0760FAC772A9BD725C /* libPods-HediaRecommendationScreen-HediaRecommendationScreenTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5EDA6B8933B78062F35AD378 /* libPods-HediaRecommendationScreen-HediaRecommendationScreenTests.a */; };
+		072C9E3B51DA436C891218B1 /* Roboto-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A825F67CF7F84470A6CA153E /* Roboto-Black.ttf */; };
+		22573CC8B7CE4FF1BD10295D /* Roboto-BlackItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 292E9B7C9CC34528A189562E /* Roboto-BlackItalic.ttf */; };
+		7A871848483F435B9A0BEA2C /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB57D47699604DFAA6805BA9 /* Roboto-Bold.ttf */; };
+		E61177AB81304E969ADEED74 /* Roboto-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 02F7D2222CF04F1080EC856D /* Roboto-BoldItalic.ttf */; };
+		054F998137774421AE47012A /* Roboto-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A40E87F3A8C2414EAFEB6561 /* Roboto-Italic.ttf */; };
+		F761ADFC0F1D40219F84BC4E /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E61EBECE6F704FA9B6A0A0A2 /* Roboto-Light.ttf */; };
+		E250F52F03C348DEB792BFA7 /* Roboto-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 525CDCD5B0F548FBB616CEE7 /* Roboto-LightItalic.ttf */; };
+		729B270E7FF74717B643ED72 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 07CB8191B5BD449ABE77A9E4 /* Roboto-Medium.ttf */; };
+		79BF34167F0341D784C2AB24 /* Roboto-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D4A4DBD26164962A8597BE7 /* Roboto-MediumItalic.ttf */; };
+		12D08CCEE9074DA9ABC5CBE3 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7A22FC8F689C40349AD97898 /* Roboto-Regular.ttf */; };
+		293D0A9D749748C09992BD81 /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B8AB50A0130D4104AE2EEC01 /* Roboto-Thin.ttf */; };
+		F4F44066504F4C7EA1C5B3E9 /* Roboto-ThinItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5C1C36955725451281090FA0 /* Roboto-ThinItalic.ttf */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -83,6 +95,18 @@
 		EE8FB5191C77428097063908 /* AntDesign.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = "<group>"; };
 		EFC57BC9FB3B2C296DEE36A4 /* libPods-HediaRecommendationScreen-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-HediaRecommendationScreen-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		FC979D0C4CEB472E8E6FB497 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; };
+		A825F67CF7F84470A6CA153E /* Roboto-Black.ttf */ = {isa = PBXFileReference; name = "Roboto-Black.ttf"; path = "../assets/fonts/Roboto/Roboto-Black.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		292E9B7C9CC34528A189562E /* Roboto-BlackItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-BlackItalic.ttf"; path = "../assets/fonts/Roboto/Roboto-BlackItalic.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		BB57D47699604DFAA6805BA9 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; name = "Roboto-Bold.ttf"; path = "../assets/fonts/Roboto/Roboto-Bold.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		02F7D2222CF04F1080EC856D /* Roboto-BoldItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-BoldItalic.ttf"; path = "../assets/fonts/Roboto/Roboto-BoldItalic.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		A40E87F3A8C2414EAFEB6561 /* Roboto-Italic.ttf */ = {isa = PBXFileReference; name = "Roboto-Italic.ttf"; path = "../assets/fonts/Roboto/Roboto-Italic.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		E61EBECE6F704FA9B6A0A0A2 /* Roboto-Light.ttf */ = {isa = PBXFileReference; name = "Roboto-Light.ttf"; path = "../assets/fonts/Roboto/Roboto-Light.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		525CDCD5B0F548FBB616CEE7 /* Roboto-LightItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-LightItalic.ttf"; path = "../assets/fonts/Roboto/Roboto-LightItalic.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		07CB8191B5BD449ABE77A9E4 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; name = "Roboto-Medium.ttf"; path = "../assets/fonts/Roboto/Roboto-Medium.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		5D4A4DBD26164962A8597BE7 /* Roboto-MediumItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-MediumItalic.ttf"; path = "../assets/fonts/Roboto/Roboto-MediumItalic.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		7A22FC8F689C40349AD97898 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; name = "Roboto-Regular.ttf"; path = "../assets/fonts/Roboto/Roboto-Regular.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		B8AB50A0130D4104AE2EEC01 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; name = "Roboto-Thin.ttf"; path = "../assets/fonts/Roboto/Roboto-Thin.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		5C1C36955725451281090FA0 /* Roboto-ThinItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-ThinItalic.ttf"; path = "../assets/fonts/Roboto/Roboto-ThinItalic.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -157,6 +181,18 @@
 				B766079F5D3B4E2DA1F1D2FA /* Octicons.ttf */,
 				FC979D0C4CEB472E8E6FB497 /* SimpleLineIcons.ttf */,
 				A147DC8C00E94433B8826100 /* Zocial.ttf */,
+				A825F67CF7F84470A6CA153E /* Roboto-Black.ttf */,
+				292E9B7C9CC34528A189562E /* Roboto-BlackItalic.ttf */,
+				BB57D47699604DFAA6805BA9 /* Roboto-Bold.ttf */,
+				02F7D2222CF04F1080EC856D /* Roboto-BoldItalic.ttf */,
+				A40E87F3A8C2414EAFEB6561 /* Roboto-Italic.ttf */,
+				E61EBECE6F704FA9B6A0A0A2 /* Roboto-Light.ttf */,
+				525CDCD5B0F548FBB616CEE7 /* Roboto-LightItalic.ttf */,
+				07CB8191B5BD449ABE77A9E4 /* Roboto-Medium.ttf */,
+				5D4A4DBD26164962A8597BE7 /* Roboto-MediumItalic.ttf */,
+				7A22FC8F689C40349AD97898 /* Roboto-Regular.ttf */,
+				B8AB50A0130D4104AE2EEC01 /* Roboto-Thin.ttf */,
+				5C1C36955725451281090FA0 /* Roboto-ThinItalic.ttf */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -381,6 +417,18 @@
 			files = (
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
+				072C9E3B51DA436C891218B1 /* Roboto-Black.ttf in Resources */,
+				22573CC8B7CE4FF1BD10295D /* Roboto-BlackItalic.ttf in Resources */,
+				7A871848483F435B9A0BEA2C /* Roboto-Bold.ttf in Resources */,
+				E61177AB81304E969ADEED74 /* Roboto-BoldItalic.ttf in Resources */,
+				054F998137774421AE47012A /* Roboto-Italic.ttf in Resources */,
+				F761ADFC0F1D40219F84BC4E /* Roboto-Light.ttf in Resources */,
+				E250F52F03C348DEB792BFA7 /* Roboto-LightItalic.ttf in Resources */,
+				729B270E7FF74717B643ED72 /* Roboto-Medium.ttf in Resources */,
+				79BF34167F0341D784C2AB24 /* Roboto-MediumItalic.ttf in Resources */,
+				12D08CCEE9074DA9ABC5CBE3 /* Roboto-Regular.ttf in Resources */,
+				293D0A9D749748C09992BD81 /* Roboto-Thin.ttf in Resources */,
+				F4F44066504F4C7EA1C5B3E9 /* Roboto-ThinItalic.ttf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

package/package.json

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

package/react-native.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+    project: {
+        ios: {},
+        android: {},
+    },
+    assets: [`./assets/fonts`],
+};

package/src/RecommendationScreen.d.ts

@@ -20,9 +20,10 @@ export interface IRecommendationProps {
     closeCalculationCallback(): void;
     exitCallback(): void;
     onRecentInsulinYes(): void;
-    transferToLogbook(carbs: IResult, insulin: IResult, reminder: number): void;
+    transferToLogbook(carbs: IResult, insulin: IResult, reminder: number, recommendationDate: Date): void;
     onError(error: RecommendationError): void;
     showBolusBar(toggle: boolean): void;
+    restartCalculation(): void;
 }
 interface IState {
     remeasureTime: number;
@@ -36,26 +37,32 @@ interface IState {
     enteredCarbs?: number;
     enteredInsulin?: number;
     recommendationModal: boolean;
-    exitModal: boolean;
+    showExitModal: boolean;
+    showLimitationMessage: boolean;
+    showTimeoutModal: boolean;
 }
 export default class RecommendationScreen extends React.Component<IRecommendationProps, IState> {
     private readonly timer;
     private readonly suggestedCarbs;
     private readonly hasError;
+    private readonly recommendationDate;
     private scrollView;
     constructor(props: IRecommendationProps);
     componentWillUnmount(): void;
     recalculateInsulin: (calculatorParams: Calculator.IRecommendationParams) => void;
     onExit: () => void;
+    hideAttentionModal: () => void;
+    hideLimitationMessage: () => void;
+    hideExitModal: () => void;
+    hideTimeoutModal: () => void;
     updateRemeasureTime: (remeasureTime: number) => void;
     handleNoRecentInsulin: () => void;
     updateCarbRecommendation: (enteredCarbs: number) => void;
     removeCarbRecommendation: () => void;
     declineCarbRecommendation: () => void;
     acceptCarbRecommendation: () => void;
-    hideAttentionModal: () => void;
-    hideExitModal: () => void;
     closeCalculation: () => void;
+    restartCalculation: () => void;
     handleMoodSelected: (selectedMood: IState["selectedMood"]) => void;
     updateInsulinRecommendation: (enteredInsulin: number) => void;
     handleTransfer: () => void;

package/src/RecommendationScreen.jsx

@@ -36,12 +36,13 @@ const Calculator = __importStar(require("@hedia/recommendation-calculator"));
 const react_2 = require("@lingui/react");
 const Emotion_1 = __importDefault(require("./components/mood/Emotion"));
 const TransferToLogbook_1 = __importDefault(require("./components/TransferToLogbook"));
-const RecommendationError_1 = require("./utils/RecommendationError");
 const macro_1 = require("@lingui/macro");
 const Activity_1 = __importDefault(require("./components/activity/Activity"));
-const ExitModal_1 = __importDefault(require("./components/ExitModal"));
+const LimitationMessage_1 = __importDefault(require("./components/LimitationMessage"));
 const RecommendationModal_1 = __importDefault(require("./components/RecommendationModal"));
+const TwoOptionModal_1 = __importStar(require("./components/TwoOptionModal"));
 const i18nUtils_1 = require("./locale/i18nUtils");
+const AttentionMessages_1 = require("./utils/AttentionMessages");
 const RecommendationUtils_1 = require("./utils/RecommendationUtils");
 const Utils_1 = require("./utils/Utils");
 const Validations_1 = require("./utils/Validations");
@@ -53,20 +54,35 @@ class RecommendationScreen extends react_1.default.Component {
         super(props);
         this.hasError = false;
         this.recalculateInsulin = (calculatorParams) => {
-            const { bolus } = Calculator.calculateRecommendation(calculatorParams);
+            const { bolus, wasLimited, activityReduction } = Calculator.calculateRecommendation(calculatorParams);
             this.setState({
                 insulinRecommendation: Utils_1.Utils.roundValue(bolus, this.props.injectionMethod),
                 enteredInsulin: undefined,
+                wasLimited,
+                activityReduction,
+                showLimitationMessage: wasLimited,
             });
         };
         this.onExit = () => {
             if (this.state.isRecommendationDisplayed) {
-                this.setState({ exitModal: true }, () => this.props.showBolusBar(!this.state.exitModal));
+                this.setState({ showExitModal: true }, () => this.props.showBolusBar(!this.state.showExitModal));
             }
             else {
                 this.props.exitCallback();
             }
         };
+        this.hideAttentionModal = () => {
+            this.setState({ recommendationModal: false });
+        };
+        this.hideLimitationMessage = () => {
+            this.setState({ showLimitationMessage: false });
+        };
+        this.hideExitModal = () => {
+            this.setState({ showExitModal: false }, () => this.props.showBolusBar(!this.state.showExitModal));
+        };
+        this.hideTimeoutModal = () => {
+            this.setState({ showTimeoutModal: false }, () => this.props.showBolusBar(!this.state.showTimeoutModal));
+        };
         this.updateRemeasureTime = (remeasureTime) => {
             this.setState({ remeasureTime });
         };
@@ -93,16 +109,14 @@ class RecommendationScreen extends react_1.default.Component {
             this.hideAttentionModal();
             this.props.carbRecommendationAnswer(true);
         };
-        this.hideAttentionModal = () => {
-            this.setState({ recommendationModal: false });
-        };
-        this.hideExitModal = () => {
-            this.setState({ exitModal: false }, () => this.props.showBolusBar(!this.state.exitModal));
-        };
         this.closeCalculation = () => {
-            this.hideExitModal();
+            this.state.showExitModal ? this.hideExitModal() : this.hideTimeoutModal();
             this.props.closeCalculationCallback();
         };
+        this.restartCalculation = () => {
+            this.hideTimeoutModal();
+            this.props.restartCalculation();
+        };
         this.handleMoodSelected = (selectedMood) => {
             this.setState({ selectedMood });
         };
@@ -110,12 +124,11 @@ class RecommendationScreen extends react_1.default.Component {
             this.setState({ enteredInsulin });
         };
         this.handleTransfer = () => {
-            if (this.state.exitModal) {
-                this.hideExitModal();
-            }
-            const carbs = { suggested: this.suggestedCarbs, entered: this.state.enteredCarbs };
-            const insulin = { suggested: this.state.insulinRecommendation, entered: this.state.enteredInsulin };
-            this.props.transferToLogbook(carbs, insulin, this.state.remeasureTime);
+            const { enteredCarbs, enteredInsulin, insulinRecommendation, remeasureTime, showExitModal } = this.state;
+            const carbs = { suggested: this.suggestedCarbs, entered: enteredCarbs };
+            const insulin = { suggested: insulinRecommendation, entered: enteredInsulin };
+            showExitModal ? this.hideExitModal() : this.hideTimeoutModal();
+            this.props.transferToLogbook(carbs, insulin, remeasureTime, this.recommendationDate);
         };
         this.getBGLevelAttentionMessage = () => {
             const { calculatorParams, latestLogbookFrom6Hours } = this.props;
@@ -136,6 +149,7 @@ class RecommendationScreen extends react_1.default.Component {
         try {
             Validations_1.validateParams(props);
             i18nUtils_1.changeLanguage(props.language);
+            this.recommendationDate = new Date(global.Date.now());
             const { recentBoluses } = props.calculatorParams;
             const { bolus, carbRecommendation, activityReduction, wasLimited, activeInsulin, } = Calculator.calculateRecommendation(props.calculatorParams);
             this.suggestedCarbs = carbRecommendation;
@@ -149,10 +163,12 @@ class RecommendationScreen extends react_1.default.Component {
                 activeInsulin,
                 selectedMood: null,
                 recommendationModal: wasLimited || !!Math.round(carbRecommendation) || !!this.getBGLevelAttentionMessage(),
-                exitModal: false,
+                showExitModal: false,
+                showLimitationMessage: false,
+                showTimeoutModal: false,
             };
             this.timer = setTimeout(() => {
-                props.onError(RecommendationError_1.TimeoutLimitError());
+                this.setState({ showTimeoutModal: true }, () => this.props.showBolusBar(!this.state.showTimeoutModal));
             }, enum_1.Milliseconds.Minute * 15);
         }
         catch (error) {
@@ -174,28 +190,34 @@ class RecommendationScreen extends react_1.default.Component {
         return (<react_2.I18nProvider language={this.props.language} i18n={i18nUtils_1.i18n}>
 				<react_native_1.ScrollView style={containerStyles.container} ref={(view) => (this.scrollView = view)}>
 					<Header_1.default exitCallback={this.onExit}/>
-					<InfoBars_1.default style={{ flex: 5 }} label={i18nUtils_1.i18n._(macro_1.t `Active Insulin`)} value={activeInsulin ? `${activeInsulin.toFixed(1)}` : null} units={i18nUtils_1.i18n._(macro_1.t `units`)} showNullAsDash={false}/>
+					<InfoBars_1.default label={i18nUtils_1.i18n._(macro_1.t `Active Insulin`)} value={activeInsulin ? `${activeInsulin.toFixed(1)}` : null} units={i18nUtils_1.i18n._(macro_1.t `units`)} showNullAsDash={false}/>
 					<InfoBars_1.default label={i18nUtils_1.i18n._(macro_1.t `Blood Glucose Level`)} value={currentBGL ? `${displayedBGL}` : null} units={this.props.units} showNullAsDash={true}/>
 					<react_native_1.View style={containerStyles.calcContainer}>
 						<react_native_1.View style={containerStyles.calcMargin}>
 							<react_native_1.View style={[
             containerStyles.calcBorder,
             {
-                borderColor: carbRecommendation ? Constants_1.BORDER_COLOUR_TEAL : Constants_1.BORDER_COLOUR_GREY,
+                borderColor: Math.round(carbRecommendation)
+                    ? Constants_1.BORDER_COLOUR_TEAL
+                    : Constants_1.BORDER_COLOUR_GREY,
             },
         ]}>
 								<RecommendedCarbs_1.default enteredCarbs={`${carbohydrates}`} changedRecommendedCarbs={this.updateCarbRecommendation} recommendedCarbs={`${enteredCarbs ?? Math.round(carbRecommendation)}`} removeRecommendedCarbs={this.removeCarbRecommendation}/>
-								<Remeasure_1.default onSliderChange={this.updateRemeasureTime} remeasureTime={this.state.remeasureTime}/>
 							</react_native_1.View>
 						</react_native_1.View>
 					</react_native_1.View>
 					{this.props.calculatorParams.activity && this.props.activityDisplayProps ? (<Activity_1.default activity={this.props.calculatorParams.activity} activityType={this.props.activityDisplayProps.activityType} activityTitle={this.props.activityDisplayProps.activityTitle} activityReduction={this.state.activityReduction}/>) : null}
+					<Remeasure_1.default onSliderChange={this.updateRemeasureTime} remeasureTime={this.state.remeasureTime}/>
 					{!this.state.isRecommendationDisplayed ? (<RecentInsulin_1.default onRecentInsulinYes={this.props.onRecentInsulinYes} onRecentInsulinNo={this.handleNoRecentInsulin}/>) : (<RecommendedInsulin_1.default injectionMethod={this.props.injectionMethod} insulinRecommendation={insulinRecommendation} enteredInsulin={enteredInsulin} activityReduction={activityReduction} updateRecommendedInsulin={this.updateInsulinRecommendation}/>)}
 					<Emotion_1.default moodSelected={this.handleMoodSelected} currentMood={this.state.selectedMood}/>
 					<TransferToLogbook_1.default visible={isRecommendationDisplayed} transfer={this.handleTransfer}/>
-					<RecommendationModal_1.default isVisible={recommendationModal} suggestedCarbohydrates={carbRecommendation} attentionMessage={this.getBGLevelAttentionMessage()} limitationMessage={this.getLimitationAttentionMessage()} onClickOkButton={this.hideAttentionModal} onAcceptCarbohydrates={this.acceptCarbRecommendation} onDeclineCarbohydrates={this.declineCarbRecommendation}/>
+					<RecommendationModal_1.default isVisible={recommendationModal} suggestedCarbohydrates={Math.round(carbRecommendation)} attentionMessage={this.getBGLevelAttentionMessage()} limitationMessage={this.getLimitationAttentionMessage()} onClickOkButton={this.hideAttentionModal} onAcceptCarbohydrates={this.acceptCarbRecommendation} onDeclineCarbohydrates={this.declineCarbRecommendation}/>
 				</react_native_1.ScrollView>
-				{this.state.exitModal ? (<ExitModal_1.default onSave={this.handleTransfer} onCloseCalculation={this.closeCalculation} onClose={this.hideExitModal}/>) : null}
+				{this.state.showExitModal ? (<TwoOptionModal_1.default title={i18nUtils_1.i18n._(macro_1.t `Save data before closing?`)} message={i18nUtils_1.i18n._(macro_1.t `Your saved data will be used for future calculations.`)} textFirstOption={i18nUtils_1.i18n._(macro_1.t `Save to logbook`)} textSecondOption={i18nUtils_1.i18n._(macro_1.t `Close calculation`)} isCancelable={true} rowAsButtonLayout={true} firstOption={this.handleTransfer} secondOption={this.closeCalculation} onClose={this.hideExitModal}/>) : null}
+				{this.state.showLimitationMessage ? (<react_native_1.View style={TwoOptionModal_1.modalStyle.container}>
+						<LimitationMessage_1.default limitationMessage={this.getLimitationAttentionMessage()} onPressNextButton={this.hideLimitationMessage}/>
+					</react_native_1.View>) : null}
+				{this.state.showTimeoutModal ? (this.state.isRecommendationDisplayed ? (<TwoOptionModal_1.default title={AttentionMessages_1.Messages.TimeoutPrompTitle()} message={AttentionMessages_1.Messages.TimeoutRecommendationVisible(this.recommendationDate)} textFirstOption={i18nUtils_1.i18n._(macro_1.t `Yes, save to logbook`)} textSecondOption={i18nUtils_1.i18n._(macro_1.t `No, return to dashboard`)} rowAsButtonLayout={false} firstOption={this.handleTransfer} secondOption={this.closeCalculation}/>) : (<TwoOptionModal_1.default title={AttentionMessages_1.Messages.TimeoutPrompTitle()} message={AttentionMessages_1.Messages.TimeoutRecommendationNotVisible()} textFirstOption={i18nUtils_1.i18n._(macro_1.t `Start new calculation`)} textSecondOption={i18nUtils_1.i18n._(macro_1.t `Return to dashboard`)} rowAsButtonLayout={false} firstOption={this.restartCalculation} secondOption={this.closeCalculation}/>)) : null}
 			</react_2.I18nProvider>);
     }
 }
@@ -210,6 +232,7 @@ const containerStyles = react_native_1.StyleSheet.create({
     },
     calcMargin: {
         flex: 1,
+        marginBottom: 0,
         margin: Header_1.headerStyles.margin.margin,
     },
     calcBorder: {

package/src/RecommendationScreen.tsx

@@ -15,15 +15,16 @@ import * as Calculator from "@hedia/recommendation-calculator";
 import { I18nProvider } from "@lingui/react";
 import Emotion from "./components/mood/Emotion";
 import TransferToLogbook from "./components/TransferToLogbook";
-import { RecommendationError, TimeoutLimitError } from "./utils/RecommendationError";
+import { RecommendationError } from "./utils/RecommendationError";
 
 import { t } from "@lingui/macro";
 import Activity from "./components/activity/Activity";
-import ExitModal from "./components/ExitModal";
+import LimitationMessage from "./components/LimitationMessage";
 import RecommendationModal from "./components/RecommendationModal";
+import TwoOptionModal, { modalStyle } from "./components/TwoOptionModal";
 import { changeLanguage, i18n } from "./locale/i18nUtils";
 import { IActivityDisplayProps, logbookEntry } from "./types/types";
-import { AttentionMessage } from "./utils/AttentionMessages";
+import { AttentionMessage, Messages } from "./utils/AttentionMessages";
 import { getAttentionMessage, getBGLevel, getLimitationMessage, getReminder } from "./utils/RecommendationUtils";
 import { Utils } from "./utils/Utils";
 import { validateParams } from "./utils/Validations";
@@ -52,9 +53,10 @@ export interface IRecommendationProps {
 	closeCalculationCallback(): void;
 	exitCallback(): void;
 	onRecentInsulinYes(): void;
-	transferToLogbook(carbs: IResult, insulin: IResult, reminder: number): void;
+	transferToLogbook(carbs: IResult, insulin: IResult, reminder: number, recommendationDate: Date): void;
 	onError(error: RecommendationError): void;
 	showBolusBar(toggle: boolean): void;
+	restartCalculation(): void;
 }
 
 interface IState {
@@ -69,13 +71,16 @@ interface IState {
 	enteredCarbs?: number;
 	enteredInsulin?: number;
 	recommendationModal: boolean;
-	exitModal: boolean;
+	showExitModal: boolean;
+	showLimitationMessage: boolean;
+	showTimeoutModal: boolean;
 }
 
 export default class RecommendationScreen extends React.Component<IRecommendationProps, IState> {
 	private readonly timer: ReturnType<typeof setTimeout>;
 	private readonly suggestedCarbs: number;
 	private readonly hasError: boolean = false;
+	private readonly recommendationDate: Date;
 	private scrollView: ScrollView;
 
 	constructor(props: IRecommendationProps) {
@@ -84,7 +89,7 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 			validateParams(props);
 
 			changeLanguage(props.language);
-
+			this.recommendationDate = new Date(global.Date.now());
 			const { recentBoluses } = props.calculatorParams;
 			const {
 				bolus,
@@ -107,11 +112,15 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 				selectedMood: null,
 				recommendationModal:
 					wasLimited || !!Math.round(carbRecommendation) || !!this.getBGLevelAttentionMessage(),
-				exitModal: false,
+				showExitModal: false,
+				showLimitationMessage: false,
+				showTimeoutModal: false,
 			};
 
 			this.timer = setTimeout((): void => {
-				props.onError(TimeoutLimitError());
+				this.setState({ showTimeoutModal: true }, (): void =>
+					this.props.showBolusBar(!this.state.showTimeoutModal),
+				);
 			}, Milliseconds.Minute * 15);
 		} catch (error) {
 			this.hasError = true;
@@ -124,21 +133,37 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 	}
 
 	public recalculateInsulin = (calculatorParams: Calculator.IRecommendationParams): void => {
-		const { bolus } = Calculator.calculateRecommendation(calculatorParams);
+		const { bolus, wasLimited, activityReduction } = Calculator.calculateRecommendation(calculatorParams);
 		this.setState({
 			insulinRecommendation: Utils.roundValue(bolus, this.props.injectionMethod),
 			enteredInsulin: undefined,
+			wasLimited,
+			activityReduction,
+			showLimitationMessage: wasLimited,
 		});
 	};
 
 	public onExit = (): void => {
 		if (this.state.isRecommendationDisplayed) {
-			this.setState({ exitModal: true }, (): void => this.props.showBolusBar(!this.state.exitModal));
+			this.setState({ showExitModal: true }, (): void => this.props.showBolusBar(!this.state.showExitModal));
 		} else {
 			this.props.exitCallback();
 		}
 	};
 
+	public hideAttentionModal = (): void => {
+		this.setState({ recommendationModal: false });
+	};
+	public hideLimitationMessage = (): void => {
+		this.setState({ showLimitationMessage: false });
+	};
+	public hideExitModal = (): void => {
+		this.setState({ showExitModal: false }, (): void => this.props.showBolusBar(!this.state.showExitModal));
+	};
+	public hideTimeoutModal = (): void => {
+		this.setState({ showTimeoutModal: false }, (): void => this.props.showBolusBar(!this.state.showTimeoutModal));
+	};
+
 	public updateRemeasureTime = (remeasureTime: number): void => {
 		this.setState({ remeasureTime });
 	};
@@ -173,17 +198,15 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 		this.hideAttentionModal();
 		this.props.carbRecommendationAnswer(true);
 	};
-	public hideAttentionModal = (): void => {
-		this.setState({ recommendationModal: false });
-	};
 
-	public hideExitModal = (): void => {
-		this.setState({ exitModal: false }, (): void => this.props.showBolusBar(!this.state.exitModal));
-	};
 	public closeCalculation = (): void => {
-		this.hideExitModal();
+		this.state.showExitModal ? this.hideExitModal() : this.hideTimeoutModal();
 		this.props.closeCalculationCallback();
 	};
+	public restartCalculation = (): void => {
+		this.hideTimeoutModal();
+		this.props.restartCalculation();
+	};
 
 	public handleMoodSelected = (selectedMood: IState["selectedMood"]): void => {
 		this.setState({ selectedMood });
@@ -194,12 +217,12 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 	};
 
 	public handleTransfer = (): void => {
-		if (this.state.exitModal) {
-			this.hideExitModal();
-		}
-		const carbs: IResult = { suggested: this.suggestedCarbs, entered: this.state.enteredCarbs };
-		const insulin: IResult = { suggested: this.state.insulinRecommendation, entered: this.state.enteredInsulin };
-		this.props.transferToLogbook(carbs, insulin, this.state.remeasureTime);
+		const { enteredCarbs, enteredInsulin, insulinRecommendation, remeasureTime, showExitModal } = this.state;
+		const carbs: IResult = { suggested: this.suggestedCarbs, entered: enteredCarbs };
+		const insulin: IResult = { suggested: insulinRecommendation, entered: enteredInsulin };
+
+		showExitModal ? this.hideExitModal() : this.hideTimeoutModal();
+		this.props.transferToLogbook(carbs, insulin, remeasureTime, this.recommendationDate);
 	};
 
 	public getBGLevelAttentionMessage = (): AttentionMessage => {
@@ -215,6 +238,7 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 		const bgLevel = getBGLevel(currentBGL, latestLogbookFrom6Hours);
 		return getReminder(bgLevel, carbohydrates, userReminder, activity);
 	};
+
 	public getLimitationAttentionMessage = (): AttentionMessage => {
 		const { wasLimited, activityReduction } = this.state;
 		return getLimitationMessage(wasLimited, activityReduction);
@@ -244,7 +268,6 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 				<ScrollView style={containerStyles.container} ref={(view): ScrollView => (this.scrollView = view)}>
 					<Header exitCallback={this.onExit} />
 					<InfoBars
-						style={{ flex: 5 }}
 						label={i18n._(t`Active Insulin`)}
 						value={activeInsulin ? `${activeInsulin.toFixed(1)}` : null}
 						units={i18n._(t`units`)}
@@ -262,7 +285,9 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 								style={[
 									containerStyles.calcBorder,
 									{
-										borderColor: carbRecommendation ? BORDER_COLOUR_TEAL : BORDER_COLOUR_GREY,
+										borderColor: Math.round(carbRecommendation)
+											? BORDER_COLOUR_TEAL
+											: BORDER_COLOUR_GREY,
 									},
 								]}
 							>
@@ -272,10 +297,6 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 									recommendedCarbs={`${enteredCarbs ?? Math.round(carbRecommendation)}`}
 									removeRecommendedCarbs={this.removeCarbRecommendation}
 								/>
-								<Remeasure
-									onSliderChange={this.updateRemeasureTime}
-									remeasureTime={this.state.remeasureTime}
-								/>
 							</View>
 						</View>
 					</View>
@@ -287,6 +308,7 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 							activityReduction={this.state.activityReduction}
 						/>
 					) : null}
+					<Remeasure onSliderChange={this.updateRemeasureTime} remeasureTime={this.state.remeasureTime} />
 					{!this.state.isRecommendationDisplayed ? (
 						<RecentInsulin
 							onRecentInsulinYes={this.props.onRecentInsulinYes}
@@ -305,7 +327,7 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 					<TransferToLogbook visible={isRecommendationDisplayed} transfer={this.handleTransfer} />
 					<RecommendationModal
 						isVisible={recommendationModal}
-						suggestedCarbohydrates={carbRecommendation}
+						suggestedCarbohydrates={Math.round(carbRecommendation)}
 						attentionMessage={this.getBGLevelAttentionMessage()}
 						limitationMessage={this.getLimitationAttentionMessage()}
 						onClickOkButton={this.hideAttentionModal}
@@ -313,13 +335,50 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
 						onDeclineCarbohydrates={this.declineCarbRecommendation}
 					/>
 				</ScrollView>
-				{this.state.exitModal ? (
-					<ExitModal
-						onSave={this.handleTransfer}
-						onCloseCalculation={this.closeCalculation}
+				{this.state.showExitModal ? (
+					<TwoOptionModal
+						title={i18n._(t`Save data before closing?`)}
+						message={i18n._(t`Your saved data will be used for future calculations.`)}
+						textFirstOption={i18n._(t`Save to logbook`)}
+						textSecondOption={i18n._(t`Close calculation`)}
+						isCancelable={true}
+						rowAsButtonLayout={true}
+						firstOption={this.handleTransfer}
+						secondOption={this.closeCalculation}
 						onClose={this.hideExitModal}
 					/>
 				) : null}
+				{this.state.showLimitationMessage ? (
+					<View style={modalStyle.container}>
+						<LimitationMessage
+							limitationMessage={this.getLimitationAttentionMessage()}
+							onPressNextButton={this.hideLimitationMessage}
+						/>
+					</View>
+				) : null}
+				{this.state.showTimeoutModal ? (
+					this.state.isRecommendationDisplayed ? (
+						<TwoOptionModal
+							title={Messages.TimeoutPrompTitle()}
+							message={Messages.TimeoutRecommendationVisible(this.recommendationDate)}
+							textFirstOption={i18n._(t`Yes, save to logbook`)}
+							textSecondOption={i18n._(t`No, return to dashboard`)}
+							rowAsButtonLayout={false}
+							firstOption={this.handleTransfer}
+							secondOption={this.closeCalculation}
+						/>
+					) : (
+						<TwoOptionModal
+							title={Messages.TimeoutPrompTitle()}
+							message={Messages.TimeoutRecommendationNotVisible()}
+							textFirstOption={i18n._(t`Start new calculation`)}
+							textSecondOption={i18n._(t`Return to dashboard`)}
+							rowAsButtonLayout={false}
+							firstOption={this.restartCalculation}
+							secondOption={this.closeCalculation}
+						/>
+					)
+				) : null}
 			</I18nProvider>
 		);
 	}
@@ -335,6 +394,7 @@ const containerStyles = StyleSheet.create({
 	},
 	calcMargin: {
 		flex: 1,
+		marginBottom: 0,
 		margin: headerStyles.margin.margin,
 	},
 	calcBorder: {

package/src/components/InfoBars.d.ts

@@ -1,11 +1,9 @@
 import React from "react";
-import { StyleProp, ViewStyle } from "react-native";
 export interface IProps {
     label: string;
     value?: string;
     units: string;
     showNullAsDash: boolean;
-    style?: StyleProp<ViewStyle>;
 }
 export default class InfoBars extends React.Component<IProps> {
     render(): JSX.Element;
@@ -23,13 +21,13 @@ export declare const infoStyles: {
         borderWidth: number;
         borderColor: string;
         borderRadius: number;
+        paddingVertical: string;
     };
     borderContainer: {
         flex: number;
         flexDirection: "row";
         justifyContent: "space-between";
-        paddingLeft: string;
-        paddingRight: string;
+        paddingHorizontal: string;
     };
     labelContainer: {
         flex: number;