Merge pull request #5828 from EdgeApp/sam/posthog-capture-event-fixes

Sam/posthog capture event fixes

Author: samholmes

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased (develop)
 
+- fixed: Fixed broken `logEvent` tracking calls by adding the needed `dispatch`.
 - removed: Remove change quote tracking.
 
 ## 4.38.0 (staging)

eslint.config.mjs

@@ -375,7 +375,6 @@ export default [
       'src/components/themed/TransactionListTop.tsx',
       'src/components/themed/VectorIcon.tsx',
       'src/components/themed/WalletList.tsx',
-      'src/components/themed/WalletListCreateRow.tsx',
 
       'src/components/themed/WalletListErrorRow.tsx',
       'src/components/themed/WalletListHeader.tsx',

src/actions/AccountReferralActions.ts

@@ -123,13 +123,13 @@ function createAccountReferral(): ThunkAction<Promise<void>> {
           referral.accountAppleAdsAttribution = isFirstOpenEmpty
             ? await getAppleAdsAttribution()
             : firstOpenAttrib
-          logEvent('AAA_Success')
+          dispatch(logEvent('AAA_Success'))
         } else {
           referral.accountAppleAdsAttribution = await getAppleAdsAttribution()
           if (referral.accountAppleAdsAttribution == null) {
-            logEvent('AAA_Failed')
+            dispatch(logEvent('AAA_Failed'))
           } else {
-            logEvent('AAA_Success')
+            dispatch(logEvent('AAA_Success'))
           }
         }
       } catch (e) {}

src/components/scenes/RampCreateScene.tsx

@@ -525,7 +525,7 @@ export const RampCreateScene: React.FC<Props> = (props: Props) => {
 
   // Log the quote event only when the scene is focused
   useFocusEffect(() => {
-    logEvent(direction === 'buy' ? 'Buy_Quote' : 'Sell_Quote')
+    dispatch(logEvent(direction === 'buy' ? 'Buy_Quote' : 'Sell_Quote'))
   })
 
   //
@@ -619,7 +619,9 @@ export const RampCreateScene: React.FC<Props> = (props: Props) => {
       }
     }
 
