.commandcode/settings.json

@@ -1,10 +1,7 @@
 {
   "permissions": {
     "allow": [
-      "Shell(npx tsc --noEmit --skipLibCheck src/trpc/apis/common-apis/common.ts 2 >& 1)",
-      "Shell(npx tsc --noEmit 2 >& 1)",
-      "Shell(grep:*)",
-      "Shell(npx tsc --noEmit -p packages/shared/tsconfig.json 2 >& 1)"
+      "Shell(npx tsc --noEmit --skipLibCheck src/trpc/apis/common-apis/common.ts 2 >& 1)"
     ],
     "deny": [],
     "defaultMode": "default"

apps/admin-ui/app/(drawer)/manage-orders/order-details/[id].tsx

@@ -463,8 +463,8 @@ export default function OrderDetails() {
                    {item.name}
                  </MyText>
                  <MyText style={tw`text-xs text-gray-500`}>
-                    {Number(item.quantity)} x {item.productSize}{item.unit} × ₹{item.price}
-                  </MyText>
+                   {Number(item.quantity) * item.productSize} {item.unit} × ₹{item.price}
+                 </MyText>
                  <View style={tw`flex-row items-center mt-2 gap-3`}>
                    <TouchableOpacity
                      style={tw`flex-row items-center`}

apps/admin-ui/app/(drawer)/manage-orders/orders/index.tsx

@@ -413,7 +413,7 @@ const OrderItem = ({ order, refetch }: { order: OrderType; refetch: () => void }
               <View key={idx} style={tw`py-2 border-b border-gray-50 last:border-0`}>
                 <View style={tw`flex-row items-center`}>
                   <View style={tw`bg-gray-100 px-2 py-1 rounded items-center justify-center mr-2`}>
-                    <MyText style={tw`text-xs font-bold text-gray-600`}>{item.quantity} x {item.productSize}{item.unit}</MyText>
+                    <MyText style={tw`text-xs font-bold text-gray-600`}>{item.quantity * item.productSize } {item.unit}</MyText>
                   </View>
                   <MyText style={tw`text-sm text-gray-800 flex-1`} numberOfLines={1} ellipsizeMode="tail">
                     {item.name.length > 30 ? `${item.name.substring(0, 30)}...` : item.name}

apps/admin-ui/app/(drawer)/prices-overview/index.tsx

@@ -402,6 +402,15 @@ export default function PricesOverview() {
             />
           </View>
 
+          <View style={tw`mb-4`}>
+            <MyText style={tw`text-sm font-medium mb-1`}>Size</MyText>
+            <TextInput
+              style={tw`border border-gray-300 rounded-md px-3 py-2`}
+              keyboardType="decimal-pad"
+              placeholder="Enter size"
+            />
+          </View>
+
           <TouchableOpacity
             style={tw`bg-blue-600 py-3 rounded-md items-center`}
             onPress={saveEditDialog}

apps/admin-ui/app/(drawer)/product-tags/_layout.tsx

@@ -6,7 +6,6 @@ export default function Layout() {
       <Stack.Screen name="index" options={{ title: "Product Tags" }} />
       <Stack.Screen name="add" options={{ title: "Add Tag" }} />
       <Stack.Screen name="edit/index" options={{ title: "Edit Tag" }} />
-      <Stack.Screen name="order" options={{ title: "Tag Orders" }} />
     </Stack>
   );
 }

apps/admin-ui/app/(drawer)/product-tags/add.tsx

@@ -11,7 +11,6 @@ interface TagFormData {
   tagDescription: string;
   isDashboardTag: boolean;
   relatedStores: number[];
-  productIds: number[];
 }
 
 export default function AddTag() {
@@ -46,7 +45,6 @@ export default function AddTag() {
         imageUrl,
         isDashboardTag: values.isDashboardTag,
         relatedStores: values.relatedStores,
-        productIds: values.productIds,
         uploadUrls,
       })
 
@@ -68,7 +66,6 @@ export default function AddTag() {
     tagDescription: '',
     isDashboardTag: false,
     relatedStores: [],
-    productIds: [],
   };
 
   return (

apps/admin-ui/app/(drawer)/product-tags/edit/index.tsx

@@ -11,7 +11,6 @@ interface TagFormData {
   tagDescription: string;
   isDashboardTag: boolean;
   relatedStores: number[];
-  productIds: number[];
   existingImageUrl?: string;
 }
 
@@ -59,7 +58,6 @@ export default function EditTag() {
         imageUrl,
         isDashboardTag: values.isDashboardTag,
         relatedStores: values.relatedStores,
-        productIds: values.productIds,
         uploadUrls,
       })
 
@@ -97,16 +95,11 @@ export default function EditTag() {
   }
 
   const tag = tagData.tag;
-  const tagProductIds = tag.productIds || (tag.products || []).map((p: any) => p.productId);
-  // Order by the saved sortOrder (fall back to the join order if empty).
-  const orderedProductIds = (tag.sortOrder || []).filter((id: number) => tagProductIds.includes(id));
-  const remainingProductIds = tagProductIds.filter((id: number) => !orderedProductIds.includes(id));
   const initialValues: TagFormData = {
     tagName: tag.tagName,
     tagDescription: tag.tagDescription || '',
     isDashboardTag: tag.isDashboardTag,
     relatedStores: Array.isArray(tag.relatedStores) ? tag.relatedStores : [],
-    productIds: [...orderedProductIds, ...remainingProductIds],
     existingImageUrl: tag.imageUrl || undefined,
   };
 

apps/admin-ui/app/(drawer)/product-tags/index.tsx

@@ -53,18 +53,11 @@ const TagItem: React.FC<TagItemProps> = ({ item, onDeleteSuccess }) => (
 
 interface TagHeaderProps {
   onAddNewTag: () => void;
-  onOrderTags: () => void;
 }
 
-const TagHeader: React.FC<TagHeaderProps> = ({ onAddNewTag, onOrderTags }) => (
+const TagHeader: React.FC<TagHeaderProps> = ({ onAddNewTag }) => (
   <View style={tw`flex-row justify-between items-center p-4 bg-white border-b border-gray-200`}>
-    <TouchableOpacity
-      onPress={onOrderTags}
-      style={tw`bg-gray-100 px-3 py-2 rounded-lg flex-row items-center`}
-    >
-      <MaterialIcons name="sort" size={18} color="#374151" />
-      <MyText style={tw`text-gray-800 font-medium ml-1.5`}>Tag Orders</MyText>
-    </TouchableOpacity>
+    <MyText style={tw`text-xl font-bold text-gray-800`}>Product Tags</MyText>
     <TouchableOpacity
       onPress={onAddNewTag}
       style={tw`bg-blue-500 px-4 py-2 rounded-lg flex-row items-center`}
@@ -98,10 +91,6 @@ export default function ProductTags() {
     router.push('/product-tags/add');
   };
 
-  const handleOrderTags = () => {
-    router.push('/product-tags/order');
-  };
-
 
 
   if (isLoading) {
@@ -138,7 +127,7 @@ export default function ProductTags() {
         refreshControl={
           <RefreshControl refreshing={refreshing} onRefresh={handleRefresh} />
         }
-        ListHeaderComponent={<TagHeader onAddNewTag={handleAddNewTag} onOrderTags={handleOrderTags} />}
+        ListHeaderComponent={<TagHeader onAddNewTag={handleAddNewTag} />}
         contentContainerStyle={tw`pb-4`}
         ListEmptyComponent={
           <View style={tw`flex-1 justify-center items-center py-12`}>

apps/admin-ui/app/(drawer)/product-tags/order.tsx

@@ -1,369 +0,0 @@
-import React, { useState, useEffect, useCallback } from 'react';
-import {
-  View,
-  Alert,
-  ActivityIndicator,
-  Dimensions,
-  StyleSheet,
-} from 'react-native';
-import { TouchableOpacity } from 'react-native-gesture-handler';
-import { Image } from 'expo-image';
-import DraggableFlatList, {
-  ScaleDecorator,
-} from 'react-native-draggable-flatlist';
-import {
-  AppContainer,
-  MyText,
-  tw,
-  MyTouchableOpacity,
-} from 'common-ui';
-import { useRouter } from 'expo-router';
-import { trpc } from '../../../src/trpc-client';
-import MaterialIcons from '@expo/vector-icons/MaterialIcons';
-import { useQueryClient } from '@tanstack/react-query';
-
-const { width: screenWidth } = Dimensions.get('window');
-const itemWidth = screenWidth - 48;
-const itemHeight = 80;
-
-interface Tag {
-  id: number;
-  tagName: string;
-  imageUrl: string | null;
-}
-
-interface TagItemProps {
-  item: Tag;
-  drag: () => void;
-  isActive: boolean;
-}
-
-const TagItem: React.FC<TagItemProps> = ({ item, drag, isActive }) => {
-  return (
-    <ScaleDecorator>
-      <TouchableOpacity
-        onLongPress={drag}
-        activeOpacity={1}
-        style={[
-          styles.item,
-          isActive && styles.activeItem,
-        ]}
-      >
-        {/* Drag Handle */}
-        <View style={styles.dragHandle}>
-          <MaterialIcons
-            name="drag-indicator"
-            size={24}
-            color={isActive ? '#3b82f6' : '#9ca3af'}
-          />
-        </View>
-
-        {/* Tag Image */}
-        {item.imageUrl ? (
-          <Image
-            source={{ uri: item.imageUrl }}
-            style={styles.image}
-            contentFit="cover"
-          />
-        ) : (
-          <View style={styles.placeholderImage}>
-            <MaterialIcons name="label" size={24} color="#9ca3af" />
-          </View>
-        )}
-
-        {/* Tag Info */}
-        <View style={styles.info}>
-          <MyText style={styles.name} numberOfLines={1}>
-            {item.tagName}
-          </MyText>
-        </View>
-      </TouchableOpacity>
-    </ScaleDecorator>
-  );
-};
-
-export default function TagOrders() {
-  const router = useRouter();
-  const queryClient = useQueryClient();
-  const [tags, setTags] = useState<Tag[]>([]);
-  const [hasChanges, setHasChanges] = useState(false);
-
-  // Get current order from constants
-  const { data: constants, isLoading: isLoadingConstants, error: constantsError } = trpc.admin.const.getConstants.useQuery();
-  const { data: tagsData, isLoading: isLoadingTags, error: tagsError } = trpc.admin.product.getProductTags.useQuery();
-  const updateConstants = trpc.admin.const.updateConstants.useMutation();
-
-  // Initialize tags from the tagsOrder constant
-  useEffect(() => {
-    if (tagsData?.tags) {
-      const tagsOrderConstant = constants?.find(c => c.key === 'tagsOrder');
-
-      let orderedIds: number[] = [];
-
-      if (tagsOrderConstant) {
-        const value = tagsOrderConstant.value;
-
-        if (Array.isArray(value)) {
-          orderedIds = value.map((id: any) => parseInt(id));
-        } else if (typeof value === 'string') {
-          orderedIds = value.split(',').map((id: string) => parseInt(id.trim())).filter(id => !isNaN(id));
-        }
-      }
-
-      // Create tag map for quick lookup
-      const tagMap = new Map(tagsData.tags.map(t => [t.id, t]));
-
-      // Sort tags based on order, tags not in order go to end
-      const sortedTags: Tag[] = [];
-
-      // First add tags in the specified order
-      for (const id of orderedIds) {
-        const tag = tagMap.get(id);
-        if (tag) {
-          sortedTags.push({
-            id: tag.id,
-            tagName: tag.tagName,
-            imageUrl: tag.imageUrl || null,
-          });
-          tagMap.delete(id);
-        }
-      }
-
-      // Then add remaining tags (not in order yet)
-      for (const tag of tagMap.values()) {
-        sortedTags.push({
-          id: tag.id,
-          tagName: tag.tagName,
-          imageUrl: tag.imageUrl || null,
-        });
-      }
-
-      setTags(sortedTags);
-    }
-  }, [constants, tagsData]);
-
-  const handleDragEnd = useCallback(({ data }: { data: Tag[] }) => {
-    setTags(data);
-    setHasChanges(true);
-  }, []);
-
-  const renderItem = useCallback(({ item, drag, isActive }: { item: Tag; drag: () => void; isActive: boolean }) => {
-    return (
-      <TagItem
-        item={item}
-        drag={drag}
-        isActive={isActive}
-      />
-    );
-  }, []);
-
-  const handleSave = () => {
-    const tagIds = tags.map(t => t.id);
-
-    updateConstants.mutate(
-      {
-        constants: [{
-          key: 'tagsOrder',
-          value: tagIds
-        }]
-      },
-      {
-        onSuccess: () => {
-          setHasChanges(false);
-          Alert.alert('Success', 'Tag order updated successfully!');
-          queryClient.invalidateQueries({ queryKey: ['const.getConstants'] });
-        },
-        onError: (error) => {
-          Alert.alert('Error', 'Failed to update tag order. Please try again.');
-          console.error('Update tag order error:', error);
-        }
-      }
-    );
-  };
-
-  // Show loading state while data is being fetched
-  if (isLoadingConstants || isLoadingTags) {
-    return (
-      <AppContainer>
-        <View style={tw`flex-1 bg-gray-50`}>
-          <View style={tw`bg-white px-4 py-4 border-b border-gray-200 flex-row items-center justify-between`}>
-            <TouchableOpacity
-              onPress={() => router.back()}
-              style={tw`p-2 -ml-4`}
-            >
-              <MaterialIcons name="chevron-left" size={24} color="#374151" />
-            </TouchableOpacity>
-            <MyText style={tw`text-xl font-bold text-gray-900`}>Tag Orders</MyText>
-            <View style={tw`w-16`} />
-          </View>
-          <View style={tw`flex-1 justify-center items-center p-8`}>
-            <ActivityIndicator size="large" color="#3b82f6" />
-            <MyText style={tw`text-gray-500 mt-4 text-center`}>
-              {isLoadingConstants ? 'Loading order...' : 'Loading tags...'}
-            </MyText>
-          </View>
-        </View>
-      </AppContainer>
-    );
-  }
-
-  // Show error state if queries failed
-  if (constantsError || tagsError) {
-    return (
-      <AppContainer>
-        <View style={tw`flex-1 bg-gray-50`}>
-          <View style={tw`bg-white px-4 py-4 border-b border-gray-200 flex-row items-center justify-between`}>
-            <TouchableOpacity
-              onPress={() => router.back()}
-              style={tw`p-2 -ml-4`}
-            >
-              <MaterialIcons name="chevron-left" size={24} color="#374151" />
-            </TouchableOpacity>
-            <MyText style={tw`text-xl font-bold text-gray-900`}>Tag Orders</MyText>
-            <View style={tw`w-16`} />
-          </View>
-          <View style={tw`flex-1 justify-center items-center p-8`}>
-            <MaterialIcons name="error-outline" size={64} color="#ef4444" />
-            <MyText style={tw`text-gray-900 text-lg font-bold mt-4`}>Error</MyText>
-            <MyText style={tw`text-gray-500 mt-2 text-center`}>
-              {constantsError ? 'Failed to load order' : 'Failed to load tags'}
-            </MyText>
-            <TouchableOpacity
-              onPress={() => router.back()}
-              style={tw`mt-6 bg-blue-600 px-6 py-3 rounded-full`}
-            >
-              <MyText style={tw`text-white font-semibold`}>Go Back</MyText>
-            </TouchableOpacity>
-          </View>
-        </View>
-      </AppContainer>
-    );
-  }
-
-  return (
-    <View style={tw`flex-1 bg-gray-50`}>
-      {/* Header */}
-      <View style={tw`bg-white px-4 py-4 border-b border-gray-200 flex-row items-center justify-between`}>
-        <MyTouchableOpacity
-          onPress={() => router.back()}
-          style={tw`p-2 -ml-4`}
-        >
-          <MaterialIcons name="chevron-left" size={24} color="#374151" />
-        </MyTouchableOpacity>
-
-        <MyText style={tw`text-xl font-bold text-gray-900`}>Tag Orders</MyText>
-
-        <MyTouchableOpacity
-          onPress={handleSave}
-          disabled={!hasChanges || updateConstants.isPending}
-          style={tw`px-4 py-2 rounded-lg ${
-            hasChanges && !updateConstants.isPending
-              ? 'bg-blue-600'
-              : 'bg-gray-300'
-          }`}
-        >
-          <MyText style={tw`${
-            hasChanges && !updateConstants.isPending
-              ? 'text-white'
-              : 'text-gray-500'
-          } font-semibold`}>
-            {updateConstants.isPending ? 'Saving...' : 'Save'}
-          </MyText>
-        </MyTouchableOpacity>
-      </View>
-
-      {/* Content */}
-      {tags.length === 0 ? (
-        <View style={tw`flex-1 justify-center items-center p-8`}>
-          <MaterialIcons name="label-off" size={64} color="#e5e7eb" />
-          <MyText style={tw`text-gray-500 mt-4 text-center text-lg`}>
-            No tags available
-          </MyText>
-        </View>
-      ) : (
-        <View style={tw`flex-1`}>
-          <View style={tw`bg-blue-50 px-4 py-2 mb-2 mt-2 mx-4 rounded-lg`}>
-            <MyText style={tw`text-blue-700 text-xs text-center`}>
-              Long press and drag to reorder • {tags.length} items
-            </MyText>
-          </View>
-
-          <View style={tw`flex-1 px-3`}>
-            <DraggableFlatList
-              data={tags}
-              renderItem={renderItem}
-              keyExtractor={(item) => item.id.toString()}
-              onDragEnd={handleDragEnd}
-              showsVerticalScrollIndicator={true}
-              contentContainerStyle={{ paddingBottom: 20 }}
-              containerStyle={tw`flex-1`}
-              keyboardShouldPersistTaps="handled"
-              activationDistance={10}
-            />
-          </View>
-        </View>
-      )}
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  item: {
-    width: itemWidth,
-    height: 60,
-    backgroundColor: 'white',
-    borderRadius: 8,
-    borderWidth: 1,
-    borderColor: '#e5e7eb',
-    padding: 10,
-    flexDirection: 'row',
-    alignItems: 'center',
-    shadowColor: '#000',
-    shadowOffset: { width: 0, height: 1 },
-    shadowOpacity: 0.1,
-    shadowRadius: 2,
-    elevation: 2,
-    marginVertical: 4,
-  },
-  activeItem: {
-    shadowColor: '#3b82f6',
-    shadowOffset: { width: 0, height: 4 },
-    shadowOpacity: 0.3,
-    shadowRadius: 8,
-    elevation: 8,
-    borderColor: '#3b82f6',
-    transform: [{ scale: 1.02 }],
-  },
-  dragHandle: {
-    marginRight: 8,
-    padding: 2,
-  },
-  image: {
-    width: 30,
-    height: 30,
-    borderRadius: 6,
-    marginRight: 10,
-  },
-  placeholderImage: {
-    width: 30,
-    height: 30,
-    borderRadius: 6,
-    backgroundColor: '#f3f4f6',
-    marginRight: 10,
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-  info: {
-    flex: 1,
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-  },
-  name: {
-    fontSize: 13,
-    color: '#111827',
-    fontWeight: '500',
-    flex: 1,
-    marginRight: 4,
-  },
-});

apps/admin-ui/src/components/TagForm.tsx

@@ -1,14 +1,9 @@
 import React, { useState, useEffect, forwardRef, useCallback } from 'react';
-import { View, TouchableOpacity, StyleSheet } from 'react-native';
+import { View, TouchableOpacity } from 'react-native';
 import { Formik } from 'formik';
 import * as Yup from 'yup';
 import { MyTextInput, MyText, Checkbox, ImageUploaderNeo, tw, useFocusCallback, BottomDropdown, type ImageUploaderNeoItem, type ImageUploaderNeoPayload } from 'common-ui';
 import MaterialIcons from '@expo/vector-icons/MaterialIcons';
-import { TouchableOpacity as GHTouchableOpacity } from 'react-native-gesture-handler';
-import DraggableFlatList, { ScaleDecorator } from 'react-native-draggable-flatlist';
-import { Image } from 'expo-image';
-import ProductsSelector from '@/components/ProductsSelector';
-import { trpc } from '@/src/trpc-client';
 
 interface StoreOption {
   id: number;
@@ -20,7 +15,6 @@ interface TagFormData {
   tagDescription: string;
   isDashboardTag: boolean;
   relatedStores: number[];
-  productIds: number[];
 }
 
 interface TagFormProps {
@@ -32,13 +26,6 @@ interface TagFormProps {
   stores?: StoreOption[];
 }
 
-interface SelectedProduct {
-  skuId: number;
-  productId: number;
-  label: string;
-  imageUrl?: string | null;
-}
-
 const TagForm = forwardRef<any, TagFormProps>(({
   mode,
   initialValues,
@@ -50,35 +37,10 @@ const TagForm = forwardRef<any, TagFormProps>(({
   const [images, setImages] = useState<ImageUploaderNeoItem[]>([])
   const [removedExisting, setRemovedExisting] = useState(false)
   const [isDashboardTagChecked, setIsDashboardTagChecked] = useState<boolean>(Boolean(initialValues.isDashboardTag));
-  const [selectedProducts, setSelectedProducts] = useState<SelectedProduct[]>([]);
 
   const existingImageUrl = existingImageUrlRaw || ''
   const stores = storesRaw || []
 
-  const { data: skusData } = trpc.common.product.getAllSkusSummary.useQuery();
-  const allSkus: SelectedProduct[] = (skusData?.skus || []).map((sku: any) => ({
-    skuId: sku.id,
-    productId: sku.productId,
-    label: sku.label,
-    imageUrl: sku.images?.[0] || null,
-  }));
-
-  // Build the ordered list from initialValues.productIds (product ids, in sortOrder).
-  useEffect(() => {
-    const ordered: SelectedProduct[] = [];
-    const skuMap = new Map<number, SelectedProduct>();
-    for (const sku of allSkus) {
-      skuMap.set(sku.productId, sku);
-    }
-    for (const productId of initialValues.productIds || []) {
-      const sku = skuMap.get(productId);
-      if (sku) ordered.push(sku);
-      else ordered.push({ skuId: 0, productId, label: `Product #${productId}`, imageUrl: null });
-    }
-    setSelectedProducts(ordered);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [initialValues.productIds, skusData]);
-
   // Update checkbox when initial values change
   useEffect(() => {
     setIsDashboardTagChecked(Boolean(initialValues.isDashboardTag));
@@ -89,6 +51,7 @@ const TagForm = forwardRef<any, TagFormProps>(({
     }
     setRemovedExisting(false)
   }, [existingImageUrlRaw, initialValues.isDashboardTag]);
+  
 
   const validationSchema = Yup.object().shape({
     tagName: Yup.string()
@@ -99,74 +62,21 @@ const TagForm = forwardRef<any, TagFormProps>(({
       .max(500, 'Description must be less than 500 characters'),
   });
 
-  // When a product is picked in the selector, add it to the ordered list (if not already present).
-  const handleProductSelect = (value: number | number[]) => {
-    const skuIds = Array.isArray(value) ? value : [value];
-    setSelectedProducts((prev) => {
-      const next = [...prev];
-      for (const skuId of skuIds) {
-        if (next.some((p) => p.skuId === skuId)) continue;
-        const sku = allSkus.find((s) => s.skuId === skuId);
-        if (sku) next.push(sku);
-      }
-      return next;
-    });
-  };
-
-  const handleDragEnd = useCallback(({ data }: { data: SelectedProduct[] }) => {
-    setSelectedProducts(data);
-  }, []);
-
-  const handleRemoveProduct = (productId: number) => {
-    setSelectedProducts((prev) => prev.filter((p) => p.productId !== productId));
-  };
-
-  const renderSelectedItem = useCallback(({ item, drag, isActive }: { item: SelectedProduct; drag: () => void; isActive: boolean }) => (
-    <ScaleDecorator>
-      <GHTouchableOpacity
-        onLongPress={drag}
-        disabled={isActive}
-        activeOpacity={1}
-        style={[styles.item, isActive && styles.activeItem]}
-      >
-        <View style={styles.dragHandle}>
-          <MaterialIcons name="drag-indicator" size={24} color={isActive ? '#3b82f6' : '#9ca3af'} />
-        </View>
-        {item.imageUrl ? (
-          <Image source={{ uri: item.imageUrl }} style={styles.image} contentFit="cover" />
-        ) : (
-          <View style={styles.placeholderImage}>
-            <MaterialIcons name="image" size={24} color="#9ca3af" />
-          </View>
-        )}
-        <MyText style={styles.name} numberOfLines={1}>
-          {item.label}
-        </MyText>
-        <TouchableOpacity onPress={() => handleRemoveProduct(item.productId)} style={styles.removeButton}>
-          <MaterialIcons name="close" size={18} color="#9ca3af" />
-        </TouchableOpacity>
-      </GHTouchableOpacity>
-    </ScaleDecorator>
-  ), []);
-
   return (
     <Formik
       initialValues={initialValues}
       validationSchema={validationSchema}
-      onSubmit={(values) => onSubmit({ ...values, productIds: selectedProducts.map((p) => p.productId) }, images, removedExisting)}
+      onSubmit={(values) => onSubmit(values, images, removedExisting)}
       enableReinitialize
     >
-      {({ handleChange, handleSubmit, values, setFieldValue, errors, touched, resetForm }) => {
-        // Clear form when screen comes into focus (create mode only — edit keeps its loaded products)
-        const clearForm = useCallback(() => {
-          setImages([])
-          setRemovedExisting(false)
-          setIsDashboardTagChecked(false);
-          if (mode === 'create') {
-            setSelectedProducts([]);
-          }
-          resetForm();
-        }, [resetForm, mode]);
+      {({ handleChange, handleSubmit, values, setFieldValue, errors, touched, setFieldValue: formikSetFieldValue, resetForm }) => {
+        // Clear form when screen comes into focus
+          const clearForm = useCallback(() => {
+            setImages([])
+            setRemovedExisting(false)
+            setIsDashboardTagChecked(false);
+            resetForm();
+          }, [resetForm]);
 
         useFocusCallback(clearForm);
 
@@ -196,6 +106,7 @@ const TagForm = forwardRef<any, TagFormProps>(({
                 Tag Image {mode === 'edit' ? '(Upload new to replace)' : '(Optional)'}
               </MyText>
 
+
               <ImageUploaderNeo
                 images={images}
                 onImageAdd={(payload: ImageUploaderNeoPayload[]) => {
@@ -221,7 +132,7 @@ const TagForm = forwardRef<any, TagFormProps>(({
                 onPress={() => {
                   const newValue = !isDashboardTagChecked;
                   setIsDashboardTagChecked(newValue);
-                  setFieldValue('isDashboardTag', newValue);
+                  formikSetFieldValue('isDashboardTag', newValue);
                 }}
               />
               <MyText style={tw`ml-3 text-gray-800`}>Mark as Dashboard Tag</MyText>
@@ -242,53 +153,12 @@ const TagForm = forwardRef<any, TagFormProps>(({
                 }))}
                 onValueChange={(selectedValues) => {
                   const numericValues = (selectedValues as string[]).map(v => parseInt(v));
-                  setFieldValue('relatedStores', numericValues);
+                  formikSetFieldValue('relatedStores', numericValues);
                 }}
                 multiple={true}
               />
             </View>
 
-            {/* Products Section: selector + reorderable list */}
-            <View style={tw`mb-6`}>
-              <MyText style={tw`text-lg font-bold mb-2 text-gray-800`}>
-                Products
-              </MyText>
-              <ProductsSelector
-                value={[]}
-                onChange={handleProductSelect}
-                multiple
-                label="Select Products"
-                placeholder="Search and select products..."
-                showGroups={false}
-              />
-              <View style={tw`mt-4`}>
-                {selectedProducts.length > 0 && (
-                  <View style={tw`bg-blue-50 px-4 py-2 mb-2 rounded-lg`}>
-                    <MyText style={tw`text-blue-700 text-xs text-center`}>
-                      Long press and drag to reorder • {selectedProducts.length} items
-                    </MyText>
-                  </View>
-                )}
-                {selectedProducts.length > 0 ? (
-                  <DraggableFlatList
-                    data={selectedProducts}
-                    renderItem={renderSelectedItem}
-                    keyExtractor={(item) => item.productId.toString()}
-                    onDragEnd={handleDragEnd}
-                    showsVerticalScrollIndicator={false}
-                    contentContainerStyle={{ paddingBottom: 20 }}
-                    keyboardShouldPersistTaps="handled"
-                    activationDistance={10}
-                  />
-                ) : (
-                  <View style={tw`bg-gray-50 p-6 rounded-xl border border-gray-200 border-dashed items-center justify-center`}>
-                    <MaterialIcons name="inventory" size={32} color="#9CA3AF" />
-                    <MyText style={tw`text-gray-500 mt-2 text-sm`}>No products selected yet</MyText>
-                  </View>
-                )}
-              </View>
-            </View>
-
             <TouchableOpacity
               onPress={() => handleSubmit()}
               disabled={isLoading}
@@ -305,62 +175,6 @@ const TagForm = forwardRef<any, TagFormProps>(({
   );
 });
 
-const styles = StyleSheet.create({
-  item: {
-    backgroundColor: 'white',
-    borderRadius: 8,
-    borderWidth: 1,
-    borderColor: '#e5e7eb',
-    padding: 10,
-    flexDirection: 'row',
-    alignItems: 'center',
-    shadowColor: '#000',
-    shadowOffset: { width: 0, height: 1 },
-    shadowOpacity: 0.1,
-    shadowRadius: 2,
-    elevation: 2,
-    marginVertical: 4,
-  },
-  activeItem: {
-    shadowColor: '#3b82f6',
-    shadowOffset: { width: 0, height: 4 },
-    shadowOpacity: 0.3,
-    shadowRadius: 8,
-    elevation: 8,
-    borderColor: '#3b82f6',
-    transform: [{ scale: 1.02 }],
-  },
-  dragHandle: {
-    marginRight: 8,
-    padding: 2,
-  },
-  image: {
-    width: 30,
-    height: 30,
-    borderRadius: 6,
-    marginRight: 10,
-  },
-  placeholderImage: {
-    width: 30,
-    height: 30,
-    borderRadius: 6,
-    backgroundColor: '#f3f4f6',
-    marginRight: 10,
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-  name: {
-    flex: 1,
-    fontSize: 13,
-    color: '#111827',
-    fontWeight: '500',
-    marginRight: 4,
-  },
-  removeButton: {
-    padding: 2,
-  },
-});
-
 TagForm.displayName = 'TagForm';
 
 export default TagForm;

apps/backend/src/lib/cloud_cache.ts

@@ -1,11 +1,11 @@
 import { Buffer } from 'buffer'
-import { scaffoldProducts, scaffoldAvailability } from '@/src/trpc/apis/common-apis/common'
+import { scaffoldProducts } from '@/src/trpc/apis/common-apis/common'
 import { scaffoldEssentialConsts } from '@/src/trpc/apis/common-apis/common-trpc-index'
 import { scaffoldStores } from '@/src/trpc/apis/user-apis/apis/stores'
 import { scaffoldSlotsWithProducts } from '@/src/trpc/apis/user-apis/apis/slots'
 import { scaffoldBanners } from '@/src/trpc/apis/user-apis/apis/banners'
 import { scaffoldStoreWithProducts } from '@/src/trpc/apis/user-apis/apis/stores'
-import { getStoresSummary, incrementCacheVersion, incrementAvailabilityVersionNum, incrementSlotsVersionNum } from '@/src/dbService'
+import { getStoresSummary, incrementCacheVersion } from '@/src/dbService'
 import { imageUploadS3 } from '@/src/lib/s3-client'
 import { getApiCacheKey, getCloudflareApiToken, getCloudflareZoneId, getAssetsDomain } from '@/src/lib/env-exporter'
 import { CACHE_FILENAMES } from '@packages/shared'
@@ -13,29 +13,16 @@ import { retryWithExponentialBackoff } from '@/src/lib/retry'
 
 const buildCachePath = (path: string, version: number) => `v-${version}/${path}`
 
-const buildAvailabilityPath = (version: number) => `av-${version}/${CACHE_FILENAMES.availability}`
-
-const buildSlotsPath = (version: number) => `slots/v-${version}/${CACHE_FILENAMES.slots}`
-
 function constructCacheUrl(path: string, version: number): string {
   return `${getAssetsDomain()}${getApiCacheKey()}/${buildCachePath(path, version)}`
 }
 
-function constructAvailabilityUrl(version: number): string {
-  return `${getAssetsDomain()}${buildAvailabilityPath(version)}`
-}
-
-function constructSlotsUrl(version: number): string {
-  return `${getAssetsDomain()}${buildSlotsPath(version)}`
-}
-
 export interface CreateAllCacheFilesResult {
   cacheVersion: number
   products: string
   essentialConsts: string
   stores: string
-  slotsVersion: number
-  availabilityVersion: number
+  slots: string
   banners: string
   individualStores: string[]
 }
@@ -50,16 +37,14 @@ export async function createAllCacheFiles(): Promise<CreateAllCacheFilesResult>
     productsKey,
     essentialConstsKey,
     storesKey,
-    slotsVersion,
-    availabilityVersion,
+    slotsKey,
     bannersKey,
     individualStoreKeys,
   ] = await Promise.all([
     createProductsFileInternal(cacheVersion),
     createEssentialConstsFileInternal(cacheVersion),
     createStoresFileInternal(cacheVersion),
-    createSlotsCacheFile(),
-    createAvailabilityCacheFile(),
+    createSlotsFileInternal(cacheVersion),
     createBannersFileInternal(cacheVersion),
     createAllStoresFilesInternal(cacheVersion),
   ])
@@ -71,8 +56,7 @@ export async function createAllCacheFiles(): Promise<CreateAllCacheFilesResult>
     constructCacheUrl(CACHE_FILENAMES.products, cacheVersion),
     constructCacheUrl(CACHE_FILENAMES.essentialConsts, cacheVersion),
     constructCacheUrl(CACHE_FILENAMES.stores, cacheVersion),
-    constructSlotsUrl(slotsVersion),
-    constructAvailabilityUrl(availabilityVersion),
+    constructCacheUrl(CACHE_FILENAMES.slots, cacheVersion),
     constructCacheUrl(CACHE_FILENAMES.banners, cacheVersion),
     ...stores.map((store) => constructCacheUrl(`stores/${store.id}.json`, cacheVersion)),
   ]
@@ -92,8 +76,7 @@ export async function createAllCacheFiles(): Promise<CreateAllCacheFilesResult>
     products: productsKey,
     essentialConsts: essentialConstsKey,
     stores: storesKey,
-    slotsVersion,
-    availabilityVersion,
+    slots: slotsKey,
     banners: bannersKey,
     individualStores: individualStoreKeys,
   }
@@ -115,23 +98,6 @@ async function createProductsFileInternal(version: number): Promise<string> {
 
 }
 
-export async function createAvailabilityCacheFile(): Promise<number> {
-  const version = await incrementAvailabilityVersionNum()
-  const availabilityData = await scaffoldAvailability()
-  const jsonContent = JSON.stringify(availabilityData, null, 2)
-  const buffer = Buffer.from(jsonContent, 'utf-8')
-  const filePath = buildAvailabilityPath(version)
-
-  console.log(filePath)
-  await imageUploadS3(
-    buffer,
-    'application/json',
-    filePath
-  )
-
-  return version
-}
-
 async function createEssentialConstsFileInternal(version: number): Promise<string> {
   const essentialConstsData = await scaffoldEssentialConsts()
   const jsonContent = JSON.stringify(essentialConstsData, null, 2)
@@ -154,21 +120,15 @@ async function createStoresFileInternal(version: number): Promise<string> {
   )
 }
 
-export async function createSlotsCacheFile(): Promise<number> {
-  const version = await incrementSlotsVersionNum()
+async function createSlotsFileInternal(version: number): Promise<string> {
   const slotsData = await scaffoldSlotsWithProducts()
   const jsonContent = JSON.stringify(slotsData, null, 2)
   const buffer = Buffer.from(jsonContent, 'utf-8')
-  const filePath = buildSlotsPath(version)
-
-  console.log(filePath)
-  await imageUploadS3(
+  return await imageUploadS3(
     buffer,
     'application/json',
-    filePath
+    `${getApiCacheKey()}/${buildCachePath(CACHE_FILENAMES.slots, version)}`
   )
-
-  return version
 }
 
 async function createBannersFileInternal(version: number): Promise<string> {

apps/backend/src/lib/const-keys.ts

@@ -17,7 +17,6 @@ export const CONST_KEYS = {
   appStoreUrl: 'appStoreUrl',
   popularItems: 'popularItems',
   allItemsOrder: 'allItemsOrder',
-  tagsOrder: 'tagsOrder',
   isFlashDeliveryEnabled: 'isFlashDeliveryEnabled',
   supportMobile: 'supportMobile',
   supportEmail: 'supportEmail',
@@ -42,7 +41,6 @@ export const CONST_LABELS: Record<ConstKey, string> = {
   appStoreUrl: 'App Store URL',
   popularItems: 'Popular Items',
   allItemsOrder: 'All Items Order',
-  tagsOrder: 'Tags Order',
   isFlashDeliveryEnabled: 'Enable Flash Delivery',
   supportMobile: 'Support Mobile',
   supportEmail: 'Support Email',
@@ -73,7 +71,6 @@ export const CONST_TYPES: Record<ConstKey, ConstValueType> = {
   appStoreUrl: 'string',
   popularItems: 'string',
   allItemsOrder: 'string',
-  tagsOrder: 'string',
   isFlashDeliveryEnabled: 'boolean',
   supportMobile: 'string',
   supportEmail: 'string',
@@ -98,7 +95,6 @@ export const CONST_VISIBILITY: Record<ConstKey, boolean> = {
   appStoreUrl: true,
   popularItems: true,
   allItemsOrder: true,
-  tagsOrder: false,
   isFlashDeliveryEnabled: true,
   supportMobile: true,
   supportEmail: true,

apps/backend/src/sqliteImporter.ts

@@ -72,7 +72,6 @@ export {
   createSpecialDealsForSku,
   updateSkuDeals,
   replaceProductTags,
-  replaceTagProducts,
   mergeSkus,
   updateSlotProducts,
   getSlotsProductIds,
@@ -241,7 +240,6 @@ export {
   // Store Helpers
   getAllBannersForCache,
   getAllProductsForCache,
-  getAvailabilityForCache,
   getAllStoresForCache,
   getAllDeliverySlotsForCache,
   getAllSpecialDealsForCache,

apps/backend/src/stores/product-store.ts

@@ -44,7 +44,6 @@ interface Product {
     productName: string
     images: string[] | null
     price: string
-    isOffer: boolean
   }>
 }
 
@@ -251,7 +250,6 @@ export async function getAllProducts(): Promise<Product[]> {
         productName: ci.productName,
         images: ci.images ? scaffoldAssetUrl((ci.images as string[]) || []) : null,
         price: ci.price,
-        isOffer: ci.isOffer,
       }))
 
       products.push({

apps/backend/src/trpc/apis/admin-apis/apis/product.ts

@@ -3,7 +3,6 @@ import { z } from 'zod'
 import { ApiError } from '@/src/lib/api-error'
 import { generateSignedUrlsFromS3Urls, scaffoldAssetUrl, claimUploadUrl, extractKeyFromPresignedUrl, deleteImageUtil } from '@/src/lib/s3-client'
 import { scheduleStoreInitialization } from '@/src/stores/store-initializer'
-import { createAvailabilityCacheFile } from '@/src/lib/cloud_cache'
 import {
   getAllProducts as getAllProductsInDb,
   getProductById as getProductByIdInDb,
@@ -21,7 +20,6 @@ import {
   checkUnitExists,
   createProduct as createProductInDb,
   replaceProductTags,
-  replaceTagProducts,
   getProductImagesById,
   updateProduct as updateProductInDb,
   checkProductTagExistsByName,
@@ -30,7 +28,6 @@ import {
   deleteProductTag as deleteProductTagInDb,
   getAllProductTagInfos as getAllProductTagInfosInDb,
   getProductTagInfoById as getProductTagInfoByIdInDb,
-  getProductTagById as getProductTagByIdInDb,
 } from '@/src/dbService'
 import type {
   AdminProduct,
@@ -199,7 +196,6 @@ export const productRouter = router({
         images: z.array(z.string()).optional().default([]),
         isFlashAvailable: z.boolean().optional().default(false),
         flashPrice: z.number().optional().nullable(),
-        isOutOfStock: z.boolean().optional().default(false),
         isOffer: z.boolean().optional().default(false),
         isComboOnly: z.boolean().optional().default(false),
         isSuspended: z.boolean().optional().default(false),
@@ -229,7 +225,6 @@ export const productRouter = router({
         images: sku.images.map((url) => extractKeyFromPresignedUrl(url)),
         isFlashAvailable: sku.isFlashAvailable,
         flashPrice: sku.flashPrice ?? null,
-        isOutOfStock: sku.isOutOfStock,
         isOffer: sku.isOffer,
         isComboOnly: sku.isComboOnly,
         isSuspended: sku.isSuspended,
@@ -289,7 +284,6 @@ export const productRouter = router({
         images: z.array(z.string()).optional().default([]),
         isFlashAvailable: z.boolean().optional().default(false),
         flashPrice: z.number().optional().nullable(),
-        isOutOfStock: z.boolean().optional().default(false),
         isOffer: z.boolean().optional().default(false),
         isComboOnly: z.boolean().optional().default(false),
         isSuspended: z.boolean().optional().default(false),
@@ -321,7 +315,6 @@ export const productRouter = router({
         images: sku.images.map((url) => extractKeyFromPresignedUrl(url)),
         isFlashAvailable: sku.isFlashAvailable,
         flashPrice: sku.flashPrice ?? null,
-        isOutOfStock: sku.isOutOfStock,
         isOffer: sku.isOffer,
         isComboOnly: sku.isComboOnly,
         isSuspended: sku.isSuspended,
@@ -849,13 +842,11 @@ export const productRouter = router({
          };
          */
 
-        if (result.invalidIds.length > 0) {
-          throw new ApiError(`Invalid product IDs: ${result.invalidIds.join(', ')}`, 400)
-        }
+       if (result.invalidIds.length > 0) {
+         throw new ApiError(`Invalid product IDs: ${result.invalidIds.join(', ')}`, 400)
+       }
 
-        await createAvailabilityCacheFile().catch((err) => {
-          console.error('Failed to regenerate availability cache after price update:', err)
-        })
+        await scheduleStoreInitialization()
 
         return {
           message: `Updated prices for ${result.updatedCount} product(s)`,
@@ -882,8 +873,8 @@ export const productRouter = router({
 
       getProductTagById: protectedProcedure
         .input(z.object({ id: z.number() }))
-        .query(async ({ input }): Promise<{ tag: { id: number; tagName: string; tagDescription: string | null; imageUrl: string | null; isDashboardTag: boolean; relatedStores: unknown; sortOrder: number[]; createdAt: Date; products: Array<{ productId: number; tagId: number; assignedAt: Date; product: any }>; productIds: number[] }; message: string }> => {
-          const tag = await getProductTagByIdInDb(input.id)
+        .query(async ({ input }): Promise<{ tag: { id: number; tagName: string; tagDescription: string | null; imageUrl: string | null; isDashboardTag: boolean; relatedStores: unknown; createdAt: Date }; message: string }> => {
+          const tag = await getProductTagInfoByIdInDb(input.id)
 
           if (!tag) {
             throw new ApiError('Tag not found', 404)
@@ -907,11 +898,10 @@ export const productRouter = router({
           imageUrl: z.string().optional().nullable(),
           isDashboardTag: z.boolean().optional().default(false),
           relatedStores: z.array(z.number()).optional().default([]),
-          productIds: z.array(z.number()).optional().default([]),
           uploadUrls: z.array(z.string()).optional().default([]),
         }))
-        .mutation(async ({ input }): Promise<{ tag: { id: number; tagName: string; tagDescription: string | null; imageUrl: string | null; isDashboardTag: boolean; relatedStores: unknown; sortOrder: number[]; createdAt: Date }; message: string }> => {
-          const { tagName, tagDescription, imageUrl, isDashboardTag, relatedStores, productIds, uploadUrls } = input
+        .mutation(async ({ input }): Promise<{ tag: { id: number; tagName: string; tagDescription: string | null; imageUrl: string | null; isDashboardTag: boolean; relatedStores: unknown; createdAt: Date }; message: string }> => {
+          const { tagName, tagDescription, imageUrl, isDashboardTag, relatedStores, uploadUrls } = input
 
           const existingTag = await checkProductTagExistsByName(tagName.trim())
           if (existingTag) {
@@ -924,11 +914,8 @@ export const productRouter = router({
             imageUrl: imageUrl ?? null,
             isDashboardTag,
             relatedStores,
-            sortOrder: productIds,
           })
 
-          await replaceTagProducts(createdTag.id, productIds)
-
           if (uploadUrls.length > 0) {
             await Promise.all(uploadUrls.map((url) => claimUploadUrl(url)))
           }
@@ -954,11 +941,10 @@ export const productRouter = router({
           imageUrl: z.string().optional().nullable(),
           isDashboardTag: z.boolean().optional(),
           relatedStores: z.array(z.number()).optional(),
-          productIds: z.array(z.number()).optional(),
           uploadUrls: z.array(z.string()).optional().default([]),
         }))
-        .mutation(async ({ input }): Promise<{ tag: { id: number; tagName: string; tagDescription: string | null; imageUrl: string | null; isDashboardTag: boolean; relatedStores: unknown; sortOrder: number[]; createdAt: Date }; message: string }> => {
-          const { id, tagName, tagDescription, imageUrl, isDashboardTag, relatedStores, productIds, uploadUrls } = input
+        .mutation(async ({ input }): Promise<{ tag: { id: number; tagName: string; tagDescription: string | null; imageUrl: string | null; isDashboardTag: boolean; relatedStores: unknown; createdAt: Date }; message: string }> => {
+          const { id, tagName, tagDescription, imageUrl, isDashboardTag, relatedStores, uploadUrls } = input
 
           const currentTag = await getProductTagInfoByIdInDb(id)
 
@@ -978,13 +964,8 @@ export const productRouter = router({
             imageUrl: imageUrl ?? undefined,
             isDashboardTag,
             relatedStores,
-            sortOrder: productIds,
           })
 
-          if (productIds !== undefined) {
-            await replaceTagProducts(id, productIds)
-          }
-
           if (uploadUrls.length > 0) {
             await Promise.all(uploadUrls.map((url) => claimUploadUrl(url)))
           }

apps/backend/src/trpc/apis/admin-apis/apis/slots.ts

@@ -6,7 +6,6 @@ import { getAppUrl } from "@/src/lib/env-exporter"
 // import redisClient from "@/src/lib/redis-client"
 // import { getSlotSequenceKey } from "@/src/lib/redisKeyGetters"
 import { scheduleStoreInitialization } from '@/src/stores/store-initializer'
-import { createSlotsCacheFile } from '@/src/lib/cloud_cache'
 import {
   getActiveSlotsWithProducts as getActiveSlotsWithProductsInDb,
   getActiveSlots as getActiveSlotsInDb,
@@ -267,9 +266,7 @@ export const slotsRouter = router({
       };
       */
 
-      await createSlotsCacheFile().catch((err) => {
-        console.error('Failed to regenerate slots cache after product update:', err)
-      })
+      await scheduleStoreInitialization()
 
       return {
         message: result.message,
@@ -363,10 +360,8 @@ export const slotsRouter = router({
       });
       */
 
-      // Regenerate slots cache file (availability/products stay as-is)
-      await createSlotsCacheFile().catch((error) => {
-        console.error('Failed to regenerate slots cache after slot create:', error)
-      })
+      // Reinitialize stores to reflect changes (outside transaction)
+      await scheduleStoreInitialization()
 
       // Fire and forget: cleanup stale product slot associations
       staleSlotsCleanup().catch((error) => {
@@ -553,10 +548,8 @@ export const slotsRouter = router({
         throw new ApiError('Slot not found', 404)
       }
 
-      // Regenerate slots cache file (availability/products stay as-is)
-      await createSlotsCacheFile().catch((error) => {
-        console.error('Failed to regenerate slots cache after slot update:', error)
-      })
+      // Reinitialize stores to reflect changes (outside transaction)
+      await scheduleStoreInitialization()
 
       return result
     }
@@ -594,10 +587,8 @@ export const slotsRouter = router({
         throw new ApiError('Slot not found', 404)
       }
 
-      // Regenerate slots cache file (availability/products stay as-is)
-      await createSlotsCacheFile().catch((error) => {
-        console.error('Failed to regenerate slots cache after slot delete:', error)
-      })
+      // Reinitialize stores to reflect changes
+      await scheduleStoreInitialization()
 
       return {
         message: 'Slot deleted successfully',
@@ -745,9 +736,7 @@ export const slotsRouter = router({
         throw new ApiError('Slot not found', 404)
       }
 
-      await createSlotsCacheFile().catch((error) => {
-        console.error('Failed to regenerate slots cache after capacity update:', error)
-      })
+      await scheduleStoreInitialization()
 
       return result
     }),

apps/backend/src/trpc/apis/common-apis/common-trpc-index.ts

@@ -4,8 +4,6 @@ import {
   getStoresSummary,
   healthCheck,
   getCacheVersion,
-  getAvailabilityVersionNum,
-  getSlotsVersionNum,
 } from '@/src/dbService'
 import type { StoresSummaryResponse } from '@packages/shared'
 import { polygon as turfPolygon, point as turfPoint } from '@turf/helpers';
@@ -23,8 +21,6 @@ const polygon = turfPolygon(mbnrGeoJson.features[0].geometry.coordinates);
 export async function scaffoldEssentialConsts() {
   const consts = await getAllConstValues();
   const cacheVersion = await getCacheVersion()
-  const availabilityVersionNum = await getAvailabilityVersionNum()
-  const slotsVersionNum = await getSlotsVersionNum()
 
   return {
     freeDeliveryThreshold: consts[CONST_KEYS.freeDeliveryThreshold] ?? 200,
@@ -44,8 +40,6 @@ export async function scaffoldEssentialConsts() {
     assetsDomain: getAssetsDomain(),
     apiCacheKey: getApiCacheKey(),
     cacheVersion,
-    availabilityVersionNum,
-    slotsVersionNum,
   };
 }
 

apps/backend/src/trpc/apis/common-apis/common.ts

@@ -6,13 +6,10 @@ import {
   getAllSkusSummary as getAllSkusSummaryInDb,
   getAllTagsForCache,
   getAllTagProductMappings,
-  getAvailabilityForCache,
 } from '@/src/dbService'
 import { generateSignedUrlsFromS3Urls, generateSignedUrlFromS3Url, scaffoldAssetUrl } from '@/src/lib/s3-client'
 import { getAllProducts as getAllProductsFromCache } from '@/src/stores/product-store'
 import { getDashboardTags as getDashboardTagsFromCache } from '@/src/stores/product-tag-store'
-import { getConstant } from '@/src/lib/const-store'
-import { CONST_KEYS } from '@/src/lib/const-keys'
 
 // Re-export with original name for backwards compatibility
 export const getNextDeliveryDate = getNextDeliveryDateWithCapacity
@@ -48,14 +45,18 @@ export async function scaffoldProducts() {
         id: product.id,
         name: product.name,
         shortDescription: product.shortDescription,
+        price: parseFloat(product.price),
+        marketPrice: product.marketPrice ? parseFloat(product.marketPrice) : null,
         unit: product.unitNotation,
         unitNotation: product.unitNotation,
         incrementStep: product.incrementStep,
         productQuantity: product.productQuantity,
         storeId: product.store?.id || null,
         isOutOfStock: product.isOutOfStock,
+        isFlashAvailable: product.isFlashAvailable,
         nextDeliveryDate: nextDeliveryDate ? nextDeliveryDate.toISOString() : null,
         images: product.images,
+        flashPrice: product.flashPrice,
         productType: product.productType || 'item'
       };
     })
@@ -67,28 +68,6 @@ export async function scaffoldProducts() {
     getAllTagProductMappings(),
   ])
 
-  // Order tags by the admin-defined tagsOrder (unknown tags go to the end).
-  const tagsOrderRaw = await getConstant(CONST_KEYS.tagsOrder)
-  let tagsOrderIds: number[] = []
-  if (Array.isArray(tagsOrderRaw)) {
-    tagsOrderIds = tagsOrderRaw.map((id: any) => parseInt(id)).filter((id: number) => !isNaN(id))
-  } else if (typeof tagsOrderRaw === 'string') {
-    tagsOrderIds = tagsOrderRaw.split(',').map((id: string) => parseInt(id.trim())).filter((id: number) => !isNaN(id))
-  }
-
-  const tagsById = new Map(allTags.map((tag: any) => [tag.id, tag]))
-  const orderedTags: any[] = []
-  for (const id of tagsOrderIds) {
-    const tag = tagsById.get(id)
-    if (tag) {
-      orderedTags.push(tag)
-      tagsById.delete(id)
-    }
-  }
-  for (const tag of tagsById.values()) {
-    orderedTags.push(tag)
-  }
-
   const productIdsByTag = new Map<number, number[]>()
   for (const mapping of tagMappings) {
     if (!productIdsByTag.has(mapping.tagId)) {
@@ -97,25 +76,14 @@ export async function scaffoldProducts() {
     productIdsByTag.get(mapping.tagId)!.push(mapping.productId)
   }
 
-  // Reorder each tag's product ids by the admin-defined sortOrder (unknown products go to the end).
-  const reorderProductIds = (tagId: number, tagSortOrder: number[] | undefined) => {
-    const current = productIdsByTag.get(tagId) || []
-    if (!Array.isArray(tagSortOrder) || tagSortOrder.length === 0) {
-      return current
-    }
-    const ordered = tagSortOrder.filter((id: number) => current.includes(id))
-    const rest = current.filter((id: number) => !ordered.includes(id))
-    return [...ordered, ...rest]
-  }
-
-  const tags = orderedTags.map((tag: { id: number; tagName: string; tagDescription: string | null; imageUrl: string | null; isDashboardTag: boolean; relatedStores: unknown; sortOrder: number[] | null }) => ({
+  const tags = allTags.map((tag: { id: number; tagName: string; tagDescription: string | null; imageUrl: string | null; isDashboardTag: boolean; relatedStores: unknown }) => ({
     id: tag.id,
     tagName: tag.tagName,
     tagDescription: tag.tagDescription,
     imageUrl: tag.imageUrl ? scaffoldAssetUrl(tag.imageUrl) : null,
     isDashboardTag: tag.isDashboardTag,
     relatedStores: (tag.relatedStores as number[]) || [],
-    productIds: reorderProductIds(tag.id, tag.sortOrder ?? undefined),
+    productIds: productIdsByTag.get(tag.id) || [],
   }))
 
   return {
@@ -125,15 +93,6 @@ export async function scaffoldProducts() {
   };
 }
 
-export async function scaffoldAvailability() {
-  const availability = await getAvailabilityForCache()
-
-  return {
-    availability,
-    count: availability.length,
-  };
-}
-
 export const commonRouter = router({
   getDashboardTags: publicProcedure
     .query(async () => {

apps/backend/src/trpc/apis/user-apis/apis/slots.ts

@@ -17,16 +17,28 @@ export async function scaffoldSlotsWithProducts(): Promise<UserSlotsWithProducts
 
   const productAvailability = await getUserProductAvailabilityInDb()
 
+  /*
+  // Old implementation - direct DB query:
+  const allProducts = await db
+    .select({
+      id: productInfo.id,
+      name: productInfo.name,
+      isOutOfStock: productInfo.isOutOfStock,
+      isFlashAvailable: productInfo.isFlashAvailable,
+    })
+    .from(productInfo)
+    .where(eq(productInfo.isSuspended, false));
+
+  const productAvailability = allProducts.map(product => ({
+    id: product.id,
+    name: product.name,
+    isOutOfStock: product.isOutOfStock,
+    isFlashAvailable: product.isFlashAvailable,
+  }));
+  */
+
   return {
-    slots: validSlots.map((slot) => ({
-      id: slot.id,
-      deliveryTime: slot.deliveryTime,
-      freezeTime: slot.freezeTime,
-      products: (slot.products || []).map((product) => ({
-        id: product.id,
-        images: product.images,
-      })),
-    })),
+    slots: validSlots,
     productAvailability,
     count: validSlots.length,
   };

apps/backend/src/trpc/router.ts

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { adminRouter } from '@/src/trpc/apis/admin-apis/apis/admin-trpc-index'
 import { userRouter } from '@/src/trpc/apis/user-apis/apis/user-trpc-index'
 import { commonApiRouter } from '@/src/trpc/apis/common-apis/common-trpc-index'
-import { scaffoldProducts, scaffoldAvailability } from './apis/common-apis/common';
+import { scaffoldProducts } from './apis/common-apis/common';
 import { scaffoldStores, scaffoldStoreWithProducts } from './apis/user-apis/apis/stores';
 import { scaffoldSlotsWithProducts } from './apis/user-apis/apis/slots';
 import { scaffoldEssentialConsts } from './apis/common-apis/common-trpc-index';
@@ -26,7 +26,6 @@ export const appRouter = router({
 export type AppRouter = typeof appRouter;
 
 export type AllProductsApiType = Awaited<ReturnType<typeof scaffoldProducts>>;
-export type AvailabilityApiType = Awaited<ReturnType<typeof scaffoldAvailability>>;
 export type StoresApiType = Awaited<ReturnType<typeof scaffoldStores>>;
 export type SlotsApiType = Awaited<ReturnType<typeof scaffoldSlotsWithProducts>>;
 export type EssentialConstsApiType = Awaited<ReturnType<typeof scaffoldEssentialConsts>>;

apps/backend/wrangler-commands.md

@@ -49,16 +49,10 @@ and paste it ABOVE the child table's block. Then verify it loads cleanly:
 
     sqlite3 :memory: "PRAGMA foreign_keys=ON; BEGIN; .read dumps/<dump>.sql; COMMIT;"
 
-This should exit 0 with no error. (Example already applied to `latest_1.sql` and
-`local_8_aug.sql`: `product_info` was moved above `product_skus`.)
+This should exit 0 with no error. (Example already applied to `latest_1.sql`:
+`product_info` was moved above `product_skus`.)
 
 ## When to re-check
 
 After ANY new `wrangler d1 export`, especially once a migration that re-creates
 tables has been applied. This is a general trap, not specific to one dump.
-
-> The SKU-split migration re-creates these tables in this historical order:
-> `product_skus`, `sku_features`, `product_market_stats`, `product_info`,
-> `cart_items`, `order_items`, `product_combos`. Exports put `product_info`
-> AFTER its child `product_skus` — every fresh export needs `product_info`
-> moved above `product_skus` (or the whole chain checked) before local import.

apps/backend/wrangler.dev.toml

@@ -9,7 +9,7 @@ routes = [
 [[d1_databases]]
 binding = "DB"
 database_name = "freshyo-backend-dev"
-database_id = "b05f2d65-5496-45bc-9780-ad3cd6f83afa" 
+database_id = "0814d709-5278-4311-8978-c36c0f05875d" 
 #database_name = "freshyo-dev"
 #database_id = "3cad440f-dc14-4baa-ab05-04eb08e206de" 
 migrations_dir="../../packages/db_helper_sqlite/drizzle"

apps/user-ui/app/(drawer)/(tabs)/home/index.tsx

@@ -1,6 +1,5 @@
-import React, { useState, useCallback, useMemo, memo, useRef } from "react";
+import React, { useState, useCallback, useMemo, memo } from "react";
 import { View, Dimensions, Image, RefreshControl, ScrollView } from "react-native";
-import { TabView, TabBar } from "react-native-tab-view";
 import { LinearGradient } from "expo-linear-gradient";
 import { useRouter } from "expo-router";
 import {
@@ -26,6 +25,7 @@ import { useProductSlotIdentifier } from "@/hooks/useProductSlotIdentifier";
 import { useCentralSlotStore } from "@/src/store/centralSlotStore";
 import { useCentralProductStore } from "@/src/store/centralProductStore";
 import FloatingCartBar from "@/components/floating-cart-bar";
+import BannerCarousel from "@/components/BannerCarousel";
 import { useUserDetails } from "@/src/contexts/AuthContext";
 import TabLayoutWrapper from "@/components/TabLayoutWrapper";
 import { useNavigationStore } from "@/src/store/navigationStore";
@@ -37,14 +37,6 @@ const itemWidth = screenWidth * 0.45;
 const heroItemWidth = (screenWidth - 72) / 3;
 const gridItemWidth = (screenWidth - 48) / 2;
 
-// Hero product card geometry (used to size the tab scene heights)
-const heroCardImageHeight = heroItemWidth * 0.82;
-const heroCardTextBlock = 86;
-const heroCardHeight = heroCardImageHeight + heroCardTextBlock;
-const heroRowHeight = heroCardHeight + 12; // + mb-3
-const TAG_GRID_COLUMNS = 3;
-const TAB_BAR_HEIGHT = 48;
-
 const formatTimeRange = (deliveryTime: string) => {
   const time = dayjs(deliveryTime);
   const endTime = time.add(1, 'hour');
@@ -61,6 +53,7 @@ const formatTimeRange = (deliveryTime: string) => {
 const staticStyles = {
   flatListContent: { gap: 16 },
   columnWrapper: { gap: 16, paddingHorizontal: 16 },
+  popularListContent: { paddingBottom: 16 },
   slotsListContent: { paddingBottom: 24 },
 };
 
@@ -98,15 +91,15 @@ const RenderStore = memo(({ item }: RenderStoreProps) => {
       activeOpacity={0.7}
     >
       <View
-        style={tw`w-16 h-16 rounded-2xl bg-brand50 border border-brand100 items-center justify-center mb-2 shadow-sm overflow-hidden`}
+        style={tw`w-16 h-16 rounded-2xl bg-white/20 border-2 border-white/30 items-center justify-center mb-2 shadow-lg overflow-hidden`}
       >
         {item.signedImageUrl ? (
           <Image source={{ uri: item.signedImageUrl }} style={tw`w-16 h-16 rounded-2xl`} resizeMode="cover" />
         ) : (
-          <MaterialIcons name="storefront" size={28} color={theme.colors.brand600} />
+          <MaterialIcons name="storefront" size={28} color="#FFF" />
         )}
       </View>
-      <MyText style={tw`font-bold text-xs text-center tracking-wide text-neutral-800`} numberOfLines={1}>
+      <MyText style={tw`font-bold text-xs text-center tracking-wide drop-shadow-sm text-neutral-800`} numberOfLines={1}>
         {item.name.replace(/^The\s+/i, "")}
       </MyText>
     </MyTouchableOpacity>
@@ -132,7 +125,7 @@ const SlotCard = memo(({ slot }: SlotCardProps) => {
     <MyTouchableOpacity
       testID={`slot-card-${slot.id}`}
       style={[
-        tw`bg-white rounded-[24px] p-5 mr-4 shadow-sm border border-gray-100 min-w-[280px]`,
+        tw`bg-white rounded-[24px] p-5 mr-4 shadow-xl shadow-slate-200 border border-slate-100 min-w-[280px]`,
         isClosingSoon ? tw`border-l-4 border-l-amber-400` : tw`border-l-4 border-l-brand500`,
       ]}
       onPress={handlePress}
@@ -186,15 +179,35 @@ const SlotCard = memo(({ slot }: SlotCardProps) => {
             </View>
           ))}
         </View>
-        <View style={tw`flex-row items-center bg-brand50 rounded-full px-3 py-1.5`}>
-          <MyText style={tw`text-[11px] font-bold text-brand700`}>View all {slot.products.length} items</MyText>
-          <MaterialIcons name="chevron-right" size={16} color={theme.colors.brand600} style={tw`ml-0.5`} />
-        </View>
+        <MyText style={tw`text-[11px] font-bold text-brand600`}>View all {slot.products.length} items</MyText>
+        <MaterialIcons name="chevron-right" size={16} color={theme.colors.brand600} />
       </View>
     </MyTouchableOpacity>
   );
 });
 
+interface PopularProductItemProps {
+  item: any;
+  onPress: (id: number) => void;
+}
+
+const PopularProductItem = memo(({ item, onPress }: PopularProductItemProps) => {
+  const handlePress = useCallback(() => onPress(item.id), [item.id, onPress]);
+  
+  return (
+    <View style={tw`mr-4`}>
+      <ProductCard
+        item={item}
+        itemWidth={itemWidth}
+        onPress={handlePress}
+        showDeliveryInfo={false}
+        useAddToCartDialog={true}
+        miniView={true}
+      />
+    </View>
+  );
+});
+
 interface ExploreTabProps {
   tag: any;
   isSelected: boolean;
@@ -213,7 +226,7 @@ const ExploreTab = memo(({ tag, isSelected, onPress }: ExploreTabProps) => {
           style={[
             tw`text-base tracking-tight`,
             {
-              color: isSelected ? theme.colors.brand600 : '#64748B',
+              color: isSelected ? '#111827' : '#64748B',
               fontWeight: isSelected ? '700' : '500',
             },
           ]}
@@ -226,7 +239,7 @@ const ExploreTab = memo(({ tag, isSelected, onPress }: ExploreTabProps) => {
             height: 4,
             borderRadius: 999,
             marginTop: 8,
-            backgroundColor: isSelected ? theme.colors.brand500 : 'transparent',
+            backgroundColor: isSelected ? '#111827' : 'transparent',
           }}
         />
       </View>
@@ -234,141 +247,28 @@ const ExploreTab = memo(({ tag, isSelected, onPress }: ExploreTabProps) => {
   );
 });
 
-interface TagTabViewProps {
-  dashboardTags: any[];
-  activeTagId: number | null;
-  productsByTagId: Record<number, any[]>;
-  onSelectTag: (id: number) => void;
-  onProductPress: (id: number) => void;
-}
-
-const TagTabView = memo(({
-  dashboardTags,
-  activeTagId,
-  productsByTagId,
-  onSelectTag,
-  onProductPress,
-}: TagTabViewProps) => {
-  const [expandedByTagId, setExpandedByTagId] = useState<Record<number, boolean>>({});
-
-  const routes = useMemo(
-    () => dashboardTags.map((tag) => ({ key: String(tag.id), title: tag.tagName })),
-    [dashboardTags]
-  );
-
-  const index = useMemo(() => {
-    const idx = dashboardTags.findIndex((tag) => tag.id === activeTagId);
-    return idx < 0 ? 0 : idx;
-  }, [dashboardTags, activeTagId]);
-
-  // Height: fit the max visible product rows across all tags (default 6 per tag).
-  const sceneHeight = useMemo(() => {
-    let maxRows = 1;
-    for (const tag of dashboardTags) {
-      const count = (productsByTagId[tag.id] || []).length;
-      const visible = expandedByTagId[tag.id] ? count : Math.min(count, 6);
-      const rows = Math.max(1, Math.ceil(visible / TAG_GRID_COLUMNS));
-      maxRows = Math.max(maxRows, rows);
-    }
-    return maxRows * heroRowHeight + 16;
-  }, [dashboardTags, productsByTagId, expandedByTagId]);
-
-  const renderTabBar = useCallback((props: any) => (
-    <TabBar
-      {...props}
-      scrollEnabled
-      activeColor={theme.colors.brand600}
-      inactiveColor="#64748B"
-      indicatorStyle={{
-        backgroundColor: theme.colors.brand500,
-        height: 4,
-        borderRadius: 999,
-      }}
-      labelStyle={tw`text-sm font-bold`}
-      style={tw`bg-transparent`}
-      tabStyle={{ width: 'auto', paddingHorizontal: 8, minWidth: 0 }}
-      indicatorContainerStyle={tw`mb-1`}
-    />
-  ), []);
-
-  const renderScene = useCallback(({ route }: any) => {
-    const tagId = Number(route.key);
-    const products = productsByTagId[tagId] || [];
-    const expanded = !!expandedByTagId[tagId];
-    const visible = expanded ? products : products.slice(0, 6);
-    const hasMore = products.length > 6 && !expanded;
-
-    return (
-      <View style={tw`mt-3`}>
-        {products.length > 0 ? (
-          <View style={tw`flex-row flex-wrap justify-between`}>
-            {visible.map((product: any) => (
-              <ExploreProductItem key={product.id} item={product} onPress={onProductPress} />
-            ))}
-          </View>
-        ) : (
-          <View style={tw`py-6 items-center`}>
-            <MyText style={tw`text-sm text-gray-500 font-medium`}>
-              No products in this category yet
-            </MyText>
-          </View>
-        )}
-        {hasMore && (
-          <MyTouchableOpacity
-            style={tw`self-center mt-1 mb-2 px-5 py-2.5 rounded-full bg-brand500 shadow-sm`}
-            activeOpacity={0.85}
-            onPress={() => setExpandedByTagId((prev) => ({ ...prev, [tagId]: true }))}
-          >
-            <MyText style={tw`text-white text-sm font-semibold`}>Show More</MyText>
-          </MyTouchableOpacity>
-        )}
-      </View>
-    );
-  }, [productsByTagId, expandedByTagId, onProductPress]);
-
-  return (
-    <TabView
-      navigationState={{ index, routes }}
-      onIndexChange={(i) => onSelectTag(Number(routes[i].key))}
-      renderTabBar={renderTabBar}
-      renderScene={renderScene}
-      swipeEnabled
-      lazy
-      style={{ height: TAB_BAR_HEIGHT + sceneHeight }}
-    />
-  );
-});
-
-interface StickyTabsRowProps {
+interface ExploreTabsRowProps {
   dashboardTags: any[];
   activeTagId: number | null;
   onSelectTag: (id: number) => void;
 }
 
-const StickyTabsRow = memo(({ dashboardTags, activeTagId, onSelectTag }: StickyTabsRowProps) => {
-  const scrollRef = useRef<ScrollView>(null);
-
-  const handleSelect = (id: number) => {
-    onSelectTag(id);
-    const idx = dashboardTags.findIndex((tag) => tag.id === id);
-    if (idx >= 0) {
-      scrollRef.current?.scrollTo({ x: idx * 96, animated: true });
-    }
-  };
-
-  return (
-    <ScrollView
-      ref={scrollRef}
-      horizontal
-      showsHorizontalScrollIndicator={false}
-      contentContainerStyle={tw`gap-3 py-1 px-1`}
-    >
-      {dashboardTags.map((tag) => (
-        <ExploreTab key={tag.id} tag={tag} isSelected={activeTagId === tag.id} onPress={() => handleSelect(tag.id)} />
-      ))}
-    </ScrollView>
-  );
-});
+const ExploreTabsRow = memo(({ dashboardTags, activeTagId, onSelectTag }: ExploreTabsRowProps) => (
+  <ScrollView
+    horizontal
+    showsHorizontalScrollIndicator={false}
+    contentContainerStyle={tw`gap-3 py-1 px-1`}
+  >
+    {dashboardTags.map((tag) => (
+      <ExploreTab
+        key={tag.id}
+        tag={tag}
+        isSelected={activeTagId === tag.id}
+        onPress={() => onSelectTag(tag.id)}
+      />
+    ))}
+  </ScrollView>
+));
 
 interface ExploreProductItemProps {
   item: any;
@@ -423,11 +323,12 @@ interface ListHeaderProps {
   gradientHeight: number;
   onGradientLayout: (height: number) => void;
   storesData: any;
+  popularProducts: any[];
   sortedSlots: any[];
   onProductPress: (id: number) => void;
   dashboardTags: any[];
   activeTagId: number | null;
-  productsByTagId: Record<number, any[]>;
+  activeTagProducts: any[];
   onSelectTag: (id: number) => void;
   onTabsSectionLayout: (layout: { y: number; height: number }) => void;
 }
@@ -436,19 +337,29 @@ const ListHeader = memo(({
   gradientHeight,
   onGradientLayout,
   storesData,
+  popularProducts,
   sortedSlots,
   onProductPress,
   dashboardTags,
   activeTagId,
-  productsByTagId,
+  activeTagProducts,
   onSelectTag,
   onTabsSectionLayout,
 }: ListHeaderProps) => {
+  const [showAllActiveProducts, setShowAllActiveProducts] = useState(false);
   const handleLayout = useCallback((event: any) => {
     const { y, height } = event.nativeEvent.layout;
     onGradientLayout(y + height);
   }, [onGradientLayout]);
 
+  React.useEffect(() => {
+    setShowAllActiveProducts(false);
+  }, [activeTagId]);
+
+  const renderPopularItem = useCallback(({ item }: { item: any }) => (
+    <PopularProductItem item={item} onPress={onProductPress} />
+  ), [onProductPress]);
+
   const renderSlotItem = useCallback(({ item }: { item: any }) => (
     <SlotItem item={item} />
   ), []);
@@ -459,14 +370,16 @@ const ListHeader = memo(({
   ], [gradientHeight]);
   const activeColor = activeTagId == null ? null : getTagColor(activeTagId);
   const pageTint = activeColor?.pageBg ?? '#FFFFFF';
+  const visibleActiveTagProducts = showAllActiveProducts ? activeTagProducts : activeTagProducts.slice(0, 6);
+  const hasMoreActiveTagProducts = activeTagProducts.length > visibleActiveTagProducts.length;
 
   return (
     <>
-      <View onLayout={handleLayout} style={{ backgroundColor: '#FFFFFF' }}>
+      <View onLayout={handleLayout} style={{ backgroundColor: pageTint }}>
         <LinearGradient
-          colors={['#FFFFFF', '#FFFFFF']}
+          colors={[pageTint, pageTint]}
           start={{ x: 0, y: 0 }}
-          end={{ x: 0, y: 1 }}
+          end={{ x: 1, y: 0.5 }}
           style={gradientStyle}
         />
 
@@ -477,29 +390,59 @@ const ListHeader = memo(({
               onTabsSectionLayout({ y, height });
             }}
             style={[
-              tw`mx-4 mb-2 rounded-[28px] px-3 pt-3 pb-[30px]`,
-              { backgroundColor: theme.colors.brand25 },
+              tw`mx-4 mb-2 rounded-[28px] px-3 pt-3 pb-2`,
+              { backgroundColor: pageTint },
             ]}
           >
-            <TagTabView
+            <ExploreTabsRow
               dashboardTags={dashboardTags}
               activeTagId={activeTagId}
-              productsByTagId={productsByTagId}
               onSelectTag={onSelectTag}
-              onProductPress={onProductPress}
             />
+            {activeTagProducts.length > 0 ? (
+              <View style={[tw`mt-4 relative`, { backgroundColor: pageTint }]}>
+                <View style={tw`flex-row flex-wrap justify-between`}>
+                  {visibleActiveTagProducts.map((product: any) => (
+                    <ExploreProductItem
+                      key={product.id}
+                      item={product}
+                      onPress={onProductPress}
+                    />
+                  ))}
+                </View>
+                {hasMoreActiveTagProducts && (
+                  <MyTouchableOpacity
+                    style={tw`self-center mt-1 mb-2 px-5 py-2.5 rounded-full bg-gray-900`}
+                    activeOpacity={0.85}
+                    onPress={() => setShowAllActiveProducts(true)}
+                  >
+                    <MyText style={tw`text-white text-sm font-semibold`}>Show More</MyText>
+                  </MyTouchableOpacity>
+                )}
+              </View>
+            ) : (
+              <View style={tw`py-6 items-center`}>
+                <MyText style={tw`text-sm text-gray-500 font-medium`}>
+                  No products in this category yet
+                </MyText>
+              </View>
+            )}
           </View>
         )}
       </View>
 
+      <View style={tw`py-4`}>
+        <BannerCarousel />
+      </View>
+
       <View
         style={[
           tw`rounded-t-3xl px-4`,
-          { backgroundColor: '#FFFFFF' },
+          { backgroundColor: pageTint },
         ]}
       >
         {storesData?.stores && storesData.stores.length > 0 && (
-          <View style={tw`mt-4 mb-5 rounded-[28px] bg-white shadow-sm border border-gray-100 px-3 pt-4 pb-2`}>
+          <View style={tw`mt-4 mb-5 rounded-[28px] bg-white/70 border border-white px-3 pt-4 pb-2`}>
             <View style={tw`flex-row items-center justify-between mb-4 px-1`}>
               <View>
                 <MyText style={tw`text-xl font-extrabold text-gray-900 tracking-tight`}>
@@ -524,15 +467,36 @@ const ListHeader = memo(({
           <NextOrderGlimpse />
         </View>
 
+        <View style={tw`mb-4 pt-2 px-1`}>
+          <MyText style={tw`text-2xl font-extrabold text-gray-900 tracking-tight`}>Popular Items</MyText>
+          <MyText style={tw`text-sm text-gray-500 font-medium`}>Trending fresh picks just for you</MyText>
+        </View>
+
+        <View style={tw`relative`}>
+          <MyFlatList
+            data={popularProducts}
+            keyExtractor={(item) => item.id.toString()}
+            horizontal
+            showsHorizontalScrollIndicator={false}
+            contentContainerStyle={staticStyles.popularListContent}
+            renderItem={renderPopularItem}
+            removeClippedSubviews={true}
+          />
+          <LinearGradient
+            colors={["transparent", "rgba(0,0,0,0.08)"]}
+            start={{ x: 0, y: 0.5 }}
+            end={{ x: 1, y: 0.5 }}
+            style={tw`absolute right-0 top-0 bottom-4 w-12 rounded-l-xl`}
+            pointerEvents="none"
+          />
+        </View>
+
         {sortedSlots.length > 0 && (
           <View style={tw`mt-2 mb-4`}>
             <View style={tw`flex-row items-center justify-between px-1 mb-6`}>
               <View>
-                <View style={tw`flex-row items-center mb-1.5`}>
-                  <View style={tw`w-1 h-5 rounded-full bg-brand500 mr-2.5`} />
-                  <MyText style={tw`text-2xl font-extrabold text-gray-900 tracking-tight`}>Upcoming Delivery Slots</MyText>
-                </View>
-                <MyText style={tw`text-sm text-gray-500 font-medium ml-4`}>Plan your fresh deliveries ahead</MyText>
+                <MyText style={tw`text-2xl font-extrabold text-gray-900 tracking-tight`}>Upcoming Delivery Slots</MyText>
+                <MyText style={tw`text-sm text-gray-500 font-medium mt-1`}>Plan your fresh deliveries ahead</MyText>
               </View>
             </View>
             <MyFlatList
@@ -552,11 +516,8 @@ const ListHeader = memo(({
         <View style={tw`mt-2 mb-4`}>
           <View style={tw`flex-row items-center justify-between px-1 mb-4`}>
             <View>
-              <View style={tw`flex-row items-center mb-1.5`}>
-                <View style={tw`w-1 h-5 rounded-full bg-brand500 mr-2.5`} />
-                <MyText style={tw`text-2xl font-extrabold text-gray-900 tracking-tight`}>All Available Products</MyText>
-              </View>
-              <MyText style={tw`text-sm text-gray-500 font-medium ml-4`}>Browse our complete selection</MyText>
+              <MyText style={tw`text-2xl font-extrabold text-gray-900 tracking-tight`}>All Available Products</MyText>
+              <MyText style={tw`text-sm text-gray-500 font-medium mt-1`}>Browse our complete selection</MyText>
             </View>
           </View>
         </View>
@@ -626,6 +587,21 @@ export default function Dashboard() {
     setHasMore(products.length > 10)
   }, [productsData, productSlotsMap]);
 
+  const popularItemIds = useMemo(() => {
+    const popularItems = essentialConsts?.popularItems;
+    if (!popularItems) return [];
+
+    if (Array.isArray(popularItems)) {
+      return popularItems.map((id: any) => parseInt(id)).filter((id: number) => !isNaN(id));
+    } else if (typeof popularItems === 'string') {
+      return popularItems
+        .split(',')
+        .map((id: string) => parseInt(id.trim()))
+        .filter((id: number) => !isNaN(id));
+    }
+    return [];
+  }, [essentialConsts?.popularItems]);
+
   const sortedSlots = useMemo(() => {
     if (!slotsData?.slots) return [];
     const now = dayjs();
@@ -638,43 +614,31 @@ export default function Dashboard() {
       });
   }, [slotsData]);
 
-  const productsByTagId = useMemo(() => {
-    const map: Record<number, any[]> = {};
-    for (const tag of dashboardTags) {
-      const productById = new Map<number, any>();
-      for (const product of products) {
-        productById.set(product.id, product);
-      }
+  const popularProducts = useMemo(() => {
+    return popularItemIds
+      .map(id => products.find(product => product.id === id))
+      .filter((product): product is NonNullable<typeof product> => product != null);
+  }, [popularItemIds, products]);
 
-      // tag.productIds is already in the admin-curated order (backend sorts by sortOrder).
-      const orderedIds = (tag.productIds || []).filter((id: number) => productById.has(id));
-      const ordered: any[] = [];
-      const rest: any[] = [];
-      for (const id of orderedIds) {
-        const product = productById.get(id);
-        const isOutOfStock = Boolean(productSlotsMap[id]?.isOutOfStock) || !getQuickestSlot(id);
-        if (isOutOfStock) rest.push(product);
-        else ordered.push(product);
-      }
+  const activeTagProducts = useMemo(() => {
+    if (activeTagId == null) return [];
+    const activeTag = dashboardTags.find((tag: any) => tag.id === activeTagId);
+    if (!activeTag) return [];
 
-      // Products in the tag's productIds but not in the curated order (added later) — availability sort.
-      const seen = new Set(orderedIds);
-      const extra = products
-        .filter((product: any) => (tag.productIds?.includes(product.id) ?? false) && !seen.has(product.id))
-        .sort((a: any, b: any) => {
-          const slotA = getQuickestSlot(a.id)
-          const slotB = getQuickestSlot(b.id)
-          const aOutOfStock = Boolean(productSlotsMap[a.id]?.isOutOfStock) || !slotA
-          const bOutOfStock = Boolean(productSlotsMap[b.id]?.isOutOfStock) || !slotB
-          if (aOutOfStock && !bOutOfStock) return 1
-          if (!aOutOfStock && bOutOfStock) return -1
-          return 0
-        });
+    return products
+      .filter((product: any) => activeTag.productIds?.includes(product.id) ?? false)
+      .sort((a: any, b: any) => {
+        const slotA = getQuickestSlot(a.id)
+        const slotB = getQuickestSlot(b.id)
 
-      map[tag.id] = [...ordered, ...rest, ...extra];
-    }
-    return map;
-  }, [dashboardTags, products, getQuickestSlot, productSlotsMap]);
+        const aOutOfStock = Boolean(productSlotsMap[a.id]?.isOutOfStock) || !slotA
+        const bOutOfStock = Boolean(productSlotsMap[b.id]?.isOutOfStock) || !slotB
+
+        if (aOutOfStock && !bOutOfStock) return 1
+        if (!aOutOfStock && bOutOfStock) return -1
+        return 0
+      });
+  }, [activeTagId, dashboardTags, products, getQuickestSlot, productSlotsMap]);
 
   const handleRefresh = useCallback(async () => {
     setIsRefreshing(true);
@@ -739,25 +703,26 @@ export default function Dashboard() {
       gradientHeight={gradientHeight}
       onGradientLayout={handleGradientLayout}
       storesData={storesData}
+      popularProducts={popularProducts}
       sortedSlots={sortedSlots}
       onProductPress={handleProductPress}
       dashboardTags={dashboardTags}
       activeTagId={activeTagId}
-      productsByTagId={productsByTagId}
+      activeTagProducts={activeTagProducts}
       onSelectTag={setSelectedTagId}
       onTabsSectionLayout={handleTabsSectionLayout}
     />
-  ), [gradientHeight, handleGradientLayout, storesData, sortedSlots, handleProductPress, dashboardTags, activeTagId, productsByTagId, handleTabsSectionLayout]);
+  ), [gradientHeight, handleGradientLayout, storesData, popularProducts, sortedSlots, handleProductPress, dashboardTags, activeTagId, activeTagProducts, handleTabsSectionLayout]);
 
   const pageTint = activeTagId == null ? '#FFFFFF' : getTagColor(activeTagId).pageBg;
   const pageTintStyle = useMemo(() => [
     tw`flex-1`,
-    { backgroundColor: '#FFFFFF' }
+    { backgroundColor: pageTint }
   ], [pageTint]);
 
   const searchBarContainerStyle = useMemo(() => [
     tw`w-full px-4 pt-4 pb-0`,
-    { backgroundColor: '#FFFFFF' }
+    { backgroundColor: pageTint }
   ], [pageTint]);
 
   const listContentContainerStyle = useMemo(() => [
@@ -786,8 +751,11 @@ export default function Dashboard() {
       </View>
     );
   }
+  let str = ''
+  displayedProducts.forEach(product => str += `${product.id}-`)
+  // console.log(str)
   return (
-    <TabLayoutWrapper style={{ backgroundColor: '#FFFFFF' }}>
+    <TabLayoutWrapper style={{ backgroundColor: pageTint }}>
       <View style={pageTintStyle}>
         <View
           style={searchBarContainerStyle}
@@ -812,7 +780,7 @@ export default function Dashboard() {
           data={displayedProducts}
           keyExtractor={(item) => item.id.toString()}
           numColumns={2}
-          style={{ backgroundColor: '#FFFFFF' }}
+          style={{ backgroundColor: pageTint }}
           onScroll={handleListScroll}
           scrollEventThrottle={16}
           contentContainerStyle={listContentContainerStyle}
@@ -823,8 +791,8 @@ export default function Dashboard() {
             <RefreshControl
               refreshing={isRefreshing}
               onRefresh={handleRefresh}
-              tintColor={theme.colors.brand500}
-              colors={[theme.colors.brand500]}
+              tintColor="#3b82f6"
+              colors={["#3b82f6"]}
             />
           }
           ListEmptyComponent={
@@ -846,7 +814,7 @@ export default function Dashboard() {
               tw`absolute left-0 right-0 z-20 px-4 pb-2`,
               {
                 top: searchBarHeight,
-                backgroundColor: '#FFFFFF',
+                backgroundColor: pageTint,
                 elevation: 8,
               },
             ]}
@@ -854,10 +822,10 @@ export default function Dashboard() {
             <View
               style={[
                 tw`rounded-[28px] px-3 pt-2 pb-1`,
-                { backgroundColor: theme.colors.brand25 },
+                { backgroundColor: pageTint },
               ]}
             >
-              <StickyTabsRow
+              <ExploreTabsRow
                 dashboardTags={dashboardTags}
                 activeTagId={activeTagId}
                 onSelectTag={setSelectedTagId}

apps/user-ui/components/ProductDetail.tsx

@@ -2,7 +2,6 @@ import React, { useState, useMemo } from 'react';
 import { View, ScrollView, Alert, Dimensions, FlatList, RefreshControl } from 'react-native';
 import { useRouter } from 'expo-router';
 import { ImageCarousel, tw, BottomDialog, useManualRefresh, useMarkDataFetchers, LoadingDialog, ImageUploader, MyText, MyTextInput, MyTouchableOpacity, Quantifier } from 'common-ui';
-import { Image } from 'expo-image';
 import { LinearGradient } from 'expo-linear-gradient';
 import usePickImage from 'common-ui/src/components/use-pick-image';
 import { theme } from 'common-ui/src/theme';
@@ -378,54 +377,6 @@ const ProductDetail: React.FC<ProductDetailProps> = ({ productId, isFlashDeliver
           </View>
         </View>
 
-        {/* Combo Items */}
-        {productDetail.productType === 'combo' && productDetail.comboItems && productDetail.comboItems.length > 0 && (
-          <View style={tw`px-4 mb-4`}>
-            <View style={tw`bg-white p-5 rounded-2xl shadow-sm border border-gray-100`}>
-              <View style={tw`flex-row items-center mb-4`}>
-                <View style={tw`w-8 h-8 bg-brand50 rounded-full items-center justify-center mr-3`}>
-                  <MaterialIcons name="view-list" size={18} color="#3B82F6" />
-                </View>
-                <MyText style={tw`text-lg font-bold text-gray-900`}>Included Items</MyText>
-              </View>
-
-              {productDetail.comboItems.map((comboItem, index) => (
-                <View
-                  key={comboItem.skuId}
-                  style={tw`flex-row items-center py-2 ${index !== productDetail.comboItems.length - 1 ? 'border-b border-gray-50' : ''}`}
-                >
-                  <View style={tw`w-12 h-12 bg-gray-100 rounded-lg overflow-hidden items-center justify-center mr-3`}>
-                    {comboItem.images?.[0] ? (
-                      <Image
-                        source={{ uri: comboItem.images[0] }}
-                        style={tw`w-full h-full`}
-                        resizeMode="cover"
-                      />
-                    ) : (
-                      <MaterialIcons name="image" size={20} color="#9CA3AF" />
-                    )}
-                  </View>
-                  <View style={tw`flex-1`}>
-                    <View style={tw`flex-row items-center`}>
-                      <MyText style={tw`text-sm font-bold text-gray-900 flex-1`} numberOfLines={1}>
-                        {comboItem.productName}
-                      </MyText>
-                      {comboItem.isOffer && (
-                        <View style={tw`ml-2 bg-pink-100 px-2 py-0.5 rounded-full`}>
-                          <MyText style={tw`text-[10px] font-bold text-pink-600`}>OFFER</MyText>
-                        </View>
-                      )}
-                    </View>
-                    <MyText style={tw`text-xs text-gray-500 mt-0.5`}>
-                      {comboItem.unitNotation || comboItem.skuName || ''}
-                    </MyText>
-                  </View>
-                </View>
-              ))}
-            </View>
-          </View>
-        )}
-
         {/* Delivery Slots */}
         <View style={tw`px-4 mb-4`}>
           <View style={tw`bg-white p-5 rounded-2xl shadow-sm border border-gray-100`}>

apps/user-ui/hooks/cart-query-hooks.tsx

@@ -1,4 +1,4 @@
-import { useCentralProductStore } from '@/src/store/centralProductStore';
+import { useAllProducts } from '@/src/hooks/prominent-api-hooks';
 import { useCentralSlotStore } from '@/src/store/centralSlotStore';
 import { Alert } from 'react-native';
 import { useQuery, useMutation, useQueryClient, UseQueryResult, UseMutationResult } from '@tanstack/react-query';
@@ -184,7 +184,7 @@ const clearLocalCart = async (cartType: CartType = "regular"): Promise<void> =>
 };
 
 export function useGetCart(options: UseGetCartOptions = {}, cartType: CartType = "regular"): UseGetCartReturn {
-  const productsById = useCentralProductStore((state) => state.productsById);
+  const { data: products } = useAllProducts();
   const productSlotsMap = useCentralSlotStore((state) => state.productSlotsMap);
   
   const query: UseQueryResult<CartData, Error> = useQuery({
@@ -193,7 +193,7 @@ export function useGetCart(options: UseGetCartOptions = {}, cartType: CartType =
       const cartItems = await getLocalCart(cartType);
 
       const productMap: Record<number, Omit<ProductSummary, 'isOutOfStock' | 'isFlashAvailable'>> = Object.fromEntries(
-        Object.values(productsById).map((p) => [
+        products?.products?.map((p) => [
           p.id,
           {
             id: p.id,
@@ -206,7 +206,7 @@ export function useGetCart(options: UseGetCartOptions = {}, cartType: CartType =
             productQuantity: p.productQuantity,
             unitNotation: p.unitNotation,
           },
-        ])
+        ]) ?? []
       );
 
       const items: CartItem[] = cartItems
@@ -236,7 +236,7 @@ export function useGetCart(options: UseGetCartOptions = {}, cartType: CartType =
       };
     },
     refetchOnWindowFocus: options?.refetchOnWindowFocus ?? true,
-    enabled: (options?.enabled ?? true) && Object.keys(productsById).length > 0,
+    enabled: (options?.enabled ?? true) && !!products,
   });
   
   return {

apps/user-ui/src/hooks/prominent-api-hooks.ts

@@ -1,8 +1,7 @@
-import React from 'react'
 import { useQuery } from '@tanstack/react-query'
 import axios from 'axios'
 import { trpc } from '@/src/trpc-client'
-import { AllProductsApiType, StoresApiType, SlotsApiType, EssentialConstsApiType, BannersApiType, StoreWithProductsApiType, AvailabilityApiType } from "@backend/trpc/router";
+import { AllProductsApiType, StoresApiType, SlotsApiType, EssentialConstsApiType, BannersApiType, StoreWithProductsApiType } from "@backend/trpc/router";
 import { CACHE_FILENAMES } from "@packages/shared";
 
 // Local useGetEssentialConsts hook
@@ -19,19 +18,6 @@ type SlotsResponse = SlotsApiType;
 type EssentialConstsResponse = EssentialConstsApiType;
 type BannersResponse = BannersApiType;
 type StoreWithProductsResponse = StoreWithProductsApiType;
-type AvailabilityResponse = AvailabilityApiType;
-
-type BaseProduct = AllProductsApiType['products'][number]
-type AvailabilityEntry = AvailabilityApiType['availability'][number]
-
-export type MergedProduct = BaseProduct & {
-  price: number
-  marketPrice: number | null
-  flashPrice: string | null
-  isFlashAvailable: boolean
-  isOutOfStock: boolean
-  isSuspended: boolean
-}
 
 function useCacheUrl(filename: string): string | null {
   const { data: essentialConsts } = useGetEssentialConsts()
@@ -47,37 +33,11 @@ function useCacheUrl(filename: string): string | null {
   return `${assetsDomain}${apiCacheKey}/v-${cacheVersion}/${filename}`
 }
 
-function useAvailabilityCacheUrl(): string | null {
-  const { data: essentialConsts } = useGetEssentialConsts()
-
-  const assetsDomain = essentialConsts?.assetsDomain
-  const availabilityVersionNum = essentialConsts?.availabilityVersionNum
-
-  if (!assetsDomain || availabilityVersionNum === undefined || availabilityVersionNum === null) {
-    return null
-  }
-
-  return `${assetsDomain}av-${availabilityVersionNum}/${CACHE_FILENAMES.availability}`
-}
-
-function useSlotsCacheUrl(): string | null {
-  const { data: essentialConsts } = useGetEssentialConsts()
-
-  const assetsDomain = essentialConsts?.assetsDomain
-  const slotsVersionNum = essentialConsts?.slotsVersionNum
-
-  if (!assetsDomain || slotsVersionNum === undefined || slotsVersionNum === null) {
-    return null
-  }
-
-  return `${assetsDomain}slots/v-${slotsVersionNum}/${CACHE_FILENAMES.slots}`
-}
-
 export function useAllProducts() {
   const cacheUrl = useCacheUrl(CACHE_FILENAMES.products)
-  const { data: availabilityData } = useAvailability()
 
-  const productsQuery = useQuery<ProductsResponse>({
+  
+  return useQuery<ProductsResponse>({
     queryKey: ['all-products', cacheUrl],
     queryFn: async () => {
       if (!cacheUrl) {
@@ -89,57 +49,6 @@ export function useAllProducts() {
     staleTime: 60000, // 1 minute
     enabled: !!cacheUrl,
   })
-
-  const mergedProducts = React.useMemo(() => {
-    const rawProducts = productsQuery.data?.products || []
-    const availabilityById: Record<number, AvailabilityEntry> = {}
-    availabilityData?.availability?.forEach((entry: AvailabilityEntry) => {
-      availabilityById[entry.id] = entry
-    })
-
-    return rawProducts.map((product) => {
-      const availability = availabilityById[product.id]
-      return {
-        ...product,
-        price: availability ? Number(availability.price) : 0,
-        marketPrice: availability?.marketPrice != null ? Number(availability.marketPrice) : null,
-        flashPrice: availability?.flashPrice ?? null,
-        isFlashAvailable: availability?.isFlashAvailable ?? false,
-        isOutOfStock: availability?.isOutOfStock ?? false,
-        isSuspended: availability?.isSuspended ?? false,
-      }
-    })
-  }, [productsQuery.data, availabilityData])
-
-  const mergedData = React.useMemo(() => {
-    if (!productsQuery.data) return undefined
-    return {
-      ...productsQuery.data,
-      products: mergedProducts,
-    } as ProductsResponse & { products: MergedProduct[] }
-  }, [productsQuery.data, mergedProducts])
-
-  return {
-    ...productsQuery,
-    data: mergedData,
-  }
-}
-
-export function useAvailability() {
-  const cacheUrl = useAvailabilityCacheUrl()
-
-  return useQuery<AvailabilityResponse>({
-    queryKey: ['availability', cacheUrl],
-    queryFn: async () => {
-      if (!cacheUrl) {
-        throw new Error('Cache URL not available')
-      }
-      const response = await axios.get<AvailabilityResponse>(cacheUrl)
-      return response.data
-    },
-    staleTime: 60000, // 1 minute
-    enabled: !!cacheUrl,
-  })
 }
 
 export function useStores() {
@@ -160,7 +69,7 @@ export function useStores() {
 }
 
 export function useSlots() {
-  const cacheUrl = useSlotsCacheUrl()
+  const cacheUrl = useCacheUrl(CACHE_FILENAMES.slots)
 
   return useQuery<SlotsResponse>({
     queryKey: ['slots', cacheUrl],

apps/user-ui/src/store/centralProductStore.ts

@@ -1,8 +1,9 @@
 import { create } from 'zustand'
 import { useEffect } from 'react'
-import { useAllProducts, type MergedProduct } from '@/src/hooks/prominent-api-hooks'
+import { useAllProducts } from '@/src/hooks/prominent-api-hooks'
+import { AllProductsApiType } from '@backend/trpc/router'
 
-export type Product = MergedProduct
+type Product = AllProductsApiType['products'][number]
 
 interface CentralProductState {
   products: Product[]

apps/user-ui/src/store/centralSlotStore.ts

@@ -1,24 +1,22 @@
 import { create } from 'zustand';
-import { useSlots, useAvailability } from '@/src/hooks/prominent-api-hooks';
+import { useSlots } from '@/src/hooks/prominent-api-hooks';
 import { useEffect } from 'react';
-import { SlotsApiType, AvailabilityApiType } from "@backend/trpc/router";
+import { SlotsApiType } from "@backend/trpc/router";
 
 type Slot = SlotsApiType['slots'][number];
 type ProductAvailability = SlotsApiType['productAvailability'][number];
-type AvailabilityEntry = AvailabilityApiType['availability'][number];
 
 interface ProductSlotInfo {
   slots: Slot[];
   isOutOfStock: boolean;
   isFlashAvailable: boolean;
-  isSuspended: boolean;
 }
 
 interface CentralSlotState {
   slots: Slot[];
   productSlotsMap: Record<number, ProductSlotInfo>;
   refetchSlots: (() => Promise<void>) | null;
-  setSlotsData: (slots: Slot[], productAvailability: ProductAvailability[], availability: AvailabilityEntry[]) => void;
+  setSlotsData: (slots: Slot[], productAvailability: ProductAvailability[]) => void;
   clearSlotsData: () => void;
   setRefetchSlots: (refetch: () => Promise<void>) => void;
 }
@@ -27,20 +25,15 @@ export const useCentralSlotStore = create<CentralSlotState>((set) => ({
   slots: [],
   productSlotsMap: {},
   refetchSlots: null,
-  setSlotsData: (slots, productAvailability, availability) => {
+  setSlotsData: (slots, productAvailability) => {
     const productSlotsMap: Record<number, ProductSlotInfo> = {};
-    const availabilityById: Record<number, AvailabilityEntry> = {};
-    availability.forEach((entry) => {
-      availabilityById[entry.id] = entry;
-    });
 
     // First, create entries for ALL products from productAvailability
     productAvailability.forEach((product) => {
       productSlotsMap[product.id] = {
         slots: [],
-        isOutOfStock: availabilityById[product.id]?.isOutOfStock ?? false,
-        isFlashAvailable: availabilityById[product.id]?.isFlashAvailable ?? false,
-        isSuspended: availabilityById[product.id]?.isSuspended ?? false,
+        isOutOfStock: product.isOutOfStock,
+        isFlashAvailable: product.isFlashAvailable,
       };
     });
 
@@ -61,15 +54,14 @@ export const useCentralSlotStore = create<CentralSlotState>((set) => ({
 
 export function useInitializeCentralSlotStore() {
   const { data: slotsData, refetch } = useSlots();
-  const { data: availabilityData } = useAvailability();
   const setSlotsData = useCentralSlotStore((state) => state.setSlotsData);
   const setRefetchSlots = useCentralSlotStore((state) => state.setRefetchSlots);
 
   useEffect(() => {
     if (slotsData?.slots) {
-      setSlotsData(slotsData.slots, slotsData.productAvailability || [], availabilityData?.availability || []);
+      setSlotsData(slotsData.slots, slotsData.productAvailability || []);
     }
-  }, [slotsData, availabilityData, setSlotsData]);
+  }, [slotsData, setSlotsData]);
 
   useEffect(() => {
     setRefetchSlots(async () => {

apps/web-ui/src/components/AddToCartDialog.tsx

@@ -4,7 +4,6 @@ import { BottomDialog, p, div, Quantifier } from 'web-components'
 import { useSlots } from '../hooks/prominent-api-hooks'
 import { useAddToCart, useUpdateCartItem, useRemoveFromCart, useGetCart } from '../hooks/cart-query-hooks'
 import { useCartStore } from '../lib/stores/cart-store'
-import { useCentralSlotStore } from '../lib/stores/central-slot-store'
 import { ShoppingCart, Truck, Zap, X } from 'lucide-react'
 import dayjs from 'dayjs'
 
@@ -30,7 +29,6 @@ export default function AddToCartDialog() {
 
   const { data: slotsData } = useSlots()
   const { data: cartData } = useGetCart()
-  const productSlotsMap = useCentralSlotStore((state) => state.productSlotsMap)
   const isFlashDeliveryEnabled = true
 
   const addToCart = useAddToCart('regular')
@@ -78,7 +76,7 @@ export default function AddToCartDialog() {
   const cartItem = cartData?.items?.find((item: any) => item.productId === product?.id)
   const isUpdate = (cartItem?.quantity || 0) >= 1
 
-  const productAvailability = productSlotsMap[product?.id]
+  const productAvailability = slotsData?.productAvailability?.find((pa: any) => pa.id === product?.id)
   const showFlashOption = productAvailability?.isFlashAvailable === true && isFlashDeliveryEnabled
 
   const handleAddToCart = () => {

apps/web-ui/src/hooks/prominent-api-hooks.ts

@@ -1,10 +1,8 @@
-import { useMemo } from 'react'
 import { useQuery } from '@tanstack/react-query'
 import axios from 'axios'
 import { trpc } from '../lib/trpc-client'
 import type {
   AllProductsApiType,
-  AvailabilityApiType,
   StoresApiType,
   SlotsApiType,
   EssentialConstsApiType,
@@ -25,17 +23,6 @@ type StoresResponse = StoresApiType
 type SlotsResponse = SlotsApiType
 type BannersResponse = BannersApiType
 type StoreWithProductsResponse = StoreWithProductsApiType
-type AvailabilityResponse = AvailabilityApiType
-
-type BaseProduct = AllProductsApiType['products'][number]
-type AvailabilityEntry = AvailabilityApiType['availability'][number]
-
-export type MergedProduct = BaseProduct & {
-  price: number
-  marketPrice: number | null
-  flashPrice: string | null
-  isFlashAvailable: boolean
-}
 
 function useCacheUrl(filename: string): string | null {
   const { data: essentialConsts } = useGetEssentialConsts()
@@ -56,37 +43,10 @@ function useCacheUrl(filename: string): string | null {
   return `${assetsDomain}${apiCacheKey}/v-${cacheVersion}/${filename}`
 }
 
-function useAvailabilityCacheUrl(): string | null {
-  const { data: essentialConsts } = useGetEssentialConsts()
-
-  const assetsDomain = essentialConsts?.assetsDomain
-  const availabilityVersionNum = essentialConsts?.availabilityVersionNum
-
-  if (!assetsDomain || availabilityVersionNum === undefined || availabilityVersionNum === null) {
-    return null
-  }
-
-  return `${assetsDomain}av-${availabilityVersionNum}/${CACHE_FILENAMES.availability}`
-}
-
-function useSlotsCacheUrl(): string | null {
-  const { data: essentialConsts } = useGetEssentialConsts()
-
-  const assetsDomain = essentialConsts?.assetsDomain
-  const slotsVersionNum = essentialConsts?.slotsVersionNum
-
-  if (!assetsDomain || slotsVersionNum === undefined || slotsVersionNum === null) {
-    return null
-  }
-
-  return `${assetsDomain}slots/v-${slotsVersionNum}/${CACHE_FILENAMES.slots}`
-}
-
 export function useAllProducts() {
   const cacheUrl = useCacheUrl(CACHE_FILENAMES.products)
-  const { data: availabilityData } = useAvailability()
 
-  const productsQuery = useQuery<ProductsResponse>({
+  return useQuery<ProductsResponse>({
     queryKey: ['all-products', cacheUrl],
     queryFn: async () => {
       if (!cacheUrl) {
@@ -98,55 +58,6 @@ export function useAllProducts() {
     staleTime: 60000,
     enabled: !!cacheUrl,
   })
-
-  const mergedProducts = useMemo(() => {
-    const rawProducts = productsQuery.data?.products || []
-    const availabilityById: Record<number, AvailabilityEntry> = {}
-    availabilityData?.availability?.forEach((entry: AvailabilityEntry) => {
-      availabilityById[entry.id] = entry
-    })
-
-    return rawProducts.map((product) => {
-      const availability = availabilityById[product.id]
-      return {
-        ...product,
-        price: availability ? Number(availability.price) : 0,
-        marketPrice: availability?.marketPrice != null ? Number(availability.marketPrice) : null,
-        flashPrice: availability?.flashPrice ?? null,
-        isFlashAvailable: availability?.isFlashAvailable ?? false,
-      }
-    })
-  }, [productsQuery.data, availabilityData])
-
-  const mergedData = useMemo(() => {
-    if (!productsQuery.data) return undefined
-    return {
-      ...productsQuery.data,
-      products: mergedProducts,
-    } as ProductsResponse & { products: MergedProduct[] }
-  }, [productsQuery.data, mergedProducts])
-
-  return {
-    ...productsQuery,
-    data: mergedData,
-  }
-}
-
-export function useAvailability() {
-  const cacheUrl = useAvailabilityCacheUrl()
-
-  return useQuery<AvailabilityResponse>({
-    queryKey: ['availability', cacheUrl],
-    queryFn: async () => {
-      if (!cacheUrl) {
-        throw new Error('Cache URL not available')
-      }
-      const response = await axios.get<AvailabilityResponse>(cacheUrl)
-      return response.data
-    },
-    staleTime: 60000,
-    enabled: !!cacheUrl,
-  })
 }
 
 export function useStores() {
@@ -167,7 +78,7 @@ export function useStores() {
 }
 
 export function useSlots() {
-  const cacheUrl = useSlotsCacheUrl()
+  const cacheUrl = useCacheUrl(CACHE_FILENAMES.slots)
 
   return useQuery<SlotsResponse>({
     queryKey: ['slots', cacheUrl],

packages/db_helper_sqlite/drizzle/0002_sku_split.sql

@@ -9,7 +9,13 @@ CREATE TABLE `product_skus` (
 	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
 	`product_id` integer NOT NULL,
 	`name` text,
+	`price` text NOT NULL,
+	`market_price` text,
 	`images` text,
+	`is_out_of_stock` integer DEFAULT false NOT NULL,
+	`is_suspended` integer DEFAULT false NOT NULL,
+	`is_flash_available` integer DEFAULT false NOT NULL,
+	`flash_price` text,
 	`is_offer` integer DEFAULT false NOT NULL,
 	`is_combo_only` integer DEFAULT false NOT NULL,
 	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
@@ -28,12 +34,19 @@ CREATE UNIQUE INDEX `unique_sku_feature_name` ON `sku_features` (`sku_id`,`featu
 
 -- 2. Migrate each existing product into one default SKU plus a mandatory quantity feature.
 INSERT INTO `product_skus` (
-	`product_id`, `name`, `images`, `created_at`
+	`product_id`, `name`, `price`, `market_price`, `images`, `is_out_of_stock`,
+	`is_suspended`, `is_flash_available`, `flash_price`, `created_at`
 )
 SELECT
 	`id`,
 	NULL,
+	`price`,
+	`market_price`,
 	`images`,
+	`is_out_of_stock`,
+	`is_suspended`,
+	`is_flash_available`,
+	`flash_price`,
 	`created_at`
 FROM `product_info`;
 
@@ -46,33 +59,6 @@ FROM `product_info` `pi`
 JOIN `product_skus` `ps` ON `ps`.`product_id` = `pi`.`id`
 LEFT JOIN `units` `u` ON `u`.`id` = `pi`.`unit_id`;
 
--- 2b. Create product_market_stats to hold pricing/flash/stock per SKU, and backfill it.
-CREATE TABLE `product_market_stats` (
-	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`sku_id` integer NOT NULL,
-	`market_price` text,
-	`our_price` text NOT NULL,
-	`is_flash_available` integer DEFAULT false NOT NULL,
-	`flash_price` text,
-	`is_out_of_stock` integer DEFAULT false NOT NULL,
-	`is_suspended` integer DEFAULT false NOT NULL,
-	FOREIGN KEY (`sku_id`) REFERENCES `product_skus`(`id`) ON UPDATE no action ON DELETE no action
-);
-
-CREATE UNIQUE INDEX `product_market_stats_sku_id_unique` ON `product_market_stats` (`sku_id`);
-
-INSERT INTO `product_market_stats` (`sku_id`, `market_price`, `our_price`, `is_flash_available`, `flash_price`, `is_out_of_stock`, `is_suspended`)
-SELECT
-	`ps`.`id`,
-	`pi`.`market_price`,
-	`pi`.`price`,
-	`pi`.`is_flash_available`,
-	`pi`.`flash_price`,
-	`pi`.`is_out_of_stock`,
-	`pi`.`is_suspended`
-FROM `product_info` `pi`
-JOIN `product_skus` `ps` ON `ps`.`product_id` = `pi`.`id`;
-
 -- 3. Build a product_id -> sku_id mapping for downstream tables.
 CREATE TABLE `__product_to_sku` (
 	`product_id` integer PRIMARY KEY,
@@ -261,8 +247,5 @@ CREATE TABLE `product_combos` (
 
 CREATE UNIQUE INDEX `unique_combo_sku_item` ON `product_combos` (`combo_sku_id`,`sku_id`);
 
--- 11. Add sort_order to product_tag_info for curated product ordering per tag.
-ALTER TABLE `product_tag_info` ADD COLUMN `sort_order` text DEFAULT '[]';
-
 -- PRAGMA foreign_keys=ON;
 PRAGMA defer_foreign_keys = off;

packages/db_helper_sqlite/index.ts

@@ -32,10 +32,6 @@ export {
   upsertConstants,
   getCacheVersion,
   incrementCacheVersion,
-  getAvailabilityVersionNum,
-  incrementAvailabilityVersionNum,
-  getSlotsVersionNum,
-  incrementSlotsVersionNum,
 } from './src/admin-apis/const'
 
 export {
@@ -86,7 +82,6 @@ export {
   createSpecialDealsForSku,
   updateSkuDeals,
   replaceProductTags,
-  replaceTagProducts,
   mergeSkus,
   updateSlotProducts,
   getSlotsProductIds,
@@ -319,14 +314,12 @@ export {
   type BannerData,
   // Product Store
   getAllProductsForCache,
-  getAvailabilityForCache,
   getAllStoresForCache,
   getAllDeliverySlotsForCache,
   getAllSpecialDealsForCache,
   getAllProductTagsForCache,
   getAllProductCombosForCache,
   type ProductBasicData,
-  type AvailabilityCacheData,
   type StoreBasicData,
   type DeliverySlotData,
   type SpecialDealData,

packages/db_helper_sqlite/src/admin-apis/const.ts

@@ -76,69 +76,3 @@ export async function incrementCacheVersion(): Promise<number> {
     return nextValue
   })
 }
-
-const AVAILABILITY_VERSION_KEY = CONST_KEYS.availabilityVersionNum
-
-export async function getAvailabilityVersionNum(): Promise<number> {
-  const record = await db.query.keyValStore.findFirst({
-    where: eq(keyValStore.key, AVAILABILITY_VERSION_KEY),
-    columns: { value: true },
-  })
-
-  return record ? parseCacheVersion(record.value) : 0
-}
-
-export async function incrementAvailabilityVersionNum(): Promise<number> {
-  return db.transaction(async (tx) => {
-    const existing = await tx.query.keyValStore.findFirst({
-      where: eq(keyValStore.key, AVAILABILITY_VERSION_KEY),
-      columns: { value: true },
-    })
-
-    const nextValue = parseCacheVersion(existing?.value) + 1
-
-    if (existing) {
-      await tx.update(keyValStore)
-        .set({ value: nextValue +'' })
-        .where(eq(keyValStore.key, AVAILABILITY_VERSION_KEY))
-    } else {
-      await tx.insert(keyValStore)
-        .values({ key: AVAILABILITY_VERSION_KEY, value: nextValue+'' })
-    }
-
-    return nextValue
-  })
-}
-
-const SLOTS_VERSION_KEY = CONST_KEYS.slotsVersionNum
-
-export async function getSlotsVersionNum(): Promise<number> {
-  const record = await db.query.keyValStore.findFirst({
-    where: eq(keyValStore.key, SLOTS_VERSION_KEY),
-    columns: { value: true },
-  })
-
-  return record ? parseCacheVersion(record.value) : 0
-}
-
-export async function incrementSlotsVersionNum(): Promise<number> {
-  return db.transaction(async (tx) => {
-    const existing = await tx.query.keyValStore.findFirst({
-      where: eq(keyValStore.key, SLOTS_VERSION_KEY),
-      columns: { value: true },
-    })
-
-    const nextValue = parseCacheVersion(existing?.value) + 1
-
-    if (existing) {
-      await tx.update(keyValStore)
-        .set({ value: nextValue +'' })
-        .where(eq(keyValStore.key, SLOTS_VERSION_KEY))
-    } else {
-      await tx.insert(keyValStore)
-        .values({ key: SLOTS_VERSION_KEY, value: nextValue+'' })
-    }
-
-    return nextValue
-  })
-}

packages/db_helper_sqlite/src/admin-apis/product.ts

@@ -1,7 +1,7 @@
+// @ts-nocheck -- temporary: file partially updated for SKU migration; remaining functions to be fixed later
 import { db } from '../db/db_index'
 import {
   productInfo,
-  productMarketStats,
   productSkus,
   skuFeatures,
   productCombos,
@@ -45,42 +45,7 @@ import type {
 
 type ProductRow = InferSelectModel<typeof productInfo>
 type SkuRow = InferSelectModel<typeof productSkus>
-type MarketStatsRow = InferSelectModel<typeof productMarketStats>
 type SkuFeatureRow = InferSelectModel<typeof skuFeatures>
-
-interface CreateSkuFeatureInput {
-  featureName?: string | null
-  featureValue: string
-}
-
-interface CreateComboItemInput {
-  skuId: number
-}
-
-interface CreateSkuInput {
-  name?: string | null
-  price: number
-  marketPrice?: number | null
-  images?: string[] | null
-  isFlashAvailable?: boolean
-  flashPrice?: number | null
-  isOutOfStock?: boolean
-  isSuspended?: boolean
-  isOffer?: boolean
-  isComboOnly?: boolean
-  features: CreateSkuFeatureInput[]
-  comboItems?: CreateComboItemInput[]
-}
-
-interface CreateProductInput {
-  name: string
-  shortDescription?: string | null
-  longDescription?: string | null
-  storeId?: number | null
-  incrementStep?: number
-  productType?: 'item' | 'combo'
-  skus: CreateSkuInput[]
-}
 type UnitRow = InferSelectModel<typeof units>
 type StoreRow = InferSelectModel<typeof storeInfo>
 type SpecialDealRow = InferSelectModel<typeof specialDeals>
@@ -129,23 +94,18 @@ const mapSkuFeature = (feature: SkuFeatureRow): AdminSkuFeature => ({
   featureValue: feature.featureValue,
 })
 
-const mapSku = (
-  sku: SkuRow,
-  features: SkuFeatureRow[] = [],
-  comboItems: any[] = [],
-  marketStats: MarketStatsRow | null = null
-): AdminSku => ({
+const mapSku = (sku: SkuRow, features: SkuFeatureRow[] = [], comboItems: any[] = []): AdminSku => ({
   id: sku.id,
   productId: sku.productId,
   name: sku.name ?? null,
-  price: marketStats?.ourPrice ? String(marketStats.ourPrice) : '0',
-  marketPrice: marketStats?.marketPrice ? String(marketStats.marketPrice) : null,
+  price: String(sku.price ?? '0'),
+  marketPrice: sku.marketPrice ? String(sku.marketPrice) : null,
   images: getStringArray(sku.images),
   imageKeys: getStringArray(sku.images),
-  isOutOfStock: marketStats?.isOutOfStock ?? false,
-  isSuspended: marketStats?.isSuspended ?? false,
-  isFlashAvailable: marketStats?.isFlashAvailable ?? false,
-  flashPrice: marketStats?.flashPrice ? String(marketStats.flashPrice) : null,
+  isOutOfStock: sku.isOutOfStock,
+  isSuspended: sku.isSuspended,
+  isFlashAvailable: sku.isFlashAvailable,
+  flashPrice: sku.flashPrice ? String(sku.flashPrice) : null,
   isOffer: sku.isOffer,
   isComboOnly: sku.isComboOnly,
   createdAt: sku.createdAt,
@@ -168,14 +128,13 @@ const mapTagInfo = (tag: ProductTagInfoRow): AdminProductTagInfo => ({
   imageUrl: tag.imageUrl ?? null,
   isDashboardTag: tag.isDashboardTag,
   relatedStores: tag.relatedStores,
-  sortOrder: tag.sortOrder ?? [],
   createdAt: tag.createdAt,
 })
 
 export async function getAllProducts(): Promise<AdminProductWithRelations[]> {
   type ProductWithRelationsRow = ProductRow & {
     store: StoreRow | null
-    skus: Array<SkuRow & { features: SkuFeatureRow[]; comboItems: any[]; marketStats: MarketStatsRow | null }>
+    skus: Array<SkuRow & { features: SkuFeatureRow[]; comboItems: any[] }>
   }
   const products = await db.query.productInfo.findMany({
     orderBy: productInfo.name,
@@ -184,10 +143,9 @@ export async function getAllProducts(): Promise<AdminProductWithRelations[]> {
       skus: {
         with: {
           features: true,
-          marketStats: true,
           comboItems: {
             with: {
-              sku: { with: { product: true, features: true, marketStats: true } },
+              sku: { with: { product: true, features: true } },
             },
           },
         },
@@ -205,9 +163,9 @@ export async function getAllProducts(): Promise<AdminProductWithRelations[]> {
         features: (ci.sku?.features || []).map((f: any) => ({ featureName: f.featureName, featureValue: f.featureValue })),
         productName: ci.sku?.product?.name ?? 'Unknown',
         images: getStringArray(ci.sku?.images),
-        price: ci.sku?.marketStats?.ourPrice ? String(ci.sku.marketStats.ourPrice) : '0',
+        price: String(ci.sku?.price ?? '0'),
       }))
-      return mapSku(sku, sku.features, comboItems, sku.marketStats)
+      return mapSku(sku, sku.features, comboItems)
     }),
   }))
 }
@@ -220,10 +178,9 @@ export async function getProductById(id: number): Promise<AdminProductWithDetail
       skus: {
         with: {
           features: true,
-          marketStats: true,
           comboItems: {
             with: {
-              sku: { with: { product: true, features: true, marketStats: true } },
+              sku: { with: { product: true, features: true } },
             },
           },
         },
@@ -255,12 +212,12 @@ export async function getProductById(id: number): Promise<AdminProductWithDetail
     const comboItems = (sku.comboItems || []).map((ci: any) => ({
       skuId: ci.skuId,
       skuName: ci.sku?.name ?? null,
-      features: (ci.sku?.features || []).map((f: any) => ({ featureName: f.featureName, featureValue: f.featureValue })),
+      features: (ci.sku?.features || []).map((f) => ({ featureName: f.featureName, featureValue: f.featureValue })),
       productName: ci.sku?.product?.name ?? 'Unknown',
       images: getStringArray(ci.sku?.images),
-      price: ci.sku?.marketStats?.ourPrice ? String(ci.sku.marketStats.ourPrice) : '0',
+      price: String(ci.sku?.price ?? '0'),
     }))
-    return mapSku(sku, sku.features, comboItems, sku.marketStats)
+    return mapSku(sku, sku.features, comboItems)
   })
 
   return {
@@ -315,26 +272,20 @@ export async function createProduct(input: CreateProductInput): Promise<AdminPro
     skus.map((sku) => ({
       productId: product.id,
       name: sku.name ?? null,
+      price: String(sku.price),
+      marketPrice: sku.marketPrice != null ? String(sku.marketPrice) : null,
       images: sku.images ?? null,
+      isFlashAvailable: sku.isFlashAvailable ?? false,
+      flashPrice: sku.flashPrice != null ? String(sku.flashPrice) : null,
       isOffer: sku.isOffer ?? false,
       isComboOnly: sku.isComboOnly ?? false,
+      isSuspended: sku.isSuspended ?? false,
     }))
   ).returning()
 
   for (let i = 0; i < skuRows.length; i++) {
     const skuRow = skuRows[i]
     const sku = skus[i]
-
-    await db.insert(productMarketStats).values({
-      skuId: skuRow.id,
-      marketPrice: sku.marketPrice != null ? String(sku.marketPrice) : null,
-      ourPrice: sku.price != null ? String(sku.price) : '0',
-      isFlashAvailable: sku.isFlashAvailable ?? false,
-      flashPrice: sku.flashPrice != null ? String(sku.flashPrice) : null,
-      isOutOfStock: sku.isOutOfStock ?? false,
-      isSuspended: sku.isSuspended ?? false,
-    })
-
     await db.insert(skuFeatures).values(
       sku.features.map((f) => ({
         skuId: skuRow.id,
@@ -355,13 +306,13 @@ export async function createProduct(input: CreateProductInput): Promise<AdminPro
 
   const createdSkus = await db.query.productSkus.findMany({
     where: eq(productSkus.productId, product.id),
-    with: { features: true, marketStats: true },
+    with: { features: true },
   })
 
   return {
     ...mapProduct(product),
     store: null,
-    skus: createdSkus.map((s) => mapSku(s, s.features, [], s.marketStats)),
+    skus: createdSkus.map((s) => mapSku(s, s.features)),
   }
 }
 
@@ -417,11 +368,11 @@ export async function updateProduct(id: number, input: any): Promise<AdminProduc
       const comboIds = Array.from(new Set(comboMemberships.map((c) => c.comboSkuId)))
 
       if (comboIds.length > 0) {
-        const combos = await db.query.productMarketStats.findMany({
-          where: inArray(productMarketStats.skuId, comboIds),
-          columns: { skuId: true, isSuspended: true },
+        const combos = await db.query.productSkus.findMany({
+          where: inArray(productSkus.id, comboIds),
+          columns: { id: true, isSuspended: true },
         })
-        const activeComboIds = combos.filter((c) => !c.isSuspended).map((c) => c.skuId)
+        const activeComboIds = combos.filter((c) => !c.isSuspended).map((c) => c.id)
         if (activeComboIds.length > 0) {
           throw new Error(
             `Cannot suspend SKU(s): they are members of combo(s) ${activeComboIds.join(', ')} that are not suspended`
@@ -436,35 +387,17 @@ export async function updateProduct(id: number, input: any): Promise<AdminProduc
         await db.update(productSkus)
           .set({
             name: sku.name ?? null,
+            price: String(sku.price),
+            marketPrice: sku.marketPrice != null ? String(sku.marketPrice) : null,
             images: sku.images ?? null,
+            isFlashAvailable: sku.isFlashAvailable ?? false,
+            flashPrice: sku.flashPrice != null ? String(sku.flashPrice) : null,
             isOffer: sku.isOffer ?? false,
             isComboOnly: sku.isComboOnly ?? false,
+            isSuspended: sku.isSuspended ?? false,
           })
           .where(eq(productSkus.id, sku.id))
 
-        const existingMarketStats = await db.query.productMarketStats.findFirst({
-          where: eq(productMarketStats.skuId, sku.id),
-          columns: { id: true },
-        })
-        const marketStatsValues = {
-          marketPrice: sku.marketPrice != null ? String(sku.marketPrice) : null,
-          ourPrice: sku.price != null ? String(sku.price) : '0',
-          isFlashAvailable: sku.isFlashAvailable ?? false,
-          flashPrice: sku.flashPrice != null ? String(sku.flashPrice) : null,
-          isOutOfStock: sku.isOutOfStock ?? false,
-          isSuspended: sku.isSuspended ?? false,
-        }
-        if (existingMarketStats) {
-          await db.update(productMarketStats)
-            .set(marketStatsValues)
-            .where(eq(productMarketStats.skuId, sku.id))
-        } else {
-          await db.insert(productMarketStats).values({
-            skuId: sku.id,
-            ...marketStatsValues,
-          })
-        }
-
         await db.delete(skuFeatures).where(eq(skuFeatures.skuId, sku.id))
         await db.insert(skuFeatures).values(
           sku.features.map((f: any) => ({
@@ -488,20 +421,15 @@ export async function updateProduct(id: number, input: any): Promise<AdminProduc
         const [newSku] = await db.insert(productSkus).values({
           productId: id,
           name: sku.name ?? null,
-          images: sku.images ?? null,
-          isOffer: sku.isOffer ?? false,
-          isComboOnly: sku.isComboOnly ?? false,
-        }).returning()
-
-        await db.insert(productMarketStats).values({
-          skuId: newSku.id,
+          price: String(sku.price),
           marketPrice: sku.marketPrice != null ? String(sku.marketPrice) : null,
-          ourPrice: sku.price != null ? String(sku.price) : '0',
+          images: sku.images ?? null,
           isFlashAvailable: sku.isFlashAvailable ?? false,
           flashPrice: sku.flashPrice != null ? String(sku.flashPrice) : null,
-          isOutOfStock: sku.isOutOfStock ?? false,
+          isOffer: sku.isOffer ?? false,
+          isComboOnly: sku.isComboOnly ?? false,
           isSuspended: sku.isSuspended ?? false,
-        })
+        }).returning()
 
         await db.insert(skuFeatures).values(
           sku.features.map((f: any) => ({
@@ -519,7 +447,7 @@ export async function updateProduct(id: number, input: any): Promise<AdminProduc
     with: {
       store: true,
       skus: {
-        with: { features: true, marketStats: true },
+        with: { features: true },
       },
     },
   })
@@ -531,7 +459,7 @@ export async function updateProduct(id: number, input: any): Promise<AdminProduc
   return {
     ...mapProduct(updatedProduct),
     store: updatedProduct.store ? mapStore(updatedProduct.store) : null,
-    skus: updatedProduct.skus.map((s) => mapSku(s, s.features, [], s.marketStats)),
+    skus: updatedProduct.skus.map((s) => mapSku(s, s.features)),
   }
 }
 
@@ -588,7 +516,6 @@ export async function getAllProductTags(): Promise<AdminProductTagWithProducts[]
       assignedAt: assignment.assignedAt,
       product: mapProduct(assignment.product),
     })),
-    productIds: tag.products.map((assignment: ProductTagRow) => assignment.productId),
   }))
 }
 
@@ -618,7 +545,6 @@ export interface CreateProductTagInput {
   imageUrl?: string | null
   isDashboardTag?: boolean
   relatedStores?: number[]
-  sortOrder?: number[]
 }
 
 export async function createProductTag(input: CreateProductTagInput): Promise<AdminProductTagWithProducts> {
@@ -628,13 +554,11 @@ export async function createProductTag(input: CreateProductTagInput): Promise<Ad
     imageUrl: input.imageUrl || null,
     isDashboardTag: input.isDashboardTag || false,
     relatedStores: input.relatedStores || [],
-    sortOrder: input.sortOrder || [],
   }).returning()
 
   return {
     ...mapTagInfo(tag),
     products: [],
-    productIds: [],
   }
 }
 
@@ -662,7 +586,6 @@ export async function getProductTagById(tagId: number): Promise<AdminProductTagW
       assignedAt: assignment.assignedAt,
       product: mapProduct(assignment.product),
     })),
-    productIds: tag.products.map((assignment: ProductTagRow) => assignment.productId),
   }
 }
 
@@ -672,7 +595,6 @@ export interface UpdateProductTagInput {
   imageUrl?: string | null
   isDashboardTag?: boolean
   relatedStores?: number[]
-  sortOrder?: number[]
 }
 
 export async function updateProductTag(tagId: number, input: UpdateProductTagInput): Promise<AdminProductTagWithProducts> {
@@ -682,7 +604,6 @@ export async function updateProductTag(tagId: number, input: UpdateProductTagInp
     ...(input.imageUrl !== undefined && { imageUrl: input.imageUrl }),
     ...(input.isDashboardTag !== undefined && { isDashboardTag: input.isDashboardTag }),
     ...(input.relatedStores !== undefined && { relatedStores: input.relatedStores }),
-    ...(input.sortOrder !== undefined && { sortOrder: input.sortOrder }),
   }).where(eq(productTagInfo.id, tagId)).returning()
 
   const fullTag = await db.query.productTagInfo.findFirst({
@@ -704,7 +625,6 @@ export async function updateProductTag(tagId: number, input: UpdateProductTagInp
       assignedAt: assignment.assignedAt,
       product: mapProduct(assignment.product),
     })) || [],
-    productIds: fullTag?.products.map((assignment: ProductTagRow) => assignment.productId) || [],
   }
 }
 
@@ -978,32 +898,15 @@ export async function updateProductPrices(updates: Array<{
       const { productId, price, marketPrice, flashPrice, isFlashAvailable } = update
       const updateData: any = {}
 
-      if (price !== undefined) updateData.ourPrice = price.toString()
+      if (price !== undefined) updateData.price = price.toString()
       if (marketPrice !== undefined) updateData.marketPrice = marketPrice === null ? null : marketPrice.toString()
       if (flashPrice !== undefined) updateData.flashPrice = flashPrice === null ? null : flashPrice.toString()
       if (isFlashAvailable !== undefined) updateData.isFlashAvailable = isFlashAvailable
 
-      if (Object.keys(updateData).length === 0) continue
-
-      const existingMarketStats = await tx.query.productMarketStats.findFirst({
-        where: eq(productMarketStats.skuId, productId),
-        columns: { id: true },
-      })
-
-      if (existingMarketStats) {
-        await tx
-          .update(productMarketStats)
-          .set(updateData)
-          .where(eq(productMarketStats.skuId, productId))
-      } else {
-        await tx.insert(productMarketStats).values({
-          skuId: productId,
-          ourPrice: updateData.ourPrice ?? '0',
-          marketPrice: updateData.marketPrice ?? null,
-          flashPrice: updateData.flashPrice ?? null,
-          isFlashAvailable: updateData.isFlashAvailable ?? false,
-        })
-      }
+      await tx
+        .update(productSkus)
+        .set(updateData)
+        .where(eq(productSkus.id, productId))
     }
   })
 
@@ -1053,7 +956,7 @@ export interface CreateSpecialDealInput {
 }
 
 export async function createSpecialDealsForSku(
-  skuId: number,
+  productId: number,
   deals: CreateSpecialDealInput[]
 ): Promise<AdminSpecialDeal[]> {
   if (deals.length === 0) {
@@ -1061,7 +964,7 @@ export async function createSpecialDealsForSku(
   }
 
   const dealInserts = deals.map((deal) => ({
-    skuId,
+    productId,
     quantity: deal.quantity.toString(),
     price: deal.price.toString(),
     validTill: new Date(deal.validTill),
@@ -1122,7 +1025,7 @@ export async function updateSkuDeals(
 
   if (dealsToAdd.length > 0) {
     const dealInserts = dealsToAdd.map((deal) => ({
-      skuId: productId,
+      productId,
       quantity: deal.quantity.toString(),
       price: deal.price.toString(),
       validTill: new Date(deal.validTill),
@@ -1156,21 +1059,6 @@ export async function replaceProductTags(productId: number, tagIds: number[]): P
   await db.insert(productTags).values(tagAssociations)
 }
 
-export async function replaceTagProducts(tagId: number, productIds: number[]): Promise<void> {
-  await db.delete(productTags).where(eq(productTags.tagId, tagId))
-
-  if (productIds.length === 0) {
-    return
-  }
-
-  const productAssociations = productIds.map((productId) => ({
-    productId,
-    tagId,
-  }))
-
-  await db.insert(productTags).values(productAssociations)
-}
-
 export async function mergeSkus(fromSkuId: number, toSkuId: number) {
   if (fromSkuId === toSkuId) {
     return { fromSkuId, toSkuId, message: 'SKUs are the same, no merge needed', counts: {} }

packages/db_helper_sqlite/src/db/schema.ts

@@ -201,23 +201,18 @@ export const productSkus = sqliteTable('product_skus', {
   id: integer().primaryKey({ autoIncrement: true }),
   productId: integer('product_id').notNull().references(() => productInfo.id),
   name: text(),
+  price: numericText('price').notNull(),
+  marketPrice: numericText('market_price'),
   images: jsonText<string[] | null>('images'),
+  isOutOfStock: integer('is_out_of_stock', { mode: 'boolean' }).notNull().default(false),
+  isSuspended: integer('is_suspended', { mode: 'boolean' }).notNull().default(false),
+  isFlashAvailable: integer('is_flash_available', { mode: 'boolean' }).notNull().default(false),
+  flashPrice: numericText('flash_price'),
   isOffer: integer('is_offer', { mode: 'boolean' }).notNull().default(false),
   isComboOnly: integer('is_combo_only', { mode: 'boolean' }).notNull().default(false),
   createdAt: timestampText('created_at').notNull().default(sql`CURRENT_TIMESTAMP`),
 })
 
-export const productMarketStats = sqliteTable('product_market_stats', {
-  id: integer().primaryKey({ autoIncrement: true }),
-  skuId: integer('sku_id').notNull().references(() => productSkus.id).unique(),
-  marketPrice: numericText('market_price'),
-  ourPrice: numericText('our_price').notNull(),
-  isFlashAvailable: integer('is_flash_available', { mode: 'boolean' }).notNull().default(false),
-  flashPrice: numericText('flash_price'),
-  isOutOfStock: integer('is_out_of_stock', { mode: 'boolean' }).notNull().default(false),
-  isSuspended: integer('is_suspended', { mode: 'boolean' }).notNull().default(false),
-})
-
 export const skuFeatures = sqliteTable('sku_features', {
   id: integer().primaryKey({ autoIncrement: true }),
   skuId: integer('sku_id').notNull().references(() => productSkus.id),
@@ -291,7 +286,6 @@ export const productTagInfo = sqliteTable('product_tag_info', {
   imageUrl: text('image_url'),
   isDashboardTag: integer('is_dashboard_tag', { mode: 'boolean' }).notNull().default(false),
   relatedStores: jsonText<number[]>('related_stores').$defaultFn(() => []),
-  sortOrder: jsonText<number[]>('sort_order').$defaultFn(() => []),
   createdAt: timestampText('created_at').notNull().default(sql`CURRENT_TIMESTAMP`),
 })
 
@@ -596,7 +590,6 @@ export const productInfoRelations = relations(productInfo, ({ one, many }) => ({
 export const productSkusRelations = relations(productSkus, ({ one, many }) => ({
   product: one(productInfo, { fields: [productSkus.productId], references: [productInfo.id] }),
   features: many(skuFeatures),
-  marketStats: one(productMarketStats),
   specialDeals: many(specialDeals),
   orderItems: many(orderItems),
   cartItems: many(cartItems),
@@ -604,10 +597,6 @@ export const productSkusRelations = relations(productSkus, ({ one, many }) => ({
   comboItems: many(productCombos, { relationName: 'comboSku' }),
 }))
 
-export const productMarketStatsRelations = relations(productMarketStats, ({ one }) => ({
-  sku: one(productSkus, { fields: [productMarketStats.skuId], references: [productSkus.id] }),
-}))
-
 export const skuFeaturesRelations = relations(skuFeatures, ({ one }) => ({
   sku: one(productSkus, { fields: [skuFeatures.skuId], references: [productSkus.id] }),
 }))

packages/db_helper_sqlite/src/lib/const-keys.ts

@@ -13,8 +13,6 @@ export const CONST_KEYS = {
   readableOrderId: 'readableOrderId',
   versionNum: 'versionNum',
   cacheVersion: 'cache_version',
-  availabilityVersionNum: 'availability_version_num',
-  slotsVersionNum: 'slots_version_num',
   playStoreUrl: 'playStoreUrl',
   appStoreUrl: 'appStoreUrl',
   popularItems: 'popularItems',
@@ -39,8 +37,6 @@ export const CONST_LABELS: Record<ConstKey, string> = {
   readableOrderId: 'Readable Order ID',
   versionNum: 'Version Number',
   'cache_version': 'Cache Version',
-  availability_version_num: 'Availability Cache Version',
-  slots_version_num: 'Slots Cache Version',
   playStoreUrl: 'Play Store URL',
   appStoreUrl: 'App Store URL',
   popularItems: 'Popular Items',
@@ -71,8 +67,6 @@ export const CONST_TYPES: Record<ConstKey, ConstValueType> = {
   readableOrderId: 'number',
   versionNum: 'string',
   'cache_version': 'number',
-  availability_version_num: 'number',
-  slots_version_num: 'number',
   playStoreUrl: 'string',
   appStoreUrl: 'string',
   popularItems: 'string',
@@ -97,8 +91,6 @@ export const CONST_VISIBILITY: Record<ConstKey, boolean> = {
   readableOrderId: false,
   versionNum: true,
   'cache_version': false,
-  availability_version_num: false,
-  slots_version_num: false,
   playStoreUrl: true,
   appStoreUrl: true,
   popularItems: true,

packages/db_helper_sqlite/src/stores/store-helpers.ts

@@ -5,7 +5,6 @@ import { db } from '../db/db_index'
 import {
   homeBanners,
   productInfo,
-  productMarketStats,
   productSkus,
   skuFeatures,
   deliverySlotInfo,
@@ -62,16 +61,6 @@ export interface ProductBasicData {
   productType: string
 }
 
-export interface AvailabilityCacheData {
-  id: number
-  price: string
-  marketPrice: string | null
-  flashPrice: string | null
-  isFlashAvailable: boolean
-  isOutOfStock: boolean
-  isSuspended: boolean
-}
-
 export interface StoreBasicData {
   id: number
   name: string
@@ -118,18 +107,15 @@ export interface ProductTagData {
 
 export async function getAllProductsForCache(): Promise<ProductBasicData[]> {
   const skus = await db.query.productSkus.findMany({
+    where: eq(productSkus.isSuspended, false),
     with: {
       product: true,
       features: true,
-      marketStats: true,
     },
   })
 
-  return skus
-    .filter((sku) => !sku.marketStats?.isSuspended)
-    .map((sku) => {
+  return skus.map((sku) => {
     const features = sku.features || []
-    const marketStats = sku.marketStats
     return {
       id: sku.id,
       productId: sku.productId,
@@ -137,37 +123,21 @@ export async function getAllProductsForCache(): Promise<ProductBasicData[]> {
       skuName: sku.name ?? null,
       shortDescription: sku.product?.shortDescription ?? null,
       longDescription: sku.product?.longDescription ?? null,
-      price: marketStats?.ourPrice ? String(marketStats.ourPrice) : '0',
-      marketPrice: marketStats?.marketPrice ? String(marketStats.marketPrice) : null,
+      price: String(sku.price ?? '0'),
+      marketPrice: sku.marketPrice ? String(sku.marketPrice) : null,
       images: sku.images,
-      isOutOfStock: marketStats?.isOutOfStock ?? false,
+      isOutOfStock: sku.isOutOfStock,
       storeId: sku.product?.storeId ?? null,
       unitNotation: composeUnitNotation(features),
       incrementStep: sku.product?.incrementStep ?? 1,
       productQuantity: 1,
-      isFlashAvailable: marketStats?.isFlashAvailable ?? false,
-      flashPrice: marketStats?.flashPrice ? String(marketStats.flashPrice) : null,
+      isFlashAvailable: sku.isFlashAvailable,
+      flashPrice: sku.flashPrice ? String(sku.flashPrice) : null,
       productType: sku.product?.productType ?? 'item',
     }
   })
 }
 
-export async function getAvailabilityForCache(): Promise<AvailabilityCacheData[]> {
-  const stats = await db.query.productMarketStats.findMany({})
-
-  return stats
-    .filter((stat) => !stat.isSuspended)
-    .map((stat) => ({
-      id: stat.skuId,
-      price: stat.ourPrice ? String(stat.ourPrice) : '0',
-      marketPrice: stat.marketPrice ? String(stat.marketPrice) : null,
-      flashPrice: stat.flashPrice ? String(stat.flashPrice) : null,
-      isFlashAvailable: stat.isFlashAvailable,
-      isOutOfStock: stat.isOutOfStock,
-      isSuspended: stat.isSuspended,
-    }))
-}
-
 export async function getAllStoresForCache(): Promise<StoreBasicData[]> {
   return db.query.storeInfo.findMany({
     columns: { id: true, name: true, description: true },
@@ -222,21 +192,20 @@ export interface ProductComboCacheData {
   images: unknown
   unitNotation: string
   price: string
-  isOffer: boolean
 }
 
 export async function getAllProductCombosForCache(): Promise<ProductComboCacheData[]> {
   const results = await db.query.productCombos.findMany({
     with: {
-      sku: { with: { product: true, features: true, marketStats: true } },
+      sku: { with: { product: true, features: true } },
     },
   })
 
   const suspendedSkuIds = new Set(
     (await db
-      .select({ id: productMarketStats.skuId })
-      .from(productMarketStats)
-      .where(eq(productMarketStats.isSuspended, true))).map((r) => r.id)
+      .select({ id: productSkus.id })
+      .from(productSkus)
+      .where(eq(productSkus.isSuspended, true))).map((r) => r.id)
   )
 
   return results
@@ -250,8 +219,7 @@ export async function getAllProductCombosForCache(): Promise<ProductComboCacheDa
       skuName: ci.sku?.name ?? null,
       images: ci.sku?.images,
       unitNotation: composeUnitNotation(features),
-      price: ci.sku?.marketStats?.ourPrice ? String(ci.sku.marketStats.ourPrice) : '0',
-      isOffer: ci.sku?.isOffer ?? false,
+      price: String(ci.sku?.price ?? '0'),
     }
   })
 }
@@ -267,7 +235,6 @@ export interface TagBasicData {
   imageUrl: string | null
   isDashboardTag: boolean
   relatedStores: unknown
-  sortOrder: number[] | null
 }
 
 export interface TagProductMapping {
@@ -284,7 +251,6 @@ export async function getAllTagsForCache(): Promise<TagBasicData[]> {
       imageUrl: productTagInfo.imageUrl,
       isDashboardTag: productTagInfo.isDashboardTag,
       relatedStores: productTagInfo.relatedStores,
-      sortOrder: productTagInfo.sortOrder,
     })
     .from(productTagInfo)
 }
@@ -351,15 +317,15 @@ export async function getAllSlotsWithProductsForCache(): Promise<SlotWithProduct
   let skusData: any[] = []
   if (skuIdsArray.length > 0) {
     skusData = await db.query.productSkus.findMany({
+      where: eq(productSkus.isSuspended, false),
       with: {
         product: {
           with: { store: true },
         },
         features: true,
-        marketStats: true,
       },
     })
-    skusData = skusData.filter((item: any) => skuIdSet.has(item.id) && !item.marketStats?.isSuspended)
+    skusData = skusData.filter((item: any) => skuIdSet.has(item.id))
   }
 
   const skuMap = new Map(skusData.map((s: any) => [s.id, s]))
@@ -375,7 +341,6 @@ export async function getAllSlotsWithProductsForCache(): Promise<SlotWithProduct
       .filter((p): p is NonNullable<typeof p> => p != null)
       .map((sku: any) => {
         const features = sku.features || []
-        const marketStats = sku.marketStats
         return {
           id: sku.id,
           productId: sku.productId,
@@ -383,8 +348,8 @@ export async function getAllSlotsWithProductsForCache(): Promise<SlotWithProduct
           skuName: sku.name ?? null,
           productQuantity: 1,
           shortDescription: sku.product?.shortDescription ?? null,
-          price: marketStats?.ourPrice ? String(marketStats.ourPrice) : '0',
-          marketPrice: marketStats?.marketPrice ? String(marketStats.marketPrice) : null,
+          price: String(sku.price ?? '0'),
+          marketPrice: sku.marketPrice ? String(sku.marketPrice) : null,
           unitNotation: composeUnitNotation(features),
           store: sku.product?.store ? { 
             id: sku.product.store.id, 
@@ -392,10 +357,10 @@ export async function getAllSlotsWithProductsForCache(): Promise<SlotWithProduct
             description: sku.product.store.description 
           } : null,
           images: sku.images,
-          isOutOfStock: marketStats?.isOutOfStock ?? false,
+          isOutOfStock: sku.isOutOfStock,
           storeId: sku.product?.storeId ?? null,
-          isFlashAvailable: marketStats?.isFlashAvailable ?? false,
-          flashPrice: marketStats?.flashPrice ? String(marketStats.flashPrice) : null,
+          isFlashAvailable: sku.isFlashAvailable,
+          flashPrice: sku.flashPrice ? String(sku.flashPrice) : null,
         }
       }),
   })) as SlotWithProductsData[]

packages/db_helper_sqlite/src/user-apis/product.ts

@@ -1,5 +1,5 @@
 import { db } from '../db/db_index'
-import { deliverySlotInfo, productInfo, productCombos, productSkus, productMarketStats, productReviews, productTags, specialDeals, storeInfo, users } from '../db/schema'
+import { deliverySlotInfo, productInfo, productCombos, productSkus, productReviews, productTags, specialDeals, storeInfo, users } from '../db/schema'
 import { and, desc, eq, gt, sql } from 'drizzle-orm'
 import type { UserProductDetailData, UserProductReview } from '@packages/shared'
 import { composeSkuName, composeUnitNotation } from '../lib/sku-features'
@@ -11,24 +11,19 @@ const getStringArray = (value: unknown): string[] | null => {
 
 export async function getProductDetailById(skuId: number): Promise<UserProductDetailData | null> {
   const sku = await db.query.productSkus.findFirst({
-    where: eq(productSkus.id, skuId),
+    where: and(eq(productSkus.id, skuId), eq(productSkus.isSuspended, false)),
     with: {
       product: true,
       features: true,
-      marketStats: true,
     },
   })
 
   if (!sku) {
     return null
   }
-  if (sku.marketStats?.isSuspended) {
-    return null
-  }
 
   const features = sku.features || []
   const product = sku.product
-  const marketStats = sku.marketStats
 
   const storeData = product?.storeId ? await db.query.storeInfo.findFirst({
     where: eq(storeInfo.id, product.storeId),
@@ -53,7 +48,7 @@ export async function getProductDetailById(skuId: number): Promise<UserProductDe
   const comboItemsData = await db.query.productCombos.findMany({
     where: eq(productCombos.comboSkuId, skuId),
     with: {
-      sku: { with: { product: true, features: true, marketStats: true } },
+      sku: { with: { product: true, features: true } },
     },
   })
 
@@ -65,8 +60,7 @@ export async function getProductDetailById(skuId: number): Promise<UserProductDe
       unitNotation: composeUnitNotation(ciFeatures),
       productName: composeSkuName(ci.sku?.product?.name ?? 'Unknown', ciFeatures),
       images: getStringArray(ci.sku?.images),
-      price: ci.sku?.marketStats?.ourPrice ? String(ci.sku.marketStats.ourPrice) : '0',
-      isOffer: ci.sku?.isOffer ?? false,
+      price: String(ci.sku?.price ?? '0'),
     }
   })
 
@@ -76,11 +70,11 @@ export async function getProductDetailById(skuId: number): Promise<UserProductDe
     name: composeSkuName(product?.name ?? 'Unknown', features),
     shortDescription: product?.shortDescription ?? null,
     longDescription: product?.longDescription ?? null,
-    price: marketStats?.ourPrice ? String(marketStats.ourPrice) : '0',
-    marketPrice: marketStats?.marketPrice ? String(marketStats.marketPrice) : null,
+    price: String(sku.price ?? '0'),
+    marketPrice: sku.marketPrice ? String(sku.marketPrice) : null,
     unitNotation: composeUnitNotation(features),
     images: getStringArray(sku.images),
-    isOutOfStock: marketStats?.isOutOfStock ?? false,
+    isOutOfStock: sku.isOutOfStock,
     store: storeData ? {
       id: storeData.id,
       name: storeData.name,
@@ -88,8 +82,8 @@ export async function getProductDetailById(skuId: number): Promise<UserProductDe
     } : null,
     incrementStep: product?.incrementStep ?? 1,
     productQuantity: 1,
-    isFlashAvailable: marketStats?.isFlashAvailable ?? false,
-    flashPrice: marketStats?.flashPrice?.toString() || null,
+    isFlashAvailable: sku.isFlashAvailable,
+    flashPrice: sku.flashPrice?.toString() || null,
     deliverySlots: [],
     specialDeals: specialDealsData.map((deal) => ({
       quantity: String(deal.quantity ?? '0'),
@@ -208,32 +202,30 @@ export async function getAllProductsWithUnits(tagId?: number): Promise<ProductSu
   }
 
   const skus = await db.query.productSkus.findMany({
+    where: eq(productSkus.isSuspended, false),
     with: {
       product: true,
       features: true,
-      marketStats: true,
     },
   })
 
   return skus
     .filter((sku) => {
-      if (sku.marketStats?.isSuspended) return false
       if (!tagId) return true
       return taggedProductIdSet.has(sku.productId)
     })
     .map((sku) => {
       const features = sku.features || []
-      const marketStats = sku.marketStats
       return {
         id: sku.product?.id ?? 0,
         name: composeSkuName(sku.product?.name ?? 'Unknown', features),
         skuId: sku.id,
         skuName: sku.name ?? null,
         shortDescription: sku.product?.shortDescription ?? null,
-        price: marketStats?.ourPrice ? String(marketStats.ourPrice) : '0',
-        marketPrice: marketStats?.marketPrice ? String(marketStats.marketPrice) : null,
+        price: String(sku.price ?? '0'),
+        marketPrice: sku.marketPrice ? String(sku.marketPrice) : null,
       images: sku.images,
-      isOutOfStock: marketStats?.isOutOfStock ?? false,
+      isOutOfStock: sku.isOutOfStock,
       unitShortNotation: composeUnitNotation(features),
       productQuantity: 1,
       features: features.map((f) => ({ featureName: f.featureName, featureValue: f.featureValue })),
@@ -246,9 +238,9 @@ export async function getAllProductsWithUnits(tagId?: number): Promise<ProductSu
  */
 export async function getSuspendedSkuIds(): Promise<number[]> {
   const suspendedSkus = await db
-    .select({ id: productMarketStats.skuId })
-    .from(productMarketStats)
-    .where(eq(productMarketStats.isSuspended, true))
+    .select({ id: productSkus.id })
+    .from(productSkus)
+    .where(eq(productSkus.isSuspended, true))
 
   return suspendedSkus.map(sp => sp.id)
 }
@@ -287,18 +279,16 @@ export interface SkuSummary {
 
 export async function getAllSkusSummary(): Promise<SkuSummary[]> {
   const skus = await db.query.productSkus.findMany({
+    where: eq(productSkus.isSuspended, false),
     with: {
       features: true,
-      marketStats: true,
       product: {
         columns: { name: true },
       },
     },
   })
 
-  return skus
-    .filter((sku) => !sku.marketStats?.isSuspended)
-    .map((sku) => {
+  return skus.map((sku) => {
     const featureValues = (sku.features || []).map((f) => f.featureValue)
     const label = [sku.product?.name ?? 'Unknown', ...featureValues].join(' ')
     return {
@@ -329,12 +319,10 @@ export interface OffersPageData {
 
 const mapOffersPageProduct = (sku: {
   id: number
-  marketStats: {
-    ourPrice: string | null
-    marketPrice: string | null
-    isOutOfStock: boolean
-  } | null
+  price: string | null
+  marketPrice: string | null
   images: unknown
+  isOutOfStock: boolean
   product: { name: string; incrementStep: number | null } | null
   features: Array<{ featureValue: string }>
 }): OffersPageProductData => {
@@ -342,21 +330,21 @@ const mapOffersPageProduct = (sku: {
   return {
     id: sku.id,
     name: composeSkuName(sku.product?.name ?? 'Unknown', features),
-    price: sku.marketStats?.ourPrice ? String(sku.marketStats.ourPrice) : '0',
-    marketPrice: sku.marketStats?.marketPrice ? String(sku.marketStats.marketPrice) : null,
+    price: String(sku.price ?? '0'),
+    marketPrice: sku.marketPrice ? String(sku.marketPrice) : null,
     unitNotation: composeUnitNotation(features),
     images: sku.images,
-    isOutOfStock: sku.marketStats?.isOutOfStock ?? false,
+    isOutOfStock: sku.isOutOfStock,
     incrementStep: sku.product?.incrementStep ?? 1,
   }
 }
 
 export async function getOffersAndCombos(): Promise<OffersPageData> {
   const skus = await db.query.productSkus.findMany({
+    where: eq(productSkus.isSuspended, false),
     with: {
       product: true,
       features: true,
-      marketStats: true,
     },
   })
 
@@ -364,7 +352,6 @@ export async function getOffersAndCombos(): Promise<OffersPageData> {
   const offers: OffersPageProductData[] = []
 
   for (const sku of skus) {
-    if (sku.marketStats?.isSuspended) continue
     if (sku.product?.productType === 'combo') {
       combos.push(mapOffersPageProduct(sku))
     }

packages/db_helper_sqlite/src/user-apis/slots.ts

@@ -1,5 +1,5 @@
 import { db } from '../db/db_index'
-import { deliverySlotInfo, productMarketStats } from '../db/schema'
+import { deliverySlotInfo, productSkus } from '../db/schema'
 import { asc, eq } from 'drizzle-orm'
 import type { InferSelectModel } from 'drizzle-orm'
 import type { UserDeliverySlot, UserSlotAvailability } from '@packages/shared'
@@ -27,16 +27,17 @@ export async function getActiveSlotsList(): Promise<UserDeliverySlot[]> {
 }
 
 export async function getProductAvailability(): Promise<UserSlotAvailability[]> {
-  const stats = await db.query.productMarketStats.findMany({
-    where: eq(productMarketStats.isSuspended, false),
-    columns: {
-      skuId: true,
-      isOutOfStock: true,
+  const skus = await db.query.productSkus.findMany({
+    where: eq(productSkus.isSuspended, false),
+    with: {
+      product: { columns: { name: true } },
     },
   })
 
-  return stats.map((stat) => ({
-    id: stat.skuId,
-    isOutOfStock: stat.isOutOfStock,
+  return skus.map((sku) => ({
+    id: sku.id,
+    name: sku.product?.name ?? 'Unknown',
+    isOutOfStock: sku.isOutOfStock,
+    isFlashAvailable: sku.isFlashAvailable,
   }))
 }

packages/db_helper_sqlite/src/user-apis/stores.ts

@@ -21,13 +21,13 @@ export async function getStoreSummaries(): Promise<UserStoreSummaryData[]> {
   }).from(storeInfo)
 
   const skus = await db.query.productSkus.findMany({
-    with: { product: true, marketStats: true },
+    where: eq(productSkus.isSuspended, false),
+    with: { product: true },
     orderBy: asc(productSkus.id),
   })
-  const activeSkus = skus.filter((sku) => !sku.marketStats?.isSuspended)
 
   const skusByStore = new Map<number, typeof skus>()
-  for (const sku of activeSkus) {
+  for (const sku of skus) {
     const storeId = sku.product?.storeId
     if (storeId == null) continue
     if (!skusByStore.has(storeId)) skusByStore.set(storeId, [])
@@ -77,31 +77,30 @@ export async function getStoreDetail(storeId: number): Promise<UserStoreDetailDa
 
   const skus = productIdArr.length > 0
     ? await db.query.productSkus.findMany({
-        where: inArray(productSkus.productId, productIdArr),
+        where: and(
+          inArray(productSkus.productId, productIdArr),
+          eq(productSkus.isSuspended, false)
+        ),
         with: {
           product: true,
           features: true,
-          marketStats: true,
         },
       })
     : []
 
-  const products: UserStoreProductData[] = skus
-    .filter((sku) => !sku.marketStats?.isSuspended)
-    .map((sku) => {
+  const products: UserStoreProductData[] = skus.map((sku) => {
     const features = sku.features || []
-    const marketStats = sku.marketStats
     return {
       id: sku.id,
       name: composeSkuName(sku.product?.name ?? 'Unknown', features),
       shortDescription: sku.product?.shortDescription ?? null,
-      price: marketStats?.ourPrice ? String(marketStats.ourPrice) : '0',
-      marketPrice: marketStats?.marketPrice ? String(marketStats.marketPrice) : null,
+      price: String(sku.price ?? '0'),
+      marketPrice: sku.marketPrice ? String(sku.marketPrice) : null,
       incrementStep: sku.product?.incrementStep ?? 1,
       unit: composeUnitNotation(features),
       unitNotation: composeUnitNotation(features),
       images: getStringArray(sku.images),
-      isOutOfStock: marketStats?.isOutOfStock ?? false,
+      isOutOfStock: sku.isOutOfStock,
       productQuantity: 1,
     }
   })

packages/shared/index.ts

@@ -2,7 +2,6 @@ export const CACHE_FILENAMES = {
   products: 'products.json',
   stores: 'stores.json',
   slots: 'slots.json',
-  availability: 'availability.json',
   essentialConsts: 'essential-consts.json',
   banners: 'banners.json',
 } as const

packages/shared/types/admin.ts

@@ -454,7 +454,6 @@ export interface AdminProductTagInfo {
   imageUrl: string | null;
   isDashboardTag: boolean;
   relatedStores: unknown;
-  sortOrder: number[];
   createdAt: Date;
 }
 
@@ -467,7 +466,6 @@ export interface AdminProductTagAssignment {
 
 export interface AdminProductTagWithProducts extends AdminProductTagInfo {
   products: AdminProductTagAssignment[];
-  productIds: number[];
 }
 
 export interface AdminSpecialDeal {

packages/shared/types/user.ts

@@ -267,7 +267,6 @@ export interface UserProductComboItem {
   productName: string;
   images: string[] | null;
   price: string;
-  isOffer: boolean;
 }
 
 export interface UserProductDetailData {
@@ -321,34 +320,32 @@ export interface UserCreateReviewResponse {
 
 export interface UserSlotProduct {
   id: number;
-  images: string[] | null;
+  name: string;
+  shortDescription: string | null;
+  productQuantity: number;
+  price: string;
+  marketPrice: string | null;
+  unit: string | null;
+  images: string[];
+  isOutOfStock: boolean;
+  storeId: number | null;
+  nextDeliveryDate: Date;
 }
 
 export interface UserSlotWithProducts {
   id: number;
   deliveryTime: Date;
   freezeTime: Date;
+  isActive: boolean;
+  isCapacityFull: boolean;
   products: UserSlotProduct[];
 }
 
 export interface UserSlotAvailability {
   id: number;
+  name: string;
   isOutOfStock: boolean;
-}
-
-export interface UserAvailabilityEntry {
-  id: number;
-  price: string;
-  marketPrice: string | null;
-  flashPrice: string | null;
   isFlashAvailable: boolean;
-  isOutOfStock: boolean;
-  isSuspended: boolean;
-}
-
-export interface UserAvailabilityResponse {
-  availability: UserAvailabilityEntry[];
-  count: number;
 }
 
 export interface UserDeliverySlot {