@ethora/chat-component-rn 26.10.2 → 26.10.4

package/lib/module/components/VideoCalls/callUiStore.js

@@ -0,0 +1,84 @@
+"use strict";
+
+import { useSyncExternalStore } from 'react';
+import { store } from '../../roomStore';
+
+/**
+ * UI state of the call shared between the overlay and the header bar:
+ * whether the call is minimized, and which header (if any) currently hosts
+ * the minimized bar.
+ *
+ * Minimized, the call is a strip under the visible header (ChatHeader or
+ * HeaderRoomList), Telegram-style, instead of a floating panel. Each header
+ * registers itself while mounted; the most recently mounted one shows the
+ * strip (on an iPad split view both are mounted, and only one strip should
+ * appear). With no header mounted (the user is on a host-app screen) the
+ * overlay docks the same strip to the top of the screen.
+ */
+
+let state = {
+  minimized: false,
+  barHost: null
+};
+const hosts = [];
+let nextHostId = 1;
+const listeners = new Set();
+let storeUnsubscribe = null;
+const emit = patch => {
+  state = {
+    ...state,
+    ...patch
+  };
+  listeners.forEach(listener => listener());
+};
+
+// The next call always opens full-screen.
+const ensureStoreWatcher = () => {
+  if (storeUnsubscribe) {
+    return;
+  }
+  storeUnsubscribe = store.subscribe(() => {
+    if (state.minimized && store.getState().call.phase === 'idle') {
+      emit({
+        minimized: false
+      });
+    }
+  });
+};
+const subscribe = listener => {
+  ensureStoreWatcher();
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
+};
+const getSnapshot = () => state;
+
+/** Current state, for non-React code and tests. */
+export const getCallUiState = () => state;
+export const useCallUi = () => useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+export const setCallMinimized = minimized => {
+  if (state.minimized !== minimized) {
+    emit({
+      minimized
+    });
+  }
+};
+export const registerCallBarHost = onId => {
+  const id = nextHostId++;
+  hosts.push(id);
+  onId?.(id);
+  emit({
+    barHost: id
+  });
+  return () => {
+    const index = hosts.indexOf(id);
+    if (index >= 0) {
+      hosts.splice(index, 1);
+    }
+    emit({
+      barHost: hosts.length ? hosts[hosts.length - 1] : null
+    });
+  };
+};
+//# sourceMappingURL=callUiStore.js.map

package/lib/module/components/VideoCalls/callUiStore.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useSyncExternalStore","store","state","minimized","barHost","hosts","nextHostId","listeners","Set","storeUnsubscribe","emit","patch","forEach","listener","ensureStoreWatcher","subscribe","getState","call","phase","add","delete","getSnapshot","getCallUiState","useCallUi","setCallMinimized","registerCallBarHost","onId","id","push","index","indexOf","splice","length"],"sourceRoot":"../../../../src","sources":["components/VideoCalls/callUiStore.ts"],"mappings":";;AAAA,SAASA,oBAAoB,QAAQ,OAAO;AAC5C,SAASC,KAAK,QAAQ,iBAAiB;;AAEvC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAQA,IAAIC,KAAkB,GAAG;EAAEC,SAAS,EAAE,KAAK;EAAEC,OAAO,EAAE;AAAK,CAAC;AAC5D,MAAMC,KAAe,GAAG,EAAE;AAC1B,IAAIC,UAAU,GAAG,CAAC;AAClB,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAa,CAAC;AACvC,IAAIC,gBAAqC,GAAG,IAAI;AAEhD,MAAMC,IAAI,GAAIC,KAA2B,IAAK;EAC5CT,KAAK,GAAG;IAAE,GAAGA,KAAK;IAAE,GAAGS;EAAM,CAAC;EAC9BJ,SAAS,CAACK,OAAO,CAAEC,QAAQ,IAAKA,QAAQ,CAAC,CAAC,CAAC;AAC7C,CAAC;;AAED;AACA,MAAMC,kBAAkB,GAAGA,CAAA,KAAM;EAC/B,IAAIL,gBAAgB,EAAE;IAAC;EAAO;EAC9BA,gBAAgB,GAAGR,KAAK,CAACc,SAAS,CAAC,MAAM;IACvC,IAAIb,KAAK,CAACC,SAAS,IAAIF,KAAK,CAACe,QAAQ,CAAC,CAAC,CAACC,IAAI,CAACC,KAAK,KAAK,MAAM,EAAE;MAC7DR,IAAI,CAAC;QAAEP,SAAS,EAAE;MAAM,CAAC,CAAC;IAC5B;EACF,CAAC,CAAC;AACJ,CAAC;AAED,MAAMY,SAAS,GAAIF,QAAoB,IAAK;EAC1CC,kBAAkB,CAAC,CAAC;EACpBP,SAAS,CAACY,GAAG,CAACN,QAAQ,CAAC;EACvB,OAAO,MAAM;IACXN,SAAS,CAACa,MAAM,CAACP,QAAQ,CAAC;EAC5B,CAAC;AACH,CAAC;AAED,MAAMQ,WAAW,GAAGA,CAAA,KAAMnB,KAAK;;AAE/B;AACA,OAAO,MAAMoB,cAAc,GAAGA,CAAA,KAAmBpB,KAAK;AAEtD,OAAO,MAAMqB,SAAS,GAAGA,CAAA,KACvBvB,oBAAoB,CAACe,SAAS,EAAEM,WAAW,EAAEA,WAAW,CAAC;AAE3D,OAAO,MAAMG,gBAAgB,GAAIrB,SAAkB,IAAW;EAC5D,IAAID,KAAK,CAACC,SAAS,KAAKA,SAAS,EAAE;IAACO,IAAI,CAAC;MAAEP;IAAU,CAAC,CAAC;EAAC;AAC1D,CAAC;AAED,OAAO,MAAMsB,mBAAmB,GAC9BC,IAA2B,IACV;EACjB,MAAMC,EAAE,GAAGrB,UAAU,EAAE;EACvBD,KAAK,CAACuB,IAAI,CAACD,EAAE,CAAC;EACdD,IAAI,GAAGC,EAAE,CAAC;EACVjB,IAAI,CAAC;IAAEN,OAAO,EAAEuB;EAAG,CAAC,CAAC;EACrB,OAAO,MAAM;IACX,MAAME,KAAK,GAAGxB,KAAK,CAACyB,OAAO,CAACH,EAAE,CAAC;IAC/B,IAAIE,KAAK,IAAI,CAAC,EAAE;MAACxB,KAAK,CAAC0B,MAAM,CAACF,KAAK,EAAE,CAAC,CAAC;IAAC;IACxCnB,IAAI,CAAC;MAAEN,OAAO,EAAEC,KAAK,CAAC2B,MAAM,GAAG3B,KAAK,CAACA,KAAK,CAAC2B,MAAM,GAAG,CAAC,CAAC,GAAG;IAAK,CAAC,CAAC;EAClE,CAAC;AACH,CAAC","ignoreList":[]}