-    logEvent(direction === 'buy' ? 'Buy_Quote_Next' : 'Sell_Quote_Next')
+    dispatch(
+      logEvent(direction === 'buy' ? 'Buy_Quote_Next' : 'Sell_Quote_Next')
+    )
 
     navigation.navigate('rampSelectOption', {
       rampQuoteRequest

src/components/themed/WalletListCreateRow.tsx

@@ -35,7 +35,7 @@ export interface WalletListCreateRowProps {
 
 export const WalletListCreateRowComponent = (
   props: WalletListCreateRowProps
-) => {
+): React.ReactElement => {
   const {
     createItem,
     createWalletId,
@@ -88,7 +88,7 @@ export const WalletListCreateRowComponent = (
     if (walletType != null) {
       await dispatch(createAndSelectWallet(pluginId, keyOptions))
         .then(handleRes)
-        .catch(err => {
+        .catch((err: unknown) => {
           showError(err)
         })
         .finally(() => (pressMutexRef.current = false))
@@ -104,13 +104,15 @@ export const WalletListCreateRowComponent = (
           })
         )
           .then(handleRes)
-          .catch(err => {
+          .catch((err: unknown) => {
             showError(err)
           })
           .finally(() => (pressMutexRef.current = false))
       } else {
         await Airship.show(bridge => {
-          const renderRow = (wallet: EdgeCurrencyWallet) => (
+          const renderRow = (
+            wallet: EdgeCurrencyWallet
+          ): React.ReactElement => (
             <WalletListCurrencyRow
               tokenId={null}
               wallet={wallet}
@@ -149,7 +151,7 @@ export const WalletListCreateRowComponent = (
             />
           )
         })
-          .catch(err => {
+          .catch((err: unknown) => {
             showError(err)
           })
           .finally(() => (pressMutexRef.current = false))
@@ -238,12 +240,12 @@ function createAndSelectToken({
       )
 
       await wallet.changeEnabledTokenIds([...wallet.enabledTokenIds, tokenId])
-      if (trackingEventSuccess != null) logEvent(trackingEventSuccess)
+      if (trackingEventSuccess != null) dispatch(logEvent(trackingEventSuccess))
       return wallet
     } catch (error: any) {
       showError(error)
       if (trackingEventFailed != null)
-        logEvent(trackingEventFailed, { error: String(error) })
+        dispatch(logEvent(trackingEventFailed, { error: String(error) }))
     }
   }
 }

src/plugins/gui/amountQuotePlugin.ts

@@ -13,7 +13,6 @@ import {
 } from '../../util/CurrencyInfoHelpers'
 import { getHistoricalFiatRate } from '../../util/exchangeRates'
 import { infoServerData } from '../../util/network'
-import { logEvent } from '../../util/tracking'
 import {
   DECIMAL_PRECISION,
   fuzzyTimeout,
@@ -134,7 +133,14 @@ async function getInitialFiatValue(
 export const amountQuoteFiatPlugin: FiatPluginFactory = async (
   params: FiatPluginFactoryArgs
 ) => {
-  const { account, guiPlugin, longPress = false, pluginUtils, showUi } = params
+  const {
+    account,
+    guiPlugin,
+    longPress = false,
+    pluginUtils,
+    showUi,
+    onLogEvent
+  } = params
   const { pluginId } = guiPlugin
   const isLightAccount = account.username == null
 
@@ -352,7 +358,7 @@ export const amountQuoteFiatPlugin: FiatPluginFactory = async (
       const isBuy = direction === 'buy'
       const disableInput = requireCrypto ? 1 : requireFiat ? 2 : undefined
 
-      logEvent(isBuy ? 'Buy_Quote' : 'Sell_Quote')
+      onLogEvent(isBuy ? 'Buy_Quote' : 'Sell_Quote')
 
       const startingFiatAmount = isLightAccount
         ? DEFAULT_FIAT_AMOUNT_LIGHT_ACCOUNT
@@ -776,7 +782,7 @@ export const amountQuoteFiatPlugin: FiatPluginFactory = async (
             }
           }
 
-          logEvent(isBuy ? 'Buy_Quote_Next' : 'Sell_Quote_Next')
+          onLogEvent(isBuy ? 'Buy_Quote_Next' : 'Sell_Quote_Next')
           await bestQuote.approveQuote({ showUi, coreWallet })
         }
       }

src/plugins/gui/fiatPlugin.tsx

@@ -461,7 +461,8 @@ export const executePlugin = async (params: {
     longPress,
     guiPlugin,
     pluginUtils,
-    showUi
+    showUi,
+    onLogEvent
   })
   if (plugin == null) {
     throw new Error(`pluginId ${pluginId} not found`)

src/plugins/gui/fiatPluginTypes.ts

@@ -29,7 +29,8 @@ import type {
 import type {
   BuyConversionValues,
   SellConversionValues,
-  TrackingEventName
+  TrackingEventName,
+  TrackingValues
 } from '../../util/tracking'
 import type { FiatPluginAddressFormParams } from './scenes/AddressFormScene'
 import type { FiatPluginOpenWebViewParams } from './scenes/FiatPluginWebView'
@@ -220,6 +221,7 @@ export interface FiatPluginFactoryArgs {
   guiPlugin: GuiPlugin
   showUi: FiatPluginUi
   pluginUtils: FiatPluginUtils
+  onLogEvent: (event: TrackingEventName, values?: TrackingValues) => void
 }
 
 export interface FiatPluginRegionCode {

src/types/posthog.d.ts

@@ -0,0 +1,8 @@
+import type { PostHog } from 'posthog-react-native'
+
+declare global {
+  // Expose the analytics instance on the global scope for app-wide use
+  // The PostHog instance is initialized at runtime
+  // See src/util/tracking.ts for initialization
+  var posthog: PostHog | undefined
+}

src/util/tracking.ts

@@ -171,7 +171,6 @@ if (ENV.POSTHOG_INIT != null) {
 
   posthogAsync
     .then(client => {
-      // @ts-expect-error Attach PostHog instance to global for analytics access
       global.posthog = client
     })
     .catch((e: unknown) => {
@@ -408,10 +407,8 @@ async function logToPosthog(
   event: TrackingEventName,
   values: TrackingValues
 ): Promise<void> {
-  // @ts-expect-error PostHog is attached to global at runtime
   if (global.posthog == null) return
 
-  // @ts-expect-error PostHog is attached to global at runtime
   global.posthog.capture(event, values)
 }