vdb-ai-chat 1.0.14 → 1.0.16

package/lib/typescript/api.d.ts

@@ -2,7 +2,19 @@ import { FeedbackAction } from "./components/utils";
 import type { ChatMessage } from "./types";
 export type ChatApiParams = Record<string, any>;
 export declare function normaliseMessages(raw: any): ChatMessage[];
+export interface PaginatedMessagesResponse {
+    messages: any[];
+    conversation_id?: string | number;
+    has_more?: boolean;
+    next_cursor?: string | number;
+    total_count?: number;
+}
 export declare function fetchInitialMessages(apiUrl: string, _params?: ChatApiParams, priceMode?: string | null): Promise<any>;
+/**
+ * Fetches older messages for pagination when user scrolls to top.
+ * Uses cursor-based pagination if available, falls back to page number.
+ */
+export declare function fetchOlderMessages(apiUrl: string, priceMode: string | null, cursor?: string | number, pageNumber?: number): Promise<PaginatedMessagesResponse>;
 export declare function sendUserMessage(apiUrl: string, userMessage: string, _params: ChatApiParams, _history: ChatMessage[], priceMode: any): Promise<any>;
 export declare function clearChatHistory(apiUrl: string, priceMode: any): Promise<void>;
 export declare function getProducts(params: ChatApiParams, priceMode: string | null): Promise<any>;

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,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,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,CA6Cd;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,CA6Fd;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,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"}

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;AAef,OAAO,KAAK,EAAe,eAAe,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AA2B5E,eAAO,MAAM,UAAU,uFA2yBtB,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,uFAk7BtB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"MessageBubble.d.ts","sourceRoot":"","sources":["../../../src/components/MessageBubble.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;AAGpC,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAMvD,UAAU,KAAK;IACb,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAChD,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IACjD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAmDD,eAAO,MAAM,aAAa,mCAA+B,CAAC"}
+{"version":3,"file":"MessageBubble.d.ts","sourceRoot":"","sources":["../../../src/components/MessageBubble.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;AAGpC,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAOvD,UAAU,KAAK;IACb,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAChD,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IACjD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA6DD,eAAO,MAAM,aAAa,mCAA+B,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;AAsHzD,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;AA0PD,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;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"}

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

@@ -1 +1 @@
-{"version":3,"file":"SuggestionsRow.d.ts","sourceRoot":"","sources":["../../../src/components/SuggestionsRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;AAYpC,UAAU,mBAAmB;IAC3B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,uFAAuF;IACvF,OAAO,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;CAChC;AAkGD,QAAA,MAAM,cAAc,iDAAgC,CAAC;AACrD,eAAe,cAAc,CAAC"}
+{"version":3,"file":"SuggestionsRow.d.ts","sourceRoot":"","sources":["../../../src/components/SuggestionsRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;AAMpC,UAAU,mBAAmB;IAC3B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,uFAAuF;IACvF,OAAO,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;CAChC;AAkGD,QAAA,MAAM,cAAc,iDAAgC,CAAC;AACrD,eAAe,cAAc,CAAC"}

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

@@ -43,4 +43,10 @@ export declare const useDeviceType: () => {
     isDesktop: boolean;
     isLargeScreen: boolean;
 };
+export declare const generateSavedSearchName: (search_params: any) => {
+    title: string;
+    options: {
+        [k: string]: any;
+    };
+};
 //# sourceMappingURL=utils.d.ts.map

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;AAGF,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,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,UAiB7E;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"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vdb-ai-chat",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "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

@@ -92,6 +92,14 @@ export function normaliseMessages(raw: any): ChatMessage[] {
   }));
 }
 
