From 98150851c9ae61d1415b82869566647243655c24 Mon Sep 17 00:00:00 2001
From: Xor290 <free6nk33@gmail.com>
Date: Sat, 28 Mar 2026 17:39:45 +0100
Subject: [PATCH] chore: fix order id

---
 mobile/src/api/api.ts                             | 1 +
 mobile/src/screens/client/CheckoutScreen.tsx      | 5 +++--
 mobile/src/screens/client/OrderDetailsScreen.tsx  | 2 +-
 mobile/src/screens/client/OrderHistoryScreen.tsx  | 2 +-
 mobile/src/screens/client/OrderTrackingScreen.tsx | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mobile/src/api/api.ts b/mobile/src/api/api.ts
index 997fca2f..67456194 100644
--- a/mobile/src/api/api.ts
+++ b/mobile/src/api/api.ts
@@ -796,6 +796,7 @@ export const getPublicSettings = async (): Promise<PublicSettings> => {
 
 export interface CryptoPaymentStatus {
     command_id: number;
+    client_order_number?: number;
     payment_status: string;
     pay_address: string;
     pay_amount: number;
diff --git a/mobile/src/screens/client/CheckoutScreen.tsx b/mobile/src/screens/client/CheckoutScreen.tsx
index 223512e2..20ee9374 100644
--- a/mobile/src/screens/client/CheckoutScreen.tsx
+++ b/mobile/src/screens/client/CheckoutScreen.tsx
@@ -151,6 +151,7 @@ export default function CheckoutScreen() {
             if (res.success && res.payment_method === "crypto") {
                 setCryptoData({
                     command_id: res.command_id!,
+                    client_order_number: (res as any).client_order_number,
                     payment_status: res.payment_status!,
                     pay_address: res.pay_address!,
                     pay_amount: res.pay_amount!,
@@ -641,7 +642,7 @@ export default function CheckoutScreen() {
                         </View>
                     </View>
                     <Text style={styles.confirmText}>
-                        Votre commande #{confirmationData?.command_id} a ete creee avec succes.
+                        Votre commande #{confirmationData?.client_order_number ?? confirmationData?.command_id} a ete creee avec succes.
                     </Text>
                     {confirmationData?.referral_used > 0 && (
                         <View style={styles.confirmInfo}>
@@ -677,7 +678,7 @@ export default function CheckoutScreen() {
                         {/* Commande */}
                         <View style={styles.cryptoRow}>
                             <Text style={styles.cryptoLabel}>Commande</Text>
-                            <Text style={styles.cryptoValue}>#{cryptoData.command_id}</Text>
+                            <Text style={styles.cryptoValue}>#{cryptoData.client_order_number ?? cryptoData.command_id}</Text>
                         </View>
 
                         {/* Statut */}
diff --git a/mobile/src/screens/client/OrderDetailsScreen.tsx b/mobile/src/screens/client/OrderDetailsScreen.tsx
index 342e53e2..e566291c 100644
--- a/mobile/src/screens/client/OrderDetailsScreen.tsx
+++ b/mobile/src/screens/client/OrderDetailsScreen.tsx
@@ -327,7 +327,7 @@ export default function OrderDetailsScreen() {
         >
             <View style={styles.headerCard}>
                 <View style={styles.headerRow}>
-                    <Text style={styles.title}>Commande #{order.client_order_number ?? order.id}</Text>
+                    <Text style={styles.title}>Commande #{order.client_order_number}</Text>
                     <StatusBadge status={status} />
                 </View>
                 <Text style={styles.date}>
diff --git a/mobile/src/screens/client/OrderHistoryScreen.tsx b/mobile/src/screens/client/OrderHistoryScreen.tsx
index 5562c563..dabd95a4 100644
--- a/mobile/src/screens/client/OrderHistoryScreen.tsx
+++ b/mobile/src/screens/client/OrderHistoryScreen.tsx
@@ -370,7 +370,7 @@ export default function OrderHistoryScreen() {
                     >
                         <View style={styles.orderHeader}>
                             <Text style={styles.orderIdText}>
-                                Commande #{order.client_order_number ?? order.id}
+                                Commande #{order.client_order_number}
                             </Text>
                             <StatusBadge status={order.status} />
                         </View>
diff --git a/mobile/src/screens/client/OrderTrackingScreen.tsx b/mobile/src/screens/client/OrderTrackingScreen.tsx
index 4d4ffac2..dfad20cf 100644
--- a/mobile/src/screens/client/OrderTrackingScreen.tsx
+++ b/mobile/src/screens/client/OrderTrackingScreen.tsx
@@ -406,7 +406,7 @@ export default function OrderTrackingScreen() {
                             >
                                 <View style={styles.cardHeader}>
                                     <Text style={styles.orderId}>
-                                        Commande #{order.client_order_number ?? order.id}
+                                        Commande #{order.client_order_number}
                                     </Text>
                                     <StatusBadge status={order.status} />
                                 </View>