[Testing] Fix for flaky UITests in CI that occasionally fail

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla31333.cs

@@ -16,6 +16,7 @@ public Bugzilla31333(TestDevice testDevice) : base(testDevice)
 	[Test]
 	public void Issue31333FocusEntryInListViewCell()
 	{
+		App.WaitForElement("Focus Entry in ListView");
 		App.Tap("Focus Entry in ListView");
 		App.EnterText("EntryListView", "Entry in ListView Success");
 		Assert.That(App.WaitForElement("EntryListView")?.GetText(), Is.EqualTo("Entry in ListView Success"));
@@ -25,6 +26,7 @@ public void Issue31333FocusEntryInListViewCell()
 	[Test]
 	public void Issue31333FocusEditorInListViewCell()
 	{
+		App.WaitForElement("Focus Editor in ListView");
 		App.Tap("Focus Editor in ListView");
 		App.EnterText("EditorListView", "Editor in ListView Success");
 		Assert.That(App.WaitForElement("EditorListView")?.GetText(), Is.EqualTo("Editor in ListView Success"));
@@ -34,15 +36,17 @@ public void Issue31333FocusEditorInListViewCell()
 	[Test]
 	public void Issue31333FocusEntryInTableViewCell()
 	{
+		App.WaitForElement("Focus Entry in Table");
 		App.Tap("Focus Entry in Table");
 		App.EnterText("EntryTable", "Entry in TableView Success");
 		Assert.That(App.WaitForElement("EntryTable")?.GetText(), Is.EqualTo("Entry in TableView Success"));
 		App.Tap("Focus Entry in Table");
 	}
-#if !IOS //Once Editor text is entered the cursor move to second line when using App.EnterText method in appium which results retrived text is not as expected one. 
+#if TEST_FAILS_ON_IOS //Once Editor text is entered the cursor move to second line when using App.EnterText method in appium which results retrived text is not as expected one. 
 	[Test]
 	public void Issue31333FocusEditorInTableViewCell()
 	{
+		App.WaitForElement("Focus Editor in Table");
 		App.Tap("Focus Editor in Table");
 		App.EnterText("EditorTable", "Editor in TableView Success");
 		Assert.That(App.WaitForElement("EditorTable")?.GetText(), Is.EqualTo("Editor in TableView Success"));

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla34632.cs

@@ -18,6 +18,7 @@ public Bugzilla34632(TestDevice testDevice) : base(testDevice)
 	[Category(UITestCategories.FlyoutPage)]
 	public void Bugzilla34632Test()
 	{
+		App.WaitForElement("btnModal");
 		App.SetOrientationPortrait();
 		App.WaitForElement("btnModal");
 		App.Tap("btnModal");
@@ -27,6 +28,7 @@ public void Bugzilla34632Test()
 		App.WaitForElement("btnModal");
 		App.Tap("btnModal");
 		App.SetOrientationPortrait();
+		App.WaitForElement("btnDismissModal");
 		App.Tap("btnDismissModal");
 		App.TapFlyoutPageIcon("Main Page");
 		App.WaitForElement("btnFlyout");

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue2597.cs

@@ -16,6 +16,8 @@ public Issue2597(TestDevice testDevice) : base(testDevice)
 	[Category(UITestCategories.Stepper)]
 	public void Issue2597Test()
 	{
+		App.WaitForElement("Stepper");
+
 		App.IncreaseStepper("Stepper");
 
 		Assert.That(App.FindElement("StepperValue").GetText(), Is.EqualTo("Stepper value is 0"));

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue2809.cs

@@ -16,10 +16,11 @@ public Issue2809(TestDevice testDevice) : base(testDevice)
 	[Category(UITestCategories.ToolbarItem)]
 	public void TestPageDoesntCrash()
 	{
-#if ANDROID && WINDOWS // WaitForMoreButton is only supported on Android and Windows
-		App.WaitForMoreButton();
-#endif
-		App.TapMoreButton();
+		if (App is AppiumAndroidApp || App is AppiumWindowsApp) // WaitForMoreButton is only supported on Android and Windows
+		{
+			App.WaitForMoreButton();
+			App.TapMoreButton();
+		}
 		App.Tap("Item 1");
 	}
 }