+export interface PaginatedMessagesResponse {
+  messages: any[];
+  conversation_id?: string | number;
+  has_more?: boolean;
+  next_cursor?: string | number;
+  total_count?: number;
+}
+
 export async function fetchInitialMessages(
   apiUrl: string,
   _params?: ChatApiParams,
@@ -133,6 +141,59 @@ export async function fetchInitialMessages(
   return data;
 }
 
+/**
+ * Fetches older messages for pagination when user scrolls to top.
+ * Uses cursor-based pagination if available, falls back to page number.
+ */
+export async function fetchOlderMessages(
+  apiUrl: string,
+  priceMode: string | null,
+  cursor?: string | number,
+  pageNumber?: number
+): Promise<PaginatedMessagesResponse> {
+  const conversations = await getValidConversations();
+  const storedId = conversations?.[priceMode ?? ""]?.conversation_id ?? null;
+
+  if (!storedId) {
+    return { messages: [], has_more: false };
+  }
+
+  const body: any = {
+    conversation_id: Number.isNaN(Number(storedId))
+      ? storedId
+      : Number(storedId),
+    fetch_history: true,
+  };
+
+  // Support both cursor-based and page-based pagination
+  if (cursor !== undefined) {
+    body.cursor = cursor;
+  }
+  if (pageNumber !== undefined) {
+    body.page = pageNumber;
+  }
+
+  const res = await fetch(apiUrl, {
+    method: "POST",
+    headers: await buildHeaders(),
+    body: JSON.stringify(body),
+  });
+
+  if (!res.ok) {
+    throw new Error(`POST ${apiUrl} failed with ${res.status}`);
+  }
+
+  const data = await res.json();
+
+  return {
+    messages: data.messages || [],
+    conversation_id: data.conversation_id,
+    has_more: data.has_more ?? false,
+    next_cursor: data.next_cursor,
+    total_count: data.total_count,
+  };
+}
+
 export async function sendUserMessage(
   apiUrl: string,
   userMessage: string,
@@ -149,10 +210,6 @@ export async function sendUserMessage(
   }
 
   const external_context = await Storage.getJSON<string>("external_context");
-  if(external_context) {
-    await Storage.removeItem("external_context");
-  }
-
   const body: any = {
     query: userMessage,
     external_context: external_context || null,
@@ -217,7 +274,12 @@ 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 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(
@@ -242,11 +304,11 @@ export async function getProducts(
       vdbSetting = true;
       mGroupIds = mGroupIds.filter((groupId: number) => groupId !== 0);
     }
-  } else if(!mGroupIds || mGroupIds.length === 0) {
+  } else if (!mGroupIds || mGroupIds.length === 0) {
     vdbSetting = true;
   }
 
-  if(params.three_x) {
+  if (params.three_x) {
     delete params.three_x;
   }
 

package/src/components/ChatWidget.tsx

@@ -17,6 +17,7 @@ import {
   Keyboard,
   DeviceEventEmitter,
   Platform,
+  ActivityIndicator,
 } from "react-native";
 import { ChatInput } from "./ChatInput";
 import { MessageBubble } from "./MessageBubble";
@@ -26,6 +27,7 @@ import { mergeTheme } from "../theme";
 import {
   ChatApiParams,
   fetchInitialMessages,
+  fetchOlderMessages,
   getProducts,
   handleFeedbackActionApi,
   normaliseMessages,
@@ -75,8 +77,6 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
     );
     const [typingMessageId, setTypingMessageId] = useState<string | null>(null);
     const [typingFullText, setTypingFullText] = useState<string>("");
-    const [scrollY, setScrollY] = useState(0);
-    const [autoScroll, setAutoScroll] = useState(true);
     const [productsByMsg, setProductsByMsg] = useState<Record<string, any>>({});
     const [reloadLoadingIds, setReloadLoadingIds] = useState<Set<string>>(
       new Set()
@@ -85,8 +85,21 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
       priceModeProp || null
     );
     const [userToken, setUserToken] = useState<string>(userTokenProp || "");
+    // Pagination state
+    const [loadingOlder, setLoadingOlder] = useState(false);
+    const [hasMoreMessages, setHasMoreMessages] = useState(true);
+    const [nextCursor, setNextCursor] = useState<string | number | undefined>(
+      undefined
+    );
+    const [currentPage, setCurrentPage] = useState(1);
     const scrollRef = useRef<ScrollView | null>(null);
     const inputRef = useRef<TextInput | null>(null);
+    // Scroll management refs - using refs instead of state to avoid re-renders
+    const scrollYRef = useRef(0);
+    const contentHeightRef = useRef(0);
+    const isUserScrollingRef = useRef(false);
+    const isPaginatingRef = useRef(false);
+    const initialScrollDoneRef = useRef(false);
     const themeProps = useMemo(
       () => mergeTheme(themeOverrides),
       [themeOverrides]
@@ -123,17 +136,24 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
         if (activeProductType) {
           await Storage.setJSON("external_context", activeProductType);
         }
-      }
+      };
       setActiveProduct();
     }, [activeProductType]);
 
     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) {
+      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) {
+        if (!searchPayload?.shapes) {
           searchPayload.shapes = [];
         }
       }
