Fix trader price sorting

Author: vaisest

spec/System/TestTradeQueryCurrency_spec.lua

@@ -58,12 +58,25 @@ describe("TradeQuery Currency Conversion", function()
 	end)
 
 	describe("GetTotalPriceString", function()
-		-- Pass: Sums and formats correctly (e.g., "5 chaos, 10 div")
+		-- Pass: Sums and formats correctly (e.g., "5 chaos, 10 div", should be most valuable currency first)
 		-- Fail: Wrong string (e.g., unsorted/missing sums), indicating aggregation bug, misleading users on totals
 		it("aggregates prices", function()
-			mock_tradeQuery.totalPrice = { { currency = "chaos", amount = 5 }, { currency = "div", amount = 10 } }
+			-- check alphabetical sorting
+			mock_tradeQuery.totalPrice = { { currency = "chaos", amount = 5 }, { currency = "div", amount = 10 }, {currency = "exalted", amount = 1} }
 			local result = mock_tradeQuery:GetTotalPriceString()
-			assert.are.equal(result, "5 chaos, 10 div")
+			assert.are.equal(result, "1 exalted, 10 div, 5 chaos")
+
+			-- check if they're sorted according to currency value
+			mock_tradeQuery.pbLeague = "league"
+			mock_tradeQuery.pbCurrencyConversion = { league = { chaos = 0.1, exalted = 0.05, div = 1, mirror = 700} }
+			local result = mock_tradeQuery:GetTotalPriceString()
+			assert.are.equal(result, "10 div, 5 chaos, 1 exalted")
+
+			-- check that missing currency values don't crash
+			mock_tradeQuery.pbLeague = "league"
+			mock_tradeQuery.pbCurrencyConversion = { league = { chaos = 0.1, exalted = 0.05, mirror = 700 } }
+			local result = mock_tradeQuery:GetTotalPriceString()
+			assert.True(true)
 		end)
 	end)
 end)

src/Classes/TradeQuery.lua

@@ -1298,15 +1298,32 @@ end
 -- Method to update the Total Price string sum of all items
 function TradeQueryClass:GetTotalPriceString()
 	local text = ""
-	local sorted_price = { }
+	-- sum up prices
+	local prices = {}
 	for _, entry in pairs(self.totalPrice) do
-		if sorted_price[entry.currency] then
-			sorted_price[entry.currency] = sorted_price[entry.currency] + entry.amount
+		if prices[entry.currency] then
+			prices[entry.currency] = prices[entry.currency] + entry.amount
 		else
-			sorted_price[entry.currency] = entry.amount
+			prices[entry.currency] = entry.amount
 		end
 	end
-	for currency, value in pairs(sorted_price) do
+
+	-- try to sort by the value of each currency, i.e. 1 mirror > 9999 div, 1 chaos > 123 ex
+	-- if currency data isn't available, just sort by currency name
+	local currencies = {}
+	for currency, _ in pairs(prices) do
+		table.insert(currencies, currency)
+	end
+	local currencyMap = self.pbCurrencyConversion[self.pbLeague] or {}
+	table.sort(currencies, function(a, b)
+		if currencyMap[a] and currencyMap[b] then
+			return currencyMap[a] > currencyMap[b]
+		else
+			return a > b
+		end
+	end)
+	for _, currency in ipairs(currencies) do
+		local value = prices[currency]
 		text = text .. tostring(value) .. " " .. currency .. ", "
 	end
 	if text ~= "" then