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 ad8f8e9..e33e9cc 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
@@ -3,6 +3,7 @@ package h_mal.appttude.com.driver
 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
@@ -100,6 +101,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/androidTestAdmin/java/h_mal/appttude/com/driver/robots/HomeAdminRobot.kt b/app/src/androidTestAdmin/java/h_mal/appttude/com/driver/robots/HomeAdminRobot.kt
index 7957910..2cd8bfb 100644
--- a/app/src/androidTestAdmin/java/h_mal/appttude/com/driver/robots/HomeAdminRobot.kt
+++ b/app/src/androidTestAdmin/java/h_mal/appttude/com/driver/robots/HomeAdminRobot.kt
@@ -46,6 +46,7 @@ class HomeAdminRobot : BaseTestRobot() {
     }
 
     fun showNoPermissionsDisplay() {
+        matchViewWaitFor(R.id.header)
         matchText(R.id.header, DatabaseStatus.NO_PERMISSION.header)
         matchText(R.id.subtext, DatabaseStatus.NO_PERMISSION.subtext)
     }
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()
     }