@@ -155,14 +175,19 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
       if (searchPayload?.symmetry_to) {
         searchPayload.symmetries.push(searchPayload?.symmetry_to);
       }
-      if(searchPayload?.three_x) {
+      if (searchPayload?.three_x) {
         delete searchPayload.three_x;
       }
 
       const stringifiedSearchPayload = JSON.stringify(searchPayload);
       const payload = item?.search_payload;
       if (!payload) return;
-      const isLabgrown = (typeof payload.lab_grown === "string" ? payload.lab_grown === "true" : typeof payload.lab_grown === "boolean" ? payload.lab_grown : false);
+      const isLabgrown =
+        typeof payload.lab_grown === "string"
+          ? payload.lab_grown === "true"
+          : typeof payload.lab_grown === "boolean"
+          ? payload.lab_grown
+          : false;
       const domain = apiUrl.split("v3");
       const deepLinkUrl = `${domain[0]}webapp/${
         isLabgrown ? "lab-grown-diamonds" : "natural-diamonds"
@@ -258,11 +283,23 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
           );
           if (!cancelled) {
             const normalised = normaliseMessages(initial).reverse();
+            // Capture pagination info from initial response
+            if (initial?.has_more !== undefined) {
+              setHasMoreMessages(initial.has_more);
+            }
+            if (initial?.next_cursor !== undefined) {
+              setNextCursor(initial.next_cursor);
+            }
+
+            // Reset scroll tracking for fresh load
+            initialScrollDoneRef.current = false;
+            isUserScrollingRef.current = false;
+
             if (normalised.length === 0) {
               const initialAssistant: ChatMessage = {
                 id: "",
                 role: "assistant",
-                text: "Describe the diamond you’re looking for — for example, “2ct F VS2 under $10,000” or “1–2ct D–F VS pear” — and I’ll take it from there.",
+                text: 'Describe the diamond you\'re looking for — for example, "2ct F VS2 under $10,000" or "1–2ct D–F VS pear" — and I\'ll take it from there.',
                 createdAt: Date.now(),
                 isLoading: false,
                 suggestions: [],
@@ -270,15 +307,11 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
                 reaction: "0",
               };
               setMessages([initialAssistant]);
-              setTimeout(() => {
-                scrollRef.current?.scrollToEnd({ animated: false });
-              }, 0);
+              setHasMoreMessages(false);
             } else {
               setMessages(normalised);
-              setTimeout(() => {
-                scrollRef.current?.scrollToEnd({ animated: false });
-              }, 0);
             }
+            // onContentSizeChange will handle scrollToEnd
           }
         } catch (error) {
           console.error("Failed to fetch initial messages", error);
@@ -298,14 +331,16 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
       async (rawText: string) => {
         const trimmed = rawText.trim();
         if (!trimmed || loading) return;
-        const external_context = await Storage.getJSON<string>("external_context");
+        const external_context = await Storage.getJSON<string>(
+          "external_context"
+        );
 
         const userMessage: ChatMessage = {
           id: `user-${Date.now()}`,
           role: "user",
           text: trimmed,
           createdAt: Date.now(),
-          external_context: external_context || null
+          external_context: external_context || null,
         };
 
         const loadingId = `bot-loading-${Date.now()}`;
@@ -496,6 +531,71 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
       }
     }, []);
 
+    // Load older messages when user scrolls to top
+    const loadOlderMessages = useCallback(async () => {
+      if (loadingOlder || !hasMoreMessages || !hasAuth) return;
+
+      // Mark that we're paginating - this prevents auto-scroll to bottom
+      isPaginatingRef.current = true;
+      const prevHeight = contentHeightRef.current;
+      setLoadingOlder(true);
+
+      try {
+        const result = await fetchOlderMessages(
+          apiUrl,
+          priceMode,
+          nextCursor,
+          currentPage + 1
+        );
+
+        const olderMessages = normaliseMessages(result);
+        if (olderMessages.length > 0) {
+          // Prepend older messages to the beginning
+          setMessages((prev) => {
+            // Filter out duplicates by id
+            const existingIds = new Set(prev.map((m) => m.id));
+            const newMessages = olderMessages.filter(
+              (m) => !existingIds.has(m.id)
+            );
+            return [...newMessages, ...prev];
+          });
+          setCurrentPage((prev) => prev + 1);
+
+          // After state update, adjust scroll to maintain position
+          // Use requestAnimationFrame to wait for layout
+          requestAnimationFrame(() => {
+            const newHeight = contentHeightRef.current;
+            const heightDiff = newHeight - prevHeight;
+            if (heightDiff > 0 && scrollRef.current) {
+              scrollRef.current.scrollTo({
+                y: scrollYRef.current + heightDiff,
+                animated: false,
+              });
+            }
+            isPaginatingRef.current = false;
+          });
+        } else {
+          isPaginatingRef.current = false;
+        }
+
+        setHasMoreMessages(result.has_more ?? olderMessages.length > 0);
+        setNextCursor(result.next_cursor);
+      } catch (e) {
+        console.error("Failed to load older messages", e);
+        isPaginatingRef.current = false;
+      } finally {
+        setLoadingOlder(false);
+      }
+    }, [
+      loadingOlder,
+      hasMoreMessages,
+      hasAuth,
+      apiUrl,
+      priceMode,
+      nextCursor,
+      currentPage,
+    ]);
+
     useEffect(() => {
       const scrollToBottom = () => {
         setTimeout(() => {
@@ -505,8 +605,10 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
         }, 100);
       };
 
-      const showEvent = Platform.OS === "ios" ? "keyboardWillShow" : "keyboardDidShow";
-      const hideEvent = Platform.OS === "ios" ? "keyboardWillHide" : "keyboardDidHide";
+      const showEvent =
+        Platform.OS === "ios" ? "keyboardWillShow" : "keyboardDidShow";
+      const hideEvent =
+        Platform.OS === "ios" ? "keyboardWillHide" : "keyboardDidHide";
 
       const subShow = Keyboard.addListener(showEvent, scrollToBottom);
       const subHide = Keyboard.addListener(hideEvent, scrollToBottom);
@@ -574,6 +676,14 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
         setLoadingMessageId(null);
         setTypingMessageId(null);
         setTypingFullText("");
+        // Reset pagination state
+        setHasMoreMessages(true);
+        setNextCursor(undefined);
+        setCurrentPage(1);
+        // Reset scroll tracking
+        initialScrollDoneRef.current = false;
+        isUserScrollingRef.current = false;
+        isPaginatingRef.current = false;
 
         const fresh = await fetchInitialMessages(apiUrl, undefined, priceMode);
         const normalised = normaliseMessages(fresh).reverse();
@@ -581,7 +691,7 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
           const initialAssistant: ChatMessage = {
             id: "",
             role: "assistant",
-            text: "Describe the diamond you’re looking for — for example, “2ct F VS2 under $10,000” or “1–2ct D–F VS pear” — and I’ll take it from there.",
+            text: 'Describe the diamond you\'re looking for — for example, "2ct F VS2 under $10,000" or "1–2ct D–F VS pear" — and I\'ll take it from there.',
             createdAt: Date.now(),
             isLoading: false,
             suggestions: [],
@@ -592,9 +702,7 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
         } else {
           setMessages(normalised);
         }
-        setTimeout(() => {
-          scrollRef.current?.scrollToEnd({ animated: false });
-        }, 500);
+        // onContentSizeChange will handle scrollToEnd
         onClearChat?.();
       } catch (err) {
         console.error("Failed to clear chat", err);
@@ -698,12 +806,22 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
               onScroll={(e) => {
                 const { contentOffset, contentSize, layoutMeasurement } =
                   e.nativeEvent;
-                setScrollY(contentOffset.y);
+                scrollYRef.current = contentOffset.y;
                 const distanceFromBottom =
                   contentSize.height -
                   (layoutMeasurement.height + contentOffset.y);
-                // Enable auto-scroll when user is near the bottom; disable when scrolled up
-                setAutoScroll(distanceFromBottom < 48);
+                // Track if user has scrolled away from bottom
+                isUserScrollingRef.current = distanceFromBottom > 100;
+
+                // Load older messages when scrolled near the top (within 50px)
+                if (
+                  contentOffset.y < 50 &&
+                  hasMoreMessages &&
+                  !loadingOlder &&
+                  !isPaginatingRef.current
+                ) {
+                  loadOlderMessages();
+                }
               }}
               scrollEventThrottle={16}
               style={
@@ -726,12 +844,38 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
                   ? { maxWidth: 608, alignSelf: "center", width: "100%" }
                   : {}),
               }}
-              onContentSizeChange={() => {
-                if (autoScroll) {
+              onContentSizeChange={(_width, height) => {
+                contentHeightRef.current = height;
+
+                // Skip auto-scroll during pagination - scroll is handled in loadOlderMessages
+                if (isPaginatingRef.current || loadingOlder) {
+                  return;
+                }
+
+                // Only auto-scroll to bottom if:
+                // 1. Initial scroll hasn't been done yet, OR
+                // 2. User is near the bottom (not scrolled up to view history)
+                if (!initialScrollDoneRef.current) {
+                  scrollRef.current?.scrollToEnd({ animated: false });
+                  initialScrollDoneRef.current = true;
+                } else if (!isUserScrollingRef.current) {
+                  // User is near bottom, auto-scroll for new messages
                   scrollRef.current?.scrollToEnd({ animated: false });
                 }
               }}
             >
+              {/* Loading indicator for pagination */}
+              {loadingOlder && (
+                <LoadingOlderContainer>
+                  <ActivityIndicator
+                    size="small"
+                    color={theme["core-06"] || "#4F4E57"}
+                  />
+                  <LoadingOlderText theme={theme}>
+                    Loading older messages...
+                  </LoadingOlderText>
+                </LoadingOlderContainer>
+              )}
               {messages?.[0]?.createdAt && (
                 <EmptyContainer theme={theme}>
                   <EmptyText theme={theme}>
@@ -787,15 +931,7 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
                               const diamonds = result?.response?.body?.diamonds;
                               const hasAny =
                                 Array.isArray(diamonds) && diamonds.length > 0;
-                              if (hasAny) {
-                                try {
-                                  scrollRef.current?.scrollTo({
-                                    x: 0,
-                                    y: scrollY + 120,
-                                    animated: true,
-                                  });
-                                } catch (_) {}
-                              } else {
+                              if (!hasAny) {
                                 setMessages((prev) =>
                                   prev.map((msg) =>
                                     msg.id === id
@@ -809,6 +945,7 @@ export const ChatWidget = forwardRef<ChatWidgetRef, ChatWidgetProps>(
                                   )
                                 );
                               }
+                              // Let onContentSizeChange handle scrolling naturally
                             }}
                           />
                         )}
@@ -908,6 +1045,20 @@ const LineView = styled.View<{ theme: DefaultTheme }>`
   border-top-width: 1;
 `;
 
+const LoadingOlderContainer = styled.View`
+  padding: 12px;
+  align-items: center;
+  justify-content: center;
+  flex-direction: row;
+  gap: 8px;
+`;
+
+const LoadingOlderText = styled.Text<{ theme: DefaultTheme }>`
+  font-size: 12px;
+  color: ${({ theme }: { theme: DefaultTheme }) =>
+    theme["core-06"] || "#4F4E57"};
+`;
+
 const styles = StyleSheet.create({
   listContent: {
     paddingVertical: 8,

package/src/components/MessageBubble.tsx

@@ -6,6 +6,7 @@ import { useTheme } from "styled-components/native";
 import styled from "styled-components/native";
 import { DefaultTheme } from "styled-components/native";
 import { css } from "styled-components/native";
+import { generateSavedSearchName } from "./utils";
 
 interface Props {
   message: ChatMessage;
@@ -34,17 +35,27 @@ const MessageBubbleComponent: React.FC<Props> = ({
 }) => {
   const isUser = message.role === "user";
   const theme = useTheme();
+  const isLabgrown =
+    typeof message?.search_payload?.lab_grown === "string"
+      ? message?.search_payload?.lab_grown === "true"
+      : typeof message?.search_payload?.lab_grown === "boolean"
+      ? message?.search_payload?.lab_grown
+      : false;
+
   return (
     <Container theme={theme} userTheme={userTheme} isUser={isUser}>
       <BubbleContainer theme={theme} userTheme={userTheme} isUser={isUser}>
         <MessageText isUser={isUser} userTheme={userTheme} theme={theme}>
-          {message.text || ""}
+          {!(message.role === "assistant" && hasResults) &&
+            (message.text || "")}
           {message.role === "assistant" &&
           hasResults &&
           typeof totalResults === "number"
-            ? ` Found ${Number(
-                totalResults
-              ).toLocaleString()} diamonds (showing first ${shownResults})`
+            ? `Found ${Number(totalResults).toLocaleString()} ${
+                isLabgrown ? "Lab-Grown" : "Natural"
+              } Diamond matches for ${
+                generateSavedSearchName(message.search_payload)?.title
+              } (showing first ${shownResults})`
             : null}
         </MessageText>
         {message.role === "assistant" &&