@oxyhq/services 5.17.14 → 5.17.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/ui/context/OxyContext.js +34 -34
- package/lib/commonjs/ui/context/OxyContext.js.map +1 -1
- package/lib/commonjs/ui/hooks/mutations/useAccountMutations.js +21 -26
- package/lib/commonjs/ui/hooks/mutations/useAccountMutations.js.map +1 -1
- package/lib/commonjs/ui/hooks/queries/useAccountQueries.js +31 -28
- package/lib/commonjs/ui/hooks/queries/useAccountQueries.js.map +1 -1
- package/lib/commonjs/ui/screens/AccountSettingsScreen.js +9 -3
- package/lib/commonjs/ui/screens/AccountSettingsScreen.js.map +1 -1
- package/lib/commonjs/ui/utils/avatarUtils.js +7 -8
- package/lib/commonjs/ui/utils/avatarUtils.js.map +1 -1
- package/lib/module/ui/context/OxyContext.js +39 -39
- package/lib/module/ui/context/OxyContext.js.map +1 -1
- package/lib/module/ui/hooks/mutations/useAccountMutations.js +21 -26
- package/lib/module/ui/hooks/mutations/useAccountMutations.js.map +1 -1
- package/lib/module/ui/hooks/queries/useAccountQueries.js +31 -28
- package/lib/module/ui/hooks/queries/useAccountQueries.js.map +1 -1
- package/lib/module/ui/screens/AccountSettingsScreen.js +9 -3
- package/lib/module/ui/screens/AccountSettingsScreen.js.map +1 -1
- package/lib/module/ui/utils/avatarUtils.js +7 -8
- package/lib/module/ui/utils/avatarUtils.js.map +1 -1
- package/lib/typescript/ui/context/OxyContext.d.ts.map +1 -1
- package/lib/typescript/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/ui/hooks/queries/useAccountQueries.d.ts.map +1 -1
- package/lib/typescript/ui/screens/AccountSettingsScreen.d.ts.map +1 -1
- package/lib/typescript/ui/utils/avatarUtils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/ui/context/OxyContext.tsx +30 -41
- package/src/ui/hooks/mutations/useAccountMutations.ts +23 -34
- package/src/ui/hooks/queries/useAccountQueries.ts +23 -20
- package/src/ui/screens/AccountSettingsScreen.tsx +17 -3
- package/src/ui/utils/avatarUtils.ts +7 -8
|
@@ -166,44 +166,50 @@ const OxyProvider = ({
|
|
|
166
166
|
queryClient
|
|
167
167
|
});
|
|
168
168
|
const {
|
|
169
|
-
data: userData
|
|
170
|
-
refetch: refetchUser
|
|
169
|
+
data: userData
|
|
171
170
|
} = (0, _reactQuery.useQuery)({
|
|
172
171
|
queryKey: _queryKeys.queryKeys.accounts.current(),
|
|
173
172
|
queryFn: async () => {
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
173
|
+
_loggerUtils.logger.debug('Fetching current user', {
|
|
174
|
+
component: 'OxyContext',
|
|
175
|
+
sessionId: activeSessionId ?? undefined
|
|
176
|
+
});
|
|
177
177
|
if (!activeSessionId) {
|
|
178
178
|
throw new Error('No active session');
|
|
179
179
|
}
|
|
180
180
|
const data = await oxyServices.getUserBySession(activeSessionId);
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
181
|
+
_loggerUtils.logger.debug('Current user fetched', {
|
|
182
|
+
component: 'OxyContext',
|
|
183
|
+
username: data.username
|
|
184
|
+
});
|
|
184
185
|
return data;
|
|
185
186
|
},
|
|
186
187
|
enabled: isAuthenticated && !!activeSessionId && tokenReady,
|
|
187
|
-
staleTime:
|
|
188
|
-
|
|
188
|
+
staleTime: 30000,
|
|
189
|
+
// 30 seconds - reduces unnecessary refetches
|
|
190
|
+
gcTime: 5 * 60 * 1000,
|
|
191
|
+
// 5 minutes - keeps data in cache longer
|
|
189
192
|
retry: false,
|
|
190
193
|
refetchOnMount: 'always',
|
|
191
194
|
refetchOnWindowFocus: false
|
|
192
195
|
});
|
|
193
196
|
const user = userData ?? null;
|
|
194
197
|
|
|
195
|
-
//
|
|
198
|
+
// Profile update mutation - defined inline to avoid circular dependency with useOxy()
|
|
196
199
|
const updateProfileMutation = (0, _reactQuery.useMutation)({
|
|
197
200
|
mutationFn: async updates => {
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
+
_loggerUtils.logger.debug('Updating profile', {
|
|
202
|
+
component: 'OxyContext',
|
|
203
|
+
updates
|
|
204
|
+
});
|
|
201
205
|
return await oxyServices.updateProfile(updates);
|
|
202
206
|
},
|
|
203
207
|
onSuccess: async (data, updates) => {
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
208
|
+
_loggerUtils.logger.debug('Profile update successful', {
|
|
209
|
+
component: 'OxyContext',
|
|
210
|
+
username: data.username,
|
|
211
|
+
updatedFields: Object.keys(updates)
|
|
212
|
+
});
|
|
207
213
|
|
|
208
214
|
// Update cache with server response
|
|
209
215
|
queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), data);
|
|
@@ -211,28 +217,22 @@ const OxyProvider = ({
|
|
|
211
217
|
queryClient.setQueryData(_queryKeys.queryKeys.users.profile(activeSessionId), data);
|
|
212
218
|
}
|
|
213
219
|
|
|
214
|
-
// Refresh accountStore with all updated profile data (
|
|
220
|
+
// Refresh accountStore with all updated profile data (synchronizes immediately)
|
|
215
221
|
if (activeSessionId && oxyServices) {
|
|
216
222
|
(0, _avatarUtils.refreshAccountInStore)(activeSessionId, data, oxyServices);
|
|
217
223
|
}
|
|
218
224
|
|
|
219
|
-
//
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
queryKey: _queryKeys.queryKeys.accounts.current(),
|
|
225
|
-
type: 'active'
|
|
226
|
-
}), refetchUser?.()]);
|
|
227
|
-
if (__DEV__) {
|
|
228
|
-
console.log('[OxyContext] Profile update complete - cache invalidated and refetched');
|
|
229
|
-
console.log('[OxyContext] Updated user data:', data);
|
|
230
|
-
}
|
|
225
|
+
// Only invalidate specific queries that need refresh (not everything)
|
|
226
|
+
(0, _queryKeys.invalidateAccountQueries)(queryClient);
|
|
227
|
+
_loggerUtils.logger.debug('Profile update complete', {
|
|
228
|
+
component: 'OxyContext'
|
|
229
|
+
});
|
|
231
230
|
},
|
|
232
231
|
onError: error => {
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
}
|
|
232
|
+
_loggerUtils.logger.error('Profile update failed', error, {
|
|
233
|
+
component: 'OxyContext'
|
|
234
|
+
});
|
|
235
|
+
_sonner.toast.error(error instanceof Error ? error.message : 'Failed to update profile');
|
|
236
236
|
}
|
|
237
237
|
});
|
|
238
238
|
const updateProfile = (0, _react.useCallback)(async updates => {
|
|
@@ -410,7 +410,7 @@ const OxyProvider = ({
|
|
|
410
410
|
}
|
|
411
411
|
} catch (error) {
|
|
412
412
|
if (__DEV__) {
|
|
413
|
-
_loggerUtils.logger.error('Auth init error', error
|
|
413
|
+
_loggerUtils.logger.error('Auth init error', error, {
|
|
414
414
|
component: 'OxyContext',
|
|
415
415
|
method: 'restoreSessionsFromStorage'
|
|
416
416
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactQuery","_sonner","_core","_loggerUtils","_useAuthOperations","_useAvatarPicker","_useSessionSocket","_useDeviceManagement","_useLanguageManagement","_useSessionManagement","_useStorage","_accountStore","_authStore","_queryKeys","_queryClient","_bottomSheetManager","_storageHelpers","_errorHandlers","_avatarUtils","_shallow","_OxyContextBase","_jsxRuntime","cachedUseFollowHook","loadUseFollowHook","useFollow","error","__DEV__","loggerUtil","warn","component","method","fallback","Error","OxyProvider","children","oxyServices","providedOxyServices","baseURL","storageKeyPrefix","onAuthStateChange","onError","oxyServicesRef","useRef","current","OxyServices","isAuthenticated","isOnline","isLoading","setOnline","loginSuccess","loginFailure","logoutStore","useAuthStore","useShallow","state","logout","tokenReady","setTokenReady","useState","initializedRef","setAuthState","setState","logger","useCallback","message","err","undefined","console","storageKeys","useMemo","getStorageKeys","storage","isReady","isStorageReady","useStorage","currentLanguage","metadata","currentLanguageMetadata","languageName","currentLanguageName","nativeLanguageName","currentNativeLanguageName","setLanguage","applyLanguagePreference","useLanguageManagement","languageKey","language","queryClient","useQueryClient","sessions","activeSessionId","setActiveSessionId","updateSessions","switchSession","refreshSessions","clearSessionState","saveActiveSessionId","trackRemovedSession","useSessionManagement","setAuthError","data","userData","refetch","refetchUser","useQuery","queryKey","queryKeys","accounts","queryFn","log","getUserBySession","username","name","enabled","staleTime","gcTime","retry","refetchOnMount","refetchOnWindowFocus","user","updateProfileMutation","useMutation","mutationFn","updates","updateProfile","onSuccess","setQueryData","users","profile","refreshAccountInStore","Promise","all","invalidateUserQueries","invalidateAccountQueries","refetchQueries","type","mutateAsync","completeSignIn","logoutAll","useAuthOperations","clearAllAccountData","clear","clearQueryCache","useAccountStore","getState","reset","clearCache","useEffect","wasOffline","checkTimeout","scheduleNextCheck","clearTimeout","setTimeout","checkNetworkStatus","healthCheck","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","useDeviceManagement","useFollowHook","restoreSessionsFromStorage","storedSessionIdsJson","getItem","sessionIds","storedSessionIds","JSON","parse","storedActiveSessionId","validSessions","length","sessionId","validation","validateSession","useHeaderValidation","valid","now","Date","push","deviceId","expiresAt","getTime","toISOString","lastActive","userId","id","toString","isCurrent","validationError","isInvalidSessionError","isTimeoutOrNetworkError","debug","merge","switchError","removeItem","filter","session","String","activeSession","find","currentDeviceId","getCurrentUserId","refreshSessionsWithUser","handleSessionRemoved","handleRemoteSignOut","toast","info","catch","remoteError","useSessionSocket","getBaseURL","getAccessToken","onRemoteSignOut","onSessionRemoved","switchSessionForContext","showBottomSheetForContext","screenOrConfig","globalShowBottomSheet","openAvatarPicker","useAvatarPicker","showBottomSheet","contextValue","isTokenReady","removeSession","jsx","OxyContext","Provider","value","exports","OxyContextProvider","_default","default"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","require","_reactQuery","_sonner","_core","_loggerUtils","_useAuthOperations","_useAvatarPicker","_useSessionSocket","_useDeviceManagement","_useLanguageManagement","_useSessionManagement","_useStorage","_accountStore","_authStore","_queryKeys","_queryClient","_bottomSheetManager","_storageHelpers","_errorHandlers","_avatarUtils","_shallow","_OxyContextBase","_jsxRuntime","cachedUseFollowHook","loadUseFollowHook","useFollow","error","__DEV__","appLogger","warn","component","method","fallback","Error","OxyProvider","children","oxyServices","providedOxyServices","baseURL","storageKeyPrefix","onAuthStateChange","onError","oxyServicesRef","useRef","current","OxyServices","isAuthenticated","isOnline","isLoading","setOnline","loginSuccess","loginFailure","logoutStore","useAuthStore","useShallow","state","logout","tokenReady","setTokenReady","useState","initializedRef","setAuthState","setState","logger","useCallback","message","err","undefined","console","storageKeys","useMemo","getStorageKeys","storage","isReady","isStorageReady","useStorage","currentLanguage","metadata","currentLanguageMetadata","languageName","currentLanguageName","nativeLanguageName","currentNativeLanguageName","setLanguage","applyLanguagePreference","useLanguageManagement","languageKey","language","queryClient","useQueryClient","sessions","activeSessionId","setActiveSessionId","updateSessions","switchSession","refreshSessions","clearSessionState","saveActiveSessionId","trackRemovedSession","useSessionManagement","setAuthError","data","userData","useQuery","queryKey","queryKeys","accounts","queryFn","debug","sessionId","getUserBySession","username","enabled","staleTime","gcTime","retry","refetchOnMount","refetchOnWindowFocus","user","updateProfileMutation","useMutation","mutationFn","updates","updateProfile","onSuccess","updatedFields","Object","keys","setQueryData","users","profile","refreshAccountInStore","invalidateAccountQueries","toast","mutateAsync","completeSignIn","logoutAll","useAuthOperations","clearAllAccountData","clear","clearQueryCache","useAccountStore","getState","reset","clearCache","useEffect","wasOffline","checkTimeout","scheduleNextCheck","clearTimeout","setTimeout","checkNetworkStatus","healthCheck","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","useDeviceManagement","useFollowHook","restoreSessionsFromStorage","storedSessionIdsJson","getItem","sessionIds","storedSessionIds","JSON","parse","storedActiveSessionId","validSessions","length","validation","validateSession","useHeaderValidation","valid","now","Date","push","deviceId","expiresAt","getTime","toISOString","lastActive","userId","id","toString","isCurrent","validationError","isInvalidSessionError","isTimeoutOrNetworkError","merge","switchError","removeItem","filter","session","activeSession","find","currentDeviceId","getCurrentUserId","refreshSessionsWithUser","handleSessionRemoved","handleRemoteSignOut","info","catch","remoteError","useSessionSocket","getBaseURL","getAccessToken","onRemoteSignOut","onSessionRemoved","switchSessionForContext","showBottomSheetForContext","screenOrConfig","globalShowBottomSheet","openAvatarPicker","useAvatarPicker","showBottomSheet","contextValue","isTokenReady","removeSession","jsx","OxyContext","Provider","value","exports","OxyContextProvider","_default","default"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":";;;;;;;;;;;;;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AAOA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAH,OAAA;AAGA,IAAAI,YAAA,GAAAJ,OAAA;AACA,IAAAK,kBAAA,GAAAL,OAAA;AACA,IAAAM,gBAAA,GAAAN,OAAA;AACA,IAAAO,iBAAA,GAAAP,OAAA;AAEA,IAAAQ,oBAAA,GAAAR,OAAA;AACA,IAAAS,sBAAA,GAAAT,OAAA;AACA,IAAAU,qBAAA,GAAAV,OAAA;AACA,IAAAW,WAAA,GAAAX,OAAA;AACA,IAAAY,aAAA,GAAAZ,OAAA;AACA,IAAAa,UAAA,GAAAb,OAAA;AACA,IAAAc,UAAA,GAAAd,OAAA;AACA,IAAAe,YAAA,GAAAf,OAAA;AAEA,IAAAgB,mBAAA,GAAAhB,OAAA;AACA,IAAAiB,eAAA,GAAAjB,OAAA;AACA,IAAAkB,cAAA,GAAAlB,OAAA;AACA,IAAAmB,YAAA,GAAAnB,OAAA;AACA,IAAAoB,QAAA,GAAApB,OAAA;AAEA,IAAAqB,eAAA,GAAArB,OAAA;AAK0B,IAAAsB,WAAA,GAAAtB,OAAA;AAK1B,IAAIuB,mBAAyC,GAAG,IAAI;AAEpD,MAAMC,iBAAiB,GAAGA,CAAA,KAAqB;EAC7C,IAAID,mBAAmB,EAAE;IACvB,OAAOA,mBAAmB;EAC5B;EAEA,IAAI;IACF;IACA,MAAM;MAAEE;IAAU,CAAC,GAAGzB,OAAO,CAAC,oBAAoB,CAAC;IACnDuB,mBAAmB,GAAGE,SAA0B;IAChD,OAAOF,mBAAmB;EAC5B,CAAC,CAAC,OAAOG,KAAK,EAAE;IACd,IAAIC,OAAO,EAAE;MACXC,mBAAS,CAACC,IAAI,CACZ,yFAAyF,EACzF;QAAEC,SAAS,EAAE,YAAY;QAAEC,MAAM,EAAE;MAAoB,CAAC,EACxDL,KACF,CAAC;IACH;IAEA,MAAMM,QAAuB,GAAGA,CAAA,KAAM;MACpC,MAAM,IAAIC,KAAK,CAAC,oFAAoF,CAAC;IACvG,CAAC;IAEDV,mBAAmB,GAAGS,QAAQ;IAC9B,OAAOT,mBAAmB;EAC5B;AACF,CAAC;AAEM,MAAMW,WAA8C,GAAGA,CAAC;EAC7DC,QAAQ;EACRC,WAAW,EAAEC,mBAAmB;EAChCC,OAAO;EACPC,gBAAgB,GAAG,aAAa;EAChCC,iBAAiB;EACjBC;AACF,CAAC,KAAK;EACJ,MAAMC,cAAc,GAAG,IAAAC,aAAM,EAAqB,IAAI,CAAC;EAEvD,IAAI,CAACD,cAAc,CAACE,OAAO,EAAE;IAC3B,IAAIP,mBAAmB,EAAE;MACvBK,cAAc,CAACE,OAAO,GAAGP,mBAAmB;IAC9C,CAAC,MAAM,IAAIC,OAAO,EAAE;MAClBI,cAAc,CAACE,OAAO,GAAG,IAAIC,iBAAW,CAAC;QAAEP;MAAQ,CAAC,CAAC;IACvD,CAAC,MAAM;MACL,MAAM,IAAIL,KAAK,CAAC,sEAAsE,CAAC;IACzF;EACF;EAEA,MAAMG,WAAW,GAAGM,cAAc,CAACE,OAAO;EAE1C,MAAM;IACJE,eAAe;IACfC,QAAQ;IACRC,SAAS;IACTtB,KAAK;IACLuB,SAAS;IACTC,YAAY;IACZC,YAAY;IACZC;EACF,CAAC,GAAG,IAAAC,uBAAY,EACd,IAAAC,mBAAU,EAAEC,KAAgB,KAAM;IAChCT,eAAe,EAAES,KAAK,CAACT,eAAe;IACtCC,QAAQ,EAAEQ,KAAK,CAACR,QAAQ;IACxBC,SAAS,EAAEO,KAAK,CAACP,SAAS;IAC1BtB,KAAK,EAAE6B,KAAK,CAAC7B,KAAK;IAClBuB,SAAS,EAAEM,KAAK,CAACN,SAAS;IAC1BC,YAAY,EAAEK,KAAK,CAACL,YAAY;IAChCC,YAAY,EAAEI,KAAK,CAACJ,YAAY;IAChCC,WAAW,EAAEG,KAAK,CAACC;EACrB,CAAC,CAAC,CACJ,CAAC;EAED,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAG,IAAAC,eAAQ,EAAC,IAAI,CAAC;EAClD,MAAMC,cAAc,GAAG,IAAAjB,aAAM,EAAC,KAAK,CAAC;EACpC,MAAMkB,YAAY,GAAGR,uBAAY,CAACS,QAAQ;EAE1C,MAAMC,MAAM,GAAG,IAAAC,kBAAW,EAAC,CAACC,OAAe,EAAEC,GAAa,KAAK;IAC7D,IAAIvC,OAAO,EAAE;MACX,IAAIuC,GAAG,KAAKC,SAAS,EAAE;QACrBC,OAAO,CAACvC,IAAI,CAAC,gBAAgBoC,OAAO,EAAE,EAAEC,GAAG,CAAC;MAC9C,CAAC,MAAM;QACLE,OAAO,CAACvC,IAAI,CAAC,gBAAgBoC,OAAO,EAAE,CAAC;MACzC;IACF;EACF,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMI,WAAW,GAAG,IAAAC,cAAO,EAAC,MAAM,IAAAC,8BAAc,EAAChC,gBAAgB,CAAC,EAAE,CAACA,gBAAgB,CAAC,CAAC;EAEvF,MAAM;IAAEiC,OAAO;IAAEC,OAAO,EAAEC;EAAe,CAAC,GAAG,IAAAC,sBAAU,EAAC;IAAElC,OAAO;IAAEsB;EAAO,CAAC,CAAC;EAE5E,MAAM;IACJa,eAAe;IACfC,QAAQ,EAAEC,uBAAuB;IACjCC,YAAY,EAAEC,mBAAmB;IACjCC,kBAAkB,EAAEC,yBAAyB;IAC7CC,WAAW;IACXC;EACF,CAAC,GAAG,IAAAC,4CAAqB,EAAC;IACxBb,OAAO;IACPc,WAAW,EAAEjB,WAAW,CAACkB,QAAQ;IACjC9C,OAAO;IACPsB;EACF,CAAC,CAAC;EAEF,MAAMyB,WAAW,GAAG,IAAAC,0BAAc,EAAC,CAAC;EAEpC,MAAM;IACJC,QAAQ;IACRC,eAAe;IACfC,kBAAkB;IAClBC,cAAc;IACdC,aAAa;IACbC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC;EACF,CAAC,GAAG,IAAAC,0CAAoB,EAAC;IACvB/D,WAAW;IACXoC,OAAO;IACPjC,gBAAgB;IAChBW,YAAY;IACZE,WAAW;IACXgC,uBAAuB;IACvB5C,iBAAiB;IACjBC,OAAO;IACP2D,YAAY,EAAGnC,OAAO,IAAKJ,YAAY,CAAC;MAAEnC,KAAK,EAAEuC;IAAQ,CAAC,CAAC;IAC3DF,MAAM;IACNL,aAAa;IACb8B;EACF,CAAC,CAAC;EAEF,MAAM;IAAEa,IAAI,EAAEC;EAAS,CAAC,GAAG,IAAAC,oBAAQ,EAAC;IAClCC,QAAQ,EAAEC,oBAAS,CAACC,QAAQ,CAAC9D,OAAO,CAAC,CAAC;IACtC+D,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB/E,mBAAS,CAACgF,KAAK,CAAC,uBAAuB,EAAE;QACvC9E,SAAS,EAAE,YAAY;QACvB+E,SAAS,EAAElB,eAAe,IAAIxB;MAChC,CAAC,CAAC;MACF,IAAI,CAACwB,eAAe,EAAE;QACpB,MAAM,IAAI1D,KAAK,CAAC,mBAAmB,CAAC;MACtC;MACA,MAAMoE,IAAI,GAAG,MAAMjE,WAAW,CAAC0E,gBAAgB,CAACnB,eAAe,CAAC;MAChE/D,mBAAS,CAACgF,KAAK,CAAC,sBAAsB,EAAE;QACtC9E,SAAS,EAAE,YAAY;QACvBiF,QAAQ,EAAEV,IAAI,CAACU;MACjB,CAAC,CAAC;MACF,OAAOV,IAAI;IACb,CAAC;IACDW,OAAO,EAAElE,eAAe,IAAI,CAAC,CAAC6C,eAAe,IAAIlC,UAAU;IAC3DwD,SAAS,EAAE,KAAK;IAAE;IAClBC,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IACvBC,KAAK,EAAE,KAAK;IACZC,cAAc,EAAE,QAAQ;IACxBC,oBAAoB,EAAE;EACxB,CAAC,CAAC;EACF,MAAMC,IAAI,GAAGhB,QAAQ,IAAI,IAAI;;EAE7B;EACA,MAAMiB,qBAAqB,GAAG,IAAAC,uBAAW,EAAC;IACxCC,UAAU,EAAE,MAAOC,OAAsB,IAAK;MAC5C9F,mBAAS,CAACgF,KAAK,CAAC,kBAAkB,EAAE;QAAE9E,SAAS,EAAE,YAAY;QAAE4F;MAAQ,CAAC,CAAC;MACzE,OAAO,MAAMtF,WAAW,CAACuF,aAAa,CAACD,OAAO,CAAC;IACjD,CAAC;IACDE,SAAS,EAAE,MAAAA,CAAOvB,IAAI,EAAEqB,OAAO,KAAK;MAClC9F,mBAAS,CAACgF,KAAK,CAAC,2BAA2B,EAAE;QAC3C9E,SAAS,EAAE,YAAY;QACvBiF,QAAQ,EAAEV,IAAI,CAACU,QAAQ;QACvBc,aAAa,EAAEC,MAAM,CAACC,IAAI,CAACL,OAAO;MACpC,CAAC,CAAC;;MAEF;MACAlC,WAAW,CAACwC,YAAY,CAACvB,oBAAS,CAACC,QAAQ,CAAC9D,OAAO,CAAC,CAAC,EAAEyD,IAAI,CAAC;MAC5D,IAAIV,eAAe,EAAE;QACnBH,WAAW,CAACwC,YAAY,CAACvB,oBAAS,CAACwB,KAAK,CAACC,OAAO,CAACvC,eAAe,CAAC,EAAEU,IAAI,CAAC;MAC1E;;MAEA;MACA,IAAIV,eAAe,IAAIvD,WAAW,EAAE;QAClC,IAAA+F,kCAAqB,EAACxC,eAAe,EAAEU,IAAI,EAAEjE,WAAW,CAAC;MAC3D;;MAEA;MACA,IAAAgG,mCAAwB,EAAC5C,WAAW,CAAC;MAErC5D,mBAAS,CAACgF,KAAK,CAAC,yBAAyB,EAAE;QAAE9E,SAAS,EAAE;MAAa,CAAC,CAAC;IACzE,CAAC;IACDW,OAAO,EAAGf,KAAK,IAAK;MAClBE,mBAAS,CAACF,KAAK,CAAC,uBAAuB,EAAEA,KAAK,EAAE;QAAEI,SAAS,EAAE;MAAa,CAAC,CAAC;MAC5EuG,aAAK,CAAC3G,KAAK,CAACA,KAAK,YAAYO,KAAK,GAAGP,KAAK,CAACuC,OAAO,GAAG,0BAA0B,CAAC;IAClF;EACF,CAAC,CAAC;EAEF,MAAM0D,aAAa,GAAG,IAAA3D,kBAAW,EAC/B,MAAO0D,OAAsB,IAAoB;IAC/C,OAAO,MAAMH,qBAAqB,CAACe,WAAW,CAACZ,OAAO,CAAC;EACzD,CAAC,EACD,CAACH,qBAAqB,CACxB,CAAC;EAED,MAAM;IACJgB,cAAc;IACd/E,MAAM;IACNgF;EACF,CAAC,GAAG,IAAAC,oCAAiB,EAAC;IACpBrG,WAAW;IACXoC,OAAO;IACPkB,QAAQ;IACRC,eAAe;IACfC,kBAAkB;IAClBC,cAAc;IACdI,mBAAmB;IACnBD,iBAAiB;IACjBF,aAAa;IACbV,uBAAuB;IACvB5C,iBAAiB;IACjBC,OAAO;IACPS,YAAY;IACZC,YAAY;IACZC,WAAW;IACXS,YAAY;IACZE;EACF,CAAC,CAAC;EAEF,MAAM2E,mBAAmB,GAAG,IAAA1E,kBAAW,EAAC,YAA2B;IACjEwB,WAAW,CAACmD,KAAK,CAAC,CAAC;IAEnB,IAAInE,OAAO,EAAE;MACX,IAAI;QACF,MAAM,IAAAoE,4BAAe,EAACpE,OAAO,CAAC;MAChC,CAAC,CAAC,OAAO9C,KAAK,EAAE;QACdqC,MAAM,CAAC,uCAAuC,EAAErC,KAAK,CAAC;MACxD;IACF;IAEA,MAAMsE,iBAAiB,CAAC,CAAC;IAEzB6C,6BAAe,CAACC,QAAQ,CAAC,CAAC,CAACC,KAAK,CAAC,CAAC;IAElC3G,WAAW,CAAC4G,UAAU,CAAC,CAAC;EAC1B,CAAC,EAAE,CAACxD,WAAW,EAAEhB,OAAO,EAAEwB,iBAAiB,EAAEjC,MAAM,EAAE3B,WAAW,CAAC,CAAC;EAElE,IAAA6G,gBAAS,EAAC,MAAM;IACd,IAAI,CAACzE,OAAO,EAAE;IAEd,IAAI0E,UAAU,GAAG,KAAK;IACtB,IAAIC,YAAmC,GAAG,IAAI;IAE9C,MAAMC,iBAAiB,GAAGA,CAAA,KAAM;MAC9B,IAAID,YAAY,EAAE;QAChBE,YAAY,CAACF,YAAY,CAAC;MAC5B;MACAA,YAAY,GAAGG,UAAU,CAAC,MAAM;QAC9BC,kBAAkB,CAAC,CAAC;MACtB,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IACb,CAAC;IAED,MAAMA,kBAAkB,GAAG,MAAAA,CAAA,KAAY;MACrC,IAAI;QACF;QACA,MAAMnH,WAAW,CAACoH,WAAW,CAAC,CAAC;;QAE/B;QACA,IAAIN,UAAU,EAAE;UACdnF,MAAM,CAAC,4CAA4C,CAAC;UACpDd,SAAS,CAAC,IAAI,CAAC;UACf;UACA;UACAiG,UAAU,GAAG,KAAK;QACpB,CAAC,MAAM;UACL;UACAjG,SAAS,CAAC,IAAI,CAAC;QACjB;MACF,CAAC,CAAC,OAAOvB,KAAK,EAAE;QACd;QACA,IAAI,CAACwH,UAAU,EAAE;UACf,IAAIvH,OAAO,EAAE;YACXoC,MAAM,CAAC,qDAAqD,CAAC;UAC/D;UACAd,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QACpB;QACAiG,UAAU,GAAG,IAAI;MACnB,CAAC,SAAS;QACRE,iBAAiB,CAAC,CAAC;MACrB;IACF,CAAC;;IAED;IACAG,kBAAkB,CAAC,CAAC;IAEpB,OAAO,MAAM;MACX,IAAIJ,YAAY,EAAE;QAChBE,YAAY,CAACF,YAAY,CAAC;MAC5B;IACF,CAAC;EACH,CAAC,EAAE,CAAC/G,WAAW,EAAEoC,OAAO,EAAET,MAAM,EAAEd,SAAS,CAAC,CAAC;EAE7C,MAAM;IAAEwG,iBAAiB;IAAEC,uBAAuB;IAAEC;EAAiB,CAAC,GAAG,IAAAC,wCAAmB,EAAC;IAC3FxH,WAAW;IACXuD,eAAe;IACflD,OAAO;IACPuD,iBAAiB;IACjBjC;EACF,CAAC,CAAC;EAEF,MAAM8F,aAAa,GAAGrI,iBAAiB,CAAC,CAAC;EAEzC,MAAMsI,0BAA0B,GAAG,IAAA9F,kBAAW,EAAC,YAA2B;IACxE,IAAI,CAACQ,OAAO,EAAE;MACZ;IACF;IAEAd,aAAa,CAAC,KAAK,CAAC;IAEpB,IAAI;MACF,MAAMqG,oBAAoB,GAAG,MAAMvF,OAAO,CAACwF,OAAO,CAAC3F,WAAW,CAAC4F,UAAU,CAAC;MAC1E,MAAMC,gBAA0B,GAAGH,oBAAoB,GAAGI,IAAI,CAACC,KAAK,CAACL,oBAAoB,CAAC,GAAG,EAAE;MAC/F,MAAMM,qBAAqB,GAAG,MAAM7F,OAAO,CAACwF,OAAO,CAAC3F,WAAW,CAACsB,eAAe,CAAC;MAEhF,MAAM2E,aAA8B,GAAG,EAAE;MAEzC,IAAIJ,gBAAgB,CAACK,MAAM,GAAG,CAAC,EAAE;QAC/B,KAAK,MAAM1D,SAAS,IAAIqD,gBAAgB,EAAE;UACxC,IAAI;YACF,MAAMM,UAAU,GAAG,MAAMpI,WAAW,CAACqI,eAAe,CAAC5D,SAAS,EAAE;cAAE6D,mBAAmB,EAAE;YAAK,CAAC,CAAC;YAC9F,IAAIF,UAAU,EAAEG,KAAK,IAAIH,UAAU,CAAClD,IAAI,EAAE;cACxC,MAAMsD,GAAG,GAAG,IAAIC,IAAI,CAAC,CAAC;cACtBP,aAAa,CAACQ,IAAI,CAAC;gBACjBjE,SAAS;gBACTkE,QAAQ,EAAE,EAAE;gBACZC,SAAS,EAAE,IAAIH,IAAI,CAACD,GAAG,CAACK,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAACC,WAAW,CAAC,CAAC;gBAC1EC,UAAU,EAAEP,GAAG,CAACM,WAAW,CAAC,CAAC;gBAC7BE,MAAM,EAAEZ,UAAU,CAAClD,IAAI,CAAC+D,EAAE,EAAEC,QAAQ,CAAC,CAAC,IAAI,EAAE;gBAC5CC,SAAS,EAAE1E,SAAS,KAAKwD;cAC3B,CAAC,CAAC;YACJ;UACF,CAAC,CAAC,OAAOmB,eAAe,EAAE;YACxB;YACA;YACA,IAAI,CAAC,IAAAC,oCAAqB,EAACD,eAAe,CAAC,IAAI,CAAC,IAAAE,sCAAuB,EAACF,eAAe,CAAC,EAAE;cACxFzH,MAAM,CAAC,uCAAuC,EAAEyH,eAAe,CAAC;YAClE,CAAC,MAAM,IAAI7J,OAAO,IAAI,IAAA+J,sCAAuB,EAACF,eAAe,CAAC,EAAE;cAC9D;cACA5J,mBAAS,CAACgF,KAAK,CAAC,oDAAoD,EAAE;gBAAE9E,SAAS,EAAE,YAAY;gBAAEC,MAAM,EAAE;cAA6B,CAAC,EAAEyJ,eAA0B,CAAC;YACtK;UACF;QACF;QAEA,IAAIlB,aAAa,CAACC,MAAM,GAAG,CAAC,EAAE;UAC5B1E,cAAc,CAACyE,aAAa,EAAE;YAAEqB,KAAK,EAAE;UAAM,CAAC,CAAC;QACjD;MACF;MAEA,IAAItB,qBAAqB,EAAE;QACzB,IAAI;UACF,MAAMvE,aAAa,CAACuE,qBAAqB,CAAC;QAC5C,CAAC,CAAC,OAAOuB,WAAW,EAAE;UACpB;UACA,IAAI,IAAAH,oCAAqB,EAACG,WAAW,CAAC,EAAE;YACtC,MAAMpH,OAAO,CAACqH,UAAU,CAACxH,WAAW,CAACsB,eAAe,CAAC;YACrDE,cAAc,CACZyE,aAAa,CAACwB,MAAM,CAAEC,OAAO,IAAKA,OAAO,CAAClF,SAAS,KAAKwD,qBAAqB,CAAC,EAC9E;cAAEsB,KAAK,EAAE;YAAM,CACjB,CAAC;YACD;UACF,CAAC,MAAM,IAAI,IAAAD,sCAAuB,EAACE,WAAW,CAAC,EAAE;YAC/C;YACA,IAAIjK,OAAO,EAAE;cACXC,mBAAS,CAACgF,KAAK,CAAC,2DAA2D,EAAE;gBAAE9E,SAAS,EAAE,YAAY;gBAAEC,MAAM,EAAE;cAA6B,CAAC,EAAE6J,WAAsB,CAAC;YACzK;UACF,CAAC,MAAM;YACL;YACA7H,MAAM,CAAC,iCAAiC,EAAE6H,WAAW,CAAC;UACxD;QACF;MACF;IACF,CAAC,CAAC,OAAOlK,KAAK,EAAE;MACd,IAAIC,OAAO,EAAE;QACXC,mBAAS,CAACF,KAAK,CAAC,iBAAiB,EAAEA,KAAK,EAAE;UAAEI,SAAS,EAAE,YAAY;UAAEC,MAAM,EAAE;QAA6B,CAAC,CAAC;MAC9G;MACA,MAAMiE,iBAAiB,CAAC,CAAC;IAC3B,CAAC,SAAS;MACRtC,aAAa,CAAC,IAAI,CAAC;IACrB;EACF,CAAC,EAAE,CACDsC,iBAAiB,EACjBjC,MAAM,EACN3B,WAAW,EACXoC,OAAO,EACPH,WAAW,CAACsB,eAAe,EAC3BtB,WAAW,CAAC4F,UAAU,EACtBnE,aAAa,EACbD,cAAc,CACf,CAAC;EAEF,IAAAoD,gBAAS,EAAC,MAAM;IACd,IAAI,CAACzE,OAAO,IAAIZ,cAAc,CAAChB,OAAO,EAAE;MACtC;IACF;IAEAgB,cAAc,CAAChB,OAAO,GAAG,IAAI;IAC7B,KAAKkH,0BAA0B,CAAC,CAAC;EACnC,CAAC,EAAE,CAACA,0BAA0B,EAAEtF,OAAO,CAAC,CAAC;EAEzC,MAAMwH,aAAa,GAAGrG,eAAe,GACjCD,QAAQ,CAACuG,IAAI,CAAEF,OAAO,IAAKA,OAAO,CAAClF,SAAS,KAAKlB,eAAe,CAAC,GACjExB,SAAS;EACb,MAAM+H,eAAe,GAAGF,aAAa,EAAEjB,QAAQ,IAAI,IAAI;;EAEvD;EACA,MAAMK,MAAM,GAAGhJ,WAAW,CAAC+J,gBAAgB,CAAC,CAAC;EAE7C,MAAMC,uBAAuB,GAAG,IAAApI,kBAAW,EACzC,MAAM+B,eAAe,CAACqF,MAAM,IAAIjH,SAAS,CAAC,EAC1C,CAAC4B,eAAe,EAAEqF,MAAM,CAC1B,CAAC;EAED,MAAMiB,oBAAoB,GAAG,IAAArI,kBAAW,EACrC6C,SAAiB,IAAK;IACrBX,mBAAmB,CAACW,SAAS,CAAC;EAChC,CAAC,EACD,CAACX,mBAAmB,CACtB,CAAC;EAED,MAAMoG,mBAAmB,GAAG,IAAAtI,kBAAW,EAAC,MAAM;IAC5CqE,aAAK,CAACkE,IAAI,CAAC,oCAAoC,CAAC;IAChD/I,MAAM,CAAC,CAAC,CAACgJ,KAAK,CAAEC,WAAW,IAAK1I,MAAM,CAAC,mCAAmC,EAAE0I,WAAW,CAAC,CAAC;EAC3F,CAAC,EAAE,CAAC1I,MAAM,EAAEP,MAAM,CAAC,CAAC;EAEpB,IAAAkJ,kCAAgB,EAAC;IACftB,MAAM;IACNzF,eAAe;IACfuG,eAAe;IACfnG,eAAe,EAAEqG,uBAAuB;IACxC5I,MAAM;IACNwC,iBAAiB;IACjB1D,OAAO,EAAEF,WAAW,CAACuK,UAAU,CAAC,CAAC;IACjCC,cAAc,EAAEA,CAAA,KAAMxK,WAAW,CAACwK,cAAc,CAAC,CAAC;IAClDC,eAAe,EAAEP,mBAAmB;IACpCQ,gBAAgB,EAAET;EACpB,CAAC,CAAC;EAEF,MAAMU,uBAAuB,GAAG,IAAA/I,kBAAW,EACzC,MAAO6C,SAAiB,IAAoB;IAC1C,MAAMf,aAAa,CAACe,SAAS,CAAC;EAChC,CAAC,EACD,CAACf,aAAa,CAChB,CAAC;;EAED;EACA,MAAMkH,yBAAyB,GAAG,IAAAhJ,kBAAW,EAC1CiJ,cAAkF,IAAK;IACtF,IAAAC,mCAAqB,EAACD,cAAc,CAAC;EACvC,CAAC,EACD,EACF,CAAC;EACD,MAAM;IAAEE;EAAiB,CAAC,GAAG,IAAAC,gCAAe,EAAC;IAC3ChL,WAAW;IACXwC,eAAe;IACfe,eAAe;IACfuG,eAAe;IACf1G,WAAW;IACX6H,eAAe,EAAEL;EACnB,CAAC,CAAC;EAEF,MAAMM,YAA6B,GAAG,IAAAhJ,cAAO,EAAC,OAAO;IACnDgD,IAAI;IACJ5B,QAAQ;IACRC,eAAe;IACfuG,eAAe;IACfpJ,eAAe;IACfE,SAAS;IACTuK,YAAY,EAAE9J,UAAU;IACxBiB,cAAc;IACdhD,KAAK;IACLkD,eAAe;IACfE,uBAAuB;IACvBE,mBAAmB;IACnBE,yBAAyB;IACzBqD,cAAc;IACd/E,MAAM;IACNgF,SAAS;IACT1C,aAAa,EAAEiH,uBAAuB;IACtCS,aAAa,EAAEhK,MAAM;IACrBuC,eAAe,EAAEqG,uBAAuB;IACxCjH,WAAW;IACXsE,iBAAiB;IACjBC,uBAAuB;IACvBC,gBAAgB;IAChB3D,iBAAiB;IACjB0C,mBAAmB;IACnBtG,WAAW;IACXX,SAAS,EAAEoI,aAAa;IACxBwD,eAAe,EAAEL,yBAAyB;IAC1CG,gBAAgB;IAChBxF;EACF,CAAC,CAAC,EAAE,CACFhC,eAAe,EACfuG,eAAe,EACf3D,cAAc,EACd3D,eAAe,EACfE,uBAAuB,EACvBE,mBAAmB,EACnBE,yBAAyB,EACzBxD,KAAK,EACL+H,iBAAiB,EACjB3G,eAAe,EACfE,SAAS,EACTQ,MAAM,EACNgF,SAAS,EACTkB,uBAAuB,EACvBtH,WAAW,EACXgK,uBAAuB,EACvB1G,QAAQ,EACRP,WAAW,EACX4H,uBAAuB,EACvBtJ,UAAU,EACViB,cAAc,EACdiF,gBAAgB,EAChBjB,mBAAmB,EACnBmB,aAAa,EACbvC,IAAI,EACJ0F,yBAAyB,EACzBG,gBAAgB,EAChBxF,aAAa,CACd,CAAC;EAEF,oBACE,IAAArG,WAAA,CAAAmM,GAAA,EAACpM,eAAA,CAAAqM,UAAU,CAACC,QAAQ;IAACC,KAAK,EAAEN,YAAa;IAAAnL,QAAA,EACtCA;EAAQ,CACU,CAAC;AAE1B,CAAC;AAAC0L,OAAA,CAAA3L,WAAA,GAAAA,WAAA;AAEK,MAAM4L,kBAAkB,GAAAD,OAAA,CAAAC,kBAAA,GAAG5L,WAAW;AAAC,IAAA6L,QAAA,GAAAF,OAAA,CAAAG,OAAA,GAE/BN,0BAAU","ignoreList":[]}
|
|
@@ -9,6 +9,7 @@ var _queryKeys = require("../queries/queryKeys");
|
|
|
9
9
|
var _OxyContext = require("../../context/OxyContext");
|
|
10
10
|
var _sonner = require("../../../lib/sonner");
|
|
11
11
|
var _avatarUtils = require("../../utils/avatarUtils");
|
|
12
|
+
var _loggerUtils = require("../../../utils/loggerUtils");
|
|
12
13
|
const getDeviceIdForSession = (sessions = [], sessionId) => sessionId ? sessions.find(s => s.sessionId === sessionId)?.deviceId : undefined;
|
|
13
14
|
|
|
14
15
|
/**
|
|
@@ -87,12 +88,13 @@ const useUpdateProfile = () => {
|
|
|
87
88
|
}
|
|
88
89
|
_sonner.toast.error(error instanceof Error ? error.message : 'Failed to update profile');
|
|
89
90
|
},
|
|
90
|
-
// On success,
|
|
91
|
+
// On success, update cache and sync to store
|
|
91
92
|
onSuccess: async (data, updates) => {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
93
|
+
_loggerUtils.logger.debug('Profile update successful', {
|
|
94
|
+
component: 'useUpdateProfile',
|
|
95
|
+
username: data.username,
|
|
96
|
+
updatedFields: Object.keys(updates)
|
|
97
|
+
});
|
|
96
98
|
|
|
97
99
|
// Update cache with server response
|
|
98
100
|
queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), data);
|
|
@@ -100,26 +102,16 @@ const useUpdateProfile = () => {
|
|
|
100
102
|
queryClient.setQueryData(_queryKeys.queryKeys.users.profile(activeSessionId), data);
|
|
101
103
|
}
|
|
102
104
|
|
|
103
|
-
// Refresh accountStore with all updated profile data (
|
|
105
|
+
// Refresh accountStore with all updated profile data (synchronizes immediately)
|
|
104
106
|
if (activeSessionId && oxyServices) {
|
|
105
107
|
(0, _avatarUtils.refreshAccountInStore)(activeSessionId, data, oxyServices);
|
|
106
108
|
}
|
|
107
109
|
|
|
108
|
-
//
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
await queryClient.refetchQueries({
|
|
113
|
-
queryKey: _queryKeys.queryKeys.accounts.current(),
|
|
114
|
-
type: 'active',
|
|
115
|
-
exact: false // Also refetch derived queries
|
|
110
|
+
// Only invalidate specific queries that need refresh (not everything)
|
|
111
|
+
(0, _queryKeys.invalidateAccountQueries)(queryClient);
|
|
112
|
+
_loggerUtils.logger.debug('Profile update complete', {
|
|
113
|
+
component: 'useUpdateProfile'
|
|
116
114
|
});
|
|
117
|
-
if (__DEV__) {
|
|
118
|
-
console.log('[useUpdateProfile] Profile update complete - cache invalidated and refetched');
|
|
119
|
-
// Log current cache state
|
|
120
|
-
const currentUser = queryClient.getQueryData(_queryKeys.queryKeys.accounts.current());
|
|
121
|
-
console.log('[useUpdateProfile] Current cached user:', currentUser);
|
|
122
|
-
}
|
|
123
115
|
}
|
|
124
116
|
});
|
|
125
117
|
};
|
|
@@ -201,9 +193,11 @@ const useUploadAvatar = () => {
|
|
|
201
193
|
_sonner.toast.error(error instanceof Error ? error.message : 'Failed to upload avatar');
|
|
202
194
|
},
|
|
203
195
|
onSuccess: async data => {
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
196
|
+
_loggerUtils.logger.debug('Avatar upload successful', {
|
|
197
|
+
component: 'useUploadAvatar',
|
|
198
|
+
method: 'onSuccess',
|
|
199
|
+
data
|
|
200
|
+
});
|
|
207
201
|
queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), data);
|
|
208
202
|
if (activeSessionId) {
|
|
209
203
|
queryClient.setQueryData(_queryKeys.queryKeys.users.profile(activeSessionId), data);
|
|
@@ -223,9 +217,10 @@ const useUploadAvatar = () => {
|
|
|
223
217
|
queryKey: _queryKeys.queryKeys.accounts.current()
|
|
224
218
|
});
|
|
225
219
|
_sonner.toast.success('Avatar updated successfully');
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
220
|
+
_loggerUtils.logger.debug('Avatar update complete - cache invalidated and refetched', {
|
|
221
|
+
component: 'useUploadAvatar',
|
|
222
|
+
method: 'onSuccess'
|
|
223
|
+
});
|
|
229
224
|
}
|
|
230
225
|
});
|
|
231
226
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactQuery","require","_queryKeys","_OxyContext","_sonner","_avatarUtils","getDeviceIdForSession","sessions","sessionId","find","s","deviceId","undefined","useUpdateProfile","oxyServices","activeSessionId","user","useOxy","queryClient","useQueryClient","useMutation","mutationFn","updates","hasValidToken","getTokenBySession","tokenError","updateProfile","error","errorMessage","message","status","response","includes","onMutate","cancelQueries","queryKey","queryKeys","accounts","current","previousUser","getQueryData","setQueryData","users","profile","onError","context","toast","Error","onSuccess","data","__DEV__","console","log","Object","keys","refreshAccountInStore","Promise","all","invalidateUserQueries","invalidateAccountQueries","refetchQueries","type","exact","currentUser","exports","useUploadAvatar","file","uploadResult","assetUpload","fileId","id","avatar","optimisticUser","uri","success","useUpdateAccountSettings","settings","privacySettings","onSettled","invalidateQueries","useUpdatePrivacySettings","userId","targetUserId","getCurrentUserId","updatePrivacySettings","privacy","previousPrivacySettings","updatedUser","useUploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_reactQuery","require","_queryKeys","_OxyContext","_sonner","_avatarUtils","_loggerUtils","getDeviceIdForSession","sessions","sessionId","find","s","deviceId","undefined","useUpdateProfile","oxyServices","activeSessionId","user","useOxy","queryClient","useQueryClient","useMutation","mutationFn","updates","hasValidToken","getTokenBySession","tokenError","updateProfile","error","errorMessage","message","status","response","includes","onMutate","cancelQueries","queryKey","queryKeys","accounts","current","previousUser","getQueryData","setQueryData","users","profile","onError","context","toast","Error","onSuccess","data","logger","debug","component","username","updatedFields","Object","keys","refreshAccountInStore","invalidateAccountQueries","exports","useUploadAvatar","file","uploadResult","assetUpload","fileId","id","avatar","optimisticUser","uri","method","invalidateUserQueries","refetchQueries","success","useUpdateAccountSettings","settings","privacySettings","onSettled","invalidateQueries","useUpdatePrivacySettings","userId","targetUserId","getCurrentUserId","updatePrivacySettings","privacy","previousPrivacySettings","currentUser","updatedUser","useUploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -7,6 +7,7 @@ exports.useUsersBySessions = exports.useUserProfiles = exports.useUserProfile =
|
|
|
7
7
|
var _reactQuery = require("@tanstack/react-query");
|
|
8
8
|
var _queryKeys = require("./queryKeys");
|
|
9
9
|
var _OxyContextBase = require("../../context/OxyContextBase");
|
|
10
|
+
var _loggerUtils = require("../../../utils/loggerUtils");
|
|
10
11
|
/**
|
|
11
12
|
* Get user profile by session ID
|
|
12
13
|
*/
|
|
@@ -23,9 +24,9 @@ const useUserProfile = (sessionId, options) => {
|
|
|
23
24
|
return await oxyServices.getUserBySession(sessionId);
|
|
24
25
|
},
|
|
25
26
|
enabled: options?.enabled !== false && !!sessionId,
|
|
26
|
-
staleTime:
|
|
27
|
-
//
|
|
28
|
-
gcTime:
|
|
27
|
+
staleTime: 30000,
|
|
28
|
+
// 30 seconds - reasonable freshness without constant refetching
|
|
29
|
+
gcTime: 5 * 60 * 1000 // 5 minutes - keep in cache for quick access
|
|
29
30
|
});
|
|
30
31
|
};
|
|
31
32
|
|
|
@@ -45,9 +46,9 @@ const useUserProfiles = (sessionIds, options) => {
|
|
|
45
46
|
return results[0]?.user || null;
|
|
46
47
|
},
|
|
47
48
|
enabled: options?.enabled !== false && !!sessionId,
|
|
48
|
-
staleTime:
|
|
49
|
-
//
|
|
50
|
-
gcTime:
|
|
49
|
+
staleTime: 30000,
|
|
50
|
+
// 30 seconds
|
|
51
|
+
gcTime: 5 * 60 * 1000 // 5 minutes
|
|
51
52
|
}))
|
|
52
53
|
});
|
|
53
54
|
};
|
|
@@ -65,23 +66,25 @@ const useCurrentUser = options => {
|
|
|
65
66
|
return (0, _reactQuery.useQuery)({
|
|
66
67
|
queryKey: _queryKeys.queryKeys.accounts.current(),
|
|
67
68
|
queryFn: async () => {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
69
|
+
_loggerUtils.logger.debug('Fetching current user', {
|
|
70
|
+
component: 'useCurrentUser',
|
|
71
|
+
sessionId: activeSessionId ?? undefined
|
|
72
|
+
});
|
|
71
73
|
if (!activeSessionId) {
|
|
72
74
|
throw new Error('No active session');
|
|
73
75
|
}
|
|
74
76
|
const userData = await oxyServices.getUserBySession(activeSessionId);
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
77
|
+
_loggerUtils.logger.debug('Current user fetched', {
|
|
78
|
+
component: 'useCurrentUser',
|
|
79
|
+
username: userData.username
|
|
80
|
+
});
|
|
78
81
|
return userData;
|
|
79
82
|
},
|
|
80
83
|
enabled: options?.enabled !== false && isAuthenticated && !!activeSessionId,
|
|
81
|
-
staleTime:
|
|
82
|
-
//
|
|
83
|
-
gcTime:
|
|
84
|
-
//
|
|
84
|
+
staleTime: 30000,
|
|
85
|
+
// 30 seconds - balances freshness with performance
|
|
86
|
+
gcTime: 5 * 60 * 1000,
|
|
87
|
+
// 5 minutes
|
|
85
88
|
refetchOnMount: 'always',
|
|
86
89
|
// Always refetch on mount
|
|
87
90
|
refetchOnWindowFocus: false
|
|
@@ -105,9 +108,9 @@ const useUserById = (userId, options) => {
|
|
|
105
108
|
return await oxyServices.getUserById(userId);
|
|
106
109
|
},
|
|
107
110
|
enabled: options?.enabled !== false && !!userId,
|
|
108
|
-
staleTime:
|
|
109
|
-
//
|
|
110
|
-
gcTime:
|
|
111
|
+
staleTime: 60000,
|
|
112
|
+
// 1 minute - other users' profiles change less frequently
|
|
113
|
+
gcTime: 10 * 60 * 1000 // 10 minutes
|
|
111
114
|
});
|
|
112
115
|
};
|
|
113
116
|
|
|
@@ -128,9 +131,9 @@ const useUserByUsername = (username, options) => {
|
|
|
128
131
|
return await oxyServices.getProfileByUsername(username);
|
|
129
132
|
},
|
|
130
133
|
enabled: options?.enabled !== false && !!username,
|
|
131
|
-
staleTime:
|
|
132
|
-
//
|
|
133
|
-
gcTime:
|
|
134
|
+
staleTime: 60000,
|
|
135
|
+
// 1 minute
|
|
136
|
+
gcTime: 10 * 60 * 1000 // 10 minutes
|
|
134
137
|
});
|
|
135
138
|
};
|
|
136
139
|
|
|
@@ -151,9 +154,9 @@ const useUsersBySessions = (sessionIds, options) => {
|
|
|
151
154
|
return await oxyServices.getUsersBySessions(sessionIds);
|
|
152
155
|
},
|
|
153
156
|
enabled: options?.enabled !== false && sessionIds.length > 0,
|
|
154
|
-
staleTime:
|
|
155
|
-
//
|
|
156
|
-
gcTime:
|
|
157
|
+
staleTime: 30000,
|
|
158
|
+
// 30 seconds
|
|
159
|
+
gcTime: 5 * 60 * 1000 // 5 minutes
|
|
157
160
|
});
|
|
158
161
|
};
|
|
159
162
|
|
|
@@ -203,9 +206,9 @@ const usePrivacySettings = (userId, options) => {
|
|
|
203
206
|
}
|
|
204
207
|
},
|
|
205
208
|
enabled: options?.enabled !== false && !!targetUserId,
|
|
206
|
-
staleTime:
|
|
207
|
-
//
|
|
208
|
-
gcTime:
|
|
209
|
+
staleTime: 60000,
|
|
210
|
+
// 1 minute - privacy settings don't change frequently
|
|
211
|
+
gcTime: 10 * 60 * 1000 // 10 minutes
|
|
209
212
|
});
|
|
210
213
|
};
|
|
211
214
|
exports.usePrivacySettings = usePrivacySettings;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactQuery","require","_queryKeys","_OxyContextBase","useUserProfile","sessionId","options","oxyServices","useOxy","useQuery","queryKey","queryKeys","users","profile","queryFn","Error","getUserBySession","enabled","staleTime","gcTime","exports","useUserProfiles","sessionIds","useQueries","queries","map","results","getUsersBySessions","user","useCurrentUser","activeSessionId","isAuthenticated","accounts","current","
|
|
1
|
+
{"version":3,"names":["_reactQuery","require","_queryKeys","_OxyContextBase","_loggerUtils","useUserProfile","sessionId","options","oxyServices","useOxy","useQuery","queryKey","queryKeys","users","profile","queryFn","Error","getUserBySession","enabled","staleTime","gcTime","exports","useUserProfiles","sessionIds","useQueries","queries","map","results","getUsersBySessions","user","useCurrentUser","activeSessionId","isAuthenticated","accounts","current","logger","debug","component","undefined","userData","username","refetchOnMount","refetchOnWindowFocus","useUserById","userId","detail","getUserById","useUserByUsername","details","getProfileByUsername","useUsersBySessions","list","length","usePrivacySettings","sessions","targetUserId","getCurrentUserId","deviceId","find","s","privacy","settings","hasValidToken","getTokenBySession","tokenError","getPrivacySettings","error","errorMessage","message","status","response","includes"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAccountQueries.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -180,7 +180,8 @@ const AccountSettingsScreen = ({
|
|
|
180
180
|
// Only reset all fields if it's a new user or first load
|
|
181
181
|
// Skip reset if it's just an avatar update
|
|
182
182
|
if (shouldInitialize && !isAvatarOnlyUpdate) {
|
|
183
|
-
|
|
183
|
+
// Prioritize name.full over name.first for display name
|
|
184
|
+
const userDisplayName = typeof finalUser.name === 'string' ? finalUser.name : finalUser.name?.full || finalUser.name?.first || '';
|
|
184
185
|
const userLastName = typeof finalUser.name === 'object' ? finalUser.name?.last || '' : '';
|
|
185
186
|
setDisplayName(userDisplayName);
|
|
186
187
|
setLastName(userLastName);
|
|
@@ -321,10 +322,13 @@ const AccountSettingsScreen = ({
|
|
|
321
322
|
try {
|
|
322
323
|
switch (field) {
|
|
323
324
|
case 'displayName':
|
|
325
|
+
// Send both first/last AND full name for proper synchronization
|
|
326
|
+
const fullName = [tempDisplayName, tempLastName].filter(Boolean).join(' ').trim() || tempDisplayName;
|
|
324
327
|
await updateProfileMutation.mutateAsync({
|
|
325
328
|
name: {
|
|
326
329
|
first: tempDisplayName,
|
|
327
|
-
last: tempLastName
|
|
330
|
+
last: tempLastName,
|
|
331
|
+
full: fullName
|
|
328
332
|
}
|
|
329
333
|
});
|
|
330
334
|
setDisplayName(tempDisplayName);
|
|
@@ -438,9 +442,11 @@ const AccountSettingsScreen = ({
|
|
|
438
442
|
|
|
439
443
|
// Handle name field
|
|
440
444
|
if (displayName || lastName) {
|
|
445
|
+
const fullName = [displayName, lastName].filter(Boolean).join(' ').trim() || displayName;
|
|
441
446
|
updates.name = {
|
|
442
447
|
first: displayName,
|
|
443
|
-
last: lastName
|
|
448
|
+
last: lastName,
|
|
449
|
+
full: fullName
|
|
444
450
|
};
|
|
445
451
|
}
|
|
446
452
|
|