chore: minimise dup notifications, except OF Credit + Launcher quotes

packages/client/src/client/App/Credit/CreditRfqForm/CreditRfqForm.tsx

@@ -1,7 +1,11 @@
-import { lazy, Suspense } from "react"
+import { lazy, Suspense, useEffect } from "react"
 import styled from "styled-components"
 
 import { Loader } from "@/client/components/Loader"
+import {
+  registerCreditRfqCreatedNotifications,
+  unregisterCreditRfqCreatedNotifications,
+} from "@/client/notifications"
 
 const CreditRfqFormCore = lazy(() => import("./CreditRfqFormCore"))
 
@@ -17,12 +21,24 @@ const loader = (
   <Loader ariaLabel="Loading New RFQ Form" minWidth="22rem" minHeight="22rem" />
 )
 
-export const CreditRfqForm = () => (
-  <CreditRfqFormWrapper>
-    <Suspense fallback={loader}>
-      <CreditRfqFormCore>{loader}</CreditRfqFormCore>
-    </Suspense>
-  </CreditRfqFormWrapper>
-)
+export const CreditRfqForm = () => {
+  // TODO (5569) - required, otherwise Web will not populate instrument-related columns
+  // Instrument data is not ready when the RFQ updates are processed, without this (must be indirect subscription)
+  // (should be in lazy-loaded Core module, like other registrations)
+  useEffect(() => {
+    registerCreditRfqCreatedNotifications()
+    return () => {
+      unregisterCreditRfqCreatedNotifications()
+    }
+  }, [])
+
+  return (
+    <CreditRfqFormWrapper>
+      <Suspense fallback={loader}>
+        <CreditRfqFormCore>{loader}</CreditRfqFormCore>
+      </Suspense>
+    </CreditRfqFormWrapper>
+  )
+}
 
 export default CreditRfqForm

packages/client/src/client/App/Credit/CreditRfqForm/CreditRfqFormCore.tsx

@@ -2,10 +2,6 @@ import { Subscribe } from "@react-rxjs/core"
 import { useEffect } from "react"
 import styled from "styled-components"
 
-import {
-  registerCreditRfqCreatedNotifications,
-  unregisterCreditRfqCreatedNotifications,
-} from "@/client/notifications"
 import { WithChildren } from "@/client/utils/utilityTypes"
 import { registerSimulatedDealerResponses } from "@/services/credit/creditRfqResponses"
 
