From 97804a79daf037f5b0f10294d2aa337d1b8bbc41 Mon Sep 17 00:00:00 2001
From: Gareth Kirwan <gbjkirwan@gmail.com>
Date: Tue, 20 Jun 2023 00:56:58 +0100
Subject: [PATCH] Orders: Fix ClientOrderID not updated in merge (#1235)

---
 exchanges/order/order_test.go | 4 ++++
 exchanges/order/orders.go     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/exchanges/order/order_test.go b/exchanges/order/order_test.go
index 0547e242..ad496ca5 100644
--- a/exchanges/order/order_test.go
+++ b/exchanges/order/order_test.go
@@ -1091,6 +1091,7 @@ func TestUpdateOrderFromDetail(t *testing.T) {
 		OrderID:           "1",
 		AccountID:         "1",
 		ClientID:          "1",
+		ClientOrderID:     "DukeOfWombleton",
 		WalletAddress:     "1",
 		Type:              1,
 		Side:              1,
@@ -1166,6 +1167,9 @@ func TestUpdateOrderFromDetail(t *testing.T) {
 	if od.ClientID != "1" {
 		t.Error("Failed to update")
 	}
+	if od.ClientOrderID != "DukeOfWombleton" {
+		t.Error("Failed to update")
+	}
 	if od.WalletAddress != "1" {
 		t.Error("Failed to update")
 	}
diff --git a/exchanges/order/orders.go b/exchanges/order/orders.go
index 92bcac18..a5a29f56 100644
--- a/exchanges/order/orders.go
+++ b/exchanges/order/orders.go
@@ -184,6 +184,10 @@ func (d *Detail) UpdateOrderFromDetail(m *Detail) error {
 		d.ClientID = m.ClientID
 		updated = true
 	}
+	if m.ClientOrderID != "" && m.ClientOrderID != d.ClientOrderID {
+		d.ClientOrderID = m.ClientOrderID
+		updated = true
+	}
 	if m.WalletAddress != "" && m.WalletAddress != d.WalletAddress {
 		d.WalletAddress = m.WalletAddress
 		updated = true