diff --git a/.circleci/config.yml b/.circleci/config.yml
index d7c9b36..bd9f168 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,6 +64,7 @@ jobs:
           post-emulator-launch-assemble-command: ./gradlew assemble<< parameters.flavour >>DebugAndroidTest
           test-command: ./gradlew connected<< parameters.flavour >>DebugAndroidTest
           system-image: system-images;android-25;google_apis;x86
+          max-tries: 1
       # store test reports
       - store_artifacts:
           path: app/build/reports/androidTests/connected
diff --git a/app/src/androidTest/java/h_mal/appttude/com/driver/BaseUiTest.kt b/app/src/androidTest/java/h_mal/appttude/com/driver/BaseUiTest.kt
index e955bc8..1c008cf 100644
--- a/app/src/androidTest/java/h_mal/appttude/com/driver/BaseUiTest.kt
+++ b/app/src/androidTest/java/h_mal/appttude/com/driver/BaseUiTest.kt
@@ -5,6 +5,7 @@ import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
 import android.R
 import android.app.Activity
 import android.content.Context
+import android.os.Build
 import android.view.View
 import android.view.WindowManager
 import androidx.annotation.StringRes
@@ -111,6 +112,9 @@ open class BaseUiTest<T : BaseActivity<*, *>>(
             }
         }
         ).check(matches(isDisplayed()))
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            waitFor(3500)
+        }
     }
 
     fun checkSnackBarDisplayedByMessage(message: String) {
diff --git a/app/src/main/java/h_mal/appttude/com/driver/base/BaseActivity.kt b/app/src/main/java/h_mal/appttude/com/driver/base/BaseActivity.kt
index c582c6b..c20577e 100644
--- a/app/src/main/java/h_mal/appttude/com/driver/base/BaseActivity.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/base/BaseActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.view.View
+import android.view.View.OnAttachStateChangeListener
 import android.view.ViewGroup.LayoutParams
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.inflate
@@ -160,6 +161,8 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
                     mIdlingResource?.setIdleState(false)
                 }
             })
+        } else {
+
         }
         toast.show()
     }