diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 98ad82f..6bbb374 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-02-15T14:35:02.927926600Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-03-05T06:33:43.046757700Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/bmicalculator/BMIScreen.kt b/app/src/main/java/com/example/bmicalculator/BMIScreen.kt
index 15b48a6..066e219 100644
--- a/app/src/main/java/com/example/bmicalculator/BMIScreen.kt
+++ b/app/src/main/java/com/example/bmicalculator/BMIScreen.kt
@@ -1,14 +1,12 @@
 package com.example.bmicalculator
 
 import android.content.Intent
-import android.widget.Toast
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -48,16 +46,6 @@ fun BMIScreen(
         skipHalfExpanded = true
     )
 
-    LaunchedEffect(key1 = state.error) {
-        if (state.error != null) {
-            Toast.makeText(
-                context,
-                "This BMI does not look good, check again the height and weight value",
-                Toast.LENGTH_LONG
-            ).show()
-        }
-    }
-
     ModalBottomSheetLayout(
         sheetState = modalBottomSheet,
         sheetContent = {
@@ -93,7 +81,7 @@ fun BMIScreen(
                     viewModel.onAction(UserAction.OnWeightValueClicked)
                 },
                 onGoButtonClicked = {
-                    viewModel.onAction(UserAction.OnGoButtonClicked)
+                    viewModel.onAction(UserAction.OnGoButtonClicked(context = context))
                 },
                 onNumberClicked = {
                     viewModel.onAction(UserAction.OnNumberClicked(number = it))
diff --git a/app/src/main/java/com/example/bmicalculator/BMIViewModel.kt b/app/src/main/java/com/example/bmicalculator/BMIViewModel.kt
index 0711b05..9d3fd1a 100644
--- a/app/src/main/java/com/example/bmicalculator/BMIViewModel.kt
+++ b/app/src/main/java/com/example/bmicalculator/BMIViewModel.kt
@@ -1,5 +1,7 @@
 package com.example.bmicalculator
 
+import android.content.Context
+import android.widget.Toast
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -12,8 +14,8 @@ class BMIViewModel : ViewModel() {
 
     fun onAction(userAction: UserAction) {
         when (userAction) {
-            UserAction.OnGoButtonClicked -> {
-                calculateBMI()
+            is UserAction.OnGoButtonClicked -> {
+                calculateBMI(userAction.context)
             }
             UserAction.OnHeightValueClicked -> {
                 state = state.copy(
@@ -52,7 +54,7 @@ class BMIViewModel : ViewModel() {
         }
     }
 
-    private fun calculateBMI() {
+    private fun calculateBMI(context: Context) {
         val weightInKgs: Double = when(state.weightUnit) {
             "Pounds" -> state.weightValue.toDouble().times(0.4536)
             else -> state.weightValue.toDouble()
@@ -78,7 +80,11 @@ class BMIViewModel : ViewModel() {
                 bmiStage = bmiStage
             )
         } catch (e: Exception) {
-            state = state.copy(error = e.message)
+            Toast.makeText(
+                context,
+                "This BMI does not look good, check again the height and weight value",
+                Toast.LENGTH_LONG
+            ).show()
         }
     }
 
@@ -192,7 +198,7 @@ sealed class UserAction {
     object OnHeightValueClicked : UserAction()
     object OnWeightTextClicked : UserAction()
     object OnHeightTextClicked : UserAction()
-    object OnGoButtonClicked : UserAction()
+    data class OnGoButtonClicked(val context: Context) : UserAction()
     data class OnNumberClicked(val number: String) : UserAction()
     object OnAllClearButtonClicked : UserAction()
     object OnDeleteButtonClicked : UserAction()