@churchapps/apphelper 0.4.17 → 0.4.19

package/dist/helpers/NotificationService.js

@@ -0,0 +1,176 @@
+import { SocketHelper } from "./SocketHelper";
+import { ApiHelper } from "@churchapps/helpers";
+export class NotificationService {
+    constructor() {
+        this.counts = { notificationCount: 0, pmCount: 0 };
+        this.listeners = [];
+        this.isInitialized = false;
+        this.currentPersonId = null;
+        this.loadTimeout = null;
+    }
+    static getInstance() {
+        if (!NotificationService.instance) {
+            NotificationService.instance = new NotificationService();
+        }
+        return NotificationService.instance;
+    }
+    /**
+     * Initialize the notification service with user context
+     */
+    async initialize(context) {
+        if (this.isInitialized)
+            return;
+        try {
+            // Store current person ID for conversation counting
+            this.currentPersonId = context?.person?.id || null;
+            // Initialize WebSocket connection
+            await SocketHelper.init();
+            // Set person/church context for websocket
+            if (context?.person?.id && context?.userChurch?.church?.id) {
+                SocketHelper.setPersonChurch({
+                    personId: context.person.id,
+                    churchId: context.userChurch.church.id
+                });
+            }
+            // Register handlers for notification updates
+            this.registerWebSocketHandlers();
+            // Load initial notification counts
+            await this.loadNotificationCounts();
+            this.isInitialized = true;
+        }
+        catch (error) {
+            console.error("❌ Failed to initialize NotificationService:", error);
+            throw error;
+        }
+    }
+    /**
+     * Register websocket handlers for real-time notification updates
+     */
+    registerWebSocketHandlers() {
+        // Handler for new private messages
+        SocketHelper.addHandler("privateMessage", "NotificationService-PM", (data) => {
+            console.log('🔔 NotificationService: New private message received, updating counts');
+            this.debouncedLoadNotificationCounts();
+        });
+        // Handler for general notifications
+        SocketHelper.addHandler("notification", "NotificationService-Notification", (data) => {
+            console.log('🔔 NotificationService: New notification received, updating counts');
+            this.debouncedLoadNotificationCounts();
+        });
+        // Handler for message updates that could affect notification counts
+        SocketHelper.addHandler("message", "NotificationService-MessageUpdate", (data) => {
+            // Only update counts if the message update involves the current person
+            if (data?.message?.personId === this.currentPersonId ||
+                data?.notifyPersonId === this.currentPersonId) {
+                console.log('🔔 NotificationService: Message update affecting current user, updating counts');
+                this.debouncedLoadNotificationCounts();
+            }
+        });
+        // Handler for reconnect events
+        SocketHelper.addHandler("reconnect", "NotificationService-Reconnect", (data) => {
+            console.log('🔔 NotificationService: WebSocket reconnected, refreshing counts');
+            this.loadNotificationCounts(); // Don't debounce reconnect - need immediate update
+        });
+    }
+    /**
+     * Load notification counts from the API with debouncing
+     */
+    debouncedLoadNotificationCounts() {
+        if (this.loadTimeout) {
+            clearTimeout(this.loadTimeout);
+        }
+        this.loadTimeout = setTimeout(() => {
+            this.loadNotificationCounts();
+        }, 300); // 300ms debounce
+    }
+    /**
+     * Load notification counts from the API
+     */
+    async loadNotificationCounts() {
+        try {
+            // Use the unreadCount endpoint which returns both notification and PM counts
+            const counts = await ApiHelper.get("/notifications/unreadCount", "MessagingApi");
+            const newCounts = {
+                notificationCount: counts?.notificationCount || 0,
+                pmCount: counts?.pmCount || 0
+            };
+            // Update counts and notify listeners
+            this.updateCounts(newCounts);
+        }
+        catch (error) {
+            console.error("❌ Failed to load notification counts:", error);
+            // Don't throw - just log the error and keep existing counts
+        }
+    }
+    /**
+     * Update counts and notify all listeners
+     */
+    updateCounts(newCounts) {
+        const countsChanged = this.counts.notificationCount !== newCounts.notificationCount ||
+            this.counts.pmCount !== newCounts.pmCount;
+        if (countsChanged) {
+            this.counts = { ...newCounts };
+            // Notify all listeners
+            this.listeners.forEach(listener => {
+                try {
+                    listener(this.counts);
+                }
+                catch (error) {
+                    console.error("❌ Error in notification listener:", error);
+                }
+            });
+        }
+    }
+    /**
+     * Subscribe to notification count changes
+     */
+    subscribe(listener) {
+        this.listeners.push(listener);
+        // Immediately call with current counts
+        listener(this.counts);
+        // Return unsubscribe function
+        return () => {
+            this.listeners = this.listeners.filter(l => l !== listener);
+        };
+    }
+    /**
+     * Get current notification counts
+     */
+    getCounts() {
+        return { ...this.counts };
+    }
+    /**
+     * Manually refresh notification counts
+     */
+    async refresh() {
+        await this.loadNotificationCounts();
+    }
+    /**
+     * Cleanup the service
+     */
+    cleanup() {
+        // Clear any pending timeout
+        if (this.loadTimeout) {
+            clearTimeout(this.loadTimeout);
+            this.loadTimeout = null;
+        }
+        // Remove websocket handlers
+        SocketHelper.removeHandler("NotificationService-PM");
+        SocketHelper.removeHandler("NotificationService-Notification");
+        SocketHelper.removeHandler("NotificationService-MessageUpdate");
+        SocketHelper.removeHandler("NotificationService-Reconnect");
+        // Clear listeners
+        this.listeners = [];
+        // Reset state
+        this.counts = { notificationCount: 0, pmCount: 0 };
+        this.currentPersonId = null;
+        this.isInitialized = false;
+    }
+    /**
+     * Check if service is initialized
+     */
+    isReady() {
+        return this.isInitialized && SocketHelper.isConnected();
+    }
+}
+//# sourceMappingURL=NotificationService.js.map

