From ce32d44c2711c8644899cb7f261596c82b987499 Mon Sep 17 00:00:00 2001
From: kevin <kevin@searchspring.com>
Date: Thu, 25 Jul 2024 13:44:35 -0600
Subject: [PATCH] refactor(tracker): changing `id` -> `uid` adding support for
 supplying `childUid`

additionally made changes to the cookie order - specifically the priority was changed to favor child
data over parent, and sku over uid
---
 docs/INTEGRATION_TRACKING.md                  |  42 +++--
 packages/snap-preact-demo/public/cart.html    |   4 +-
 packages/snap-preact-demo/public/order.html   |   4 +-
 packages/snap-preact-demo/public/product.html |   2 +-
 .../tests/cypress/e2e/tracking/track.cy.js    |  22 ++-
 packages/snap-tracker/README.md               |  44 +++--
 packages/snap-tracker/src/Tracker.test.ts     | 160 ++++++++++++++----
 packages/snap-tracker/src/Tracker.ts          |  37 ++--
 packages/snap-tracker/src/types.ts            |   3 +-
 9 files changed, 219 insertions(+), 99 deletions(-)

diff --git a/docs/INTEGRATION_TRACKING.md b/docs/INTEGRATION_TRACKING.md
index 17ccd5415..47e0a7057 100644
--- a/docs/INTEGRATION_TRACKING.md
+++ b/docs/INTEGRATION_TRACKING.md
@@ -19,14 +19,15 @@ searchspring.tracker.track.shopper.login({
 ```
 
 ### Product View
-Tracks product page views. Should only be installed on product detail pages. An `id` and/or `sku` and/or `childSku` are required.
+Tracks product page views. Should only be installed on product detail pages. A `uid` and/or `sku` and/or `childSku` and/or `childUid` are required (provide as many of these product identifiers that are available).
 
 ```html
 <script type="searchspring/track/product/view">
 	item = {
-		id: '123',
+		uid: '123',
 		sku: 'product123',
-		childSku: 'product123_a',
+		childUid: '123_a',
+		childSku: 'product123_a'
 	};
 </script>
 ```
@@ -35,9 +36,10 @@ Alternatively, this can also be integrated using the `searchspring.tracker.track
 
 ```typescript
 searchspring.tracker.track.product.view({
-	id: '123',
+	uid: '123',
 	sku: 'product123',
-	childSku: 'product123_a',
+	childUid: '123_a',
+	childSku: 'product123_a'
 });
 ```
 
@@ -45,21 +47,23 @@ searchspring.tracker.track.product.view({
 ### Cart View 
 Tracks cart contents. Should only be installed on a cart page. If the checkout process does not contain a dedicated cart page (ie. slideout cart) then this method should be invoked when the cart comes into view. 
 
-Each item object must contain a `qty`, `price`, (`id` and/or `sku` and/or `childSku`)
+Each item object must contain a `qty`, `price`, (`uid` and/or `sku` and/or `childSku` and/or `childUid` - provide as many of these product identifiers that are available).
 
 ```html
 <script type="searchspring/track/cart/view">
 	items = [
 		{
-			id: '123',
+			uid: '123',
 			sku: 'product123',
+			childUid: '123_a',
 			childSku: 'product123_a',
 			qty: '1',
 			price: '9.99',
 		},
 		{
-			id: '456',
+			uid: '456',
 			sku: 'product456',
+			childUid: '456_a',
 			childSku: 'product456_a',
 			qty: '2',
 			price: '10.99',
@@ -74,15 +78,17 @@ Alternatively, this can also be integrated using the `searchspring.tracker.track
 searchspring.tracker.track.cart.view({
 	items: [
 		{
-			id: '123',
+			uid: '123',
 			sku: 'product123',
+			childUid: '123_a',
 			childSku: 'product123_a',
 			qty: '1',
 			price: '9.99',
 		},
 		{
-			id: '456',
+			uid: '456',
 			sku: 'product456',
+			childUid: '456_a',
 			childSku: 'product456_a',
 			qty: '2',
 			price: '10.99',
@@ -123,15 +129,17 @@ Tracks order transaction. Should be invoked from an order confirmation page. Exp
 	};
 	items = [
 		{
-			id: '123',
+			uid: '123',
 			sku: 'product123',
+			childUid: '123_a',
 			childSku: 'product123_a',
 			qty: '1',
 			price: '9.99'
 		},
 		{
-			id: '456',
+			uid: '456',
 			sku: 'product456',
+			childUid: '456_a',
 			childSku: 'product456_a',
 			qty: '2',
 			price: '10.99'
@@ -154,15 +162,17 @@ searchspring.tracker.track.order.transaction({
 	},
 	items: [
 		{
-			id: '123',
+			uid: '123',
 			sku: 'product123',
+			childUid: '123_a',
 			childSku: 'product123_a',
 			qty: '1',
 			price: '9.99'
 		},
 		{
-			id: '456',
+			uid: '456',
 			sku: 'product456',
+			childUid: '456_a',
 			childSku: 'product456_a',
 			qty: '2',
 			price: '10.99'
@@ -212,7 +222,7 @@ Adding the following attributes to clickable cart elements allows for real-time
 If you are using multiple custom Tracker instances with a different tracker `config.id`, attributes are namespaced by the trackers `id` (Default: `'track'`, Example: `ss-track-cart-add`)
 
 ### Add to cart
-Adds product `id` or `sku` (or `childSku`) to `ssCartProducts` cookie. Supports multiple skus using a comma delimiter.
+Adds product `uid` or `sku` (or `childSku`/`childUid`) to `ssCartProducts` cookie. It is preferable to use the more specific variant `childSku` or `childUid` if available. Supports multiple products using a comma delimiter.
 
 ```html
 <button ss-track-cart-add='product123'>Add to cart</button>
@@ -226,7 +236,7 @@ searchspring.tracker.cookies.cart.add(['product123'])
 
 
 ### Remove from cart
-Removes product `id` or `sku` (or `childSku`) from `ssCartProducts` cookie. Supports multiple skus using a comma delimiter.
+Removes product `uid` or `sku` (or `childSku`/`childUid`) to `ssCartProducts` cookie. It is preferable to use the more specific variant `childSku` or `childUid` if available. Supports multiple products using a comma delimiter.
 
 ```html
 <button ss-track-cart-remove='product123'>Remove</button>
diff --git a/packages/snap-preact-demo/public/cart.html b/packages/snap-preact-demo/public/cart.html
index 65ed08430..e855a6c50 100644
--- a/packages/snap-preact-demo/public/cart.html
+++ b/packages/snap-preact-demo/public/cart.html
@@ -244,13 +244,13 @@ <h3>Answer To Your Layers Butterscotch Yellow Top</h3>
     <script type="searchspring/track/cart/view">
         items = [
             {
-                id: "182146",
+                uid: "182146",
                 sku: "C-AD-W1-1869P",
                 qty: 1,
                 price: 48
             },
             {
-                id: "174287",
+                uid: "174287",
                 sku: "C-AD-Y5-814MD",
                 qty: 1,
                 price: 36
diff --git a/packages/snap-preact-demo/public/order.html b/packages/snap-preact-demo/public/order.html
index 9e6d9b0f3..24dee19ac 100644
--- a/packages/snap-preact-demo/public/order.html
+++ b/packages/snap-preact-demo/public/order.html
@@ -210,13 +210,13 @@ <h2>Order Confirmation</h2>
     <script type="searchspring/track/order/transaction">
         items = [
             {
-                id: "99688",
+                uid: "99688",
                 sku: "C-BP-G7-B1469",
                 qty: "1",
                 price: "22"
             },
             {
-                id: "181655",
+                uid: "181655",
                 sku: "C-VJ-P2-32007",
                 qty: "1",
                 price: "39"
diff --git a/packages/snap-preact-demo/public/product.html b/packages/snap-preact-demo/public/product.html
index cf03ed309..01d902203 100644
--- a/packages/snap-preact-demo/public/product.html
+++ b/packages/snap-preact-demo/public/product.html
@@ -223,7 +223,7 @@ <h2 id="name">Stripe Out Off-The-Shoulder Dress</h2>
 
     <script type="searchspring/track/product/view">
         item = {
-            id: "182146",
+            uid: "182146",
             sku: "C-AD-W1-1869P"
         };
     </script>
diff --git a/packages/snap-preact-demo/tests/cypress/e2e/tracking/track.cy.js b/packages/snap-preact-demo/tests/cypress/e2e/tracking/track.cy.js
index 4ffd5d931..a4cc82b16 100644
--- a/packages/snap-preact-demo/tests/cypress/e2e/tracking/track.cy.js
+++ b/packages/snap-preact-demo/tests/cypress/e2e/tracking/track.cy.js
@@ -2,11 +2,15 @@ import { BeaconType, BeaconCategory } from '@searchspring/snap-tracker';
 
 describe('Tracking', () => {
 	beforeEach(() => {
+		cy.clearCookies();
+
 		cy.on('window:before:load', (win) => {
 			win.mergeSnapConfig = {
 				mode: 'production',
 			};
 		});
+
+		cy.wait(1000);
 	});
 	it('tracked shopper login', () => {
 		cy.visit('https://localhost:2222');
@@ -89,7 +93,7 @@ describe('Tracking', () => {
 				expect(beacon.category).to.equal(BeaconCategory.PAGEVIEW);
 
 				expect(beacon.event).to.be.an('object').to.include.all.keys(['sku']);
-				expect(beacon.event.id).to.equal('182146');
+				expect(beacon.event.uid).to.equal('182146');
 				expect(beacon.event.sku).to.equal('C-AD-W1-1869P');
 			});
 
@@ -123,16 +127,16 @@ describe('Tracking', () => {
 				expect(beacon.event).to.have.property('items');
 				expect(beacon.event.items).to.be.an('array').to.have.length(2);
 
-				expect(beacon.event.items[0]).to.be.an('object').include.all.keys(['id', 'sku', 'qty', 'price']);
-				expect(beacon.event.items[1]).to.be.an('object').include.all.keys(['id', 'sku', 'qty', 'price']);
+				expect(beacon.event.items[0]).to.be.an('object').include.all.keys(['uid', 'sku', 'qty', 'price']);
+				expect(beacon.event.items[1]).to.be.an('object').include.all.keys(['uid', 'sku', 'qty', 'price']);
 				expect(beacon.event.items[0]).to.deep.equal({
-					id: '182146',
+					uid: '182146',
 					sku: 'C-AD-W1-1869P',
 					qty: '1',
 					price: '48',
 				});
 				expect(beacon.event.items[1]).to.deep.equal({
-					id: '174287',
+					uid: '174287',
 					sku: 'C-AD-Y5-814MD',
 					qty: '1',
 					price: '36',
@@ -172,17 +176,17 @@ describe('Tracking', () => {
 				expect(beacon.event).to.have.property('items');
 				expect(beacon.event.items).to.be.an('array').to.have.length(2);
 
-				expect(beacon.event.items[0]).to.be.an('object').include.all.keys(['id', 'sku', 'qty', 'price']);
-				expect(beacon.event.items[1]).to.be.an('object').include.all.keys(['id', 'sku', 'qty', 'price']);
+				expect(beacon.event.items[0]).to.be.an('object').include.all.keys(['uid', 'sku', 'qty', 'price']);
+				expect(beacon.event.items[1]).to.be.an('object').include.all.keys(['uid', 'sku', 'qty', 'price']);
 
 				expect(beacon.event.items[0]).to.deep.equal({
-					id: '99688',
+					uid: '99688',
 					sku: 'C-BP-G7-B1469',
 					qty: '1',
 					price: '22',
 				});
 				expect(beacon.event.items[1]).to.deep.equal({
-					id: '181655',
+					uid: '181655',
 					sku: 'C-VJ-P2-32007',
 					qty: '1',
 					price: '39',
diff --git a/packages/snap-tracker/README.md b/packages/snap-tracker/README.md
index 7a5f3cf11..f35aecc98 100644
--- a/packages/snap-tracker/README.md
+++ b/packages/snap-tracker/README.md
@@ -83,8 +83,9 @@ This method will call the `retarget` method on all `DomTargeters` set in the Tra
 ```html
 <script type="searchspring/track/product/view">
     item = {
-        id: '123',
+        uid: '123',
         sku: 'product123',
+        childUid: '123_a',
         childSku: 'product123_a',
     };
 </script>
@@ -96,15 +97,17 @@ This method will call the `retarget` method on all `DomTargeters` set in the Tra
 <script type="searchspring/track/cart/view">
     items = [
         {
-            id: '123',
+            uid: '123',
             sku: 'product123',
+            childUid: '123_a',
             childSku: 'product123_a',
             qty: '1',
             price: '9.99',
         },
         {
-            id: '456',
+            uid: '456',
             sku: 'product456',
+            childUid: '456_a',
             childSku: 'product456_a',
             qty: '2',
             price: '10.99',
@@ -127,15 +130,17 @@ This method will call the `retarget` method on all `DomTargeters` set in the Tra
     };
     items = [
         {
-            id: '123',
+            uid: '123',
             sku: 'product123',
+            childUid: '123_a',
             childSku: 'product123_a',
             qty: '1',
             price: '9.99'
         },
         {
-            id: '456',
+            uid: '456',
             sku: 'product456',
+            childUid: '456_a',
             childSku: 'product456_a',
             qty: '2',
             price: '10.99'
@@ -155,8 +160,9 @@ Each tracking method expects a data object which contains different attributes d
 
 ```typescript
 tracker.track.product.view({
-    id: '123',
+    uid: '123',
     sku: 'product123',
+    childUid: '123_a',
     childSku: 'product123_a',
 });
 ```
@@ -165,8 +171,9 @@ If a bundle is using multiple Snap Controllers with different `siteId`, an optio
 
 ```typescript
 tracker.track.product.view({
-    id: '123',
+    uid: '123',
     sku: 'product123',
+    childUid: '123_a',
     childSku: 'product123_a',
 }, 'abc123');
 ```
@@ -276,12 +283,13 @@ tracker.track.product.click({
 ```
 
 ### Product View `track.product.view`
-Tracks product page views. Should be invoked from a product detail page. An `id` and/or `sku` and/or `childSku` are required.
+Tracks product page views. Should be invoked from a product detail page. A `uid` and/or `sku` and/or `childUid` and/or `childSku` are required.
 
 ```typescript
 tracker.track.product.view({
-    id: '123',
+    ud: '123',
     sku: 'product123',
+    childUid: '123_a',
     childSku: 'product123_a',
 });
 ```
@@ -297,21 +305,23 @@ tracker.track.shopper.login({
 ```
 
 ### Cart View `track.cart.view`
-Tracks cart contents. Should be invoked from a cart page. Each item object must contain a `qty`, `price`, (`id` and/or `sku` and/or `childSku`)
+Tracks cart contents. Should be invoked from a cart page. Each item object must contain a `qty`, `price`, (`uid` and/or `sku` and/or `childUid` and/or `childSku`)
 
 ```typescript
 tracker.track.cart.view({
     items: [
         {
-            id: '123',
+            uid: '123',
             sku: 'product123',
+            childUid: '123_a',
             childSku: 'product123_a',
             qty: '1',
             price: '9.99',
         },
         {
-            id: '456',
+            uid: '456',
             sku: 'product456',
+            childUid: '456_a',
             childSku: 'product456_a',
             qty: '2',
             price: '10.99',
@@ -351,15 +361,17 @@ tracker.track.order.transaction({
     },
     items: [
         {
-            id: '123',
+            uid: '123',
             sku: 'product123',
+            childUid: '123_a',
             childSku: 'product123_a',
             qty: '1',
             price: '9.99'
         },
         {
-            id: '456',
+            uid: '456',
             sku: 'product456',
+            childUid: '456_a',
             childSku: 'product456_a',
             qty: '2',
             price: '10.99'
@@ -472,7 +484,7 @@ console.log(tracker.getShopperId())
 The `cookies` property provides access to the `cart` and `viewed` tracking cookies.
 
 #### `cookies.cart.get` method
-Returns an array of strings containing the `ids` and/or `skus` of each item last registered as being in the shopping cart. This value is stored in the `ssCartProducts` cookie and is set via the calls to the `tracker.track.cart.view` event.
+Returns an array of strings containing the `uids` and/or `skus` of each item last registered as being in the shopping cart. This value is stored in the `ssCartProducts` cookie and is set via the calls to the `tracker.track.cart.view` event.
 
 ```typescript
 const tracker = new Tracker();
@@ -527,7 +539,7 @@ tracker.cookies.cart.clear();
 ```
 
 #### `cookies.viewed.get` method
-Returns an array of strings containing the `ids` and/or `skus` of items which have been viewed. This value is stored in the `ssViewedProducts` cookie and is set via the calls to the `tracker.track.product.view` event.
+Returns an array of strings containing the `uids` and/or `skus` of items which have been viewed. This value is stored in the `ssViewedProducts` cookie and is set via the calls to the `tracker.track.product.view` event.
 
 ```typescript
 const tracker = new Tracker();
diff --git a/packages/snap-tracker/src/Tracker.test.ts b/packages/snap-tracker/src/Tracker.test.ts
index e29c49152..56db36a0a 100644
--- a/packages/snap-tracker/src/Tracker.test.ts
+++ b/packages/snap-tracker/src/Tracker.test.ts
@@ -791,8 +791,9 @@ describe('Tracker', () => {
 		const eventFn = jest.spyOn(tracker.track.product, 'view');
 
 		const payload = {
-			id: undefined,
+			uid: undefined,
 			sku: 'abc123',
+			childUid: undefined,
 			childSku: 'abc123_a',
 		};
 		const beaconEvent = await tracker.track.product.view(payload);
@@ -838,7 +839,7 @@ describe('Tracker', () => {
 		productView.mockRestore();
 	});
 
-	it('logs console error if no id or sku or childSku is provided to track.product.view', async () => {
+	it('logs console error if no uid or sku or childUid or childSku is provided to track.product.view', async () => {
 		const tracker = new Tracker(globals, config);
 		const eventFn = jest.spyOn(tracker.track.product, 'view');
 		const consoleError = jest.spyOn(console, 'error');
@@ -1038,7 +1039,7 @@ describe('Tracker', () => {
 		eventFn.mockRestore();
 	});
 
-	it('can invoke track.cart.view event method with id', async () => {
+	it('can invoke track.cart.view event method with uid', async () => {
 		const tracker = new Tracker(globals, config);
 
 		const eventFn = jest.spyOn(tracker.track.cart, 'view');
@@ -1046,12 +1047,12 @@ describe('Tracker', () => {
 		const payload = {
 			items: [
 				{
-					id: 'id_1',
+					uid: 'id_1',
 					qty: '1',
 					price: '9.99',
 				},
 				{
-					id: 'id_2',
+					uid: 'id_2',
 					qty: '2',
 					price: '10.99',
 				},
@@ -1069,50 +1070,34 @@ describe('Tracker', () => {
 		eventFn.mockRestore();
 	});
 
-	it('logs console error if no items is provided to track.cart.view', async () => {
+	it('can invoke track.cart.view event method with childUid', async () => {
 		const tracker = new Tracker(globals, config);
-		const eventFn = jest.spyOn(tracker.track.cart, 'view');
-		const consoleError = jest.spyOn(console, 'error');
-
-		let consoleCount = 0;
-		let payload: CartViewEvent = {
-			items: [],
-		};
-		await tracker.track.cart.view(payload);
-		consoleCount++;
 
-		expect(eventFn).toHaveBeenCalledWith(payload);
-		expect(consoleError).toHaveBeenCalledTimes(consoleCount);
+		const eventFn = jest.spyOn(tracker.track.cart, 'view');
 
-		// without qty, price, childSku or sku
-		payload = {
+		const payload = {
 			items: [
-				// @ts-ignore
 				{
-					childSku: 'abc123_a',
-					// qty: '1',
+					childUid: 'id_c1',
+					qty: '1',
 					price: '9.99',
 				},
-				// @ts-ignore
-				{
-					childSku: 'def456_a',
-					qty: '2',
-					// price: '10.99',
-				},
 				{
-					// childSku: 'def456_a',
+					childUid: 'id_c2',
 					qty: '2',
 					price: '10.99',
 				},
 			],
 		};
-		await tracker.track.cart.view(payload);
-		consoleCount += payload.items.length;
+		const beaconEvent = await tracker.track.cart.view(payload);
+
+		expect(beaconEvent?.type).toStrictEqual(BeaconType.CART);
+		expect(beaconEvent?.category).toStrictEqual(BeaconCategory.CARTVIEW);
+		expect(beaconEvent?.event).toStrictEqual(payload);
 
+		expect(eventFn).toHaveBeenCalledTimes(1);
 		expect(eventFn).toHaveBeenCalledWith(payload);
-		expect(consoleError).toHaveBeenCalledTimes(consoleCount);
 
-		consoleError.mockRestore();
 		eventFn.mockRestore();
 	});
 
@@ -1157,6 +1142,65 @@ describe('Tracker', () => {
 		trackEvent.mockRestore();
 	});
 
+	it('logs console error if no valid items are provided to track.cart.view', async () => {
+		const tracker = new Tracker(globals, config);
+		const eventFn = jest.spyOn(tracker.track.cart, 'view');
+		const consoleError = jest.spyOn(console, 'error');
+
+		let consoleCount = 0;
+		let payload: CartViewEvent = {
+			items: [],
+		};
+		await tracker.track.cart.view(payload);
+		consoleCount++;
+
+		expect(eventFn).toHaveBeenCalledWith(payload);
+		expect(consoleError).toHaveBeenCalledTimes(consoleCount);
+
+		// without qty, price, childSku or sku
+		payload = {
+			items: [
+				// @ts-ignore
+				{
+					childSku: 'abc123_a',
+					// qty: '1',
+					price: '9.99',
+				},
+				// @ts-ignore
+				{
+					childSku: 'def456_a',
+					qty: '2',
+					// price: '10.99',
+				},
+				// @ts-ignore
+				{
+					childUid: '456_a',
+					// qty: '2',
+					price: '10.99',
+				},
+				// @ts-ignore
+				{
+					uid: '456',
+					// qty: '3',
+					price: '10.99',
+				},
+				{
+					// childSku: 'def456_a',
+					qty: '2',
+					price: '10.99',
+				},
+			],
+		};
+		await tracker.track.cart.view(payload);
+		consoleCount += payload.items.length;
+
+		expect(eventFn).toHaveBeenCalledWith(payload);
+		expect(consoleError).toHaveBeenCalledTimes(consoleCount);
+
+		consoleError.mockRestore();
+		eventFn.mockRestore();
+	});
+
 	it('can invoke track.order.transaction event method', async () => {
 		const tracker = new Tracker(globals, config);
 
@@ -1173,8 +1217,8 @@ describe('Tracker', () => {
 			},
 			items: [
 				{
-					id: 'abc123_id',
-					sku: 'abc123',
+					uid: 'abc123',
+					sku: 'productabc123',
 					childSku: 'abc123_a',
 					qty: '1',
 					price: '9.99',
@@ -1244,7 +1288,49 @@ describe('Tracker', () => {
 		eventFn.mockRestore();
 	});
 
-	it('can invoke track.order.transaction event method with ONLY item id', async () => {
+	it('can invoke track.order.transaction event method with ONLY item uid', async () => {
+		const tracker = new Tracker(globals, config);
+
+		const eventFn = jest.spyOn(tracker.track.order, 'transaction');
+
+		const payload = {
+			order: {
+				id: '123456',
+				total: '10.71',
+				transactionTotal: '9.99',
+				city: 'Los Angeles',
+				state: 'CA',
+				country: 'US',
+			},
+			items: [
+				{
+					uid: 'abc123_id',
+					qty: '1',
+					price: '9.99',
+				},
+			],
+		};
+		const beaconEvent = await tracker.track.order.transaction(payload);
+
+		expect(beaconEvent?.type).toStrictEqual(BeaconType.ORDER);
+		expect(beaconEvent?.category).toStrictEqual(BeaconCategory.ORDERVIEW);
+		expect(beaconEvent?.event).toStrictEqual({
+			orderId: payload.order.id,
+			total: payload.order.total,
+			transactionTotal: payload.order.transactionTotal,
+			city: payload.order.city,
+			state: payload.order.state,
+			country: payload.order.country,
+			items: payload.items,
+		});
+
+		expect(eventFn).toHaveBeenCalledTimes(1);
+		expect(eventFn).toHaveBeenCalledWith(payload);
+
+		eventFn.mockRestore();
+	});
+
+	it('can invoke track.order.transaction event method with ONLY item childUid', async () => {
 		const tracker = new Tracker(globals, config);
 
 		const eventFn = jest.spyOn(tracker.track.order, 'transaction');
@@ -1260,7 +1346,7 @@ describe('Tracker', () => {
 			},
 			items: [
 				{
-					id: 'abc123_id',
+					childUid: 'abc123_cid',
 					qty: '1',
 					price: '9.99',
 				},
diff --git a/packages/snap-tracker/src/Tracker.ts b/packages/snap-tracker/src/Tracker.ts
index be8eb3d18..d95b5b9a5 100644
--- a/packages/snap-tracker/src/Tracker.ts
+++ b/packages/snap-tracker/src/Tracker.ts
@@ -339,9 +339,9 @@ export class Tracker {
 		},
 		product: {
 			view: (data: ProductViewEvent, siteId?: string): BeaconEvent | undefined => {
-				if (!data?.id && !data?.sku && !data?.childSku) {
+				if (!data?.uid && !data?.sku && !data?.childUid && !data?.childSku) {
 					console.error(
-						'track.product.view event: requires a valid id, sku and/or childSku. \nExample: track.product.view({ id: "123", sku: "product123", childSku: "product123_a" })'
+						'track.product.view event: requires a valid uid, sku and/or childUid, childSku. \nExample: track.product.view({ uid: "123", sku: "product123", childUid: "123_a", childSku: "product123_a" })'
 					);
 					return;
 				}
@@ -360,8 +360,9 @@ export class Tracker {
 					category: BeaconCategory.PAGEVIEW,
 					context,
 					event: {
-						id: data?.id ? `${data.id}` : undefined,
+						uid: data?.uid ? `${data.uid}` : undefined,
 						sku: data?.sku ? `${data.sku}` : undefined,
+						childUid: data?.childUid ? `${data.childUid}` : undefined,
 						childSku: data?.childSku ? `${data.childSku}` : undefined,
 					},
 				};
@@ -369,7 +370,7 @@ export class Tracker {
 				const event = this.track.event(payload);
 				if (event) {
 					// save recently viewed products to cookie
-					const sku = data?.sku || data?.childSku || data?.id;
+					const sku = data?.childSku || data?.childUid || data?.sku || data?.uid;
 					if (sku) {
 						const lastViewedProducts = this.cookies.viewed.get();
 						const uniqueCartItems = Array.from(new Set([...lastViewedProducts, sku])).map((item) => item.trim());
@@ -392,7 +393,7 @@ export class Tracker {
 							...payload,
 							event: {
 								sku: data.sku,
-								id: data.id,
+								id: data.uid,
 							},
 						});
 					}
@@ -452,9 +453,9 @@ export class Tracker {
 					});
 				}
 				const items = data.items.map((item, index) => {
-					if (!item?.qty || !item?.price || (!item?.id && !item?.sku && !item?.childSku)) {
+					if (!item?.qty || !item?.price || (!item?.uid && !item?.sku && !item?.childUid && !item?.childSku)) {
 						console.error(
-							`track.view.cart event: item at index ${index} requires a valid qty, price, and (id or sku and/or childSku.) \nExample: track.view.cart({ items: [{ sku: "product123", childSku: "product123_a", qty: "1", price: "9.99" }] })`
+							`track.view.cart event: item at index ${index} requires a valid qty, price, and (uid and/or sku and/or childUid and/or childSku.) \nExample: track.view.cart({ items: [{ uid: "123", sku: "product123", childUid: "123_a", childSku: "product123_a", qty: "1", price: "9.99" }] })`
 						);
 						return;
 					}
@@ -462,12 +463,15 @@ export class Tracker {
 						qty: `${item.qty}`,
 						price: `${item.price}`,
 					};
-					if (item?.id) {
-						product.id = `${item.id}`;
+					if (item?.uid) {
+						product.uid = `${item.uid}`;
 					}
 					if (item?.sku) {
 						product.sku = `${item.sku}`;
 					}
+					if (item?.childUid) {
+						product.childUid = `${item.childUid}`;
+					}
 					if (item?.childSku) {
 						product.childSku = `${item.childSku}`;
 					}
@@ -484,7 +488,7 @@ export class Tracker {
 				if (event) {
 					// save cart items to cookie
 					if (items.length) {
-						const products = items.map((item) => item?.sku || item?.childSku || item?.id || '').filter((sku) => sku);
+						const products = items.map((item) => item?.childSku || item?.childUid || item?.sku || item?.uid || '').filter((sku) => sku);
 						this.cookies.cart.add(products);
 					}
 					// legacy tracking
@@ -497,7 +501,7 @@ export class Tracker {
 			transaction: (data: OrderTransactionData, siteId?: string): BeaconEvent | undefined => {
 				if (!data?.items || !Array.isArray(data.items) || !data.items.length) {
 					console.error(
-						'track.order.transaction event: object parameter must contain `items` array of cart items. \nExample: order.transaction({ order: { id: "1001", total: "10.71", transactionTotal: "9.99", city: "Los Angeles", state: "CA", country: "US" }, items: [{ sku: "product123", childSku: "product123_a", qty: "1", price: "9.99" }] })'
+						'track.order.transaction event: object parameter must contain `items` array of cart items. \nExample: order.transaction({ order: { id: "1001", total: "10.71", transactionTotal: "9.99", city: "Los Angeles", state: "CA", country: "US" }, items: [{ uid: "123", sku: "product123", childUid: "123_a", childSku: "product123_a", qty: "1", price: "9.99" }] })'
 					);
 					return;
 				}
@@ -512,9 +516,9 @@ export class Tracker {
 					});
 				}
 				const items = data.items.map((item, index) => {
-					if (!item?.qty || !item?.price || (!item?.id && !item?.sku && !item?.childSku)) {
+					if (!item?.qty || !item?.price || (!item?.uid && !item?.sku && !item?.childUid && !item?.childSku)) {
 						console.error(
-							`track.order.transaction event: object parameter \`items\`: item at index ${index} requires a valid qty, price, and (id or sku and/or childSku.) \nExample: order.view({ items: [{ sku: "product123", childSku: "product123_a", qty: "1", price: "9.99" }] })`
+							`track.order.transaction event: object parameter \`items\`: item at index ${index} requires a valid qty, price, and (id or sku and/or childSku.) \nExample: order.view({ items: [{ uid: "123", sku: "product123", childUid: "123_a", childSku: "product123_a", qty: "1", price: "9.99" }] })`
 						);
 						return;
 					}
@@ -522,12 +526,15 @@ export class Tracker {
 						qty: `${item.qty}`,
 						price: `${item.price}`,
 					};
-					if (item?.id) {
-						product.id = `${item.id}`;
+					if (item?.uid) {
+						product.uid = `${item.uid}`;
 					}
 					if (item?.sku) {
 						product.sku = `${item.sku}`;
 					}
+					if (item?.childUid) {
+						product.childUid = `${item.childUid}`;
+					}
 					if (item?.childSku) {
 						product.childSku = `${item.childSku}`;
 					}
diff --git a/packages/snap-tracker/src/types.ts b/packages/snap-tracker/src/types.ts
index 3e00cf196..29e16dea6 100644
--- a/packages/snap-tracker/src/types.ts
+++ b/packages/snap-tracker/src/types.ts
@@ -133,8 +133,9 @@ export interface TrackErrorEvent {
 	details?: { [any: string]: unknown };
 }
 export interface ProductViewEvent {
-	id?: string;
+	uid?: string;
 	sku?: string;
+	childUid?: string;
 	childSku?: string;
 }
 export interface CartViewEvent {