@dubsdotapp/expo 0.5.21 → 0.5.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dubsdotapp/expo",
-  "version": "0.5.21",
+  "version": "0.5.23",
   "description": "React Native SDK for the Dubs betting platform",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/chat/hooks.ts

@@ -9,6 +9,7 @@ import type {
   DirectMessage,
   FriendUser,
   FriendRequest,
+  SentFriendRequest,
   SendMessageParams,
 } from './types';
 
@@ -225,6 +226,49 @@ export function useFriendRequests(): {
   return { requests: pendingRequests, loading, refetch };
 }
 
+/** Get pending friend requests this user has SENT (still awaiting response). */
+export function useSentFriendRequests(): {
+  requests: SentFriendRequest[];
+  loading: boolean;
+  refetch: () => Promise<void>;
+} {
+  const { sentFriendRequests, refreshSentFriendRequests } = useChatContext();
+  const [loading, setLoading] = useState(false);
+
+  const refetch = useCallback(async () => {
+    setLoading(true);
+    await refreshSentFriendRequests();
+    setLoading(false);
+  }, [refreshSentFriendRequests]);
+
+  return { requests: sentFriendRequests, loading, refetch };
+}
+
+/** Cancel a pending friend request the current user previously sent. */
+export function useCancelFriendRequest(): {
+  cancel: (requestId: number) => Promise<void>;
+  loading: boolean;
+} {
+  const { client } = useDubs();
+  const { refreshSentFriendRequests } = useChatContext();
+  const [loading, setLoading] = useState(false);
+
+  const cancel = useCallback(
+    async (requestId: number) => {
+      setLoading(true);
+      try {
+        await client.cancelFriendRequest(requestId);
+        await refreshSentFriendRequests();
+      } finally {
+        setLoading(false);
+      }
+    },
+    [client, refreshSentFriendRequests],
+  );
+
+  return { cancel, loading };
+}
+
 /** Search for users by username */
 export function useSearchUsers(): {
   results: FriendUser[];

package/src/chat/index.ts

@@ -17,9 +17,11 @@ export {
   useDirectMessages,
   useFriends,
   useFriendRequests,
+  useSentFriendRequests,
   useSearchUsers,
   useSendFriendRequest,
   useRespondToFriendRequest,
+  useCancelFriendRequest,
 } from './hooks';
 
 // Types
@@ -31,6 +33,7 @@ export type {
   Conversation,
   FriendUser,
   FriendRequest,
+  SentFriendRequest,
   OnlineUser,
   TypingEvent,
   ChatNotification,

package/src/chat/provider.tsx

@@ -9,6 +9,7 @@ import type {
   Conversation,
   FriendUser,
   FriendRequest,
+  SentFriendRequest,
   DirectMessage,
   ChatNotification,
 } from './types';
@@ -30,16 +31,20 @@ export interface ChatContextValue {
   conversations: Conversation[];
   /** Friends list */
   friends: FriendUser[];
-  /** Pending friend requests */
+  /** Pending friend requests (received) */
   pendingRequests: FriendRequest[];
+  /** Pending friend requests this user has sent (still awaiting response) */
+  sentFriendRequests: SentFriendRequest[];
   /** Reload messages from REST */
   refreshMessages: () => Promise<void>;
   /** Reload conversations from REST */
   refreshConversations: () => Promise<void>;
   /** Reload friends from REST */
   refreshFriends: () => Promise<void>;
-  /** Reload pending friend requests from REST */
+  /** Reload pending friend requests (received) from REST */
   refreshPendingRequests: () => Promise<void>;
+  /** Reload pending friend requests (sent) from REST */
+  refreshSentFriendRequests: () => Promise<void>;
 }
 
 const ChatContext = createContext<ChatContextValue | null>(null);
@@ -66,6 +71,7 @@ export function ChatProvider({ children, autoConnect = true }: ChatProviderProps
   const [conversations, setConversations] = useState<Conversation[]>([]);
   const [friends, setFriends] = useState<FriendUser[]>([]);
   const [pendingRequests, setPendingRequests] = useState<FriendRequest[]>([]);
+  const [sentFriendRequests, setSentFriendRequests] = useState<SentFriendRequest[]>([]);
 
   // ── REST loaders ──
 
@@ -106,6 +112,15 @@ export function ChatProvider({ children, autoConnect = true }: ChatProviderProps
     }
   }, [client]);
 
+  const refreshSentFriendRequests = useCallback(async () => {
+    try {
+      const res = await client.getSentFriendRequests();
+      setSentFriendRequests(res.requests);
+    } catch (_) {
+      // Server may not yet expose /social/friend-requests/sent — silent fail
+    }
+  }, [client]);
+
   // ── Socket setup ──
 
   useEffect(() => {
@@ -140,9 +155,18 @@ export function ChatProvider({ children, autoConnect = true }: ChatProviderProps
         setUnreadCount((prev) => prev + 1);
         // Refresh relevant lists on social notifications
         if (n.type === 'friend_request') refreshPendingRequests();
-        if (n.type === 'friend_request_accepted') refreshFriends();
+        if (n.type === 'friend_request_accepted') {
+          refreshFriends();
+          refreshSentFriendRequests();
+        }
+        if (n.type === 'friend_request_declined') refreshSentFriendRequests();
+      },
+      onFriendRequestAccepted: () => {
+        refreshFriends();
+        refreshSentFriendRequests();
       },
-      onFriendRequestAccepted: () => refreshFriends(),
+      onFriendRequestDeclined: () => refreshSentFriendRequests(),
+      onFriendRequestCancelled: () => refreshPendingRequests(),
       onFriendRemoved: () => refreshFriends(),
     });
 
@@ -152,11 +176,12 @@ export function ChatProvider({ children, autoConnect = true }: ChatProviderProps
     refreshMessages();
     refreshFriends().catch(() => {});
     refreshPendingRequests().catch(() => {});
+    refreshSentFriendRequests().catch(() => {});
 
     return () => {
       chatSocket.disconnect();
     };
-  }, [client, autoConnect, refreshMessages, refreshConversations, refreshFriends, refreshPendingRequests]);
+  }, [client, autoConnect, refreshMessages, refreshConversations, refreshFriends, refreshPendingRequests, refreshSentFriendRequests]);
 
   // ── Reconnect on app foreground ──
 
