Merge branch 'develop' into feat.block-room-content-e2ee

.circleci/config.yml

@@ -1,8 +1,14 @@
 defaults: &defaults
   working_directory: ~/repo
 
+android-executor: &android-executor
+  executor:
+    name: android/android-machine
+    resource-class: large
+    tag: 2024.01.1
+
 orbs:
-  android: circleci/android@2.1.2
+  android: circleci/android@2.5.0
 
 macos: &macos
   macos:
@@ -87,7 +93,6 @@ commands:
       - run:
           name: Install ruby
           command: |
-            echo "ruby-2.7.7" > ~/.ruby-version
             if [ -d ~/.rbenv/versions/2.7.7 ]; then
               echo "Ruby already installed"
             else
@@ -139,11 +144,11 @@ commands:
           name: Configure Gradle
           command: |
             echo -e "" > ./gradle.properties
-            # echo -e "android.enableAapt2=false" >> ./gradle.properties
             echo -e "android.useAndroidX=true" >> ./gradle.properties
             echo -e "android.enableJetifier=true" >> ./gradle.properties
+            echo -e "reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64" >> ./gradle.properties
             echo -e "newArchEnabled=false" >> ./gradle.properties
-            echo -e "FLIPPER_VERSION=0.125.0" >> ./gradle.properties
+            echo -e "hermesEnabled=true" >> ./gradle.properties
             echo -e "VERSIONCODE=$CIRCLE_BUILD_NUM" >> ./gradle.properties
 
             if [[ $CIRCLE_JOB == "android-build-official" ]]; then
@@ -188,23 +193,15 @@ commands:
           working_directory: android
 
       - run:
-          name: Upload sourcemaps to Bugsnag
+          name: Upload sourcemaps/NDK symbols to Bugsnag
           command: |
             if [[ $CIRCLE_JOB == "android-build-official" ]]; then
-              npx bugsnag-source-maps upload-react-native \
-                --api-key=$BUGSNAG_KEY_OFFICIAL \
-                --app-version-code=$CIRCLE_BUILD_NUM \
-                --platform android \
-                --source-map=android/app/build/generated/sourcemaps/react/officialPlay/release/app.bundle.map \
-                --bundle android/app/build/generated/assets/react/officialPlay/release/app.bundle
+              yarn bugsnag:upload-android --variant officialPlayRelease
+              yarn bugsnag-cli upload android-aab android/app/build/outputs/bundle/officialPlayRelease/app-official-play-release.aab
             fi
             if [[ $CIRCLE_JOB == "android-build-experimental" || "android-automatic-build-experimental" ]]; then
-              npx bugsnag-source-maps upload-react-native \
-                --api-key=$BUGSNAG_KEY \
-                --app-version-code=$CIRCLE_BUILD_NUM \
-                --platform android \
-                --source-map=android/app/build/generated/sourcemaps/react/experimentalPlay/release/app.bundle.map \
-                --bundle android/app/build/generated/assets/react/experimentalPlay/release/app.bundle
+              yarn bugsnag:upload-android --variant experimentalPlayRelease
+              yarn bugsnag-cli upload android-aab android/app/build/outputs/bundle/experimentalPlayRelease/app-experimental-play-release.aab
             fi
 
       - store_artifacts:
@@ -384,7 +381,7 @@ jobs:
   lint-testunit:
     <<: *defaults
     docker:
-      - image: cimg/node:16.14
+      - image: cimg/node:lts
     resource_class: large
     environment:
       CODECOV_TOKEN: caa771ab-3d45-4756-8e2a-e1f25996fef6
@@ -416,35 +413,29 @@ jobs:
   # Android builds
   android-build-experimental:
     <<: *defaults
-    docker:
-      - image: cimg/android:2023.11-node
+    <<: *android-executor
     environment:
       <<: *android-env
       <<: *bash-env
-    resource_class: large
     steps:
       - android-build
 
     # Android automatic builds
   android-automatic-build-experimental:
     <<: *defaults
-    docker:
-      - image: cimg/android:2023.11-node
+    <<: *android-executor
     environment:
       <<: *android-env
       <<: *bash-env
-    resource_class: large
     steps:
       - android-build
 
   android-build-official:
     <<: *defaults
-    docker:
-      - image: cimg/android:2023.11-node
+    <<: *android-executor
     environment:
       <<: *android-env
       <<: *bash-env
-    resource_class: large
     steps:
       - android-build
 
@@ -483,10 +474,7 @@ jobs:
 
   e2e-build-android:
     <<: *defaults
-    executor:
-      name: android/android-machine
-      resource-class: large
-      tag: 2022.12.1
+    <<: *android-executor
     environment:
       <<: *android-env
     steps:
