diff --git a/RobotApp.Client/Pages/Order/JsonOutputPanel.razor b/RobotApp.Client/Pages/Order/JsonOutputPanel.razor
index 7e9ff0c..b37af07 100644
--- a/RobotApp.Client/Pages/Order/JsonOutputPanel.razor
+++ b/RobotApp.Client/Pages/Order/JsonOutputPanel.razor
@@ -16,13 +16,14 @@
 
             <!-- CANCEL -->
             <MudButton Variant="Variant.Filled"
-                       Color="Color.Error"
-                       StartIcon="@Icons.Material.Filled.Cancel"
+                       Color="@CancelButtonColor"
+                       StartIcon="@CancelButtonIcon"
                        Disabled="@DisableCancel"
                        OnClick="OnCancel">
-                Cancel
+                @CancelButtonText
             </MudButton>
 
+
             <!-- SEND -->
             <MudButton Variant="Variant.Filled"
                        Color="@SendButtonColor"
@@ -61,6 +62,7 @@
     [Parameter] public bool Copied { get; set; }
     [Parameter] public bool? SendSuccess { get; set; }
     [Parameter] public bool DisableCancel { get; set; }
+    [Parameter] public bool? CancelSuccess { get; set; }
 
     [Parameter] public EventCallback OnCopy { get; set; }
     [Parameter] public EventCallback OnSend { get; set; }
@@ -90,4 +92,29 @@
             false => Icons.Material.Filled.Error,
             _ => Icons.Material.Filled.Send
         };
+
+    private string CancelButtonText =>
+    CancelSuccess switch
+    {
+        true => "Done",
+        false => "Error",
+        _ => "Cancel"
+    };
+
+    private Color CancelButtonColor =>
+        CancelSuccess switch
+        {
+            true => Color.Success,
+            false => Color.Error,
+            _ => Color.Error
+        };
+
+    private string CancelButtonIcon =>
+        CancelSuccess switch
+        {
+            true => Icons.Material.Filled.CheckCircle,
+            false => Icons.Material.Filled.Error,
+            _ => Icons.Material.Filled.Cancel
+        };
+
 }
diff --git a/RobotApp.Client/Pages/Order/OrderMess.razor b/RobotApp.Client/Pages/Order/OrderMess.razor
index bc73b0a..7f3b732 100644
--- a/RobotApp.Client/Pages/Order/OrderMess.razor
+++ b/RobotApp.Client/Pages/Order/OrderMess.razor
@@ -8,7 +8,6 @@
 
 @inject IJSRuntime JS
 @inject IDialogService DialogService
-@inject ISnackbar Snackbar
 @inject HttpClient Http
 
 <MudMainContent Class="pa-0 ma-0">
@@ -50,6 +49,7 @@
                     <JsonOutputPanel OrderJson="@OrderJson"
                                      Copied="@copied"
                                      SendSuccess="@sendSuccess"
+                                     CancelSuccess="@cancelSuccess"
                                      OnCopy="CopyJsonToClipboard"
                                      OnSend="SendOrderToServer"
                                      OnImport="OpenImportDialog"
@@ -67,6 +67,7 @@
     private string OrderJson = "";          // 🔥 CACHE JSON (QUAN TRỌNG)
     private bool copied;
     private bool? sendSuccess;
+    private bool? cancelSuccess;
     private CancellationTokenSource? _copyCts;
 
     // ================= INIT =================
@@ -248,35 +249,33 @@
 
     async Task CancelOrder()
     {
+        // reset trạng thái trước khi gửi
+        cancelSuccess = null;
+        StateHasChanged();
+
         try
         {
             var res = await Http.PostAsync("/api/order/cancel", null);
-
-            sendSuccess = null;   // reset trạng thái SEND
-            copied = false;
-
-            if (res.IsSuccessStatusCode)
-            {
-                Snackbar.Add(
-                    "⛔ Order đã huỷ",
-                    Severity.Info);
-            }
-            else
-            {
-                Snackbar.Add(
-                    "❌ Huỷ order thất bại",
-                    Severity.Error);
-            }
+            cancelSuccess = res.IsSuccessStatusCode;
         }
-        catch (Exception ex)
+        catch
         {
-            Snackbar.Add(
-                $"❌ Lỗi: {ex.Message}",
-                Severity.Error);
+            cancelSuccess = false;
         }
+
+        StateHasChanged();
+
+        // 🔥 AUTO RESET SAU 2 GIÂY
+        _ = Task.Run(async () =>
+        {
+            await Task.Delay(2000);
+            cancelSuccess = null;
+            await InvokeAsync(StateHasChanged);
+        });
     }
 
 
+
     async Task CopyJsonToClipboard()
     {
         _copyCts?.Cancel();
diff --git a/RobotApp.Client/Services/UiEdge.cs b/RobotApp.Client/Services/UiEdge.cs
index 987a580..048d3dc 100644
--- a/RobotApp.Client/Services/UiEdge.cs
+++ b/RobotApp.Client/Services/UiEdge.cs
@@ -131,7 +131,7 @@ public class OrderMessage
     public string Version { get; set; } = "v1";
     public string Manufacturer { get; set; } = "PNKX";
     public string SerialNumber { get; set; } = "T800-002";
-    public string OrderId { get; set; } = Guid.NewGuid().ToString();
+    public string OrderId { get; set; } 
     public int OrderUpdateId { get; set; }
     public string? ZoneSetId { get; set; }
 
@@ -419,7 +419,7 @@ public class OrderMessage
             manufacturer = Manufacturer,
             serialNumber = SerialNumber,
 
-            orderId = OrderId,
+            orderId = OrderId= Guid.NewGuid().ToString(),
             orderUpdateId = OrderUpdateId,
 
             zoneSetId = string.IsNullOrWhiteSpace(ZoneSetId)