@oxyhq/services 6.9.32 → 6.9.33

package/lib/commonjs/ui/components/FollowButton.js

@@ -10,22 +10,9 @@ var _OxyContext = require("../context/OxyContext.js");
 var _fonts = require("../styles/fonts.js");
 var _sonner = require("../../lib/sonner");
 var _useFollow = require("../hooks/useFollow.js");
-var _theme2 = require("@oxyhq/bloom/theme");
+var _theme = require("@oxyhq/bloom/theme");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-/**
- * Inner component that handles all hooks and rendering.
- *
- * Separated from the outer wrapper to avoid a Rules of Hooks violation.
- * The outer wrapper handles the auth/self-follow guard and returns null
- * before any hooks are called. This inner component always renders
- * (all hooks are called unconditionally).
- *
- * Receives oxyServices as a prop instead of calling useOxy(), so it does
- * not subscribe to the OxyContext. This is critical in list contexts where
- * N buttons would all re-render on any context change (session socket events,
- * token refreshes, etc.).
- */
 const FollowButtonInner = /*#__PURE__*/(0, _react.memo)(function FollowButtonInner({
   userId,
   oxyServices,
@@ -36,13 +23,11 @@ const FollowButtonInner = /*#__PURE__*/(0, _react.memo)(function FollowButtonInn
   textStyle,
   disabled = false,
   showLoadingState = true,
-  preventParentActions = true,
-  theme: _theme = 'light'
+  preventParentActions = true
 }) {
-  const bloomTheme = (0, _theme2.useTheme)();
-  const colors = bloomTheme.colors;
-
-  // Uses granular Zustand selectors — only re-renders when THIS user's data changes
+  const {
+    colors
+  } = (0, _theme.useTheme)();
   const {
     isFollowing,
     isLoading,
@@ -50,80 +35,47 @@ const FollowButtonInner = /*#__PURE__*/(0, _react.memo)(function FollowButtonInn
     setFollowStatus,
     fetchStatus
   } = (0, _useFollow.useFollowForButton)(userId, oxyServices);
-
-  // Stable press handler — depends on primitives only
   const handlePress = (0, _react.useCallback)(async event => {
-    if (preventParentActions && event && event.preventDefault) {
+    if (preventParentActions && event?.preventDefault) {
       event.preventDefault();
       event.stopPropagation?.();
     }
     if (disabled || isLoading) return;
     try {
       await toggleFollow();
-      if (onFollowChange) onFollowChange(!isFollowing);
+      onFollowChange?.(!isFollowing);
     } catch (err) {
       const error = err instanceof Error ? err : new Error(String(err));
       _sonner.toast.error(error.message || 'Failed to update follow status');
     }
   }, [disabled, isLoading, toggleFollow, onFollowChange, isFollowing, preventParentActions]);
-
-  // Set initial follow status on mount if provided and not already set
   (0, _react.useEffect)(() => {
     if (userId && !isFollowing && initiallyFollowing) {
       setFollowStatus(initiallyFollowing);
     }
-    // Intentional: only run on mount with initial values
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [userId, initiallyFollowing]);
-
-  // Fetch latest follow status from backend on mount
   (0, _react.useEffect)(() => {
-    if (userId) {
-      fetchStatus();
-    }
+    if (userId) fetchStatus();
   }, [userId, fetchStatus]);
-
-  // Colors from bloom theme — follows NativeWind convention via useTheme()
-  // Not following: bg-primary, border-primary, text white
-  // Following: bg-background, border-border, text-foreground
-  const buttonColorStyle = isFollowing ? {
-    backgroundColor: colors.background,
-    borderColor: colors.border
-  } : {
-    backgroundColor: colors.primary,
-    borderColor: colors.primary
-  };
-  const textColor = isFollowing ? colors.text : '#FFFFFF';
   const baseButtonStyle = getBaseButtonStyle(size, style);
   const baseTextStyle = getBaseTextStyle(size, textStyle);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
-    style: [baseButtonStyle, buttonColorStyle],
+    className: isFollowing ? 'bg-background border-border' : 'bg-primary border-primary',
+    style: baseButtonStyle,
     onPress: handlePress,
     disabled: disabled || isLoading,
     activeOpacity: 0.8,
     children: showLoadingState && isLoading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ActivityIndicator, {
       size: "small",
-      color: textColor
+      color: isFollowing ? colors.text : '#FFFFFF'
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
-      style: [baseTextStyle, {
-        color: textColor
-      }],
+      className: isFollowing ? 'text-foreground' : 'text-primary-foreground',
+      style: baseTextStyle,
       children: isFollowing ? 'Following' : 'Follow'
     })
   });
 });
-
-/**
- * Outer wrapper that handles the "should we render?" check.
- *
- * This is the ONLY place useOxy() is called — to check authentication and
- * get the current user ID for the self-follow guard. The oxyServices instance
- * is passed down as a prop to the inner component, which avoids subscribing
- * to the full OxyContext.
- *
- * The early return happens BEFORE the inner component mounts, so the inner
- * component's hooks are never called conditionally (no Rules of Hooks violation).
- */
 const FollowButton = props => {
   const {
     oxyServices,
@@ -132,8 +84,6 @@ const FollowButton = props => {
   } = (0, _OxyContext.useOxy)();
   const currentUserId = currentUser?.id ? String(currentUser.id).trim() : '';
   const targetUserId = props.userId ? String(props.userId).trim() : '';
-
-  // Don't render if not authenticated or viewing own profile
   if (!isAuthenticated || !targetUserId || currentUserId && currentUserId === targetUserId) {
     return null;
   }
@@ -143,8 +93,6 @@ const FollowButton = props => {
     oxyServices: oxyServices
   });
 };
-
-// Pure helper functions (no hooks, no state) extracted outside the component
 exports.FollowButton = FollowButton;
 function getBaseButtonStyle(size, style) {
   const baseStyle = {

package/lib/commonjs/ui/components/FollowButton.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_OxyContext","_fonts","_sonner","_useFollow","_theme2","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","FollowButtonInner","memo","userId","oxyServices","initiallyFollowing","size","onFollowChange","style","textStyle","disabled","showLoadingState","preventParentActions","theme","_theme","bloomTheme","useTheme","colors","isFollowing","isLoading","toggleFollow","setFollowStatus","fetchStatus","useFollowForButton","handlePress","useCallback","event","preventDefault","stopPropagation","err","error","Error","String","toast","message","useEffect","buttonColorStyle","backgroundColor","background","borderColor","border","primary","textColor","text","baseButtonStyle","getBaseButtonStyle","baseTextStyle","getBaseTextStyle","jsx","TouchableOpacity","onPress","activeOpacity","children","ActivityIndicator","color","Text","FollowButton","props","isAuthenticated","user","currentUser","useOxy","currentUserId","id","trim","targetUserId","exports","baseStyle","flexDirection","alignItems","justifyContent","borderWidth","Platform","select","web","shadowColor","shadowOffset","width","height","shadowOpacity","shadowRadius","elevation","sizeStyle","paddingVertical","paddingHorizontal","minWidth","borderRadius","fontFamily","fontFamilies","interSemiBold","fontWeight","sizeTextStyle","fontSize","_default"],"sourceRoot":"../../../../src","sources":["ui/components/FollowButton.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AASA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,UAAA,GAAAL,OAAA;AACA,IAAAM,OAAA,GAAAN,OAAA;AAA8C,IAAAO,WAAA,GAAAP,OAAA;AAAA,SAAAD,wBAAAS,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAX,uBAAA,YAAAA,CAAAS,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAgB9C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMkB,iBAAiB,gBAAG,IAAAC,WAAI,EAAC,SAASD,iBAAiBA,CAAC;EACxDE,MAAM;EACNC,WAAW;EACXC,kBAAkB,GAAG,KAAK;EAC1BC,IAAI,GAAG,QAAQ;EACfC,cAAc;EACdC,KAAK;EACLC,SAAS;EACTC,QAAQ,GAAG,KAAK;EAChBC,gBAAgB,GAAG,IAAI;EACvBC,oBAAoB,GAAG,IAAI;EAC3BC,KAAK,EAAEC,MAAM,GAAG;AACgC,CAAC,EAAE;EACnD,MAAMC,UAAU,GAAG,IAAAC,gBAAQ,EAAC,CAAC;EAC7B,MAAMC,MAAM,GAAGF,UAAU,CAACE,MAAM;;EAEhC;EACA,MAAM;IACJC,WAAW;IACXC,SAAS;IACTC,YAAY;IACZC,eAAe;IACfC;EACF,CAAC,GAAG,IAAAC,6BAAkB,EAACpB,MAAM,EAAEC,WAAW,CAAC;;EAE3C;EACA,MAAMoB,WAAW,GAAG,IAAAC,kBAAW,EAAC,MAAOC,KAAqE,IAAK;IAC/G,IAAId,oBAAoB,IAAIc,KAAK,IAAIA,KAAK,CAACC,cAAc,EAAE;MACzDD,KAAK,CAACC,cAAc,CAAC,CAAC;MACtBD,KAAK,CAACE,eAAe,GAAG,CAAC;IAC3B;IACA,IAAIlB,QAAQ,IAAIS,SAAS,EAAE;IAE3B,IAAI;MACF,MAAMC,YAAY,CAAC,CAAC;MACpB,IAAIb,cAAc,EAAEA,cAAc,CAAC,CAACW,WAAW,CAAC;IAClD,CAAC,CAAC,OAAOW,GAAY,EAAE;MACrB,MAAMC,KAAK,GAAGD,GAAG,YAAYE,KAAK,GAAGF,GAAG,GAAG,IAAIE,KAAK,CAACC,MAAM,CAACH,GAAG,CAAC,CAAC;MACjEI,aAAK,CAACH,KAAK,CAACA,KAAK,CAACI,OAAO,IAAI,gCAAgC,CAAC;IAChE;EACF,CAAC,EAAE,CAACxB,QAAQ,EAAES,SAAS,EAAEC,YAAY,EAAEb,cAAc,EAAEW,WAAW,EAAEN,oBAAoB,CAAC,CAAC;;EAE1F;EACA,IAAAuB,gBAAS,EAAC,MAAM;IACd,IAAIhC,MAAM,IAAI,CAACe,WAAW,IAAIb,kBAAkB,EAAE;MAChDgB,eAAe,CAAChB,kBAAkB,CAAC;IACrC;IACA;IACA;EACF,CAAC,EAAE,CAACF,MAAM,EAAEE,kBAAkB,CAAC,CAAC;;EAEhC;EACA,IAAA8B,gBAAS,EAAC,MAAM;IACd,IAAIhC,MAAM,EAAE;MACVmB,WAAW,CAAC,CAAC;IACf;EACF,CAAC,EAAE,CAACnB,MAAM,EAAEmB,WAAW,CAAC,CAAC;;EAEzB;EACA;EACA;EACA,MAAMc,gBAA2B,GAAGlB,WAAW,GAC3C;IAAEmB,eAAe,EAAEpB,MAAM,CAACqB,UAAU;IAAEC,WAAW,EAAEtB,MAAM,CAACuB;EAAO,CAAC,GAClE;IAAEH,eAAe,EAAEpB,MAAM,CAACwB,OAAO;IAAEF,WAAW,EAAEtB,MAAM,CAACwB;EAAQ,CAAC;EACpE,MAAMC,SAAS,GAAGxB,WAAW,GAAGD,MAAM,CAAC0B,IAAI,GAAG,SAAS;EAEvD,MAAMC,eAAe,GAAGC,kBAAkB,CAACvC,IAAI,EAAEE,KAAK,CAAC;EACvD,MAAMsC,aAAa,GAAGC,gBAAgB,CAACzC,IAAI,EAAEG,SAAS,CAAC;EAEvD,oBACE,IAAA5B,WAAA,CAAAmE,GAAA,EAACzE,YAAA,CAAA0E,gBAAgB;IACfzC,KAAK,EAAE,CAACoC,eAAe,EAAER,gBAAgB,CAAE;IAC3Cc,OAAO,EAAE1B,WAAY;IACrBd,QAAQ,EAAEA,QAAQ,IAAIS,SAAU;IAChCgC,aAAa,EAAE,GAAI;IAAAC,QAAA,EAElBzC,gBAAgB,IAAIQ,SAAS,gBAC5B,IAAAtC,WAAA,CAAAmE,GAAA,EAACzE,YAAA,CAAA8E,iBAAiB;MAChB/C,IAAI,EAAC,OAAO;MACZgD,KAAK,EAAEZ;IAAU,CAClB,CAAC,gBAEF,IAAA7D,WAAA,CAAAmE,GAAA,EAACzE,YAAA,CAAAgF,IAAI;MAAC/C,KAAK,EAAE,CAACsC,aAAa,EAAE;QAAEQ,KAAK,EAAEZ;MAAU,CAAC,CAAE;MAAAU,QAAA,EAChDlC,WAAW,GAAG,WAAW,GAAG;IAAQ,CACjC;EACP,CACe,CAAC;AAEvB,CAAC,CAAC;;AAEF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMsC,YAAyC,GAAIC,KAAK,IAAK;EAC3D,MAAM;IAAErD,WAAW;IAAEsD,eAAe;IAAEC,IAAI,EAAEC;EAAY,CAAC,GAAG,IAAAC,kBAAM,EAAC,CAAC;EAEpE,MAAMC,aAAa,GAAGF,WAAW,EAAEG,EAAE,GAAG/B,MAAM,CAAC4B,WAAW,CAACG,EAAE,CAAC,CAACC,IAAI,CAAC,CAAC,GAAG,EAAE;EAC1E,MAAMC,YAAY,GAAGR,KAAK,CAACtD,MAAM,GAAG6B,MAAM,CAACyB,KAAK,CAACtD,MAAM,CAAC,CAAC6D,IAAI,CAAC,CAAC,GAAG,EAAE;;EAEpE;EACA,IAAI,CAACN,eAAe,IAAI,CAACO,YAAY,IAAKH,aAAa,IAAIA,aAAa,KAAKG,YAAa,EAAE;IAC1F,OAAO,IAAI;EACb;EAEA,oBACE,IAAApF,WAAA,CAAAmE,GAAA,EAAC/C,iBAAiB;IAAA,GACZwD,KAAK;IACTtD,MAAM,EAAE8D,YAAa;IACrB7D,WAAW,EAAEA;EAAY,CAC1B,CAAC;AAEN,CAAC;;AAED;AAAA8D,OAAA,CAAAV,YAAA,GAAAA,YAAA;AACA,SAASX,kBAAkBA,CAACvC,IAAY,EAAEE,KAA4B,EAAwB;EAC5F,MAAM2D,SAAoB,GAAG;IAC3BC,aAAa,EAAE,KAAK;IACpBC,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE,QAAQ;IACxBC,WAAW,EAAE,CAAC;IACd,GAAGC,qBAAQ,CAACC,MAAM,CAAC;MACjBC,GAAG,EAAE,CAAC,CAAC;MACPlF,OAAO,EAAE;QACPmF,WAAW,EAAE,MAAM;QACnBC,YAAY,EAAE;UAAEC,KAAK,EAAE,CAAC;UAAEC,MAAM,EAAE;QAAE,CAAC;QACrCC,aAAa,EAAE,GAAG;QAClBC,YAAY,EAAE,CAAC;QACfC,SAAS,EAAE;MACb;IACF,CAAC;EACH,CAAC;EAED,IAAIC,SAAoB;EACxB,IAAI5E,IAAI,KAAK,OAAO,EAAE;IACpB4E,SAAS,GAAG;MAAEC,eAAe,EAAE,CAAC;MAAEC,iBAAiB,EAAE,EAAE;MAAEC,QAAQ,EAAE,EAAE;MAAEC,YAAY,EAAE;IAAG,CAAC;EAC3F,CAAC,MAAM,IAAIhF,IAAI,KAAK,OAAO,EAAE;IAC3B4E,SAAS,GAAG;MAAEC,eAAe,EAAE,EAAE;MAAEC,iBAAiB,EAAE,EAAE;MAAEC,QAAQ,EAAE,GAAG;MAAEC,YAAY,EAAE;IAAG,CAAC;EAC7F,CAAC,MAAM;IACLJ,SAAS,GAAG;MAAEC,eAAe,EAAE,CAAC;MAAEC,iBAAiB,EAAE,EAAE;MAAEC,QAAQ,EAAE,EAAE;MAAEC,YAAY,EAAE;IAAG,CAAC;EAC3F;EAEA,OAAO,CAACnB,SAAS,EAAEe,SAAS,EAAE1E,KAAK,CAAC;AACtC;AAEA,SAASuC,gBAAgBA,CAACzC,IAAY,EAAEG,SAAgC,EAAwB;EAC9F,MAAMqC,aAAwB,GAAG;IAC/ByC,UAAU,EAAEC,mBAAY,CAACC,aAAa;IACtCC,UAAU,EAAE;EACd,CAAC;EAED,IAAIC,aAAwB;EAC5B,IAAIrF,IAAI,KAAK,OAAO,EAAE;IACpBqF,aAAa,GAAG;MAAEC,QAAQ,EAAE;IAAG,CAAC;EAClC,CAAC,MAAM,IAAItF,IAAI,KAAK,OAAO,EAAE;IAC3BqF,aAAa,GAAG;MAAEC,QAAQ,EAAE;IAAG,CAAC;EAClC,CAAC,MAAM;IACLD,aAAa,GAAG;MAAEC,QAAQ,EAAE;IAAG,CAAC;EAClC;EAEA,OAAO,CAAC9C,aAAa,EAAE6C,aAAa,EAAElF,SAAS,CAAC;AAClD;AAAC,IAAAoF,QAAA,GAAA3B,OAAA,CAAA1E,OAAA,GAGcgE,YAAY","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_OxyContext","_fonts","_sonner","_useFollow","_theme","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","FollowButtonInner","memo","userId","oxyServices","initiallyFollowing","size","onFollowChange","style","textStyle","disabled","showLoadingState","preventParentActions","colors","useTheme","isFollowing","isLoading","toggleFollow","setFollowStatus","fetchStatus","useFollowForButton","handlePress","useCallback","event","preventDefault","stopPropagation","err","error","Error","String","toast","message","useEffect","baseButtonStyle","getBaseButtonStyle","baseTextStyle","getBaseTextStyle","jsx","TouchableOpacity","className","onPress","activeOpacity","children","ActivityIndicator","color","text","Text","FollowButton","props","isAuthenticated","user","currentUser","useOxy","currentUserId","id","trim","targetUserId","exports","baseStyle","flexDirection","alignItems","justifyContent","borderWidth","Platform","select","web","shadowColor","shadowOffset","width","height","shadowOpacity","shadowRadius","elevation","sizeStyle","paddingVertical","paddingHorizontal","minWidth","borderRadius","fontFamily","fontFamilies","interSemiBold","fontWeight","sizeTextStyle","fontSize","_default"],"sourceRoot":"../../../../src","sources":["ui/components/FollowButton.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/components/FollowButton.js

@@ -8,19 +8,6 @@ import { toast } from '../../lib/sonner';
 import { useFollowForButton } from "../hooks/useFollow.js";
 import { useTheme } from '@oxyhq/bloom/theme';
 import { jsx as _jsx } from "react/jsx-runtime";
-/**
- * Inner component that handles all hooks and rendering.
- *
- * Separated from the outer wrapper to avoid a Rules of Hooks violation.
- * The outer wrapper handles the auth/self-follow guard and returns null
- * before any hooks are called. This inner component always renders
- * (all hooks are called unconditionally).
- *
- * Receives oxyServices as a prop instead of calling useOxy(), so it does
- * not subscribe to the OxyContext. This is critical in list contexts where
- * N buttons would all re-render on any context change (session socket events,
- * token refreshes, etc.).
- */
 const FollowButtonInner = /*#__PURE__*/memo(function FollowButtonInner({
   userId,
   oxyServices,
@@ -31,13 +18,11 @@ const FollowButtonInner = /*#__PURE__*/memo(function FollowButtonInner({
   textStyle,
   disabled = false,
   showLoadingState = true,
-  preventParentActions = true,
-  theme: _theme = 'light'
+  preventParentActions = true
 }) {
-  const bloomTheme = useTheme();
-  const colors = bloomTheme.colors;
-
-  // Uses granular Zustand selectors — only re-renders when THIS user's data changes
+  const {
+    colors
+  } = useTheme();
   const {
     isFollowing,
     isLoading,
@@ -45,80 +30,47 @@ const FollowButtonInner = /*#__PURE__*/memo(function FollowButtonInner({
     setFollowStatus,
     fetchStatus
   } = useFollowForButton(userId, oxyServices);
-
-  // Stable press handler — depends on primitives only
   const handlePress = useCallback(async event => {
-    if (preventParentActions && event && event.preventDefault) {
+    if (preventParentActions && event?.preventDefault) {
       event.preventDefault();
       event.stopPropagation?.();
     }
     if (disabled || isLoading) return;
     try {
       await toggleFollow();
-      if (onFollowChange) onFollowChange(!isFollowing);
+      onFollowChange?.(!isFollowing);
     } catch (err) {
       const error = err instanceof Error ? err : new Error(String(err));
       toast.error(error.message || 'Failed to update follow status');
     }
   }, [disabled, isLoading, toggleFollow, onFollowChange, isFollowing, preventParentActions]);
-
-  // Set initial follow status on mount if provided and not already set
   useEffect(() => {
     if (userId && !isFollowing && initiallyFollowing) {
       setFollowStatus(initiallyFollowing);
     }
-    // Intentional: only run on mount with initial values
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [userId, initiallyFollowing]);
-
-  // Fetch latest follow status from backend on mount
   useEffect(() => {
-    if (userId) {
-      fetchStatus();
-    }
+    if (userId) fetchStatus();
   }, [userId, fetchStatus]);
-
-  // Colors from bloom theme — follows NativeWind convention via useTheme()
-  // Not following: bg-primary, border-primary, text white
-  // Following: bg-background, border-border, text-foreground
-  const buttonColorStyle = isFollowing ? {
-    backgroundColor: colors.background,
-    borderColor: colors.border
-  } : {
-    backgroundColor: colors.primary,
-    borderColor: colors.primary
-  };
-  const textColor = isFollowing ? colors.text : '#FFFFFF';
   const baseButtonStyle = getBaseButtonStyle(size, style);
   const baseTextStyle = getBaseTextStyle(size, textStyle);
   return /*#__PURE__*/_jsx(TouchableOpacity, {
-    style: [baseButtonStyle, buttonColorStyle],
+    className: isFollowing ? 'bg-background border-border' : 'bg-primary border-primary',
+    style: baseButtonStyle,
     onPress: handlePress,
     disabled: disabled || isLoading,
     activeOpacity: 0.8,
     children: showLoadingState && isLoading ? /*#__PURE__*/_jsx(ActivityIndicator, {
       size: "small",
-      color: textColor
+      color: isFollowing ? colors.text : '#FFFFFF'
     }) : /*#__PURE__*/_jsx(Text, {
-      style: [baseTextStyle, {
-        color: textColor
-      }],
+      className: isFollowing ? 'text-foreground' : 'text-primary-foreground',
+      style: baseTextStyle,
       children: isFollowing ? 'Following' : 'Follow'
     })
   });
 });
-
-/**
- * Outer wrapper that handles the "should we render?" check.
- *
- * This is the ONLY place useOxy() is called — to check authentication and
- * get the current user ID for the self-follow guard. The oxyServices instance
- * is passed down as a prop to the inner component, which avoids subscribing
- * to the full OxyContext.
- *
- * The early return happens BEFORE the inner component mounts, so the inner
- * component's hooks are never called conditionally (no Rules of Hooks violation).
- */
 const FollowButton = props => {
   const {
     oxyServices,
@@ -127,8 +79,6 @@ const FollowButton = props => {
   } = useOxy();
   const currentUserId = currentUser?.id ? String(currentUser.id).trim() : '';
   const targetUserId = props.userId ? String(props.userId).trim() : '';
-
-  // Don't render if not authenticated or viewing own profile
   if (!isAuthenticated || !targetUserId || currentUserId && currentUserId === targetUserId) {
     return null;
   }
@@ -138,8 +88,6 @@ const FollowButton = props => {
     oxyServices: oxyServices
   });
 };
-
-// Pure helper functions (no hooks, no state) extracted outside the component
 function getBaseButtonStyle(size, style) {
   const baseStyle = {
     flexDirection: 'row',

package/lib/module/ui/components/FollowButton.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useCallback","memo","TouchableOpacity","Text","Platform","ActivityIndicator","useOxy","fontFamilies","toast","useFollowForButton","useTheme","jsx","_jsx","FollowButtonInner","userId","oxyServices","initiallyFollowing","size","onFollowChange","style","textStyle","disabled","showLoadingState","preventParentActions","theme","_theme","bloomTheme","colors","isFollowing","isLoading","toggleFollow","setFollowStatus","fetchStatus","handlePress","event","preventDefault","stopPropagation","err","error","Error","String","message","buttonColorStyle","backgroundColor","background","borderColor","border","primary","textColor","text","baseButtonStyle","getBaseButtonStyle","baseTextStyle","getBaseTextStyle","onPress","activeOpacity","children","color","FollowButton","props","isAuthenticated","user","currentUser","currentUserId","id","trim","targetUserId","baseStyle","flexDirection","alignItems","justifyContent","borderWidth","select","web","default","shadowColor","shadowOffset","width","height","shadowOpacity","shadowRadius","elevation","sizeStyle","paddingVertical","paddingHorizontal","minWidth","borderRadius","fontFamily","interSemiBold","fontWeight","sizeTextStyle","fontSize"],"sourceRoot":"../../../../src","sources":["ui/components/FollowButton.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useCallback","memo","TouchableOpacity","Text","Platform","ActivityIndicator","useOxy","fontFamilies","toast","useFollowForButton","useTheme","jsx","_jsx","FollowButtonInner","userId","oxyServices","initiallyFollowing","size","onFollowChange","style","textStyle","disabled","showLoadingState","preventParentActions","colors","isFollowing","isLoading","toggleFollow","setFollowStatus","fetchStatus","handlePress","event","preventDefault","stopPropagation","err","error","Error","String","message","baseButtonStyle","getBaseButtonStyle","baseTextStyle","getBaseTextStyle","className","onPress","activeOpacity","children","color","text","FollowButton","props","isAuthenticated","user","currentUser","currentUserId","id","trim","targetUserId","baseStyle","flexDirection","alignItems","justifyContent","borderWidth","select","web","default","shadowColor","shadowOffset","width","height","shadowOpacity","shadowRadius","elevation","sizeStyle","paddingVertical","paddingHorizontal","minWidth","borderRadius","fontFamily","interSemiBold","fontWeight","sizeTextStyle","fontSize"],"sourceRoot":"../../../../src","sources":["ui/components/FollowButton.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/commonjs/ui/components/FollowButton.d.ts

@@ -12,17 +12,6 @@ export interface FollowButtonProps {
     preventParentActions?: boolean;
     theme?: 'light' | 'dark';
 }
-/**
- * Outer wrapper that handles the "should we render?" check.
- *
- * This is the ONLY place useOxy() is called — to check authentication and
- * get the current user ID for the self-follow guard. The oxyServices instance
- * is passed down as a prop to the inner component, which avoids subscribing
- * to the full OxyContext.
- *
- * The early return happens BEFORE the inner component mounts, so the inner
- * component's hooks are never called conditionally (no Rules of Hooks violation).
- */
 declare const FollowButton: React.FC<FollowButtonProps>;
 export { FollowButton };
 export default FollowButton;

package/lib/typescript/commonjs/ui/components/FollowButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FollowButton.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/FollowButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EAGf,MAAM,cAAc,CAAC;AAQtB,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B;AAyGD;;;;;;;;;;GAUG;AACH,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAkB7C,CAAC;AAmDF,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,eAAe,YAAY,CAAC"}
+{"version":3,"file":"FollowButton.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/FollowButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EAGf,MAAM,cAAc,CAAC;AAQtB,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B;AAkFD,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAiB7C,CAAC;AAkDF,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,eAAe,YAAY,CAAC"}

package/lib/typescript/module/ui/components/FollowButton.d.ts

@@ -12,17 +12,6 @@ export interface FollowButtonProps {
     preventParentActions?: boolean;
     theme?: 'light' | 'dark';
 }
-/**
- * Outer wrapper that handles the "should we render?" check.
- *
- * This is the ONLY place useOxy() is called — to check authentication and
- * get the current user ID for the self-follow guard. The oxyServices instance
- * is passed down as a prop to the inner component, which avoids subscribing
- * to the full OxyContext.
- *
- * The early return happens BEFORE the inner component mounts, so the inner
- * component's hooks are never called conditionally (no Rules of Hooks violation).
- */
 declare const FollowButton: React.FC<FollowButtonProps>;
 export { FollowButton };
 export default FollowButton;

package/lib/typescript/module/ui/components/FollowButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FollowButton.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/FollowButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EAGf,MAAM,cAAc,CAAC;AAQtB,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B;AAyGD;;;;;;;;;;GAUG;AACH,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAkB7C,CAAC;AAmDF,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,eAAe,YAAY,CAAC"}
+{"version":3,"file":"FollowButton.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/FollowButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EAGf,MAAM,cAAc,CAAC;AAQtB,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B;AAkFD,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAiB7C,CAAC;AAkDF,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,eAAe,YAAY,CAAC"}

package/lib/typescript/nativewind-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="nativewind/types" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "6.9.32",
+  "version": "6.9.33",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -94,6 +94,8 @@
     "zustand": "^5.0.9"
   },
   "devDependencies": {
+    "nativewind": "5.0.0-preview.3",
+    "react-native-css": "^3.0.0",
     "@biomejs/biome": "^1.9.4",
     "@commitlint/cli": "^17.6.5",
     "@commitlint/config-conventional": "^17.6.5",
@@ -135,9 +137,13 @@
     "react-native-gesture-handler": "~2.30.0",
     "react-native-reanimated": ">=4.2.0",
     "react-native-safe-area-context": "~5.6.0",
-    "react-native-svg": ">=13.0.0"
+    "react-native-svg": ">=13.0.0",
+    "nativewind": ">=4.0.0"
   },
   "peerDependenciesMeta": {
+    "nativewind": {
+      "optional": true
+    },
     "@expo/vector-icons": {
       "optional": true
     },

package/src/nativewind-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="nativewind/types" />

package/src/ui/components/FollowButton.tsx

@@ -28,19 +28,6 @@ export interface FollowButtonProps {
   theme?: 'light' | 'dark';
 }
 
-/**
- * Inner component that handles all hooks and rendering.
- *
- * Separated from the outer wrapper to avoid a Rules of Hooks violation.
- * The outer wrapper handles the auth/self-follow guard and returns null
- * before any hooks are called. This inner component always renders
- * (all hooks are called unconditionally).
- *
- * Receives oxyServices as a prop instead of calling useOxy(), so it does
- * not subscribe to the OxyContext. This is critical in list contexts where
- * N buttons would all re-render on any context change (session socket events,
- * token refreshes, etc.).
- */
 const FollowButtonInner = memo(function FollowButtonInner({
   userId,
   oxyServices,
@@ -52,12 +39,9 @@ const FollowButtonInner = memo(function FollowButtonInner({
   disabled = false,
   showLoadingState = true,
   preventParentActions = true,
-  theme: _theme = 'light',
 }: FollowButtonProps & { oxyServices: OxyServices }) {
-  const bloomTheme = useTheme();
-  const colors = bloomTheme.colors;
+  const { colors } = useTheme();
 
-  // Uses granular Zustand selectors — only re-renders when THIS user's data changes
   const {
     isFollowing,
     isLoading,
@@ -66,9 +50,8 @@ const FollowButtonInner = memo(function FollowButtonInner({
     fetchStatus,
   } = useFollowForButton(userId, oxyServices);
 
-  // Stable press handler — depends on primitives only
   const handlePress = useCallback(async (event?: { preventDefault?: () => void; stopPropagation?: () => void }) => {
-    if (preventParentActions && event && event.preventDefault) {
+    if (preventParentActions && event?.preventDefault) {
       event.preventDefault();
       event.stopPropagation?.();
     }
@@ -76,43 +59,34 @@ const FollowButtonInner = memo(function FollowButtonInner({
 
     try {
       await toggleFollow();
-      if (onFollowChange) onFollowChange(!isFollowing);
+      onFollowChange?.(!isFollowing);
     } catch (err: unknown) {
       const error = err instanceof Error ? err : new Error(String(err));
       toast.error(error.message || 'Failed to update follow status');
     }
   }, [disabled, isLoading, toggleFollow, onFollowChange, isFollowing, preventParentActions]);
 
-  // Set initial follow status on mount if provided and not already set
   useEffect(() => {
     if (userId && !isFollowing && initiallyFollowing) {
       setFollowStatus(initiallyFollowing);
     }
-    // Intentional: only run on mount with initial values
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [userId, initiallyFollowing]);
 
-  // Fetch latest follow status from backend on mount
   useEffect(() => {
-    if (userId) {
-      fetchStatus();
-    }
+    if (userId) fetchStatus();
   }, [userId, fetchStatus]);
 
-  // Colors from bloom theme — follows NativeWind convention via useTheme()
-  // Not following: bg-primary, border-primary, text white
-  // Following: bg-background, border-border, text-foreground
-  const buttonColorStyle: ViewStyle = isFollowing
-    ? { backgroundColor: colors.background, borderColor: colors.border }
-    : { backgroundColor: colors.primary, borderColor: colors.primary };
-  const textColor = isFollowing ? colors.text : '#FFFFFF';
-
   const baseButtonStyle = getBaseButtonStyle(size, style);
   const baseTextStyle = getBaseTextStyle(size, textStyle);
 
   return (
     <TouchableOpacity
-      style={[baseButtonStyle, buttonColorStyle]}
+      className={isFollowing
+        ? 'bg-background border-border'
+        : 'bg-primary border-primary'
+      }
+      style={baseButtonStyle}
       onPress={handlePress}
       disabled={disabled || isLoading}
       activeOpacity={0.8}
@@ -120,10 +94,13 @@ const FollowButtonInner = memo(function FollowButtonInner({
       {showLoadingState && isLoading ? (
         <ActivityIndicator
           size="small"
-          color={textColor}
+          color={isFollowing ? colors.text : '#FFFFFF'}
         />
       ) : (
-        <Text style={[baseTextStyle, { color: textColor }]}>
+        <Text
+          className={isFollowing ? 'text-foreground' : 'text-primary-foreground'}
+          style={baseTextStyle}
+        >
           {isFollowing ? 'Following' : 'Follow'}
         </Text>
       )}
@@ -131,24 +108,12 @@ const FollowButtonInner = memo(function FollowButtonInner({
   );
 });
 
-/**
- * Outer wrapper that handles the "should we render?" check.
- *
- * This is the ONLY place useOxy() is called — to check authentication and
- * get the current user ID for the self-follow guard. The oxyServices instance
- * is passed down as a prop to the inner component, which avoids subscribing
- * to the full OxyContext.
- *
- * The early return happens BEFORE the inner component mounts, so the inner
- * component's hooks are never called conditionally (no Rules of Hooks violation).
- */
 const FollowButton: React.FC<FollowButtonProps> = (props) => {
   const { oxyServices, isAuthenticated, user: currentUser } = useOxy();
 
   const currentUserId = currentUser?.id ? String(currentUser.id).trim() : '';
   const targetUserId = props.userId ? String(props.userId).trim() : '';
 
-  // Don't render if not authenticated or viewing own profile
   if (!isAuthenticated || !targetUserId || (currentUserId && currentUserId === targetUserId)) {
     return null;
   }
@@ -162,7 +127,6 @@ const FollowButton: React.FC<FollowButtonProps> = (props) => {
   );
 };
 
-// Pure helper functions (no hooks, no state) extracted outside the component
 function getBaseButtonStyle(size: string, style?: StyleProp<ViewStyle>): StyleProp<ViewStyle> {
   const baseStyle: ViewStyle = {
     flexDirection: 'row',