chore: update @rocket.chat/sdk to mobile branch HEAD

.github/scripts/__tests__/fixtures/scenario-catalog.json

@@ -108,10 +108,10 @@
     },
     {
       "id": "C3",
-      "name": "shared saga fans wide: sagas/rooms.js -> twelve flows",
+      "name": "shared saga fans wide: sagas/rooms.js -> thirteen flows",
       "category": "real-domain",
       "input": { "diff": ["app/sagas/rooms.js"] },
-      "expectedShards": [1, 5, 6, 7, 8, 11, 12, 13, 14],
+      "expectedShards": [1, 3, 5, 6, 7, 8, 11, 12, 13, 14],
       "expectedShouldRun": true,
       "assertableIn": ["map", "ci"]
     },

.maestro/scripts/data-setup.js

@@ -263,5 +263,6 @@ output.utils = {
     post,
     login,
     getDeepLink,
-    createDM
+    createDM,
+    sleep
 };

.maestro/tests/room/messages-received-while-offline.yaml

@@ -0,0 +1,55 @@
+appId: ${APP_ID}
+name: Messages received while device is offline
+onFlowStart:
+  - runFlow: '../../helpers/setup.yaml'
+onFlowComplete:
+  - setAirplaneMode: disabled
+  - stopApp: ${APP_ID}
+  - evalScript: ${output.utils.deleteCreatedUsers()}
+tags:
+  - test-3
+  - android-only
+
+---
+- evalScript: ${output.user = output.utils.createUser()}
+- evalScript: ${output.sender = output.utils.createUser()}
+- evalScript: ${output.tag = 'offline-' + output.random(6)}
+- evalScript: ${output.utils.sendMessage(output.sender.username, output.sender.password, '@' + output.user.username, output.tag + '-baseline')}
+
+- runFlow:
+    file: '../../helpers/login-with-deeplink.yaml'
+    env:
+      USERNAME: ${output.user.username}
+      PASSWORD: ${output.user.password}
+      CLEAR_STATE: true
+- runFlow:
+    file: '../../helpers/navigate-to-room.yaml'
+    env:
+      ROOM: ${output.sender.username}
+- extendedWaitUntil:
+    visible:
+      id: 'message-content-${output.tag}-baseline'
+    timeout: 60000
+
+# should deliver every message that arrived while the device had no network
+- setAirplaneMode: enabled
+- evalScript: ${output.utils.sendMessage(output.sender.username, output.sender.password, '@' + output.user.username, output.tag + '-1')}
+- evalScript: ${output.utils.sendMessage(output.sender.username, output.sender.password, '@' + output.user.username, output.tag + '-2')}
+- evalScript: ${output.utils.sendMessage(output.sender.username, output.sender.password, '@' + output.user.username, output.tag + '-3')}
+- evalScript: ${output.utils.sleep(5000)}
+- assertNotVisible:
+    id: 'message-content-${output.tag}-1'
+- assertNotVisible:
+    id: 'message-content-${output.tag}-2'
+- assertNotVisible:
+    id: 'message-content-${output.tag}-3'
+- setAirplaneMode: disabled
+
+- extendedWaitUntil:
+    visible:
+      id: 'message-content-${output.tag}-3'
+    timeout: 120000
+- assertVisible:
+    id: 'message-content-${output.tag}-1'
+- assertVisible:
+    id: 'message-content-${output.tag}-2'

.sniffler/test-map.json

@@ -40,7 +40,9 @@
 			"app/views/RegisterView/**",
 			"app/views/RoomsListView/**",
 			"app/sagas/login.js",
-			"app/sagas/rooms.js"
+			"app/sagas/rooms.js",
+			"app/sagas/selectServer.ts",
+			"app/lib/services/connect.ts"
 		]
 	},
 	{
@@ -66,7 +68,9 @@
 			"app/views/RegisterView/**",
 			"app/views/RoomsListView/**",
 			"app/sagas/login.js",
-			"app/sagas/rooms.js"
+			"app/sagas/rooms.js",
+			"app/sagas/selectServer.ts",
+			"app/lib/services/connect.ts"
 		]
 	},
 	{
@@ -249,6 +253,18 @@
 		"test": ".maestro/tests/room/mark-as-unread.yaml",
 		"dependsOn": ["app/views/RoomsListView/**", "app/containers/MessageActions/**", "app/sagas/rooms.js"]
 	},