package/dist/helpers/NotificationService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NotificationService.js","sourceRoot":"","sources":["../../src/helpers/NotificationService.ts"],"names":[],"mappings":"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"}

package/dist/helpers/SocketHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SocketHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiD,4BAA4B,EAAE,sBAAsB,EAAwE,MAAM,qBAAqB,CAAC;AAEhN,qBAAa,YAAY;IACvB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;IACzB,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,cAAc,EAAE,4BAA4B,EAAE,CAAM;IAC3D,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAkE;IACjG,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAuB;IACtD,OAAO,CAAC,MAAM,CAAC,WAAW,CAAkB;IAC5C,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAc;IACjD,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAa;IAE7C,MAAM,CAAC,eAAe,GAAI,IAAI;QAAC,QAAQ,EAAC,MAAM,CAAC;QAAC,QAAQ,EAAC,MAAM,CAAA;KAAC,UAM/D;IAED,MAAM,CAAC,qBAAqB,aAK3B;IAED,MAAM,CAAC,IAAI,sBAsEV;IAED,MAAM,CAAC,UAAU,GAAI,QAAQ,MAAM,EAAE,IAAI,MAAM,EAAE,eAAe,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,UAOlF;IAED,MAAM,CAAC,aAAa,GAAI,IAAI,MAAM,UAEjC;IAED,MAAM,CAAC,sBAAsB,GAAI,QAAQ,MAAM,UAE9C;IAED,MAAM,CAAC,gBAAgB,aAEtB;IAED,MAAM,CAAC,aAAa,GAAI,SAAS,sBAAsB,UAqBtD;IAED,MAAM,CAAC,OAAO,aAwBb;IAED,MAAM,CAAC,UAAU,aAEhB;IAED,MAAM,CAAC,WAAW,QAAO,OAAO,CAE/B;IAED,MAAM,CAAC,kBAAkB,QAAO,MAAM,CAerC;IAGD,MAAM,CAAC,kBAAkB,mBAmBxB;CAEF"}
+{"version":3,"file":"SocketHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiD,4BAA4B,EAAE,sBAAsB,EAAwE,MAAM,qBAAqB,CAAC;AAEhN,qBAAa,YAAY;IACvB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;IACzB,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,cAAc,EAAE,4BAA4B,EAAE,CAAM;IAC3D,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAkE;IACjG,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAuB;IACtD,OAAO,CAAC,MAAM,CAAC,WAAW,CAAkB;IAC5C,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAc;IACjD,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAa;IAE7C,MAAM,CAAC,eAAe,GAAI,IAAI;QAAC,QAAQ,EAAC,MAAM,CAAC;QAAC,QAAQ,EAAC,MAAM,CAAA;KAAC,UAK/D;IAED,MAAM,CAAC,qBAAqB,aAQ3B;IAED,MAAM,CAAC,IAAI,sBA0EV;IAED,MAAM,CAAC,UAAU,GAAI,QAAQ,MAAM,EAAE,IAAI,MAAM,EAAE,eAAe,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,UAOlF;IAED,MAAM,CAAC,aAAa,GAAI,IAAI,MAAM,UAEjC;IAED,MAAM,CAAC,sBAAsB,GAAI,QAAQ,MAAM,UAE9C;IAED,MAAM,CAAC,gBAAgB,aAEtB;IAED,MAAM,CAAC,aAAa,GAAI,SAAS,sBAAsB,UAqBtD;IAED,MAAM,CAAC,OAAO,aAwBb;IAED,MAAM,CAAC,UAAU,aAEhB;IAED,MAAM,CAAC,WAAW,QAAO,OAAO,CAE/B;IAED,MAAM,CAAC,kBAAkB,QAAO,MAAM,CAerC;IAGD,MAAM,CAAC,kBAAkB,mBAmBxB;CAEF"}

