diff --git a/apps/backend/src/trpc/user-apis/order.ts b/apps/backend/src/trpc/user-apis/order.ts
index b7b7119..05cbc90 100644
--- a/apps/backend/src/trpc/user-apis/order.ts
+++ b/apps/backend/src/trpc/user-apis/order.ts
@@ -824,7 +824,7 @@ export const orderRouter = router({
   updateUserNotes: protectedProcedure
     .input(
       z.object({
-        id: z.string(),
+        id: z.number(),
         userNotes: z.string(),
       })
     )
diff --git a/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/[id].tsx b/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/[id].tsx
index 33537f5..b0eec6f 100644
--- a/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/[id].tsx
+++ b/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/[id].tsx
@@ -236,7 +236,7 @@ export default function OrderDetails() {
                   </MyTouchableOpacity>
                   <MyTouchableOpacity
                     onPress={() => {
-                      updateNotesMutation.mutate({ id: order.orderId, userNotes: notesInput });
+                      updateNotesMutation.mutate({ id: order.id, userNotes: notesInput });
                     }}
                     disabled={updateNotesMutation.isPending}
                     style={tw`px-3 py-1 bg-brand500 rounded-lg`}
@@ -435,7 +435,7 @@ export default function OrderDetails() {
               setComplaintDialogOpen(false);
               refetch();
             }}
-            orderId={order.orderId}
+            orderId={order.id}
           />
         </BottomDialog>
       </View>
diff --git a/apps/user-ui/components/ProductDetail.tsx b/apps/user-ui/components/ProductDetail.tsx
index 76f2005..5d9e343 100644
--- a/apps/user-ui/components/ProductDetail.tsx
+++ b/apps/user-ui/components/ProductDetail.tsx
@@ -443,7 +443,7 @@ const ProductDetail: React.FC<ProductDetailProps> = ({ productId, isFlashDeliver
 
           {/* Review Form - Moved above or keep below? Usually users want to read reviews first, but if few reviews, writing is good. The original had form then reviews. I will keep format but make it nicer. */}
           <View style={tw`mb-6`}>
-            <ReviewForm productId={productDetail.id} onReviewSubmitted={handleReviewSubmitted} />
+            <ReviewForm productId={productDetail!.id} onReviewSubmitted={handleReviewSubmitted} />
           </View>
 
           <View style={tw`bg-white rounded-3xl shadow-sm border border-gray-100 overflow-hidden`}>