fix remaining e2e

Author: kochavi-daniel

e2e/Modals.test.js

@@ -26,9 +26,9 @@ describe('modal', () => {
     await elementById(TestIDs.MODAL_LIFECYCLE_BTN).tap();
     await expect(elementByLabel('didAppear')).toBeVisible();
     await elementById(TestIDs.DISMISS_MODAL_BTN).tap();
-    await expect(elementByLabel('componentWillUnmount')).toBeVisible();
+    await waitFor(elementByLabel('componentWillUnmount')).toBeVisible().withTimeout(1000);
     await elementByLabel('OK').atIndex(0).tap();
-    await expect(elementByLabel('didDisappear')).toBeVisible();
+    await waitFor(elementByLabel('didDisappear')).toBeVisible().withTimeout(1000);
     await elementByLabel('OK').atIndex(0).tap();
   });
 
@@ -148,11 +148,9 @@ describe('modal', () => {
     await elementById(TestIDs.MODAL_COMMANDS_BTN).tap();
     await elementById(TestIDs.MODAL_BTN).tap();
 
-    await expect(elementByLabel('showModal promise resolved with: UniqueStackId')).toBeVisible();
-    await expect(
-      elementByLabel('modalDismissed listener called with with: UniqueStackId')
-    ).toBeVisible();
-    await expect(elementByLabel('dismissModal promise resolved with: UniqueStackId')).toBeVisible();
+    await waitFor(elementByLabel('showModal promise resolved with: UniqueStackId')).toBeVisible().withTimeout(1000);
+    await waitFor(elementByLabel('modalDismissed listener called with with: UniqueStackId')).toBeVisible().withTimeout(1000);
+    await waitFor(elementByLabel('dismissModal promise resolved with: UniqueStackId')).toBeVisible().withTimeout(1000);
   });
 
   it.e2e('should show declared modal', async () => {

playground/src/screens/OverlayBanner.tsx

@@ -31,8 +31,9 @@ export default class OverlayBanner extends NavigationComponent<Props> {
         }}
         pointerEvents="box-none"
       >
-        <View testID={BANNER_OVERLAY} style={styles.banner}>
+        <View style={styles.banner}>
           <Button
+            testID={BANNER_OVERLAY}
             // @ts-ignore
             size={'small'}
             style={styles.text}

playground/src/screens/StackCommandsScreen.tsx

@@ -47,8 +47,10 @@ export default class StackCommandsScreen extends NavigationComponent<NavigationP
         this.setState({
           pushPromiseResult: `push promise resolved with: ${pushId}`,
         });
-        return Navigation.pop('ChildId');
+        return 'ChildId';
       })
+      .then((popId) => new Promise<string>((resolve) => setTimeout(() => resolve(popId), 500)))
+      .then((popId) => Navigation.pop(popId))
       .then((popId) => {
         this.setState({
           popPromiseResult: `pop promise resolved with: ${popId}`,