From c00ab98441337f1e84600cc43dbaed59287152af Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Wed, 10 May 2023 17:22:18 -0300
Subject: [PATCH] feat(Android): Remove Open workspace from onboarding (#5065)

* Remove Open

* Remove on Android only and comment tests out
---
 app/views/NewServerView/index.tsx          | 50 ++++++++++++----------
 e2e/tests/assorted/12-i18n.spec.ts         | 12 +++---
 e2e/tests/onboarding/01-onboarding.spec.ts | 18 ++++----
 3 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/app/views/NewServerView/index.tsx b/app/views/NewServerView/index.tsx
index 7bb3d0874..85d0846c3 100644
--- a/app/views/NewServerView/index.tsx
+++ b/app/views/NewServerView/index.tsx
@@ -22,7 +22,7 @@ import { sanitizeLikeString } from '../../lib/database/utils';
 import UserPreferences from '../../lib/methods/userPreferences';
 import { OutsideParamList } from '../../stacks/types';
 import { withTheme } from '../../theme';
-import { isTablet } from '../../lib/methods/helpers';
+import { isIOS, isTablet } from '../../lib/methods/helpers';
 import EventEmitter from '../../lib/methods/helpers/events';
 import { BASIC_AUTH_KEY, setBasicAuth } from '../../lib/methods/helpers/fetch';
 import { showConfirmationAlert } from '../../lib/methods/helpers/info';
@@ -392,28 +392,32 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
 						style={[styles.connectButton, { marginTop: verticalScale({ size: 16, height }) }]}
 						testID='new-server-view-button'
 					/>
-					<OrSeparator theme={theme} />
-					<Text
-						style={[
-							styles.description,
-							{
-								color: themes[theme].auxiliaryText,
-								fontSize: moderateScale({ size: 14, width }),
-								marginBottom: verticalScale({ size: 16, height })
-							}
-						]}
-					>
-						{I18n.t('Onboarding_join_open_description')}
-					</Text>
-					<Button
-						title={I18n.t('Join_our_open_workspace')}
-						type='secondary'
-						backgroundColor={themes[theme].chatComponentBackground}
-						onPress={this.connectOpen}
-						disabled={connecting}
-						loading={connectingOpen && connecting}
-						testID='new-server-view-open'
-					/>
+					{isIOS ? (
+						<>
+							<OrSeparator theme={theme} />
+							<Text
+								style={[
+									styles.description,
+									{
+										color: themes[theme].auxiliaryText,
+										fontSize: moderateScale({ size: 14, width }),
+										marginBottom: verticalScale({ size: 16, height })
+									}
+								]}
+							>
+								{I18n.t('Onboarding_join_open_description')}
+							</Text>
+							<Button
+								title={I18n.t('Join_our_open_workspace')}
+								type='secondary'
+								backgroundColor={themes[theme].chatComponentBackground}
+								onPress={this.connectOpen}
+								disabled={connecting}
+								loading={connectingOpen && connecting}
+								testID='new-server-view-open'
+							/>
+						</>
+					) : null}
 				</FormContainerInner>
 				{this.renderCertificatePicker()}
 			</FormContainer>
diff --git a/e2e/tests/assorted/12-i18n.spec.ts b/e2e/tests/assorted/12-i18n.spec.ts
index 2ef7531d8..fbce37cb8 100644
--- a/e2e/tests/assorted/12-i18n.spec.ts
+++ b/e2e/tests/assorted/12-i18n.spec.ts
@@ -33,9 +33,9 @@ describe('i18n', () => {
 			({ textMatcher } = platformTypes[device.getPlatform()]);
 		});
 		it("OS set to 'en' and proper translate to 'en'", async () => {
-			// if (device.getPlatform() === 'android') {
-			// 	return; // FIXME: Passing language with launch parameters doesn't work with Android
-			// }
+			if (device.getPlatform() === 'android') {
+				return; // FIXME: Passing language with launch parameters doesn't work with Android
+			}
 			await device.launchApp({
 				...defaultLaunchArgs,
 				languageAndLocale: {
@@ -54,9 +54,9 @@ describe('i18n', () => {
 		});
 
 		it("OS set to unavailable language and fallback to 'en'", async () => {
-			// if (device.getPlatform() === 'android') {
-			// 	return; // FIXME: Passing language with launch parameters doesn't work with Android
-			// }
+			if (device.getPlatform() === 'android') {
+				return; // FIXME: Passing language with launch parameters doesn't work with Android
+			}
 			await device.launchApp({
 				...defaultLaunchArgs,
 				languageAndLocale: {
diff --git a/e2e/tests/onboarding/01-onboarding.spec.ts b/e2e/tests/onboarding/01-onboarding.spec.ts
index d44777c7e..6190a8c27 100644
--- a/e2e/tests/onboarding/01-onboarding.spec.ts
+++ b/e2e/tests/onboarding/01-onboarding.spec.ts
@@ -19,9 +19,9 @@ describe('Onboarding', () => {
 			await expect(element(by.id('new-server-view'))).toBeVisible();
 		});
 
-		it('should have "Join our open workspace"', async () => {
-			await expect(element(by.id('new-server-view-open'))).toBeVisible();
-		});
+		// it('should have "Join our open workspace"', async () => {
+		// 	await expect(element(by.id('new-server-view-open'))).toBeVisible();
+		// });
 	});
 
 	describe('Usage', () => {
@@ -34,12 +34,12 @@ describe('Onboarding', () => {
 			await element(by[textMatcher]('OK').and(by.type(alertButtonType))).tap();
 		});
 
-		it('should tap on "Join our open workspace" and navigate', async () => {
-			await element(by.id('new-server-view-open')).tap();
-			await waitFor(element(by.id('workspace-view')))
-				.toBeVisible()
-				.withTimeout(60000);
-		});
+		// it('should tap on "Join our open workspace" and navigate', async () => {
+		// 	await element(by.id('new-server-view-open')).tap();
+		// 	await waitFor(element(by.id('workspace-view')))
+		// 		.toBeVisible()
+		// 		.withTimeout(60000);
+		// });
 
 		it('should enter a valid server without login services and navigate to login', async () => {
 			await device.launchApp({ newInstance: true });