Merge branch 'zulip:main' into main

package.json

@@ -105,7 +105,6 @@
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-react-hooks": "^4.5.0",
-    "expo-cli": "^6.0.5",
     "flow-bin": "^0.170.0",
     "flow-coverage-report": "^0.8.0",
     "flow-typed": "^3.3.1",

src/account-info/CustomProfileFields.js

@@ -63,7 +63,7 @@ function CustomProfileFieldRow(props: {|
   let valueElement = undefined;
   switch (value.displayType) {
     case 'text':
-      valueElement = <ZulipText style={styles.valueText} text={value.text} />;
+      valueElement = <ZulipText selectable style={styles.valueText} text={value.text} />;
       break;
 
     case 'link':

src/alertWords/__tests__/alertWordsReducer-test.js

@@ -20,6 +20,7 @@ describe('alertWordsReducer', () => {
       expect(actualState).toEqual(expectedState);
     });
 
+    // TODO(#5102): Delete; see comment on implementation.
     test('when no `alert_words` data is given reset state', () => {
       const initialState = deepFreeze(['word']);
       const action = deepFreeze({

src/alertWords/alertWordsReducer.js

@@ -15,7 +15,15 @@ export default (
       return initialState;
 
     case REGISTER_COMPLETE:
-      return action.data.alert_words || initialState;
+      return (
+        action.data.alert_words
+        // TODO(#5102): Delete fallback once we enforce any threshold for
+        //   ancient servers we refuse to connect to. It was added in #2878
+        //   (2018-11-16), but it wasn't clear even then, it seems, whether
+        //   any servers actually omit the data. The API doc doesn't mention
+        //   any servers that omit it, and our Flow types mark it required.
+        || initialState
+      );
 
     case EVENT_ALERT_WORDS:
       return action.alert_words || initialState;

src/api/eventTypes.js

@@ -10,7 +10,7 @@
  * @flow strict-local
  */
 
-import type { SubsetProperties } from '../generics';
+import type { BoundedDiff, SubsetProperties } from '../generics';
 import { keyMirror } from '../utils/keyMirror';
 import type {
   CustomProfileField,
@@ -24,6 +24,7 @@ import type {
   UserPresence,
   UserStatusUpdate,
   UserSettings,
+  ClientPresence,
 } from './modelTypes';
 import type { RealmDataForUpdate } from './realmDataTypes';
 
@@ -135,12 +136,16 @@ export type SubmessageEvent = $ReadOnly<{|
   content: string,
 |}>;
 
+/** https://zulip.com/api/get-events#presence  */
 export type PresenceEvent = $ReadOnly<{|
   ...EventCommon,
   type: typeof EventTypes.presence,
   email: string,
   server_timestamp: number,
-  presence: UserPresence,
+
+  // Clients are asked to compute aggregated presence; the event doesn't
+  // have it.
+  presence: BoundedDiff<UserPresence, {| +aggregated: ClientPresence |}>,
 |}>;
 
 /**

src/api/initialDataTypes.js

@@ -415,6 +415,9 @@ export type InitialDataRealmUser = $ReadOnly<{|
 
 export type InitialDataRealmUserGroups = $ReadOnly<{|
   // New in Zulip 1.8.
+  // TODO(#5102): In userGroupsReducer, we still have a fallback for pre-1.8
+  //   servers; remove that, and remove the above comment, which will be
+  //   irrelevant.
   realm_user_groups: $ReadOnlyArray<UserGroup>,
 |}>;