@@ -499,11 +487,11 @@ jobs:
           name: Configure Gradle
           command: |
             echo -e "" > ./gradle.properties
-            # echo -e "android.enableAapt2=false" >> ./gradle.properties
             echo -e "android.useAndroidX=true" >> ./gradle.properties
             echo -e "android.enableJetifier=true" >> ./gradle.properties
+            echo -e "reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64" >> ./gradle.properties
             echo -e "newArchEnabled=false" >> ./gradle.properties
-            echo -e "FLIPPER_VERSION=0.125.0" >> ./gradle.properties
+            echo -e "hermesEnabled=true" >> ./gradle.properties
             echo -e "VERSIONCODE=$CIRCLE_BUILD_NUM" >> ./gradle.properties
             echo -e "APPLICATION_ID=chat.rocket.reactnative" >> ./gradle.properties
             echo -e "BugsnagAPIKey=$BUGSNAG_KEY" >> ./gradle.properties
@@ -532,8 +520,8 @@ jobs:
     <<: *defaults
     executor:
       name: android/android-machine
-      resource-class: large
-      tag: 2022.12.1
+      resource-class: xlarge
+      tag: 2024.01.1
     parallelism: 4
     steps:
       - checkout

.detoxrc.js

@@ -9,8 +9,8 @@ module.exports = {
 	},
 	artifacts: {
 		plugins: {
-			screenshot: process.env.CI ? undefined : 'failing',
-			video: process.env.CI ? undefined : 'failing',
+			screenshot: 'failing',
+			video: 'failing',
 			uiHierarchy: process.env.CI ? undefined : 'enabled'
 		}
 	},

.eslintrc.js

@@ -7,7 +7,7 @@ module.exports = {
 		}
 	},
 	parser: '@babel/eslint-parser',
-	extends: ['@rocket.chat/eslint-config', 'prettier'],
+	extends: ['plugin:jest/recommended', '@rocket.chat/eslint-config', 'prettier'],
 	parserOptions: {
 		sourceType: 'module',
 		ecmaVersion: 2017,
@@ -17,14 +17,15 @@ module.exports = {
 			legacyDecorators: true
 		}
 	},
-	plugins: ['react', 'jsx-a11y', 'import', 'react-native', '@babel', 'jest', 'react-hooks'],
+	plugins: ['react', 'jsx-a11y', 'import', 'react-native', '@babel', 'react-hooks', 'jest'],
 	env: {
 		browser: true,
 		commonjs: true,
 		es6: true,
 		node: true,
 		jquery: true,
 		mocha: true,
+		jest: true,
 		'jest/globals': true
 	},
 	rules: {
@@ -225,7 +226,8 @@ module.exports = {
 				'new-cap': 'off',
 				'lines-between-class-members': 'off',
 				'react-hooks/rules-of-hooks': 'error',
-				'react-hooks/exhaustive-deps': 'warn'
+				'react-hooks/exhaustive-deps': 'warn',
+				'jest/no-conditional-expect': 'off'
 			},
 			globals: {
 				JSX: true
@@ -241,7 +243,8 @@ module.exports = {
 		{
 			files: ['e2e/**'],
 			rules: {
-				'no-await-in-loop': 0
+				'no-await-in-loop': 0,
+				'jest/expect-expect': 'off'
 			}
 		}
 	]

.gitignore

@@ -20,33 +20,37 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+ios/.xcode.env.local
 project.xcworkspace
 *.mobileprovision
 ios/Pods/
 /vendor/bundle/
 
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
+
+# testing
+/coverage
+
 # Android/IntelliJ
 #
 build/
 .idea
 .gradle
 local.properties
 *.iml
+*.hprof
+.cxx/
+*.keystore
+*.jks
+!debug.keystore
 
 # node.js
 #
 node_modules/
 npm-debug.log
 yarn-error.log
 
-coverage/
-
-# BUCK
-buck-out/
-\.buckd/
-*.keystore
-*.jks
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the

.ruby-version

@@ -1 +1 @@
-2.7.7
+2.7.7

.storybook/index.ts

@@ -0,0 +1,14 @@
+import AsyncStorage from '@react-native-async-storage/async-storage';
+import { view } from './storybook.requires';
+import RNBootSplash from 'react-native-bootsplash';
+
+const StorybookUIRoot = view.getStorybookUI({
+  storage: {
+    getItem: AsyncStorage.getItem,
+    setItem: AsyncStorage.setItem,
+  },
+});
+
+RNBootSplash.hide();
+
+export default StorybookUIRoot;

.storybook/main.ts

@@ -0,0 +1,8 @@
+import { StorybookConfig } from '@storybook/react-native';
+
+const main: StorybookConfig = {
+  stories: ['../app/**/*.stories.?(ts|tsx|js|jsx)'],
+  addons: [],
+};
+
+export default main;