Merge pull request #5755 from EdgeApp/jon/fix/aaa-3

Fix mirroring between accountReferral's installerId and accountAppleAdsAttribution

Also rename the reported value to start fresh

Author: Jon-edge

CHANGELOG.md

@@ -9,6 +9,7 @@
 - changed: `NotificationCard` auto-dismiss in 5s
 - changed: `NotificationCard` X button replaced with swipe-to-dismiss gesture
 - fixed: Font scaling for displaying long addresses in `RequestScene` and `AddressTile2`
+- fixed: Mirroring in logic between `accountReferral`'s `installerId` and `accountAppleAdsAttribution`
 - fixed: Currency mapping for `simplexProvider`
 
 ## 4.35.2 (2025-09-25)

src/actions/AccountReferralActions.ts

@@ -8,6 +8,7 @@ import {
 } from 'cleaners'
 import type { EdgeDataStore } from 'edge-core-js'
 import type { EdgeAccount } from 'edge-core-js/types'
+import { Platform } from 'react-native'
 
 import { asAppleAdsAttribution } from '../types/AppleAdsAttributionTypes'
 import type { RootState, ThunkAction } from '../types/reduxTypes'
@@ -51,19 +52,6 @@ export function loadAccountReferral(
       const cache = asDiskReferralCache(JSON.parse(cacheText))
       const referral = unpackAccountReferral(JSON.parse(referralText))
 
-      // Ensure accountAppleAdsAttribution mirrors device-level attribution when missing or empty
-      const existingAttrib = referral.accountAppleAdsAttribution
-      const isAttribMissing =
-        existingAttrib == null ||
-        (existingAttrib.campaignId == null && existingAttrib.keywordId == null)
-      if (isAttribMissing) {
-        const { appleAdsAttribution } = await getFirstOpenInfo()
-        if (appleAdsAttribution != null) {
-          referral.accountAppleAdsAttribution =
-            asAppleAdsAttribution(appleAdsAttribution)
-        }
-      }
-
       // Reference info server promo data to see if:
       // 1. Any of these `activePromotions` are no longer valid (e.g. a
       //    promotion expired)
@@ -124,20 +112,28 @@ function createAccountReferral(): ThunkAction<Promise<void>> {
     }
 
     // Seed account-level Apple Ads attribution on account creation
-    try {
-      const { appleAdsAttribution } = await getFirstOpenInfo()
-      if (appleAdsAttribution != null) {
-        const firstOpenAttrib = asAppleAdsAttribution(appleAdsAttribution)
-        const isFirstOpenEmpty =
-          firstOpenAttrib.campaignId == null &&
-          firstOpenAttrib.keywordId == null
-        referral.accountAppleAdsAttribution = isFirstOpenEmpty
-          ? await getAppleAdsAttribution()
-          : firstOpenAttrib
-      } else {
-        referral.accountAppleAdsAttribution = await getAppleAdsAttribution()
-      }
-    } catch (e) {}
+    if (Platform.OS === 'ios') {
+      try {
+        const { appleAdsAttribution } = await getFirstOpenInfo()
+        if (appleAdsAttribution != null) {
+          const firstOpenAttrib = asAppleAdsAttribution(appleAdsAttribution)
+          const isFirstOpenEmpty =
+            firstOpenAttrib.campaignId == null &&
+            firstOpenAttrib.keywordId == null
+          referral.accountAppleAdsAttribution = isFirstOpenEmpty
+            ? await getAppleAdsAttribution()
+            : firstOpenAttrib
+          logEvent('AAA_Success')
+        } else {
+          referral.accountAppleAdsAttribution = await getAppleAdsAttribution()
+          if (referral.accountAppleAdsAttribution == null) {
+            logEvent('AAA_Failed')
+          } else {
+            logEvent('AAA_Success')
+          }
+        }
+      } catch (e) {}
+    }
     const cache: ReferralCache = {
       accountMessages: lockStartDates(messages, creationDate),
       accountPlugins: lockStartDates(plugins, creationDate)

src/actions/FirstOpenActions.tsx

@@ -98,7 +98,9 @@ const readFirstOpenInfoFromDisk = async (): Promise<FirstOpenInfo> => {
  * Get Apple Search Ads attribution data using the AdServices framework
  * and make an API call to get the actual keywordId.
  */
-export async function getAppleAdsAttribution(): Promise<AppleAdsAttribution> {
+export async function getAppleAdsAttribution(): Promise<
+  AppleAdsAttribution | undefined
+> {
   if (Platform.OS !== 'ios') {
     return { campaignId: undefined, keywordId: undefined }
   }
@@ -152,10 +154,10 @@ export async function getAppleAdsAttribution(): Promise<AppleAdsAttribution> {
         return asAppleAdsAttribution(data)
       } catch (apiError) {
         console.warn('Error fetching Apple Ads attribution data:', apiError)
-        break
+        return undefined
       }
     }
   }
 
-  return { campaignId: undefined, keywordId: undefined }
+  return undefined
 }

src/util/tracking.ts

@@ -19,6 +19,8 @@ import { makeErrorLog } from './translateError'
 import { consify, monthsBetween } from './utils'
 
 export type TrackingEventName =
+  | 'AAA_Failed'
+  | 'AAA_Success'
   | 'Activate_Wallet_Cancel'
   | 'Activate_Wallet_Done'
   | 'Activate_Wallet_Select'
@@ -258,7 +260,8 @@ export function logEvent(
             : creationDate.toISOString().replace(/-\d\dT.*/, '')
         params.refAccountInstallerId = accountReferral.installerId
         params.refAccountCurrencyCodes = accountReferral.currencyCodes
-        params.refAccountAppleAdsAttribution = accountAppleAdsAttribution
+
+        params.accountAppleAdsAttribution = accountAppleAdsAttribution
 
         // Get the account age in months:
         const { created: accountCreatedDate } = core.account