@@ -192,12 +217,14 @@ export function ChatProvider({ children, autoConnect = true }: ChatProviderProps
       conversations,
       friends,
       pendingRequests,
+      sentFriendRequests,
       refreshMessages,
       refreshConversations,
       refreshFriends,
       refreshPendingRequests,
+      refreshSentFriendRequests,
     }),
-    [status, messages, onlineUsers, onlineCount, unreadCount, conversations, friends, pendingRequests, refreshMessages, refreshConversations, refreshFriends, refreshPendingRequests],
+    [status, messages, onlineUsers, onlineCount, unreadCount, conversations, friends, pendingRequests, sentFriendRequests, refreshMessages, refreshConversations, refreshFriends, refreshPendingRequests, refreshSentFriendRequests],
   );
 
   return <ChatContext.Provider value={value}>{children}</ChatContext.Provider>;

package/src/chat/socket.ts

@@ -36,6 +36,8 @@ export interface ChatSocketListeners {
   // Social
   onFriendRequestAccepted?: (data: { requestId: number; acceptedBy: number; acceptedByUsername: string }) => void;
   onFriendRequestDeclined?: (data: { requestId: number; declinedBy: number }) => void;
+  /** Recipient-side: the original sender cancelled a pending friend request */
+  onFriendRequestCancelled?: (data: { requestId: number; cancelledBy: number }) => void;
   onFriendRemoved?: (data: { removedBy: number }) => void;
   // Errors
   onError?: (error: { message: string }) => void;
@@ -108,6 +110,7 @@ export class ChatSocket {
     // Social events
     this.socket.on('friend_request_accepted', (data: any) => this.listeners.onFriendRequestAccepted?.(data));
     this.socket.on('friend_request_declined', (data: any) => this.listeners.onFriendRequestDeclined?.(data));
+    this.socket.on('friend_request_cancelled', (data: any) => this.listeners.onFriendRequestCancelled?.(data));
     this.socket.on('friend_removed', (data: any) => this.listeners.onFriendRemoved?.(data));
 
     // Error

package/src/chat/types.ts

@@ -95,6 +95,16 @@ export interface FriendRequest {
   createdAt: string;
 }
 
+/** A friend request the current user has SENT (still pending). */
+export interface SentFriendRequest {
+  id: number;
+  toUserId: number;
+  toUsername: string;
+  toAvatar: string | null;
+  toWallet: string;
+  createdAt: string;
+}
+
 // ── Online / Real-time Types ──
 
 export interface OnlineUser {

package/src/client.ts

@@ -730,6 +730,16 @@ export class DubsClient {
     return this.request('GET', '/social/friend-requests');
   }
 
+  /** Get pending friend requests this user has sent (still awaiting response) */
+  async getSentFriendRequests(): Promise<{ requests: any[] }> {
+    return this.request('GET', '/social/friend-requests/sent');
+  }
+
+  /** Cancel a pending friend request the user previously sent */
+  async cancelFriendRequest(requestId: number): Promise<void> {
+    await this.request('DELETE', `/social/friend-request/${requestId}`);
+  }
+
   /** Accept a friend request */
   async acceptFriendRequest(requestId: number): Promise<void> {
     await this.request('POST', `/social/request/${requestId}/accept`);

package/src/hooks/usePushNotifications.ts

@@ -3,11 +3,29 @@ import { Platform } from 'react-native';
 import { useDubs } from '../provider';
 
 export interface PushNotificationStatus {
-  /** Whether push notifications are enabled in the SDK configuration */
+  /**
+   * Whether push is currently delivering to this user — the right signal for
+   * UI bindings like a "Notifications: Enabled/Disabled" toggle.
+   *
+   * Equivalent to `enabled && !!pushToken`. Goes false after `unregister()`
+   * even though OS permission is still granted. Goes true after `register()`
+   * succeeds.
+   *
+   * Use this — NOT `hasPermission` — when binding switches/toggles.
+   */
+  isActive: boolean;
+  /** Whether push notifications are enabled in the SDK configuration (the `pushEnabled` prop on DubsProvider). */
   enabled: boolean;
-  /** Whether notification permission has been granted */
+  /**
+   * Whether OS-level notification permission has been granted on this device.
+   *
+   * Note: this stays true after `unregister()` because the OS doesn't revoke
+   * permission when a server token is dropped. Useful for permission-flow
+   * prompts (e.g. "Re-enable in Settings" hint), but NOT for "is push on" UI —
+   * use `isActive` for that.
+   */
   hasPermission: boolean;
-  /** The push token (native FCM/APNs), if registered */
+  /** The native device push token (FCM/APNs), if currently registered with the server. */
   pushToken: string | null;
   /**
    * @deprecated Use pushToken instead. Kept for backwards compatibility.
@@ -188,6 +206,7 @@ export function usePushNotifications(): PushNotificationStatus {
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   return {
+    isActive: pushEnabled && !!pushToken,
     enabled: pushEnabled,
     hasPermission,
     pushToken,

package/src/index.ts

@@ -186,9 +186,11 @@ export {
   useDirectMessages,
   useFriends,
   useFriendRequests,
+  useSentFriendRequests,
   useSearchUsers,
   useSendFriendRequest,
   useRespondToFriendRequest,
+  useCancelFriendRequest,
 } from './chat';
 export type {
   ChatProviderProps,
@@ -202,6 +204,7 @@ export type {
   Conversation,
   FriendUser,
   FriendRequest,
+  SentFriendRequest,
   OnlineUser,
   TypingEvent,
   ChatNotification,