@oxy.so/services 12.10.1 → 12.12.0

package/lib/module/ui/components/accountSettings/AccountSettings.js

@@ -0,0 +1,355 @@
+"use strict";
+
+import { useCallback, useMemo, useState } from 'react';
+import { View } from 'react-native';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { Avatar } from '@oxy.so/bloom/avatar';
+import { Button } from '@oxy.so/bloom/button';
+import { GroupedSection, GroupedSectionItem } from '@oxy.so/bloom/grouped-section';
+import { surfaces } from '@oxy.so/bloom/surfaces';
+import { TextField, TextFieldInput } from '@oxy.so/bloom/text-field';
+import { useTheme } from '@oxy.so/bloom/theme';
+import { toast } from '@oxy.so/bloom/toast';
+import { Text } from '@oxy.so/bloom/typography';
+import { accountNameInvalidKey, accountNameInvalidMessage, accountNameMaxLength, getNormalizedUserHandle, isValidAccountName, kindAcceptsAccountCategories } from '@oxy.so/core';
+import { useOxy } from "../../context/oxyRuntimeContext.js";
+import { useI18n } from "../../hooks/useI18n.js";
+import { pickAvatarFile } from "../../hooks/useAvatarPicker.js";
+import { clearedFieldsFromAccountUpdate, upsertCachedUser } from "../../hooks/queries/userCache.js";
+import { OrganizationSettings } from "../organizations/OrganizationSettings.js";
+import { SettingsIcon } from "../SettingsIcon.js";
+import { AccountCategoriesSection, accountCategoriesEqual } from "./AccountCategoriesSection.js";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const BIO_MAX = 160;
+const AVATAR_SIZE = 64;
+const errorMessage = (error, fallback) => error instanceof Error && error.message ? error.message : fallback;
+
+/**
+ * How archiving the account behaves, for an app whose ending of an account
+ * means more than Oxy's archive.
+ */
+
+/**
+ * The account-graph node {@link AccountSettings} edits — seeded from the
+ * session's account list, then read fresh. `node` is `null` until it resolves.
+ */
+export function useAccountSettingsNode(accountId) {
+  const {
+    oxyServices,
+    canUsePrivateApi,
+    user,
+    accounts
+  } = useOxy();
+  const query = useQuery({
+    queryKey: ['accounts', 'detail', accountId, user?.id, canUsePrivateApi],
+    initialData: canUsePrivateApi ? accounts?.find(account => account.accountId === accountId) : undefined,
+    initialDataUpdatedAt: 0,
+    queryFn: () => oxyServices.accounts.get(accountId),
+    enabled: canUsePrivateApi && accountId.length > 0
+  });
+  return {
+    query,
+    node: canUsePrivateApi && query.isSuccess ? query.data : null
+  };
+}
+
+/**
+ * A non-personal account's settings: its picture, name, bio and categories,
+ * its members, and archiving it. The one editor for every member-operated
+ * account — the `AccountSettings` surface renders it, and an app embeds it in
+ * its own page (`@oxy.so/services/screens`) with its own sections and archive
+ * steps around it. Oxy decides what the caller may do from the membership it
+ * resolved, so every section is shown only to a member who holds its right.
+ */
+export const AccountSettings = ({
+  accountId,
+  extraSections,
+  onUpdated,
+  archive,
+  navigate,
+  onClose
+}) => {
+  const {
+    colors
+  } = useTheme();
+  const {
+    t
+  } = useI18n();
+  const {
+    oxyServices,
+    user,
+    accounts,
+    switchToAccount,
+    showBottomSheet
+  } = useOxy();
+  const queryClient = useQueryClient();
+  const id = accountId;
+  const {
+    query: accountQuery,
+    node
+  } = useAccountSettingsNode(id);
+  const account = node?.account;
+  const permissions = node?.callerMembership?.permissions ?? [];
+  const isImplicitOwner = node ? node.relationship !== 'member' : false;
+  const can = useCallback(permission => isImplicitOwner || permissions.includes(permission), [isImplicitOwner, permissions]);
+  const canUpdate = can('account:update');
+  const canViewMembers = can('members:read');
+  const canArchive = can('account:delete');
+  const hasCategories = kindAcceptsAccountCategories(node?.kind);
+
+  // Editable fields, seeded once from the loaded account and NOT re-synced: while
+  // the form is open it is the only writer, so a sync could only overwrite what
+  // is being typed. The stored values are read on every render for the dirty
+  // check, so a save settles the button without anything mirroring state.
+  const [seeded, setSeeded] = useState(false);
+  const [displayName, setDisplayName] = useState('');
+  const [displayNameError, setDisplayNameError] = useState('');
+  const [bio, setBio] = useState('');
+  // Verbatim, including an id this build cannot name: dropping it on load would
+  // delete it on the next save.
+  const [categories, setCategories] = useState([]);
+  const storedName = account?.name?.displayName ?? getNormalizedUserHandle(account) ?? '';
+  const storedCategories = account?.accountCategories ?? [];
+  if (node && !seeded) {
+    setDisplayName(storedName);
+    setBio(account?.bio ?? '');
+    setCategories([...storedCategories]);
+    setSeeded(true);
+  }
+  const updateMutation = useMutation({
+    mutationKey: ['accounts', 'update', id],
+    mutationFn: input => oxyServices.accounts.update(id, input),
+    onSuccess: (updatedNode, input) => {
+      const cleared = clearedFieldsFromAccountUpdate(input);
+      upsertCachedUser(queryClient, updatedNode.account, user?.id, {
+        cleared: cleared.length > 0 ? cleared : undefined
+      });
+      onUpdated?.(updatedNode.account, {
+        cleared
+      });
+      queryClient.invalidateQueries({
+        queryKey: ['accounts', 'detail', id]
+      });
+      queryClient.invalidateQueries({
+        queryKey: ['accounts']
+      });
+      toast.success(t('accounts.settings.toasts.saved'));
+    },
+    onError: error => {
+      toast.error(errorMessage(error, t('accounts.settings.toasts.saveFailed')));
+    }
+  });
+  const archiveMutation = useMutation({
+    mutationKey: ['accounts', 'archive', id],
+    mutationFn: async target => {
+      await archive?.beforeArchive?.(target);
+      await oxyServices.accounts.archive(id);
+      return target;
+    },
+    onSuccess: async target => {
+      // If we archived the account we're currently signed in AS, switch back to
+      // the personal account so the app isn't left as an archived identity.
+      if (user?.id === id) {
+        const personal = accounts.find(entry => entry.relationship === 'self');
+        if (personal) {
+          await switchToAccount(personal.accountId).catch(() => undefined);
+        }
+      }
+      queryClient.invalidateQueries({
+        queryKey: ['accounts']
+      });
+      toast.success(archive?.successMessage ?? t('accounts.settings.toasts.archived'));
+      if (archive?.onArchived) archive.onArchived(target);else onClose?.();
+    },
+    onError: error => {
+      toast.error(errorMessage(error, t('accounts.settings.toasts.archiveFailed')));
+    }
+  });
+  const handleArchive = useCallback(async () => {
+    if (!node) return;
+    let confirmed;
+    try {
+      confirmed = archive?.confirm ? await archive.confirm(node) : await surfaces.confirm({
+        title: t('accounts.settings.archive.confirmTitle'),
+        description: t('accounts.settings.archive.confirmDescription'),
+        confirmLabel: t('accounts.settings.archive.title'),
+        cancelLabel: t('common.cancel'),
+        destructive: true
+      });
+    } catch (error) {
+      toast.error(errorMessage(error, t('accounts.settings.toasts.archiveFailed')));
+      return;
+    }
+    if (confirmed) archiveMutation.mutate(node);
+  }, [archive, archiveMutation, node, t]);
+  const handleDisplayNameChange = useCallback(value => {
+    setDisplayName(value);
+    const trimmed = value.trim();
+    if (!trimmed) {
+      setDisplayNameError('');
+      return;
+    }
+    const kind = node?.account.kind;
+    setDisplayNameError(isValidAccountName(trimmed, kind) ? '' : t(`accounts.settings.displayName.${accountNameInvalidKey(kind)}`) || accountNameInvalidMessage(kind));
+  }, [node?.account.kind, t]);
+  const trimmedName = displayName.trim();
+  const trimmedBio = bio.trim();
+  const categoriesChanged = hasCategories && !accountCategoriesEqual(categories, storedCategories);
+  const profileChanged = trimmedName !== storedName.trim() || trimmedBio !== (account?.bio ?? '').trim() || categoriesChanged;
+  // An empty display name is refused rather than sent: at Oxy an empty
+  // `displayName` clears the explicit name, which a managed account (a title,
+  // not a given-and-family name) has nothing to fall back from.
+  const canSave = profileChanged && trimmedName.length > 0 && !displayNameError;
+  const handleSave = useCallback(() => {
+    if (!canSave) return;
+    updateMutation.mutate({
+      name: {
+        displayName: trimmedName
+      },
+      // `null` is Oxy's clear; an empty string would store one.
+      bio: trimmedBio ? trimmedBio : null,
+      // Whole and IN ORDER — element 0 is the primary, and `[]` is the clear.
+      ...(categoriesChanged ? {
+        accountCategories: categories
+      } : null)
+    });
+  }, [canSave, categories, categoriesChanged, trimmedBio, trimmedName, updateMutation]);
+
+  // The picture is written on its own, as the personal profile's is: the shared
+  // picker uploads the crop, and the account takes it (or `null`, its clear).
+  const handleChangePicture = useCallback(async () => {
+    try {
+      const avatar = await pickAvatarFile(oxyServices, {
+        avatar: account?.avatar,
+        displayName: storedName
+      });
+      if (avatar !== undefined) updateMutation.mutate({
+        avatar
+      });
+    } catch (error) {
+      toast.error(errorMessage(error, t('accounts.settings.toasts.saveFailed')));
+    }
+  }, [account?.avatar, oxyServices, storedName, t, updateMutation]);
+  const avatarUri = useMemo(() => account?.avatar ? oxyServices.assets.publicUrl(account.avatar, 'thumb') : undefined, [account?.avatar, oxyServices]);
+  const openMembers = useCallback(() => {
+    if (navigate) navigate('AccountMembers', {
+      accountId: id
+    });else showBottomSheet?.({
+      screen: 'AccountMembers',
+      props: {
+        accountId: id
+      }
+    });
+  }, [id, navigate, showBottomSheet]);
+  if (!id) {
+    return /*#__PURE__*/_jsx(View, {
+      className: "items-center justify-center px-screen-margin py-space-40",
+      children: /*#__PURE__*/_jsx(Text, {
+        className: "text-body font-body text-text-secondary text-center",
+        children: t('accounts.settings.errors.missingAccount')
+      })
+    });
+  }
+  if (accountQuery.isLoading || !node) {
+    return /*#__PURE__*/_jsx(View, {
+      className: "items-center py-space-32"
+    });
+  }
+  const busy = updateMutation.isPending;
+  return /*#__PURE__*/_jsxs(View, {
+    className: "px-screen-margin pt-space-24 pb-space-32 gap-space-24",
+    children: [canUpdate ? /*#__PURE__*/_jsxs(View, {
+      className: "gap-space-16 p-space-16 rounded-radius-20 bg-fill",
+      children: [/*#__PURE__*/_jsxs(View, {
+        className: "flex-row items-center gap-space-16",
+        children: [/*#__PURE__*/_jsx(Avatar, {
+          source: avatarUri,
+          name: storedName,
+          size: AVATAR_SIZE
+        }), /*#__PURE__*/_jsx(Button, {
+          appearance: "subtle",
+          size: "sm",
+          onPress: () => void handleChangePicture(),
+          disabled: busy,
+          children: t('accounts.settings.picture.change')
+        })]
+      }), /*#__PURE__*/_jsxs(View, {
+        className: "gap-space-4",
+        children: [/*#__PURE__*/_jsx(TextField, {
+          isInvalid: Boolean(displayNameError),
+          children: /*#__PURE__*/_jsx(TextFieldInput, {
+            floatingLabel: true,
+            label: t('accounts.settings.displayName.label'),
+            value: displayName,
+            onChangeText: handleDisplayNameChange,
+            isInvalid: Boolean(displayNameError),
+            maxLength: accountNameMaxLength(node.account.kind)
+          })
+        }), displayNameError ? /*#__PURE__*/_jsx(Text, {
+          className: "text-caption font-caption text-negative px-space-4",
+          children: displayNameError
+        }) : null]
+      }), /*#__PURE__*/_jsxs(View, {
+        className: "gap-space-4",
+        children: [/*#__PURE__*/_jsx(TextField, {
+          children: /*#__PURE__*/_jsx(TextFieldInput, {
+            floatingLabel: true,
+            label: t('accounts.settings.bio.label'),
+            value: bio,
+            onChangeText: setBio,
+            maxLength: BIO_MAX,
+            multiline: true,
+            numberOfLines: 3,
+            textAlignVertical: "top"
+          })
+        }), /*#__PURE__*/_jsxs(Text, {
+          className: "text-caption font-caption text-text-tertiary px-space-4 text-right",
+          children: [bio.length, "/", BIO_MAX]
+        })]
+      }), hasCategories ? /*#__PURE__*/_jsx(AccountCategoriesSection, {
+        value: categories,
+        onChange: setCategories,
+        disabled: busy
+      }) : null, /*#__PURE__*/_jsx(Button, {
+        appearance: "solid",
+        tone: "accent",
+        onPress: handleSave,
+        disabled: busy || !canSave,
+        loading: busy,
+        accessibilityLabel: t('accounts.settings.save'),
+        className: "w-full",
+        children: t('accounts.settings.save')
+      })]
+    }) : null, node.account.kind === 'organization' ? /*#__PURE__*/_jsx(OrganizationSettings, {
+      accountId: id,
+      canUpdate: canUpdate
+    }, id) : null, canViewMembers ? /*#__PURE__*/_jsx(GroupedSection, {
+      title: t('accounts.settings.sections.access'),
+      children: /*#__PURE__*/_jsx(GroupedSectionItem, {
+        icon: /*#__PURE__*/_jsx(SettingsIcon, {
+          name: "account-multiple",
+          color: colors.info
+        }),
+        title: t('accounts.members.title'),
+        description: t('accounts.settings.members.subtitle'),
+        onPress: openMembers
+      })
+    }) : null, extraSections, canArchive ? /*#__PURE__*/_jsx(GroupedSection, {
+      title: t('accounts.settings.sections.dangerZone'),
+      footer: archive?.footer,
+      children: /*#__PURE__*/_jsx(GroupedSectionItem, {
+        icon: /*#__PURE__*/_jsx(SettingsIcon, {
+          name: "archive-arrow-down",
+          color: colors.error
+        }),
+        title: archive?.title ?? t('accounts.settings.archive.title'),
+        description: archive?.title ? archive.description : t('accounts.settings.archive.subtitle'),
+        destructive: true,
+        disabled: archiveMutation.isPending,
+        onPress: () => void handleArchive()
+      })
+    }) : null]
+  });
+};
+export default AccountSettings;
+//# sourceMappingURL=AccountSettings.js.map