@@ -64,11 +60,8 @@ const CreditRfqFooter = styled.footer`
 const CreditRfqFormCore = ({ children }: WithChildren) => {
   useEffect(() => {
     const subscription = registerSimulatedDealerResponses()
-    registerCreditRfqCreatedNotifications()
-
     return () => {
       subscription.unsubscribe()
-      unregisterCreditRfqCreatedNotifications()
     }
   }, [])
 

packages/client/src/client/App/Credit/CreditRfqs/CreditRfqsCore.tsx

@@ -3,7 +3,9 @@ import { useEffect } from "react"
 import styled from "styled-components"
 
 import {
+  registerCreditQuoteAcceptedNotifications,
   registerCreditQuoteReceivedNotifications,
+  unregisterCreditQuoteAcceptedNotifications,
   unregisterCreditQuoteReceivedNotifications,
 } from "@/client/notifications"
 import { WithChildren } from "@/client/utils/utilityTypes"
@@ -20,9 +22,13 @@ const CreditRfqsCoreWrapper = styled.div`
 const CreditRfqsCore = ({ children }: WithChildren) => {
   useEffect(() => {
     registerCreditQuoteReceivedNotifications()
+    // the most logical place for accepted notifications,
+    // for all cases except the NLP-based nested RFQ ticket
+    registerCreditQuoteAcceptedNotifications()
 
     return () => {
       unregisterCreditQuoteReceivedNotifications()
+      unregisterCreditQuoteAcceptedNotifications()
     }
   }, [])
 

packages/client/src/client/App/Trades/CreditTrades.tsx

@@ -1,7 +1,11 @@
-import { lazy, Suspense } from "react"
+import { lazy, Suspense, useEffect } from "react"
 import styled from "styled-components"
 
 import { Loader } from "@/client/components/Loader"
+import {
+  registerCreditQuoteAcceptedNotifications,
+  unregisterCreditQuoteAcceptedNotifications,
+} from "@/client/notifications"
 
 const TradesCore = lazy(() => import("./CoreCreditTrades"))
 
@@ -12,12 +16,24 @@ const TradesWrapper = styled.article`
   background: ${({ theme }) => theme.core.darkBackground};
 `
 
-export const CreditTrades = () => (
-  <TradesWrapper>
-    <Suspense fallback={<Loader />}>
-      <TradesCore />
-    </Suspense>
-  </TradesWrapper>
-)
+export const CreditTrades = () => {
+  // TODO (5569) - for now, we need to register for RFQ "accepted" here
+  // .. otherwise, in OpenFin, there is no past data in the Credit Blotter
+  // only processes endStateOfTheWorld rfq update
+  useEffect(() => {
+    registerCreditQuoteAcceptedNotifications()
+    return () => {
+      unregisterCreditQuoteAcceptedNotifications()
+    }
+  }, [])
+
+  return (
+    <TradesWrapper>
+      <Suspense fallback={<Loader />}>
+        <TradesCore />
+      </Suspense>
+    </TradesWrapper>
+  )
+}
 
 export default CreditTrades

packages/client/src/client/notifications.openfin.ts

@@ -1,6 +1,6 @@
 import * as CSS from "csstype"
 import {
-  addEventListener,
+  addEventListener as addOpenFinNotificationsEventListener,
   ContainerTemplateFragment,
   create,
   CustomTemplateOptions,
@@ -316,7 +316,7 @@ export const registerFxTradeNotifications = (
     (message: { tradeId: number }) => setFxTradeRowHighlight(message.tradeId),
   )
 
-  addEventListener(
+  addOpenFinNotificationsEventListener(
     "notification-action",
     handler || handleHighlightFxBlotterAction,
   )
@@ -336,9 +336,10 @@ export const registerFxTradeNotifications = (
 
 export const unregisterFxTradeNotifications = () => {
   if (executionSubscription) {
-    areFxTradeNotificationsRegistered = false
     executionSubscription.unsubscribe()
+    executionSubscription = null
   }
+  areFxTradeNotificationsRegistered = false
 }
 
 let areCreditRfqCreatedNotificationsRegistered = false
@@ -352,28 +353,30 @@ export const registerCreditRfqCreatedNotifications = (
   }
   areCreditRfqCreatedNotificationsRegistered = true
 
-  if (creditRfqCreatedSubscription == null) {
-    fin.InterApplicationBus.subscribe(
-      { uuid: "*" },
-      TOPIC_HIGHLIGHT_CREDIT_RFQ,
-      (message: { rfqId: number }) => {
-        setCreditRfqCardHighlight(message.rfqId)
-      },
-    )
+  fin.InterApplicationBus.subscribe(
+    { uuid: "*" },
+    TOPIC_HIGHLIGHT_CREDIT_RFQ,
+    (message: { rfqId: number }) => {
+      setCreditRfqCardHighlight(message.rfqId)
+    },
+  )
 
-    addEventListener("notification-action", handler || handleHighlightRfqAction)
+  addOpenFinNotificationsEventListener(
+    "notification-action",
+    handler || handleHighlightRfqAction,
+  )
 
-    creditRfqCreatedSubscription = createdCreditConfirmation$.subscribe(
-      (rfqRquest) => {
-        sendCreditRfqCreatedNotification(rfqRquest)
-      },
-    )
-  }
+  creditRfqCreatedSubscription = createdCreditConfirmation$.subscribe(
+    (rfqRquest) => {
+      sendCreditRfqCreatedNotification(rfqRquest)
+    },
+  )
 }
 
 export const unregisterCreditRfqCreatedNotifications = () => {
-  if (creditRfqCreatedSubscription != null) {
+  if (creditRfqCreatedSubscription) {
     creditRfqCreatedSubscription.unsubscribe()
+    creditRfqCreatedSubscription = null
   }
   areCreditRfqCreatedNotificationsRegistered = false
 }
@@ -397,7 +400,10 @@ export const registerCreditQuoteReceivedNotifications = (
     },
   )
 
-  addEventListener("notification-action", handler || handleHighlightRfqAction)
+  addOpenFinNotificationsEventListener(
+    "notification-action",
+    handler || handleHighlightRfqAction,
+  )
 
   creditQuoteReceivedSubscription = lastQuoteReceived$.subscribe({
     next: (quote) => {
@@ -413,8 +419,9 @@ export const registerCreditQuoteReceivedNotifications = (
 }
 
 export const unregisterCreditQuoteReceivedNotifications = () => {
-  if (creditQuoteReceivedSubscription != null) {
+  if (creditQuoteReceivedSubscription) {
     creditQuoteReceivedSubscription.unsubscribe()
+    creditQuoteReceivedSubscription = null
   }
   areCreditQuoteReceivedNotificationsRegistered = false
 }
@@ -429,6 +436,7 @@ export const registerCreditQuoteAcceptedNotifications = (
     return
   }
   areCreditQuoteAcceptedNotificationsRegistered = true
+
   fin.InterApplicationBus.subscribe(
     { uuid: "*" },
     TOPIC_HIGHLIGHT_CREDIT_BLOTTER,
@@ -437,7 +445,7 @@ export const registerCreditQuoteAcceptedNotifications = (
     },
   )
 
-  addEventListener(
+  addOpenFinNotificationsEventListener(
     "notification-action",
     handler || handleHighlightCreditBlotterAction,
   )
@@ -448,8 +456,9 @@ export const registerCreditQuoteAcceptedNotifications = (
 }
 
 export const unregisterCreditQuoteAcceptedNotifications = () => {
-  if (creditQuoteAcceptedSubscription != null) {
+  if (creditQuoteAcceptedSubscription) {
     creditQuoteAcceptedSubscription.unsubscribe()
+    creditQuoteAcceptedSubscription = null
   }
   areCreditQuoteAcceptedNotificationsRegistered = false
 }

packages/client/src/client/notifications.web.ts

@@ -95,12 +95,20 @@ const notificationsGranted = () =>
     }
   })
 
+// NOTE: All the guard code complication below is due to:
+//       a) the delay of the notificationsGranted promise - in development mode effects, unreg happens before reg
+//       b) other calls of the same registration in the same context causes duplicate subs
+
 let executionSubscription: Subscription | null = null
 
 export async function registerFxTradeNotifications() {
   try {
     await notificationsGranted()
 
+    if (executionSubscription) {
+      return
+    }
+
     // send trade executed for this tab only (driven from executeTrade ACK)
     executionSubscription = executions$.subscribe({
       next: (executionTrade) => {
@@ -121,29 +129,41 @@ export async function registerFxTradeNotifications() {
 export function unregisterFxTradeNotifications() {
   if (executionSubscription) {
     executionSubscription.unsubscribe()
+    executionSubscription = null
   }
 }
 
 let creditRfqCreatedSubscription: Subscription | null = null
 
-export function registerCreditRfqCreatedNotifications() {
-  // send rfq created alerts for this tab only (driven from credit createRfq ACK)
-  creditRfqCreatedSubscription = createdCreditConfirmation$.subscribe({
-    next: (createdRFQRequest) => {
-      sendCreditRfqCreatedNotification(createdRFQRequest)
-    },
-    error: (e) => {
-      console.error(e)
-    },
-    complete: () => {
-      console.error("Credit notifications RFQ created stream completed!?")
-    },
-  })
+export async function registerCreditRfqCreatedNotifications() {
+  try {
+    await notificationsGranted()
+
+    if (creditRfqCreatedSubscription) {
+      return
+    }
+
+    // send rfq created alerts for this tab only (driven from credit createRfq ACK)
+    creditRfqCreatedSubscription = createdCreditConfirmation$.subscribe({
+      next: (createdRFQRequest) => {
+        sendCreditRfqCreatedNotification(createdRFQRequest)
+      },
+      error: (e) => {
+        console.error(e)
+      },
+      complete: () => {
+        console.error("Credit notifications RFQ created stream completed!?")
+      },
+    })
+  } catch (e) {
+    console.error(e)
+  }
 }
 
 export function unregisterCreditRfqCreatedNotifications() {
   if (creditRfqCreatedSubscription) {
     creditRfqCreatedSubscription.unsubscribe()
+    creditRfqCreatedSubscription = null
   }
 }
 
@@ -153,6 +173,10 @@ export async function registerCreditQuoteReceivedNotifications() {
   try {
     await notificationsGranted()
 
+    if (creditQuoteReceivedSubscription) {
+      return
+    }
+
     // send quote alerts for every live tab connected to BE (driven from rfq update feed)
     creditQuoteReceivedSubscription = lastQuoteReceived$.subscribe({
       next: (quote) => {
@@ -173,6 +197,7 @@ export async function registerCreditQuoteReceivedNotifications() {
 export function unregisterCreditQuoteReceivedNotifications() {
   if (creditQuoteReceivedSubscription) {
     creditQuoteReceivedSubscription.unsubscribe()
+    creditQuoteReceivedSubscription = null
   }
 }
 
@@ -182,6 +207,10 @@ export async function registerCreditQuoteAcceptedNotifications() {
   try {
     await notificationsGranted()
 
+    if (creditQuoteAcceptedSubscription) {
+      return
+    }
+
     // send accepted quote alerts for this tab only (driven from credit accept ACK)
     creditQuoteAcceptedSubscription = acceptedRfqWithQuote$.subscribe({
       next: (rfqWithQuote) => {
@@ -202,5 +231,6 @@ export async function registerCreditQuoteAcceptedNotifications() {
 export function unregisterCreditQuoteAcceptedNotifications() {
   if (creditQuoteAcceptedSubscription) {
     creditQuoteAcceptedSubscription.unsubscribe()
+    creditQuoteAcceptedSubscription = null
   }
 }