fixed e2e

e2e/TopLevelApi.test.js

@@ -34,12 +34,9 @@ describe('top level api', () => {
   it('unmount is called on pop', async () => {
     await elementByLabel('Push Lifecycle Screen').tap();
     await expect(elementByLabel('didAppear')).toBeVisible();
-    try {
-      await element(by.trait(['button']).and(by.label('Back'))).tap();
-    } catch (err) {
-      await element(by.type('_UIModernBarButton').and(by.label('Back'))).tap();
-    }
+    await Utils.tapBackIos();
     await expect(elementByLabel('didDisappear')).toBeVisible();
+    await element(by.traits(['button']).and(by.label('OK'))).atIndex(0).tap();
     await expect(elementByLabel('componentWillUnmount')).toBeVisible();
   });
 });

e2e/Utils.js

@@ -4,5 +4,12 @@ module.exports = {
   },
   elementById: (id) => {
     return element(by.id(id));
+  },
+  tapBackIos: () => {
+    try {
+      return element(by.traits(['button']).and(by.label('Back'))).atIndex(0).tap();
+    } catch (err) {
+      return element(by.type('_UIModernBarButton').and(by.label('Back'))).tap();
+    }
   }
 };