Index: firmware/App/Services/StateServices/FluidBolus.c
===================================================================
diff -u -r0b025cea0b0f290ea44714a8fae6d71ea05088b9 -r4ea39ac34ede5011de1954b7c58761df25120fcf
--- firmware/App/Services/StateServices/FluidBolus.c	(.../FluidBolus.c)	(revision 0b025cea0b0f290ea44714a8fae6d71ea05088b9)
+++ firmware/App/Services/StateServices/FluidBolus.c	(.../FluidBolus.c)	(revision 4ea39ac34ede5011de1954b7c58761df25120fcf)
@@ -27,6 +27,7 @@
 #include "StateTxPaused.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
+#include "TubeSetInstall.h"
 #include "TxParams.h"
 #include "Valves.h"
 
@@ -155,21 +156,17 @@
 /*********************************************************************//**
  * @brief
  * The getFluidBolusMedium function determines the fluid bolus medium based
- * on the current treatment modality and online fluid configuration.
- * Substitution fluid applies to HDF treatment, or HD treatment with online
- * fluid enabled. Saline applies to standard HD without online fluid.
+ * on the installed tube set type.
  * @details \b Inputs: none
  * @details \b Outputs: none
- * @return FLUID_BOLUS_MEDIUM_SUBSTITUTE for HDF or HD-online, FLUID_BOLUS_MEDIUM_SALINE otherwise.
+ * @return FLUID_BOLUS_MEDIUM_SUBSTITUTE for HDF tubing set,
+ * FLUID_BOLUS_MEDIUM_SALINE otherwise.
  *************************************************************************/
 FLUID_BOLUS_MEDIUM_T getFluidBolusMedium( void )
 {
     FLUID_BOLUS_MEDIUM_T medium = FLUID_BOLUS_MEDIUM_SALINE;
-    U32 modality = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_MODALITY );
 
-    //TODO: Uncomment and remove the modality when tube set type logic is implemented
-    //if ( ( TUBE_SET_TYPE_HDF == getTubeSetType() )
-    if ( ( modality == TREATMENT_MODALITY_HDF ) )
+    if ( TUBE_SET_TYPE_HDF == getTubeSetType() )
     {
         medium = FLUID_BOLUS_MEDIUM_SUBSTITUTE;
     }
@@ -368,7 +365,6 @@
 {
     FLUID_BOLUS_STATE_T state = FLUID_BOLUS_IN_PROGRESS_STATE;
     F32 bolusTargetVolume = (F32)getTreatmentParameterU32( TREATMENT_PARAM_FLUID_BOLUS_VOLUME );
-    BOOL isDialysateGoodToDeliver = TRUE;     // TODO: replace TRUE with getDialysateGoodToDeliverStatus() when we are ready
 
     updateFluidBolusVolumeDelivered();
 
@@ -383,7 +379,7 @@
     }
     else
     {
-        if ( FALSE == isDialysateGoodToDeliver )
+        if ( FALSE == getDialysateGoodToDeliverStatus() )
         {
             state = FLUID_BOLUS_IDLE_STATE;
         }