@oxyhq/services 24.0.1 → 24.0.2

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.
Files changed (26) hide show
  1. package/android/src/main/java/so/oxy/session/OxyBackgroundSessionModule.kt +42 -27
  2. package/lib/commonjs/ui/screens/ProfileScreen.js +15 -4
  3. package/lib/commonjs/ui/screens/ProfileScreen.js.map +1 -1
  4. package/lib/commonjs/ui/session/backgroundSession.js +1 -7
  5. package/lib/commonjs/ui/session/backgroundSession.js.map +1 -1
  6. package/lib/commonjs/ui/utils/userUtils.js +11 -21
  7. package/lib/commonjs/ui/utils/userUtils.js.map +1 -1
  8. package/lib/module/ui/screens/ProfileScreen.js +15 -4
  9. package/lib/module/ui/screens/ProfileScreen.js.map +1 -1
  10. package/lib/module/ui/session/backgroundSession.js +1 -7
  11. package/lib/module/ui/session/backgroundSession.js.map +1 -1
  12. package/lib/module/ui/utils/userUtils.js +12 -22
  13. package/lib/module/ui/utils/userUtils.js.map +1 -1
  14. package/lib/typescript/commonjs/ui/screens/ProfileScreen.d.ts.map +1 -1
  15. package/lib/typescript/commonjs/ui/session/backgroundSession.d.ts.map +1 -1
  16. package/lib/typescript/commonjs/ui/utils/userUtils.d.ts +5 -7
  17. package/lib/typescript/commonjs/ui/utils/userUtils.d.ts.map +1 -1
  18. package/lib/typescript/module/ui/screens/ProfileScreen.d.ts.map +1 -1
  19. package/lib/typescript/module/ui/session/backgroundSession.d.ts.map +1 -1
  20. package/lib/typescript/module/ui/utils/userUtils.d.ts +5 -7
  21. package/lib/typescript/module/ui/utils/userUtils.d.ts.map +1 -1
  22. package/package.json +2 -2
  23. package/src/ui/screens/ProfileScreen.tsx +17 -3
  24. package/src/ui/session/__tests__/backgroundSession.test.ts +12 -7
  25. package/src/ui/session/backgroundSession.ts +29 -15
  26. package/src/ui/utils/userUtils.ts +10 -29
@@ -4,8 +4,6 @@ import android.content.Context
4
4
  import expo.modules.kotlin.exception.Exceptions
5
5
  import expo.modules.kotlin.modules.Module
6
6
  import expo.modules.kotlin.modules.ModuleDefinition
7
- import expo.modules.kotlin.records.Field
8
- import expo.modules.kotlin.records.Record
9
7
 
