From cdf64ab09b0d9caafd104c5aa5fb25f473646b9c Mon Sep 17 00:00:00 2001
From: Anant Bhasin <bhasinanant@gmail.com>
Date: Thu, 27 May 2021 02:44:05 +0530
Subject: [PATCH] Progress

---
 app/containers/Button/index.js              |  1 +
 app/definition/ITeam.js                     |  2 +-
 e2e/tests/assorted/01-e2eencryption.spec.js |  4 ++--
 package.json                                | 14 +++-----------
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/containers/Button/index.js b/app/containers/Button/index.js
index 75a09290f..905c8d7a0 100644
--- a/app/containers/Button/index.js
+++ b/app/containers/Button/index.js
@@ -70,6 +70,7 @@ export default class Button extends React.PureComponent {
 					disabled && styles.disabled,
 					style
 				]}
+				accessibilityLabel={title}
 				{...otherProps}
 			>
 				{
diff --git a/app/definition/ITeam.js b/app/definition/ITeam.js
index 10919715d..8cf8bddce 100644
--- a/app/definition/ITeam.js
+++ b/app/definition/ITeam.js
@@ -1,5 +1,5 @@
 // https://github.com/RocketChat/Rocket.Chat/blob/develop/definition/ITeam.ts
-export const TEAM_TYPE = {
+exports.TEAM_TYPE = {
 	PUBLIC: 0,
 	PRIVATE: 1
 };
diff --git a/e2e/tests/assorted/01-e2eencryption.spec.js b/e2e/tests/assorted/01-e2eencryption.spec.js
index 4aca06a65..b6ee3e84f 100644
--- a/e2e/tests/assorted/01-e2eencryption.spec.js
+++ b/e2e/tests/assorted/01-e2eencryption.spec.js
@@ -65,13 +65,13 @@ describe('E2E Encryption', () => {
 			});
 	
 			it('should tap "How it works" and navigate', async() => {
-				await element(by.id('e2e-save-password-view-how-it-works').and(by.text('How It Works'))).tap();
+				await element(by.id('e2e-save-password-view-how-it-works').and(by.label('How It Works'))).tap();
 				await waitFor(element(by.id('e2e-how-it-works-view'))).toBeVisible().withTimeout(2000);
 				await tapBack();
 			});
 			
 			it('should tap "Save my password" and close modal', async() => {
-				await element(by.id('e2e-save-password-view-saved-password').and(by.text('I Saved My E2E Password'))).tap();
+				await element(by.id('e2e-save-password-view-saved-password').and(by.label('I Saved My E2E Password'))).tap();
 				await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(2000);
 			});
 	
diff --git a/package.json b/package.json
index d93a32d76..b382809d8 100644
--- a/package.json
+++ b/package.json
@@ -188,18 +188,10 @@
   "detox": {
     "runner-config": "e2e/.mocharc.json",
     "specs": "e2e/tests",
-    "devices": {
-      "emulator": {
-        "type": "android.emulator",
-        "device": {
-          "avdName": "Pixel_API_28_AOSP"
-        }
-      }
-    },
     "apps": {
       "android.experimental.play.debug": {
         "type": "android.apk",
-        "binaryPath": "android/app/build/outputs/apk/debug/app-Experimental-Play-debug.apk",
+        "binaryPath": "android/app/build/outputs/apk/experimentalPlay/debug/app-Experimental-Play-debug.apk",
         "build": "cd android && ./gradlew assembleExperimentalPlayDebug assembleExperimentalPlayAndroidTest -DtestBuildType=debug && cd .."
       }
     },
@@ -235,13 +227,13 @@
         }
       },
       "android.experimental.play.emu.debug": {
-        "device": "emu",
+        "device": "Pixel_API_28_AOSP",
         "type": "android.emulator",
         "binaryPath": "android/app/build/outputs/apk/experimentalPlay/debug/app-experimental-play-debug.apk",
         "build": "cd android && ./gradlew app:assembleExperimentalPlayDebug app:assembleAndroidTest -DtestBuildType=debug && cd .."
       },
       "android.experimental.play.emu.release": {
-        "device": "emu",
+        "device": "Pixel_API_28_AOSP",
         "type": "android.emulator",
         "binaryPath": "android/app/build/outputs/apk/experimentalPlay/debug/app-experimental-play-release.apk",
         "build": "cd android && ./gradlew app:assembleExperimentalPlayRelease app:assembleAndroidTest -DtestBuildType=release && cd .."