10.2.0 (52068)

Gethe · Nov 7, 2023 · ac4910b · ac4910b
1 parent 3e964ed
commit ac4910b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/Interface/AddOns/Blizzard_APIDocumentationGenerated/PvpInfoDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentationGenerated/PvpInfoDocumentation.lua
@@ -1101,7 +1101,7 @@ local PvpInfo =
 			LiteralName = "PVP_ROLE_POPUP_HIDE",
 			Payload =
 			{
-				{ Name = "readyCheckInfo", Type = "PvpReadyCheckInfo", Nilable = false },
+				{ Name = "readyCheckInfo", Type = "PvpReadyCheckInfo", Nilable = true },
 			},
 		},
 		{

diff --git a/Interface/AddOns/Blizzard_PerksProgram/Blizzard_PerksProgramProducts.lua b/Interface/AddOns/Blizzard_PerksProgram/Blizzard_PerksProgramProducts.lua
@@ -80,11 +80,20 @@ function PerksProgramProductsFrameMixin:OnEvent(event, ...)
 		local vendorItemID = ...;
 
 		local vendorItemInfo = PerksProgramFrame:GetVendorItemInfo(vendorItemID);
-
 		if event == "PERKS_PROGRAM_REFUND_SUCCESS" then
 			vendorItemInfo.purchased = false;
 		end
 
+		-- Make sure to update scroll box data since they won't receive the events sent below to update shown frames
+		local scrollBox = self.ProductsScrollBoxContainer.ScrollBox;
+		local _, foundElementData = scrollBox:FindByPredicate(function(elementData)
+			return elementData.perksVendorItemID == vendorItemID;
+		end);
+		if foundElementData then
+			foundElementData.purchased = vendorItemInfo.purchased;
+			foundElementData.refundable = vendorItemInfo.refundable;
+		end
+
 		EventRegistry:TriggerEvent("PerksProgram.OnProductPurchasedStateChange", vendorItemInfo);
 		EventRegistry:TriggerEvent("PerksProgram.OnProductInfoChanged", vendorItemInfo);
 

diff --git a/Interface/FrameXML/PvpPopup.lua b/Interface/FrameXML/PvpPopup.lua
@@ -23,8 +23,14 @@ function PVPReadyPopupMixin:OnEvent(event, ...)
 	elseif (event == "PVP_ROLE_POPUP_HIDE") then 
 		if(self:IsShown()) then 
 			local readyCheckInfo = ...;
-			self.startHide = true; 
-			self:Setup(readyCheckInfo); 
+			local hideInstantly = readyCheckInfo == nil;
+			if hideInstantly then
+				PlaySound(SOUNDKIT.LFG_DENIED);
+				StaticPopupSpecial_Hide(PVPReadyPopup);
+			else
+				self.startHide = true; 
+				self:Setup(readyCheckInfo);
+			end
 		end 
 	end		
 end

diff --git a/Interface/GlueXML/CharacterServices.lua b/Interface/GlueXML/CharacterServices.lua
@@ -54,7 +54,7 @@ local function IsBoostFlowValidForCharacter(flowData, class, level, boostInProgr
 		return false;
 	end
 
-	if raceFilename == "Dracthyr" then
+	if (flowData.level < 70) and (raceFilename == "Dracthyr") then
 		return false;
 	end