diff --git a/frontend-admin/src/screens/delivery/DashboardScreen.tsx b/frontend-admin/src/screens/delivery/DashboardScreen.tsx index 4cdb1308..3a7c3ae8 100644 --- a/frontend-admin/src/screens/delivery/DashboardScreen.tsx +++ b/frontend-admin/src/screens/delivery/DashboardScreen.tsx @@ -231,7 +231,7 @@ export default function DashboardScreen() { } const allDeliveries = [...rawDeliveries, ...queueCommands].filter( - (d) => d.status !== "approved", + (d) => d.status !== "approved" && d.status !== "cancelled", ); const enriched: EnrichedDelivery[] = await Promise.all( diff --git a/mobile/src/screens/client/CheckoutScreen.tsx b/mobile/src/screens/client/CheckoutScreen.tsx index 20ee9374..3ba0a4bc 100644 --- a/mobile/src/screens/client/CheckoutScreen.tsx +++ b/mobile/src/screens/client/CheckoutScreen.tsx @@ -303,6 +303,34 @@ export default function CheckoutScreen() { lineHeight: 16, }, prefillHint: { color: "#6ee7b7", fontSize: fontSize.xs, marginTop: 4, opacity: 0.85 }, + telegramNote: { + flexDirection: "row", + gap: spacing.s, + alignItems: "flex-start", + backgroundColor: "rgba(34, 158, 217, 0.08)", + borderWidth: 1, + borderColor: "rgba(34, 158, 217, 0.3)", + borderRadius: borderRadius.md, + padding: spacing.m, + marginTop: spacing.l, + }, + telegramNoteTitle: { + color: "#29b6f6", + fontSize: fontSize.sm, + fontWeight: "700", + marginBottom: 3, + }, + telegramNoteText: { + color: colors.textMuted, + fontSize: fontSize.xs, + lineHeight: 18, + }, + telegramNoteLink: { + color: "#29b6f6", + fontSize: fontSize.xs, + fontWeight: "600", + marginTop: 4, + }, invalidAddrContent: { gap: spacing.m }, invalidAddrIconContainer: { alignItems: "center" }, invalidAddrIconCircle: { @@ -584,6 +612,20 @@ export default function CheckoutScreen() { )} + {/* Note Telegram */} + + + + Compte Telegram requis + + Votre commande ne pourra être validée que si votre compte Telegram est lié.{" "} + + navigation.navigate("Profile")}> + Lier depuis votre profil → + + + + {error && nom.trim() && prenom.trim() && telephone.trim() && address.trim() && ( {error} )}