merged develop branch

Author: Rohit3523

.eslintignore

@@ -4,4 +4,3 @@ coverage
 e2e/docker
 android
 ios
-.eslintrc.js

.eslintrc.js

@@ -5,53 +5,33 @@ module.exports = {
 				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']
-			// plugins: ['@typescript-eslint'],
-			// rules: {
-			// 	'@typescript-eslint/consistent-type-imports': [
-			// 		'error',
-			// 		{
-			// 			prefer: 'type-imports', // enforce `import type`
-			// 			disallowTypeAnnotations: true // disallow `import { type Foo }`
-			// 			// fixStyle: 'inline-type-imports' // keeps type imports inline rather than grouped
-			// 		}
-			// 	]
-			// }
+		},
+		react: {
+			version: 'detect'
 		}
 	},
 	parser: '@babel/eslint-parser',
-	extends: ['plugin:jest/recommended', '@rocket.chat/eslint-config', 'prettier', 'plugin:react-hooks/recommended'],
+	extends: [
+		'@rocket.chat/eslint-config',
+		'plugin:react/recommended',
+		'plugin:react-hooks/recommended',
+		'plugin:prettier/recommended',
+		'prettier'
+	],
 	parserOptions: {
 		sourceType: 'module',
-		ecmaVersion: 2017,
-		ecmaFeatures: {
-			experimentalObjectRestSpread: true,
-			jsx: true,
-			legacyDecorators: true
-		}
+		ecmaVersion: 2024
 	},