package/lib/module/components/VideoCalls/livekitRuntime.js

@@ -45,6 +45,7 @@ export const loadLiveKit = () => {
       RoomEvent: core.RoomEvent,
       Track: core.Track,
       ConnectionState: core.ConnectionState,
+      VideoPresets: core.VideoPresets,
       VideoTrack: rn.VideoTrack,
       AudioSession: rn.AudioSession,
       registerGlobals: rn.registerGlobals

package/lib/module/components/VideoCalls/livekitRuntime.js.map

@@ -1 +1 @@
-{"version":3,"names":["cached","isLiveKitAvailable","loadLiveKit","undefined","rn","require","core","Room","RoomEvent","Track","ConnectionState","VideoTrack","AudioSession","registerGlobals","globalsRegistered","ensureLiveKitGlobals","runtime","__resetLiveKitRuntimeForTests"],"sourceRoot":"../../../../src","sources":["components/VideoCalls/livekitRuntime.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAmBA,IAAIA,MAAyC;AAE7C,OAAO,MAAMC,kBAAkB,GAAGA,CAAA,KAAeC,WAAW,CAAC,CAAC,KAAK,IAAI;;AAEvE;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,WAAW,GAAGA,CAAA,KAA6B;EACtD,IAAIF,MAAM,KAAKG,SAAS,EAAE;IACxB,OAAOH,MAAM;EACf;EAEA,IAAI;IACF;IACA,MAAMI,EAAE,GAAGC,OAAO,CAAC,uBAAuB,CAAC;IAC3C;IACA;IACA;IACA;IACA;IACA,MAAMC,IAAI,GAAGD,OAAO,CAAC,gBAAgB,CAAC;IAEtCL,MAAM,GAAG;MACPO,IAAI,EAAED,IAAI,CAACC,IAAI;MACfC,SAAS,EAAEF,IAAI,CAACE,SAAS;MACzBC,KAAK,EAAEH,IAAI,CAACG,KAAK;MACjBC,eAAe,EAAEJ,IAAI,CAACI,eAAe;MACrCC,UAAU,EAAEP,EAAE,CAACO,UAAU;MACzBC,YAAY,EAAER,EAAE,CAACQ,YAAY;MAC7BC,eAAe,EAAET,EAAE,CAACS;IACtB,CAAC;EACH,CAAC,CAAC,MAAM;IACNb,MAAM,GAAG,IAAI;EACf;EAEA,OAAOA,MAAM;AACf,CAAC;AAED,IAAIc,iBAAiB,GAAG,KAAK;;AAE7B;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,oBAAoB,GAAIC,OAAuB,IAAW;EACrE,IAAIF,iBAAiB,EAAE;IAAC;EAAO;EAC/B,IAAI;IACFE,OAAO,CAACH,eAAe,GAAG,CAAC;EAC7B,CAAC,CAAC,MAAM;IACN;EAAA;EAEFC,iBAAiB,GAAG,IAAI;AAC1B,CAAC;;AAED;AACA,OAAO,MAAMG,6BAA6B,GAAGA,CAAA,KAAY;EACvDjB,MAAM,GAAGG,SAAS;EAClBW,iBAAiB,GAAG,KAAK;AAC3B,CAAC","ignoreList":[]}
+{"version":3,"names":["cached","isLiveKitAvailable","loadLiveKit","undefined","rn","require","core","Room","RoomEvent","Track","ConnectionState","VideoPresets","VideoTrack","AudioSession","registerGlobals","globalsRegistered","ensureLiveKitGlobals","runtime","__resetLiveKitRuntimeForTests"],"sourceRoot":"../../../../src","sources":["components/VideoCalls/livekitRuntime.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAqBA,IAAIA,MAAyC;AAE7C,OAAO,MAAMC,kBAAkB,GAAGA,CAAA,KAAeC,WAAW,CAAC,CAAC,KAAK,IAAI;;AAEvE;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,WAAW,GAAGA,CAAA,KAA6B;EACtD,IAAIF,MAAM,KAAKG,SAAS,EAAE;IACxB,OAAOH,MAAM;EACf;EAEA,IAAI;IACF;IACA,MAAMI,EAAE,GAAGC,OAAO,CAAC,uBAAuB,CAAC;IAC3C;IACA;IACA;IACA;IACA;IACA,MAAMC,IAAI,GAAGD,OAAO,CAAC,gBAAgB,CAAC;IAEtCL,MAAM,GAAG;MACPO,IAAI,EAAED,IAAI,CAACC,IAAI;MACfC,SAAS,EAAEF,IAAI,CAACE,SAAS;MACzBC,KAAK,EAAEH,IAAI,CAACG,KAAK;MACjBC,eAAe,EAAEJ,IAAI,CAACI,eAAe;MACrCC,YAAY,EAAEL,IAAI,CAACK,YAAY;MAC/BC,UAAU,EAAER,EAAE,CAACQ,UAAU;MACzBC,YAAY,EAAET,EAAE,CAACS,YAAY;MAC7BC,eAAe,EAAEV,EAAE,CAACU;IACtB,CAAC;EACH,CAAC,CAAC,MAAM;IACNd,MAAM,GAAG,IAAI;EACf;EAEA,OAAOA,MAAM;AACf,CAAC;AAED,IAAIe,iBAAiB,GAAG,KAAK;;AAE7B;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,oBAAoB,GAAIC,OAAuB,IAAW;EACrE,IAAIF,iBAAiB,EAAE;IAAC;EAAO;EAC/B,IAAI;IACFE,OAAO,CAACH,eAAe,GAAG,CAAC;EAC7B,CAAC,CAAC,MAAM;IACN;EAAA;EAEFC,iBAAiB,GAAG,IAAI;AAC1B,CAAC;;AAED;AACA,OAAO,MAAMG,6BAA6B,GAAGA,CAAA,KAAY;EACvDlB,MAAM,GAAGG,SAAS;EAClBY,iBAAiB,GAAG,KAAK;AAC3B,CAAC","ignoreList":[]}

package/lib/module/components/VideoCalls/useDraggable.js

@@ -0,0 +1,55 @@
+"use strict";
+
+import { useMemo, useRef } from 'react';
+import { Animated, PanResponder } from 'react-native';
+
+/**
+ * Drag a floating element around (web's useDraggable, for the self-view
+ * tile and the minimized call panel). The offset is kept between drags.
+ *
+ * The responder only claims the gesture once the finger actually moves a
+ * few points, so taps still reach the buttons inside the dragged element.
+ */
+export const useDraggable = () => {
+  const position = useRef(new Animated.ValueXY({
+    x: 0,
+    y: 0
+  })).current;
+  const offset = useRef({
+    x: 0,
+    y: 0
+  });
+  const panHandlers = useMemo(() => PanResponder.create({
+    onMoveShouldSetPanResponder: (_event, gesture) => Math.abs(gesture.dx) > 4 || Math.abs(gesture.dy) > 4,
+    onPanResponderGrant: () => {
+      position.setOffset(offset.current);
+      position.setValue({
+        x: 0,
+        y: 0
+      });
+    },
+    onPanResponderMove: Animated.event([null, {
+      dx: position.x,
+      dy: position.y
+    }], {
+      useNativeDriver: false
+    }),
+    onPanResponderRelease: (_event, gesture) => {
+      offset.current = {
+        x: offset.current.x + gesture.dx,
+        y: offset.current.y + gesture.dy
+      };
+      position.flattenOffset();
+    },
+    onPanResponderTerminate: () => {
+      position.flattenOffset();
+    }
+  }).panHandlers, [position]);
+  return {
+    panHandlers,
+    style: {
+      transform: position.getTranslateTransform()
+    }
+  };
+};
+//# sourceMappingURL=useDraggable.js.map

package/lib/module/components/VideoCalls/useDraggable.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useMemo","useRef","Animated","PanResponder","useDraggable","position","ValueXY","x","y","current","offset","panHandlers","create","onMoveShouldSetPanResponder","_event","gesture","Math","abs","dx","dy","onPanResponderGrant","setOffset","setValue","onPanResponderMove","event","useNativeDriver","onPanResponderRelease","flattenOffset","onPanResponderTerminate","style","transform","getTranslateTransform"],"sourceRoot":"../../../../src","sources":["components/VideoCalls/useDraggable.ts"],"mappings":";;AAAA,SAASA,OAAO,EAAEC,MAAM,QAAQ,OAAO;AACvC,SAASC,QAAQ,EAAEC,YAAY,QAAQ,cAAc;;AAErD;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,YAAY,GAAGA,CAAA,KAAM;EAChC,MAAMC,QAAQ,GAAGJ,MAAM,CAAC,IAAIC,QAAQ,CAACI,OAAO,CAAC;IAAEC,CAAC,EAAE,CAAC;IAAEC,CAAC,EAAE;EAAE,CAAC,CAAC,CAAC,CAACC,OAAO;EACrE,MAAMC,MAAM,GAAGT,MAAM,CAAC;IAAEM,CAAC,EAAE,CAAC;IAAEC,CAAC,EAAE;EAAE,CAAC,CAAC;EAErC,MAAMG,WAAW,GAAGX,OAAO,CACzB,MACEG,YAAY,CAACS,MAAM,CAAC;IAClBC,2BAA2B,EAAEA,CAACC,MAAM,EAAEC,OAAO,KAC3CC,IAAI,CAACC,GAAG,CAACF,OAAO,CAACG,EAAE,CAAC,GAAG,CAAC,IAAIF,IAAI,CAACC,GAAG,CAACF,OAAO,CAACI,EAAE,CAAC,GAAG,CAAC;IACtDC,mBAAmB,EAAEA,CAAA,KAAM;MACzBf,QAAQ,CAACgB,SAAS,CAACX,MAAM,CAACD,OAAO,CAAC;MAClCJ,QAAQ,CAACiB,QAAQ,CAAC;QAAEf,CAAC,EAAE,CAAC;QAAEC,CAAC,EAAE;MAAE,CAAC,CAAC;IACnC,CAAC;IACDe,kBAAkB,EAAErB,QAAQ,CAACsB,KAAK,CAChC,CAAC,IAAI,EAAE;MAAEN,EAAE,EAAEb,QAAQ,CAACE,CAAC;MAAEY,EAAE,EAAEd,QAAQ,CAACG;IAAE,CAAC,CAAC,EAC1C;MAAEiB,eAAe,EAAE;IAAM,CAC3B,CAAC;IACDC,qBAAqB,EAAEA,CAACZ,MAAM,EAAEC,OAAO,KAAK;MAC1CL,MAAM,CAACD,OAAO,GAAG;QACfF,CAAC,EAAEG,MAAM,CAACD,OAAO,CAACF,CAAC,GAAGQ,OAAO,CAACG,EAAE;QAChCV,CAAC,EAAEE,MAAM,CAACD,OAAO,CAACD,CAAC,GAAGO,OAAO,CAACI;MAChC,CAAC;MACDd,QAAQ,CAACsB,aAAa,CAAC,CAAC;IAC1B,CAAC;IACDC,uBAAuB,EAAEA,CAAA,KAAM;MAC7BvB,QAAQ,CAACsB,aAAa,CAAC,CAAC;IAC1B;EACF,CAAC,CAAC,CAAChB,WAAW,EAChB,CAACN,QAAQ,CACX,CAAC;EAED,OAAO;IACLM,WAAW;IACXkB,KAAK,EAAE;MAAEC,SAAS,EAAEzB,QAAQ,CAAC0B,qBAAqB,CAAC;IAAE;EACvD,CAAC;AACH,CAAC","ignoreList":[]}

package/lib/module/helpers/createRoomFromApi.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { uniqueMembers } from './uniqueMembers';
 /**
  * Maps the flattened `lastMessage` doc `GET /v1/chats/my` embeds per room
  * into the shape a live message already takes. Backends differ in whether
@@ -68,6 +69,9 @@ export const createRoomFromApi = (room, service = 'conference.dev.xmpp.ethoradev
     const lastMessage = mapApiLastMessage(room?.lastMessage, jid);
     const roomData = {
       ...room,
+      ...(Array.isArray(room?.members) ? {
+        members: uniqueMembers(room.members)
+      } : {}),
       id: room?._id || '',
       jid,
       name: room?.title || '',

package/lib/module/helpers/createRoomFromApi.js.map

@@ -1 +1 @@
-{"version":3,"names":["mapApiLastMessage","apiLastMessage","roomJid","body","String","trim","undefined","senderName","senderFirstName","senderLastName","id","messageId","stanzaId","xmppId","date","createdAt","isDeleted","user","fromUserId","from","name","readApiUnreadCount","item","raw","unreadCount","Number","isFinite","Math","max","floor","readApiUsersCnt","fallback","membersLen","Array","isArray","members","length","total","usersCnt","participants","seedTimestamp","seed","ms","Date","getTime","NaN","createRoomFromApi","room","service","usersArrayLength","jid","apiUnreadCount","lastMessage","roomData","_id","title","messages","isLoading","roomBg","icon","picture","unreadMessages","apiUnreadSeededAt","now","lastViewedTimestamp","lastMessageTimestamp","error","console","log"],"sourceRoot":"../../../src","sources":["helpers/createRoomFromApi.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["uniqueMembers","mapApiLastMessage","apiLastMessage","roomJid","body","String","trim","undefined","senderName","senderFirstName","senderLastName","id","messageId","stanzaId","xmppId","date","createdAt","isDeleted","user","fromUserId","from","name","readApiUnreadCount","item","raw","unreadCount","Number","isFinite","Math","max","floor","readApiUsersCnt","fallback","membersLen","Array","isArray","members","length","total","usersCnt","participants","seedTimestamp","seed","ms","Date","getTime","NaN","createRoomFromApi","room","service","usersArrayLength","jid","apiUnreadCount","lastMessage","roomData","_id","title","messages","isLoading","roomBg","icon","picture","unreadMessages","apiUnreadSeededAt","now","lastViewedTimestamp","lastMessageTimestamp","error","console","log"],"sourceRoot":"../../../src","sources":["helpers/createRoomFromApi.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/incomingCallFromPush.js

@@ -58,7 +58,7 @@ export const handleCallPush = data => {
   }
   store.dispatch(setIncomingCallToken({
     roomJid,
-    roomName: parsed.callerName || resolved?.name || null,
+    roomName: parsed.callerName || resolved?.title || resolved?.name || null,
     roomBareName: parsed.roomBareName,
     token: parsed.token,
     kind: parsed.kind,

package/lib/module/helpers/incomingCallFromPush.js.map

@@ -1 +1 @@
-{"version":3,"names":["store","setIncomingCallToken","isCallPush","parseCallPush","handleCallPush","data","parsed","state","getState","chatSettingStore","config","videoCalls","enabled","current","call","phase","sameCall","callId","roomBareName","token","rooms","resolved","Object","values","find","room","jid","split","roomRef","roomJid","includes","dispatch","roomName","callerName","name","kind","peerXmppUsername","callerXmppUsername"],"sourceRoot":"../../../src","sources":["helpers/incomingCallFromPush.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,cAAc;AACpC,SAASC,oBAAoB,QAAQ,wBAAwB;AAC7D,SAASC,UAAU,EAAEC,aAAa,QAAQ,YAAY;;AAEtD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GACzBC,IAA4C,IAChC;EACZ,IAAI,CAACH,UAAU,CAACG,IAAI,CAAC,EAAE;IACrB,OAAO,KAAK;EACd;EAEA,MAAMC,MAAM,GAAGH,aAAa,CAACE,IAAI,CAAC;EAClC,MAAME,KAAK,GAAGP,KAAK,CAACQ,QAAQ,CAAC,CAAC;;EAE9B;EACA;EACA,IAAID,KAAK,CAACE,gBAAgB,CAACC,MAAM,EAAEC,UAAU,EAAEC,OAAO,KAAK,IAAI,EAAE;IAC/D,OAAO,IAAI;EACb;;EAEA;EACA;EACA;EACA,MAAMC,OAAO,GAAGN,KAAK,CAACO,IAAI;EAC1B,IAAID,OAAO,CAACE,KAAK,KAAK,MAAM,EAAE;IAC5B,MAAMC,QAAQ,GACX,CAAC,CAACV,MAAM,CAACW,MAAM,IAAIX,MAAM,CAACW,MAAM,KAAKJ,OAAO,CAACI,MAAM,IACnD,CAAC,CAACX,MAAM,CAACY,YAAY,IAAIZ,MAAM,CAACY,YAAY,KAAKL,OAAO,CAACK,YAAa;IACzE,IAAIF,QAAQ,IAAIH,OAAO,CAACE,KAAK,KAAK,SAAS,EAAE;MAC3C,OAAO,IAAI;IACb;EACF;;EAEA;EACA;EACA;EACA;EACA,IAAI,CAACT,MAAM,CAACa,KAAK,EAAE;IACjB,OAAO,IAAI;EACb;;EAEA;EACA;EACA,MAAMC,KAAK,GAAGb,KAAK,CAACa,KAAK,CAACA,KAAK,IAAI,CAAC,CAAC;EACrC,MAAMC,QAAQ,GAAGC,MAAM,CAACC,MAAM,CAACH,KAAK,CAAC,CAACI,IAAI,CACvCC,IAAS,IACR,CAACA,IAAI,EAAEC,GAAG,IAAI,EAAE,EAAEC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAKrB,MAAM,CAACY,YAAY,IACvDO,IAAI,EAAEC,GAAG,KAAKpB,MAAM,CAACsB,OACzB,CAAgD;EAEhD,MAAMC,OAAO,GACXR,QAAQ,EAAEK,GAAG,KACZpB,MAAM,CAACsB,OAAO,IAAItB,MAAM,CAACsB,OAAO,CAACE,QAAQ,CAAC,GAAG,CAAC,GAAGxB,MAAM,CAACsB,OAAO,GAAG,EAAE,CAAC;EACxE,IAAI,CAACC,OAAO,EAAE;IACZ,OAAO,IAAI;EACb;EAEA7B,KAAK,CAAC+B,QAAQ,CACZ9B,oBAAoB,CAAC;IACnB4B,OAAO;IACPG,QAAQ,EAAE1B,MAAM,CAAC2B,UAAU,IAAIZ,QAAQ,EAAEa,IAAI,IAAI,IAAI;IACrDhB,YAAY,EAAEZ,MAAM,CAACY,YAAY;IACjCC,KAAK,EAAEb,MAAM,CAACa,KAAK;IACnBgB,IAAI,EAAE7B,MAAM,CAAC6B,IAAI;IACjBlB,MAAM,EAAEX,MAAM,CAACW,MAAM;IACrBmB,gBAAgB,EAAE9B,MAAM,CAAC+B;EAC3B,CAAC,CACH,CAAC;EAED,OAAO,IAAI;AACb,CAAC","ignoreList":[]}
+{"version":3,"names":["store","setIncomingCallToken","isCallPush","parseCallPush","handleCallPush","data","parsed","state","getState","chatSettingStore","config","videoCalls","enabled","current","call","phase","sameCall","callId","roomBareName","token","rooms","resolved","Object","values","find","room","jid","split","roomRef","roomJid","includes","dispatch","roomName","callerName","title","name","kind","peerXmppUsername","callerXmppUsername"],"sourceRoot":"../../../src","sources":["helpers/incomingCallFromPush.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,cAAc;AACpC,SAASC,oBAAoB,QAAQ,wBAAwB;AAC7D,SAASC,UAAU,EAAEC,aAAa,QAAQ,YAAY;;AAEtD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GACzBC,IAA4C,IAChC;EACZ,IAAI,CAACH,UAAU,CAACG,IAAI,CAAC,EAAE;IACrB,OAAO,KAAK;EACd;EAEA,MAAMC,MAAM,GAAGH,aAAa,CAACE,IAAI,CAAC;EAClC,MAAME,KAAK,GAAGP,KAAK,CAACQ,QAAQ,CAAC,CAAC;;EAE9B;EACA;EACA,IAAID,KAAK,CAACE,gBAAgB,CAACC,MAAM,EAAEC,UAAU,EAAEC,OAAO,KAAK,IAAI,EAAE;IAC/D,OAAO,IAAI;EACb;;EAEA;EACA;EACA;EACA,MAAMC,OAAO,GAAGN,KAAK,CAACO,IAAI;EAC1B,IAAID,OAAO,CAACE,KAAK,KAAK,MAAM,EAAE;IAC5B,MAAMC,QAAQ,GACX,CAAC,CAACV,MAAM,CAACW,MAAM,IAAIX,MAAM,CAACW,MAAM,KAAKJ,OAAO,CAACI,MAAM,IACnD,CAAC,CAACX,MAAM,CAACY,YAAY,IAAIZ,MAAM,CAACY,YAAY,KAAKL,OAAO,CAACK,YAAa;IACzE,IAAIF,QAAQ,IAAIH,OAAO,CAACE,KAAK,KAAK,SAAS,EAAE;MAC3C,OAAO,IAAI;IACb;EACF;;EAEA;EACA;EACA;EACA;EACA,IAAI,CAACT,MAAM,CAACa,KAAK,EAAE;IACjB,OAAO,IAAI;EACb;;EAEA;EACA;EACA,MAAMC,KAAK,GAAGb,KAAK,CAACa,KAAK,CAACA,KAAK,IAAI,CAAC,CAAC;EACrC,MAAMC,QAAQ,GAAGC,MAAM,CAACC,MAAM,CAACH,KAAK,CAAC,CAACI,IAAI,CACvCC,IAAS,IACR,CAACA,IAAI,EAAEC,GAAG,IAAI,EAAE,EAAEC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAKrB,MAAM,CAACY,YAAY,IACvDO,IAAI,EAAEC,GAAG,KAAKpB,MAAM,CAACsB,OACzB,CAAgE;EAEhE,MAAMC,OAAO,GACXR,QAAQ,EAAEK,GAAG,KACZpB,MAAM,CAACsB,OAAO,IAAItB,MAAM,CAACsB,OAAO,CAACE,QAAQ,CAAC,GAAG,CAAC,GAAGxB,MAAM,CAACsB,OAAO,GAAG,EAAE,CAAC;EACxE,IAAI,CAACC,OAAO,EAAE;IACZ,OAAO,IAAI;EACb;EAEA7B,KAAK,CAAC+B,QAAQ,CACZ9B,oBAAoB,CAAC;IACnB4B,OAAO;IACPG,QAAQ,EAAE1B,MAAM,CAAC2B,UAAU,IAAIZ,QAAQ,EAAEa,KAAK,IAAIb,QAAQ,EAAEc,IAAI,IAAI,IAAI;IACxEjB,YAAY,EAAEZ,MAAM,CAACY,YAAY;IACjCC,KAAK,EAAEb,MAAM,CAACa,KAAK;IACnBiB,IAAI,EAAE9B,MAAM,CAAC8B,IAAI;IACjBnB,MAAM,EAAEX,MAAM,CAACW,MAAM;IACrBoB,gBAAgB,EAAE/B,MAAM,CAACgC;EAC3B,CAAC,CACH,CAAC;EAED,OAAO,IAAI;AACb,CAAC","ignoreList":[]}

package/lib/module/helpers/roomUserCount.js

@@ -8,11 +8,17 @@
 export const getRoomUserCount = room => {
   const members = Array.isArray(room?.members) ? room.members.length : 0;
   const cnt = typeof room?.usersCnt === 'number' && Number.isFinite(room.usersCnt) ? room.usersCnt : 0;
-  return Math.max(cnt, members);
+  const total = Math.max(cnt, members);
+  // A private chat is two people by definition; the server's usersCnt has
+  // been seen to drift above that (3 for a 1:1 room).
+  return room?.type === 'private' ? Math.min(total, 2) : total;
 };
 
 /** True when the room is known to have more users than members loaded. */
 export const isRoomMembersTruncated = room => {
+  if (room?.type === 'private') {
+    return false;
+  }
   const members = Array.isArray(room?.members) ? room.members.length : 0;
   const cnt = typeof room?.usersCnt === 'number' && Number.isFinite(room.usersCnt) ? room.usersCnt : 0;
   return cnt > members;

package/lib/module/helpers/roomUserCount.js.map

@@ -1 +1 @@
-{"version":3,"names":["getRoomUserCount","room","members","Array","isArray","length","cnt","usersCnt","Number","isFinite","Math","max","isRoomMembersTruncated","adjustUsersCnt","delta","nextMembersLength","current"],"sourceRoot":"../../../src","sources":["helpers/roomUserCount.ts"],"mappings":";;AAQA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,gBAAgB,GAAIC,IAAiB,IAAa;EAC7D,MAAMC,OAAO,GAAGC,KAAK,CAACC,OAAO,CAACH,IAAI,EAAEC,OAAO,CAAC,GAAGD,IAAI,CAACC,OAAO,CAACG,MAAM,GAAG,CAAC;EACtE,MAAMC,GAAG,GACP,OAAOL,IAAI,EAAEM,QAAQ,KAAK,QAAQ,IAAIC,MAAM,CAACC,QAAQ,CAACR,IAAI,CAACM,QAAQ,CAAC,GAChEN,IAAI,CAACM,QAAQ,GACb,CAAC;EACP,OAAOG,IAAI,CAACC,GAAG,CAACL,GAAG,EAAEJ,OAAO,CAAC;AAC/B,CAAC;;AAED;AACA,OAAO,MAAMU,sBAAsB,GAAIX,IAAiB,IAAc;EACpE,MAAMC,OAAO,GAAGC,KAAK,CAACC,OAAO,CAACH,IAAI,EAAEC,OAAO,CAAC,GAAGD,IAAI,CAACC,OAAO,CAACG,MAAM,GAAG,CAAC;EACtE,MAAMC,GAAG,GACP,OAAOL,IAAI,EAAEM,QAAQ,KAAK,QAAQ,IAAIC,MAAM,CAACC,QAAQ,CAACR,IAAI,CAACM,QAAQ,CAAC,GAChEN,IAAI,CAACM,QAAQ,GACb,CAAC;EACP,OAAOD,GAAG,GAAGJ,OAAO;AACtB,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMW,cAAc,GAAGA,CAC5BZ,IAAiB,EACjBa,KAAa,EACbC,iBAAyB,KACd;EACX,MAAMC,OAAO,GAAGhB,gBAAgB,CAACC,IAAI,CAAC;EACtC,OAAOS,IAAI,CAACC,GAAG,CAACI,iBAAiB,EAAEC,OAAO,GAAGF,KAAK,EAAE,CAAC,CAAC;AACxD,CAAC","ignoreList":[]}
+{"version":3,"names":["getRoomUserCount","room","members","Array","isArray","length","cnt","usersCnt","Number","isFinite","total","Math","max","type","min","isRoomMembersTruncated","adjustUsersCnt","delta","nextMembersLength","current"],"sourceRoot":"../../../src","sources":["helpers/roomUserCount.ts"],"mappings":";;AAQA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,gBAAgB,GAAIC,IAAiB,IAAa;EAC7D,MAAMC,OAAO,GAAGC,KAAK,CAACC,OAAO,CAACH,IAAI,EAAEC,OAAO,CAAC,GAAGD,IAAI,CAACC,OAAO,CAACG,MAAM,GAAG,CAAC;EACtE,MAAMC,GAAG,GACP,OAAOL,IAAI,EAAEM,QAAQ,KAAK,QAAQ,IAAIC,MAAM,CAACC,QAAQ,CAACR,IAAI,CAACM,QAAQ,CAAC,GAChEN,IAAI,CAACM,QAAQ,GACb,CAAC;EACP,MAAMG,KAAK,GAAGC,IAAI,CAACC,GAAG,CAACN,GAAG,EAAEJ,OAAO,CAAC;EACpC;EACA;EACA,OAAQD,IAAI,EAAyBY,IAAI,KAAK,SAAS,GAAGF,IAAI,CAACG,GAAG,CAACJ,KAAK,EAAE,CAAC,CAAC,GAAGA,KAAK;AACtF,CAAC;;AAED;AACA,OAAO,MAAMK,sBAAsB,GAAId,IAAiB,IAAc;EACpE,IAAKA,IAAI,EAAyBY,IAAI,KAAK,SAAS,EAAE;IAAC,OAAO,KAAK;EAAC;EACpE,MAAMX,OAAO,GAAGC,KAAK,CAACC,OAAO,CAACH,IAAI,EAAEC,OAAO,CAAC,GAAGD,IAAI,CAACC,OAAO,CAACG,MAAM,GAAG,CAAC;EACtE,MAAMC,GAAG,GACP,OAAOL,IAAI,EAAEM,QAAQ,KAAK,QAAQ,IAAIC,MAAM,CAACC,QAAQ,CAACR,IAAI,CAACM,QAAQ,CAAC,GAChEN,IAAI,CAACM,QAAQ,GACb,CAAC;EACP,OAAOD,GAAG,GAAGJ,OAAO;AACtB,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMc,cAAc,GAAGA,CAC5Bf,IAAiB,EACjBgB,KAAa,EACbC,iBAAyB,KACd;EACX,MAAMC,OAAO,GAAGnB,gBAAgB,CAACC,IAAI,CAAC;EACtC,OAAOU,IAAI,CAACC,GAAG,CAACM,iBAAiB,EAAEC,OAAO,GAAGF,KAAK,EAAE,CAAC,CAAC;AACxD,CAAC","ignoreList":[]}

package/lib/module/helpers/uniqueMembers.js

@@ -0,0 +1,31 @@
+"use strict";
+
+/**
+ * Drop repeated entries from a room's member list, keeping the first.
+ *
+ * The same person could appear twice in a 1:1 chat ("Members: 3", four
+ * rows): the list came back from the server with repeats after the private
+ * chat was requested again for an existing room. Members are keyed by
+ * whatever identity the entry carries: xmppUsername, then _id, then the
+ * JID's localpart.
+ */
+export const uniqueMembers = members => {
+  if (!Array.isArray(members)) {
+    return [];
+  }
+  const seen = new Set();
+  const out = [];
+  for (const member of members) {
+    const m = member;
+    const key = String(m?.xmppUsername || m?._id || String(m?.jid || '').split('@')[0] || '').trim();
+    if (key) {
+      if (seen.has(key)) {
+        continue;
+      }
+      seen.add(key);
+    }
+    out.push(member);
+  }
+  return out;
+};
+//# sourceMappingURL=uniqueMembers.js.map

package/lib/module/helpers/uniqueMembers.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["uniqueMembers","members","Array","isArray","seen","Set","out","member","m","key","String","xmppUsername","_id","jid","split","trim","has","add","push"],"sourceRoot":"../../../src","sources":["helpers/uniqueMembers.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,aAAa,GAAQC,OAA+B,IAAU;EACzE,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,OAAO,CAAC,EAAE;IAAC,OAAO,EAAE;EAAC;EACxC,MAAMG,IAAI,GAAG,IAAIC,GAAG,CAAS,CAAC;EAC9B,MAAMC,GAAQ,GAAG,EAAE;EACnB,KAAK,MAAMC,MAAM,IAAIN,OAAO,EAAE;IAC5B,MAAMO,CAAC,GAAGD,MAAa;IACvB,MAAME,GAAG,GAAGC,MAAM,CAChBF,CAAC,EAAEG,YAAY,IAAIH,CAAC,EAAEI,GAAG,IAAIF,MAAM,CAACF,CAAC,EAAEK,GAAG,IAAI,EAAE,CAAC,CAACC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EACrE,CAAC,CAACC,IAAI,CAAC,CAAC;IACR,IAAIN,GAAG,EAAE;MACP,IAAIL,IAAI,CAACY,GAAG,CAACP,GAAG,CAAC,EAAE;QAAC;MAAS;MAC7BL,IAAI,CAACa,GAAG,CAACR,GAAG,CAAC;IACf;IACAH,GAAG,CAACY,IAAI,CAACX,MAAM,CAAC;EAClB;EACA,OAAOD,GAAG;AACZ,CAAC","ignoreList":[]}

package/lib/module/hooks/useLeaveRoom.js

@@ -0,0 +1,48 @@
+"use strict";
+
+import { useCallback } from 'react';
+import { useDispatch } from 'react-redux';
+import { deleteRoom } from '../roomStore/roomsSlice';
+import { leaveRoom } from '../networking/api-requests/rooms.api';
+import { useXmppClient } from '../context/xmppProvider';
+
+/** Rooms with a leave request in flight: a second tap waits for the first. */
+const inFlight = new Set();
+
+/**
+ * Leave a chat, shared by the room-list swipe, the chat header and the chat
+ * profile. The server goes first: if it refuses, the chat stays where it is
+ * (dropping it locally would only have it come back on the next /chats/my).
+ * Then the unavailable presence to the MUC and the room out of the store.
+ * Resolves false on failure, so the caller can say so in its own way.
+ */
+export const useLeaveRoom = () => {
+  const dispatch = useDispatch();
+  const {
+    client
+  } = useXmppClient();
+  return useCallback(async jid => {
+    if (!jid || inFlight.has(jid)) {
+      return true;
+    }
+    inFlight.add(jid);
+    try {
+      await leaveRoom(jid.split('@')[0]);
+    } catch (error) {
+      console.warn('[ethora-rn] leave failed', error);
+      return false;
+    } finally {
+      inFlight.delete(jid);
+    }
+    try {
+      client?.leaveTheRoomStanza?.(jid);
+    } catch (error) {
+      console.error('Failed to leave the room:', error);
+    }
+    dispatch(deleteRoom({
+      jid
+    }));
+    return true;
+  }, [client, dispatch]);
+};
+//# sourceMappingURL=useLeaveRoom.js.map

package/lib/module/hooks/useLeaveRoom.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useCallback","useDispatch","deleteRoom","leaveRoom","useXmppClient","inFlight","Set","useLeaveRoom","dispatch","client","jid","has","add","split","error","console","warn","delete","leaveTheRoomStanza"],"sourceRoot":"../../../src","sources":["hooks/useLeaveRoom.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,WAAW,QAAQ,aAAa;AACzC,SAASC,UAAU,QAAQ,yBAAyB;AACpD,SAASC,SAAS,QAAQ,sCAAsC;AAChE,SAASC,aAAa,QAAQ,yBAAyB;;AAEvD;AACA,MAAMC,QAAQ,GAAG,IAAIC,GAAG,CAAS,CAAC;;AAElC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,YAAY,GAAGA,CAAA,KAAM;EAChC,MAAMC,QAAQ,GAAGP,WAAW,CAAC,CAAC;EAC9B,MAAM;IAAEQ;EAAO,CAAC,GAAGL,aAAa,CAAC,CAAC;EAClC,OAAOJ,WAAW,CAChB,MAAOU,GAAW,IAAuB;IACvC,IAAI,CAACA,GAAG,IAAIL,QAAQ,CAACM,GAAG,CAACD,GAAG,CAAC,EAAE;MAAC,OAAO,IAAI;IAAC;IAC5CL,QAAQ,CAACO,GAAG,CAACF,GAAG,CAAC;IACjB,IAAI;MACF,MAAMP,SAAS,CAACO,GAAG,CAACG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,OAAOC,KAAK,EAAE;MACdC,OAAO,CAACC,IAAI,CAAC,0BAA0B,EAAEF,KAAK,CAAC;MAC/C,OAAO,KAAK;IACd,CAAC,SAAS;MACRT,QAAQ,CAACY,MAAM,CAACP,GAAG,CAAC;IACtB;IACA,IAAI;MACFD,MAAM,EAAES,kBAAkB,GAAGR,GAAG,CAAC;IACnC,CAAC,CAAC,OAAOI,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,2BAA2B,EAAEA,KAAK,CAAC;IACnD;IACAN,QAAQ,CAACN,UAAU,CAAC;MAAEQ;IAAI,CAAC,CAAC,CAAC;IAC7B,OAAO,IAAI;EACb,CAAC,EACD,CAACD,MAAM,EAAED,QAAQ,CACnB,CAAC;AACH,CAAC","ignoreList":[]}

package/lib/module/i18n/strings.js

@@ -115,6 +115,7 @@ const en = {
   'call.action.stopCamera': 'Turn camera off',
   'call.action.startCamera': 'Turn camera on',
   'call.action.switchCamera': 'Switch camera',
+  'call.action.swapVideo': 'Swap videos',
   'call.action.speakerOn': 'Turn speaker on',
   'call.action.speakerOff': 'Turn speaker off',
   'call.action.startAudioCall': 'Start audio call',
@@ -128,6 +129,8 @@ const en = {
   'call.error.deviceInUse': 'Your camera or microphone is already in use by another app.',
   'call.error.deviceGeneric': 'Could not access your camera or microphone.',
   'call.error.noAnswerTimeout': 'No answer, the call timed out',
+  'call.peerMuted': '{name} is muted',
+  'call.selfMuted': 'Your microphone is muted',
   'action.send': 'Send',
   'action.cancel': 'Cancel',
   'action.save': 'Save',
@@ -138,6 +141,7 @@ const en = {
   'action.mute': 'Mute',
   'action.unmute': 'Unmute',
   'toast.muteFailed': 'Could not update notifications for this chat',
+  'toast.leaveFailed': 'Could not leave this chat',
   'action.create': 'Create',
   'action.submit': 'Submit',
   'action.translate': 'Translate',
@@ -491,6 +495,7 @@ const fr = {
   'call.action.stopCamera': 'Désactiver la caméra',
   'call.action.startCamera': 'Activer la caméra',
   'call.action.switchCamera': 'Changer de caméra',
+  'call.action.swapVideo': 'Inverser les vidéos',
   'call.action.speakerOn': 'Activer le haut-parleur',
   'call.action.speakerOff': 'Désactiver le haut-parleur',
   'call.action.startAudioCall': 'Démarrer un appel audio',
@@ -504,6 +509,8 @@ const fr = {
   'call.error.deviceInUse': 'Votre caméra ou microphone est déjà utilisé par une autre application.',
   'call.error.deviceGeneric': 'Impossible d\'accéder à votre caméra ou microphone.',
   'call.error.noAnswerTimeout': 'Pas de réponse, l\'appel a expiré',
+  'call.peerMuted': '{name} a coupé son micro',
+  'call.selfMuted': 'Votre micro est coupé',
   'action.send': 'Envoyer',
   'action.cancel': 'Annuler',
   'action.save': 'Enregistrer',
@@ -514,6 +521,7 @@ const fr = {
   'action.mute': 'Muet',
   'action.unmute': 'Réactiver',
   'toast.muteFailed': 'Impossible de modifier les notifications de ce chat',
+  'toast.leaveFailed': 'Impossible de quitter ce chat',
   'action.create': 'Créer',
   'action.submit': 'Soumettre',
   'action.translate': 'Traduire',
@@ -867,6 +875,7 @@ const es = {
   'call.action.stopCamera': 'Apagar la cámara',
   'call.action.startCamera': 'Encender la cámara',
   'call.action.switchCamera': 'Cambiar de cámara',
+  'call.action.swapVideo': 'Intercambiar vídeos',
   'call.action.speakerOn': 'Activar el altavoz',
   'call.action.speakerOff': 'Desactivar el altavoz',
   'call.action.startAudioCall': 'Iniciar llamada de audio',
@@ -880,6 +889,8 @@ const es = {
   'call.error.deviceInUse': 'Tu cámara o micrófono ya está siendo usado por otra aplicación.',
   'call.error.deviceGeneric': 'No se pudo acceder a tu cámara o micrófono.',
   'call.error.noAnswerTimeout': 'Sin respuesta, la llamada expiró',
+  'call.peerMuted': '{name} tiene el micrófono silenciado',
+  'call.selfMuted': 'Tu micrófono está silenciado',
   'action.send': 'Enviar',
   'action.cancel': 'Cancelar',
   'action.save': 'Guardar',
@@ -890,6 +901,7 @@ const es = {
   'action.mute': 'Silenciar',
   'action.unmute': 'Activar',
   'toast.muteFailed': 'No se pudieron cambiar las notificaciones de este chat',
+  'toast.leaveFailed': 'No se pudo salir de este chat',
   'action.create': 'Crear',
   'action.submit': 'Enviar',
   'action.translate': 'Traducir',
@@ -1243,6 +1255,7 @@ const pt = {
   'call.action.stopCamera': 'Desligar a câmara',
   'call.action.startCamera': 'Ligar a câmara',
   'call.action.switchCamera': 'Mudar de câmara',
+  'call.action.swapVideo': 'Trocar vídeos',
   'call.action.speakerOn': 'Ligar o altifalante',
   'call.action.speakerOff': 'Desligar o altifalante',
   'call.action.startAudioCall': 'Iniciar chamada de áudio',
@@ -1256,6 +1269,8 @@ const pt = {
   'call.error.deviceInUse': 'A sua câmara ou microfone já está a ser utilizado por outra aplicação.',
   'call.error.deviceGeneric': 'Não foi possível aceder à câmara ou microfone.',
   'call.error.noAnswerTimeout': 'Sem resposta, a chamada expirou',
+  'call.peerMuted': '{name} está com o microfone desativado',
+  'call.selfMuted': 'Seu microfone está desativado',
   'action.send': 'Enviar',
   'action.cancel': 'Cancelar',
   'action.save': 'Guardar',
@@ -1266,6 +1281,7 @@ const pt = {
   'action.mute': 'Silenciar',
   'action.unmute': 'Ativar som',
   'toast.muteFailed': 'Could not update notifications for this chat',
+  'toast.leaveFailed': 'Não foi possível sair deste chat',
   'action.create': 'Criar',
   'action.submit': 'Enviar',
   'action.translate': 'Traduzir',
@@ -1619,6 +1635,7 @@ const ht = {
   'call.action.stopCamera': 'Etenn kamera a',
   'call.action.startCamera': 'Limen kamera a',
   'call.action.switchCamera': 'Chanje kamera',
+  'call.action.swapVideo': 'Chanje videyo yo',
   'call.action.speakerOn': 'Limen opalè a',
   'call.action.speakerOff': 'Etenn opalè a',
   'call.action.startAudioCall': 'Kòmanse yon apèl odyo',
@@ -1632,6 +1649,8 @@ const ht = {
   'call.error.deviceInUse': 'Kamera oswa mikwofòn ou deja ap itilize pa yon lòt app.',
   'call.error.deviceGeneric': 'Nou pa t kapab jwenn aksè nan kamera oswa mikwofòn ou.',
   'call.error.noAnswerTimeout': 'Pa gen repons, apèl la fini',
+  'call.peerMuted': '{name} koupe mikwo li',
+  'call.selfMuted': 'Mikwo ou koupe',
   'action.send': 'Voye',
   'action.cancel': 'Anile',
   'action.save': 'Anrejistre',
@@ -1642,6 +1661,7 @@ const ht = {
   'action.mute': 'Mete an silans',
   'action.unmute': 'Retire silans',
   'toast.muteFailed': 'Could not update notifications for this chat',
+  'toast.leaveFailed': 'Pa t kapab kite chat sa a',
   'action.create': 'Kreye',
   'action.submit': 'Soumèt',
   'action.translate': 'Tradui',
@@ -1995,6 +2015,7 @@ const zh = {
   'call.action.stopCamera': '关闭摄像头',
   'call.action.startCamera': '打开摄像头',
   'call.action.switchCamera': '切换摄像头',
+  'call.action.swapVideo': '切换画面',
   'call.action.speakerOn': '打开扬声器',
   'call.action.speakerOff': '关闭扬声器',
   'call.action.startAudioCall': '发起语音通话',
@@ -2008,6 +2029,8 @@ const zh = {
   'call.error.deviceInUse': '您的摄像头或麦克风正被其他应用占用。',
   'call.error.deviceGeneric': '无法访问您的摄像头或麦克风。',
   'call.error.noAnswerTimeout': '无人接听，通话已超时',
+  'call.peerMuted': '{name} 已静音',
+  'call.selfMuted': '你的麦克风已静音',
   'action.send': '发送',
   'action.cancel': '取消',
   'action.save': '保存',
@@ -2018,6 +2041,7 @@ const zh = {
   'action.mute': '静音',
   'action.unmute': '取消静音',
   'toast.muteFailed': 'Could not update notifications for this chat',
+  'toast.leaveFailed': '无法退出此聊天',
   'action.create': '创建',
   'action.submit': '提交',
   'action.translate': '翻译',