diff --git a/.detoxrc.js b/.detoxrc.js index 346ebf02c..70fec65cd 100644 --- a/.detoxrc.js +++ b/.detoxrc.js @@ -30,15 +30,13 @@ module.exports = { 'android.debug': { type: 'android.apk', binaryPath: 'android/app/build/outputs/apk/play/debug/app-play-debug.apk', - build: - 'cd android ; ./gradlew assemblePlayDebug assemblePlayDebugAndroidTest -DtestBuildType=debug ; cd -', + build: 'cd android ; ./gradlew assemblePlayDebug assemblePlayDebugAndroidTest -DtestBuildType=debug ; cd -', reversePorts: [8081] }, 'android.release': { type: 'android.apk', binaryPath: 'android/app/build/outputs/apk/play/release/app-play-release.apk', - build: - 'cd android ; ./gradlew assemblePlayRelease assemblePlayReleaseAndroidTest -DtestBuildType=release ; cd -' + build: 'cd android ; ./gradlew assemblePlayRelease assemblePlayReleaseAndroidTest -DtestBuildType=release ; cd -' } }, devices: { diff --git a/android/app/build.gradle b/android/app/build.gradle index 7089a2c76..15fbce601 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -105,7 +105,6 @@ android { ndkVersion rootProject.ext.ndkVersion compileSdkVersion rootProject.ext.compileSdkVersion - // Can't set this, since it causes issues to Official flavor namespace "chat.rocket.android" defaultConfig { applicationId APPLICATION_ID diff --git a/app/containers/markdown/Preview.tsx b/app/containers/markdown/Preview.tsx index 03571ea16..7cd9471cd 100644 --- a/app/containers/markdown/Preview.tsx +++ b/app/containers/markdown/Preview.tsx @@ -26,7 +26,8 @@ const MarkdownPreview = ({ msg, numberOfLines = 1, style = [], testID }: IMarkdo accessibilityLabel={m} style={[styles.text, { color: themes[theme].bodyText }, ...style]} numberOfLines={numberOfLines} - testID={testID || `markdown-preview-${m}`}> + testID={testID || `markdown-preview-${m}`} + > {m} ); diff --git a/app/sagas/selectServer.js b/app/sagas/selectServer.js index a989ca03b..b553ab83b 100644 --- a/app/sagas/selectServer.js +++ b/app/sagas/selectServer.js @@ -97,7 +97,6 @@ const handleSelectServer = function* handleSelectServer({ server, version, fetch avatarETag: userRecord.avatarETag }; } catch { - // search credentials on shared credentials (Experimental/Official) const token = UserPreferences.getString(`${TOKEN_KEY}-${userId}`); if (token) { user = { token };