package/lib/module/ui/components/accountSettings/AccountSettings.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useCallback","useMemo","useState","View","useMutation","useQuery","useQueryClient","Avatar","Button","GroupedSection","GroupedSectionItem","surfaces","TextField","TextFieldInput","useTheme","toast","Text","accountNameInvalidKey","accountNameInvalidMessage","accountNameMaxLength","getNormalizedUserHandle","isValidAccountName","kindAcceptsAccountCategories","useOxy","useI18n","pickAvatarFile","clearedFieldsFromAccountUpdate","upsertCachedUser","OrganizationSettings","SettingsIcon","AccountCategoriesSection","accountCategoriesEqual","jsx","_jsx","jsxs","_jsxs","BIO_MAX","AVATAR_SIZE","errorMessage","error","fallback","Error","message","useAccountSettingsNode","accountId","oxyServices","canUsePrivateApi","user","accounts","query","queryKey","id","initialData","find","account","undefined","initialDataUpdatedAt","queryFn","get","enabled","length","node","isSuccess","data","AccountSettings","extraSections","onUpdated","archive","navigate","onClose","colors","t","switchToAccount","showBottomSheet","queryClient","accountQuery","permissions","callerMembership","isImplicitOwner","relationship","can","permission","includes","canUpdate","canViewMembers","canArchive","hasCategories","kind","seeded","setSeeded","displayName","setDisplayName","displayNameError","setDisplayNameError","bio","setBio","categories","setCategories","storedName","name","storedCategories","accountCategories","updateMutation","mutationKey","mutationFn","input","update","onSuccess","updatedNode","cleared","invalidateQueries","success","onError","archiveMutation","target","beforeArchive","personal","entry","catch","successMessage","onArchived","handleArchive","confirmed","confirm","title","description","confirmLabel","cancelLabel","destructive","mutate","handleDisplayNameChange","value","trimmed","trim","trimmedName","trimmedBio","categoriesChanged","profileChanged","canSave","handleSave","handleChangePicture","avatar","avatarUri","assets","publicUrl","openMembers","screen","props","className","children","isLoading","busy","isPending","source","size","appearance","onPress","disabled","isInvalid","Boolean","floatingLabel","label","onChangeText","maxLength","multiline","numberOfLines","textAlignVertical","onChange","tone","loading","accessibilityLabel","icon","color","info","footer"],"sourceRoot":"../../../../../src","sources":["ui/components/accountSettings/AccountSettings.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/hooks/useAvatarPicker.js

