@ethora/chat-component-rn 26.10.0 → 26.10.2

package/src/components/Modals/SettingsModals/Visibility/VisibilityModal.tsx

@@ -13,6 +13,7 @@ import {
   SharedSettingsColumnContainer,
   SharedSettingsLabelData,
   SharedSettingsStyledLabel,
+  SharedSettingsScrollBody,
 } from '../SharedStyledComponents';
 import { RadioInput } from './RadioInput';
 import { useTheme } from '../../../../hooks/useTheme';
@@ -71,67 +72,69 @@ const VisibilityModal: React.FC<VisibilityModalProps> = ({
         handleCloseModal={handleCloseModal}
         headerTitle={t('settings.visibility.title')}
       />
-      <SharedSettingsCenterContainer>
-        <SharedSettingsColumnContainer>
-          <SharedSettingsStyledLabel>
-            {t('settings.visibility.profileLabel')}
-          </SharedSettingsStyledLabel>
-          <RadioGroup>
-            <RadioLabel>
-              <RadioInput
-                option={{ label: t('settings.visibility.open'), value: isProfileOpen }}
-                radioColor={theme.primary}
-                checked={isProfileOpen === true}
-                onChange={() => setIsProfileOpen(true)}
-              />
-            </RadioLabel>
+      <SharedSettingsScrollBody>
+        <SharedSettingsCenterContainer>
+          <SharedSettingsColumnContainer>
+            <SharedSettingsStyledLabel>
+              {t('settings.visibility.profileLabel')}
+            </SharedSettingsStyledLabel>
+            <RadioGroup>
+              <RadioLabel>
+                <RadioInput
+                  option={{ label: t('settings.visibility.open'), value: isProfileOpen }}
+                  radioColor={theme.primary}
+                  checked={isProfileOpen === true}
+                  onChange={() => setIsProfileOpen(true)}
+                />
+              </RadioLabel>
 
-            <SharedSettingsLabelData>
-              {t('settings.visibility.openDescription')}
-            </SharedSettingsLabelData>
-            <RadioLabel>
-              <RadioInput
-                option={{ label: t('settings.visibility.restricted'), value: isProfileOpen }}
-                radioColor={theme.primary}
-                checked={isProfileOpen === false}
-                onChange={() => setIsProfileOpen(false)}
-              />
-            </RadioLabel>
-            <SharedSettingsLabelData>
-              {t('settings.visibility.restrictedDescription')}
-            </SharedSettingsLabelData>
-          </RadioGroup>
-        </SharedSettingsColumnContainer>
-        <SharedSettingsColumnContainer>
-          <SharedSettingsStyledLabel>
-            {t('settings.visibility.documentsLabel')}
-          </SharedSettingsStyledLabel>
-          <RadioGroup>
-            <RadioLabel>
-              <RadioInput
-                option={{ label: t('settings.visibility.full'), value: isAssetsOpen }}
-                radioColor={theme.primary}
-                checked={isAssetsOpen === true}
-                onChange={() => setIsAssetsOpen(true)}
-              />
-            </RadioLabel>
-            <SharedSettingsLabelData>
-              {t('settings.visibility.fullDescription')}
-            </SharedSettingsLabelData>
-            <RadioLabel>
-              <RadioInput
-                option={{ label: t('settings.visibility.individual'), value: isAssetsOpen }}
-                radioColor={theme.primary}
-                checked={isAssetsOpen === false}
-                onChange={() => setIsAssetsOpen(false)}
-              />
-            </RadioLabel>
-            <SharedSettingsLabelData>
-              {t('settings.visibility.individualDescription')}
-            </SharedSettingsLabelData>
-          </RadioGroup>
-        </SharedSettingsColumnContainer>
-      </SharedSettingsCenterContainer>
+              <SharedSettingsLabelData>
+                {t('settings.visibility.openDescription')}
+              </SharedSettingsLabelData>
+              <RadioLabel>
+                <RadioInput
+                  option={{ label: t('settings.visibility.restricted'), value: isProfileOpen }}
+                  radioColor={theme.primary}
+                  checked={isProfileOpen === false}
+                  onChange={() => setIsProfileOpen(false)}
+                />
+              </RadioLabel>
+              <SharedSettingsLabelData>
+                {t('settings.visibility.restrictedDescription')}
+              </SharedSettingsLabelData>
+            </RadioGroup>
+          </SharedSettingsColumnContainer>
+          <SharedSettingsColumnContainer>
+            <SharedSettingsStyledLabel>
+              {t('settings.visibility.documentsLabel')}
+            </SharedSettingsStyledLabel>
+            <RadioGroup>
+              <RadioLabel>
+                <RadioInput
+                  option={{ label: t('settings.visibility.full'), value: isAssetsOpen }}
+                  radioColor={theme.primary}
+                  checked={isAssetsOpen === true}
+                  onChange={() => setIsAssetsOpen(true)}
+                />
+              </RadioLabel>
+              <SharedSettingsLabelData>
+                {t('settings.visibility.fullDescription')}
+              </SharedSettingsLabelData>
+              <RadioLabel>
+                <RadioInput
+                  option={{ label: t('settings.visibility.individual'), value: isAssetsOpen }}
+                  radioColor={theme.primary}
+                  checked={isAssetsOpen === false}
+                  onChange={() => setIsAssetsOpen(false)}
+                />
+              </RadioLabel>
+              <SharedSettingsLabelData>
+                {t('settings.visibility.individualDescription')}
+              </SharedSettingsLabelData>
+            </RadioGroup>
+          </SharedSettingsColumnContainer>
+        </SharedSettingsCenterContainer>
+      </SharedSettingsScrollBody>
 
       {notification && (
         <Notification type={notification.type}>

package/src/components/Modals/UserSettingsModal/UserSettingsModal.tsx

@@ -3,6 +3,7 @@
 import React, { useCallback, useMemo } from 'react';
 import LanguageCard from './LanguageCard';
 import {
+  ScrollView,
   StyleSheet,
   Switch,
   Text,
@@ -119,7 +120,11 @@ const UserSettingsModal: React.FC<UserSettingsModalProps> = ({
       {/* One card per entry, rather than a single bordered block with
         * hairline dividers — the rows are separate destinations, and the
         * design gives each its own surface. */}
-      <View style={styles.body}>
+      <ScrollView
+        style={styles.scroll}
+        contentContainerStyle={styles.body}
+        showsVerticalScrollIndicator={false}
+      >
         {!config?.settings?.hideAppearance ? (
           <View style={[styles.card, styles.stackCard]} testID="settings-appearance">
             <Text style={styles.label}>{t('settings.appearance.title')}</Text>
@@ -188,7 +193,7 @@ const UserSettingsModal: React.FC<UserSettingsModalProps> = ({
             />
           </TouchableOpacity>
         ))}
-      </View>
+      </ScrollView>
     </ModalContainerFullScreen>
   );
 };
@@ -197,8 +202,11 @@ const createStyles = (theme: ChatTheme) => StyleSheet.create({
   screen: {
     backgroundColor: theme.listBackground,
   },
-  body: {
+  scroll: {
+    flex: 1,
     width: '100%',
+  },
+  body: {
     padding: 12,
     gap: 12,
   },

package/src/hooks/useLogout.tsx

@@ -50,7 +50,18 @@ const logoutService = {
    * AFTER all the disk work has actually landed.
    */
   performLogout: async (): Promise<void> => {
-    // 0. Flush lastViewedTimestamp to the server's private store BEFORE
+    // 0. Push. Release the device-token registration on the backend
+    //    FIRST, while the access token is still valid (the token itself
+    //    is kept so the next login re-registers it). It runs alongside
+    //    the private-store flush below instead of after it: the flush
+    //    can take up to 2s, and a host with a logout time budget could
+    //    cut us off before the release went out, leaving the device
+    //    receiving pushes for the logged-out user.
+    const pushRelease = releasePushRegistration().catch((e) => {
+      console.warn('logoutService: push release failed', e);
+    });
+
+    // 0a. Flush lastViewedTimestamp to the server's private store BEFORE
     //    we close XMPP. Only rooms with no outstanding unread (plus the
     //    visible room) get their entries updated — rooms with unread
     //    keep their old marker so the next login still surfaces those
@@ -95,15 +106,9 @@ const logoutService = {
       /* non-fatal */
     }
 
-    // 2. Push. Release the device-token registration on the backend
-    //    while the access token is still valid (the token itself is kept
-    //    so the next login re-registers it), then clear the local MucSub
-    //    room cache.
-    try {
-      await releasePushRegistration();
-    } catch (e) {
-      console.warn('logoutService: push release failed', e);
-    }
+    // 2. Push. Wait for the release started in step 0, then clear the
+    //    local MucSub room cache.
+    await pushRelease;
     try {
       await pushSubscriptionService.reset();
     } catch (e) {

package/src/i18n/strings.ts

@@ -343,6 +343,10 @@ const en: UiStringTable = {
   'settings.manageData.deleteLabel': 'Delete your account',
   'settings.manageData.deleteDescription': 'Use this only if you want to permanently delete your account & data from our system.',
   'settings.manageData.deleteDisclosure': 'Due to the immutable nature of distributed ledger technology, network nodes operated by the community may still retain historical transactions generated by your account, however your personally identifiable information such as your name, e-mail, your key-value storage etc will be removed. Any of your digital assets will be lost.',
+  'settings.manageData.downloadFailed': "Couldn't download your data. Please try again later.",
+  'settings.manageData.deleteConfirmTitle': 'Delete your account?',
+  'settings.manageData.deleteConfirmMessage': 'This permanently deletes your account and data. It cannot be undone.',
+  'settings.manageData.deleteFailed': "Couldn't delete your account. Please try again later.",
   'search.messages.title': 'Search messages',
   'search.messages.placeholderChat': 'Search in this chat',
   'search.messages.placeholderAll': 'Search all chats',
@@ -716,6 +720,10 @@ const fr: UiStringTable = {
   'settings.manageData.deleteLabel': 'Supprimer votre compte',
   'settings.manageData.deleteDescription': 'À utiliser uniquement si vous souhaitez supprimer définitivement votre compte et vos données de notre système.',
   'settings.manageData.deleteDisclosure': "En raison de la nature immuable de la technologie des registres distribués, les nœuds du réseau exploités par la communauté peuvent conserver des transactions historiques générées par votre compte ; toutefois, vos informations personnelles identifiables telles que votre nom, e-mail, stockage clé-valeur, etc. seront supprimées. Tous vos actifs numériques seront perdus.",
+  'settings.manageData.downloadFailed': 'Impossible de télécharger vos données. Veuillez réessayer plus tard.',
+  'settings.manageData.deleteConfirmTitle': 'Supprimer votre compte ?',
+  'settings.manageData.deleteConfirmMessage': 'Votre compte et vos données seront définitivement supprimés. Cette action est irréversible.',
+  'settings.manageData.deleteFailed': 'Impossible de supprimer votre compte. Veuillez réessayer plus tard.',
   'search.messages.title': 'Rechercher des messages',
   'search.messages.placeholderChat': 'Rechercher dans cette discussion',
   'search.messages.placeholderAll': 'Rechercher dans toutes les discussions',
@@ -1089,6 +1097,10 @@ const es: UiStringTable = {
   'settings.manageData.deleteLabel': 'Elimina tu cuenta',
   'settings.manageData.deleteDescription': 'Utiliza esto solo si deseas eliminar permanentemente tu cuenta y tus datos de nuestro sistema.',
   'settings.manageData.deleteDisclosure': 'Debido a la naturaleza inmutable de la tecnología de registro distribuido, los nodos de red operados por la comunidad pueden seguir conservando transacciones históricas generadas por tu cuenta; sin embargo, tu información personal identificable, como tu nombre, correo electrónico y almacenamiento clave-valor, será eliminada. Se perderán todos tus activos digitales.',
+  'settings.manageData.downloadFailed': 'No se pudieron descargar tus datos. Inténtalo de nuevo más tarde.',
+  'settings.manageData.deleteConfirmTitle': '¿Eliminar tu cuenta?',
+  'settings.manageData.deleteConfirmMessage': 'Tu cuenta y tus datos se eliminarán de forma permanente. No se puede deshacer.',
+  'settings.manageData.deleteFailed': 'No se pudo eliminar tu cuenta. Inténtalo de nuevo más tarde.',
   'search.messages.title': 'Buscar mensajes',
   'search.messages.placeholderChat': 'Buscar en este chat',
   'search.messages.placeholderAll': 'Buscar en todos los chats',
@@ -1462,6 +1474,10 @@ const pt: UiStringTable = {
   'settings.manageData.deleteLabel': 'Eliminar a sua conta',
   'settings.manageData.deleteDescription': 'Use isto apenas se quiser eliminar permanentemente a sua conta e os seus dados do nosso sistema.',
   'settings.manageData.deleteDisclosure': 'Devido à natureza imutável da tecnologia de registo distribuído, os nós da rede operados pela comunidade podem manter transações históricas geradas pela sua conta; no entanto, as suas informações de identificação pessoal, como nome, email e armazenamento chave-valor, serão removidas. Todos os seus ativos digitais serão perdidos.',
+  'settings.manageData.downloadFailed': 'Não foi possível transferir os seus dados. Tente novamente mais tarde.',
+  'settings.manageData.deleteConfirmTitle': 'Eliminar a sua conta?',
+  'settings.manageData.deleteConfirmMessage': 'A sua conta e os seus dados serão eliminados permanentemente. Não é possível anular.',
+  'settings.manageData.deleteFailed': 'Não foi possível eliminar a sua conta. Tente novamente mais tarde.',
   'search.messages.title': 'Pesquisar mensagens',
   'search.messages.placeholderChat': 'Pesquisar nesta conversa',
   'search.messages.placeholderAll': 'Pesquisar em todas as conversas',
@@ -1835,6 +1851,10 @@ const ht: UiStringTable = {
   'settings.manageData.deleteLabel': 'Efase kont ou',
   'settings.manageData.deleteDescription': 'Sèvi ak sa a sèlman si ou vle efase kont ou ak done ou yo nèt nan sistèm nou an.',
   'settings.manageData.deleteDisclosure': 'Akoz nati imityab teknoloji rejis distribiye a, nœud rezo kominote a opere yo ka toujou kenbe tranzaksyon istorik kont ou an te jenere; sepandan, enfòmasyon idantifyab pèsonèl ou yo tankou non ou, imèl ou ak depo kle-valè ou yo ap retire. Tout byen dijital ou yo ap pèdi.',
+  'settings.manageData.downloadFailed': 'Nou pa t ka telechaje done ou yo. Tanpri eseye ankò pita.',
+  'settings.manageData.deleteConfirmTitle': 'Efase kont ou?',
+  'settings.manageData.deleteConfirmMessage': 'Sa ap efase kont ou ak done ou yo nèt. Ou pa ka defèt sa.',
+  'settings.manageData.deleteFailed': 'Nou pa t ka efase kont ou. Tanpri eseye ankò pita.',
   'search.messages.title': 'Chèche mesaj',
   'search.messages.placeholderChat': 'Chèche nan chat sa a',
   'search.messages.placeholderAll': 'Chèche nan tout chat yo',
@@ -2208,6 +2228,10 @@ const zh: UiStringTable = {
   'settings.manageData.deleteLabel': '删除您的账户',
   'settings.manageData.deleteDescription': '仅当您希望从我们的系统中永久删除您的账户及数据时才使用此功能。',
   'settings.manageData.deleteDisclosure': '由于分布式账本技术的不可篡改特性，社区运营的网络节点可能仍会保留您账户生成的历史交易记录；但您的个人身份信息，如姓名、电子邮箱、键值存储等将被移除。您的所有数字资产都将丢失。',
+  'settings.manageData.downloadFailed': '无法下载您的数据，请稍后重试。',
+  'settings.manageData.deleteConfirmTitle': '删除您的账户？',
+  'settings.manageData.deleteConfirmMessage': '这将永久删除您的账户和数据，且无法撤销。',
+  'settings.manageData.deleteFailed': '无法删除您的账户，请稍后重试。',
   'search.messages.title': '搜索消息',
   'search.messages.placeholderChat': '在此聊天中搜索',
   'search.messages.placeholderAll': '在所有聊天中搜索',

package/src/networking/api-requests/user.api.ts

@@ -1,3 +1,4 @@
+import * as FileSystem from 'expo-file-system/legacy';
 import http from '../apiClient';
 import { normalizeApiPath } from '../apiClient';
 import { store } from '../../roomStore';
@@ -37,11 +38,31 @@ export function getExportMyData() {
   return http.get('/v1/users/exportData', {
     headers: {
       Authorization: token,
-      responseType: 'arraybuffer',
     },
+    responseType: 'arraybuffer',
   });
 }
 
+/**
+ * Download the current user's data export (`GET /v1/users/exportData`)
+ * straight to `destPath` on disk. The export can be large, so it is
+ * streamed by expo-file-system instead of being buffered through axios.
+ * Rejects on a non-2xx answer so the caller can show an error.
+ */
+export async function downloadMyDataExport(destPath: string) {
+  const token = store.getState().chatSettingStore.user.token || '';
+  const result = await FileSystem.downloadAsync(
+    `${http.defaults.baseURL || ''}/v1/users/exportData`,
+    destPath,
+    { headers: { Authorization: token } }
+  );
+  if (result.status < 200 || result.status >= 300) {
+    await FileSystem.deleteAsync(result.uri, { idempotent: true });
+    throw new Error(`exportData failed with status ${result.status}`);
+  }
+  return result;
+}
+
 export function deleteDocument(fileId: string) {
   const token = store.getState().chatSettingStore.user.token || '';
   return http.delete(`/v1/files/${fileId}`, {
@@ -52,7 +73,12 @@ export function deleteDocument(fileId: string) {
 }
 
 export function deleteMe() {
-  return http.delete('/v1/users');
+  const token = store.getState().chatSettingStore.user.token || '';
+  return http.delete('/v1/users', {
+    headers: {
+      Authorization: token,
+    },
+  });
 }
 
 export function updateMe(data: any) {

package/src/roomStore/chatSettingsSlice.ts

@@ -231,6 +231,12 @@ const reducers = {
     state.client = undefined;
     state.langSource = undefined;
     state.translateMode = undefined;
+    // Drop any open modal / preview so the next login lands on the chat
+    // list instead of the screen the previous session was on.
+    state.activeModal = undefined;
+    state.deleteModal = undefined;
+    state.selectedUser = undefined;
+    state.activeFile = undefined;
     secureUserStorage().remove();
   },
   setLangSource: (

package/src/version.ts

@@ -1,3 +1,3 @@
 // Generated by scripts/sync-version.mjs on `npm version`.
 // Edit package.json's version instead of this file.
-export const ETHORA_CHAT_COMPONENT_VERSION = '26.10.0';
+export const ETHORA_CHAT_COMPONENT_VERSION = '26.10.2';