-	plugins: ['react', 'jsx-a11y', 'import', 'react-native', '@babel', 'react-hooks', 'jest'],
+	plugins: ['import', 'react-native', '@babel'],
 	env: {
-		browser: true,
-		commonjs: true,
-		es6: true,
-		node: true,
-		jquery: true,
-		mocha: true,
-		jest: true,
-		'jest/globals': true
+		es6: true
 	},
 	rules: {
-		'react-hooks/set-state-in-effect': 1,
-		'react-hooks/immutability': 1,
-		'react-hooks/refs': 1,
-		'import/named': 'error',
-		'import/no-unresolved': 'error',
 		'import/extensions': [
 			'error',
 			'ignorePackages',
@@ -62,122 +42,34 @@ module.exports = {
 				tsx: 'warning'
 			}
 		],
-		'react/jsx-filename-extension': [
-			1,
-			{
-				extensions: ['.js', '.jsx', '.ts', '.tsx']
-			}
-		],
-		'react/require-default-props': [0],
-		'ordered-imports': [0],
-		'react/no-did-mount-set-state': 0,
-		'react/no-multi-comp': [0],
-		'react/jsx-indent-props': [2, 'tab'],
-		'jsx-quotes': [2, 'prefer-single'],
-		'jsx-a11y/href-no-hash': 0,
-		'jsx-a11y/aria-role': 0,
-		'import/prefer-default-export': 0,
-		'import/no-cycle': 2,
+		'import/named': 'error',
+		'import/no-cycle': 'error',
+		'import/no-unresolved': 'error',
 		'import/order': [
 			'error',
 			{
 				'newlines-between': 'ignore'
 			}
 		],
-		camelcase: 0,
-		'no-underscore-dangle': 0,
-		'no-return-assign': 0,
-		'no-param-reassign': 0,
-		'no-tabs': 0,
-		'no-multi-spaces': 2,
-		'no-eval': 2,
-		'no-extend-native': 2,
-		'no-multi-str': 2,
-		'no-use-before-define': 2,
-		'no-const-assign': 2,
-		'no-cond-assign': 2,
-		'no-constant-condition': 2,
-		'no-control-regex': 2,
-		'no-debugger': 2,
-		'no-delete-var': 2,
-		'no-dupe-keys': 2,
-		'no-dupe-args': 2,
-		'no-dupe-class-members': 2,
-		'no-duplicate-case': 2,
-		'no-else-return': [0, { allowElseIf: true }],
-		'no-empty': 2,
-		'no-empty-character-class': 2,
-		'no-ex-assign': 2,
-		'no-extra-boolean-cast': 2,
-		'no-extra-semi': 2,
-		'no-fallthrough': 2,
-		'no-func-assign': 2,
-		'no-inner-declarations': [2, 'functions'],
-		'no-invalid-regexp': 2,
-		'no-irregular-whitespace': 2,
-		'no-mixed-spaces-and-tabs': 1,
-		'no-sparse-arrays': 2,
-		'no-negated-in-lhs': 2,
-		'no-obj-calls': 2,
-		'no-octal': 2,
-		'no-redeclare': 2,
-		'no-regex-spaces': 2,
-		'no-undef': 2,
-		'no-unreachable': 2,
-		'no-unused-expressions': 0,
+		'react/display-name': 'off',
+		'react/jsx-fragments': ['error', 'syntax'],
+		'react/jsx-key': 'off',
+		'react/no-direct-mutation-state': 'off',
+		'react/prop-types': 'off',
+		'react/react-in-jsx-scope': 'off',
+		'react-hooks/set-state-in-effect': 'warn',
+		'react-hooks/immutability': 'warn',
+		'react-hooks/refs': 'warn',
+		'react-native/no-color-literals': 'off',
+		'react-native/no-inline-styles': 'off',
+		'react-native/no-raw-text': 'off',
+		'react-native/no-single-element-style-arrays': 'error',
+		'react-native/no-unused-styles': 'error',
+		'react-native/split-platform-components': 'off',
 		'no-unused-vars': 'off',
-		'max-len': 0,
-		'react/jsx-uses-vars': 2,
-		'no-void': 2,
-		'no-var': 2,
-		'one-var': [2, 'never'],
-		'no-lonely-if': 2,
-		'no-trailing-spaces': 2,
-		complexity: [1, 31],
-		'space-in-parens': [2, 'never'],
-		'space-before-blocks': [2, 'always'],
-		indent: 'off',
-		'eol-last': [2, 'always'],
-		'comma-dangle': [2, 'never'],
-		'keyword-spacing': 2,
-		'block-spacing': 2,
-		'brace-style': [2, '1tbs', { allowSingleLine: true }],
-		'computed-property-spacing': 2,
-		'comma-spacing': 2,
-		'comma-style': 2,
-		'guard-for-in': 2,
-		'wrap-iife': 2,
-		'block-scoped-var': 2,
-		curly: [2, 'all'],
-		eqeqeq: [2, 'allow-null'],
-		'new-cap': 'off',
-		'use-isnan': 2,
-		'valid-typeof': 2,
-		'linebreak-style': 0,
-		'prefer-template': 2,
-		quotes: [1, 'single'],
-		semi: [2, 'always'],
-		'prefer-const': 2,
-		'object-shorthand': 2,
-		'consistent-return': 0,
-		'global-require': 'off',
-		'react-native/no-unused-styles': 2,
-		'react/jsx-one-expression-per-line': 0,
-		'require-await': 2,
-		'func-names': 0,
-		'react/static-property-placement': [0],
-		'arrow-parens': ['warn', 'as-needed', { requireForBlockBody: true }],
-		'react/jsx-curly-newline': [0],
-		'react/state-in-constructor': [0],
-		'no-async-promise-executor': [0],
-		'max-classes-per-file': [0],
-		'no-multiple-empty-lines': [0],
-		'no-sequences': 'off',
-		'react-hooks/rules-of-hooks': 'error',
-		'react-hooks/exhaustive-deps': 'warn'
-	},
-	globals: {
-		__DEV__: true
+		'no-void': 'error',
+		'new-cap': 'error',
+		'require-await': 'error'
 	},
 	overrides: [
 		{
@@ -186,50 +78,13 @@ module.exports = {
 				'plugin:@typescript-eslint/recommended',
 				'plugin:@typescript-eslint/eslint-recommended',
 				'@rocket.chat/eslint-config',
+				'plugin:prettier/recommended',
 				'prettier'
 			],
 			parser: '@typescript-eslint/parser',
-			parserOptions: {
-				sourceType: 'module',
-				ecmaVersion: 2018,
-				warnOnUnsupportedTypeScriptVersion: false,
-				ecmaFeatures: {
-					experimentalObjectRestSpread: true,
-					legacyDecorators: true
-				}
-			},
-			plugins: ['react', '@typescript-eslint'],
 			rules: {
-				'@typescript-eslint/no-var-requires': 'off',
-				'@typescript-eslint/no-empty-function': [0],
-				'@typescript-eslint/ban-types': [0],
-				'func-call-spacing': 'off',
-				'jsx-quotes': ['error', 'prefer-single'],
-				indent: 'off',
-				'comma-dangle': [2, 'never'],
-				'no-return-assign': 0,
-				'no-dupe-class-members': 'off',
-				'no-extra-parens': 'off',
-				'no-spaced-func': 'off',
-				'no-unused-vars': 'off',
-				'no-useless-constructor': 'off',
-				'no-use-before-define': 'off',
-				'react/jsx-uses-react': 'error',
-				'react/jsx-uses-vars': 'error',
-				'react/jsx-no-undef': 'error',
-				'react/jsx-fragments': ['error', 'syntax'],
 				'@typescript-eslint/ban-ts-comment': 'off',
-				'@typescript-eslint/indent': 'off',
-				'@typescript-eslint/no-extra-parens': 'off',
-				'@typescript-eslint/no-dupe-class-members': 'error',
-				'@typescript-eslint/no-explicit-any': 'off',
-				'@typescript-eslint/no-unused-vars': [
-					'error',
-					{
-						argsIgnorePattern: '^_',
-						ignoreRestSiblings: true
-					}
-				],
+				'@typescript-eslint/ban-types': 'off',
 				'@typescript-eslint/consistent-type-imports': [
 					'error',
 					{
@@ -238,14 +93,31 @@ module.exports = {
 						fixStyle: 'inline-type-imports'
 					}
 				],
+				'@typescript-eslint/indent': 'off',
+				'@typescript-eslint/no-dupe-class-members': 'error',
+				'@typescript-eslint/no-empty-function': 'off',
+				'@typescript-eslint/no-explicit-any': 'off',
+				'@typescript-eslint/no-extra-parens': 'off',
+				'@typescript-eslint/no-unused-vars': [
+					'error',
+					{
+						args: 'all',
+						argsIgnorePattern: '^_'
+					}
+				],
+				'@typescript-eslint/no-var-requires': 'off',
+				'no-return-assign': 'off',
+				'no-dupe-class-members': 'off',
+				'no-extra-parens': 'off',
+				'no-spaced-func': 'off',
+				'no-unused-vars': 'off',
+				'no-useless-constructor': 'off',
+				'no-use-before-define': 'off',
 				'new-cap': 'off',
-				'lines-between-class-members': 'off',
-				'react-hooks/rules-of-hooks': 'error',
-				'react-hooks/exhaustive-deps': 'warn',
-				'jest/no-conditional-expect': 'off'
+				'lines-between-class-members': 'off'
 			},
 			globals: {
-				JSX: true
+				JSX: 'readonly'
 			},
 			settings: {
 				'import/resolver': {
@@ -256,10 +128,13 @@ module.exports = {
 			}
 		},
 		{
-			files: ['e2e/**'],
-			rules: {
-				'no-await-in-loop': 0,
-				'jest/expect-expect': 'off'
+			files: ['jest.setup.js', '__mocks__/**/*.js', '**/*.test.{js,ts,tsx}'],
+			extends: ['plugin:jest/recommended']
+		},
+		{
+			files: ['index.js', 'app/**/*.{js,ts,tsx}'],
+			env: {
+				'react-native/react-native': true
 			}
 		}
 	]

.github/actions/build-ios/action.yml

@@ -53,7 +53,7 @@ runs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '16.4'
+        xcode-version: '26.2.0'
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

.github/actions/upload-android/action.yml

@@ -53,6 +53,26 @@ runs:
         echo "${{ inputs.FASTLANE_GOOGLE_SERVICE_ACCOUNT }}" | base64 --decode > service_account.json
       shell: bash
 
+    - uses: actions/download-artifact@v4
+      if: ${{ inputs.trigger == 'develop' }}
+      with:
+        name: release-changelog
+        path: .
+
+    - name: Prepare Play Store changelog metadata
+      if: ${{ inputs.trigger == 'develop' }}
+      run: |
+        mkdir -p android/fastlane/metadata/android/en-US/changelogs
+
+        if [ -f changelog.txt ]; then
+          node .github/scripts/prepare-changelog.js
+        else
+          printf "Internal improvements and bug fixes" > "android/fastlane/metadata/android/en-US/changelogs/${BUILD_VERSION}.txt"
+        fi
+      shell: bash
+      env:
+        BUILD_VERSION: ${{ inputs.BUILD_VERSION }}
+
     - name: Fastlane Play Store Upload
       working-directory: android
       run: |
@@ -65,7 +85,6 @@ runs:
         if [[ ${{ inputs.trigger }} == "develop" ]] && [[ ${{ inputs.type }} == 'official' ]]; then
           bundle exec fastlane android official_open_testing
         fi
-          
       shell: bash
 
     - name: Leave a comment on PR

.github/actions/upload-ios/action.yml

@@ -91,7 +91,7 @@ runs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '16.2'
+        xcode-version: '26.2.0'
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
@@ -109,6 +109,12 @@ runs:
         yarn pod-install
       shell: bash
 
+    - uses: actions/download-artifact@v4
+      if: ${{ inputs.type == 'official' && inputs.trigger == 'develop' }}
+      with:
+        name: release-changelog
+        path: .
+
     - name: Fastlane Submit to TestFlight
       working-directory: ios
       run: |
@@ -157,4 +163,4 @@ runs:
         message="**iOS Build Available**"$'\n\n'"$app_name $VERSION_NAME.$BUILD_VERSION"
 
         gh pr comment "$PR_NUMBER" --body "$message"
-      shell: bash
+      shell: bash