@@ -4,7 +4,10 @@
  * Avatar Picker Hook
  *
  * The ONE write path for a user's profile picture. It owns no UI: the whole
- * choose-and-crop experience is a single surface.
+ * choose-and-crop experience is a single surface. The choosing half —
+ * {@link pickAvatarFile} — is account-agnostic and also serves a managed
+ * account's picture (`AccountSettings`), so there is one picker, one cropper and
+ * one upload for every account an app can edit.
  *
  * Flow (typed promise over the shared surface stack — no callback props):
  *   1. `openWithinOrPresent('ChangeAvatar')` opens the source list (device gallery,
@@ -38,66 +41,68 @@ function extractUploadedFileId(result) {
   if (first?.id) return first.id;
   return undefined;
 }
+
+/**
+ * Whose picture the picker is changing, when it is not the signed-in user's —
+ * the source list previews it and offers "Remove" only when there is one.
+ */
+
+/**
+ * The shared choose-and-crop flow, then the crop uploaded as a NEW public file.
+ *
+ * Resolves the new file's id, `null` when the person chose to remove the
+ * picture, or `undefined` when they backed out. It writes no account: the
+ * caller decides whose picture the file becomes, which is what lets the
+ * signed-in user's profile and a managed account share every step before that.
+ * An upload failure rejects.
+ */
+export async function pickAvatarFile(oxyServices, subject) {
+  // The source list + crop editor are ONE flow. When triggered from a screen
+  // already inside a surface (EditProfile, ManageAccount, WelcomeNewUser,
+  // AccountSettings), it MORPHS into that surface and pops back on finish;
+  // triggered with no surface open it presents cold. Either way it resolves with
+  // the cropped JPEG, a removal, or `undefined` when the user backs out.
+  const result = await openWithinOrPresent('ChangeAvatar', subject ? {
+    subject
+  } : undefined);
+  if (!result) return undefined;
+  if ('removed' in result) return null;
+  const uploadResult = await oxyServices.assets.upload({
+    uri: result.uri,
+    type: result.mime,
+    name: `avatar-${Date.now()}.jpg`
+  }, {
+    visibility: 'public'
+  });
+  const fileId = extractUploadedFileId(uploadResult);
+  if (!fileId) {
+    throw new Error('Avatar upload succeeded but no file ID was returned');
+  }
+  await updateAvatarVisibility(fileId, oxyServices, 'pickAvatarFile');
+  return fileId;
+}
 export function useAvatarPicker({
   oxyServices,
   currentLanguage,
   activeSessionId,
   queryClient
 }) {
-  /**
-   * Final step: take the cropped JPEG, upload it as a new public file, then
-   * set it as the user's avatar. Fires success/error toasts.
-   */
-  const finalizeCroppedAvatar = useCallback(async cropped => {
-    try {
-      const uploadResult = await oxyServices.assets.upload({
-        uri: cropped.uri,
-        type: cropped.mime,
-        name: `avatar-${Date.now()}.jpg`
-      }, {
-        visibility: 'public'
-      });
-      const newFileId = extractUploadedFileId(uploadResult);
-      if (!newFileId) {
-        throw new Error('Avatar upload succeeded but no file ID was returned');
-      }
-      await updateAvatarVisibility(newFileId, oxyServices, 'useAvatarPicker');
-      await updateProfileWithAvatar({
-        avatar: newFileId
-      }, oxyServices, activeSessionId, queryClient);
-      toast.success(translate(currentLanguage ?? undefined, 'editProfile.toasts.avatarUpdated') || 'Avatar updated');
-    } catch (e) {
-      const message = e instanceof Error ? e.message : undefined;
-      toast.error(message || translate(currentLanguage ?? undefined, 'editProfile.toasts.updateAvatarFailed') || 'Failed to update avatar');
-    }
-  }, [activeSessionId, currentLanguage, oxyServices, queryClient]);
-
-  /** Clear the avatar so the profile falls back to the user's initials. */
-  const removeAvatar = useCallback(async () => {
+  const openAvatarPicker = useCallback(async () => {
+    const locale = currentLanguage ?? undefined;
     try {
+      const fileId = await pickAvatarFile(oxyServices);
+      if (fileId === undefined) return;
+      // `''` clears the field on `updateMe`, so the profile falls back to the
+      // user's initials.
       await updateProfileWithAvatar({
-        avatar: ''
+        avatar: fileId ?? ''
       }, oxyServices, activeSessionId, queryClient);
-      toast.success(translate(currentLanguage ?? undefined, 'editProfile.toasts.avatarRemoved'));
+      toast.success(translate(locale, fileId === null ? 'editProfile.toasts.avatarRemoved' : 'editProfile.toasts.avatarUpdated'));
     } catch (e) {
       const message = e instanceof Error ? e.message : undefined;
-      toast.error(message || translate(currentLanguage ?? undefined, 'editProfile.toasts.updateAvatarFailed'));
+      toast.error(message || translate(locale, 'editProfile.toasts.updateAvatarFailed'));
     }
   }, [activeSessionId, currentLanguage, oxyServices, queryClient]);
-  const openAvatarPicker = useCallback(async () => {
-    // The source list + crop editor are ONE flow. When triggered from a screen
-    // already inside a surface (EditProfile, ManageAccount, WelcomeNewUser — every
-    // current entry point), it MORPHS into that surface and pops back on finish;
-    // triggered with no surface open it presents cold. Either way it resolves with
-    // the cropped JPEG, a removal, or `undefined` when the user backs out.
-    const result = await openWithinOrPresent('ChangeAvatar');
-    if (!result) return;
-    if ('removed' in result) {
-      await removeAvatar();
-      return;
-    }
-    await finalizeCroppedAvatar(result);
-  }, [finalizeCroppedAvatar, removeAvatar]);
   return {
     openAvatarPicker
   };

package/lib/module/ui/hooks/useAvatarPicker.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","translate","updateAvatarVisibility","toast","updateProfileWithAvatar","openWithinOrPresent","extractUploadedFileId","result","undefined","id","file","first","files","useAvatarPicker","oxyServices","currentLanguage","activeSessionId","queryClient","finalizeCroppedAvatar","cropped","uploadResult","assets","upload","uri","type","mime","name","Date","now","visibility","newFileId","Error","avatar","success","e","message","error","removeAvatar","openAvatarPicker"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAvatarPicker.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,WAAW,QAAQ,OAAO;AAEnC,SAASC,SAAS,EAAEC,sBAAsB,QAAQ,cAAc;AAEhE,SAASC,KAAK,QAAQ,qBAAqB;AAC3C,SAASC,uBAAuB,QAAQ,yBAAsB;AAC9D,SAASC,mBAAmB,QAAQ,2BAAwB;;AAU5D;;AAOA,SAASC,qBAAqBA,CAACC,MAAqC,EAAsB;EACxF,IAAI,CAACA,MAAM,EAAE,OAAOC,SAAS;EAC7B,IAAI,OAAOD,MAAM,CAACE,EAAE,KAAK,QAAQ,EAAE,OAAOF,MAAM,CAACE,EAAE;EACnD,IAAIF,MAAM,CAACG,IAAI,EAAED,EAAE,EAAE,OAAOF,MAAM,CAACG,IAAI,CAACD,EAAE;EAC1C,MAAME,KAAK,GAAGJ,MAAM,CAACK,KAAK,GAAG,CAAC,CAAC;EAC/B,IAAID,KAAK,EAAEF,EAAE,EAAE,OAAOE,KAAK,CAACF,EAAE;EAC9B,OAAOD,SAAS;AAClB;AAEA,OAAO,SAASK,eAAeA,CAAC;EAC9BC,WAAW;EACXC,eAAe;EACfC,eAAe;EACfC;AACsB,CAAC,EAAE;EACzB;AACF;AACA;AACA;EACE,MAAMC,qBAAqB,GAAGlB,WAAW,CACvC,MAAOmB,OAAyB,IAAK;IACnC,IAAI;MACF,MAAMC,YAAY,GAAI,MAAMN,WAAW,CAACO,MAAM,CAACC,MAAM,CACnD;QACEC,GAAG,EAAEJ,OAAO,CAACI,GAAG;QAChBC,IAAI,EAAEL,OAAO,CAACM,IAAI;QAClBC,IAAI,EAAE,UAAUC,IAAI,CAACC,GAAG,CAAC,CAAC;MAC5B,CAAC,EACD;QAAEC,UAAU,EAAE;MAAS,CACzB,CAAuB;MAEvB,MAAMC,SAAS,GAAGxB,qBAAqB,CAACc,YAAY,CAAC;MACrD,IAAI,CAACU,SAAS,EAAE;QACd,MAAM,IAAIC,KAAK,CAAC,qDAAqD,CAAC;MACxE;MAEA,MAAM7B,sBAAsB,CAAC4B,SAAS,EAAEhB,WAAW,EAAE,iBAAiB,CAAC;MACvE,MAAMV,uBAAuB,CAC3B;QAAE4B,MAAM,EAAEF;MAAU,CAAC,EACrBhB,WAAW,EACXE,eAAe,EACfC,WACF,CAAC;MAEDd,KAAK,CAAC8B,OAAO,CACXhC,SAAS,CAACc,eAAe,IAAIP,SAAS,EAAE,kCAAkC,CAAC,IACzE,gBACJ,CAAC;IACH,CAAC,CAAC,OAAO0B,CAAU,EAAE;MACnB,MAAMC,OAAO,GAAGD,CAAC,YAAYH,KAAK,GAAGG,CAAC,CAACC,OAAO,GAAG3B,SAAS;MAC1DL,KAAK,CAACiC,KAAK,CACTD,OAAO,IACLlC,SAAS,CAACc,eAAe,IAAIP,SAAS,EAAE,uCAAuC,CAAC,IAChF,yBACJ,CAAC;IACH;EACF,CAAC,EACD,CAACQ,eAAe,EAAED,eAAe,EAAED,WAAW,EAAEG,WAAW,CAC7D,CAAC;;EAED;EACA,MAAMoB,YAAY,GAAGrC,WAAW,CAAC,YAAY;IAC3C,IAAI;MACF,MAAMI,uBAAuB,CAAC;QAAE4B,MAAM,EAAE;MAAG,CAAC,EAAElB,WAAW,EAAEE,eAAe,EAAEC,WAAW,CAAC;MACxFd,KAAK,CAAC8B,OAAO,CAAChC,SAAS,CAACc,eAAe,IAAIP,SAAS,EAAE,kCAAkC,CAAC,CAAC;IAC5F,CAAC,CAAC,OAAO0B,CAAU,EAAE;MACnB,MAAMC,OAAO,GAAGD,CAAC,YAAYH,KAAK,GAAGG,CAAC,CAACC,OAAO,GAAG3B,SAAS;MAC1DL,KAAK,CAACiC,KAAK,CACTD,OAAO,IAAIlC,SAAS,CAACc,eAAe,IAAIP,SAAS,EAAE,uCAAuC,CAC5F,CAAC;IACH;EACF,CAAC,EAAE,CAACQ,eAAe,EAAED,eAAe,EAAED,WAAW,EAAEG,WAAW,CAAC,CAAC;EAEhE,MAAMqB,gBAAgB,GAAGtC,WAAW,CAAC,YAAY;IAC/C;IACA;IACA;IACA;IACA;IACA,MAAMO,MAAM,GAAG,MAAMF,mBAAmB,CAAC,cAAc,CAAC;IACxD,IAAI,CAACE,MAAM,EAAE;IACb,IAAI,SAAS,IAAIA,MAAM,EAAE;MACvB,MAAM8B,YAAY,CAAC,CAAC;MACpB;IACF;IACA,MAAMnB,qBAAqB,CAACX,MAAM,CAAC;EACrC,CAAC,EAAE,CAACW,qBAAqB,EAAEmB,YAAY,CAAC,CAAC;EAEzC,OAAO;IAAEC;EAAiB,CAAC;AAC7B","ignoreList":[]}
+{"version":3,"names":["useCallback","translate","updateAvatarVisibility","toast","updateProfileWithAvatar","openWithinOrPresent","extractUploadedFileId","result","undefined","id","file","first","files","pickAvatarFile","oxyServices","subject","uploadResult","assets","upload","uri","type","mime","name","Date","now","visibility","fileId","Error","useAvatarPicker","currentLanguage","activeSessionId","queryClient","openAvatarPicker","locale","avatar","success","e","message","error"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAvatarPicker.ts"],"mappings":"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","ignoreList":[]}