package/dist/helpers/SocketHelper.js

@@ -11,7 +11,6 @@ SocketHelper.maxReconnectAttempts = 10;
 SocketHelper.reconnectAttempts = 0;
 SocketHelper.setPersonChurch = (pc) => {
     if (pc?.personId && pc.personId && pc.churchId !== _a.personIdChurchId.churchId && pc.personId !== _a.personIdChurchId.personId) {
-        //if (pc?.personId && pc.personId!==this.personIdChurchId.personId && this.socketId!==undefined && this.socketId) {
         _a.personIdChurchId = pc;
         _a.createAlertConnection();
     }
@@ -19,7 +18,9 @@ SocketHelper.setPersonChurch = (pc) => {
 SocketHelper.createAlertConnection = () => {
     if (_a.personIdChurchId.personId && _a.socketId) {
         const connection = { conversationId: "alerts", churchId: _a.personIdChurchId.churchId, displayName: "Test", socketId: _a.socketId, personId: _a.personIdChurchId.personId };
-        ApiHelper.postAnonymous("/connections", [connection], "MessagingApi");
+        ApiHelper.postAnonymous("/connections", [connection], "MessagingApi").catch((error) => {
+            console.error("❌ Failed to create alert connection:", error);
+        });
     }
 };
 SocketHelper.init = async () => {
@@ -27,12 +28,12 @@ SocketHelper.init = async () => {
     _a.cleanup();
     // Reset cleanup flag
     _a.isCleanedUp = false;
-    if (_a.socket !== undefined && _a.socket.readyState !== _a.socket.CLOSED) {
+    if (_a.socket && _a.socket.readyState !== _a.socket.CLOSED) {
         try {
             _a.socket.close();
         }
         catch (e) {
-            console.log("Error closing existing socket:", e);
+            console.error("❌ Error closing existing socket:", e);
         }
     }
     await new Promise((resolve, reject) => {
@@ -40,18 +41,18 @@ SocketHelper.init = async () => {
             _a.socket = new WebSocket(CommonEnvironmentHelper.MessagingApiSocket);
             _a.socket.onmessage = (event) => {
                 if (_a.isCleanedUp)
-                    return; // Don't process messages after cleanup
+                    return;
                 try {
                     const payload = JSON.parse(event.data);
                     _a.handleMessage(payload);
                 }
                 catch (error) {
-                    console.error("Error parsing socket message:", error);
+                    console.error("❌ Error parsing socket message:", error);
                 }
             };
             _a.socket.onopen = async (e) => {
                 _a.reconnectAttempts = 0; // Reset reconnect attempts on successful connection
-                _a.socket.send("getId"); //not sure this is needed.  It auto-sends socketId on connect
+                _a.socket.send("getId"); // Request socket ID
                 setTimeout(() => { resolve(null); }, 500);
             };
             _a.socket.onclose = async (e) => {
@@ -63,25 +64,29 @@ SocketHelper.init = async () => {
                 // Only attempt reconnection if not manually cleaned up and within retry limits
                 if (!_a.isCleanedUp && _a.reconnectAttempts < _a.maxReconnectAttempts) {
                     _a.reconnectAttempts++;
-                    const backoffDelay = Math.min(1000 * Math.pow(2, _a.reconnectAttempts - 1), 30000); // Exponential backoff with max 30s
+                    const backoffDelay = Math.min(1000 * Math.pow(2, _a.reconnectAttempts - 1), 30000);
+                    console.log(`🔄 WebSocket reconnecting... attempt ${_a.reconnectAttempts}/${_a.maxReconnectAttempts}`);
                     _a.reconnectTimeout = setTimeout(() => {
-                        if (!_a.isCleanedUp && _a.socket.readyState === _a.socket.CLOSED) {
+                        if (!_a.isCleanedUp && _a.socket && _a.socket.readyState === _a.socket.CLOSED) {
                             _a.init().then(() => {
                                 _a.handleMessage({ action: "reconnect", data: null });
                             }).catch((error) => {
-                                console.error("Reconnection failed:", error);
+                                console.error("❌ Reconnection failed:", error);
                             });
                         }
                     }, backoffDelay);
                 }
+                else if (_a.reconnectAttempts >= _a.maxReconnectAttempts) {
+                    console.error("❌ WebSocket max reconnection attempts reached");
+                }
             };
             _a.socket.onerror = (error) => {
-                console.error("WebSocket error:", error);
+                console.error("❌ WebSocket connection error:", error);
                 reject(error);
             };
         }
         catch (error) {
-            console.error("Error initializing socket:", error);
+            console.error("❌ Error initializing socket:", error);
             reject(error);
         }
     });
@@ -106,26 +111,26 @@ SocketHelper.clearAllHandlers = () => {
 };
 SocketHelper.handleMessage = (payload) => {
     if (_a.isCleanedUp)
-        return; // Don't handle messages after cleanup
+        return;
     try {
-        //console.log("MESSAGE", payload)
         if (payload.action === "socketId") {
             _a.socketId = payload.data;
             _a.createAlertConnection();
         }
         else {
-            ArrayHelper.getAll(_a.actionHandlers, "action", payload.action).forEach((handler) => {
+            const matchingHandlers = ArrayHelper.getAll(_a.actionHandlers, "action", payload.action);
+            matchingHandlers.forEach((handler) => {
                 try {
                     handler.handleMessage(payload.data);
                 }
                 catch (error) {
-                    console.error(`Error in handler ${handler.id}:`, error);
+                    console.error(`❌ Error in handler ${handler.id}:`, error);
                 }
             });
         }
     }
     catch (error) {
-        console.error("Error handling socket message:", error);
+        console.error("❌ Error handling socket message:", error);
     }
 };
 SocketHelper.cleanup = () => {

package/dist/helpers/SocketHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"SocketHelper.js","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SocketHelper.js","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":";AAAA,OAAO,EAA4H,SAAS,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAEhN,MAAM,OAAO,YAAY;;;AAGhB,2BAAc,GAAmC,EAAE,AAArC,CAAsC;AAC5C,6BAAgB,GAAuC,EAAC,QAAQ,EAAC,EAAE,EAAE,QAAQ,EAAC,EAAE,EAAC,AAAjE,CAAkE;AAClF,6BAAgB,GAAkB,IAAI,AAAtB,CAAuB;AACvC,wBAAW,GAAY,KAAK,AAAjB,CAAkB;AAC7B,iCAAoB,GAAW,EAAE,AAAb,CAAc;AAClC,8BAAiB,GAAW,CAAC,AAAZ,CAAa;AAEtC,4BAAe,GAAG,CAAC,EAAsC,EAAE,EAAE;IAClE,IAAI,EAAE,EAAE,QAAQ,IAAI,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,KAAG,EAAI,CAAC,gBAAgB,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,KAAG,EAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;QAChI,EAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,EAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;AACH,CAAC,AALqB,CAKrB;AAEM,kCAAqB,GAAG,GAAG,EAAE;IAClC,IAAI,EAAY,CAAC,gBAAgB,CAAC,QAAQ,IAAI,EAAY,CAAC,QAAQ,EAAE,CAAC;QACpE,MAAM,UAAU,GAAwB,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAY,CAAC,gBAAgB,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAY,CAAC,QAAQ,EAAE,QAAQ,EAAC,EAAY,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAA;QAE7N,SAAS,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;YACzF,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,AAR2B,CAQ3B;AAEM,iBAAI,GAAG,KAAK,IAAI,EAAE;IACvB,qCAAqC;IACrC,EAAY,CAAC,OAAO,EAAE,CAAC;IAEvB,qBAAqB;IACrB,EAAY,CAAC,WAAW,GAAG,KAAK,CAAC;IAEjC,IAAI,EAAY,CAAC,MAAM,IAAI,EAAY,CAAC,MAAM,CAAC,UAAU,KAAK,EAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACzF,IAAI,CAAC;YACH,EAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,CAAC,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpC,IAAI,CAAC;YACH,EAAY,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;YAEhF,EAAY,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE;gBACxC,IAAI,EAAY,CAAC,WAAW;oBAAE,OAAO;gBAErC,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACvC,EAAY,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBACtC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC,CAAC;YAEF,EAAY,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;gBACvC,EAAY,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,oDAAoD;gBACxF,EAAY,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAE,oBAAoB;gBACxD,UAAU,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YAC5C,CAAC,CAAC;YAEF,EAAY,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;gBACxC,uCAAuC;gBACvC,IAAI,EAAY,CAAC,gBAAgB,EAAE,CAAC;oBAClC,YAAY,CAAC,EAAY,CAAC,gBAAgB,CAAC,CAAC;oBAC5C,EAAY,CAAC,gBAAgB,GAAG,IAAI,CAAC;gBACvC,CAAC;gBAED,+EAA+E;gBAC/E,IAAI,CAAC,EAAY,CAAC,WAAW,IAAI,EAAY,CAAC,iBAAiB,GAAG,EAAY,CAAC,oBAAoB,EAAE,CAAC;oBACpG,EAAY,CAAC,iBAAiB,EAAE,CAAC;oBACjC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAY,CAAC,iBAAiB,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;oBAE7F,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAY,CAAC,iBAAiB,IAAI,EAAY,CAAC,oBAAoB,EAAE,CAAC,CAAC;oBAE3H,EAAY,CAAC,gBAAgB,GAAG,UAAU,CAAC,GAAG,EAAE;wBAC9C,IAAI,CAAC,EAAY,CAAC,WAAW,IAAI,EAAY,CAAC,MAAM,IAAI,EAAY,CAAC,MAAM,CAAC,UAAU,KAAK,EAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;4BACtH,EAAY,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gCAC5B,EAAY,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;4BAClE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gCACjB,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;4BACjD,CAAC,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC,EAAE,YAAY,CAAC,CAAC;gBACnB,CAAC;qBAAM,IAAI,EAAY,CAAC,iBAAiB,IAAI,EAAY,CAAC,oBAAoB,EAAE,CAAC;oBAC/E,OAAO,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC,CAAC;YAEF,EAAY,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;gBACtC,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;gBACtD,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC;QAEJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;YACrD,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,AA1EU,CA0EV;AAEM,uBAAU,GAAG,CAAC,MAAc,EAAE,EAAU,EAAE,aAAkC,EAAE,EAAE;IACrF,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,EAAY,CAAC,cAAc,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAC3E,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtB,QAAQ,CAAC,aAAa,GAAG,aAAa,CAAC;IACzC,CAAC;SAAM,CAAC;QACN,EAAY,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;IAClE,CAAC;AACH,CAAC,AAPgB,CAOhB;AAEM,0BAAa,GAAG,CAAC,EAAU,EAAE,EAAE;IACpC,EAAY,CAAC,cAAc,GAAG,EAAY,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;AACjG,CAAC,AAFmB,CAEnB;AAEM,mCAAsB,GAAG,CAAC,MAAc,EAAE,EAAE;IACjD,EAAY,CAAC,cAAc,GAAG,EAAY,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;AACzG,CAAC,AAF4B,CAE5B;AAEM,6BAAgB,GAAG,GAAG,EAAE;IAC7B,EAAY,CAAC,cAAc,GAAG,EAAE,CAAC;AACnC,CAAC,AAFsB,CAEtB;AAEM,0BAAa,GAAG,CAAC,OAA+B,EAAE,EAAE;IACzD,IAAI,EAAY,CAAC,WAAW;QAAE,OAAO;IAErC,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,MAAM,KAAG,UAAU,EAAE,CAAC;YAChC,EAAY,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;YACrC,EAAY,CAAC,qBAAqB,EAAE,CAAC;QACvC,CAAC;aACI,CAAC;YACJ,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,EAAY,CAAC,cAAc,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACnG,gBAAgB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACnC,IAAI,CAAC;oBACH,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACtC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CAAC,sBAAsB,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC,AArBmB,CAqBnB;AAEM,oBAAO,GAAG,GAAG,EAAE;IACpB,EAAY,CAAC,WAAW,GAAG,IAAI,CAAC;IAEhC,0BAA0B;IAC1B,IAAI,EAAY,CAAC,gBAAgB,EAAE,CAAC;QAClC,YAAY,CAAC,EAAY,CAAC,gBAAgB,CAAC,CAAC;QAC5C,EAAY,CAAC,gBAAgB,GAAG,IAAI,CAAC;IACvC,CAAC;IAED,0BAA0B;IAC1B,IAAI,EAAY,CAAC,MAAM,IAAI,EAAY,CAAC,MAAM,CAAC,UAAU,KAAK,EAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACzF,IAAI,CAAC;YACH,EAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,mBAAmB;IACnB,EAAY,CAAC,MAAM,GAAG,IAAI,CAAC;IAC3B,EAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC7B,EAAY,CAAC,cAAc,GAAG,EAAE,CAAC;IACjC,EAAY,CAAC,gBAAgB,GAAG,EAAC,QAAQ,EAAC,EAAE,EAAE,QAAQ,EAAC,EAAE,EAAC,CAAC;IAC3D,EAAY,CAAC,iBAAiB,GAAG,CAAC,CAAC;AACrC,CAAC,AAxBa,CAwBb;AAEM,uBAAU,GAAG,GAAG,EAAE;IACvB,EAAY,CAAC,OAAO,EAAE,CAAC;AACzB,CAAC,AAFgB,CAEhB;AAEM,wBAAW,GAAG,GAAY,EAAE;IACjC,OAAO,EAAY,CAAC,MAAM,IAAI,EAAY,CAAC,MAAM,CAAC,UAAU,KAAK,EAAY,CAAC,MAAM,CAAC,IAAI,CAAC;AAC5F,CAAC,AAFiB,CAEjB;AAEM,+BAAkB,GAAG,GAAW,EAAE;IACvC,IAAI,CAAC,EAAY,CAAC,MAAM;QAAE,OAAO,eAAe,CAAC;IAEjD,QAAQ,EAAY,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACvC,KAAK,EAAY,CAAC,MAAM,CAAC,UAAU;YACjC,OAAO,YAAY,CAAC;QACtB,KAAK,EAAY,CAAC,MAAM,CAAC,IAAI;YAC3B,OAAO,MAAM,CAAC;QAChB,KAAK,EAAY,CAAC,MAAM,CAAC,OAAO;YAC9B,OAAO,SAAS,CAAC;QACnB,KAAK,EAAY,CAAC,MAAM,CAAC,MAAM;YAC7B,OAAO,QAAQ,CAAC;QAClB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC,AAfwB,CAexB;AAED,kCAAkC;AAC3B,+BAAkB,GAAG,GAAG,EAAE;IAC/B,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,EAAY,CAAC,OAAO,EAAE,CAAC;QACzB,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAE3C,8DAA8D;QAC9D,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,GAAG,EAAE;YACjD,IAAI,QAAQ,CAAC,eAAe,KAAK,QAAQ,EAAE,CAAC;gBAC1C,4CAA4C;gBAC5C,0BAA0B;YAC5B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC,AAnBwB,CAmBxB"}

package/dist/helpers/UserHelper.js

@@ -1,5 +1,5 @@
 var _a;
-import { ApiHelper } from "./ApiHelper";
+import { ApiHelper } from "@churchapps/helpers";
 export class UserHelper {
     static setupApiHelper(userChurch) {
         ApiHelper.setDefaultPermissions(userChurch.jwt);
@@ -12,7 +12,7 @@ export class UserHelper {
         const permissions = ApiHelper.getConfig(api)?.permissions || [];
         let result = false;
         if (permissions !== undefined) {
-            permissions.forEach(element => {
+            permissions.forEach((element) => {
                 if (element.contentType === contentType && element.action === action)
                     result = true;
             });

package/dist/helpers/UserHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserHelper.js","sourceRoot":"","sources":["../../src/helpers/UserHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"UserHelper.js","sourceRoot":"","sources":["../../src/helpers/UserHelper.ts"],"names":[],"mappings":"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"}

package/dist/helpers/index.d.ts

@@ -7,4 +7,6 @@ export { createEmotionCache } from "./createEmotionCache";
 export { Locale } from "./Locale";
 export { SlugHelper } from "./SlugHelper";
 export { SocketHelper } from "./SocketHelper";
+export { NotificationService } from "./NotificationService";
+export type { NotificationCounts } from "./NotificationService";
 //# sourceMappingURL=index.d.ts.map

package/dist/helpers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EACT,gBAAgB,IAAI,oBAAoB,EACxC,WAAW,EACX,uBAAuB,EACvB,cAAc,EACd,UAAU,EACV,WAAW,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,UAAU,EACV,cAAc,EACd,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAG7B,YAAY,EACV,iBAAiB,EACjB,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,aAAa,EACb,wBAAwB,EACxB,oBAAoB,EACpB,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,EACrB,6BAA6B,EAC7B,8BAA8B,EAC9B,mBAAmB,EACnB,4BAA4B,EAC5B,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EACT,gBAAgB,IAAI,oBAAoB,EACxC,WAAW,EACX,uBAAuB,EACvB,cAAc,EACd,UAAU,EACV,WAAW,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,UAAU,EACV,cAAc,EACd,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAG7B,YAAY,EACV,iBAAiB,EACjB,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,aAAa,EACb,wBAAwB,EACxB,oBAAoB,EACpB,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,EACrB,6BAA6B,EAC7B,8BAA8B,EAC9B,mBAAmB,EACnB,4BAA4B,EAC5B,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,YAAY,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/helpers/index.js

@@ -7,4 +7,5 @@ export { createEmotionCache } from "./createEmotionCache";
 export { Locale } from "./Locale";
 export { SlugHelper } from "./SlugHelper";
 export { SocketHelper } from "./SocketHelper";
+export { NotificationService } from "./NotificationService";
 //# sourceMappingURL=index.js.map

package/dist/helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EACL,SAAS,EACT,gBAAgB,IAAI,oBAAoB,EACxC,WAAW,EACX,uBAAuB,EACvB,cAAc,EACd,UAAU,EACV,WAAW,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,UAAU,EACV,cAAc,EACd,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAyB7B,uBAAuB;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EACL,SAAS,EACT,gBAAgB,IAAI,oBAAoB,EACxC,WAAW,EACX,uBAAuB,EACvB,cAAc,EACd,UAAU,EACV,WAAW,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,UAAU,EACV,cAAc,EACd,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAyB7B,uBAAuB;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/hooks/index.d.ts

@@ -1,2 +1,4 @@
 export { useMountedState } from "./useMountedState";
+export { useNotifications } from "./useNotifications";
+export type { UseNotificationsResult } from "./useNotifications";
 //# sourceMappingURL=index.d.ts.map

package/dist/hooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/hooks/index.js

@@ -1,2 +1,3 @@
 export { useMountedState } from "./useMountedState";
+export { useNotifications } from "./useNotifications";
 //# sourceMappingURL=index.js.map

package/dist/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/hooks/useNotifications.d.ts

@@ -0,0 +1,30 @@
+import { NotificationCounts } from '../helpers/NotificationService';
+import { UserContextInterface } from '@churchapps/helpers';
+export interface UseNotificationsResult {
+    counts: NotificationCounts;
+    isLoading: boolean;
+    isReady: boolean;
+    refresh: () => Promise<void>;
+    error: string | null;
+}
+/**
+ * Custom hook for managing real-time notifications
+ *
+ * @param context - User context containing person and church information
+ * @returns Object containing notification counts and management functions
+ *
+ * @example
+ * ```tsx
+ * const { counts, isLoading, refresh } = useNotifications(context);
+ *
+ * return (
+ *   <UserMenu
+ *     notificationCounts={counts}
+ *     loadCounts={refresh}
+ *     // ... other props
+ *   />
+ * );
+ * ```
+ */
+export declare function useNotifications(context: UserContextInterface | null): UseNotificationsResult;
+//# sourceMappingURL=useNotifications.d.ts.map

package/dist/hooks/useNotifications.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useNotifications.d.ts","sourceRoot":"","sources":["../../src/hooks/useNotifications.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,oBAAoB,GAAG,IAAI,GAAG,sBAAsB,CA8D7F"}

package/dist/hooks/useNotifications.js

@@ -0,0 +1,79 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import { NotificationService } from '../helpers/NotificationService';
+/**
+ * Custom hook for managing real-time notifications
+ *
+ * @param context - User context containing person and church information
+ * @returns Object containing notification counts and management functions
+ *
+ * @example
+ * ```tsx
+ * const { counts, isLoading, refresh } = useNotifications(context);
+ *
+ * return (
+ *   <UserMenu
+ *     notificationCounts={counts}
+ *     loadCounts={refresh}
+ *     // ... other props
+ *   />
+ * );
+ * ```
+ */
+export function useNotifications(context) {
+    const [counts, setCounts] = useState({ notificationCount: 0, pmCount: 0 });
+    const [isLoading, setIsLoading] = useState(true);
+    const [error, setError] = useState(null);
+    // Get the singleton instance only once
+    const notificationService = React.useMemo(() => NotificationService.getInstance(), []);
+    // Initialize the service when context becomes available
+    useEffect(() => {
+        if (!context?.person?.id || !context?.userChurch?.church?.id) {
+            setIsLoading(false);
+            return;
+        }
+        const initializeService = async () => {
+            try {
+                setIsLoading(true);
+                setError(null);
+                await notificationService.initialize(context);
+            }
+            catch (err) {
+                console.error("❌ useNotifications: Failed to initialize:", err);
+                setError(err instanceof Error ? err.message : 'Failed to initialize notifications');
+            }
+            finally {
+                setIsLoading(false);
+            }
+        };
+        initializeService();
+    }, [context?.person?.id, context?.userChurch?.church?.id]);
+    // Subscribe to notification count changes
+    useEffect(() => {
+        const unsubscribe = notificationService.subscribe((newCounts) => {
+            setCounts(newCounts);
+        });
+        // Cleanup subscription on unmount
+        return () => {
+            unsubscribe();
+        };
+    }, [notificationService]);
+    // Refresh function - memoized without dependencies for stable reference
+    const refresh = useCallback(async () => {
+        try {
+            setError(null);
+            await NotificationService.getInstance().refresh();
+        }
+        catch (err) {
+            console.error("❌ useNotifications: Refresh failed:", err);
+            setError(err instanceof Error ? err.message : 'Failed to refresh notifications');
+        }
+    }, []);
+    return {
+        counts,
+        isLoading,
+        isReady: notificationService.isReady(),
+        refresh,
+        error
+    };
+}
+//# sourceMappingURL=useNotifications.js.map

package/dist/hooks/useNotifications.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useNotifications.js","sourceRoot":"","sources":["../../src/hooks/useNotifications.ts"],"names":[],"mappings":"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"}

package/dist/public/css/styles.css

@@ -58,13 +58,17 @@
 }
 
 #primaryNavButton {
-  margin-right:50px;
+  margin-right:15px;
   text-transform: "none";
+  height: 48px !important;
+  min-height: 48px !important;
+  max-height: 48px !important;
 }
 
 #primaryNavButton img {
-  height:35px;
+  height:35px !important;
   margin-right:15px;
+  max-height:35px !important;
 }
 
 #primaryNavButton h2 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@churchapps/apphelper",
-  "version": "0.4.17",
+  "version": "0.4.19",
   "description": "Library of helper functions for React and NextJS ChurchApps",
   "type": "module",
   "main": "dist/index.js",

package/public/css/styles.css

@@ -58,13 +58,17 @@
 }
 
 #primaryNavButton {
-  margin-right:50px;
+  margin-right:15px;
   text-transform: "none";
+  height: 48px !important;
+  min-height: 48px !important;
+  max-height: 48px !important;
 }
 
 #primaryNavButton img {
-  height:35px;
+  height:35px !important;
   margin-right:15px;
+  max-height:35px !important;
 }
 
 #primaryNavButton h2 {

package/src/components/DisplayBox.tsx

@@ -60,22 +60,22 @@ export const DisplayBox = React.forwardRef<HTMLDivElement, Props>((props, ref) =
   else if (props.editContent !== undefined) editContent = props.editContent;
 
   return (
-    <Paper sx={{ padding: 2, marginBottom: 4 }} id={props.id} data-testid={props["data-testid"] || ""}>
+    <Paper sx={{ padding: 2, marginBottom: 4 }} id={props.id || "display-box"} data-testid={props["data-testid"] || ""}>
       {props.help && <HelpIcon article={props.help} />}
-      <Box sx={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
-        <Box sx={{ display: "flex", alignItems: "center" }}>
-          {props.headerIcon && <Icon sx={{ color: headerText }}>{props.headerIcon}</Icon>}
-          <Typography component="h2" sx={{ display: "inline-block", marginLeft: props.headerIcon ? 1 : 0 }} variant="h6" color={headerText}>
+      <Box id="display-box-header" sx={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
+        <Box id="display-box-title-section" sx={{ display: "flex", alignItems: "center" }}>
+          {props.headerIcon && <Icon id="display-box-icon" sx={{ color: headerText }}>{props.headerIcon}</Icon>}
+          <Typography id="display-box-title" component="h2" sx={{ display: "inline-block", marginLeft: props.headerIcon ? 1 : 0 }} variant="h6" color={headerText}>
             {props.headerText}
           </Typography>
 
         </Box>
-        <Box>
+        <Box id="display-box-actions">
           {editContent}
         </Box>
       </Box>
-      <CustomContextBox ref={ref} data-testid="display-box-content">{props.children}</CustomContextBox>
-      {props.footerContent && (<div style={{ marginLeft: -16, marginRight: -16, marginBottom: -15, marginTop: 15 }}>{props.footerContent}</div>)}
+      <CustomContextBox id="display-box-content" ref={ref} data-testid="display-box-content">{props.children}</CustomContextBox>
+      {props.footerContent && (<div id="display-box-footer" style={{ marginLeft: -16, marginRight: -16, marginBottom: -15, marginTop: 15 }}>{props.footerContent}</div>)}
     </Paper>
   );
 })