+	{
+		"test": ".maestro/tests/room/messages-received-while-offline.yaml",
+		"dependsOn": [
+			"app/lib/services/sdk.ts",
+			"app/lib/services/socketHealth.ts",
+			"app/lib/methods/loadMissedMessages.ts",
+			"app/lib/methods/subscriptions/room.ts",
+			"app/lib/methods/subscribeRooms.ts",
+			"app/sagas/rooms.js",
+			"app/views/RoomView/**"
+		]
+	},
 	{
 		"test": ".maestro/tests/room/message-markdown-click.yaml",
 		"dependsOn": ["app/views/RoomView/**", "app/containers/markdown/**", "app/sagas/room.js"]

CONTEXT.md

@@ -2,18 +2,18 @@
 
 ## Rooms & Conversations
 
-| Term                | Definition                                                                                                                     | Aliases to avoid              |
-| ------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ----------------------------- |
-| **Room**            | A server-side conversation container with shared state (name, type, settings)                                                  | Chat, conversation            |
-| **Subscription**    | A user's personal relationship to a Room, holding per-user state (unread count, favorite, muted, open)                         | Membership, room entry        |
-| **Channel**         | A public Room (type `'c'`) visible to all server users                                                                         | Public room                   |
-| **Group**           | A private Room (type `'p'`) visible only to invited members                                                                    | Private room, private channel |
-| **Direct Message**  | A 1-on-1 private Room (type `'d'`) between two users                                                                           | DM, PM, private message       |
-| **Thread**          | A branched conversation spawned from a single Message, identified by `tmid` (thread message id)                                | Reply chain                   |
-| **Discussion**      | A separate Room spawned from a parent Room, identified by `prid` (parent room id) — unlike Threads, Discussions are full Rooms | Sub-room, sub-channel         |
-| **Team**            | An organizational container that groups multiple Channels and users under a single entity                                      | Workspace (ambiguous)         |
-| **Broadcast Room**  | A Room where only authorized users can send Messages; other users can only Reply Broadcast to existing Messages                | Broadcast channel             |
-| **Reply Broadcast** | The action of replying to a Message in a Broadcast Room when the current user cannot send regular Messages                     | Broadcast reply               |
+| Term                | Definition                                                                                                                            | Aliases to avoid              |
+| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------- |
+| **Room**            | A server-side conversation container with shared state (name, type, settings)                                                         | Chat, conversation            |
+| **Subscription**    | A user's personal relationship to a Room, holding per-user state (unread count, favorite, muted, open) — never a **DDP Subscription** | Membership, room entry        |
+| **Channel**         | A public Room (type `'c'`) visible to all server users                                                                                | Public room                   |
+| **Group**           | A private Room (type `'p'`) visible only to invited members                                                                           | Private room, private channel |
+| **Direct Message**  | A 1-on-1 private Room (type `'d'`) between two users                                                                                  | DM, PM, private message       |
+| **Thread**          | A branched conversation spawned from a single Message, identified by `tmid` (thread message id)                                       | Reply chain                   |
+| **Discussion**      | A separate Room spawned from a parent Room, identified by `prid` (parent room id) — unlike Threads, Discussions are full Rooms        | Sub-room, sub-channel         |
+| **Team**            | An organizational container that groups multiple Channels and users under a single entity                                             | Workspace (ambiguous)         |
+| **Broadcast Room**  | A Room where only authorized users can send Messages; other users can only Reply Broadcast to existing Messages                       | Broadcast channel             |
+| **Reply Broadcast** | The action of replying to a Message in a Broadcast Room when the current user cannot send regular Messages                            | Broadcast reply               |
 
 ## Messages
 
@@ -197,12 +197,13 @@ A **Message Action** is the active mode on a Message in the Room view. The three
 
 ## Server & Connection
 
-| Term               | Definition                                                                                                               | Aliases to avoid                                                 |
-| ------------------ | ------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------- |
-| **Server**         | A Rocket.Chat server instance the app connects to, with version, settings, and enterprise modules                        | Workspace (used by web but not consistently in mobile), instance |
-| **Server History** | List of previously connected Servers for quick reconnection                                                              | Recent servers                                                   |
-| **Meteor Connect** | The WebSocket connection to the Server's DDP (Distributed Data Protocol) endpoint                                        | Socket, connection                                               |
-| **Socket Health**  | Whether the Meteor Connect socket is genuinely alive — confirmed by a round trip when in doubt, reopened when known dead | Staleness (stale/gray/fresh), socket probe                       |
+| Term                 | Definition                                                                                                                                                                                                                                                                                | Aliases to avoid                                                 |
+| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------- |
+| **Server**           | A Rocket.Chat server instance the app connects to, with version, settings, and enterprise modules                                                                                                                                                                                         | Workspace (used by web but not consistently in mobile), instance |
+| **Server History**   | List of previously connected Servers for quick reconnection                                                                                                                                                                                                                               | Recent servers                                                   |
+| **Meteor Connect**   | The WebSocket connection to the Server's DDP (Distributed Data Protocol) endpoint                                                                                                                                                                                                         | Socket, connection                                               |
+| **Socket Health**    | Whether the Meteor Connect socket is genuinely alive — confirmed by a round trip when in doubt, reopened when known dead                                                                                                                                                                  | Staleness (stale/gray/fresh), socket probe                       |
+| **DDP Subscription** | A live server-push feed on Meteor Connect, opened by name and parameters (`stream-room-messages`, `stream-notify-user`); the SDK derives its id from those parameters, so two callers asking for the same feed share one — distinct from a **Subscription**, which is a membership record | Stream, DDP stream, sub                                          |
 
 ## Navigation & Layout
 

app/containers/Avatar/useAvatarETag.ts

@@ -13,7 +13,7 @@ export const useAvatarETag = ({
 	id
 }: {
 	type?: string;
-	username: string;
+	username?: string;
 	text: string;
 	rid?: string;
 	id: string;
@@ -61,7 +61,7 @@ export const useAvatarETag = ({
 				}
 			};
 		}
-	}, [text]);
+	}, [text, username, type, rid, id]);
 
 	return { avatarETag };
 };

