vdb-ai-chat 1.0.16 → 1.0.17

package/lib/typescript/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAe,MAAM,oBAAoB,CAAC;AAEjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAG3C,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAqEhD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW,EAAE,CAkBzD;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,aAAa,EACvB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GACxB,OAAO,CAAC,GAAG,CAAC,CAmCd;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EACxB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,yBAAyB,CAAC,CA0CpC;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,WAAW,EAAE,EACvB,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,GAAG,CAAC,CAyCd;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,IAAI,CAAC,CAsBf;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,aAAa,EACrB,SAAS,EAAE,MAAM,GAAG,IAAI,GACvB,OAAO,CAAC,GAAG,CAAC,CAkGd;AAED,eAAO,MAAM,uBAAuB,GAClC,QAAQ,cAAc,EACtB,iBAAiB,MAAM,EACvB,YAAY,MAAM,sBAanB,CAAC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAmC,MAAM,oBAAoB,CAAC;AAErF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAG3C,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAqEhD,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAwDlG;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,aAAa,EACvB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GACxB,OAAO,CAAC,GAAG,CAAC,CAmCd;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EACxB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,yBAAyB,CAAC,CA0CpC;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,WAAW,EAAE,EACvB,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,GAAG,CAAC,CAyCd;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,IAAI,CAAC,CAsBf;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,GAAG,CAAC,CAkCd;AAED,eAAO,MAAM,uBAAuB,GAClC,QAAQ,cAAc,EACtB,iBAAiB,MAAM,EACvB,YAAY,MAAM,sBAanB,CAAC"}

