@envive-ai/react-hooks 0.3.6 → 0.3.8

package/dist/services/userIdentityService/userIdentityService.d.ts

@@ -0,0 +1,19 @@
+import { getAtomStore } from "../../atoms/atomStore/atomStore.js";
+
+//#region src/services/userIdentityService/userIdentityService.d.ts
+type UserIdentityServiceProps = {
+  apiKey: string;
+};
+declare class UserIdentityService {
+  private readonly apiKey;
+  private readonly USER_ID_OVERRIDE_KEY;
+  constructor({
+    apiKey
+  }: UserIdentityServiceProps);
+  getUserIdOverrideFromLocalStorage(): string | undefined;
+  getUserIdOrDefault(): Promise<string>;
+  initializeUser(atomStore?: ReturnType<typeof getAtomStore>): Promise<void>;
+}
+//#endregion
+export { UserIdentityService };
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlcklkZW50aXR5U2VydmljZS5kLnRzIiwibmFtZXMiOltdLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy91c2VySWRlbnRpdHlTZXJ2aWNlL3VzZXJJZGVudGl0eVNlcnZpY2UuZC50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBnZXRBdG9tU3RvcmUgfSBmcm9tICdzcmMvYXRvbXMvYXRvbVN0b3JlJztcbnR5cGUgVXNlcklkZW50aXR5U2VydmljZVByb3BzID0ge1xuICAgIGFwaUtleTogc3RyaW5nO1xufTtcbmV4cG9ydCBkZWNsYXJlIGNsYXNzIFVzZXJJZGVudGl0eVNlcnZpY2Uge1xuICAgIHByaXZhdGUgcmVhZG9ubHkgYXBpS2V5O1xuICAgIHByaXZhdGUgcmVhZG9ubHkgVVNFUl9JRF9PVkVSUklERV9LRVk7XG4gICAgY29uc3RydWN0b3IoeyBhcGlLZXkgfTogVXNlcklkZW50aXR5U2VydmljZVByb3BzKTtcbiAgICBnZXRVc2VySWRPdmVycmlkZUZyb21Mb2NhbFN0b3JhZ2UoKTogc3RyaW5nIHwgdW5kZWZpbmVkO1xuICAgIGdldFVzZXJJZE9yRGVmYXVsdCgpOiBQcm9taXNlPHN0cmluZz47XG4gICAgaW5pdGlhbGl6ZVVzZXIoYXRvbVN0b3JlPzogUmV0dXJuVHlwZTx0eXBlb2YgZ2V0QXRvbVN0b3JlPik6IFByb21pc2U8dm9pZD47XG59XG5leHBvcnQge307XG4iXSwibWFwcGluZ3MiOiI7OztBQUNBLElBQUksMkJBQTJCLENBQUMsSUFBQTtBQUNoQyxJQUFXLHNCQUFPO0NBQUE7T0FBQTtPQUFBO09BQUE7T0FBQTtPQUFBO09BQUE7Q0FBQSJ9

package/dist/services/userIdentityService/userIdentityService.js