app/containers/LoginServices/serviceLogin.ts

@@ -137,7 +137,11 @@ export const onPressAppleLogin = async () => {
 				AppleAuthentication.AppleAuthenticationScope.EMAIL
 			]
 		});
-		await loginOAuthOrSso({ fullName, email, identityToken });
+		if (!identityToken) {
+			logEvent(events.ENTER_WITH_APPLE_F);
+			return;
+		}
+		await loginOAuthOrSso({ fullName: fullName ?? {}, email, identityToken });
 	} catch {
 		logEvent(events.ENTER_WITH_APPLE_F);
 	}

app/containers/TwoFactor/index.test.tsx

@@ -0,0 +1,38 @@
+import { act, fireEvent, render, waitFor } from '@testing-library/react-native';
+
+import TwoFactor from '.';
+import { isTwoFactorCancelled, twoFactor } from '../../lib/services/twoFactor';
+
+jest.mock('../../lib/services/restApi', () => ({
+	sendEmailCode: jest.fn()
+}));
+
+jest.mock('../../lib/hooks/useMasterDetail', () => ({
+	useMasterDetail: () => false
+}));
+
+const requestTwoFactor = () => twoFactor({ method: 'totp', invalid: false });
+
+describe('TwoFactor', () => {
+	it('cancels the displaced prompt and resolves the newest one', async () => {
+		const { getByTestId } = render(<TwoFactor />);
+
+		let displacedResult: Promise<unknown> | undefined;
+		let newest: ReturnType<typeof requestTwoFactor> | undefined;
+		await act(() => {
+			displacedResult = requestTwoFactor().catch(error => error);
+			newest = requestTwoFactor();
+		});
+
+		await waitFor(() => expect(getByTestId('two-factor-input')).toBeTruthy());
+
+		expect(isTwoFactorCancelled(await displacedResult!)).toBe(true);
+
+		fireEvent.changeText(getByTestId('two-factor-input'), '123456');
+		await act(() => {
+			fireEvent.press(getByTestId('two-factor-send'));
+		});
+
+		await expect(newest!).resolves.toEqual({ twoFactorCode: '123456', twoFactorMethod: 'totp' });
+	});
+});

app/containers/TwoFactor/index.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState, memo } from 'react';
+import { useEffect, useRef, useState, memo } from 'react';
 import { AccessibilityInfo, Text, View } from 'react-native';
 import isEmpty from 'lodash/isEmpty';
 import { sha256 } from 'js-sha256';
@@ -16,11 +16,11 @@
 import Button from '../Button';
 import sharedStyles from '../../views/Styles';
 import styles from './styles';
