feat: allows filtering inbox by accountId

packages/client-graphql/src/inbox/messages.ts

@@ -2,6 +2,7 @@ import { Client } from "urql";
 import { IActionElemental } from "./message";
 
 export interface IGetInboxMessagesParams {
+  accountId?: string;
   archived?: boolean;
   from?: string | number;
   limit?: number;

packages/react-hooks/src/inbox/types.ts

@@ -1,12 +1,18 @@
-import { Brand, IInboxMessagePreview } from "@trycourier/react-provider";
+import {
+  Brand,
+  IInboxMessagePreview,
+  OnEvent,
+} from "@trycourier/react-provider";
 export interface IInbox<T = IInboxMessagePreview> {
+  accountId?: string;
   brand?: Brand;
   from?: number;
   isLoading?: boolean;
   isOpen?: boolean;
   lastMarkedAllRead?: number;
   lastMessagesFetched?: number;
   messages?: Array<T>;
+  onEvent?: OnEvent;
   pinned?: Array<T>;
   startCursor?: string;
   unreadMessageCount?: number;

packages/react-hooks/src/inbox/use-inbox.ts

@@ -11,7 +11,7 @@ import useInboxActions, { IInboxActions } from "./use-inbox-actions";
 import { IInbox } from "./types";
 
 const useInbox = (): IInbox<IInboxMessagePreview> & IInboxActions => {
-  const { dispatch, inbox, transport, brand } =
+  const { dispatch, inbox, transport, brand, accountId } =
     useCourier<{
       inbox: IInbox;
     }>();
@@ -22,6 +22,10 @@ const useInbox = (): IInbox<IInboxMessagePreview> & IInboxActions => {
     inbox.brand = deepExtend({}, brand ?? {}, inbox.brand ?? {});
   }
 
+  if (accountId) {
+    inbox.accountId = accountId ?? inbox.accountId;
+  }
+
   useEffect(() => {
     transport?.listen({
       id: "message-listener",

packages/react-inbox/src/components/Messages2.0/index.tsx

@@ -202,6 +202,7 @@ const Messages: React.ForwardRefExoticComponent<
     const { fetchRecipientPreferences } = usePreferences();
 
     const {
+      accountId,
       brand,
       fetchMessages,
       getUnreadMessageCount,
@@ -227,9 +228,12 @@ const Messages: React.ForwardRefExoticComponent<
       }
 
       fetchMessages({
-        params: currentView?.params,
+        params: {
+          ...currentView?.params,
+          accountId,
+        },
       });
-    }, [view, currentView]);
+    }, [accountId, view, currentView]);
 
     useOnScroll(
       messageListRef,

packages/react-inbox/src/types.ts

@@ -3,7 +3,7 @@ import {
   Brand,
   PinDetails,
   IInboxMessagePreview,
-  EventType,
+  OnEvent,
 } from "@trycourier/react-provider";
 import { IGetInboxMessagesParams } from "@trycourier/client-graphql";
 
@@ -39,12 +39,9 @@ export interface InboxTheme {
   root?: CSSObject;
   unreadIndicator?: CSSObject;
 }
-export type OnEvent = (eventParams: {
-  messageId?: string;
-  message?: IInboxMessagePreview;
-  event: EventType;
-}) => void;
+
 export interface InboxProps {
+  accountId?: string;
   brand?: Brand;
   className?: string;
   defaultIcon?: false | string;

packages/react-provider/src/index.tsx

@@ -15,10 +15,12 @@ import createReducer from "react-use/lib/factory/createReducer";
 
 import {
   Brand,
+  EventType,
   ICourierContext,
   ICourierProviderProps,
   PinDetails,
   WSOptions,
+  OnEvent,
 } from "./types";
 import { CourierTransport } from "./transports/courier";
 import {
@@ -54,6 +56,8 @@ export type {
   Middleware,
   PinDetails,
   WSOptions,
+  EventType,
+  OnEvent,
 };
 
 export const CourierContext =

packages/react-provider/src/transports/types.ts

@@ -1,5 +1,5 @@
 export interface ICourierEventMessage {
-  event: "read" | "unread" | "archive" | "mark-all-read" | "opened";
+  event: "read" | "unread" | "archive" | "mark-all-read" | "opened" | "unpin";
   type: "event";
   messageId?: string;
   error?: string;

packages/react-provider/src/types.ts

@@ -1,5 +1,5 @@
 import { CourierTransport, Transport } from "./transports";
-import { Interceptor } from "./transports/types";
+import { IInboxMessagePreview, Interceptor } from "./transports/types";
 import { ErrorEvent } from "reconnecting-websocket";
 export { IInboxMessagePreview } from "@trycourier/client-graphql";
 
@@ -14,6 +14,12 @@ export type WSOptions = {
   connectionTimeout?: number;
 };
 
+export type OnEvent = (eventParams: {
+  messageId?: string;
+  message?: IInboxMessagePreview;
+  event: EventType;
+}) => void;
+
 export interface PinDetails {
   id: string;
   label: {

packages/react-provider/src/ws.ts

@@ -14,6 +14,7 @@ export class WS {
     event?: string;
     callback: ICourierEventCallback;
   }>;
+  private accountId?: string;
   private clientSourceId?: string;
   private authorization?: string;
   private clientKey?: string;
@@ -31,18 +32,21 @@ export class WS {
   protected messageCallback;
 
   constructor({
+    accountId,
     authorization,
     clientKey,
     options,
     clientSourceId,
     userSignature,
   }: {
+    accountId?: string;
     authorization?: string;
     clientSourceId?: string;
     clientKey?: string;
     options?: WSOptions;
     userSignature?: string;
   }) {
+    this.accountId = accountId;
     this.connectionCount = 0;
     this.authorization = authorization;
     this.messageCallback = null;
@@ -173,6 +177,7 @@ export class WS {
       this.send({
         action: "subscribe",
         data: {
+          accountId: this.accountId,
           channel,
           clientKey: this.clientKey,
           clientSourceId: this.clientSourceId,