chore: Merge 4.65.0 into master (#6712)

Author: diegolmello

.eslintrc.js

@@ -3,7 +3,14 @@ module.exports = {
 		'import/resolver': {
 			node: {
 				extensions: ['.ts', '.tsx', '.js', '.ios.js', '.android.js', '.native.js', '.ios.tsx', '.android.tsx']
+			},
+			typescript: {
+				alwaysTryTypes: true,
+				project: './tsconfig.json'
 			}
+		},
+		'import/parsers': {
+			'@typescript-eslint/parser': ['.ts', '.tsx']
 		}
 	},
 	parser: '@babel/eslint-parser',
@@ -29,6 +36,8 @@ module.exports = {
 		'jest/globals': true
 	},
 	rules: {
+		'import/named': 'error',
+		'import/no-unresolved': 'error',
 		'import/extensions': [
 			'error',
 			'ignorePackages',
@@ -54,7 +63,7 @@ module.exports = {
 		'jsx-a11y/href-no-hash': 0,
 		'jsx-a11y/aria-role': 0,
 		'import/prefer-default-export': 0,
-		'import/no-cycle': 0,
+		'import/no-cycle': 2,
 		'import/order': [
 			'error',
 			{

.github/workflows/build-pr.yml

@@ -80,6 +80,12 @@ jobs:
     uses: ./.github/workflows/maestro-android.yml
     needs: [e2e-build-android]
     secrets: inherit
+    strategy:
+      matrix:
+        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
+      fail-fast: false
+    with:
+      shard: ${{ matrix.shard }}
 
   e2e-build-ios:
     name: E2E Build iOS
@@ -93,4 +99,5 @@ jobs:
     if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
     uses: ./.github/workflows/maestro-ios.yml
     needs: [e2e-build-ios]
-    secrets: inherit
+    secrets: inherit
+    

.github/workflows/e2e-build-android.yml

@@ -28,21 +28,25 @@ jobs:
       - name: Checkout and Setup Node
         uses: ./.github/actions/setup-node
 
-      - name: Setup E2E Account
-        uses: ./.github/actions/e2e-account
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v4
         with:
-          E2E_ACCOUNT: ${{ secrets.E2E_ACCOUNT }}
+          path: |
+            ~/.gradle
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            gradle-${{ runner.os }}-
 
-      - name: Cache Gradle dependencies
+      - name: Cache Android build
         uses: actions/cache@v4
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/transforms-*
-            ~/.gradle/caches/build-cache-*
-          key: gradle-transforms-v1-${{ runner.os }}-${{ hashFiles('**/*.gradle*', 'gradle-wrapper.properties') }}
+            android/.gradle
+            android/app/build
+            android/app/.cxx
+          key: android-build-${{ runner.os }}-${{ hashFiles('package.json', '**/*.gradle*', 'android/gradle.properties', 'android/settings.gradle') }}
           restore-keys: |
-            gradle-transforms-v1-${{ runner.os }}-
+            android-build-${{ runner.os }}-
 
       - name: Set up JDK
         uses: actions/setup-java@v4
@@ -57,7 +61,6 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: wrapper
-          cache-disabled: true
 
       - name: Decode Keystore
         run: |
@@ -70,7 +73,7 @@ jobs:
           echo -e "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" >> ./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 "reactNativeArchitectures=x86_64" >> ./gradle.properties
           echo -e "APPLICATION_ID=chat.rocket.reactnative" >> ./gradle.properties
           echo -e "newArchEnabled=true" >> ./gradle.properties
           echo -e "hermesEnabled=true" >> ./gradle.properties

.github/workflows/e2e-build-ios.yml

@@ -79,6 +79,7 @@ jobs:
       - name: Build iOS app
         run: |
           cd ios
+          export RUNNING_E2E_TESTS=true
           bundle exec fastlane ios build_experimental_simulator \
             disable_xcpretty:false \
             skip_package_ipa:true \

.github/workflows/maestro-android.yml

@@ -2,9 +2,14 @@ name: Maestro Tests on Android
 
 on:
   workflow_call:
+    inputs:
+      shard:
+        required: true
+        type: string
 
 jobs:
   android-test:
+    name: 'Android Tests'
     runs-on: ubuntu-latest
 
     steps:
@@ -38,8 +43,63 @@ jobs:
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
+      - name: Create Maestro script
+        run: |
+          cat << 'EOF' > run-maestro.sh
+          #!/bin/bash
+          SHARD=${{ inputs.shard }}
+          echo "Running shard: $SHARD"
+
+          adb shell settings put system show_touches 1
+          adb install app-experimental-release.apk
+          adb shell monkey -p chat.rocket.reactnative -c android.intent.category.LAUNCHER 1
+          sleep 10
+          adb shell am force-stop chat.rocket.reactnative
+          export MAESTRO_DRIVER_STARTUP_TIMEOUT=120000
+
+          MAX_RETRIES=3
+          ATTEMPT=1
+          FINAL_EXIT_CODE=1
+
+          while [ $ATTEMPT -le $MAX_RETRIES ]; do
+            echo "Attempt $ATTEMPT of $MAX_RETRIES"
+
+            echo "Starting screen recording..."
+            adb shell screenrecord /sdcard/test_run.mp4 > /dev/null 2>&1 &
+            RECORD_PID=$!
+
+            maestro test .maestro --exclude-tags=util --include-tags=test-$SHARD --format junit --output maestro-report.xml
+            TEST_EXIT_CODE=$?
+
+            echo "Stopping screen recording..."
+            kill -INT $RECORD_PID || true
+            sleep 2
+
+            echo "Pulling video from device..."
+            adb pull /sdcard/test_run.mp4 test_run_${SHARD}_attempt_${ATTEMPT}.mp4 || true
+            adb shell rm /sdcard/test_run.mp4 || true
+
+            if [ $TEST_EXIT_CODE -eq 0 ]; then
+              echo "Maestro passed on attempt $ATTEMPT"
+              FINAL_EXIT_CODE=0
+              break
+            else
+              echo "Maestro failed on attempt $ATTEMPT"
+            fi
+
+            ATTEMPT=$((ATTEMPT+1))
+          done
+
+          exit $FINAL_EXIT_CODE
+          EOF
+
+          chmod +x run-maestro.sh
+        env:
+          SHARD: ${{ inputs.shard }}
+
       - name: Start Android Emulator and Run Maestro Tests
         uses: reactivecircus/android-emulator-runner@v2
+        timeout-minutes: 60
         with:
           api-level: 34
           disk-size: 4096M
@@ -51,24 +111,20 @@ jobs:
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          script: |
-            adb install app-experimental-release.apk
-            adb shell monkey -p chat.rocket.reactnative -c android.intent.category.LAUNCHER 1
-            sleep 10
-            adb shell am force-stop chat.rocket.reactnative
-            export MAESTRO_DRIVER_STARTUP_TIMEOUT=120000
-            maestro test .maestro --format junit --output maestro-report.xml
+          script: ./run-maestro.sh
 
       - name: Upload Test Report
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Android Test Report
+          name: Android Test Report - Shard ${{ inputs.shard }}
           path: maestro-report.xml
-
-      - name: Upload Maestro Logs
+          retention-days: 7
+      
+      - name: Upload Screen Recording
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Android Maestro Logs
-          path: ~/.maestro/tests/
+          name: maestro-video-${{ inputs.shard }}
+          path: test_run_${{ inputs.shard }}_attempt_*.mp4
+          retention-days: 7

.maestro/helpers/login.yaml

@@ -18,11 +18,14 @@ onFlowStart:
 - tapOn:
     id: login-view-email
 - inputText: ${USERNAME || output.createdUser.email}
-- pressKey: enter
+- tapOn:
+    text: '.*Username or email.*'
 - tapOn:
     id: login-view-password
 - inputText: ${PASSWORD || output.createdUser.password}
-- hideKeyboard
+- tapOn:
+    text: Login
+    index: 0
 - tapOn:
     id: login-view-submit
 - extendedWaitUntil:

.maestro/helpers/logout.yaml

@@ -49,16 +49,19 @@ tags:
     commands:
       - extendedWaitUntil:
           visible:
-            text: 'LOGOUT'
+            id: 'android:id/button1'
           timeout: 60000
-      - tapOn: 'LOGOUT'
+      - tapOn:
+          text: Logout
+          index: 0
 
 - runFlow:
     when:
       platform: iOS
     commands:
       - tapOn:
-          point: '67%,57%'
+          text: Logout
+          index: 1
 
 - extendedWaitUntil:
     visible:

.maestro/helpers/navigate-to-register.yaml

@@ -5,7 +5,7 @@ tags:
 
 ---
 - tapOn: Workspace URL. Required.
-- inputText: ${output.data.server}
+- inputText: ${server || output.data.server}
 - extendedWaitUntil:
     visible: 'Connect'
     timeout: 60000

.maestro/helpers/navigate-to-room-action.yaml

@@ -10,7 +10,7 @@ tags:
         id: 'room-view'
     commands:
       - runFlow:
-          file: './navigate-to-room.yaml'
+          file: './search-and-navigate-room.yaml'
           env:
             ROOM: ${ROOM}
 

.maestro/helpers/open-deeplink.yaml

@@ -0,0 +1,13 @@
+appId: chat.rocket.reactnative
+name: Open Deep Link
+tags:
+  - 'util'
+
+---
+- openLink:
+    link: ${link}
+- runFlow:
+    when:
+      visible: '.*Open in.*'
+    commands:
+      - tapOn: Open