11.0.0 (55818)

Gethe · Jul 24, 2024 · 5a34f68 · 5a34f68
1 parent a2be406
commit 5a34f68
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/Interface/AddOns/Blizzard_GlueDialogs/Mainline/GlueDialog.lua b/Interface/AddOns/Blizzard_GlueDialogs/Mainline/GlueDialog.lua
@@ -422,13 +422,10 @@ StaticPopupDialogs["SWAPPING_ENVIRONMENT"] = {
 
 StaticPopupDialogs["ACCOUNT_CONVERSION_DISPLAY"] = {
  text = ACCOUNT_CONVERSION_IN_PROGRESS,
- button1 = BACK,
+ button1 = nil,
  button2 = nil,
  cover = true,
  spinner = true,
- OnAccept = function()
- C_Login.DisconnectFromServer();
- end
 }
 
 StaticPopupDialogs["CREATE_CHARACTER_REALM_CONFIRMATION"] = {

diff --git a/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterSelect.lua b/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterSelect.lua
@@ -828,7 +828,8 @@ function CharacterSelect_SelectCharacter(index, noCreate)
  CharSelectEnterWorldButton:SetText(text);
 
  if characterInfo.boostInProgress == false and (not CharacterServicesFlow_IsShowing() or not CharacterServicesMaster.flow:UsesSelector()) then
- if IsRPEBoostEligible(selectedCharacterID) and characterInfo.realmName == CharacterSelectUtil.GetFormattedCurrentRealmName() then
+ local currentRealm = GetServerName();
+ if IsRPEBoostEligible(selectedCharacterID) and characterInfo.realmName == currentRealm then
  BeginCharacterServicesFlow(RPEUpgradeFlow, {});
  if IsVeteranTrialAccount() then
  CharSelectServicesFlow_Minimize() --if they need to resubscribe, get the RPE flow out of the way.

diff --git a/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterSelect/CharacterSelectTemplates.lua b/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterSelect/CharacterSelectTemplates.lua
@@ -70,9 +70,11 @@ function CharacterSelectToolTrayMixin:SetToolFrameShown(toolFrame, isEnabled)
 end
 
 function CharacterSelectToolTrayMixin:UpdateLayoutIndices()
+ local anyActiveToolFrames = false;
  local nextLayoutIndex = 1;
  for i, toolFrame in ipairs(self.toolFrames) do
  if toolFrame:IsShown() then
+ anyActiveToolFrames = true;
  toolFrame.layoutIndex = nextLayoutIndex;
  nextLayoutIndex = nextLayoutIndex + 1;
  else
@@ -82,6 +84,7 @@ function CharacterSelectToolTrayMixin:UpdateLayoutIndices()
 
  self.nextLayoutIndex = nextLayoutIndex;
  self.Container:MarkDirty();
+ self:SetShown(anyActiveToolFrames);
 end
 
 function CharacterSelectToolTrayMixin:SetExpanded(isExpanded, isUserInput)

diff --git a/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterSelect/CharacterSelectUtil.lua b/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterSelect/CharacterSelectUtil.lua
@@ -125,7 +125,8 @@ function CharacterSelectUtil.SetTooltipForCharacterInfo(characterInfo, character
  local professionName1 = profession1 ~= 0 and GetSkillLineDisplayNameForRace(profession1, raceID) or nil;
 
  -- Block 4
- local money = realmName == CharacterSelectUtil.GetFormattedCurrentRealmName() and characterInfo.money or 0;
+ local currentRealmName = GetServerName();
+ local money = realmName == currentRealmName and characterInfo.money or 0;
 
  -- Block 5
  local hasGearUpdate = characterID and IsRPEBoostEligible(characterID);
@@ -178,7 +179,7 @@ function CharacterSelectUtil.SetTooltipForCharacterInfo(characterInfo, character
  GameTooltip_AddNormalLine(GlueTooltip, RPE_TOOLTIP_LINE1);
  GameTooltip_AddNormalLine(GlueTooltip, RPE_TOOLTIP_LINE2);
 
- if realmName ~= CharacterSelectUtil.GetFormattedCurrentRealmName() then
+ if realmName ~= currentRealmName then
  GameTooltip_AddErrorLine(GlueTooltip, RPE_TOOLTIP_CHARACTER_ON_DIFFERENT_REALM);
  end
  end

diff --git a/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterServices.lua b/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterServices.lua
@@ -873,7 +873,7 @@ function DoesClientThinkTheCharacterIsEligibleForCharacterUpgrade(characterID)
  local errors = {};
 
  if characterInfo then
- local currentRealm = CharacterSelectUtil.GetFormattedCurrentRealmName();
+ local currentRealm = GetServerName();
  local characterRealm = characterInfo.realmName;
  CheckAddVASErrorString(errors, BLIZZARD_STORE_VAS_ERROR_CHARACTER_ON_DIFFERENT_REALM_1, currentRealm == characterRealm);
  CheckAddVASErrorString(errors, BLIZZARD_STORE_VAS_ERROR_CHARACTER_ON_DIFFERENT_REALM_2, currentRealm == characterRealm);

diff --git a/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterServicesPaidCharacterTransfer.lua b/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterServicesPaidCharacterTransfer.lua
@@ -24,7 +24,7 @@ function DoesClientThinkTheCharacterIsEligibleForPCT(characterID)
  local errors = {};
 
  if characterInfo then
- local currentRealm = CharacterSelectUtil.GetFormattedCurrentRealmName();
+ local currentRealm = GetServerName();
  local characterRealm = characterInfo.realmName;
  CheckAddVASErrorString(errors, BLIZZARD_STORE_VAS_ERROR_CHARACTER_ON_DIFFERENT_REALM_1, currentRealm == characterRealm);
  CheckAddVASErrorString(errors, BLIZZARD_STORE_VAS_ERROR_CHARACTER_ON_DIFFERENT_REALM_2, currentRealm == characterRealm);

diff --git a/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterServicesPaidFactionChange.lua b/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterServicesPaidFactionChange.lua
@@ -51,7 +51,7 @@ function DoesClientThinkTheCharacterIsEligibleForPFC(characterID)
  local errors = {};
 
  if characterInfo then
- local currentRealm = CharacterSelectUtil.GetFormattedCurrentRealmName();
+ local currentRealm = GetServerName();
  local characterRealm = characterInfo.realmName;
  CheckAddVASErrorString(errors, BLIZZARD_STORE_VAS_ERROR_CHARACTER_ON_DIFFERENT_REALM_1, currentRealm == characterRealm);
  CheckAddVASErrorString(errors, BLIZZARD_STORE_VAS_ERROR_CHARACTER_ON_DIFFERENT_REALM_2, currentRealm == characterRealm);

diff --git a/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterServicesPaidNameChange.lua b/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterServicesPaidNameChange.lua
@@ -52,7 +52,7 @@ function DoesClientThinkTheCharacterIsEligibleForPNC(characterID)
 
  local characterInfo = CharacterSelectUtil.GetCharacterInfoTable(characterID);
  if characterInfo then
- local currentRealm = CharacterSelectUtil.GetFormattedCurrentRealmName();
+ local currentRealm = GetServerName();
  local characterRealm = characterInfo.realmName;
  CheckAddVASErrorString(errors, BLIZZARD_STORE_VAS_ERROR_CHARACTER_ON_DIFFERENT_REALM_1, currentRealm == characterRealm);
  CheckAddVASErrorString(errors, BLIZZARD_STORE_VAS_ERROR_CHARACTER_ON_DIFFERENT_REALM_2, currentRealm == characterRealm);

diff --git a/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterServicesPaidRaceChange.lua b/Interface/AddOns/Blizzard_GlueXML/Mainline/CharacterServicesPaidRaceChange.lua
@@ -33,7 +33,7 @@ function DoesClientThinkTheCharacterIsEligibleForPRC(characterID)
  local errors = {};
 
  if characterInfo then
- local currentRealm = CharacterSelectUtil.GetFormattedCurrentRealmName();
+ local currentRealm = GetServerName();
  local characterRealm = characterInfo.realmName;
  CheckAddVASErrorString(errors, BLIZZARD_STORE_VAS_ERROR_CHARACTER_ON_DIFFERENT_REALM_1, currentRealm == characterRealm);
  CheckAddVASErrorString(errors, BLIZZARD_STORE_VAS_ERROR_CHARACTER_ON_DIFFERENT_REALM_2, currentRealm == characterRealm);