package/lib/typescript/components/ChatWidget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatWidget.d.ts","sourceRoot":"","sources":["../../../src/components/ChatWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAgBf,OAAO,KAAK,EAAe,eAAe,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AA4B5E,eAAO,MAAM,UAAU,uFAk7BtB,CAAC"}
+{"version":3,"file":"ChatWidget.d.ts","sourceRoot":"","sources":["../../../src/components/ChatWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAgBf,OAAO,KAAK,EAAe,eAAe,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AA4B5E,eAAO,MAAM,UAAU,uFAy4BtB,CAAC"}

package/lib/typescript/components/ProductsListView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProductsListView.d.ts","sourceRoot":"","sources":["../../../src/components/ProductsListView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoC,MAAM,OAAO,CAAC;AA0HzD,UAAU,qBAAqB;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAClC,IAAI,EAAE,GAAG,CAAC;CACX;AAqQD,QAAA,MAAM,gBAAgB,mDAAkC,CAAC;AACzD,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"ProductsListView.d.ts","sourceRoot":"","sources":["../../../src/components/ProductsListView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoC,MAAM,OAAO,CAAC;AA6LzD,UAAU,qBAAqB;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAClC,IAAI,EAAE,GAAG,CAAC;CACX;AAwQD,QAAA,MAAM,gBAAgB,mDAAkC,CAAC;AACzD,eAAe,gBAAgB,CAAC"}

package/lib/typescript/components/utils.d.ts

@@ -43,6 +43,7 @@ export declare const useDeviceType: () => {
     isDesktop: boolean;
     isLargeScreen: boolean;
 };
+export declare const renderSearchParams: ({ searchPayload, priceMode, vdbSetting, searchResultViewType }: any) => any;
 export declare const generateSavedSearchName: (search_params: any) => {
     title: string;
     options: {

package/lib/typescript/components/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/components/utils.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,mCAA2B,CAAC;AAEpD,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAatD;AAED,oBAAY,cAAc;IACxB,IAAI,MAAM;IACV,OAAO,MAAM;IACb,KAAK,MAAM;CACZ;AAcD,eAAO,MAAM,mBAAmB,GAC9B,YAAY,MAAM,KACjB,OAAO,CAAC,MAAM,GAAG,IAAI,CAqBvB,CAAC;AAEF,eAAO,MAAM,qBAAqB,QAAa,OAAO,CAAC,MAAM,GAAG,IAAI,CAInE,CAAC;AAEF,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,OAAO,CAMrD,CAAC;AAGF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAI/D;AAGD,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,WAAW,EAAE,OAAO,UAgBrB;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,eAAO,MAAM,cAAc,QAAa,OAAO,CAAC,WAAW,GAAG,IAAI,CAqBjE,CAAC;AAEF,oBAAY,UAAU;IACpB,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,aAAa,GAAI,WAAW,MAAM,cAW9C,CAAC;AAEF,oBAAY,mBAAmB;IAC7B,aAAa,0BAA0B;IACvC,aAAa,0BAA0B;IACvC,YAAY,oBAAoB;CACjC;AAED,eAAO,MAAM,MAAM,eAclB,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;CAUzB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,eAAe,GAAG;;;;;CAuhBzD,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/components/utils.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,mCAA2B,CAAC;AAEpD,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAatD;AAED,oBAAY,cAAc;IACxB,IAAI,MAAM;IACV,OAAO,MAAM;IACb,KAAK,MAAM;CACZ;AAcD,eAAO,MAAM,mBAAmB,GAC9B,YAAY,MAAM,KACjB,OAAO,CAAC,MAAM,GAAG,IAAI,CAqBvB,CAAC;AAEF,eAAO,MAAM,qBAAqB,QAAa,OAAO,CAAC,MAAM,GAAG,IAAI,CAInE,CAAC;AAEF,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,OAAO,CAMrD,CAAC;AAGF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAI/D;AAGD,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,WAAW,EAAE,OAAO,UAgBrB;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,eAAO,MAAM,cAAc,QAAa,OAAO,CAAC,WAAW,GAAG,IAAI,CAqBjE,CAAC;AAEF,oBAAY,UAAU;IACpB,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,aAAa,GAAI,WAAW,MAAM,cAW9C,CAAC;AAEF,oBAAY,mBAAmB;IAC7B,aAAa,0BAA0B;IACvC,aAAa,0BAA0B;IACvC,YAAY,oBAAoB;CACjC;AAED,eAAO,MAAM,MAAM,eAclB,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;CAUzB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,gEAA8D,GAAG,QA4GnG,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAI,eAAe,GAAG;;;;;CAuhBzD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vdb-ai-chat",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "Cross-platform AI chat widget for React Native and Web",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/src/api.ts

@@ -1,4 +1,4 @@
-import { FeedbackAction, UserDetails } from "./components/utils";
+import { FeedbackAction, renderSearchParams, UserDetails } from "./components/utils";
 import { Storage } from "./storage";
 import type { ChatMessage } from "./types";
 
@@ -72,24 +72,62 @@ async function saveConversations(
   await Storage.setJSON("vdbchat_conversations", data);
 }
 
-export function normaliseMessages(raw: any): ChatMessage[] {
+export async function normaliseMessages(raw: any, priceMode: string | null): Promise<ChatMessage[]> {
   const messages = Array.isArray(raw) ? raw : raw?.messages;
   if (!Array.isArray(messages)) return [];
+  const userInfo = await Storage.getJSON<UserDetails>("persist:userInfo", {});
+  const searchResultViewTypeMap = JSON.parse(
+    userInfo?.searchResultViewType || "{}"
+  );
+
+  const rootState = JSON.parse((await Storage.getItem("persist:root")) || "{}");
+  const selectedGroups =
+    typeof rootState?.selectedGroups === "string"
+      ? JSON.parse(rootState.selectedGroups)?.selectedGroups
+      : rootState?.selectedGroups?.selectedGroups || {};
 
-  return messages.map((m, index) => ({
-    id: String(m.id ?? `${m.role}-${index}-${m.created_at ?? Date.now()}`),
-    role: m.role === "user" ? "user" : "assistant",
-    text: String(m.content ?? m.text ?? ""),
-    createdAt:
-      typeof m.created_at === "string"
-        ? Date.parse(m.created_at)
-        : typeof m.createdAt === "number"
-        ? m.createdAt
-        : Date.now(),
-    search_payload: m.search_payload ?? {},
-    reaction: String(m.reaction ?? "0"),
-    suggestions: Array.isArray(m.suggestions) ? m.suggestions : undefined,
-  }));
+  return messages.map((m, index) => {
+    const isLabgrown =
+      typeof m.lab_grown === "string"
+        ? m.lab_grown === "true"
+        : typeof m.lab_grown === "boolean"
+        ? m.lab_grown
+        : false;
+    const activeProduct = isLabgrown ? "lab_grown_diamond" : "diamond";
+    const searchResultViewType =
+      searchResultViewTypeMap?.[activeProduct ?? "default"];
+      let mGroupIds = selectedGroups[activeProduct ?? ""];
+    let vdbSetting = false;
+    if (mGroupIds) {
+      if (mGroupIds.includes(0)) {
+        vdbSetting = true;
+        mGroupIds = mGroupIds.filter((groupId: number) => groupId !== 0);
+      }
+    } else if (!mGroupIds || mGroupIds.length === 0) {
+      vdbSetting = true;
+    }
+
+    let queryParamList: Record<string, any> = {};
+    if (mGroupIds && mGroupIds.length > 0) {
+      queryParamList = Object.assign(queryParamList, {
+        group_ids: mGroupIds,
+      });
+    }
+    return ({
+      id: String(m.id ?? `${m.role}-${index}-${m.created_at ?? Date.now()}`),
+      role: m.role === "user" ? "user" : "assistant",
+      text: String(m.content ?? m.text ?? ""),
+      createdAt:
+        typeof m.created_at === "string"
+          ? Date.parse(m.created_at)
+          : typeof m.createdAt === "number"
+          ? m.createdAt
+          : Date.now(),
+      search_payload: m.search_payload && Object.keys(m.search_payload).length > 0 ? renderSearchParams({searchPayload: m.search_payload || {}, priceMode, vdbSetting, searchResultViewType}) : {},
+      reaction: String(m.reaction ?? "0"),
+      suggestions: Array.isArray(m.suggestions) ? m.suggestions : undefined,
+    })
+  });
 }
 
 export interface PaginatedMessagesResponse {
@@ -272,64 +310,18 @@ export async function clearChatHistory(
 
 export async function getProducts(
   params: ChatApiParams,
-  priceMode: string | null
 ): Promise<any> {
-  const isLabgrown =
-    typeof params.lab_grown === "string"
-      ? params.lab_grown === "true"
-      : typeof params.lab_grown === "boolean"
-      ? params.lab_grown
-      : false;
-  const userInfo = await Storage.getJSON<UserDetails>("persist:userInfo", {});
-  const activeProduct = isLabgrown ? "lab_grown_diamond" : "diamond";
-  const searchResultViewTypeMap = JSON.parse(
-    userInfo?.searchResultViewType || "{}"
-  );
-  const searchResultViewType =
-    searchResultViewTypeMap?.[activeProduct ?? "default"];
-  const rawState = JSON.parse(
-    (await Storage.getItem("persist:searchFilters")) || "{}"
-  );
-
-  const rootState = JSON.parse((await Storage.getItem("persist:root")) || "{}");
-  const selectedGroups =
-    typeof rootState?.selectedGroups === "string"
-      ? JSON.parse(rootState.selectedGroups)?.selectedGroups
-      : rootState?.selectedGroups?.selectedGroups || {};
-
-  let mGroupIds = selectedGroups[activeProduct ?? ""];
-  let vdbSetting = false;
-  if (mGroupIds) {
-    if (mGroupIds.includes(0)) {
-      vdbSetting = true;
-      mGroupIds = mGroupIds.filter((groupId: number) => groupId !== 0);
-    }
-  } else if (!mGroupIds || mGroupIds.length === 0) {
-    vdbSetting = true;
-  }
-
-  if (params.three_x) {
-    delete params.three_x;
-  }
-
-  let queryParamList: Record<string, any> = {};
-  if (mGroupIds && mGroupIds.length > 0) {
-    queryParamList = Object.assign(queryParamList, {
-      group_ids: mGroupIds,
-    });
-  }
-
-  let depth_percent_from: number | undefined;
-  let depth_percent_to: number | undefined;
-  let table_percent_from: number | undefined;
-  let table_percent_to: number | undefined;
-
-  if (userInfo?.user?.max_search_key_values) {
-    depth_percent_from = userInfo.user.max_search_key_values.min_depth;
-    depth_percent_to = userInfo.user.max_search_key_values.max_depth;
-    table_percent_from = userInfo.user.max_search_key_values.min_table;
-    table_percent_to = userInfo.user.max_search_key_values.max_table;
-  }
+  // let depth_percent_from: number | undefined;
+  // let depth_percent_to: number | undefined;
+  // let table_percent_from: number | undefined;
+  // let table_percent_to: number | undefined;
+
+  // if (userInfo?.user?.max_search_key_values) {
+  //   depth_percent_from = userInfo.user.max_search_key_values.min_depth;
+  //   depth_percent_to = userInfo.user.max_search_key_values.max_depth;
+  //   table_percent_from = userInfo.user.max_search_key_values.min_table;
+  //   table_percent_to = userInfo.user.max_search_key_values.max_table;
+  // }
 
   const res = await fetch(
     "https://pdpdemo1.demo.customvirtual.app/v3/vdb/search_diamonds",
@@ -339,27 +331,8 @@ export async function getProducts(
       body: JSON.stringify({
         vdb: {
           ...params,
-          ...queryParamList,
           page_size: 5,
-          price_mode: priceMode,
-          vdb_setting: vdbSetting ? "true" : "false",
-          results_view_type: searchResultViewType || "grid",
-          featured: "false",
-          pair: params.pair === "pair" ? "pair" : "other",
-          with_available_items: false,
           page_number: 1,
-          ...(depth_percent_from !== undefined && depth_percent_to !== undefined
-            ? {
-                depth_percent_from: depth_percent_from,
-                depth_percent_to: depth_percent_to,
-              }
-            : {}),
-          ...(table_percent_from !== undefined && table_percent_to !== undefined
-            ? {
-                table_percent_from: table_percent_from,
-                table_percent_to: table_percent_to,
-              }
-            : {}),
         },
       }),
     }

package/src/components/ChatWidget.tsx

@@ -142,43 +142,6 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
 
     const onViewAll = (item: any) => {
       let searchPayload = item?.search_payload;
-      if (
-        searchPayload?.cut_from ||
-        searchPayload?.cut_to ||
-        searchPayload?.polish_from ||
-        searchPayload?.polish_to ||
-        searchPayload?.symmetry_from ||
-        searchPayload?.symmetry_to
-      ) {
-        searchPayload.cutGrades = [];
-        searchPayload.polishes = [];
-        searchPayload.symmetries = [];
-        if (!searchPayload?.shapes) {
-          searchPayload.shapes = [];
-        }
-      }
-      if (searchPayload?.cut_from) {
-        searchPayload.cutGrades.push(searchPayload?.cut_from);
-      }
-      if (searchPayload?.cut_to) {
-        searchPayload.cutGrades.push(searchPayload?.cut_to);
-      }
-      if (searchPayload?.polish_from) {
-        searchPayload.polishes.push(searchPayload?.polish_from);
-      }
-      if (searchPayload?.polish_to) {
-        searchPayload.polishes.push(searchPayload?.polish_to);
-      }
-      if (searchPayload?.symmetry_from) {
-        searchPayload.symmetries.push(searchPayload?.symmetry_from);
-      }
-      if (searchPayload?.symmetry_to) {
-        searchPayload.symmetries.push(searchPayload?.symmetry_to);
-      }
-      if (searchPayload?.three_x) {
-        delete searchPayload.three_x;
-      }
-
       const stringifiedSearchPayload = JSON.stringify(searchPayload);
       const payload = item?.search_payload;
       if (!payload) return;
@@ -282,7 +245,7 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
             priceMode
           );
           if (!cancelled) {
-            const normalised = normaliseMessages(initial).reverse();
+            const normalised = (await normaliseMessages(initial, priceMode)).reverse();
             // Capture pagination info from initial response
             if (initial?.has_more !== undefined) {
               setHasMoreMessages(initial.has_more);
@@ -383,7 +346,7 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
             priceMode
           );
 
-          const normalised = normaliseMessages(updatedMessages);
+          const normalised = await normaliseMessages(updatedMessages, priceMode);
           const latestAssistant = normalised.find(
             (m) => m.role === "assistant"
           );
@@ -394,11 +357,7 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
               typeof latestAssistant.search_payload === "object" &&
               Object.keys(latestAssistant.search_payload).length > 0
             ) {
-              const productsResult = await getProducts(
-                latestAssistant.search_payload,
-                priceMode as string
-              );
-
+              const productsResult = await getProducts(latestAssistant.search_payload);
               const hasDiamonds =
                 productsResult &&
                 productsResult.response &&
@@ -518,7 +477,7 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
         setReloadLoadingIds((prev) => new Set(prev).add(id));
         const payload = msg?.search_payload;
         if (!payload || Object.keys(payload).length === 0) return;
-        const productsResult = await getProducts(payload, priceMode as string);
+        const productsResult = await getProducts(payload);
         setProductsByMsg((prev) => ({ ...prev, [id]: productsResult }));
       } catch (e) {
         console.error("Reload results failed", e);
@@ -548,7 +507,7 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
           currentPage + 1
         );
 
-        const olderMessages = normaliseMessages(result);
+        const olderMessages = await normaliseMessages(result, priceMode);
         if (olderMessages.length > 0) {
           // Prepend older messages to the beginning
           setMessages((prev) => {
@@ -686,7 +645,7 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
         isPaginatingRef.current = false;
 
         const fresh = await fetchInitialMessages(apiUrl, undefined, priceMode);
-        const normalised = normaliseMessages(fresh).reverse();
+        const normalised = (await normaliseMessages(fresh, priceMode)).reverse();
         if (normalised.length === 0) {
           const initialAssistant: ChatMessage = {
             id: "",

package/src/components/LazyProductsFetcher.tsx

@@ -27,7 +27,7 @@ const LazyProductsFetcher: React.FC<LazyProductsFetcherProps> = ({
     fetchedRef.current = true;
     (async () => {
       try {
-        const result = await getProducts(payload, priceMode as string);
+        const result = await getProducts(payload);
         onFetched(messageId, result);
       } catch (e) {
         // eslint-disable-next-line no-console

package/src/components/ProductsListView.tsx

@@ -51,7 +51,7 @@ interface TokenConfig {
   items?: TokenConfig[];
 }
 
-const DIAMOND_TOKENS: TokenConfig[] = [
+const DIAMOND_TOKENS_MOBILE_WEB: TokenConfig[] = [
   // Row 1: Basic specs
   { type: "field", field: "shape_long", style: "primary" },
   {
@@ -120,6 +120,73 @@ const DIAMOND_TOKENS: TokenConfig[] = [
   },
 ];
 
+const DIAMOND_TOKENS_TABLET: TokenConfig[] = [
+  // Row 1: Basic specs
+  { type: "field", field: "shape_long", style: "primary" },
+  {
+    type: "fieldWithSuffix",
+    field: "size",
+    style: "secondary",
+    suffix: "ct",
+    showCurrencyIf: "price_per_carat",
+  },
+  { type: "field", field: "color", style: "primary" },
+  { type: "field", field: "clarity_short", style: "primary" },
+  { type: "separator" },
+  {
+    type: "group",
+    items: [
+      { type: "field", field: "cut_short", style: "primary" },
+      { type: "field", field: "polish_short", style: "primary", prefix: "/" },
+      { type: "field", field: "symmetry_short", style: "primary", prefix: "/" },
+    ],
+  },
+  { type: "separator" },
+  { type: "field", field: "fluorescence_intensity_short", style: "primary" },
+  { type: "separator" },
+  { type: "field", field: "lab_short", style: "primary" },
+  { type: "separator" },
+  {
+    type: "field",
+    field: "depth_percent",
+    style: "secondary",
+    prefixStyle: "primary",
+    prefix: "D",
+    format: "percent",
+  },
+  { type: "separator" },
+  {
+    type: "field",
+    field: "table_percent",
+    style: "secondary",
+    prefixStyle: "primary",
+    prefix: "T",
+    format: "percent",
+  },
+  { type: "separator" },
+  { type: "field", field: "measurement", style: "secondary" },
+  { type: "separator" },  {
+    type: "field",
+    field: "discount_percent",
+    style: "secondary",
+    format: "percent",
+  },
+  // Row 2: Measurements & Pricing
+  { type: "lineBreak" },
+  {
+    type: "priceField",
+    field: "price_per_carat",
+    style: "secondary",
+    suffixStyle: "primary",
+    suffix: "PC",
+  },
+  {
+    type: "priceField",
+    field: "total_sales_price",
+    style: "secondary",
+    prefix: " =",
+  },
+];
 interface ProductsListViewProps {
   data: any[];
   totalResults?: number;
@@ -224,7 +291,10 @@ const ProductsListViewComponent: React.FC<ProductsListViewProps> = ({
   const theme = useTheme();
   const [userCurrency, setUserCurrency] = useState<string | null>(null);
   const [shouldRound, setShouldRound] = useState<boolean>(false);
-
+  const isTablet = theme.isTablet;  
+  const DIAMOND_TOKENS = isTablet
+    ? DIAMOND_TOKENS_TABLET
+    : DIAMOND_TOKENS_MOBILE_WEB;
   useEffect(() => {
     const fetchCurrency = async () => {
       const currency = await getUserCurrencySymbol();
@@ -314,7 +384,7 @@ const TextStyleTwo = styled.Text<{ theme: DefaultTheme }>`
   font-size: 13px;
   color: ${({ theme }: { theme: DefaultTheme }) =>
     theme["core-05"] || "#020001"};
-  font-weight: 500;
+  font-weight: 800;
   font-family: "Roboto";
   font-style: normal;
 `;

package/src/components/utils.ts

@@ -196,6 +196,116 @@ export const useDeviceType = () => {
   return { isMobile, isTablet, isDesktop, isLargeScreen };
 };
 
+export const renderSearchParams = ({searchPayload, priceMode, vdbSetting, searchResultViewType}: any) => {
+  if (
+    searchPayload?.cut_from ||
+    searchPayload?.cut_to ||
+    searchPayload?.polish_from ||
+    searchPayload?.polish_to ||
+    searchPayload?.symmetry_from ||
+    searchPayload?.symmetry_to
+  ) {
+    searchPayload.cutGrades = [];
+    searchPayload.polishes = [];
+    searchPayload.symmetries = [];
+    if (!searchPayload?.shapes) {
+      searchPayload.shapes = [];
+    }
+  }
+  if (searchPayload?.cut_from) {
+    searchPayload.cutGrades.push(searchPayload?.cut_from);
+  }
+  if (searchPayload?.cut_to) {
+    searchPayload.cutGrades.push(searchPayload?.cut_to);
+  }
+  if (searchPayload?.polish_from) {
+    searchPayload.polishes.push(searchPayload?.polish_from);
+  }
+  if (searchPayload?.polish_to) {
+    searchPayload.polishes.push(searchPayload?.polish_to);
+  }
+  if (searchPayload?.symmetry_from) {
+    searchPayload.symmetries.push(searchPayload?.symmetry_from);
+  }
+  if (searchPayload?.symmetry_to) {
+    searchPayload.symmetries.push(searchPayload?.symmetry_to);
+  }
+  if (searchPayload?.three_x) {
+    if(searchPayload.lab_grown) {
+      searchPayload.cutGrades = ["Excellent", "8X"];
+      searchPayload.polishes = ["Excellent", "8X"];
+      searchPayload.symmetries = ["Excellent", "8X"];
+      searchPayload.cps_three_x_options = ["8X", "Excellent"];
+      searchPayload.cut_from = "Excellent";
+      searchPayload.cut_to = "8X";
+      searchPayload.polish_from = "Excellent";
+      searchPayload.polish_to = "8X";
+      searchPayload.symmetry_from = "Excellent";
+      searchPayload.symmetry_to = "8X";
+    } else {
+      searchPayload.cutGrades = ["Excellent", "Excellent"];
+      searchPayload.polishes = ["Excellent", "Excellent"];
+      searchPayload.symmetries = ["Excellent", "Excellent"];
+      searchPayload.cut_from = "Excellent";
+      searchPayload.cut_to = "Excellent";
+      searchPayload.polish_from = "Excellent";
+      searchPayload.polish_to = "Excellent";
+      searchPayload.symmetry_from = "Excellent";
+      searchPayload.symmetry_to = "Excellent";
+    }
+    delete searchPayload.three_x;
+  }
+  if(searchPayload?.three_vg_plus && searchPayload.lab_grown) {
+    searchPayload.cutGrades = ["Very Good", "8X"];
+    searchPayload.polishes = ["Very Good", "8X"];
+    searchPayload.symmetries = ["Very Good", "8X"];
+    searchPayload.cut_from = "Very Good";
+    searchPayload.cut_to = "8X";
+    searchPayload.polish_from = "Very Good";
+    searchPayload.polish_to = "8X";
+    searchPayload.symmetry_from = "Very Good";
+    searchPayload.symmetry_to = "8X";
+    searchPayload.cps_three_vg_plus_options = ["8X", "Very Good"];
+  }
+  if(searchPayload?.eight_x && searchPayload.lab_grown) {
+    searchPayload.cutGrades = ["8X", "8X"];
+    searchPayload.polishes = ["8X", "8X"];
+    searchPayload.symmetries = ["8X", "8X"];
+    searchPayload.cut_from = "8X";
+    searchPayload.cut_to = "8X";
+    searchPayload.polish_from = "8X";
+    searchPayload.polish_to = "8X";
+    searchPayload.symmetry_from = "8X";
+    searchPayload.symmetry_to = "8X";
+  }
+  if(searchPayload?.page_size) {
+    delete searchPayload.page_size;
+  }
+  searchPayload.price_mode = priceMode;
+  searchPayload.vdb_setting =vdbSetting ? "true" : "false";
+  searchPayload.results_view_type = searchResultViewType || "grid";
+  searchPayload.featured = searchPayload.featured || "false";
+  searchPayload.pair = searchPayload.pair === "pair" ? "pair" : "other";
+  searchPayload.with_available_items = !!searchPayload.with_available_items;
+  if(searchPayload.page_number) {
+    delete searchPayload.page_number;
+  }
+  searchPayload.preference = searchPayload.preference || [];
+  searchPayload.depth_percent_from = searchPayload.depth_percent_from ?? "0";
+  searchPayload.depth_percent_to = searchPayload.depth_percent_to ?? "100";
+  searchPayload.table_percent_from = searchPayload.table_percent_from ?? "0";
+  searchPayload.table_percent_to = searchPayload.table_percent_to ?? "100";
+
+  if(searchPayload.price_total_from || searchPayload.price_total_to) {
+    searchPayload.total_or_price_per_carat = "total_sales_price"
+  }
+
+  if(searchPayload.price_per_carat_from || searchPayload.price_per_carat_to) {
+    searchPayload.total_or_price_per_carat = "price_per_carat"
+  }  
+  return searchPayload;
+}
+
 export const generateSavedSearchName = (search_params: any) => {
   let options: { [k: string]: any } = {};
   let title_parts = [];