diff --git a/e2e/helpers/app.js b/e2e/helpers/app.js
index 20c39e0b0..136c62901 100644
--- a/e2e/helpers/app.js
+++ b/e2e/helpers/app.js
@@ -97,6 +97,11 @@ async function navigateToRoom(room) {
     await expect(element(by.id(`room-view-title-${ room }`))).toBeVisible();
 }
 
+// TODO: it should be only temp... we need to figure a better way
+async function waitForToast() {
+	await sleep(5000);
+}
+
 module.exports = {
     navigateToWorkspace,
     navigateToLogin,
@@ -107,5 +112,6 @@ module.exports = {
     tapBack,
     sleep,
     searchRoom,
-    navigateToRoom
+    navigateToRoom,
+    waitForToast
 };
\ No newline at end of file
diff --git a/e2e/tests/assorted/03-profile.spec.js b/e2e/tests/assorted/03-profile.spec.js
index 122422aa2..270bf4742 100644
--- a/e2e/tests/assorted/03-profile.spec.js
+++ b/e2e/tests/assorted/03-profile.spec.js
@@ -1,19 +1,11 @@
 const {
 	device, expect, element, by, waitFor
 } = require('detox');
-const { logout, navigateToLogin, login, sleep } = require('../../helpers/app');
+const { logout, navigateToLogin, login, sleep, waitForToast } = require('../../helpers/app');
 const data = require('../../data');
 
 const scrollDown = 200;
 
-async function waitForToast() {
-	// await waitFor(element(by.id('toast'))).toBeVisible().withTimeout(10000);
-	// await expect(element(by.id('toast'))).toBeVisible();
-	// await waitFor(element(by.id('toast'))).toBeNotVisible().withTimeout(10000);
-	// await expect(element(by.id('toast'))).toBeNotVisible();
-	await sleep(5000);
-}
-
 describe('Profile screen', () => {
 	before(async() => {
 		await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
diff --git a/e2e/tests/assorted/06-status.spec.js b/e2e/tests/assorted/06-status.spec.js
index ee592d41f..cb462f28e 100644
--- a/e2e/tests/assorted/06-status.spec.js
+++ b/e2e/tests/assorted/06-status.spec.js
@@ -1,11 +1,7 @@
 const {
 	expect, element, by, waitFor
 } = require('detox');
-const { sleep } = require('../../helpers/app');
-
-async function waitForToast() {
-	await sleep(5000);
-}
+const { sleep, waitForToast } = require('../../helpers/app');
 
 describe('Status screen', () => {
 	before(async() => {
diff --git a/e2e/tests/room/02-room.spec.js b/e2e/tests/room/02-room.spec.js
index efaf26e26..2d5d898e5 100644
--- a/e2e/tests/room/02-room.spec.js
+++ b/e2e/tests/room/02-room.spec.js
@@ -12,7 +12,7 @@ async function mockMessage(message) {
 	await expect(element(by.label(`${ data.random }${ message }`)).atIndex(0)).toBeVisible();
 };
 
-describe.only('Room screen', () => {
+describe('Room screen', () => {
 	const mainRoom = `private${ data.random }`;
 
 	before(async() => {
diff --git a/e2e/tests/room/04-roominfo.spec.js b/e2e/tests/room/04-roominfo.spec.js
index c96970bcb..7f0d1632b 100644
--- a/e2e/tests/room/04-roominfo.spec.js
+++ b/e2e/tests/room/04-roominfo.spec.js
@@ -2,7 +2,7 @@ const {
 	device, expect, element, by, waitFor
 } = require('detox');
 const data = require('../../data');
-const { tapBack, sleep, navigateToRoom } = require('../../helpers/app');
+const { tapBack, sleep, navigateToRoom, waitForToast } = require('../../helpers/app');
 
 async function navigateToRoomInfo(type) {
 	let room;
@@ -20,14 +20,6 @@ async function navigateToRoomInfo(type) {
 	await waitFor(element(by.id('room-info-view'))).toBeVisible().withTimeout(2000);
 }
 
-async function waitForToast() {
-	// await waitFor(element(by.id('toast'))).toBeVisible().withTimeout(10000);
-	// await expect(element(by.id('toast'))).toBeVisible();
-	// await waitFor(element(by.id('toast'))).toBeNotVisible().withTimeout(10000);
-	// await expect(element(by.id('toast'))).toBeNotVisible();
-	await sleep(5000);
-}
-
 describe('Room info screen', () => {
 	describe('Direct', async() => {
 		before(async() => {