From 8d1945e9a0e3836c75b333f9c99e41633003cc38 Mon Sep 17 00:00:00 2001
From: Kamiel <k.vanflierenburg@outlook.com>
Date: Sun, 15 Apr 2018 19:37:46 +0200
Subject: [PATCH] Show grand exchange offer type on cancelled state

---
 .../java/net/runelite/api/GrandExchangeOfferState.java   | 8 ++++++--
 .../plugins/grandexchange/GrandExchangeOfferSlot.java    | 9 ++++++---
 .../grandexchange/GrandExchangeOfferSlotTest.java        | 2 +-
 .../net/runelite/mixins/RSGrandExchangeOfferMixin.java   | 5 +++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/runelite-api/src/main/java/net/runelite/api/GrandExchangeOfferState.java b/runelite-api/src/main/java/net/runelite/api/GrandExchangeOfferState.java
index 0c68e493ba..17f7d00760 100644
--- a/runelite-api/src/main/java/net/runelite/api/GrandExchangeOfferState.java
+++ b/runelite-api/src/main/java/net/runelite/api/GrandExchangeOfferState.java
@@ -35,9 +35,13 @@ public enum GrandExchangeOfferState
 	 */
 	EMPTY,
 	/**
-	 * Any offer that's been cancelled
+	 * A cancelled buy offer
 	 */
-	CANCELLED,
+	CANCELLED_BUY,
+	/**
+	 * A cancelled sell offer
+	 */
+	CANCELLED_SELL,
 	/**
 	 * A buy offer that is currently in progress.
 	 */
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
index 856d997f1a..7e9409a26d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
@@ -151,8 +151,10 @@ public class GrandExchangeOfferSlot extends JPanel
 	{
 		switch (state)
 		{
-			case CANCELLED:
-				return "Cancelled";
+			case CANCELLED_BUY:
+				return "Buying cancelled";
+			case CANCELLED_SELL:
+				return "Selling cancelled";
 			case BUYING:
 				return "Buying";
 			case BOUGHT:
@@ -172,7 +174,8 @@ public class GrandExchangeOfferSlot extends JPanel
 	{
 		switch (state)
 		{
-			case CANCELLED:
+			case CANCELLED_BUY:
+			case CANCELLED_SELL:
 				return GE_CANCELLED_RED;
 			case BUYING:
 			case SELLING:
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlotTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlotTest.java
index 216b6493c9..2ed3b1175a 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlotTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlotTest.java
@@ -45,7 +45,7 @@ public class GrandExchangeOfferSlotTest
 	@Test
 	public void testUpdateOffer()
 	{
-		when(offer.getState()).thenReturn(GrandExchangeOfferState.CANCELLED);
+		when(offer.getState()).thenReturn(GrandExchangeOfferState.CANCELLED_BUY);
 
 		GrandExchangeOfferSlot offerSlot = new GrandExchangeOfferSlot();
 		offerSlot.updateOffer(mock(ItemComposition.class), mock(BufferedImage.class), offer);
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSGrandExchangeOfferMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSGrandExchangeOfferMixin.java
index f132e84ab4..17509a4aa1 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSGrandExchangeOfferMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSGrandExchangeOfferMixin.java
@@ -28,7 +28,8 @@ package net.runelite.mixins;
 import net.runelite.api.GrandExchangeOfferState;
 import static net.runelite.api.GrandExchangeOfferState.BOUGHT;
 import static net.runelite.api.GrandExchangeOfferState.BUYING;
-import static net.runelite.api.GrandExchangeOfferState.CANCELLED;
+import static net.runelite.api.GrandExchangeOfferState.CANCELLED_BUY;
+import static net.runelite.api.GrandExchangeOfferState.CANCELLED_SELL;
 import static net.runelite.api.GrandExchangeOfferState.EMPTY;
 import static net.runelite.api.GrandExchangeOfferState.SELLING;
 import static net.runelite.api.GrandExchangeOfferState.SOLD;
@@ -79,7 +80,7 @@ public abstract class RSGrandExchangeOfferMixin implements RSGrandExchangeOffer
 		}
 		else if (isFinished && getQuantitySold() < getTotalQuantity())
 		{
-			return CANCELLED;
+			return isSelling ? CANCELLED_SELL : CANCELLED_BUY;
 		}
 		else if (isSelling)
 		{