-import { type ICredentials } from '../../definitions';
+import { type ILoginCredentials } from '../../definitions';
 import { sendEmailCode } from '../../lib/services/restApi';
 import { useMasterDetail } from '../../lib/hooks/useMasterDetail';
 import Toast from '../Toast';
 import { showToast } from '../../lib/methods/helpers/showToast';
 import log from '../../lib/methods/helpers/log';
 
 export const TWO_FACTOR = 'TWO_FACTOR';
@@ -38,7 +38,7 @@
 }
 
 interface EventListenerMethod {
-	params?: ICredentials;
+	params?: ILoginCredentials;
 	method?: keyof IMethods;
 	submit?: (param: string) => void;
 	cancel?: () => void;
@@ -70,6 +70,7 @@
 	const isMasterDetail = useMasterDetail();
 	const [visible, setVisible] = useState(false);
 	const [data, setData] = useState<EventListenerMethod>({});
+	const pendingCancel = useRef<EventListenerMethod['cancel']>(undefined);
 	const {
 		control,
 		setValue,
@@ -87,12 +88,13 @@
 	const method = data.method ? methods[data.method] : null;
 	const isEmail = data.method === 'email';
 	const params = data?.params;
+	const emailCodeRecipient = params && 'user' in params ? params.user : undefined;
 
 	const sendEmail = async () => {
 		try {
-			if (params?.user) {
+			if (emailCodeRecipient) {
 				clearErrors();
-				const response = await sendEmailCode(params?.user);
+				const response = await sendEmailCode(emailCodeRecipient);
 
 				if (response.success) {
 					showToast(I18n.t('Two_Factor_Success_message'));
@@ -113,6 +115,8 @@
 	}, [data]);
 
 	const showTwoFactor = (args: EventListenerMethod) => {
+		pendingCancel.current?.();
+		pendingCancel.current = args.cancel;
 		setData(args);
 		if (args.invalid) {
 			setError('code', { message: I18n.t('Invalid_code'), type: 'validate' });
@@ -128,6 +132,7 @@
 
 	const onCancel = () => {
 		const { cancel } = data;
+		pendingCancel.current = undefined;
 		if (cancel) {
 			cancel();
 		}
@@ -136,6 +141,7 @@
 
 	const onSubmit = () => {
 		const { submit } = data;
+		pendingCancel.current = undefined;
 		if (submit) {
 			const { code } = getValues();
 			if (data.method === 'password') {

app/definitions/ILoggedUser.ts

@@ -1,13 +1,13 @@
 import type Model from '@nozbe/watermelondb/Model';
 
-import { type IUserEmail, type IUserSettings } from './IUser';
+import { type IUserEmail } from './IUser';
 import { type TStatusSource } from './TStatusSource';
 import { type TUserStatus } from './TUserStatus';
 
 export interface ILoggedUser {
 	id: string;
 	token: string;
-	username: string;
+	username?: string;
 	name?: string;
 	language?: string;
 	status: TUserStatus;
@@ -30,18 +30,4 @@ export interface ILoggedUser {
 	requirePasswordChange?: boolean;
 }
 
-export interface ILoggedUserResultFromServer extends Omit<
-	ILoggedUser,
-	'enableMessageParserEarlyAdoption' | 'showMessageInMainThread'
-> {
-	settings: IUserSettings;
-}
-
-export interface ILoginResultFromServer {
-	status: string;
-	authToken: string;
-	userId: string;
-	me: ILoggedUserResultFromServer;
-}
-
 export type TLoggedUserModel = ILoggedUser & Model;

app/definitions/ILoginCredentials.ts

@@ -0,0 +1,12 @@
+export type {
+	ICredentialsAppleAPI,
+	ICredentialsAuthenticated,
+	ICredentialsCasAPI,
+	ICredentialsCrowdAPI,
+	ICredentialsLdapAPI,
+	ICredentialsOAuth,
+	ICredentialsPasswordAPI,
+	ICredentialsSamlAPI,
+	ICredentialsTotpAPI,
+	ILoginCredentials
+} from '@rocket.chat/sdk/interfaces';

app/definitions/IProfile.ts

@@ -3,7 +3,7 @@ import { type ReactNode } from 'react';
 export interface IProfileParams {
 	realname?: string;
 	name?: string;
-	username: string;
+	username?: string;
 	email: string | null;
 	newPassword: string;
 	currentPassword: string;