10
8
  /**
11
9
  * JS side of the background session credential.
@@ -25,35 +23,52 @@ class OxyBackgroundSessionModule : Module() {
25
23
  private val context: Context
26
24
  get() = appContext.reactContext ?: throw Exceptions.ReactContextLost()
27
25
 
28
- /**
29
- * The provisioned credential as it crosses the bridge.
30
- *
31
- * `expiresAt` is epoch MILLIS, already parsed from the server's ISO-8601 string
32
- * on the JS side — JS has a `Date`, so there is no reason to hand native a
33
- * string to re-parse.
34
- */
35
- data class CredentialInput(
36
- @Field val baseUrl: String = "",
37
- @Field val deviceId: String = "",
38
- @Field val secret: String = "",
39
- @Field val accountId: String = "",
40
- @Field val expiresAt: Double = 0.0,
41
- ) : Record
42
-
43
26
  override fun definition() = ModuleDefinition {
44
27
  Name("OxyBackgroundSession")
45
28
 
46
29
  /**
47
30
  * Store (replacing) the credential. Rejects an incomplete or already-expired
48
31
  * one rather than persisting something no mint could ever use.
32
+ *
33
+ * ## Five scalars, not a `Record`, and that is not a style choice
34
+ *
35
+ * This took a `Record` and it did not work on a device: every call was rejected
36
+ * with `The 1st argument cannot be cast to type CredentialInput (received class
37
+ * ReadableNativeMap)`, preceded by `Introspectable data is missing for class
38
+ * CredentialInput. Falling back to reflection-based conversion`. The fallback
39
+ * then failed too, so nothing was ever stored — the provision succeeded, the
40
+ * server issued a credential, and the widget stayed signed out forever with only
41
+ * a warning in the log to show for it.
42
+ *
43
+ * The reason is where this package's Kotlin lives: it ships as SOURCE that each
44
+ * consuming app compiles, so the annotation processing that generates a `Record`'s
45
+ * introspection metadata does not necessarily run in the consumer's build. The
46
+ * sibling module in this same library, `OxyIdentityModule`, has always passed
47
+ * plain scalars (`putShared(privateKey, publicKey)`) and has always worked — so
48
+ * scalars are the proven shape here and `CredentialInput` was the only `Record`
49
+ * in the package, i.e. the one untested path.
50
+ *
51
+ * Do not "tidy" these five parameters back into a `Record` without first proving
52
+ * on a real device that a `Record` converts at all in a consumer build. The
53
+ * failure is silent from JS's side: it surfaces as a widget that never signs in.
54
+ *
55
+ * `expiresAt` is epoch MILLIS as a `Double`, already parsed from the server's
56
+ * ISO-8601 string on the JS side — JS has a `Date`, so there is no reason to hand
57
+ * native a string to re-parse. `Double` because that is what a JS number crosses
58
+ * the bridge as; a `Long` parameter would fail to convert for the same family of
59
+ * reason this comment exists.
49
60
  */
50
- AsyncFunction("put") { credential: CredentialInput ->
51
- val expiresAt = credential.expiresAt.toLong()
61
+ AsyncFunction("put") { baseUrl: String,
62
+ deviceId: String,
63
+ secret: String,
64
+ accountId: String,
65
+ expiresAtMs: Double ->
66
+ val expiresAt = expiresAtMs.toLong()
52
67
  if (
53
- credential.baseUrl.isEmpty() ||
54
- credential.deviceId.isEmpty() ||
55
- credential.secret.isEmpty() ||
56
- credential.accountId.isEmpty() ||
68
+ baseUrl.isEmpty() ||
69
+ deviceId.isEmpty() ||
70
+ secret.isEmpty() ||
71
+ accountId.isEmpty() ||
57
72
  expiresAt <= System.currentTimeMillis()
58
73
  ) {
59
74
  return@AsyncFunction false
@@ -62,10 +77,10 @@ class OxyBackgroundSessionModule : Module() {
62
77
  OxyBackgroundSessionStore.writeCredential(
63
78
  context,
64
79
  OxyBackgroundSessionStore.Credential(
65
- baseUrl = credential.baseUrl,
66
- deviceId = credential.deviceId,
67
- secret = credential.secret,
68
- accountId = credential.accountId,
80
+ baseUrl = baseUrl,
81
+ deviceId = deviceId,
82
+ secret = secret,
83
+ accountId = accountId,
69
84
  expiresAt = expiresAt,
70
85
  ),
71
86
  )
@@ -131,7 +131,12 @@ const ProfileScreen = ({
131
131
  // title (a stable "Profile" fallback before it resolves), so the banner +
132
132
  // overlapping avatar scroll as content UNDER the shared gradient nav bar.
133
133
  // `onImage` tone keeps the title + close legible over the colored banner.
134
- const displayName = profile ? profile.name?.displayName ?? (0, _core.getNormalizedUserHandle)(profile) : username || '';
134
+ // Ends in a string, deliberately: `getNormalizedUserHandle` answers `null` for a
135
+ // user it cannot normalise, and letting that null travel makes this `string | null`
136
+ // — which does not satisfy `Avatar.name` and does not typecheck. Empty is the honest
137
+ // bottom of the chain and every reader below already treats it as falsy
138
+ // (`displayName || t('profile.title')`), so nothing renders a literal "null".
139
+ const displayName = profile ? profile.name?.displayName ?? (0, _core.getNormalizedUserHandle)(profile) ?? '' : username || '';
135
140
  (0, _useSurfaceHeader.useSurfaceHeader)({
136
141
  title: displayName || t('profile.title'),
137
142
  largeTitle: false,
@@ -198,9 +203,15 @@ const ProfileScreen = ({
198
203
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
199
204
  style: styles.avatarWrapper,
200
205
  className: "border-bg bg-bg rounded-radius-max",
201
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_avatar.Avatar, {
202
- source: profile?.avatar ? oxyServices.getFileDownloadUrl(profile.avatar, 'thumb') : undefined,
203
- name: displayName || username,
206
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_avatar.Avatar
207
+ // `getFileDownloadUrl` answers `null` for a reference it cannot
208
+ // resolve, and `Avatar.source` takes `undefined` for "no picture" —
209
+ // the two spellings of absent do not meet, so the coalesce is the
210
+ // whole fix. Without it this file does not typecheck, which blocks
211
+ // `bun run build` and therefore every publish of this package.
212
+ , {
213
+ source: profile?.avatar ? oxyServices.getFileDownloadUrl(profile.avatar, 'thumb') ?? undefined : undefined,
214
+ name: displayName,
204
215
  size: AVATAR_SIZE
205
216
  })
206
217
  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
@@ -1 +1 @@
1
- {"version":3,"names":["_react","require","_reactNative","_reactQuery","_theme","_button","_typography","_settingsList","_avatar","_FollowButton","_interopRequireDefault","_useFollow","_Ionicons","_useI18n","_useSurfaceHeader","_OxyContext","_core","_errorHandlers","_jsxRuntime","e","__esModule","default","AVATAR_SIZE","BANNER_HEIGHT","AVATAR_OVERLAP","INFO_ICON_SIZE","ProfileScreen","userId","username","theme","goBack","navigate","oxyServices","user","currentUser","useOxy","followerCount","followingCount","isLoadingCounts","useFollow","bloomTheme","useTheme","t","useI18n","normalizeId","id","String","trim","currentUserId","targetUserId","isOwnProfile","profileQuery","useQuery","queryKey","enabled","retry","queryFn","profileRes","reputationRes","Promise","all","getUserById","catch","err","logger","error","Error","component","getMyReputationBalance","getReputationBalance","then","balance","total","undefined","getUserStats","postCount","commentCount","resolve","profile","reputationTotal","links","normalizeProfileLinks","linksMetadata","data","isLoading","useMemo","isError","errorWithStatus","errorMessageText","extractErrorMessage","status","includes","displayName","name","getNormalizedUserHandle","useSurfaceHeader","title","largeTitle","tone","jsx","View","className","children","ActivityIndicator","size","color","colors","primary","jsxs","style","styles","errorContent","H2","errorTitle","Text","errorText","errorSubtext","primaryLocation","locations","first","Array","isArray","scrollContainer","bannerContainer","flex","avatarRow","avatarWrapper","Avatar","source","avatar","getFileDownloadUrl","actionButtonWrapper","Button","variant","onPress","onFollowChange","isFollowing","__DEV__","debug","header","subText","bio","SettingsListGroup","createdAt","SettingsListItem","icon","textSecondary","date","Date","toLocaleDateString","showChevron","website","company","jobTitle","education","birthday","length","url","value","count","statsRow","statItem","statAmount","statLabel","text","StyleSheet","create","alignItems","paddingBottom","height","position","overflow","flexDirection","marginTop","justifyContent","zIndex","borderWidth","width","fontSize","marginBottom","letterSpacing","lineHeight","minWidth","textAlign","fontWeight","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/screens/ProfileScreen.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_react","require","_reactNative","_reactQuery","_theme","_button","_typography","_settingsList","_avatar","_FollowButton","_interopRequireDefault","_useFollow","_Ionicons","_useI18n","_useSurfaceHeader","_OxyContext","_core","_errorHandlers","_jsxRuntime","e","__esModule","default","AVATAR_SIZE","BANNER_HEIGHT","AVATAR_OVERLAP","INFO_ICON_SIZE","ProfileScreen","userId","username","theme","goBack","navigate","oxyServices","user","currentUser","useOxy","followerCount","followingCount","isLoadingCounts","useFollow","bloomTheme","useTheme","t","useI18n","normalizeId","id","String","trim","currentUserId","targetUserId","isOwnProfile","profileQuery","useQuery","queryKey","enabled","retry","queryFn","profileRes","reputationRes","Promise","all","getUserById","catch","err","logger","error","Error","component","getMyReputationBalance","getReputationBalance","then","balance","total","undefined","getUserStats","postCount","commentCount","resolve","profile","reputationTotal","links","normalizeProfileLinks","linksMetadata","data","isLoading","useMemo","isError","errorWithStatus","errorMessageText","extractErrorMessage","status","includes","displayName","name","getNormalizedUserHandle","useSurfaceHeader","title","largeTitle","tone","jsx","View","className","children","ActivityIndicator","size","color","colors","primary","jsxs","style","styles","errorContent","H2","errorTitle","Text","errorText","errorSubtext","primaryLocation","locations","first","Array","isArray","scrollContainer","bannerContainer","flex","avatarRow","avatarWrapper","Avatar","source","avatar","getFileDownloadUrl","actionButtonWrapper","Button","variant","onPress","onFollowChange","isFollowing","__DEV__","debug","header","subText","bio","SettingsListGroup","createdAt","SettingsListItem","icon","textSecondary","date","Date","toLocaleDateString","showChevron","website","company","jobTitle","education","birthday","length","url","value","count","statsRow","statItem","statAmount","statLabel","text","StyleSheet","create","alignItems","paddingBottom","height","position","overflow","flexDirection","marginTop","justifyContent","zIndex","borderWidth","width","fontSize","marginBottom","letterSpacing","lineHeight","minWidth","textAlign","fontWeight","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/screens/ProfileScreen.tsx"],"mappings":"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","ignoreList":[]}
@@ -242,13 +242,7 @@ async function syncBackgroundSession(input) {
242
242
  });
243
243
  return;
244
244
  }
245
- const persisted = await native.put({
246
- baseUrl: oxyServices.getBaseURL(),
247
- deviceId: provisioned.deviceId,
248
- secret: provisioned.secret,
249
- accountId: provisioned.accountId,
250
- expiresAt
251
- });
245
+ const persisted = await native.put(oxyServices.getBaseURL(), provisioned.deviceId, provisioned.secret, provisioned.accountId, expiresAt);
252
246
  if (!persisted) {
253
247
  _core.logger.warn('[backgroundSession] the native store did not retain the background credential; background refreshes stay signed out until the next attempt', {
254
248
  component: 'backgroundSession'
@@ -1 +1 @@
1
- {"version":3,"names":["_expoModulesCore","require","_reactNative","_core","RENEW_WHEN_REMAINING_MS","nativeModule","loadNativeModule","undefined","Platform","OS","native","requireOptionalNativeModule","put","clear","peek","bind","isBackgroundSessionSupported","clearBackgroundSession","error","logger","warn","component","assertProvisioningAvailable","oxyServices","provisionBackgroundCredential","message","Error","syncBackgroundSession","input","userId","canUsePrivateApi","isCurrent","stored","accountId","isForCurrentAccount","hasLifeLeft","expiresAt","Date","now","provisioned","parse","Number","isFinite","persisted","baseUrl","getBaseURL","deviceId","secret"],"sourceRoot":"../../../../src","sources":["ui/session/backgroundSession.ts"],"mappings":";;;;;;;;AAmCA,IAAAA,gBAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,KAAA,GAAAF,OAAA;AAtCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA;AACA;;AAiBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMG,uBAAuB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;AAEvD,IAAIC,YAAiE;;AAErE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,gBAAgBA,CAAA,EAA4C;EACnE,IAAID,YAAY,KAAKE,SAAS,EAAE;IAC9B,IAAIC,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;MACzBJ,YAAY,GAAG,IAAI;MACnB,OAAOA,YAAY;IACrB;IACA,MAAMK,MAAM,GAAG,IAAAC,4CAA2B,EACxC,sBACF,CAAC;IACDN,YAAY,GACVK,MAAM,IACN,OAAOA,MAAM,CAACE,GAAG,KAAK,UAAU,IAChC,OAAOF,MAAM,CAACG,KAAK,KAAK,UAAU,IAClC,OAAOH,MAAM,CAACI,IAAI,KAAK,UAAU,GAC7B;MACEF,GAAG,EAAEF,MAAM,CAACE,GAAG,CAACG,IAAI,CAACL,MAAM,CAAC;MAC5BG,KAAK,EAAEH,MAAM,CAACG,KAAK,CAACE,IAAI,CAACL,MAAM,CAAC;MAChCI,IAAI,EAAEJ,MAAM,CAACI,IAAI,CAACC,IAAI,CAACL,MAAM;IAC/B,CAAC,GACD,IAAI;EACZ;EACA,OAAOL,YAAY;AACrB;;AAEA;AACO,SAASW,4BAA4BA,CAAA,EAAY;EACtD,OAAOV,gBAAgB,CAAC,CAAC,KAAK,IAAI;AACpC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeW,sBAAsBA,CAAA,EAAkB;EAC5D,MAAMP,MAAM,GAAGJ,gBAAgB,CAAC,CAAC;EACjC,IAAI,CAACI,MAAM,EAAE;IACX;EACF;EACA,IAAI;IACF,MAAMA,MAAM,CAACG,KAAK,CAAC,CAAC;EACtB,CAAC,CAAC,OAAOK,KAAK,EAAE;IACdC,YAAM,CAACC,IAAI,CAAC,sEAAsE,EAAE;MAClFC,SAAS,EAAE,mBAAmB;MAC9BH;IACF,CAAC,CAAC;EACJ;AACF;AAgBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASI,2BAA2BA,CAACC,WAAwB,EAAQ;EACnE,IAAI,OAAOA,WAAW,CAACC,6BAA6B,KAAK,UAAU,EAAE;IACnE;EACF;EACA,MAAMC,OAAO,GACX,sFAAsF,GACtF,sFAAsF,GACtF,0FAA0F;EAC5FN,YAAM,CAACD,KAAK,CAACO,OAAO,EAAElB,SAAS,EAAE;IAAEc,SAAS,EAAE;EAAoB,CAAC,CAAC;EACpE,MAAM,IAAIK,KAAK,CAACD,OAAO,CAAC;AAC1B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeE,qBAAqBA,CAACC,KAAiC,EAAiB;EAC5F,MAAMlB,MAAM,GAAGJ,gBAAgB,CAAC,CAAC;EACjC,IAAI,CAACI,MAAM,EAAE;IACX;EACF;EACA,MAAM;IAAEa,WAAW;IAAEM,MAAM;IAAEC,gBAAgB;IAAEC;EAAU,CAAC,GAAGH,KAAK;;EAElE;EACA;EACA;EACA,IAAIC,MAAM,EAAE;IACVP,2BAA2B,CAACC,WAAW,CAAC;EAC1C;EAEA,IAAI;IACF,IAAI,CAACM,MAAM,EAAE;MACX;MACA,MAAMnB,MAAM,CAACG,KAAK,CAAC,CAAC;MACpB;IACF;IAEA,MAAMmB,MAAM,GAAG,MAAMtB,MAAM,CAACI,IAAI,CAAC,CAAC;IAClC,IAAIkB,MAAM,IAAIA,MAAM,CAACC,SAAS,KAAKJ,MAAM,EAAE;MACzC;MACA,MAAMnB,MAAM,CAACG,KAAK,CAAC,CAAC;IACtB;IAEA,MAAMqB,mBAAmB,GAAGF,MAAM,EAAEC,SAAS,KAAKJ,MAAM;IACxD,MAAMM,WAAW,GACfD,mBAAmB,IAAIF,MAAM,CAACI,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGlC,uBAAuB;IAChF,IAAI+B,WAAW,EAAE;MACf;IACF;;IAEA;IACA;IACA;IACA,IAAI,CAACL,gBAAgB,IAAI,CAACC,SAAS,CAAC,CAAC,EAAE;MACrC;IACF;IAEA,MAAMQ,WAAW,GAAG,MAAMhB,WAAW,CAACC,6BAA6B,CAAC,CAAC;IACrE,IAAI,CAACe,WAAW,EAAE;MAChB;MACA;MACA;IACF;IACA,IAAI,CAACR,SAAS,CAAC,CAAC,EAAE;MAChB;IACF;IACA,IAAIQ,WAAW,CAACN,SAAS,KAAKJ,MAAM,EAAE;MACpC;MACA;MACA;MACA,MAAMnB,MAAM,CAACG,KAAK,CAAC,CAAC;MACpB;IACF;IAEA,MAAMuB,SAAS,GAAGC,IAAI,CAACG,KAAK,CAACD,WAAW,CAACH,SAAS,CAAC;IACnD,IAAI,CAACK,MAAM,CAACC,QAAQ,CAACN,SAAS,CAAC,EAAE;MAC/BjB,YAAM,CAACC,IAAI,CAAC,sEAAsE,EAAE;QAClFC,SAAS,EAAE;MACb,CAAC,CAAC;MACF;IACF;IAEA,MAAMsB,SAAS,GAAG,MAAMjC,MAAM,CAACE,GAAG,CAAC;MACjCgC,OAAO,EAAErB,WAAW,CAACsB,UAAU,CAAC,CAAC;MACjCC,QAAQ,EAAEP,WAAW,CAACO,QAAQ;MAC9BC,MAAM,EAAER,WAAW,CAACQ,MAAM;MAC1Bd,SAAS,EAAEM,WAAW,CAACN,SAAS;MAChCG;IACF,CAAC,CAAC;IACF,IAAI,CAACO,SAAS,EAAE;MACdxB,YAAM,CAACC,IAAI,CACT,4IAA4I,EAC5I;QAAEC,SAAS,EAAE;MAAoB,CACnC,CAAC;IACH;EACF,CAAC,CAAC,OAAOH,KAAK,EAAE;IACdC,YAAM,CAACC,IAAI,CAAC,qEAAqE,EAAE;MACjFC,SAAS,EAAE,mBAAmB;MAC9BH;IACF,CAAC,CAAC;EACJ;AACF","ignoreList":[]}
1
+ {"version":3,"names":["_expoModulesCore","require","_reactNative","_core","RENEW_WHEN_REMAINING_MS","nativeModule","loadNativeModule","undefined","Platform","OS","native","requireOptionalNativeModule","put","clear","peek","bind","isBackgroundSessionSupported","clearBackgroundSession","error","logger","warn","component","assertProvisioningAvailable","oxyServices","provisionBackgroundCredential","message","Error","syncBackgroundSession","input","userId","canUsePrivateApi","isCurrent","stored","accountId","isForCurrentAccount","hasLifeLeft","expiresAt","Date","now","provisioned","parse","Number","isFinite","persisted","getBaseURL","deviceId","secret"],"sourceRoot":"../../../../src","sources":["ui/session/backgroundSession.ts"],"mappings":";;;;;;;;AAmCA,IAAAA,gBAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,KAAA,GAAAF,OAAA;AAtCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA;AACA;;AA+BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMG,uBAAuB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;AAEvD,IAAIC,YAAiE;;AAErE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,gBAAgBA,CAAA,EAA4C;EACnE,IAAID,YAAY,KAAKE,SAAS,EAAE;IAC9B,IAAIC,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;MACzBJ,YAAY,GAAG,IAAI;MACnB,OAAOA,YAAY;IACrB;IACA,MAAMK,MAAM,GAAG,IAAAC,4CAA2B,EACxC,sBACF,CAAC;IACDN,YAAY,GACVK,MAAM,IACN,OAAOA,MAAM,CAACE,GAAG,KAAK,UAAU,IAChC,OAAOF,MAAM,CAACG,KAAK,KAAK,UAAU,IAClC,OAAOH,MAAM,CAACI,IAAI,KAAK,UAAU,GAC7B;MACEF,GAAG,EAAEF,MAAM,CAACE,GAAG,CAACG,IAAI,CAACL,MAAM,CAAC;MAC5BG,KAAK,EAAEH,MAAM,CAACG,KAAK,CAACE,IAAI,CAACL,MAAM,CAAC;MAChCI,IAAI,EAAEJ,MAAM,CAACI,IAAI,CAACC,IAAI,CAACL,MAAM;IAC/B,CAAC,GACD,IAAI;EACZ;EACA,OAAOL,YAAY;AACrB;;AAEA;AACO,SAASW,4BAA4BA,CAAA,EAAY;EACtD,OAAOV,gBAAgB,CAAC,CAAC,KAAK,IAAI;AACpC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeW,sBAAsBA,CAAA,EAAkB;EAC5D,MAAMP,MAAM,GAAGJ,gBAAgB,CAAC,CAAC;EACjC,IAAI,CAACI,MAAM,EAAE;IACX;EACF;EACA,IAAI;IACF,MAAMA,MAAM,CAACG,KAAK,CAAC,CAAC;EACtB,CAAC,CAAC,OAAOK,KAAK,EAAE;IACdC,YAAM,CAACC,IAAI,CAAC,sEAAsE,EAAE;MAClFC,SAAS,EAAE,mBAAmB;MAC9BH;IACF,CAAC,CAAC;EACJ;AACF;AAgBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASI,2BAA2BA,CAACC,WAAwB,EAAQ;EACnE,IAAI,OAAOA,WAAW,CAACC,6BAA6B,KAAK,UAAU,EAAE;IACnE;EACF;EACA,MAAMC,OAAO,GACX,sFAAsF,GACtF,sFAAsF,GACtF,0FAA0F;EAC5FN,YAAM,CAACD,KAAK,CAACO,OAAO,EAAElB,SAAS,EAAE;IAAEc,SAAS,EAAE;EAAoB,CAAC,CAAC;EACpE,MAAM,IAAIK,KAAK,CAACD,OAAO,CAAC;AAC1B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeE,qBAAqBA,CAACC,KAAiC,EAAiB;EAC5F,MAAMlB,MAAM,GAAGJ,gBAAgB,CAAC,CAAC;EACjC,IAAI,CAACI,MAAM,EAAE;IACX;EACF;EACA,MAAM;IAAEa,WAAW;IAAEM,MAAM;IAAEC,gBAAgB;IAAEC;EAAU,CAAC,GAAGH,KAAK;;EAElE;EACA;EACA;EACA,IAAIC,MAAM,EAAE;IACVP,2BAA2B,CAACC,WAAW,CAAC;EAC1C;EAEA,IAAI;IACF,IAAI,CAACM,MAAM,EAAE;MACX;MACA,MAAMnB,MAAM,CAACG,KAAK,CAAC,CAAC;MACpB;IACF;IAEA,MAAMmB,MAAM,GAAG,MAAMtB,MAAM,CAACI,IAAI,CAAC,CAAC;IAClC,IAAIkB,MAAM,IAAIA,MAAM,CAACC,SAAS,KAAKJ,MAAM,EAAE;MACzC;MACA,MAAMnB,MAAM,CAACG,KAAK,CAAC,CAAC;IACtB;IAEA,MAAMqB,mBAAmB,GAAGF,MAAM,EAAEC,SAAS,KAAKJ,MAAM;IACxD,MAAMM,WAAW,GACfD,mBAAmB,IAAIF,MAAM,CAACI,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGlC,uBAAuB;IAChF,IAAI+B,WAAW,EAAE;MACf;IACF;;IAEA;IACA;IACA;IACA,IAAI,CAACL,gBAAgB,IAAI,CAACC,SAAS,CAAC,CAAC,EAAE;MACrC;IACF;IAEA,MAAMQ,WAAW,GAAG,MAAMhB,WAAW,CAACC,6BAA6B,CAAC,CAAC;IACrE,IAAI,CAACe,WAAW,EAAE;MAChB;MACA;MACA;IACF;IACA,IAAI,CAACR,SAAS,CAAC,CAAC,EAAE;MAChB;IACF;IACA,IAAIQ,WAAW,CAACN,SAAS,KAAKJ,MAAM,EAAE;MACpC;MACA;MACA;MACA,MAAMnB,MAAM,CAACG,KAAK,CAAC,CAAC;MACpB;IACF;IAEA,MAAMuB,SAAS,GAAGC,IAAI,CAACG,KAAK,CAACD,WAAW,CAACH,SAAS,CAAC;IACnD,IAAI,CAACK,MAAM,CAACC,QAAQ,CAACN,SAAS,CAAC,EAAE;MAC/BjB,YAAM,CAACC,IAAI,CAAC,sEAAsE,EAAE;QAClFC,SAAS,EAAE;MACb,CAAC,CAAC;MACF;IACF;IAEA,MAAMsB,SAAS,GAAG,MAAMjC,MAAM,CAACE,GAAG,CAChCW,WAAW,CAACqB,UAAU,CAAC,CAAC,EACxBL,WAAW,CAACM,QAAQ,EACpBN,WAAW,CAACO,MAAM,EAClBP,WAAW,CAACN,SAAS,EACrBG,SACF,CAAC;IACD,IAAI,CAACO,SAAS,EAAE;MACdxB,YAAM,CAACC,IAAI,CACT,4IAA4I,EAC5I;QAAEC,SAAS,EAAE;MAAoB,CACnC,CAAC;IACH;EACF,CAAC,CAAC,OAAOH,KAAK,EAAE;IACdC,YAAM,CAACC,IAAI,CAAC,qEAAqE,EAAE;MACjFC,SAAS,EAAE,mBAAmB;MAC9BH;IACF,CAAC,CAAC;EACJ;AACF","ignoreList":[]}
@@ -9,9 +9,8 @@ var _core = require("@oxyhq/core");
9
9
  * User display name and date formatting utilities.
10
10
  *
11
11
  * Display-name helpers follow the API contract: prefer `name.displayName` when
12
- * present, otherwise fall back to the normalized handle. The legacy
13
- * `getAccountDisplayName` chain is only used as a last resort for local
14
- * account-switcher surfaces without a handle.
12
+ * present, otherwise fall back to the normalized handle via
13
+ * `getNormalizedUserHandle`.
15
14
  */
16
15
 
17
16
  /**
@@ -41,39 +40,30 @@ function readDisplayName(user) {
41
40
  /**
42
41
  * Gets a display name from user data.
43
42
  *
44
- * Prefers API `name.displayName`, then the normalized handle, then the local
45
- * account-switcher fallback chain.
43
+ * Prefers API `name.displayName`, then the normalized handle.
46
44
  */
47
- const getDisplayName = (user, locale) => {
45
+ const getDisplayName = user => {
48
46
  const displayName = readDisplayName(user);
49
47
  if (displayName) return displayName;
50
- const handle = (0, _core.getNormalizedUserHandle)(user);
51
- if (handle) return handle;
52
- return (0, _core.getAccountDisplayName)(user, locale);
48
+ return (0, _core.getNormalizedUserHandle)(user) ?? '';
53
49
  };
54
50
 
55
51
  /**
56
52
  * Gets a short display name (first token) for compact UI.
57
53
  */
58
54
  exports.getDisplayName = getDisplayName;
59
- const getShortDisplayName = (user, locale) => {
55
+ const getShortDisplayName = user => {
60
56
  const displayName = readDisplayName(user);
61
57
  if (displayName) {
62
58
  const firstToken = displayName.split(/\s+/).find(Boolean);
63
59
  if (firstToken) return firstToken;
64
60
  }
65
- const name = user?.name;
66
- if (name && typeof name === 'object') {
67
- const first = typeof name.first === 'string' ? name.first.trim() : '';
68
- if (first) return first.split(/\s+/)[0] ?? first;
69
- const full = typeof name.full === 'string' ? name.full.trim() : '';
70
- if (full) return full.split(/\s+/)[0] ?? full;
71
- } else if (typeof name === 'string' && name.trim()) {
72
- return name.trim().split(/\s+/)[0] ?? name.trim();
73
- }
74
61
  const handle = (0, _core.getNormalizedUserHandle)(user);
75
- if (handle) return handle;
76
- return (0, _core.getAccountDisplayName)(user, locale);
62
+ if (handle) {
63
+ const firstToken = handle.split(/\s+/).find(Boolean);
64
+ return firstToken ?? handle;
65
+ }
66
+ return '';
77
67
  };
78
68
  exports.getShortDisplayName = getShortDisplayName;
79
69
  //# sourceMappingURL=userUtils.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["_core","require","formatDate","dateString","date","Date","Number","isNaN","getTime","toLocaleDateString","month","day","year","exports","readDisplayName","user","name","displayName","trim","getDisplayName","locale","handle","getNormalizedUserHandle","coreGetAccountDisplayName","getShortDisplayName","firstToken","split","find","Boolean","first","full"],"sourceRoot":"../../../../src","sources":["ui/utils/userUtils.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_core","require","formatDate","dateString","date","Date","Number","isNaN","getTime","toLocaleDateString","month","day","year","exports","readDisplayName","user","name","displayName","trim","getDisplayName","getNormalizedUserHandle","getShortDisplayName","firstToken","split","find","Boolean","handle"],"sourceRoot":"../../../../src","sources":["ui/utils/userUtils.ts"],"mappings":";;;;;;AAQA,IAAAA,KAAA,GAAAC,OAAA;AARA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACO,MAAMC,UAAU,GAAIC,UAA4C,IAAa;EAClF,IAAI,CAACA,UAAU,EAAE,OAAO,EAAE;EAE1B,IAAI;IACF,MAAMC,IAAI,GAAGD,UAAU,YAAYE,IAAI,GAAGF,UAAU,GAAG,IAAIE,IAAI,CAACF,UAAU,CAAC;IAC3E,IAAIG,MAAM,CAACC,KAAK,CAACH,IAAI,CAACI,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE;IAE3C,OAAOJ,IAAI,CAACK,kBAAkB,CAAC,OAAO,EAAE;MACtCC,KAAK,EAAE,OAAO;MACdC,GAAG,EAAE,SAAS;MACdC,IAAI,EAAE;IACR,CAAC,CAAC;EACJ,CAAC,CAAC,MAAM;IACN,OAAO,EAAE;EACX;AACF,CAAC;AAACC,OAAA,CAAAX,UAAA,GAAAA,UAAA;AAEF,SAASY,eAAeA,CAACC,IAA6C,EAAU;EAC9E,MAAMC,IAAI,GAAGD,IAAI,EAAEC,IAAI;EACvB,IAAI,CAACA,IAAI,IAAI,OAAOA,IAAI,KAAK,QAAQ,EAAE,OAAO,EAAE;EAChD,OAAO,OAAOA,IAAI,CAACC,WAAW,KAAK,QAAQ,GAAGD,IAAI,CAACC,WAAW,CAACC,IAAI,CAAC,CAAC,GAAG,EAAE;AAC5E;;AAEA;AACA;AACA;AACA;AACA;AACO,MAAMC,cAAc,GACzBJ,IAA6C,IAClC;EACX,MAAME,WAAW,GAAGH,eAAe,CAACC,IAAI,CAAC;EACzC,IAAIE,WAAW,EAAE,OAAOA,WAAW;EACnC,OAAO,IAAAG,6BAAuB,EAACL,IAAI,CAAC,IAAI,EAAE;AAC5C,CAAC;;AAED;AACA;AACA;AAFAF,OAAA,CAAAM,cAAA,GAAAA,cAAA;AAGO,MAAME,mBAAmB,GAC9BN,IAA6C,IAClC;EACX,MAAME,WAAW,GAAGH,eAAe,CAACC,IAAI,CAAC;EACzC,IAAIE,WAAW,EAAE;IACf,MAAMK,UAAU,GAAGL,WAAW,CAACM,KAAK,CAAC,KAAK,CAAC,CAACC,IAAI,CAACC,OAAO,CAAC;IACzD,IAAIH,UAAU,EAAE,OAAOA,UAAU;EACnC;EAEA,MAAMI,MAAM,GAAG,IAAAN,6BAAuB,EAACL,IAAI,CAAC;EAC5C,IAAIW,MAAM,EAAE;IACV,MAAMJ,UAAU,GAAGI,MAAM,CAACH,KAAK,CAAC,KAAK,CAAC,CAACC,IAAI,CAACC,OAAO,CAAC;IACpD,OAAOH,UAAU,IAAII,MAAM;EAC7B;EAEA,OAAO,EAAE;AACX,CAAC;AAACb,OAAA,CAAAQ,mBAAA,GAAAA,mBAAA","ignoreList":[]}
@@ -126,7 +126,12 @@ const ProfileScreen = ({
126
126
  // title (a stable "Profile" fallback before it resolves), so the banner +
127
127
  // overlapping avatar scroll as content UNDER the shared gradient nav bar.
128
128
  // `onImage` tone keeps the title + close legible over the colored banner.
129
- const displayName = profile ? profile.name?.displayName ?? getNormalizedUserHandle(profile) : username || '';
129
+ // Ends in a string, deliberately: `getNormalizedUserHandle` answers `null` for a
130
+ // user it cannot normalise, and letting that null travel makes this `string | null`
131
+ // — which does not satisfy `Avatar.name` and does not typecheck. Empty is the honest
132
+ // bottom of the chain and every reader below already treats it as falsy
133
+ // (`displayName || t('profile.title')`), so nothing renders a literal "null".
134
+ const displayName = profile ? profile.name?.displayName ?? getNormalizedUserHandle(profile) ?? '' : username || '';
130
135
  useSurfaceHeader({
131
136
  title: displayName || t('profile.title'),
132
137
  largeTitle: false,
@@ -193,9 +198,15 @@ const ProfileScreen = ({
193
198
  children: [/*#__PURE__*/_jsx(View, {
194
199
  style: styles.avatarWrapper,
195
200
  className: "border-bg bg-bg rounded-radius-max",
196
- children: /*#__PURE__*/_jsx(Avatar, {
197
- source: profile?.avatar ? oxyServices.getFileDownloadUrl(profile.avatar, 'thumb') : undefined,
198
- name: displayName || username,
201
+ children: /*#__PURE__*/_jsx(Avatar
202
+ // `getFileDownloadUrl` answers `null` for a reference it cannot
203
+ // resolve, and `Avatar.source` takes `undefined` for "no picture" —
204
+ // the two spellings of absent do not meet, so the coalesce is the
205
+ // whole fix. Without it this file does not typecheck, which blocks
206
+ // `bun run build` and therefore every publish of this package.
207
+ , {
208
+ source: profile?.avatar ? oxyServices.getFileDownloadUrl(profile.avatar, 'thumb') ?? undefined : undefined,
209
+ name: displayName,
199
210
  size: AVATAR_SIZE
200
211
  })
201
212
  }), /*#__PURE__*/_jsx(View, {
@@ -1 +1 @@
1
- {"version":3,"names":["useMemo","View","StyleSheet","ActivityIndicator","useQuery","useTheme","Button","H2","Text","SettingsListGroup","SettingsListItem","Avatar","FollowButton","useFollow","Ionicons","useI18n","useSurfaceHeader","useOxy","getNormalizedUserHandle","logger","normalizeProfileLinks","extractErrorMessage","jsx","_jsx","jsxs","_jsxs","AVATAR_SIZE","BANNER_HEIGHT","AVATAR_OVERLAP","INFO_ICON_SIZE","ProfileScreen","userId","username","theme","goBack","navigate","oxyServices","user","currentUser","followerCount","followingCount","isLoadingCounts","bloomTheme","t","normalizeId","id","String","trim","currentUserId","targetUserId","isOwnProfile","profileQuery","queryKey","enabled","retry","queryFn","profileRes","reputationRes","Promise","all","getUserById","catch","err","error","Error","component","getMyReputationBalance","getReputationBalance","then","balance","total","undefined","getUserStats","postCount","commentCount","resolve","profile","reputationTotal","links","linksMetadata","data","isLoading","isError","errorWithStatus","errorMessageText","status","includes","displayName","name","title","largeTitle","tone","className","children","size","color","colors","primary","style","styles","errorContent","errorTitle","errorText","errorSubtext","primaryLocation","locations","first","Array","isArray","scrollContainer","bannerContainer","flex","avatarRow","avatarWrapper","source","avatar","getFileDownloadUrl","actionButtonWrapper","variant","onPress","onFollowChange","isFollowing","__DEV__","debug","header","subText","bio","createdAt","icon","textSecondary","date","Date","toLocaleDateString","showChevron","website","company","jobTitle","education","birthday","length","url","value","count","statsRow","statItem","statAmount","statLabel","text","create","alignItems","paddingBottom","height","position","overflow","flexDirection","marginTop","justifyContent","zIndex","borderWidth","width","fontSize","marginBottom","letterSpacing","lineHeight","minWidth","textAlign","fontWeight"],"sourceRoot":"../../../../src","sources":["ui/screens/ProfileScreen.tsx"],"mappings":";;AACA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,IAAI,EAAEC,UAAU,EAAEC,iBAAiB,QAAQ,cAAc;AAClE,SAASC,QAAQ,QAAQ,uBAAuB;AAEhD,SAASC,QAAQ,QAAQ,oBAAoB;AAC7C,SAASC,MAAM,QAAQ,qBAAqB;AAC5C,SAASC,EAAE,EAAEC,IAAI,QAAQ,yBAAyB;AAClD,SAASC,iBAAiB,EAAEC,gBAAgB,QAAQ,4BAA4B;AAChF,SAASC,MAAM,QAAQ,qBAAqB;AAC5C,OAAOC,YAAY,MAAM,+BAA4B;AACrD,SAASC,SAAS,QAAQ,uBAAoB;AAC9C,OAAOC,QAAQ,MAAM,6BAA6B;AAClD,SAASC,OAAO,QAAQ,qBAAkB;AAC1C,SAASC,gBAAgB,QAAQ,8BAA2B;AAC5D,SAASC,MAAM,QAAQ,0BAAuB;AAC9C,SAASC,uBAAuB,EAAEC,MAAM,EAAEC,qBAAqB,QAAQ,aAAa;AACpF,SAASC,mBAAmB,QAAQ,2BAAwB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAO7D,MAAMC,WAAW,GAAG,EAAE;AACtB,MAAMC,aAAa,GAAG,GAAG;AACzB,MAAMC,cAAc,GAAG,CAAC,EAAE;AAC1B,MAAMC,cAAc,GAAG,EAAE;AAEzB,MAAMC,aAA2C,GAAGA,CAAC;EAAEC,MAAM;EAAEC,QAAQ;EAAEC,KAAK;EAAEC,MAAM;EAAEC;AAAS,CAAC,KAAK;EACnG;EACA;EACA;EACA;EACA,MAAM;IAAEC,WAAW;IAAEC,IAAI,EAAEC;EAAY,CAAC,GAAGrB,MAAM,CAAC,CAAC;;EAEnD;EACA,MAAM;IACFsB,aAAa;IACbC,cAAc;IACdC;EACJ,CAAC,GAAG5B,SAAS,CAACkB,MAAM,CAAC;EAErB,MAAMW,UAAU,GAAGrC,QAAQ,CAAC,CAAC;EAC7B,MAAM;IAAEsC;EAAE,CAAC,GAAG5B,OAAO,CAAC,CAAC;;EAEvB;EACA;EACA,MAAM6B,WAAW,GAAIC,EAA6B,IAAa;IAC3D,IAAI,CAACA,EAAE,EAAE,OAAO,EAAE;IAClB,OAAOC,MAAM,CAACD,EAAE,CAAC,CAACE,IAAI,CAAC,CAAC;EAC5B,CAAC;EAED,MAAMC,aAAa,GAAGJ,WAAW,CAACN,WAAW,EAAEO,EAAE,CAAC;EAClD,MAAMI,YAAY,GAAGL,WAAW,CAACb,MAAM,CAAC;EACxC,MAAMmB,YAAY,GAAG,CAAC,EAAEF,aAAa,IAAIC,YAAY,IAAID,aAAa,KAAKC,YAAY,CAAC;;EAExF;EACA;EACA;EACA;EACA;EACA,MAAME,YAAY,GAAG/C,QAAQ,CAAC;IAC1BgD,QAAQ,EAAE,CAAC,eAAe,EAAEH,YAAY,EAAED,aAAa,CAAC;IACxDK,OAAO,EAAE,CAAC,CAACtB,MAAM;IACjBuB,KAAK,EAAE,KAAK;IACZC,OAAO,EAAE,MAAAA,CAAA,KAAY;MACjB;MACA;MACA;MACA,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAG,MAAMC,OAAO,CAACC,GAAG,CAAC,CAClDvB,WAAW,CAACwB,WAAW,CAAC7B,MAAM,CAAC,CAAC8B,KAAK,CAAEC,GAAY,IAAK;QACpD,IAAIZ,YAAY,EAAE,OAAOZ,WAAW;QACpCnB,MAAM,CAAC4C,KAAK,CACR,uBAAuB,EACvBD,GAAG,YAAYE,KAAK,GAAGF,GAAG,GAAG,IAAIE,KAAK,CAAClB,MAAM,CAACgB,GAAG,CAAC,CAAC,EACnD;UAAEG,SAAS,EAAE;QAAgB,CACjC,CAAC;QACD,MAAMH,GAAG;MACb,CAAC,CAAC,EACF,CAACZ,YAAY,GACPd,WAAW,CAAC8B,sBAAsB,CAAC,CAAC,GACpC9B,WAAW,CAAC+B,oBAAoB,CAACpC,MAAM,CAAC,EACzCqC,IAAI,CAAEC,OAAO,KAAqC;QAAEC,KAAK,EAAED,OAAO,CAACC;MAAM,CAAC,CAAC,CAAC,CAC5ET,KAAK,CAAC,OAAsC;QAAES,KAAK,EAAEC;MAAU,CAAC,CAAC,CAAC,EACvEnC,WAAW,CAACoC,YAAY,GAClBpC,WAAW,CAACoC,YAAY,CAACzC,MAAM,CAAC,CAAC8B,KAAK,CAAC,OAAO;QAAEY,SAAS,EAAE,CAAC;QAAEC,YAAY,EAAE;MAAE,CAAC,CAAC,CAAC,GACjFhB,OAAO,CAACiB,OAAO,CAAC;QAAEF,SAAS,EAAE,CAAC;QAAEC,YAAY,EAAE;MAAE,CAAC,CAAC,CAC3D,CAAC;MACF,IAAI,CAAClB,UAAU,EAAE;QACb,MAAM,IAAIQ,KAAK,CAAC,+BAA+B,CAAC;MACpD;MACA,OAAO;QACHY,OAAO,EAAEpB,UAAU;QACnBqB,eAAe,EAAE,OAAOpB,aAAa,CAACa,KAAK,KAAK,QAAQ,GAAGb,aAAa,CAACa,KAAK,GAAG,IAAI;QACrFQ,KAAK,EAAE1D,qBAAqB,CAACoC,UAAU,CAACuB,aAAa,EAAEvB,UAAU,CAACsB,KAAK;MAC3E,CAAC;IACL;EACJ,CAAC,CAAC;EAEF,MAAMF,OAAO,GAAGzB,YAAY,CAAC6B,IAAI,EAAEJ,OAAO,IAAI,IAAI;EAClD,MAAMC,eAAe,GAAG1B,YAAY,CAAC6B,IAAI,EAAEH,eAAe,IAAI,IAAI;EAClE,MAAMC,KAAK,GAAG3B,YAAY,CAAC6B,IAAI,EAAEF,KAAK,IAAI,EAAE;EAC5C,MAAMG,SAAS,GAAG,CAAC,CAAClD,MAAM,IAAIoB,YAAY,CAAC8B,SAAS;;EAEpD;EACA,MAAMlB,KAAK,GAAG/D,OAAO,CAAgB,MAAM;IACvC,IAAI,CAAC+B,MAAM,EAAE,OAAO,qBAAqB;IACzC,IAAI,CAACoB,YAAY,CAAC+B,OAAO,EAAE,OAAO,IAAI;IACtC,MAAMpB,GAAG,GAAGX,YAAY,CAACY,KAAK;IAC9B,MAAMoB,eAAe,GACjBrB,GAAG,IAAI,OAAOA,GAAG,KAAK,QAAQ,IAAI,QAAQ,IAAIA,GAAG,GAC1CA,GAAG,GACJ,IAAI;IACd,MAAMsB,gBAAgB,GAAG/D,mBAAmB,CAACyC,GAAG,EAAE,EAAE,CAAC;IACrD,IACIqB,eAAe,EAAEE,MAAM,KAAK,GAAG,IAC/BD,gBAAgB,CAACE,QAAQ,CAAC,WAAW,CAAC,IACtCF,gBAAgB,CAACE,QAAQ,CAAC,oBAAoB,CAAC,EACjD;MACE,OAAOpC,YAAY,GACb,4FAA4F,GAC5F,gEAAgE;IAC1E;IACA,IAAIiC,eAAe,EAAEE,MAAM,KAAK,GAAG,EAAE;MACjC,OAAO,kDAAkD;IAC7D;IACA,IAAIF,eAAe,EAAEE,MAAM,KAAK,GAAG,EAAE;MACjC,OAAO,0EAA0E;IACrF;IACA,OAAOD,gBAAgB,IAAI,wBAAwB;EACvD,CAAC,EAAE,CAACrD,MAAM,EAAEoB,YAAY,CAAC+B,OAAO,EAAE/B,YAAY,CAACY,KAAK,EAAEb,YAAY,CAAC,CAAC;;EAEpE;EACA;EACA;EACA;EACA,MAAMqC,WAAW,GAAGX,OAAO,GACpBA,OAAO,CAACY,IAAI,EAAED,WAAW,IAAIrE,uBAAuB,CAAC0D,OAAO,CAAC,GAC9D5C,QAAQ,IAAI,EAAE;EACpBhB,gBAAgB,CAAC;IACbyE,KAAK,EAAEF,WAAW,IAAI5C,CAAC,CAAC,eAAe,CAAC;IACxC+C,UAAU,EAAE,KAAK;IACjBC,IAAI,EAAE;EACV,CAAC,CAAC;EAEF,IAAIV,SAAS,EAAE;IACX,oBACI1D,IAAA,CAACtB,IAAI;MAAC2F,SAAS,EAAC,0BAA0B;MAAAC,QAAA,eACtCtE,IAAA,CAACpB,iBAAiB;QAAC2F,IAAI,EAAC,OAAO;QAACC,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACC;MAAQ,CAAE;IAAC,CAClE,CAAC;EAEf;EAEA,IAAIlC,KAAK,EAAE;IACP;IACA,oBACItC,KAAA,CAACxB,IAAI;MAACiG,KAAK,EAAEC,MAAM,CAACC,YAAa;MAACR,SAAS,EAAC,sCAAsC;MAAAC,QAAA,gBAC9EtE,IAAA,CAACT,QAAQ;QAAC0E,IAAI,EAAC,cAAc;QAACM,IAAI,EAAE,EAAG;QAACC,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACjC;MAAM,CAAE,CAAC,eAC1ExC,IAAA,CAAChB,EAAE;QAAC2F,KAAK,EAAEC,MAAM,CAACE,UAAW;QAACT,SAAS,EAAC,uBAAuB;QAAAC,QAAA,EAC1DlD,CAAC,CAAC,oBAAoB,CAAC,IAAI;MAAe,CAC3C,CAAC,eACLpB,IAAA,CAACf,IAAI;QAAC0F,KAAK,EAAEC,MAAM,CAACG,SAAU;QAACV,SAAS,EAAC,WAAW;QAAAC,QAAA,EAAE9B;MAAK,CAAO,CAAC,eACnExC,IAAA,CAACf,IAAI;QAAC0F,KAAK,EAAEC,MAAM,CAACI,YAAa;QAACX,SAAS,EAAC,qBAAqB;QAAAC,QAAA,EAC5DlD,CAAC,CAAC,sBAAsB,CAAC,IAAI;MAAoF,CAChH,CAAC;IAAA,CACL,CAAC;EAEf;;EAEA;EACA;EACA;EACA;EACA,MAAM6D,eAAe,GAAG,CAAC,MAA0B;IAC/C,MAAMC,SAAS,GAAG7B,OAAO,EAAE6B,SAAS;IACpC,MAAMC,KAAc,GAAGC,KAAK,CAACC,OAAO,CAACH,SAAS,CAAC,GAAGA,SAAS,CAAC,CAAC,CAAC,GAAGlC,SAAS;IAC1E,IAAImC,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAIA,KAAK,IAAI,OAAOA,KAAK,CAAClB,IAAI,KAAK,QAAQ,EAAE;MACzF,OAAOkB,KAAK,CAAClB,IAAI,IAAIjB,SAAS;IAClC;IACA,OAAOA,SAAS;EACpB,CAAC,EAAE,CAAC;EAEJ,oBACI9C,KAAA,CAACxB,IAAI;IAACiG,KAAK,EAAEC,MAAM,CAACU,eAAgB;IAAAhB,QAAA,gBAE5BtE,IAAA,CAACtB,IAAI;MAACiG,KAAK,EAAEC,MAAM,CAACW,eAAgB;MAAClB,SAAS,EAAC,kBAAkB;MAAAC,QAAA,eAC7DtE,IAAA,CAACtB,IAAI;QAACiG,KAAK,EAAEC,MAAM,CAACY,IAAK;QAACnB,SAAS,EAAC;MAAe,CAAE;IAAC,CACpD,CAAC,eAEPnE,KAAA,CAACxB,IAAI;MAACiG,KAAK,EAAEC,MAAM,CAACa,SAAU;MAACpB,SAAS,EAAC,kBAAkB;MAAAC,QAAA,gBACvDtE,IAAA,CAACtB,IAAI;QAACiG,KAAK,EAAEC,MAAM,CAACc,aAAc;QAACrB,SAAS,EAAC,oCAAoC;QAAAC,QAAA,eAC7EtE,IAAA,CAACZ,MAAM;UACHuG,MAAM,EAAEtC,OAAO,EAAEuC,MAAM,GAAG/E,WAAW,CAACgF,kBAAkB,CAACxC,OAAO,CAACuC,MAAM,EAAE,OAAO,CAAC,GAAG5C,SAAU;UAC9FiB,IAAI,EAAED,WAAW,IAAIvD,QAAS;UAC9B8D,IAAI,EAAEpE;QAAY,CACrB;MAAC,CACA,CAAC,eAEPH,IAAA,CAACtB,IAAI;QAACiG,KAAK,EAAEC,MAAM,CAACkB,mBAAoB;QAAAxB,QAAA,EACnC3C,YAAY,gBACT3B,IAAA,CAACjB,MAAM;UACHgH,OAAO,EAAC,WAAW;UACnBxB,IAAI,EAAC,OAAO;UACZyB,OAAO,EAAEA,CAAA,KAAMpF,QAAQ,GAAG,eAAe,CAAE;UAAA0D,QAAA,EAE1ClD,CAAC,CAAC,mBAAmB,CAAC,IAAI;QAAc,CACrC,CAAC,gBAETpB,IAAA,CAACX,YAAY;UACTmB,MAAM,EAAEA,MAAO;UACfyF,cAAc,EAAGC,WAAW,IAAK;YAC7B;YACA,IAAIC,OAAO,EAAE;cACTvG,MAAM,CAACwG,KAAK,CAAC,0BAA0BF,WAAW,EAAE,EAAE;gBAAExD,SAAS,EAAE;cAAgB,CAAC,CAAC;YACzF;UACJ;QAAE,CACL;MACJ,CACC,CAAC;IAAA,CACL,CAAC,eAEPxC,KAAA,CAACxB,IAAI;MAACiG,KAAK,EAAEC,MAAM,CAACyB,MAAO;MAAChC,SAAS,EAAC,kBAAkB;MAAAC,QAAA,gBACpDtE,IAAA,CAAChB,EAAE;QAAC2F,KAAK,EAAEC,MAAM,CAACZ,WAAY;QAACK,SAAS,EAAC,WAAW;QAAAC,QAAA,EAC/CN;MAAW,CACZ,CAAC,EACJX,OAAO,EAAE5C,QAAQ,iBACdP,KAAA,CAACjB,IAAI;QAAC0F,KAAK,EAAEC,MAAM,CAAC0B,OAAQ;QAACjC,SAAS,EAAC,qBAAqB;QAAAC,QAAA,GAAC,GAAC,EAACjB,OAAO,CAAC5C,QAAQ;MAAA,CAAO,CACzF,eAEDT,IAAA,CAACf,IAAI;QAAC0F,KAAK,EAAEC,MAAM,CAAC2B,GAAI;QAAClC,SAAS,EAAC,WAAW;QAAAC,QAAA,EAAEjB,OAAO,EAAEkD,GAAG,IAAKnF,CAAC,CAAC,eAAe,CAAC,IAAI;MAA4B,CAAO,CAAC;IAAA,CACzH,CAAC,eAGPpB,IAAA,CAACtB,IAAI;MAAC2F,SAAS,EAAC,kBAAkB;MAAAC,QAAA,eAClCpE,KAAA,CAAChB,iBAAiB;QAAAoF,QAAA,GACbjB,OAAO,EAAEmD,SAAS,iBACfxG,IAAA,CAACb,gBAAgB;UACbsH,IAAI,eAAEzG,IAAA,CAACT,QAAQ;YAAC0E,IAAI,EAAC,kBAAkB;YAACM,IAAI,EAAEjE,cAAe;YAACkE,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACiC;UAAc,CAAE,CAAE;UACzGxC,KAAK,EAAE9C,CAAC,CAAC,kBAAkB,EAAE;YAAEuF,IAAI,EAAE,IAAIC,IAAI,CAACvD,OAAO,CAACmD,SAAS,CAAC,CAACK,kBAAkB,CAAC;UAAE,CAAC,CAAC,IAAI,UAAU,IAAID,IAAI,CAACvD,OAAO,CAACmD,SAAS,CAAC,CAACK,kBAAkB,CAAC,CAAC,EAAG;UACzJC,WAAW,EAAE;QAAM,CACtB,CACJ,EACA7B,eAAe,iBACZjF,IAAA,CAACb,gBAAgB;UACbsH,IAAI,eAAEzG,IAAA,CAACT,QAAQ;YAAC0E,IAAI,EAAC,kBAAkB;YAACM,IAAI,EAAEjE,cAAe;YAACkE,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACiC;UAAc,CAAE,CAAE;UACzGxC,KAAK,EAAEe,eAAgB;UACvB6B,WAAW,EAAE;QAAM,CACtB,CACJ,EACAzD,OAAO,EAAE0D,OAAO,iBACb/G,IAAA,CAACb,gBAAgB;UACbsH,IAAI,eAAEzG,IAAA,CAACT,QAAQ;YAAC0E,IAAI,EAAC,eAAe;YAACM,IAAI,EAAEjE,cAAe;YAACkE,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACiC;UAAc,CAAE,CAAE;UACtGxC,KAAK,EAAEb,OAAO,CAAC0D,OAAQ;UACvBD,WAAW,EAAE;QAAM,CACtB,CACJ,EACAzD,OAAO,IAAI,SAAS,IAAIA,OAAO,IAAI,OAAOA,OAAO,CAAC2D,OAAO,KAAK,QAAQ,IAAI3D,OAAO,CAAC2D,OAAO,iBACtFhH,IAAA,CAACb,gBAAgB;UACbsH,IAAI,eAAEzG,IAAA,CAACT,QAAQ;YAAC0E,IAAI,EAAC,kBAAkB;YAACM,IAAI,EAAEjE,cAAe;YAACkE,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACiC;UAAc,CAAE,CAAE;UACzGxC,KAAK,EAAEb,OAAO,CAAC2D,OAAQ;UACvBF,WAAW,EAAE;QAAM,CACtB,CACJ,EACAzD,OAAO,IAAI,UAAU,IAAIA,OAAO,IAAI,OAAOA,OAAO,CAAC4D,QAAQ,KAAK,QAAQ,IAAI5D,OAAO,CAAC4D,QAAQ,iBACzFjH,IAAA,CAACb,gBAAgB;UACbsH,IAAI,eAAEzG,IAAA,CAACT,QAAQ;YAAC0E,IAAI,EAAC,mBAAmB;YAACM,IAAI,EAAEjE,cAAe;YAACkE,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACiC;UAAc,CAAE,CAAE;UAC1GxC,KAAK,EAAEb,OAAO,CAAC4D,QAAS;UACxBH,WAAW,EAAE;QAAM,CACtB,CACJ,EACAzD,OAAO,IAAI,WAAW,IAAIA,OAAO,IAAI,OAAOA,OAAO,CAAC6D,SAAS,KAAK,QAAQ,IAAI7D,OAAO,CAAC6D,SAAS,iBAC5FlH,IAAA,CAACb,gBAAgB;UACbsH,IAAI,eAAEzG,IAAA,CAACT,QAAQ;YAAC0E,IAAI,EAAC,gBAAgB;YAACM,IAAI,EAAEjE,cAAe;YAACkE,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACiC;UAAc,CAAE,CAAE;UACvGxC,KAAK,EAAEb,OAAO,CAAC6D,SAAU;UACzBJ,WAAW,EAAE;QAAM,CACtB,CACJ,EACAzD,OAAO,IAAI,UAAU,IAAIA,OAAO,IAAI,OAAOA,OAAO,CAAC8D,QAAQ,KAAK,QAAQ,IAAI9D,OAAO,CAAC8D,QAAQ,iBACzFnH,IAAA,CAACb,gBAAgB;UACbsH,IAAI,eAAEzG,IAAA,CAACT,QAAQ;YAAC0E,IAAI,EAAC,cAAc;YAACM,IAAI,EAAEjE,cAAe;YAACkE,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACiC;UAAc,CAAE,CAAE;UACrGxC,KAAK,EAAE9C,CAAC,CAAC,gBAAgB,EAAE;YAAEuF,IAAI,EAAE,IAAIC,IAAI,CAACvD,OAAO,CAAC8D,QAAQ,CAAC,CAACN,kBAAkB,CAAC;UAAE,CAAC,CAAC,IAAI,QAAQ,IAAID,IAAI,CAACvD,OAAO,CAAC8D,QAAQ,CAAC,CAACN,kBAAkB,CAAC,CAAC,EAAG;UACnJC,WAAW,EAAE;QAAM,CACtB,CACJ,EACAvD,KAAK,CAAC6D,MAAM,GAAG,CAAC,iBACbpH,IAAA,CAACb,gBAAgB;UACbsH,IAAI,eAAEzG,IAAA,CAACT,QAAQ;YAAC0E,IAAI,EAAC,cAAc;YAACM,IAAI,EAAEjE,cAAe;YAACkE,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACiC;UAAc,CAAE,CAAE;UACrGxC,KAAK,EAAEX,KAAK,CAAC,CAAC,CAAC,CAAC8D,GAAI;UACpBC,KAAK,EAAE/D,KAAK,CAAC6D,MAAM,GAAG,CAAC,GAAIhG,CAAC,CAAC,cAAc,EAAE;YAAEmG,KAAK,EAAEhE,KAAK,CAAC6D,MAAM,GAAG;UAAE,CAAC,CAAC,IAAI,KAAK7D,KAAK,CAAC6D,MAAM,GAAG,CAAC,OAAO,GAAIpE,SAAU;UACvHgD,OAAO,EAAEA,CAAA,KAAMpF,QAAQ,GAAG,WAAW,EAAE;YAAEJ,MAAM;YAAE+C;UAAM,CAAC;QAAE,CAC7D,CACJ;MAAA,CACc;IAAC,CACd,CAAC,eAGPrD,KAAA,CAACxB,IAAI;MAACiG,KAAK,EAAEC,MAAM,CAAC4C,QAAS;MAACnD,SAAS,EAAC,kBAAkB;MAAAC,QAAA,gBACtDpE,KAAA,CAACxB,IAAI;QAACiG,KAAK,EAAEC,MAAM,CAAC6C,QAAS;QAAAnD,QAAA,gBACzBtE,IAAA,CAACf,IAAI;UAAC0F,KAAK,EAAEC,MAAM,CAAC8C,UAAW;UAACrD,SAAS,EAAC,WAAW;UAAAC,QAAA,EAAEhB,eAAe,KAAK,IAAI,IAAIA,eAAe,KAAKN,SAAS,GAAGM,eAAe,GAAG;QAAI,CAAO,CAAC,eACjJtD,IAAA,CAACf,IAAI;UAAC0F,KAAK,EAAEC,MAAM,CAAC+C,SAAU;UAACtD,SAAS,EAAC,qBAAqB;UAAAC,QAAA,EAAElD,CAAC,CAAC,oBAAoB,CAAC,IAAI;QAAY,CAAO,CAAC;MAAA,CAC7G,CAAC,eACPlB,KAAA,CAACxB,IAAI;QAACiG,KAAK,EAAEC,MAAM,CAAC6C,QAAS;QAAAnD,QAAA,GACxBpD,eAAe,gBACZlB,IAAA,CAACpB,iBAAiB;UAAC2F,IAAI,EAAC,OAAO;UAACC,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACmD;QAAK,CAAE,CAAC,gBAEjE5H,IAAA,CAACf,IAAI;UAAC0F,KAAK,EAAEC,MAAM,CAAC8C,UAAW;UAACrD,SAAS,EAAC,WAAW;UAAAC,QAAA,EAAEtD,aAAa,KAAK,IAAI,GAAGA,aAAa,GAAG;QAAI,CAAO,CAC9G,eACDhB,IAAA,CAACf,IAAI;UAAC0F,KAAK,EAAEC,MAAM,CAAC+C,SAAU;UAACtD,SAAS,EAAC,qBAAqB;UAAAC,QAAA,EAAElD,CAAC,CAAC,mBAAmB,CAAC,IAAI;QAAW,CAAO,CAAC;MAAA,CAC3G,CAAC,eACPlB,KAAA,CAACxB,IAAI;QAACiG,KAAK,EAAEC,MAAM,CAAC6C,QAAS;QAAAnD,QAAA,GACxBpD,eAAe,gBACZlB,IAAA,CAACpB,iBAAiB;UAAC2F,IAAI,EAAC,OAAO;UAACC,KAAK,EAAErD,UAAU,CAACsD,MAAM,CAACmD;QAAK,CAAE,CAAC,gBAEjE5H,IAAA,CAACf,IAAI;UAAC0F,KAAK,EAAEC,MAAM,CAAC8C,UAAW;UAACrD,SAAS,EAAC,WAAW;UAAAC,QAAA,EAAErD,cAAc,KAAK,IAAI,GAAGA,cAAc,GAAG;QAAI,CAAO,CAChH,eACDjB,IAAA,CAACf,IAAI;UAAC0F,KAAK,EAAEC,MAAM,CAAC+C,SAAU;UAACtD,SAAS,EAAC,qBAAqB;UAAAC,QAAA,EAAElD,CAAC,CAAC,mBAAmB,CAAC,IAAI;QAAW,CAAO,CAAC;MAAA,CAC3G,CAAC;IAAA,CACL,CAAC;EAAA,CACT,CAAC;AAEf,CAAC;;AAED;AACA;AACA;AACA,MAAMwD,MAAM,GAAGjG,UAAU,CAACkJ,MAAM,CAAC;EAC7BrC,IAAI,EAAE;IAAEA,IAAI,EAAE;EAAE,CAAC;EACjBF,eAAe,EAAE;IAAEwC,UAAU,EAAE,SAAS;IAAEC,aAAa,EAAE;EAAG,CAAC;EAC7DxC,eAAe,EAAE;IAAEyC,MAAM,EAAE5H,aAAa;IAAE6H,QAAQ,EAAE,UAAU;IAAEC,QAAQ,EAAE;EAAS,CAAC;EACpFzC,SAAS,EAAE;IACP0C,aAAa,EAAE,KAAK;IACpBL,UAAU,EAAE,UAAU;IACtBM,SAAS,EAAE/H,cAAc;IACzBgI,cAAc,EAAE,eAAe;IAC/BC,MAAM,EAAE;EACZ,CAAC;EACD5C,aAAa,EAAE;IAAE6C,WAAW,EAAE,CAAC;IAAEL,QAAQ,EAAE;EAAS,CAAC;EACrDpC,mBAAmB,EAAE;IAAEN,IAAI,EAAE,CAAC;IAAEsC,UAAU,EAAE,UAAU;IAAEO,cAAc,EAAE,UAAU;IAAEN,aAAa,EAAE;EAAE,CAAC;EACtG1B,MAAM,EAAE;IAAEyB,UAAU,EAAE,YAAY;IAAEU,KAAK,EAAE,MAAM;IAAEJ,SAAS,EAAE;EAAG,CAAC;EAClEpE,WAAW,EAAE;IAAEyE,QAAQ,EAAE,EAAE;IAAEC,YAAY,EAAE,CAAC;IAAEC,aAAa,EAAE;EAAI,CAAC;EAClErC,OAAO,EAAE;IAAEmC,QAAQ,EAAE,EAAE;IAAEC,YAAY,EAAE;EAAE,CAAC;EAC1CnC,GAAG,EAAE;IAAEkC,QAAQ,EAAE,EAAE;IAAEL,SAAS,EAAE,EAAE;IAAEQ,UAAU,EAAE;EAAG,CAAC;EACpDpB,QAAQ,EAAE;IACNgB,KAAK,EAAE,MAAM;IACbL,aAAa,EAAE,KAAK;IACpBL,UAAU,EAAE,QAAQ;IACpBM,SAAS,EAAE,EAAE;IACbC,cAAc,EAAE;EACpB,CAAC;EACDZ,QAAQ,EAAE;IAAEjC,IAAI,EAAE,CAAC;IAAEsC,UAAU,EAAE,QAAQ;IAAEe,QAAQ,EAAE,EAAE;IAAEH,YAAY,EAAE;EAAG,CAAC;EAC3Ef,SAAS,EAAE;IAAEc,QAAQ,EAAE,EAAE;IAAEC,YAAY,EAAE,CAAC;IAAEI,SAAS,EAAE;EAAS,CAAC;EACjEpB,UAAU,EAAE;IAAEe,QAAQ,EAAE,EAAE;IAAEM,UAAU,EAAE,MAAM;IAAED,SAAS,EAAE,QAAQ;IAAEH,aAAa,EAAE;EAAI,CAAC;EACzF;EACA7D,UAAU,EAAE;IAAE2D,QAAQ,EAAE;EAAG,CAAC;EAC5B5D,YAAY,EAAE;IAAEwD,cAAc,EAAE,QAAQ;IAAEP,UAAU,EAAE;EAAS,CAAC;EAChE/C,SAAS,EAAE;IAAE0D,QAAQ,EAAE,EAAE;IAAEM,UAAU,EAAE,KAAK;IAAED,SAAS,EAAE;EAAS,CAAC;EACnE9D,YAAY,EAAE;IAAEyD,QAAQ,EAAE,EAAE;IAAEK,SAAS,EAAE;EAAS;AACtD,CAAC,CAAC;AAEF,eAAevI,aAAa","ignoreList":[]}
1
+ {"version":3,"names":["useMemo","View","StyleSheet","ActivityIndicator","useQuery","useTheme","Button","H2","Text","SettingsListGroup","SettingsListItem","Avatar","FollowButton","useFollow","Ionicons","useI18n","useSurfaceHeader","useOxy","getNormalizedUserHandle","logger","normalizeProfileLinks","extractErrorMessage","jsx","_jsx","jsxs","_jsxs","AVATAR_SIZE","BANNER_HEIGHT","AVATAR_OVERLAP","INFO_ICON_SIZE","ProfileScreen","userId","username","theme","goBack","navigate","oxyServices","user","currentUser","followerCount","followingCount","isLoadingCounts","bloomTheme","t","normalizeId","id","String","trim","currentUserId","targetUserId","isOwnProfile","profileQuery","queryKey","enabled","retry","queryFn","profileRes","reputationRes","Promise","all","getUserById","catch","err","error","Error","component","getMyReputationBalance","getReputationBalance","then","balance","total","undefined","getUserStats","postCount","commentCount","resolve","profile","reputationTotal","links","linksMetadata","data","isLoading","isError","errorWithStatus","errorMessageText","status","includes","displayName","name","title","largeTitle","tone","className","children","size","color","colors","primary","style","styles","errorContent","errorTitle","errorText","errorSubtext","primaryLocation","locations","first","Array","isArray","scrollContainer","bannerContainer","flex","avatarRow","avatarWrapper","source","avatar","getFileDownloadUrl","actionButtonWrapper","variant","onPress","onFollowChange","isFollowing","__DEV__","debug","header","subText","bio","createdAt","icon","textSecondary","date","Date","toLocaleDateString","showChevron","website","company","jobTitle","education","birthday","length","url","value","count","statsRow","statItem","statAmount","statLabel","text","create","alignItems","paddingBottom","height","position","overflow","flexDirection","marginTop","justifyContent","zIndex","borderWidth","width","fontSize","marginBottom","letterSpacing","lineHeight","minWidth","textAlign","fontWeight"],"sourceRoot":"../../../../src","sources":["ui/screens/ProfileScreen.tsx"],"mappings":"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","ignoreList":[]}
@@ -236,13 +236,7 @@ export async function syncBackgroundSession(input) {
236
236
  });
237
237
  return;
238
238
  }
239
- const persisted = await native.put({
240
- baseUrl: oxyServices.getBaseURL(),
241
- deviceId: provisioned.deviceId,
242
- secret: provisioned.secret,
243
- accountId: provisioned.accountId,
244
- expiresAt
245
- });
239
+ const persisted = await native.put(oxyServices.getBaseURL(), provisioned.deviceId, provisioned.secret, provisioned.accountId, expiresAt);
246
240
  if (!persisted) {
247
241
  logger.warn('[backgroundSession] the native store did not retain the background credential; background refreshes stay signed out until the next attempt', {
248
242
  component: 'backgroundSession'
@@ -1 +1 @@
1
- {"version":3,"names":["requireOptionalNativeModule","Platform","logger","RENEW_WHEN_REMAINING_MS","nativeModule","loadNativeModule","undefined","OS","native","put","clear","peek","bind","isBackgroundSessionSupported","clearBackgroundSession","error","warn","component","assertProvisioningAvailable","oxyServices","provisionBackgroundCredential","message","Error","syncBackgroundSession","input","userId","canUsePrivateApi","isCurrent","stored","accountId","isForCurrentAccount","hasLifeLeft","expiresAt","Date","now","provisioned","parse","Number","isFinite","persisted","baseUrl","getBaseURL","deviceId","secret"],"sourceRoot":"../../../../src","sources":["ui/session/backgroundSession.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,2BAA2B,QAAQ,mBAAmB;AAC/D,SAASC,QAAQ,QAAQ,cAAc;AAEvC,SAASC,MAAM,QAAQ,aAAa;;AAEpC;AACA;AACA;AACA;AACA;;AAiBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,uBAAuB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;AAEvD,IAAIC,YAAiE;;AAErE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,gBAAgBA,CAAA,EAA4C;EACnE,IAAID,YAAY,KAAKE,SAAS,EAAE;IAC9B,IAAIL,QAAQ,CAACM,EAAE,KAAK,KAAK,EAAE;MACzBH,YAAY,GAAG,IAAI;MACnB,OAAOA,YAAY;IACrB;IACA,MAAMI,MAAM,GAAGR,2BAA2B,CACxC,sBACF,CAAC;IACDI,YAAY,GACVI,MAAM,IACN,OAAOA,MAAM,CAACC,GAAG,KAAK,UAAU,IAChC,OAAOD,MAAM,CAACE,KAAK,KAAK,UAAU,IAClC,OAAOF,MAAM,CAACG,IAAI,KAAK,UAAU,GAC7B;MACEF,GAAG,EAAED,MAAM,CAACC,GAAG,CAACG,IAAI,CAACJ,MAAM,CAAC;MAC5BE,KAAK,EAAEF,MAAM,CAACE,KAAK,CAACE,IAAI,CAACJ,MAAM,CAAC;MAChCG,IAAI,EAAEH,MAAM,CAACG,IAAI,CAACC,IAAI,CAACJ,MAAM;IAC/B,CAAC,GACD,IAAI;EACZ;EACA,OAAOJ,YAAY;AACrB;;AAEA;AACA,OAAO,SAASS,4BAA4BA,CAAA,EAAY;EACtD,OAAOR,gBAAgB,CAAC,CAAC,KAAK,IAAI;AACpC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeS,sBAAsBA,CAAA,EAAkB;EAC5D,MAAMN,MAAM,GAAGH,gBAAgB,CAAC,CAAC;EACjC,IAAI,CAACG,MAAM,EAAE;IACX;EACF;EACA,IAAI;IACF,MAAMA,MAAM,CAACE,KAAK,CAAC,CAAC;EACtB,CAAC,CAAC,OAAOK,KAAK,EAAE;IACdb,MAAM,CAACc,IAAI,CAAC,sEAAsE,EAAE;MAClFC,SAAS,EAAE,mBAAmB;MAC9BF;IACF,CAAC,CAAC;EACJ;AACF;AAgBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASG,2BAA2BA,CAACC,WAAwB,EAAQ;EACnE,IAAI,OAAOA,WAAW,CAACC,6BAA6B,KAAK,UAAU,EAAE;IACnE;EACF;EACA,MAAMC,OAAO,GACX,sFAAsF,GACtF,sFAAsF,GACtF,0FAA0F;EAC5FnB,MAAM,CAACa,KAAK,CAACM,OAAO,EAAEf,SAAS,EAAE;IAAEW,SAAS,EAAE;EAAoB,CAAC,CAAC;EACpE,MAAM,IAAIK,KAAK,CAACD,OAAO,CAAC;AAC1B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeE,qBAAqBA,CAACC,KAAiC,EAAiB;EAC5F,MAAMhB,MAAM,GAAGH,gBAAgB,CAAC,CAAC;EACjC,IAAI,CAACG,MAAM,EAAE;IACX;EACF;EACA,MAAM;IAAEW,WAAW;IAAEM,MAAM;IAAEC,gBAAgB;IAAEC;EAAU,CAAC,GAAGH,KAAK;;EAElE;EACA;EACA;EACA,IAAIC,MAAM,EAAE;IACVP,2BAA2B,CAACC,WAAW,CAAC;EAC1C;EAEA,IAAI;IACF,IAAI,CAACM,MAAM,EAAE;MACX;MACA,MAAMjB,MAAM,CAACE,KAAK,CAAC,CAAC;MACpB;IACF;IAEA,MAAMkB,MAAM,GAAG,MAAMpB,MAAM,CAACG,IAAI,CAAC,CAAC;IAClC,IAAIiB,MAAM,IAAIA,MAAM,CAACC,SAAS,KAAKJ,MAAM,EAAE;MACzC;MACA,MAAMjB,MAAM,CAACE,KAAK,CAAC,CAAC;IACtB;IAEA,MAAMoB,mBAAmB,GAAGF,MAAM,EAAEC,SAAS,KAAKJ,MAAM;IACxD,MAAMM,WAAW,GACfD,mBAAmB,IAAIF,MAAM,CAACI,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC,GAAG/B,uBAAuB;IAChF,IAAI4B,WAAW,EAAE;MACf;IACF;;IAEA;IACA;IACA;IACA,IAAI,CAACL,gBAAgB,IAAI,CAACC,SAAS,CAAC,CAAC,EAAE;MACrC;IACF;IAEA,MAAMQ,WAAW,GAAG,MAAMhB,WAAW,CAACC,6BAA6B,CAAC,CAAC;IACrE,IAAI,CAACe,WAAW,EAAE;MAChB;MACA;MACA;IACF;IACA,IAAI,CAACR,SAAS,CAAC,CAAC,EAAE;MAChB;IACF;IACA,IAAIQ,WAAW,CAACN,SAAS,KAAKJ,MAAM,EAAE;MACpC;MACA;MACA;MACA,MAAMjB,MAAM,CAACE,KAAK,CAAC,CAAC;MACpB;IACF;IAEA,MAAMsB,SAAS,GAAGC,IAAI,CAACG,KAAK,CAACD,WAAW,CAACH,SAAS,CAAC;IACnD,IAAI,CAACK,MAAM,CAACC,QAAQ,CAACN,SAAS,CAAC,EAAE;MAC/B9B,MAAM,CAACc,IAAI,CAAC,sEAAsE,EAAE;QAClFC,SAAS,EAAE;MACb,CAAC,CAAC;MACF;IACF;IAEA,MAAMsB,SAAS,GAAG,MAAM/B,MAAM,CAACC,GAAG,CAAC;MACjC+B,OAAO,EAAErB,WAAW,CAACsB,UAAU,CAAC,CAAC;MACjCC,QAAQ,EAAEP,WAAW,CAACO,QAAQ;MAC9BC,MAAM,EAAER,WAAW,CAACQ,MAAM;MAC1Bd,SAAS,EAAEM,WAAW,CAACN,SAAS;MAChCG;IACF,CAAC,CAAC;IACF,IAAI,CAACO,SAAS,EAAE;MACdrC,MAAM,CAACc,IAAI,CACT,4IAA4I,EAC5I;QAAEC,SAAS,EAAE;MAAoB,CACnC,CAAC;IACH;EACF,CAAC,CAAC,OAAOF,KAAK,EAAE;IACdb,MAAM,CAACc,IAAI,CAAC,qEAAqE,EAAE;MACjFC,SAAS,EAAE,mBAAmB;MAC9BF;IACF,CAAC,CAAC;EACJ;AACF","ignoreList":[]}
1
+ {"version":3,"names":["requireOptionalNativeModule","Platform","logger","RENEW_WHEN_REMAINING_MS","nativeModule","loadNativeModule","undefined","OS","native","put","clear","peek","bind","isBackgroundSessionSupported","clearBackgroundSession","error","warn","component","assertProvisioningAvailable","oxyServices","provisionBackgroundCredential","message","Error","syncBackgroundSession","input","userId","canUsePrivateApi","isCurrent","stored","accountId","isForCurrentAccount","hasLifeLeft","expiresAt","Date","now","provisioned","parse","Number","isFinite","persisted","getBaseURL","deviceId","secret"],"sourceRoot":"../../../../src","sources":["ui/session/backgroundSession.ts"],"mappings":"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","ignoreList":[]}
@@ -4,12 +4,11 @@
4
4
  * User display name and date formatting utilities.
5
5
  *
6
6
  * Display-name helpers follow the API contract: prefer `name.displayName` when
7
- * present, otherwise fall back to the normalized handle. The legacy
8
- * `getAccountDisplayName` chain is only used as a last resort for local
9
- * account-switcher surfaces without a handle.
7
+ * present, otherwise fall back to the normalized handle via
8
+ * `getNormalizedUserHandle`.
10
9
  */
11
10
 
12
- import { getAccountDisplayName as coreGetAccountDisplayName, getNormalizedUserHandle } from '@oxyhq/core';
11
+ import { getNormalizedUserHandle } from '@oxyhq/core';
13
12
 
14
13
  /**
15
14
  * Formats a date string to a readable format (e.g., "Feb 21, 2025")
@@ -37,37 +36,28 @@ function readDisplayName(user) {
37
36
  /**
38
37
  * Gets a display name from user data.
39
38
  *
40
- * Prefers API `name.displayName`, then the normalized handle, then the local
41
- * account-switcher fallback chain.
39
+ * Prefers API `name.displayName`, then the normalized handle.
42
40
  */
43
- export const getDisplayName = (user, locale) => {
41
+ export const getDisplayName = user => {
44
42
  const displayName = readDisplayName(user);
45
43
  if (displayName) return displayName;
46
- const handle = getNormalizedUserHandle(user);
47
- if (handle) return handle;
48
- return coreGetAccountDisplayName(user, locale);
44
+ return getNormalizedUserHandle(user) ?? '';
49
45
  };
50
46
 
51
47
  /**
52
48
  * Gets a short display name (first token) for compact UI.
53
49
  */
54
- export const getShortDisplayName = (user, locale) => {
50
+ export const getShortDisplayName = user => {
55
51
  const displayName = readDisplayName(user);
56
52
  if (displayName) {
57
53
  const firstToken = displayName.split(/\s+/).find(Boolean);
58
54
  if (firstToken) return firstToken;
59
55
  }
60
- const name = user?.name;
61
- if (name && typeof name === 'object') {
62
- const first = typeof name.first === 'string' ? name.first.trim() : '';
63
- if (first) return first.split(/\s+/)[0] ?? first;
64
- const full = typeof name.full === 'string' ? name.full.trim() : '';
65
- if (full) return full.split(/\s+/)[0] ?? full;
66
- } else if (typeof name === 'string' && name.trim()) {
67
- return name.trim().split(/\s+/)[0] ?? name.trim();
68
- }
69
56
  const handle = getNormalizedUserHandle(user);
70
- if (handle) return handle;
71
- return coreGetAccountDisplayName(user, locale);
57
+ if (handle) {
58
+ const firstToken = handle.split(/\s+/).find(Boolean);
59
+ return firstToken ?? handle;
60
+ }
61
+ return '';
72
62
  };
73
63
  //# sourceMappingURL=userUtils.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["getAccountDisplayName","coreGetAccountDisplayName","getNormalizedUserHandle","formatDate","dateString","date","Date","Number","isNaN","getTime","toLocaleDateString","month","day","year","readDisplayName","user","name","displayName","trim","getDisplayName","locale","handle","getShortDisplayName","firstToken","split","find","Boolean","first","full"],"sourceRoot":"../../../../src","sources":["ui/utils/userUtils.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["getNormalizedUserHandle","formatDate","dateString","date","Date","Number","isNaN","getTime","toLocaleDateString","month","day","year","readDisplayName","user","name","displayName","trim","getDisplayName","getShortDisplayName","firstToken","split","find","Boolean","handle"],"sourceRoot":"../../../../src","sources":["ui/utils/userUtils.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,uBAAuB,QAAmC,aAAa;;AAEhF;AACA;AACA;AACA,OAAO,MAAMC,UAAU,GAAIC,UAA4C,IAAa;EAClF,IAAI,CAACA,UAAU,EAAE,OAAO,EAAE;EAE1B,IAAI;IACF,MAAMC,IAAI,GAAGD,UAAU,YAAYE,IAAI,GAAGF,UAAU,GAAG,IAAIE,IAAI,CAACF,UAAU,CAAC;IAC3E,IAAIG,MAAM,CAACC,KAAK,CAACH,IAAI,CAACI,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE;IAE3C,OAAOJ,IAAI,CAACK,kBAAkB,CAAC,OAAO,EAAE;MACtCC,KAAK,EAAE,OAAO;MACdC,GAAG,EAAE,SAAS;MACdC,IAAI,EAAE;IACR,CAAC,CAAC;EACJ,CAAC,CAAC,MAAM;IACN,OAAO,EAAE;EACX;AACF,CAAC;AAED,SAASC,eAAeA,CAACC,IAA6C,EAAU;EAC9E,MAAMC,IAAI,GAAGD,IAAI,EAAEC,IAAI;EACvB,IAAI,CAACA,IAAI,IAAI,OAAOA,IAAI,KAAK,QAAQ,EAAE,OAAO,EAAE;EAChD,OAAO,OAAOA,IAAI,CAACC,WAAW,KAAK,QAAQ,GAAGD,IAAI,CAACC,WAAW,CAACC,IAAI,CAAC,CAAC,GAAG,EAAE;AAC5E;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GACzBJ,IAA6C,IAClC;EACX,MAAME,WAAW,GAAGH,eAAe,CAACC,IAAI,CAAC;EACzC,IAAIE,WAAW,EAAE,OAAOA,WAAW;EACnC,OAAOf,uBAAuB,CAACa,IAAI,CAAC,IAAI,EAAE;AAC5C,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMK,mBAAmB,GAC9BL,IAA6C,IAClC;EACX,MAAME,WAAW,GAAGH,eAAe,CAACC,IAAI,CAAC;EACzC,IAAIE,WAAW,EAAE;IACf,MAAMI,UAAU,GAAGJ,WAAW,CAACK,KAAK,CAAC,KAAK,CAAC,CAACC,IAAI,CAACC,OAAO,CAAC;IACzD,IAAIH,UAAU,EAAE,OAAOA,UAAU;EACnC;EAEA,MAAMI,MAAM,GAAGvB,uBAAuB,CAACa,IAAI,CAAC;EAC5C,IAAIU,MAAM,EAAE;IACV,MAAMJ,UAAU,GAAGI,MAAM,CAACH,KAAK,CAAC,KAAK,CAAC,CAACC,IAAI,CAACC,OAAO,CAAC;IACpD,OAAOH,UAAU,IAAII,MAAM;EAC7B;EAEA,OAAO,EAAE;AACX,CAAC","ignoreList":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"ProfileScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/ProfileScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAe3D,UAAU,kBAAmB,SAAQ,eAAe;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAOD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAoS/C,CAAC;AAuCF,eAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"ProfileScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/ProfileScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAe3D,UAAU,kBAAmB,SAAQ,eAAe;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAOD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAkT/C,CAAC;AAuCF,eAAe,aAAa,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"backgroundSession.d.ts","sourceRoot":"","sources":["../../../../../src/ui/session/backgroundSession.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AA2F/C,yEAAyE;AACzE,wBAAgB,4BAA4B,IAAI,OAAO,CAEtD;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAa5D;AAED,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,WAAW,CAAC;IACzB,wDAAwD;IACxD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,qEAAqE;IACrE,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,SAAS,EAAE,MAAM,OAAO,CAAC;CAC1B;AA8BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAqF5F"}
1
+ {"version":3,"file":"backgroundSession.d.ts","sourceRoot":"","sources":["../../../../../src/ui/session/backgroundSession.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAyG/C,yEAAyE;AACzE,wBAAgB,4BAA4B,IAAI,OAAO,CAEtD;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAa5D;AAED,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,WAAW,CAAC;IACzB,wDAAwD;IACxD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,qEAAqE;IACrE,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,SAAS,EAAE,MAAM,OAAO,CAAC;CAC1B;AA8BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAqF5F"}
@@ -2,9 +2,8 @@
2
2
  * User display name and date formatting utilities.
3
3
  *
4
4
  * Display-name helpers follow the API contract: prefer `name.displayName` when
5
- * present, otherwise fall back to the normalized handle. The legacy
6
- * `getAccountDisplayName` chain is only used as a last resort for local
7
- * account-switcher surfaces without a handle.
5
+ * present, otherwise fall back to the normalized handle via
6
+ * `getNormalizedUserHandle`.
8
7
  */
9
8
  import { type DisplayNameUserShape } from '@oxyhq/core';
10
9
  /**
@@ -14,12 +13,11 @@ export declare const formatDate: (dateString: string | undefined | null | Date)
14
13
  /**
15
14
  * Gets a display name from user data.
16
15
  *
17
- * Prefers API `name.displayName`, then the normalized handle, then the local
18
- * account-switcher fallback chain.
16
+ * Prefers API `name.displayName`, then the normalized handle.
19
17
  */
20
- export declare const getDisplayName: (user: DisplayNameUserShape | null | undefined, locale?: string) => string;
18
+ export declare const getDisplayName: (user: DisplayNameUserShape | null | undefined) => string;
21
19
  /**
22
20
  * Gets a short display name (first token) for compact UI.
23
21
  */
24
- export declare const getShortDisplayName: (user: DisplayNameUserShape | null | undefined, locale?: string) => string;
22
+ export declare const getShortDisplayName: (user: DisplayNameUserShape | null | undefined) => string;
25
23
  //# sourceMappingURL=userUtils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"userUtils.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/userUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,aAAa,CAAC;AAErB;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,YAAY,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,KAAG,MAezE,CAAC;AAQF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,oBAAoB,GAAG,IAAI,GAAG,SAAS,EAC7C,SAAS,MAAM,KACd,MAQF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,oBAAoB,GAAG,IAAI,GAAG,SAAS,EAC7C,SAAS,MAAM,KACd,MAqBF,CAAC"}
1
+ {"version":3,"file":"userUtils.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/userUtils.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAA2B,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEjF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,YAAY,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,KAAG,MAezE,CAAC;AAQF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,oBAAoB,GAAG,IAAI,GAAG,SAAS,KAC5C,MAIF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,oBAAoB,GAAG,IAAI,GAAG,SAAS,KAC5C,MAcF,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"ProfileScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/ProfileScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAe3D,UAAU,kBAAmB,SAAQ,eAAe;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAOD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAoS/C,CAAC;AAuCF,eAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"ProfileScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/ProfileScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAe3D,UAAU,kBAAmB,SAAQ,eAAe;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAOD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAkT/C,CAAC;AAuCF,eAAe,aAAa,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"backgroundSession.d.ts","sourceRoot":"","sources":["../../../../../src/ui/session/backgroundSession.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AA2F/C,yEAAyE;AACzE,wBAAgB,4BAA4B,IAAI,OAAO,CAEtD;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAa5D;AAED,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,WAAW,CAAC;IACzB,wDAAwD;IACxD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,qEAAqE;IACrE,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,SAAS,EAAE,MAAM,OAAO,CAAC;CAC1B;AA8BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAqF5F"}
1
+ {"version":3,"file":"backgroundSession.d.ts","sourceRoot":"","sources":["../../../../../src/ui/session/backgroundSession.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAyG/C,yEAAyE;AACzE,wBAAgB,4BAA4B,IAAI,OAAO,CAEtD;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAa5D;AAED,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,WAAW,CAAC;IACzB,wDAAwD;IACxD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,qEAAqE;IACrE,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,SAAS,EAAE,MAAM,OAAO,CAAC;CAC1B;AA8BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAqF5F"}
@@ -2,9 +2,8 @@
2
2
  * User display name and date formatting utilities.
3
3
  *
4
4
  * Display-name helpers follow the API contract: prefer `name.displayName` when
5
- * present, otherwise fall back to the normalized handle. The legacy
6
- * `getAccountDisplayName` chain is only used as a last resort for local
7
- * account-switcher surfaces without a handle.
5
+ * present, otherwise fall back to the normalized handle via
6
+ * `getNormalizedUserHandle`.
8
7
  */
9
8
  import { type DisplayNameUserShape } from '@oxyhq/core';
10
9
  /**
@@ -14,12 +13,11 @@ export declare const formatDate: (dateString: string | undefined | null | Date)
14
13
  /**
15
14
  * Gets a display name from user data.
16
15
  *
17
- * Prefers API `name.displayName`, then the normalized handle, then the local
18
- * account-switcher fallback chain.
16
+ * Prefers API `name.displayName`, then the normalized handle.
19
17
  */
20
- export declare const getDisplayName: (user: DisplayNameUserShape | null | undefined, locale?: string) => string;
18
+ export declare const getDisplayName: (user: DisplayNameUserShape | null | undefined) => string;
21
19
  /**
22
20
  * Gets a short display name (first token) for compact UI.
23
21
  */
24
- export declare const getShortDisplayName: (user: DisplayNameUserShape | null | undefined, locale?: string) => string;
22
+ export declare const getShortDisplayName: (user: DisplayNameUserShape | null | undefined) => string;
25
23
  //# sourceMappingURL=userUtils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"userUtils.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/userUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,aAAa,CAAC;AAErB;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,YAAY,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,KAAG,MAezE,CAAC;AAQF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,oBAAoB,GAAG,IAAI,GAAG,SAAS,EAC7C,SAAS,MAAM,KACd,MAQF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,oBAAoB,GAAG,IAAI,GAAG,SAAS,EAC7C,SAAS,MAAM,KACd,MAqBF,CAAC"}
1
+ {"version":3,"file":"userUtils.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/userUtils.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAA2B,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEjF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,YAAY,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,KAAG,MAezE,CAAC;AAQF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,oBAAoB,GAAG,IAAI,GAAG,SAAS,KAC5C,MAIF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,oBAAoB,GAAG,IAAI,GAAG,SAAS,KAC5C,MAcF,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@oxyhq/services",
3
- "version": "24.0.1",
3
+ "version": "24.0.2",
4
4
  "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
5
5
  "main": "lib/commonjs/index.js",
6
6
  "module": "lib/module/index.js",
@@ -148,7 +148,7 @@
148
148
  "@commitlint/cli": "^21.2.1",
149
149
  "@commitlint/config-conventional": "^21.2.0",
150
150
  "@expo/vector-icons": "^15.0.3",
151
- "@oxyhq/core": "15.0.0",
151
+ "@oxyhq/core": "15.0.1",
152
152
  "@react-native-async-storage/async-storage": "^2.0.0",
153
153
  "@react-native-community/netinfo": "^11.4.1",
154
154
  "@react-native/babel-preset": "^0.86.0",
@@ -135,8 +135,13 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
135
135
  // title (a stable "Profile" fallback before it resolves), so the banner +
136
136
  // overlapping avatar scroll as content UNDER the shared gradient nav bar.
137
137
  // `onImage` tone keeps the title + close legible over the colored banner.
138
+ // Ends in a string, deliberately: `getNormalizedUserHandle` answers `null` for a
139
+ // user it cannot normalise, and letting that null travel makes this `string | null`
140
+ // — which does not satisfy `Avatar.name` and does not typecheck. Empty is the honest
141
+ // bottom of the chain and every reader below already treats it as falsy
142
+ // (`displayName || t('profile.title')`), so nothing renders a literal "null".
138
143
  const displayName = profile
139
- ? (profile.name?.displayName ?? getNormalizedUserHandle(profile))
144
+ ? (profile.name?.displayName ?? getNormalizedUserHandle(profile) ?? '')
140
145
  : username || '';
141
146
  useSurfaceHeader({
142
147
  title: displayName || t('profile.title'),
@@ -191,8 +196,17 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
191
196
  <View style={styles.avatarRow} className="px-screen-margin">
192
197
  <View style={styles.avatarWrapper} className="border-bg bg-bg rounded-radius-max">
193
198
  <Avatar
194
- source={profile?.avatar ? oxyServices.getFileDownloadUrl(profile.avatar, 'thumb') : undefined}
195
- name={displayName || username}
199
+ // `getFileDownloadUrl` answers `null` for a reference it cannot
200
+ // resolve, and `Avatar.source` takes `undefined` for "no picture" —
201
+ // the two spellings of absent do not meet, so the coalesce is the
202
+ // whole fix. Without it this file does not typecheck, which blocks
203
+ // `bun run build` and therefore every publish of this package.
204
+ source={
205
+ profile?.avatar
206
+ ? (oxyServices.getFileDownloadUrl(profile.avatar, 'thumb') ?? undefined)
207
+ : undefined
208
+ }
209
+ name={displayName}
196
210
  size={AVATAR_SIZE}
197
211
  />
198
212
  </View>
@@ -153,13 +153,18 @@ describe('syncBackgroundSession', () => {
153
153
  });
154
154
 
155
155
  expect(provision).toHaveBeenCalledTimes(1);
156
- expect(native.put).toHaveBeenCalledWith({
157
- baseUrl: 'https://api.oxy.so',
158
- deviceId: 'device-1',
159
- secret: 'bg-secret',
160
- accountId: 'user-1',
161
- expiresAt: Date.parse(expiresAt),
162
- });
156
+ // Positional scalars, and the ORDER is the contract: the native signature is
157
+ // five parameters, not one object, because an Expo Modules `Record` does not
158
+ // convert in a consumer build of this package and every call was rejected. A
159
+ // silently reordered argument would store a credential that no mint can use, so
160
+ // this assertion is what pins the order — see `OxyBackgroundSessionModule.kt`.
161
+ expect(native.put).toHaveBeenCalledWith(
162
+ 'https://api.oxy.so',
163
+ 'device-1',
164
+ 'bg-secret',
165
+ 'user-1',
166
+ Date.parse(expiresAt),
167
+ );
163
168
  // Same account, so nothing was revoked on the way.
164
169
  expect(native.clear).not.toHaveBeenCalled();
165
170
  });
@@ -44,15 +44,29 @@ import { logger } from '@oxyhq/core';
44
44
  * secret's only reader is one less place it can leak from.
45
45
  */
46
46
  interface OxyBackgroundSessionNativeModule {
47
- /** Store (replacing) the credential. Resolves `false` when it was rejected or storage failed. */
48
- put(credential: {
49
- baseUrl: string;
50
- deviceId: string;
51
- secret: string;
52
- accountId: string;
53
- /** Epoch millis parsed from the server's ISO-8601 string here, not natively. */
54
- expiresAt: number;
55
- }): Promise<boolean>;
47
+ /**
48
+ * Store (replacing) the credential. Resolves `false` when it was rejected or
49
+ * storage failed.
50
+ *
51
+ * Positional scalars rather than one object, matching the native signature — and
52
+ * that shape is load-bearing, not a preference. Passing an object made this an
53
+ * Expo Modules `Record`, and a `Record` does not convert in a consumer build of
54
+ * this package: every call was rejected with `The 1st argument cannot be cast to
55
+ * type CredentialInput (received class ReadableNativeMap)`, so the credential was
56
+ * never stored and background refreshes stayed signed out. See the comment on
57
+ * `AsyncFunction("put")` in `OxyBackgroundSessionModule.kt` for why, and do not
58
+ * restore the object form without proving on a device that a `Record` converts.
59
+ *
60
+ * `expiresAtMs` is epoch millis, parsed from the server's ISO-8601 string here
61
+ * rather than natively.
62
+ */
63
+ put(
64
+ baseUrl: string,
65
+ deviceId: string,
66
+ secret: string,
67
+ accountId: string,
68
+ expiresAtMs: number,
69
+ ): Promise<boolean>;
56
70
  /** Drop the credential and any cached access token. */
57
71
  clear(): Promise<boolean>;
58
72
  /** What is stored: the owning account and its expiry (epoch millis), or `null`. */
@@ -277,13 +291,13 @@ export async function syncBackgroundSession(input: BackgroundSessionSyncInput):
277
291
  return;
278
292
  }
279
293
 
280
- const persisted = await native.put({
281
- baseUrl: oxyServices.getBaseURL(),
282
- deviceId: provisioned.deviceId,
283
- secret: provisioned.secret,
284
- accountId: provisioned.accountId,
294
+ const persisted = await native.put(
295
+ oxyServices.getBaseURL(),
296
+ provisioned.deviceId,
297
+ provisioned.secret,
298
+ provisioned.accountId,
285
299
  expiresAt,
286
- });
300
+ );
287
301
  if (!persisted) {
288
302
  logger.warn(
289
303
  '[backgroundSession] the native store did not retain the background credential; background refreshes stay signed out until the next attempt',
@@ -2,16 +2,11 @@
2
2
  * User display name and date formatting utilities.
3
3
  *
4
4
  * Display-name helpers follow the API contract: prefer `name.displayName` when
5
- * present, otherwise fall back to the normalized handle. The legacy
6
- * `getAccountDisplayName` chain is only used as a last resort for local
7
- * account-switcher surfaces without a handle.
5
+ * present, otherwise fall back to the normalized handle via
6
+ * `getNormalizedUserHandle`.
8
7
  */
9
8
 
10
- import {
11
- getAccountDisplayName as coreGetAccountDisplayName,
12
- getNormalizedUserHandle,
13
- type DisplayNameUserShape,
14
- } from '@oxyhq/core';
9
+ import { getNormalizedUserHandle, type DisplayNameUserShape } from '@oxyhq/core';
15
10
 
16
11
  /**
17
12
  * Formats a date string to a readable format (e.g., "Feb 21, 2025")
@@ -42,20 +37,14 @@ function readDisplayName(user: DisplayNameUserShape | null | undefined): string
42
37
  /**
43
38
  * Gets a display name from user data.
44
39
  *
45
- * Prefers API `name.displayName`, then the normalized handle, then the local
46
- * account-switcher fallback chain.
40
+ * Prefers API `name.displayName`, then the normalized handle.
47
41
  */
48
42
  export const getDisplayName = (
49
43
  user: DisplayNameUserShape | null | undefined,
50
- locale?: string,
51
44
  ): string => {
52
45
  const displayName = readDisplayName(user);
53
46
  if (displayName) return displayName;
54
-
55
- const handle = getNormalizedUserHandle(user);
56
- if (handle) return handle;
57
-
58
- return coreGetAccountDisplayName(user, locale);
47
+ return getNormalizedUserHandle(user) ?? '';
59
48
  };
60
49
 
61
50
  /**
@@ -63,7 +52,6 @@ export const getDisplayName = (
63
52
  */
64
53
  export const getShortDisplayName = (
65
54
  user: DisplayNameUserShape | null | undefined,
66
- locale?: string,
67
55
  ): string => {
68
56
  const displayName = readDisplayName(user);
69
57
  if (displayName) {
@@ -71,18 +59,11 @@ export const getShortDisplayName = (
71
59
  if (firstToken) return firstToken;
72
60
  }
73
61
 
74
- const name = user?.name;
75
- if (name && typeof name === 'object') {
76
- const first = typeof name.first === 'string' ? name.first.trim() : '';
77
- if (first) return first.split(/\s+/)[0] ?? first;
78
- const full = typeof name.full === 'string' ? name.full.trim() : '';
79
- if (full) return full.split(/\s+/)[0] ?? full;
80
- } else if (typeof name === 'string' && name.trim()) {
81
- return name.trim().split(/\s+/)[0] ?? name.trim();
82
- }
83
-
84
62
  const handle = getNormalizedUserHandle(user);
85
- if (handle) return handle;
63
+ if (handle) {
64
+ const firstToken = handle.split(/\s+/).find(Boolean);
65
+ return firstToken ?? handle;
66
+ }
86
67
 
87
- return coreGetAccountDisplayName(user, locale);
68
+ return '';
88
69
  };