@envive-ai/react-hooks 0.3.11 → 0.3.13

package/src/application/commerce-api.ts

@@ -1,4 +1,3 @@
-import Logger from 'src/application/logging/logger';
 import {
   Configuration,
   ContextEnvEnum,
@@ -16,13 +15,8 @@ import {
   V1OrgConfigGetRequest,
   V1OrgConfigGetSourceEnum,
 } from '@spiffy-ai/commerce-api-client';
-import { validateSuggestion } from 'src/application/models/validators/validateSuggestion';
-import { validateUserEvent } from 'src/application/models/validators/validateUserEvent';
-import {
-  messageFromQueryEvent,
-  messageFromResponse,
-  messageFromSuggestionEvent,
-} from 'src/application/utils';
+import type { Context } from '@spiffy-ai/commerce-api-client/dist/models/Context';
+import Logger from 'src/application/logging/logger';
 import {
   Message,
   NextMessageRequest,
@@ -31,19 +25,25 @@ import {
   SupportedEventRequest,
   UserEvent,
 } from 'src/application/models';
-import { messageRequestToCommerceMessageRequest } from 'src/application/utils/nextMessageRequestToApiRequest';
-import { validateResponse } from 'src/application/models/validators/validateResponse';
-import { coreSupportedEventRequestToApiRequest } from 'src/application/utils/supportedEventRequestToApiRequest';
-import { SessionRestartRequired } from 'src/types/exceptions/sessionExceptions';
-import { UnsupportedProductException } from 'src/types/exceptions/unsupportedProductExceptions';
+import { OrgConfig } from 'src/application/models/api/orgConfigResults';
 import { ClientDetails } from 'src/application/models/clientDetails';
-import { getAtomStore } from 'src/atoms/atomStore/atomStore';
 import { ProductExperiment } from 'src/application/models/productExperiment';
 import { validateOrgConfigResults } from 'src/application/models/validators/validateOrgConfigResults';
-import { OrgConfig } from 'src/application/models/api/orgConfigResults';
-import { SupportedEvent } from 'src/atoms/app/variant';
+import { validateResponse } from 'src/application/models/validators/validateResponse';
+import { validateSuggestion } from 'src/application/models/validators/validateSuggestion';
+import { validateUserEvent } from 'src/application/models/validators/validateUserEvent';
+import {
+  getQueryParam,
+  messageFromQueryEvent,
+  messageFromResponse,
+  messageFromSuggestionEvent,
+} from 'src/application/utils';
 import { messageFromFormSubmittedEvent } from 'src/application/utils/messageFromFormSubmittedEvent';
-import type { Context } from '@spiffy-ai/commerce-api-client/dist/models/Context';
+import { messageRequestToCommerceMessageRequest } from 'src/application/utils/nextMessageRequestToApiRequest';
+import { coreSupportedEventRequestToApiRequest } from 'src/application/utils/supportedEventRequestToApiRequest';
+import { chatIdAtom, userIdAtom } from 'src/atoms/app'; // Import userIdAtom and chatIdAtom
+import { SupportedEvent } from 'src/atoms/app/variant';
+import { getAtomStore } from 'src/atoms/atomStore/atomStore';
 import {
   baseUrlAtom,
   contextSourceAtom,
@@ -53,12 +53,13 @@ import {
   orgShortNameAtom,
   reactAppNameAtom, // Import envAtom
 } from 'src/atoms/envive/enviveConfig';
-import { chatIdAtom, userIdAtom } from 'src/atoms/app'; // Import userIdAtom and chatIdAtom
 import { featureFlagServiceAtom } from 'src/atoms/org/graphqlConfig'; // Import new orgIdAtom and featureFlagServiceAtom
-import { coreWidgetTextRequestToApiRequest } from './utils/widgetTextRequestToApiRequest';
+import { SessionRestartRequired } from 'src/types/exceptions/sessionExceptions';
+import { UnsupportedProductException } from 'src/types/exceptions/unsupportedProductExceptions';
+import { WidgetText } from './models/api/widgetText';
 import { WidgetTextRequest } from './models/api/widgetTextRequest';
 import { apiWidgetTextResponseToCoreWidgetText } from './utils/widgetTextFromApiWidgetTextResponse';
-import { WidgetText } from './models/api/widgetText';
+import { coreWidgetTextRequestToApiRequest } from './utils/widgetTextRequestToApiRequest';
 
 async function errorResponseBody(error: ResponseError) {
   try {
@@ -157,11 +158,15 @@ class CommerceApiClient {
       env: (env as ContextEnvEnum) ?? ContextEnvEnum.Dev, // Cast env to ContextEnvEnum
     };
 
+    const overrideConfigVersion =
+      getQueryParam('spiffy_config_version') || getQueryParam('envive_config_version') || undefined;
+
     const featureGates = featureFlagService?.featureFlagService?.getFeatureFlags() || {};
     const urlResolvingRequest = {
       url,
       context,
       feature_gates: featureGates,
+      override_config_version: overrideConfigVersion,
     };
 
     const rawResponse = await CommerceApiClient.getInstance().inferenceApi.v1UrlResolvingPostRaw({
@@ -470,35 +475,6 @@ class CommerceApiClient {
     }
   };
 
-  static identifyUser = async (
-    spiffyUserId: string,
-    merchantUserId: string,
-    uaDetails: ClientDetails,
-  ): Promise<void> => {
-    try {
-      await CommerceApiClient.getInstance().defaultApi.v1AnalyticsIdentifyPost({
-        AnalyticsIdentifyRequest: {
-          user_id: spiffyUserId,
-          os_name: uaDetails.os,
-          os_version: uaDetails.osVersion,
-          platform: uaDetails.os,
-          device_id: uaDetails.deviceModel,
-          device_brand: uaDetails.deviceBrand,
-          device_manufacturer: uaDetails.deviceManufacturer,
-          device_model: uaDetails.deviceModel,
-          user_properties: {
-            cdp_user_id: merchantUserId,
-            browser: uaDetails.browser,
-            browser_version: uaDetails.browserVersion,
-            user_agent: uaDetails.userAgent,
-          },
-        },
-      });
-    } catch (err) {
-      Logger.logError('Failed to identify user', err);
-    }
-  };
-
   private static mapContextSourceToV1OrgConfigGetSource = (
     source: ContextSourceEnum | undefined,
   ): V1OrgConfigGetSourceEnum | undefined => {

package/src/application/models/api/widgetTextRequest.ts

@@ -7,5 +7,6 @@ export type WidgetTextRequest = {
   context: Context;
   featureFlags: Record<string, boolean>;
   language: string;
+  overrideConfigVersion?: string;
   url: string;
 };

package/src/application/models/chatElementDisplayLocationV3.ts

@@ -20,4 +20,6 @@ export enum ChatElementDisplayLocationV3 {
   PRODUCT_CARD_PROMPT_BUTTON = 'product_card_prompt_button',
   PRODUCT_CARD_TEXT_FIELD = 'product_card_text_field',
   WINDOW_API_CALL = 'window_api_call',
+  REFERRER_BASED_PROMPT = 'referrer_based_prompt',
+  AUTOMATIC_PROMPT = 'automatic_popup',
 }

package/src/application/models/variantInfo/variantInfo.ts

@@ -1,7 +1,7 @@
+import { ShowFloatingButtonOptions } from 'src/contexts/types';
 import { PLPInfo } from './plpInfo';
 import { PageVisitInfo } from './pageVisitInfo';
 import { ProductInfo } from './productInfo';
-import { ShowFloatingButtonOptions } from 'src/contexts/types';
 
 export enum VariantTypeEnum {
   Pdp = 'pdp',

package/src/application/utils/analyticsUtils.ts

@@ -5,7 +5,7 @@ import {
   isGA4EcommerceEvent,
   isLegacyUAEcommerceEvent,
 } from 'src/application/models';
-import { SpiffyMetricsEventName } from 'src/contexts/amplitudeContext/amplitudeContext';
+import { SpiffyMetricsEventName } from 'src/services/amplitudeService/amplitudeService';
 
 declare global {
   interface Window {

package/src/application/utils/nodeSelector.ts

@@ -32,7 +32,11 @@ class QuerySelector extends NodeSelector {
 
 class IDSelector extends NodeSelector {
   parse(): Node | null {
-    return this.getRoot().getElementById(this.getPattern()) as Node;
+    const root = this.getRoot();
+    if (typeof root?.getElementById !== 'function') {
+      return null;
+    }
+    return root.getElementById(this.getPattern()) as Node;
   }
 }
 
@@ -50,19 +54,19 @@ class XpathSelector extends NodeSelector {
 
 class ChainSelector extends NodeSelector {
   parse(): Node | null {
-    let selectorIndex = 0;
     const selectors = this.getPattern().split('@');
-    const lastIndex = selectors.length - 1;
+    let currentRoot: Node | null = null;
 
-    const parseChain = (pattern: string, prevNode?: Node | null): Node | null => {
-      const selector = SelectorFactory.parse(pattern);
+    for (let i = 0; i < selectors.length; i += 1) {
+      const selector = SelectorFactory.parse(selectors[i].trim());
 
-      if (prevNode) {
-        selector.setRoot(prevNode as Document);
+      if (currentRoot) {
+        selector.setRoot(currentRoot as Document);
       }
 
       const currentNode = selector.parse();
-      if (selectorIndex === lastIndex) {
+
+      if (i === selectors.length - 1) {
         return currentNode;
       }
 
@@ -75,13 +79,10 @@ class ChainSelector extends NodeSelector {
         node = (currentNode as HTMLIFrameElement).contentWindow?.document;
       }
 
-      const nextIndex = selectorIndex + 1;
-      const result = parseChain(selectors[nextIndex].trim(), node);
-      selectorIndex = nextIndex; // Update the outer scope variable to reflect the advancement
-      return result;
-    };
+      currentRoot = node ?? null;
+    }
 
-    return parseChain(selectors[selectorIndex].trim());
+    return null;
   }
 }
 

package/src/application/utils/widgetTextRequestToApiRequest.ts

@@ -47,5 +47,6 @@ export const coreWidgetTextRequestToApiRequest = (
   feature_flags: coreWidgetTextRequest.featureFlags,
   language: coreWidgetTextRequest.language,
   url: coreWidgetTextRequest.url,
+  org_base_config_version: coreWidgetTextRequest.overrideConfigVersion,
   widget_type: coreWidgetTypeToApiWidgetType(coreWidgetTextRequest.widgetType),
 });

package/src/atoms/chat/chatState.ts

@@ -1,6 +1,6 @@
 import { UserEventCategory } from '@spiffy-ai/commerce-api-client/dist/models/UserEventCategory';
 import { atom } from 'jotai';
-import { SpiffyMetricsEventName } from 'src/contexts/amplitudeContext/amplitudeContext';
+import { SpiffyMetricsEventName } from 'src/services/amplitudeService/amplitudeService';
 import {
   ChatElementDisplayLocationV3,
   FormSubmittedAttributes,

package/src/atoms/chat/replies.ts

@@ -7,7 +7,7 @@ import {
   userQueryAtom,
 } from 'src/atoms/chat';
 import { UserEventCategory } from '@spiffy-ai/commerce-api-client';
-import { SpiffyMetricsEventName } from 'src/contexts/amplitudeContext/amplitudeContext';
+import { SpiffyMetricsEventName } from 'src/services/amplitudeService/amplitudeService';
 import { amplitudeTrackEventAtom } from 'src/atoms/amplitude/amplitudeTrackEventAtom';
 import { queueUserEventAtom } from './messageQueue';
 

package/src/contexts/amplitudeContext/amplitudeContext.tsx

@@ -104,7 +104,6 @@ export const AmplitudeProvider: React.FC<{
   const value = useMemo(
     () => ({
       trackEvent: async (params: TrackEventParams): Promise<void> => {
-        console.log('=== trackEvent ===', params);
         if (service) {
           await service.trackEvent(params);
         }

package/src/contexts/enviveContext/enviveContext.tsx

@@ -17,7 +17,8 @@ import { EnviveAgent } from './types';
 import { SearchProvider } from '../searchContext';
 import { SalesAgentProvider } from '../salesAgentContext/salesAgentContext';
 import { SystemSettingsContextProvider } from '../systemSettingsContext';
-import { HardcopyProvider } from '../hardcopyContext';
+import { HardcopyProvider, HardcopyResponse } from '../hardcopyContext';
+import { WidgetTypeV3 } from '../typesV3';
 import { WidgetConfigProvider } from '../widgetConfigContext';
 import { PageProvider } from '../pageContext';
 import { UiConfigProvider } from '../uiConfigContext';
@@ -57,6 +58,7 @@ interface EnviveProviderProps extends AgentWrapperProps {
   previewMode?: boolean;
   overrideConfig?: GraphQlConfigValues;
   mockSalesAgentData?: any;
+  hardcopyOverride?: Partial<Record<WidgetTypeV3, HardcopyResponse>>;
 }
 
 const SearchAgentWrapper: React.FC<AgentWrapperProps> = ({ children, enabledAgents }) => {
@@ -106,6 +108,7 @@ export const EnviveProvider: React.FC<EnviveProviderProps> = ({
   mockV3ConfigToDeprecatedConfig = false,
   requestV3Config = false,
   mockSalesAgentData,
+  hardcopyOverride,
   ...config
 }) => {
   const [userId, setUserId] = useState<string>('');
@@ -184,7 +187,7 @@ export const EnviveProvider: React.FC<EnviveProviderProps> = ({
                     <PageProvider previewMode={previewMode}>
                       <UiConfigProvider>
                         <WidgetConfigProvider>
-                          <HardcopyProvider>
+                          <HardcopyProvider hardcopyOverride={hardcopyOverride}>
                             <EnviveCssProvider>
                               <SearchAgentWrapper enabledAgents={enabledAgents}>
                                 <WindowChatToggleBinder />

package/src/contexts/graphqlContext/mockV3Config.ts

@@ -133,6 +133,9 @@ export const mockV3FrontendConfig: FrontendConfigV3 = {
       welcomeMessageText:
         'Your personal shopper trained on the collective knowledge of thousands of real experts!',
       chatFooterTextFieldPlaceholderText: 'Ask me anything...',
+      partialViewConfig: {
+        disabled: true,
+      },
     },
     customerServiceIntegration: {
       provider: CustomerServiceType.unsupported,

package/src/contexts/hardcopyContext/hardcopyContext.tsx

@@ -10,6 +10,7 @@ import { appDetailsAtom } from 'src/atoms/app';
 import { EnviveMetricsEventName } from 'src/services/amplitudeService/amplitudeService';
 import { toCamelCase } from 'src/application/models/utils/snakeToCamelTransformer';
 import { UserEvent } from 'src/application/models';
+import { getQueryParam } from 'src/application/utils';
 import { WidgetTypeV3 } from '../typesV3';
 import { useFeatureFlagService } from '../featureFlagServiceContext/featureFlagServiceContext';
 import { useAmplitude } from '../amplitudeContext';
@@ -197,7 +198,15 @@ const MOCK_HARDCOPY_RESPONSE: Partial<Record<WidgetTypeV3, HardcopyResponse>> =
 
 const HardcopyContext = createContext<HardcopyContextType | undefined>(undefined);
 
-export const HardcopyProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
+interface HardcopyProviderProps {
+  children: ReactNode;
+  hardcopyOverride?: Partial<Record<WidgetTypeV3, HardcopyResponse>>;
+}
+
+export const HardcopyProvider: React.FC<HardcopyProviderProps> = ({
+  children,
+  hardcopyOverride,
+}) => {
   const languages = useMemo(() => navigator.languages, []);
   const [isLoading, setIsLoading] = useState(false);
   const context = useAtomValue(appDetailsAtom);
@@ -206,12 +215,21 @@ export const HardcopyProvider: React.FC<{ children: ReactNode }> = ({ children }
   const { featureFlagService } = useFeatureFlagService();
   const getHardcopyFromBackend = useCallback(
     async (request: HardcopyRequest): Promise<HardcopyResponse> => {
+      if (hardcopyOverride?.[request.widgetType]) {
+        Logger.logInfo('hardcopyContext | using hardcopy override', request.widgetType);
+        return hardcopyOverride[request.widgetType]!;
+      }
+      const overrideConfigVersion =
+        getQueryParam('spiffy_config_version') ||
+        getQueryParam('envive_config_version') ||
+        undefined;
       const widgetTextRequest: WidgetTextRequest = {
         requestId: uuid(),
         widgetType: request.widgetType,
         context,
         featureFlags: featureFlagService?.getFeatureFlags() || {},
         language: languages[0] || 'en',
+        overrideConfigVersion,
         url: window.location.href,
       };
       trackEvent({
@@ -247,7 +265,7 @@ export const HardcopyProvider: React.FC<{ children: ReactNode }> = ({ children }
       }
       throw new Error(`No hardcopy response found for widget type: ${request.widgetType}`);
     },
-    [context, featureFlagService, languages, trackEvent],
+    [context, featureFlagService, hardcopyOverride, languages, trackEvent],
   );
 
   const getHardcopy = useCallback(

package/src/contexts/pageContext/pageContext.tsx

@@ -67,11 +67,15 @@ export const PageProvider: React.FC<{
 
   const setVariantFromUrlResolver = useCallback(
     (url: string, response: UrlResolverResponse) => {
-      const newVariantInfo = mapUrlResolverResponseToVariantInfo(url, response);
-      const newUserEvent = mapApiUserEventToUserEvent(response.user_event ?? undefined);
-      setVariantInfo(newVariantInfo);
-      console.log('=== newUserEvent ===', newUserEvent);
-      setUserEvent(newUserEvent);
+      if (response.ready) {
+        const newVariantInfo = mapUrlResolverResponseToVariantInfo(url, response);
+        const newUserEvent = mapApiUserEventToUserEvent(response.user_event ?? undefined);
+        setVariantInfo(newVariantInfo);
+        setUserEvent(newUserEvent);
+      } else {
+        setUserEvent(undefined);
+        setVariantInfo(undefined);
+      }
     },
     [setVariantInfo, setUserEvent],
   );

package/src/contexts/salesAgentContext/chatAPI.ts

@@ -56,7 +56,6 @@ export const useSalesAgentChatAPI = () => {
   const logPageVisit = useCallback(
     ({ pageVisitCategory }: { pageVisitCategory: PageVisitCategory }) => {
       const eventId = uuid();
-      console.log('=== logPageVisit ===', eventId);
       trackEvent({
         eventName: EnviveMetricsEventName.ChatRequest,
         eventProps: {

package/src/contexts/salesAgentContext/salesAgentService.ts

@@ -22,10 +22,13 @@ import {
   suggestionsAtom,
 } from 'src/atoms/chat/chatState';
 import { useMessageInterceptor } from 'src/interceptors/useMessageInterceptor';
-import { SpiffyMetricsEventName, useAmplitude } from 'src/contexts/amplitudeContext';
+import { useAmplitude } from 'src/contexts/amplitudeContext';
+import {
+  EnviveMetricsEventName,
+  SpiffyMetricsEventName,
+} from 'src/services/amplitudeService/amplitudeService';
 import { useFeatureFlagService } from 'src/contexts/featureFlagServiceContext';
 import { UserEventCategory } from '@spiffy-ai/commerce-api-client';
-import { EnviveMetricsEventName } from 'src/services/amplitudeService/amplitudeService';
 import { analyticsContextAtom } from 'src/atoms/app/variant';
 
 import { StatusCodeError } from './statusCodeError';

package/src/contexts/types.ts

@@ -13,7 +13,8 @@ import { ChatState } from 'src/types/custservice-types';
 import { SuggestionBarLocationForMetrics } from 'src/types/suggestionBarV2-types';
 import { TestProps } from 'src/types/test-types';
 import { OrgConfigFeatureGate } from 'src/application/models/api/orgConfigResults';
-import { WidgetConfigV3 } from './typesV3';
+import { WidgetConfigV3, WidgetTypeV3 } from './typesV3';
+import type { HardcopyResponse } from './hardcopyContext/hardcopyContext';
 
 type ShowFloatingButtonOptions =
   | 'always'
@@ -937,6 +938,7 @@ export interface EnviveConfig {
   enviveOn?: boolean;
   publicKey?: string;
   featureGates?: OrgConfigFeatureGate[];
+  hardcopyOverride?: Partial<Record<WidgetTypeV3, HardcopyResponse>>;
 }
 
 export type {

package/src/contexts/typesV3.ts

@@ -184,6 +184,32 @@ type FloatingButtonConfig = {
   style: Style;
 };
 
+export type ReferrerPopupTrigger = {
+  type: 'referrer';
+  referrers: string[];
+};
+
+export type AutomaticPopupTrigger = {
+  type: 'automatic';
+};
+export type PopupTrigger = ReferrerPopupTrigger | AutomaticPopupTrigger;
+export type AutoPopupTrigger = {
+  delay: number;
+  trigger: PopupTrigger;
+};
+export interface AutoPopupConfig {
+  triggers: AutoPopupTrigger[];
+}
+
+type PartialViewConfig = {
+  /**
+   * When true, only full-screen mode is supported (no partial/draggable middle state).
+   * Useful when partial view causes usability issues on mobile.
+   * Default: false (undefined and false = partial view enabled).
+   */
+  disabled?: boolean;
+};
+
 type FloatingChatConfig = {
   headerBackgroundColor?: string;
   headerMode: Mode;
@@ -196,6 +222,8 @@ type FloatingChatConfig = {
   welcomeMessageTitle: string;
   welcomeMessageText: string;
   chatFooterTextFieldPlaceholderText: string;
+  autoPopupConfig?: AutoPopupConfig;
+  partialViewConfig?: PartialViewConfig;
 };
 
 type CustomerServiceIntegration = {

package/src/contexts/userIdentityContext/__tests__/userIdentityContext.test.tsx

@@ -1,10 +1,9 @@
 import React from 'react';
-import { act, render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import { Provider, useStore } from 'jotai';
 import { userIdAtom } from 'src/atoms/app';
 import { LocalStorageProvider } from 'src/contexts/localStorageContext';
 import Logger from 'src/application/logging/logger';
-import CommerceApiClient from 'src/application/commerce-api';
 import { UserIdentityService } from 'src/services/userIdentityService';
 import { UserIdentityProvider, useUserIdentity } from '../userIdentityContext';
 
@@ -13,13 +12,6 @@ vi.spyOn(Logger, 'logInfo').mockImplementation(() => {});
 vi.spyOn(Logger, 'logWarn').mockImplementation(() => {});
 vi.spyOn(Logger, 'logError').mockImplementation(() => {});
 
-// Mock CommerceApiClient
-vi.mock('src/application/commerce-api', () => ({
-  default: {
-    identifyUser: vi.fn().mockResolvedValue(undefined),
-  },
-}));
-
 // Mock uuid to have predictable values in tests
 vi.mock('uuid', () => ({
   v4: vi.fn(() => 'test-uuid-12345'),
@@ -97,31 +89,6 @@ const AtomReaderComponent: React.FC = () => {
   return <div data-testid="atom-reader">{userId}</div>;
 };
 
-// Component that uses the hook and triggers identifyUser
-const IdentifyUserComponent: React.FC = () => {
-  const context = useUserIdentity();
-  const [identifying, setIdentifying] = React.useState(false);
-
-  const handleIdentify = async () => {
-    setIdentifying(true);
-    await context.identifyUser();
-    setIdentifying(false);
-  };
-
-  return (
-    <div>
-      <button
-        type="button"
-        data-testid="identify-button"
-        onClick={handleIdentify}
-      >
-        Identify
-      </button>
-      {identifying && <div data-testid="identifying">Identifying...</div>}
-    </div>
-  );
-};
-
 describe('UserIdentityProvider', () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -334,36 +301,4 @@ describe('UserIdentityProvider', () => {
       });
     });
   });
-
-  describe('identifyUser', () => {
-    it('should call CommerceApiClient.identifyUser with correct parameters', async () => {
-      const identifySpy = vi.spyOn(CommerceApiClient, 'identifyUser');
-
-      renderWithProviders(<IdentifyUserComponent />);
-
-      await waitFor(() => {
-        expect(screen.getByTestId('identify-button')).toBeInTheDocument();
-      });
-
-      await act(async () => {
-        screen.getByTestId('identify-button').click();
-      });
-
-      await waitFor(
-        () => {
-          expect(identifySpy).toHaveBeenCalled();
-          const callArgs = identifySpy.mock.calls[0];
-          expect(callArgs[0]).toContain('spiffy-user-id-'); // spiffyUserId
-          expect(callArgs[1]).toBe('UNKNOWN_CDP_USER_ID'); // merchantUserId (cdpUserId)
-          // userAgentDetails - in test environment, some values may be undefined
-          expect(callArgs[2]).toBeDefined();
-          expect(typeof callArgs[2]).toBe('object');
-          // Verify it has the expected structure (values may be undefined in test env)
-          expect(callArgs[2]).toHaveProperty('os');
-          expect(callArgs[2]).toHaveProperty('browser');
-        },
-        { timeout: 3000 },
-      );
-    });
-  });
 });

package/src/contexts/userIdentityContext/userIdentityContext.tsx

@@ -7,34 +7,13 @@ import React, {
   useMemo,
   useState,
 } from 'react';
-import UAParser from 'ua-parser-js';
 import Logger from 'src/application/logging/logger';
-import CommerceApiClient from 'src/application/commerce-api';
-import { ClientDetails } from 'src/application/models/clientDetails';
 import { useLocalStorage } from 'src/contexts/localStorageContext';
 import { useSetAtom } from 'jotai';
 import { userIdAtom } from 'src/atoms/app';
 import { UserIdentityService } from 'src/services/userIdentityService';
 
-// Helper function from the original service
-const getUserAgentDetails = (): ClientDetails => {
-  const uaParser = new UAParser();
-  const result = uaParser.getResult();
-
-  return {
-    os: result?.os?.name,
-    osVersion: result?.os?.version,
-    deviceBrand: result?.device?.vendor,
-    deviceManufacturer: result?.device?.vendor,
-    deviceModel: result?.device?.model,
-    browser: result?.browser?.name,
-    browserVersion: result?.browser?.version,
-    userAgent: result?.ua,
-  };
-};
-
 export interface UserIdentityContextType {
-  identifyUser: () => Promise<void>;
   getUserIdOrDefault: () => Promise<string>;
   getUserIdOverrideFromLocalStorage: () => string | undefined;
   setUserIdOverrideInLocalStorage: (userId: string) => string;
@@ -113,33 +92,8 @@ export const UserIdentityProvider: React.FC<UserIdentityProviderProps> = ({
     }
   }, [getUserIdOverrideFromLocalStorage]);
 
-  const identifyUser = useCallback(async (): Promise<void> => {
-    if (!isReady) {
-      Logger.logWarn('[UserIdentityContext] Context not ready, skipping identifyUser', undefined);
-      return;
-    }
-
-    try {
-      // Temporarily commented out until WindowDataLayerService is resolved
-      // const cdpUserId = WindowDataLayerService.getGoogleAnalyticsClientId();
-      const cdpUserId = 'UNKNOWN_CDP_USER_ID'; // Placeholder
-      const userId = await getUserIdOrDefault();
-      const userAgentDetails = getUserAgentDetails();
-
-      if (!cdpUserId) {
-        Logger.logWarn('[spiffy-ai] No GA Client ID found, skipping identifyUser', undefined);
-        return;
-      }
-
-      await CommerceApiClient.identifyUser(userId, cdpUserId, userAgentDetails);
-    } catch (error) {
-      Logger.logError('[spiffy-ai] Error identifying user', error);
-    }
-  }, [isReady, getUserIdOrDefault]);
-
   const value = useMemo(
     () => ({
-      identifyUser,
       getUserIdOrDefault,
       getUserIdOverrideFromLocalStorage,
       setUserIdOverrideInLocalStorage,
@@ -147,7 +101,6 @@ export const UserIdentityProvider: React.FC<UserIdentityProviderProps> = ({
       isReady,
     }),
     [
-      identifyUser,
       getUserIdOrDefault,
       getUserIdOverrideFromLocalStorage,
       setUserIdOverrideInLocalStorage,

package/src/hooks/AmplitudeOperations/useAmplitudeOperations.ts

@@ -1,8 +1,6 @@
 import { useCallback, useState } from 'react';
-import {
-  SpiffyMetricsEventName,
-  useAmplitude,
-} from 'src/contexts/amplitudeContext/amplitudeContext';
+import { useAmplitude } from 'src/contexts/amplitudeContext/amplitudeContext';
+import { SpiffyMetricsEventName } from 'src/services/amplitudeService/amplitudeService';
 
 export const useAmplitudeTracking = () => {
   const { trackEvent, isReady } = useAmplitude();

package/src/hooks/ChatToggle/useChatToggle.ts

@@ -1,10 +1,8 @@
 import { useAtomValue, useSetAtom } from 'jotai';
 import { ChatElementDisplayLocationV3 } from 'src/application/models';
 import { chatAtom, chatOnToggleAtom } from 'src/atoms/chat';
-import {
-  SpiffyMetricsEventName,
-  useAmplitude,
-} from 'src/contexts/amplitudeContext/amplitudeContext';
+import { useAmplitude } from 'src/contexts/amplitudeContext/amplitudeContext';
+import { SpiffyMetricsEventName } from 'src/services/amplitudeService/amplitudeService';
 
 export const useChatToggle = () => {
   const onToggle = useSetAtom(chatOnToggleAtom);