@trycourier/courier-react-native 2.0.0-beta4 → 2.0.0-beta6

package/src/hooks/CourierProvider.tsx

@@ -23,6 +23,7 @@ interface CourierPushContext {
     apns?: string;
     fcm?: string;
   };
+  iOSForegroundPresentationOptions: (options: iOSForegroundPresentationOptions[]) => void;
   notificationPermissionStatus?: string;
   requestNotificationPermission: () => Promise<void>;
 }
@@ -35,14 +36,13 @@ interface CourierInboxContext {
   unreadMessageCount: number;
   totalMessageCount: number;
   canPaginate: boolean;
-  iOSForegroundPresentationOptions: (options: iOSForegroundPresentationOptions[]) => void;
   setPaginationLimit: (limit: number) => void;
   fetchNextPageOfMessages: () => Promise<InboxMessage[]>;
   refresh: () => Promise<void>;
   isRefreshing: boolean;
   readAllMessages: () => Promise<void>;
-  readMessage: (messageId: string) => Promise<void>;
-  unreadMessage: (messageId: string) => Promise<void>;
+  readMessage: (messageId: string) => string;
+  unreadMessage: (messageId: string) => string;
 }
 
 interface CourierContext {
@@ -189,13 +189,13 @@ export const CourierProvider: React.FC<{ children: ReactNode }> = ({ children })
 
   }
 
-  const syncTokens = () => {
+  const syncTokens = async () => {
 
     // APNS
     const apnsToken = Courier.shared.apnsToken;
     push_setApnsToken(apnsToken);
 
-    const fcmToken = Courier.shared.fcmToken;
+    const fcmToken = await Courier.shared.fcmToken;
     push_setFcmToken(fcmToken);
 
   }
@@ -263,6 +263,7 @@ export const CourierProvider: React.FC<{ children: ReactNode }> = ({ children })
           fcm: push_fcmToken,
           apns: push_apnsToken,
         },
+        iOSForegroundPresentationOptions,
         notificationPermissionStatus: push_notificationPermission,
         requestNotificationPermission,
       },
@@ -274,7 +275,6 @@ export const CourierProvider: React.FC<{ children: ReactNode }> = ({ children })
         unreadMessageCount: inbox_unreadMessageCount,
         totalMessageCount: inbox_totalMessageCount,
         canPaginate: inbox_canPaginate,
-        iOSForegroundPresentationOptions,
         setPaginationLimit,
         fetchNextPageOfMessages,
         refresh,
@@ -305,8 +305,12 @@ export const useCourierAuth = (): CourierAuthContext => {
 
 };
 
+interface UseCourierPushProps {
+  iOSForegroundPresentationOptions?: iOSForegroundPresentationOptions[]
+}
+
 // Push Hook
-export const useCourierPush = (): CourierPushContext => {
+export const useCourierPush = (props: UseCourierPushProps = {}): CourierPushContext => {
 
   const context = useContext(CourierContext);
 
@@ -314,6 +318,12 @@ export const useCourierPush = (): CourierPushContext => {
     throw new Error('useCourierPush must be used within an CourierProvider');
   }
 
+  // Set the presentation options
+  const options = props.iOSForegroundPresentationOptions;
+  if (options) {
+    context.push?.iOSForegroundPresentationOptions(options);
+  }
+
   context.push.start();
 
   return context.push;
@@ -322,9 +332,6 @@ export const useCourierPush = (): CourierPushContext => {
 
 interface UseCourierInboxProps {
   paginationLimit?: number;
-  iOS?: {
-    foregroundPresentationOptions?: iOSForegroundPresentationOptions[]
-  }
 }
 
 // Inbox Hook
@@ -342,12 +349,6 @@ export const useCourierInbox = (props: UseCourierInboxProps = {}): CourierInboxC
     context.inbox?.setPaginationLimit(limit);
   }
 
-  // Set the presentation options
-  const options = props.iOS?.foregroundPresentationOptions;
-  if (options) {
-    context.inbox?.iOSForegroundPresentationOptions(options);
-  }
-
   context.inbox?.start();
 
   return context.inbox;

package/src/index.tsx

@@ -136,7 +136,7 @@ class Courier {
    * using Courier token management apis
    * @example const fcmToken = await Courier.fcmToken
    */
-  get fcmToken(): string | undefined {
+  get fcmToken(): Promise<string | undefined> {
     return CourierReactNativeModules.getFcmToken();
   }
 
@@ -305,7 +305,7 @@ class Courier {
    * @param props 
    * @returns 
    */
-  public readMessage(props: { messageId: string }): Promise<void> {
+  public readMessage(props: { messageId: string }): string {
     return CourierReactNativeModules.readMessage(props.messageId);
   }
 
@@ -314,7 +314,7 @@ class Courier {
    * @param props 
    * @returns 
    */
-  public unreadMessage(props: { messageId: string }): Promise<void> {
+  public unreadMessage(props: { messageId: string }): string {
     return CourierReactNativeModules.unreadMessage(props.messageId);
   }
 
@@ -338,26 +338,32 @@ class Courier {
     const inboxListener = new CourierInboxListener();
 
     if (props.onInitialLoad) {
+
       inboxListener.onInitialLoad = CourierEventEmitter.addListener('inboxInitialLoad', () => {
-        props.onInitialLoad!()
+        props.onInitialLoad!();
       });
+
     }
 
     if (props.onError) {
+
       inboxListener.onError = CourierEventEmitter.addListener('inboxError', event => {
-        props.onError!(event)
+        props.onError!(event);
       });
+
     }
 
     if (props.onMessagesChanged) {
+
       inboxListener.onMessagesChanged = CourierEventEmitter.addListener('inboxMessagesChanged', event => {
         props.onMessagesChanged!(
           event.messages,
           event.unreadMessageCount,
           event.totalMessageCount,
           event.canPaginate,
-        )
+        );
       });
+
     }
 
     inboxListener.listenerId = CourierReactNativeModules.addInboxListener();
@@ -395,6 +401,8 @@ class Courier {
 
   /**
    * TODO
+   * Min = 1
+   * Max = 100
    * @param props 
    * @returns 
    */