@@ -0,0 +1,48 @@
+import logger_default from "../../application/logging/logger.js";
+import { getAtomStore } from "../../atoms/atomStore/atomStore.js";
+import "../../atoms/atomStore/index.js";
+import { userIdAtom } from "../../atoms/app/index.js";
+import { EnviveAnalytics } from "@envive-ai/analytics";
+import { ExecutionContext } from "@envive-ai/analytics/dist/analytics/EnviveAnalytics";
+
+//#region src/services/userIdentityService/userIdentityService.ts
+var UserIdentityService = class {
+	constructor({ apiKey }) {
+		this.USER_ID_OVERRIDE_KEY = "v1-spiffy-user-id-override";
+		this.apiKey = apiKey;
+	}
+	getUserIdOverrideFromLocalStorage() {
+		logger_default.logDebug("[spiffy-ai] Getting userID from localStorage");
+		return localStorage.getItem(this.USER_ID_OVERRIDE_KEY) ?? void 0;
+	}
+	async getUserIdOrDefault() {
+		const userIdOverride = this.getUserIdOverrideFromLocalStorage();
+		if (userIdOverride) return userIdOverride;
+		try {
+			logger_default.logDebug("Getting userID via EnviveAnalytics in UserIdentityService");
+			const enviveUserId = await new EnviveAnalytics({
+				apiKey: this.apiKey,
+				environmentInfo: { executionContext: ExecutionContext.EnviveReactComponentsV3 }
+			}).resolveEnviveUserId();
+			if (!enviveUserId) throw new Error("[spiffy-ai] EnviveAnalytics.resolveEnviveUserId() returned null/undefined");
+			return enviveUserId;
+		} catch (error) {
+			logger_default.logError("[spiffy-ai] CRITICAL: Failed to get user ID:", error);
+			const errorMessage = error instanceof Error ? error.message : "Unknown error";
+			throw new Error(`[spiffy-ai] CRITICAL: User ID resolution failed: ${errorMessage}`);
+		}
+	}
+	async initializeUser(atomStore) {
+		try {
+			const userId = await this.getUserIdOrDefault();
+			(atomStore || getAtomStore()).set(userIdAtom, userId);
+		} catch (error) {
+			logger_default.logError("[spiffy-ai] CRITICAL: Failed to initialize user ID:", error);
+			throw error;
+		}
+	}
+};
+
+//#endregion
+export { UserIdentityService };
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlcklkZW50aXR5U2VydmljZS5qcyIsIm5hbWVzIjpbImVycm9yOiB1bmtub3duIl0sInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3VzZXJJZGVudGl0eVNlcnZpY2UvdXNlcklkZW50aXR5U2VydmljZS50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBFbnZpdmVBbmFseXRpY3MgfSBmcm9tICdAZW52aXZlLWFpL2FuYWx5dGljcyc7XG5pbXBvcnQgTG9nZ2VyIGZyb20gJ3NyYy9hcHBsaWNhdGlvbi9sb2dnaW5nL2xvZ2dlcic7XG5pbXBvcnQgeyBnZXRBdG9tU3RvcmUgfSBmcm9tICdzcmMvYXRvbXMvYXRvbVN0b3JlJztcbmltcG9ydCB7IHVzZXJJZEF0b20gfSBmcm9tICdzcmMvYXRvbXMvYXBwJztcbmltcG9ydCB7IEV4ZWN1dGlvbkNvbnRleHQgfSBmcm9tICdAZW52aXZlLWFpL2FuYWx5dGljcy9kaXN0L2FuYWx5dGljcy9FbnZpdmVBbmFseXRpY3MnO1xuXG50eXBlIFVzZXJJZGVudGl0eVNlcnZpY2VQcm9wcyA9IHtcbiAgYXBpS2V5OiBzdHJpbmc7XG59O1xuXG5leHBvcnQgY2xhc3MgVXNlcklkZW50aXR5U2VydmljZSB7XG4gIHByaXZhdGUgcmVhZG9ubHkgYXBpS2V5OiBzdHJpbmc7XG5cbiAgcHJpdmF0ZSByZWFkb25seSBVU0VSX0lEX09WRVJSSURFX0tFWSA9ICd2MS1zcGlmZnktdXNlci1pZC1vdmVycmlkZSc7XG5cbiAgY29uc3RydWN0b3IoeyBhcGlLZXkgfTogVXNlcklkZW50aXR5U2VydmljZVByb3BzKSB7XG4gICAgdGhpcy5hcGlLZXkgPSBhcGlLZXk7XG4gIH1cblxuICBnZXRVc2VySWRPdmVycmlkZUZyb21Mb2NhbFN0b3JhZ2UoKTogc3RyaW5nIHwgdW5kZWZpbmVkIHtcbiAgICBMb2dnZXIubG9nRGVidWcoJ1tzcGlmZnktYWldIEdldHRpbmcgdXNlcklEIGZyb20gbG9jYWxTdG9yYWdlJyk7XG4gICAgcmV0dXJuIGxvY2FsU3RvcmFnZS5nZXRJdGVtKHRoaXMuVVNFUl9JRF9PVkVSUklERV9LRVkpID8/IHVuZGVmaW5lZDtcbiAgfVxuXG4gIGFzeW5jIGdldFVzZXJJZE9yRGVmYXVsdCgpOiBQcm9taXNlPHN0cmluZz4ge1xuICAgIGNvbnN0IHVzZXJJZE92ZXJyaWRlID0gdGhpcy5nZXRVc2VySWRPdmVycmlkZUZyb21Mb2NhbFN0b3JhZ2UoKTtcbiAgICBpZiAodXNlcklkT3ZlcnJpZGUpIHtcbiAgICAgIHJldHVybiB1c2VySWRPdmVycmlkZTtcbiAgICB9XG5cbiAgICB0cnkge1xuICAgICAgTG9nZ2VyLmxvZ0RlYnVnKCdHZXR0aW5nIHVzZXJJRCB2aWEgRW52aXZlQW5hbHl0aWNzIGluIFVzZXJJZGVudGl0eVNlcnZpY2UnKTtcbiAgICAgIGNvbnN0IGVudml2ZUFuYWx5dGljcyA9IG5ldyBFbnZpdmVBbmFseXRpY3Moe1xuICAgICAgICBhcGlLZXk6IHRoaXMuYXBpS2V5LFxuICAgICAgICBlbnZpcm9ubWVudEluZm86IHsgZXhlY3V0aW9uQ29udGV4dDogRXhlY3V0aW9uQ29udGV4dC5FbnZpdmVSZWFjdENvbXBvbmVudHNWMyB9LFxuICAgICAgfSk7XG4gICAgICBjb25zdCBlbnZpdmVVc2VySWQgPSBhd2FpdCBlbnZpdmVBbmFseXRpY3MucmVzb2x2ZUVudml2ZVVzZXJJZCgpO1xuXG4gICAgICBpZiAoIWVudml2ZVVzZXJJZCkge1xuICAgICAgICB0aHJvdyBuZXcgRXJyb3IoXG4gICAgICAgICAgJ1tzcGlmZnktYWldIEVudml2ZUFuYWx5dGljcy5yZXNvbHZlRW52aXZlVXNlcklkKCkgcmV0dXJuZWQgbnVsbC91bmRlZmluZWQnLFxuICAgICAgICApO1xuICAgICAgfVxuXG4gICAgICByZXR1cm4gZW52aXZlVXNlcklkO1xuICAgIH0gY2F0Y2ggKGVycm9yOiB1bmtub3duKSB7XG4gICAgICBMb2dnZXIubG9nRXJyb3IoJ1tzcGlmZnktYWldIENSSVRJQ0FMOiBGYWlsZWQgdG8gZ2V0IHVzZXIgSUQ6JywgZXJyb3IpO1xuICAgICAgY29uc3QgZXJyb3JNZXNzYWdlID0gZXJyb3IgaW5zdGFuY2VvZiBFcnJvciA/IGVycm9yLm1lc3NhZ2UgOiAnVW5rbm93biBlcnJvcic7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoYFtzcGlmZnktYWldIENSSVRJQ0FMOiBVc2VyIElEIHJlc29sdXRpb24gZmFpbGVkOiAke2Vycm9yTWVzc2FnZX1gKTtcbiAgICB9XG4gIH1cblxuICBhc3luYyBpbml0aWFsaXplVXNlcihhdG9tU3RvcmU/OiBSZXR1cm5UeXBlPHR5cGVvZiBnZXRBdG9tU3RvcmU+KTogUHJvbWlzZTx2b2lkPiB7XG4gICAgdHJ5IHtcbiAgICAgIGNvbnN0IHVzZXJJZCA9IGF3YWl0IHRoaXMuZ2V0VXNlcklkT3JEZWZhdWx0KCk7XG5cbiAgICAgIGNvbnN0IHN0b3JlID0gYXRvbVN0b3JlIHx8IGdldEF0b21TdG9yZSgpO1xuICAgICAgc3RvcmUuc2V0KHVzZXJJZEF0b20sIHVzZXJJZCk7XG4gICAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICAgIExvZ2dlci5sb2dFcnJvcignW3NwaWZmeS1haV0gQ1JJVElDQUw6IEZhaWxlZCB0byBpbml0aWFsaXplIHVzZXIgSUQ6JywgZXJyb3IpO1xuICAgICAgdGhyb3cgZXJyb3I7XG4gICAgfVxuICB9XG59XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBVUEsSUFBYSxzQkFBYixNQUFpQztDQUsvQixZQUFZLEVBQUUsVUFBb0M7OEJBRlY7QUFHdEMsT0FBSyxTQUFTOztDQUdoQixvQ0FBd0Q7QUFDdEQsaUJBQU8sU0FBUywrQ0FBK0M7QUFDL0QsU0FBTyxhQUFhLFFBQVEsS0FBSyxxQkFBcUIsSUFBSTs7Q0FHNUQsTUFBTSxxQkFBc0M7RUFDMUMsTUFBTSxpQkFBaUIsS0FBSyxtQ0FBbUM7QUFDL0QsTUFBSSxlQUNGLFFBQU87QUFHVCxNQUFJO0FBQ0Ysa0JBQU8sU0FBUyw0REFBNEQ7R0FLNUUsTUFBTSxlQUFlLE1BSkcsSUFBSSxnQkFBZ0I7SUFDMUMsUUFBUSxLQUFLO0lBQ2IsaUJBQWlCLEVBQUUsa0JBQWtCLGlCQUFpQix5QkFBeUI7SUFDaEYsQ0FBQyxDQUN5QyxxQkFBcUI7QUFFaEUsT0FBSSxDQUFDLGFBQ0gsT0FBTSxJQUFJLE1BQ1IsNEVBQ0Q7QUFHSCxVQUFPO1dBQ0FBLE9BQWdCO0FBQ3ZCLGtCQUFPLFNBQVMsZ0RBQWdELE1BQU07R0FDdEUsTUFBTSxlQUFlLGlCQUFpQixRQUFRLE1BQU0sVUFBVTtBQUM5RCxTQUFNLElBQUksTUFBTSxvREFBb0QsZUFBZTs7O0NBSXZGLE1BQU0sZUFBZSxXQUE0RDtBQUMvRSxNQUFJO0dBQ0YsTUFBTSxTQUFTLE1BQU0sS0FBSyxvQkFBb0I7QUFHOUMsSUFEYyxhQUFhLGNBQWMsRUFDbkMsSUFBSSxZQUFZLE9BQU87V0FDdEIsT0FBTztBQUNkLGtCQUFPLFNBQVMsdURBQXVELE1BQU07QUFDN0UsU0FBTSJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@envive-ai/react-hooks",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "React hooks for connecting to Envive AI services.",
   "keywords": [
     "react",
@@ -39,6 +39,7 @@
   "dependencies": {
     "@amplitude/analytics-browser": "2.23.7",
     "@spiffy-ai/commerce-api-client": "1.1.0-SNAPSHOT.202601131458",
+    "@envive-ai/analytics": "1.0.28",
     "fuse.js": "^7.1.0",
     "jotai": "^2.14.0",
     "ua-parser-js": "^1.0.39",
@@ -194,10 +195,6 @@
       "import": "./dist/contexts/enviveCssContext/index.js",
       "require": "./dist/contexts/enviveCssContext/index.cjs"
     },
-    "./contexts/featureFlagContext": {
-      "import": "./dist/contexts/featureFlagContext/index.js",
-      "require": "./dist/contexts/featureFlagContext/index.cjs"
-    },
     "./contexts/featureFlagServiceContext": {
       "import": "./dist/contexts/featureFlagServiceContext/index.js",
       "require": "./dist/contexts/featureFlagServiceContext/index.cjs"
@@ -386,6 +383,10 @@
       "import": "./dist/interceptors/types.js",
       "require": "./dist/interceptors/types.cjs"
     },
+    "./mocks": {
+      "import": "./dist/mocks/index.js",
+      "require": "./dist/mocks/index.cjs"
+    },
     "./services/amplitudeService": {
       "import": "./dist/services/amplitudeService/index.js",
       "require": "./dist/services/amplitudeService/index.cjs"
@@ -394,6 +395,10 @@
       "import": "./dist/services/enviveConfigService/index.js",
       "require": "./dist/services/enviveConfigService/index.cjs"
     },
+    "./services/userIdentityService": {
+      "import": "./dist/services/userIdentityService/index.js",
+      "require": "./dist/services/userIdentityService/index.cjs"
+    },
     "./types": {
       "import": "./dist/types/index.js",
       "require": "./dist/types/index.cjs"
@@ -494,6 +499,10 @@
         "import": "./dist/interceptors/index.js",
         "require": "./dist/interceptors/index.cjs"
       },
+      "./mocks": {
+        "import": "./dist/mocks/index.js",
+        "require": "./dist/mocks/index.cjs"
+      },
       "./types": {
         "import": "./dist/types/index.js",
         "require": "./dist/types/index.cjs"

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

@@ -18,7 +18,9 @@ export interface PLPAttributes extends CamelCasedPropertiesDeep<ApiPLPAttributes
 
 export interface SearchAttributes extends CamelCasedPropertiesDeep<ApiSearchAttributes> {}
 
-export interface QueryTypedAttributes extends CamelCasedPropertiesDeep<ApiQueryTypedAttributes> {}
+export interface QueryTypedAttributes extends CamelCasedPropertiesDeep<ApiQueryTypedAttributes> {
+  userTyped?: boolean;
+}
 
 export interface FormSubmittedAttributes {
   filledSchema: Record<string, unknown>;

package/src/application/models/chatElementDisplayLocationV3.ts

@@ -15,4 +15,6 @@ export enum ChatElementDisplayLocationV3 {
   FLOATING_BUTTON = 'floating_button',
   FLOATING_CHAT_OVERLAY = 'floating_chat_overlay',
   FLOATING_CHAT_CLOSE_BUTTON = 'floating_chat_close_button',
+  PRODUCT_CARD_PROMPT_BUTTON = 'product_card_prompt_button',
+  PRODUCT_CARD_TEXT_FIELD = 'product_card_text_field',
 }

package/src/application/models/frontendConfigV3.ts

@@ -6,5 +6,5 @@ export interface FrontendConfigV3 {
   pageVariants?: PageVariantConfig[];
   mountingConfigs?: Record<string, WidgetMountingConfig>;
   widgetConfigs?: Record<string, WidgetConfigV3>;
-  uiConfigs?: Omit<OrgUIConfigV3, 'merchantOverrideCss'>;
+  uiConfigs?: OrgUIConfigV3;
 }

package/src/application/models/graphql/queries/getColorsAndFrontendQuery.ts

@@ -0,0 +1,13 @@
+import { configVersion } from 'src/types/config-versions';
+
+export const getColorsAndFrontendQuery = () => `
+  query ($version: String = "${configVersion()}") {
+    me {
+      getProductsConfigByVersion(version: $version) {
+        frontend { values }
+        colors { values }
+        v_three_config { values }
+      }
+    }
+  }
+`;

package/src/application/models/guards/api/isApiQueryTypedEventAttributes.ts

@@ -1,4 +1,9 @@
 import { QueryTypedAttributes } from '@spiffy-ai/commerce-api-client';
 
 export const isApiQueryTypedAttributes = (data: unknown): data is QueryTypedAttributes =>
-  data != null && typeof data === 'object' && 'query' in data && typeof data.query === 'string';
+  data != null &&
+  typeof data === 'object' &&
+  'query' in data &&
+  typeof data.query === 'string' &&
+  'user_typed' in data &&
+  typeof data.user_typed === 'boolean';

package/src/application/utils/widgetTextRequestToApiRequest.ts

@@ -19,16 +19,16 @@ export const coreWidgetTypeToApiWidgetType = (coreWidgetType: WidgetTypeV3): Wid
     case WidgetTypeV3.TitledPromptCarouselV3:
       return WidgetType.TitledPromptCarouselV3;
     case WidgetTypeV3.ImagePromptCardV3:
+    case WidgetTypeV3.ProductCardV3:
       return WidgetType.ImagePromptCardV3;
     case WidgetTypeV3.ImageBannerV3:
       return WidgetType.ImageBannerV3;
     case WidgetTypeV3.SingleImagePromptV3:
       return WidgetType.SingleImagePromptV3;
-    // TODO: Add support for these widget types
-    // case WidgetTypeV3.ChatPreviewComparisonV3:
-    //   return WidgetType.ChatPreviewComparisonV3;
-    // case WidgetTypeV3.ChatPreviewLoadingV3:
-    //   return WidgetType.ChatPreviewLoadingV3;
+    case WidgetTypeV3.FloatingChatV3:
+      return WidgetType.FloatingChatV3;
+    case WidgetTypeV3.FloatingButtonV3:
+      return WidgetType.FloatingButtonV3;
     default:
       throw new Error(`Unsupported widget type: ${coreWidgetType}`);
   }

package/src/atoms/app/index.ts

@@ -26,21 +26,23 @@ export {
   supportedEventAtom,
 } from './variant';
 
+// Internal storage for the user ID
+// Caches the result from UserIdentityService
 const internalUserIdAtom = atom<string | undefined>(undefined);
 
+// Main user ID atom
+// Reads from cache or calls UserIdentityService
 export const userIdAtom = atom(
   get => {
-    const maybeUserId = get(internalUserIdAtom);
+    const cachedUserId = get(internalUserIdAtom);
 
-    if (maybeUserId) {
-      return maybeUserId;
+    if (cachedUserId) {
+      return cachedUserId;
     }
 
-    throw new Error(
-      'userIdAtom is not set. Ensure that all use of userIdAtom is under UserIdentityProvider',
-    );
+    throw new Error('UserId is referenced before it is set - call initializeUser() first');
   },
-  (_, set, value: string | undefined) => {
+  (_, set, value: string) => {
     set(internalUserIdAtom, value);
   },
 );

package/src/atoms/chat/index.ts

@@ -15,7 +15,6 @@ import {
 } from './chatState';
 
 export * from './chatState';
-export * from './replies';
 export * from './performanceMetrics';
 export * from './form';
 export * from './suggestions';

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

@@ -5,7 +5,7 @@ import {
   UserIdentityProvider,
   useUserIdentity,
 } from 'src/contexts/userIdentityContext/userIdentityContext';
-import { LocalStorageProvider } from 'src/contexts/localStorageContext';
+import { LocalStorageKeys, LocalStorageProvider } from 'src/contexts/localStorageContext';
 import { EnviveConfigProvider } from 'src/contexts/enviveConfigContext/enviveConfigContext';
 import {
   FeatureFlagService,
@@ -13,6 +13,7 @@ import {
 } from 'src/contexts/featureFlagServiceContext/featureFlagServiceContext';
 import { userIdAtom } from 'src/atoms/app';
 import { AmplitudeService } from 'src/services/amplitudeService/amplitudeService';
+import { UserIdentityService } from 'src/services/userIdentityService';
 import { AmplitudeProvider, SpiffyMetricsEventName, useAmplitude } from '../amplitudeContext';
 
 // Mock AmplitudeService
@@ -111,10 +112,20 @@ const AtomReaderComponent: React.FC = () => {
 const CombinedContextComponent: React.FC = () => {
   const userIdentity = useUserIdentity();
   const amplitude = useAmplitude();
+  const [userId, setUserId] = React.useState<string>('');
+
+  React.useEffect(() => {
+    const fetchUserId = async () => {
+      const id = await userIdentity.getUserIdOrDefault();
+      setUserId(id);
+    };
+
+    fetchUserId();
+  }, [userIdentity]);
 
   return (
     <div data-testid="combined-component">
-      <div data-testid="user-id-from-identity">{userIdentity.getUserIdOrDefault()}</div>
+      <div data-testid="user-id-from-identity">{userId}</div>
       <div data-testid="amplitude-ready">{amplitude.isReady.toString()}</div>
     </div>
   );
@@ -123,18 +134,33 @@ const CombinedContextComponent: React.FC = () => {
 // FeatureFlagService
 const testFeatureFlagService = new FeatureFlagService([]);
 
+// userID service
+const mockInitializeUser = vi.fn().mockResolvedValue(undefined);
+const mockGetUserId = vi.fn().mockImplementation(async () => {
+  // Check for override first
+  const override = localStorage.getItem('v1-spiffy-user-id-override');
+  if (override) return override;
+  return 'test-user-id';
+});
+
+const testUserIdService = {
+  getUserIdOrDefault: mockGetUserId,
+  initializeUser: mockInitializeUser,
+  getUserIdOverrideFromLocalStorage: vi.fn().mockImplementation(() => {
+    return localStorage.getItem('v1-spiffy-user-id-override') || undefined;
+  }),
+} as unknown as UserIdentityService;
+
 // Wrapper component with all required providers
 const TestWrapper: React.FC<{
   children: React.ReactNode;
   amplitudeApiKey?: string;
   userIdOverride?: string;
-  userIdDefault?: string;
   externalAmplitudeService?: AmplitudeService;
 }> = ({
   children,
   amplitudeApiKey = 'test-amplitude-key',
   userIdOverride,
-  userIdDefault,
   externalAmplitudeService,
 }) => {
   // Set up localStorage with user IDs if provided
@@ -142,10 +168,7 @@ const TestWrapper: React.FC<{
     if (userIdOverride) {
       localStorage.setItem('v1-spiffy-user-id-override', userIdOverride);
     }
-    if (userIdDefault) {
-      localStorage.setItem('v1-spiffy-user-id-default', userIdDefault);
-    }
-  }, [userIdOverride, userIdDefault]);
+  }, [userIdOverride]);
 
   return (
     <Provider>
@@ -159,7 +182,7 @@ const TestWrapper: React.FC<{
         featureGates={[]}
       >
         <LocalStorageProvider>
-          <UserIdentityProvider>
+          <UserIdentityProvider userIdService={testUserIdService}>
             <FeatureFlagServiceProvider featureFlagService={testFeatureFlagService}>
               <AmplitudeProvider externalAmplitudeService={externalAmplitudeService}>
                 {children}
@@ -173,8 +196,16 @@ const TestWrapper: React.FC<{
 };
 
 describe('AmplitudeProvider - React Context Integration', () => {
+  let mockGetLocalStorageItem: (key: string) => string | null;
   beforeEach(() => {
     vi.clearAllMocks();
+    vi.clearAllMocks();
+    mockGetLocalStorageItem = vi.fn((key: string) => {
+      if (key === LocalStorageKeys.ChatId) {
+        return 'test-chat-id';
+      }
+      return null;
+    });
     if (typeof localStorage !== 'undefined') {
       localStorage.clear();
     }
@@ -227,62 +258,6 @@ describe('AmplitudeProvider - React Context Integration', () => {
       });
     });
 
-    it('should use default userId from UserIdentityContext when override is not set', async () => {
-      const testUserId = 'default-user-id-456';
-      render(
-        <TestWrapper userIdDefault={testUserId}>
-          <MockAmplitudeComponent />
-        </TestWrapper>,
-      );
-
-      await waitFor(() => {
-        expect(screen.getByTestId('is-ready').textContent).toBe('true');
-      });
-
-      await act(async () => {
-        screen.getByTestId('track-event-button').click();
-      });
-
-      await waitFor(() => {
-        expect(mockTrackEvent).toHaveBeenCalled();
-        const callArgs = mockTrackEvent.mock.calls[0];
-        expect(callArgs[0]).toEqual({
-          eventName: SpiffyMetricsEventName.ChatUserMessageInput,
-          eventProps: { message: 'test message' },
-        });
-      });
-    });
-
-    it('should prioritize override userId over default userId', async () => {
-      const overrideUserId = 'override-user-id-789';
-      const defaultUserId = 'default-user-id-012';
-      render(
-        <TestWrapper
-          userIdOverride={overrideUserId}
-          userIdDefault={defaultUserId}
-        >
-          <MockAmplitudeComponent />
-        </TestWrapper>,
-      );
-
-      await waitFor(() => {
-        expect(screen.getByTestId('is-ready').textContent).toBe('true');
-      });
-
-      await act(async () => {
-        screen.getByTestId('track-event-button').click();
-      });
-
-      await waitFor(() => {
-        expect(mockTrackEvent).toHaveBeenCalled();
-        const callArgs = mockTrackEvent.mock.calls[0];
-        expect(callArgs[0]).toEqual({
-          eventName: SpiffyMetricsEventName.ChatUserMessageInput,
-          eventProps: { message: 'test message' },
-        });
-      });
-    });
-
     it('should initialize AmplitudeService with userId from UserIdentityContext', async () => {
       const testUserId = 'init-user-id-345';
       render(
@@ -369,7 +344,7 @@ describe('AmplitudeProvider - React Context Integration', () => {
               featureGates={[]}
             >
               <LocalStorageProvider>
-                <UserIdentityProvider>
+                <UserIdentityProvider userIdService={testUserIdService}>
                   <FeatureFlagServiceProvider featureFlagService={testFeatureFlagService}>
                     <AmplitudeProvider>{children}</AmplitudeProvider>
                   </FeatureFlagServiceProvider>
@@ -399,6 +374,9 @@ describe('AmplitudeProvider - React Context Integration', () => {
         userId: 'external-user-id',
         amplitudeApiKey: 'external-api-key',
         dataResidency: 'EU',
+        orgId: 'test-org-id',
+        show: true,
+        getLocalStorageItem: mockGetLocalStorageItem,
         featureFlagService: new FeatureFlagService([]),
         env: 'test', // Provide required fields to match AmplitudeServiceConfig
         contextSource: 'test-source',
@@ -435,6 +413,9 @@ describe('AmplitudeProvider - React Context Integration', () => {
         userId: 'external-user-id',
         amplitudeApiKey: 'external-api-key',
         dataResidency: 'EU',
+        orgId: 'test-org-id',
+        show: true,
+        getLocalStorageItem: mockGetLocalStorageItem,
         featureFlagService: new FeatureFlagService([]),
         env: 'test',
         contextSource: 'test-source',

package/src/contexts/amplitudeContext/amplitudeContext.tsx

@@ -43,6 +43,7 @@ export const AmplitudeProvider: React.FC<{
     variantUrlOverride,
     variantInfoOverride,
     show,
+    orgId,
     orgShortName,
     featureGates,
   } = useEnviveConfig();
@@ -67,9 +68,10 @@ export const AmplitudeProvider: React.FC<{
         env: env || '',
         contextSource: contextSource || '',
         orgShortName: orgShortName || '',
+        orgId: orgId || '',
         featureFlagService,
         orgGaConfig,
-        show,
+        show: show ?? false,
         getLocalStorageItem: getItem,
       });
       setService(amplitudeService);
@@ -92,6 +94,7 @@ export const AmplitudeProvider: React.FC<{
     featureGates,
     getItem,
     externalAmplitudeService,
+    orgId,
   ]);
 
   const value = useMemo(

package/src/contexts/enviveContext/enviveContext.tsx

@@ -4,6 +4,7 @@ import { OrgConfigFeatureGate } from 'src/application/models/api/orgConfigResult
 import { EnviveConfigService, EnviveServiceConfig } from 'src/services/enviveConfigService';
 import { AmplitudeService } from 'src/services/amplitudeService/amplitudeService';
 import Logger from 'src/application/logging/logger';
+import { UserIdentityService } from 'src/services/userIdentityService';
 import { AmplitudeProvider } from '../amplitudeContext';
 import { EnviveConfigProvider } from '../enviveConfigContext';
 import { EnviveCssProvider } from '../enviveCssContext';
@@ -50,8 +51,10 @@ interface EnviveProviderProps extends AgentWrapperProps {
   amplitudeService?: AmplitudeService;
   mockV3ConfigToDeprecatedConfig?: boolean;
   requestV3Config?: boolean;
+  userIdentityService?: UserIdentityService;
   previewMode?: boolean;
   overrideConfig?: GraphQlConfigValues;
+  mockSalesAgentData?: any;
 }
 
 const SearchAgentWrapper: React.FC<AgentWrapperProps> = ({ children, enabledAgents }) => {
@@ -61,13 +64,28 @@ const SearchAgentWrapper: React.FC<AgentWrapperProps> = ({ children, enabledAgen
   return <SearchProvider>{children}</SearchProvider>;
 };
 
-const SalesAgentWrapper: React.FC<AgentWrapperProps> = ({ children, enabledAgents }) => {
+interface SalesAgentWrapperProps extends AgentWrapperProps {
+  previewMode?: boolean;
+  mockSalesAgentData?: any;
+}
+
+const SalesAgentWrapper: React.FC<SalesAgentWrapperProps> = ({
+  children,
+  enabledAgents,
+  previewMode,
+  mockSalesAgentData,
+}) => {
   if (!enabledAgents.includes(EnviveAgent.SalesAgent)) {
     return children;
   }
   return (
     <SystemSettingsContextProvider>
-      <SalesAgentProvider>{children}</SalesAgentProvider>
+      <SalesAgentProvider
+        previewMode={previewMode}
+        mockData={mockSalesAgentData}
+      >
+        {children}
+      </SalesAgentProvider>
     </SystemSettingsContextProvider>
   );
 };
@@ -80,11 +98,30 @@ export const EnviveProvider: React.FC<EnviveProviderProps> = ({
   enviveConfigService: inputEnviveConfigService,
   featureFlagService: inputFeatureFlagService,
   amplitudeService: inputAmplitudeService,
+  userIdentityService: inputUserIdentityService,
   mockV3ConfigToDeprecatedConfig = false,
   requestV3Config = false,
+  mockSalesAgentData,
   ...config
 }) => {
-  const userId = 'spiffy-user-id-0b64d781-e1c2-4b6d-9cf5-32b4f7c1e3f2'; // TODO: How should this be derived?
+  const [userId, setUserId] = useState<string>('');
+
+  const userIdService = useMemo(
+    () =>
+      inputUserIdentityService ??
+      new UserIdentityService({ apiKey: config?.amplitudeApiKey || '' }),
+    [config?.amplitudeApiKey, inputUserIdentityService],
+  );
+
+  useEffect(() => {
+    const fetchUserId = async () => {
+      const id = await userIdService.getUserIdOrDefault();
+      setUserId(id);
+    };
+
+    fetchUserId();
+  }, [config.amplitudeApiKey, inputUserIdentityService, userIdService]);
+
   const namespace = 'spiffy-react-components'; // TODO: Should this be different from the current namespace?
   const source = 'app'; // TODO: Make this dependent upon the "spiffy_on" query param
   const [enviveServiceConfig, setEnviveServiceConfig] = useState<EnviveServiceConfig | null>(null);
@@ -97,7 +134,7 @@ export const EnviveProvider: React.FC<EnviveProviderProps> = ({
       new EnviveConfigService({
         baseUrl: config?.baseUrl || '',
         apiKey: config?.orgLevelApiKey || '',
-        userId: userId || '',
+        userId,
         namespace: namespace || '',
         source: source || '',
       });
@@ -138,7 +175,7 @@ export const EnviveProvider: React.FC<EnviveProviderProps> = ({
           <NewOrgConfigProvider overrideConfig={overrideConfig}>
             <LocalStorageProvider>
               <FeatureFlagServiceProvider featureFlagService={featureFlagService}>
-                <UserIdentityProvider>
+                <UserIdentityProvider userIdService={userIdService}>
                   <AmplitudeProvider externalAmplitudeService={inputAmplitudeService}>
                     <PageProvider previewMode={previewMode}>
                       <UiConfigProvider>
@@ -146,7 +183,11 @@ export const EnviveProvider: React.FC<EnviveProviderProps> = ({
                           <HardcopyProvider>
                             <EnviveCssProvider>
                               <SearchAgentWrapper enabledAgents={enabledAgents}>
-                                <SalesAgentWrapper enabledAgents={enabledAgents}>
+                                <SalesAgentWrapper
+                                  enabledAgents={enabledAgents}
+                                  previewMode={previewMode}
+                                  mockSalesAgentData={mockSalesAgentData}
+                                >
                                   {children}
                                 </SalesAgentWrapper>
                               </SearchAgentWrapper>