Merge branch 'develop' into watermelon-db-update

Author: diegolmello

.eslintrc.js

@@ -11,6 +11,17 @@ module.exports = {
 		},
 		'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
+			// 		}
+			// 	]
+			// }
 		}
 	},
 	parser: '@babel/eslint-parser',
@@ -219,6 +230,14 @@ module.exports = {
 						ignoreRestSiblings: true
 					}
 				],
+				'@typescript-eslint/consistent-type-imports': [
+					'error',
+					{
+						prefer: 'type-imports',
+						disallowTypeAnnotations: true,
+						fixStyle: 'inline-type-imports'
+					}
+				],
 				'new-cap': 'off',
 				'lines-between-class-members': 'off',
 				'react-hooks/rules-of-hooks': 'error',

.github/workflows/prettier.yml

@@ -26,8 +26,11 @@ jobs:
       - name: Run Prettier
         run: yarn prettier --write .
 
+      - name: Run ESLint
+        run: npx eslint . --fix
+        
       - name: Check for changes
-        id: check_changes
+        id: changes
         run: |
           if git diff --quiet; then
             echo "No code format changes detected"
@@ -37,11 +40,11 @@ jobs:
             echo "changes=true" >> $GITHUB_OUTPUT
           fi
       
-      - name: Commit and push changes
-        if: steps.check_changes.outputs.changes == 'true'
+      - name: Commit and push eslint changes
+        if: steps.changes.outputs.changes == 'true'
         run: |
           git config user.name "${{ github.actor }}"
           git config user.email "${{ github.actor }}@users.noreply.github.com"
           git add .
-          git commit -m "chore: format code with Prettier [skip ci]"
+          git commit -m "chore: format code and fix lint issues [skip ci]"
           git push origin ${{ github.ref_name }}

.maestro/tests/room/room-last-message-thread-50-plus.yaml

@@ -0,0 +1,32 @@
+appId: chat.rocket.reactnative
+name: Open room with last message as thread with more than 50 messages
+onFlowStart:
+  - runFlow: '../../helpers/setup.yaml'
+tags:
+  - test-12
+
+---
+- runFlow:
+    file: '../../helpers/login-with-deeplink.yaml'
+    env:
+      USERNAME: ${output.account.adminUser}
+      PASSWORD: ${output.account.adminPassword}
+
+# should open a room where the last message is a thread containing more than 50 messages.
+- runFlow:
+    file: '../../helpers/navigate-to-room.yaml'
+    env:
+      ROOM: 'maestro_test_load_threads'
+- extendedWaitUntil:
+    visible:
+      text: '.*message 50.*'
+    timeout: 60000
+- extendedWaitUntil:
+    visible:
+      id: 'thread-count-55'
+    timeout: 60000
+- scrollUntilVisible:
+    element:
+      id: 'message-content-message 1'
+    direction: UP
+    timeout: 60000

app/AppContainer.tsx

@@ -3,7 +3,7 @@ import { NavigationContainer } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { connect } from 'react-redux';
 
-import { SetUsernameStackParamList, StackParamList } from './definitions/navigationTypes';
+import type { SetUsernameStackParamList, StackParamList } from './definitions/navigationTypes';
 import Navigation from './lib/navigation/appNavigation';
 import { defaultHeader, getActiveRouteName, navigationTheme } from './lib/methods/helpers/navigation';
 import { RootEnum } from './definitions';

app/actions/activeUsers.ts

@@ -1,6 +1,6 @@
-import { Action } from 'redux';
+import { type Action } from 'redux';
 
-import { IActiveUsers } from '../reducers/activeUsers';
+import { type IActiveUsers } from '../reducers/activeUsers';
 import { ACTIVE_USERS } from './actionsTypes';
 
 interface ISetActiveUsers extends Action {

app/actions/app.ts

@@ -1,7 +1,7 @@
-import { Action } from 'redux';
-import { NetInfoStateType } from '@react-native-community/netinfo';
+import { type Action } from 'redux';
+import { type NetInfoStateType } from '@react-native-community/netinfo';
 
-import { RootEnum } from '../definitions';
+import { type RootEnum } from '../definitions';
 import { APP } from './actionsTypes';
 
 interface IAppStart extends Action {

app/actions/connect.ts

@@ -1,4 +1,4 @@
-import { Action } from 'redux';
+import { type Action } from 'redux';
 
 import * as types from './actionsTypes';
 

app/actions/createChannel.ts

@@ -1,6 +1,6 @@
-import { Action } from 'redux';
+import { type Action } from 'redux';
 
-import { TCreateChannelResult } from '../reducers/createChannel';
+import { type TCreateChannelResult } from '../reducers/createChannel';
 import { CREATE_CHANNEL } from './actionsTypes';
 
 interface ICreateChannelRequest extends Action {

app/actions/createDiscussion.ts

@@ -1,4 +1,4 @@
-import { Action } from 'redux';
+import { type Action } from 'redux';
 
 import { CREATE_DISCUSSION } from './actionsTypes';
 

app/actions/customEmojis.ts

@@ -1,7 +1,7 @@
-import { Action } from 'redux';
+import { type Action } from 'redux';
 
 import { SET_CUSTOM_EMOJIS } from './actionsTypes';
-import { ICustomEmojis } from '../definitions';
+import { type ICustomEmojis } from '../definitions';
 
 export interface ISetCustomEmojis extends Action {
 	emojis: ICustomEmojis;