13.59

CHANGELOG.md

@@ -1,3 +1,31 @@
+### Version 13.59 [ February 23rd 2024 ]
+*   Gnomeregan filters updated.
+*   Whitelisted Suspended World Buffs.
+*   Toggling spell ranks trigger range display issue.
+*   Updated allied races model skin.
+*   Currency error when using Better Bags.
+*   Season of Discovery Instance IDs added for the Raid Lockouts on Time Datatext.
+*   Filter creation error resolved when a filter and spell was selected.
+*   Raid Utility button supports boss mod cooldown function. (Wrath/Classic)
+*   Closing whisper tab mid-combat no longer causes errors.
+*   Blizzard options tooltip issue after displaying the Action Bars section resolved.
+*   Bags "itemButton" error fixed when adding a new Bag then reopening.
+*   Wrath Fury of Stormrage regen bug fixed. (Thanks ToddSisson)
+*   WeakAuras color picker save issue fixed. (Wrath)
+
+### Version 13.58 [ February 11th 2024 ]
+*   Updated LibRangeCheck which fixes the CheckInteractDistance error.
+*   Color Picker not saving properly on WeakAuras or other addons.
+*   The following Phase 2 auras have been added to AuraWatch & Whitelist:
+    *   Priest Renew
+    *   Priest Meditations
+    *   Druid Regrowth and Rejuvenation
+    *   Stranglethorn World Event Buff+Stacks
+    *   Stranglethorn Opt-Out PvP Buff
+    *   Dark Rider Rune discovery Buff
+    *   Cozy Sleeping Bag Buff+Stacks
+    *   Gnomeregan Raid Buffs+Debuffs
+
 ### Version 13.57 [ February 6th 2024 ]
 *   Classic: Blizzard fixed Top Auras
 

ElvUI/Classic/Filters/Filters.lua

@@ -428,6 +428,8 @@ G.unitframe.aurafilters.Blacklist = {
 G.unitframe.aurafilters.Whitelist = {
 	type = 'Whitelist',
 	spells = {
+	-- General
+	[349981] = List() -- Supercharged Chronoboon Displacer (Suspended World Buffs)
 	-- Druid
 	-- Hunter
 	-- Mage
@@ -457,6 +459,11 @@ if E.ClassicSOD then
 	Whitelist[438288] = List(2) -- Dark Presence
 end
 
+if E.ClassicHC then
+	-- Whitelist Self-Found Auras
+	G.unitframe.aurafilters.Whitelist.spells[431567] = List(2) -- Self-Found Adventurer
+end
+
 -- RAID DEBUFFS: This should be pretty self explainitory
 G.unitframe.aurafilters.RaidDebuffs = {
 	type = 'Whitelist',
@@ -651,6 +658,7 @@ if E.ClassicSOD then
 	RaidDebuffs[438714] = List(2) -- Furnace Surge
 	RaidDebuffs[438727] = List(2) -- Radiation Sickness
 	RaidDebuffs[438732] = List(2) -- Toxic Ventilation
+	RaidDebuffs[438735] = List(2) -- High Voltage!
 	RaidDebuffs[438720] = List(2) -- Freezing
 end
 

ElvUI/Classic/Modules/Blizzard/ColorPicker.lua

@@ -20,6 +20,8 @@ local ColorPickerFrame = ColorPickerFrame
 local CALENDAR_COPY_EVENT, CALENDAR_PASTE_EVENT = CALENDAR_COPY_EVENT, CALENDAR_PASTE_EVENT
 local CLASS, DEFAULT = CLASS, DEFAULT
 
+local colorFunc = E.Wrath and 'func' or 'swatchFunc' -- can probably remove this later
+
 local colorBuffer = {}
 local function alphaValue(num)
 	return num and floor(((1 - num) * 100) + .05) or 0
@@ -157,20 +159,16 @@ local function onColorSelect(frame, r, g, b)
 
 	if not frame:IsVisible() then
 		delayCall()
-	elseif not delayFunc then -- ColorPickerFrame.func is from stock Ace3 widget not the ElvUI variant
-		delayFunc = ColorPickerFrame.swatchFunc or ColorPickerFrame.func
+	elseif not delayFunc then
+		delayFunc = ColorPickerFrame[colorFunc]
 		E:Delay(delayWait, delayCall)
 	end
 end
 
 function BL:EnhanceColorPicker()
 	if E:IsAddOnEnabled('ColorPickerPlus') then return end
 
-	if E.Retail then
-		ColorPickerFrame.Border:Hide()
-	end
-
-	ColorPickerFrame.swatchFunc = E.noop -- REMOVE THIS LATER IF WE CAN? errors on Footer.OkayButton
+	ColorPickerFrame[colorFunc] = E.noop -- REMOVE THIS LATER IF WE CAN? errors on Footer.OkayButton
 
 	local Header = ColorPickerFrame.Header or _G.ColorPickerFrameHeader
 	Header:StripTextures()

ElvUI/Core/Modules/ActionBars/ActionBars.lua

@@ -1164,9 +1164,6 @@ do
 							child.CheckBox:SetEnabled(false)
 							child:DisplayEnabled(false)
 						end
-
-						child.CheckBox:SetScript('OnEnter', nil)
-						child.Tooltip:SetScript('OnEnter', nil)
 					end
 				end
 			end)

ElvUI/Core/Modules/Bags/Bags.lua

@@ -312,7 +312,7 @@ function B:Tooltip_Show()
 end
 
 do
-	local function DisableFrame(frame)
+	local function DisableFrame(frame, container)
 		if not frame then return end
 
 		frame:UnregisterAllEvents()
@@ -321,11 +321,15 @@ do
 		frame:SetParent(E.HiddenFrame)
 		frame:ClearAllPoints()
 		frame:Point('BOTTOM')
+
+		if container then -- this will fix itemButton being nil inside of UpdateItemLayout when first accessing a vendor then adding a bag
+			frame:RegisterEvent('BAG_CONTAINER_UPDATE')
+		end
 	end
 
 	function B:DisableBlizzard()
 		DisableFrame(_G.BankFrame)
-		DisableFrame(_G.ContainerFrameCombinedBags)
+		DisableFrame(_G.ContainerFrameCombinedBags, true)
 
 		for i = 1, NUM_CONTAINER_FRAMES do
 			_G['ContainerFrame'..i]:Kill()

ElvUI/Core/Modules/Chat/Chat.lua

@@ -83,6 +83,9 @@ local TitleIconVersion_Small = Enum.TitleIconVersion and Enum.TitleIconVersion.S
 local CHATCHANNELRULESET_MENTOR = Enum.ChatChannelRuleset and Enum.ChatChannelRuleset.Mentor
 local PLAYERMENTORSHIPSTATUS_NEWCOMER = Enum.PlayerMentorshipStatus and Enum.PlayerMentorshipStatus.Newcomer
 
+local SOUND_TUTORIAL_POPUP = SOUNDKIT.TUTORIAL_POPUP
+local SOUND_U_CHAT_SCROLL_BUTTON = SOUNDKIT.U_CHAT_SCROLL_BUTTON
+
 local NPEV2_CHAT_USER_TAG_GUIDE = gsub(NPEV2_CHAT_USER_TAG_GUIDE or '', '(|A.-|a).+', '%1') -- we only want the icon
 local SOCIAL_QUEUE_QUEUED_FOR = gsub(SOCIAL_QUEUE_QUEUED_FOR or '', ':%s?$', '') -- some language have `:` on end
 -- GLOBALS: ElvCharacterDB
@@ -802,6 +805,7 @@ function CH:StyleChat(frame)
 	frame:SetMaxLines(CH.db.maxLines)
 	frame:SetFading(CH.db.fade)
 
+	tab:SetScript('OnClick', CH.Tab_OnClick)
 	tab.Text:FontTemplate(LSM:Fetch('font', CH.db.tabFont), CH.db.tabFontSize, CH.db.tabFontOutline)
 
 	if not frame.isDocked then
@@ -2865,8 +2869,8 @@ function CH:SocialQueueMessage(guid, message)
 	if RecentSocialQueue(TIME, message) then return end
 	socialQueueCache[guid] = {TIME, message}
 
-	--UI_71_SOCIAL_QUEUEING_TOAST = 79739; appears to have no sound?
-	PlaySound(7355) --TUTORIAL_POPUP
+	-- UI_71_SOCIAL_QUEUEING_TOAST = 79739; appears to have no sound?
+	PlaySound(SOUND_TUTORIAL_POPUP)
 
 	E:Print(format('|Hsqu:%s|h%s|h', guid, strtrim(message)))
 end
@@ -3558,7 +3562,7 @@ function CH:FCF_Close(fallback)
 	CH:PostChatClose(self) -- also call this since it won't call from blizzard in this case
 end
 
---Same reason as CH.FCF_Close
+--Same reason as CH.FCF_Close (see note)
 function CH:FCF_PopInWindow(fallback)
 	if fallback then self = fallback end
 	if not self or self == CH then self = _G.FCF_GetCurrentChatFrame() end
@@ -3569,6 +3573,55 @@ function CH:FCF_PopInWindow(fallback)
 	CH.FCF_Close(self) -- use ours to fix close chat bug
 end
 
+-- Same reason as CH.FCF_Close (see note) but in order to fix close by middle clicking
+function CH:FCF_Tab_OnClick(button)
+	local chat = self and CH:GetOwner(self)
+	if not chat then return end
+
+	if button == 'RightButton' then -- If Rightclick bring up the options menu
+		chat:StopMovingOrSizing()
+
+		_G.CURRENT_CHAT_FRAME_ID = self:GetID()
+
+		local tabName = self:GetName()
+		_G.ToggleDropDownMenu(1, nil, _G[tabName..'DropDown'], tabName, 0, 0)
+	elseif button == 'MiddleButton' then
+		if (E.Retail or (chat ~= _G.DEFAULT_CHAT_FRAME and not _G.IsCombatLog(chat))) and not _G.IsBuiltinChatWindow(chat) then -- Dynamic between classic/wrath/retail ~Simpy
+			if not chat.isTemporary then
+				CH.FCF_PopInWindow(self, chat)
+				return
+			elseif chat.chatType == 'WHISPER' or chat.chatType == 'BN_WHISPER' then
+				CH.FCF_PopInWindow(self, chat)
+				return
+			elseif chat.chatType == 'PET_BATTLE_COMBAT_LOG' then
+				CH.FCF_Close(chat)
+			else
+				GMError(format('Unhandled temporary window type. chatType: %s, chatTarget %s', tostring(chat.chatType), tostring(chat.chatTarget)))
+			end
+		end
+	else
+		_G.CloseDropDownMenus() -- Close all dropdowns
+		_G.SELECTED_CHAT_FRAME = chat -- If frame is docked assume that a click is to select a chat window, not drag it
+
+		if chat.isDocked and _G.FCFDock_GetSelectedWindow(_G.GENERAL_CHAT_DOCK) ~= chat then
+			_G.FCF_SelectDockFrame(chat)
+		end
+
+		if GetCVar('chatStyle') ~= 'classic' then
+			_G.ChatEdit_SetLastActiveWindow(chat.editBox)
+		end
+
+		chat:ResetAllFadeTimes()
+
+		_G.FCF_FadeInChatFrame(chat)
+	end
+end
+
+function CH:Tab_OnClick(button)
+	CH.FCF_Tab_OnClick(self, button)
+	PlaySound(SOUND_U_CHAT_SCROLL_BUTTON)
+end
+
 do
 	local closeButtons = {
 		[_G.CLOSE_CHAT_CONVERSATION_WINDOW] = true,

ElvUI/Core/Modules/DataTexts/Difficulty.lua

@@ -47,7 +47,7 @@ for i = 1, 200 do
 end
 
 local DiffIDLabel = { -- also has IDs maintained in Nameplate StyleFilters
-	['N'] = { 1, 14, 38, 173, 201 },
+	['N'] = { 1, 14, 38, 173, 198, 201 },
 	['H'] = { 2, 15, 39, 174 },
 	['M'] = { 16, 23, 40 },
 	['20'] = { 148, 185 },

ElvUI/Core/Modules/DataTexts/Time.lua

@@ -213,7 +213,7 @@ local function OnEnter()
 		local info = { GetSavedInstanceInfo(i) } -- we want to send entire info
 		local name, _, _, difficulty, locked, extended, _, isRaid = unpack(info)
 		if name and (locked or extended) then
-			local isDungeon = difficulty == 2 or difficulty == 23 or difficulty == 174 or difficulty == 201
+			local isDungeon = difficulty == 2 or difficulty == 23 or difficulty == 174 or difficulty == 198 or difficulty == 201
 			if isRaid or isDungeon then
 				local isLFR = difficulty == 7 or difficulty == 17
 				local _, _, isHeroic, _, displayHeroic, displayMythic = GetDifficultyInfo(difficulty)

ElvUI/Core/Modules/Misc/EditorMode.lua

@@ -133,7 +133,7 @@ function EM:Initialize()
 	-- account settings will be tainted
 	local mixin = _G.EditModeManagerFrame.AccountSettings
 	if CheckCastFrame() then mixin.RefreshCastBar = E.noop end
-	if CheckAuraFrame() then mixin.RefreshAuraFrame = E.noop end
+	if CheckAuraFrame() then mixin.RefreshBuffsAndDebuffs = E.noop end
 	if CheckBossFrame() then mixin.RefreshBossFrames = E.noop end
 	if CheckArenaFrame() then mixin.RefreshArenaFrames = E.noop end
 	if CheckRaidFrame() then mixin.RefreshRaidFrames = E.noop end

ElvUI/Core/Modules/Misc/RaidUtility.lua

@@ -33,7 +33,7 @@ local GetRestrictPings = C_PartyInfo.GetRestrictPings
 local IG_MAINMENU_OPTION_CHECKBOX_ON = SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
 local PRIEST_COLOR = RAID_CLASS_COLORS.PRIEST
 local NUM_RAID_GROUPS = NUM_RAID_GROUPS
-local PANEL_HEIGHT = E.Retail and 180 or 130
+local PANEL_HEIGHT = E.Retail and 154 or 130
 local PANEL_WIDTH = 230
 local BUTTON_HEIGHT = 20
 
@@ -370,10 +370,13 @@ function RU:Initialize()
 	RU.Buttons = {}
 	RU.CheckBoxes = {}
 
+	local hasCountdown = C_PartyInfo.DoCountdown
+	local countdownHeight = hasCountdown and 0 or 25
+
 	local RaidUtilityPanel = CreateFrame('Frame', 'RaidUtilityPanel', E.UIParent, 'SecureHandlerBaseTemplate')
 	RaidUtilityPanel:SetScript('OnMouseUp', RU.OnClick_RaidUtilityPanel)
 	RaidUtilityPanel:SetTemplate('Transparent')
-	RaidUtilityPanel:Size(PANEL_WIDTH, PANEL_HEIGHT)
+	RaidUtilityPanel:Size(PANEL_WIDTH, PANEL_HEIGHT - countdownHeight)
 	RaidUtilityPanel:Point('TOP', E.UIParent, 'TOP', -400, 1)
 	RaidUtilityPanel:SetFrameLevel(3)
 	RaidUtilityPanel.toggled = false
@@ -425,7 +428,7 @@ function RU:Initialize()
 	if E.Retail or E.Wrath then
 		local RoleIcons = CreateFrame('Frame', 'RaidUtilityRoleIcons', RaidUtilityPanel)
 		RoleIcons:Point('LEFT', RaidUtilityPanel, 'RIGHT', -1, 0)
-		RoleIcons:Size(36, PANEL_HEIGHT)
+		RoleIcons:Size(36, PANEL_HEIGHT - countdownHeight)
 		RoleIcons:SetTemplate('Transparent')
 		RoleIcons:RegisterEvent('PLAYER_ENTERING_WORLD')
 		RoleIcons:RegisterEvent('GROUP_ROSTER_UPDATE')
@@ -466,27 +469,22 @@ function RU:Initialize()
 	end
 
 	local BUTTON_WIDTH = PANEL_WIDTH - 20
-	local DisbandRaidButton = RU:CreateUtilButton('RaidUtility_DisbandRaidButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH, BUTTON_HEIGHT, 'TOP', RaidUtilityPanel, 'TOP', 0, -5, L["Disband Group"])
+	local RaidControlButton = RU:CreateUtilButton('RaidUtility_RaidControlButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', RaidUtilityPanel, 'TOPLEFT', 10, -4, L["Raid Menu"])
+	RaidControlButton:SetScript('OnMouseUp', RU.OnClick_RaidControlButton)
+
+	local DisbandRaidButton = RU:CreateUtilButton('RaidUtility_DisbandRaidButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', RaidControlButton, 'TOPRIGHT', 3, 0, L["Disband Group"])
 	DisbandRaidButton:SetScript('OnMouseUp', RU.OnClick_DisbandRaidButton)
 
-	local ReadyCheckButton = RU:CreateUtilButton('RaidUtility_ReadyCheckButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH, BUTTON_HEIGHT, 'TOPLEFT', DisbandRaidButton, 'BOTTOMLEFT', 0, -5, _G.READY_CHECK)
+	local ReadyCheckButton = RU:CreateUtilButton('RaidUtility_ReadyCheckButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * (E.Classic and 1 or 0.49), BUTTON_HEIGHT, 'TOPLEFT', RaidControlButton, 'BOTTOMLEFT', 0, -5, _G.READY_CHECK)
 	ReadyCheckButton:SetScript('OnMouseUp', RU.OnClick_ReadyCheckButton)
 
 	local RoleCheckButton
 	if E.Retail or E.Wrath then
-		RoleCheckButton = RU:CreateUtilButton('RaidUtility_RoleCheckButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * (E.Wrath and 0.49 or 0.78), BUTTON_HEIGHT, 'TOPLEFT', ReadyCheckButton, 'BOTTOMLEFT', 0, -5, _G.ROLE_POLL)
+		RoleCheckButton = RU:CreateUtilButton('RaidUtility_RoleCheckButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', ReadyCheckButton, 'TOPRIGHT', 3, 0, _G.ROLE_POLL)
 		RoleCheckButton:SetScript('OnMouseUp', RU.OnClick_RoleCheckButton)
 	end
 
-	local RaidControlButton = RU:CreateUtilButton('RaidUtility_RaidControlButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * ((E.Retail or E.Wrath) and 0.49 or 1), BUTTON_HEIGHT, 'TOPLEFT', ((E.Retail or E.Wrath) and RoleCheckButton) or ReadyCheckButton, E.Wrath and 'TOPRIGHT' or 'BOTTOMLEFT', E.Wrath and 3 or 0, E.Wrath and 0 or -5, L["Raid Menu"])
-	RaidControlButton:SetScript('OnMouseUp', RU.OnClick_RaidControlButton)
-
-	if C_PartyInfo.DoCountdown then
-		local RaidCountdownButton = RU:CreateUtilButton('RaidUtility_RaidCountdownButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', RaidControlButton, 'TOPRIGHT', 3, 0, _G.PLAYER_COUNTDOWN_BUTTON)
-		RaidCountdownButton:SetScript('OnMouseUp', RU.OnClick_RaidCountdownButton)
-	end
-
-	local MainTankButton = RU:CreateUtilButton('RaidUtility_MainTankButton', RaidUtilityPanel, 'SecureActionButtonTemplate, UIMenuButtonStretchTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', E.Wrath and RoleCheckButton or RaidControlButton, 'BOTTOMLEFT', 0, -5, _G.MAINTANK)
+	local MainTankButton = RU:CreateUtilButton('RaidUtility_MainTankButton', RaidUtilityPanel, 'SecureActionButtonTemplate, UIMenuButtonStretchTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', ReadyCheckButton, 'BOTTOMLEFT', 0, -5, _G.MAINTANK)
 	MainTankButton:SetAttribute('type', 'maintank')
 	MainTankButton:SetAttribute('unit', 'target')
 	MainTankButton:SetAttribute('action', 'toggle')
@@ -496,7 +494,13 @@ function RU:Initialize()
 	MainAssistButton:SetAttribute('unit', 'target')
 	MainAssistButton:SetAttribute('action', 'toggle')
 
-	local EveryoneAssist = RU:CreateCheckBox('RaidUtility_EveryoneAssist', RaidUtilityPanel, nil, BUTTON_WIDTH, BUTTON_HEIGHT + 4, 'TOPLEFT', MainTankButton, 'BOTTOMLEFT', -4, -3, _G.ALL_ASSIST_LABEL_LONG, {'GROUP_ROSTER_UPDATE', 'PARTY_LEADER_CHANGED'}, RU.OnEvent_EveryoneAssist, RU.OnClick_EveryoneAssist)
+	local RaidCountdownButton
+	if hasCountdown then
+		RaidCountdownButton = RU:CreateUtilButton('RaidUtility_RaidCountdownButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * (E.Retail and 0.78 or 1), BUTTON_HEIGHT, 'TOPLEFT', MainTankButton, 'BOTTOMLEFT', 0, -5, L["Countdown"])
+		RaidCountdownButton:SetScript('OnMouseUp', RU.OnClick_RaidCountdownButton)
+	end
+
+	local EveryoneAssist = RU:CreateCheckBox('RaidUtility_EveryoneAssist', RaidUtilityPanel, nil, BUTTON_WIDTH, BUTTON_HEIGHT + 4, 'TOPLEFT', RaidCountdownButton or MainTankButton, 'BOTTOMLEFT', -4, -3, _G.ALL_ASSIST_LABEL_LONG, {'GROUP_ROSTER_UPDATE', 'PARTY_LEADER_CHANGED'}, RU.OnEvent_EveryoneAssist, RU.OnClick_EveryoneAssist)
 
 	if SetRestrictPings then
 		RU:CreateCheckBox('RaidUtility_RestrictPings', RaidUtilityPanel, nil, BUTTON_WIDTH, BUTTON_HEIGHT + 4, 'TOPLEFT', EveryoneAssist, 'BOTTOMLEFT', 0, 0, _G.RAID_MANAGER_RESTRICT_PINGS, {'GROUP_ROSTER_UPDATE', 'PARTY_LEADER_CHANGED'}, RU.OnEvent_RestrictPings, RU.OnClick_RestrictPings)
@@ -508,7 +512,7 @@ function RU:Initialize()
 			local marker = _G.CompactRaidFrameManagerDisplayFrameLeaderOptionsRaidWorldMarkerButton
 			marker:SetParent(RaidUtilityPanel)
 			marker:ClearAllPoints()
-			marker:Point('TOPLEFT', RoleCheckButton, 'TOPRIGHT', 3, 0)
+			marker:Point('TOPLEFT', RaidCountdownButton, 'TOPRIGHT', 3, 0)
 			marker:Size(BUTTON_WIDTH * 0.2, BUTTON_HEIGHT)
 			marker:HookScript('OnEnter', RU.OnEnter_Button)
 			marker:HookScript('OnLeave', RU.OnLeave_Button)

ElvUI/Core/Modules/Nameplates/StyleFilter.lua

@@ -101,7 +101,8 @@ NP.TriggerConditions = {
 		[8] = 'mythic+',
 		[23] = 'mythic',
 		[24] = 'timewalking',
-		[201] = 'normal', -- classic hardcore
+		[198] = 'normal', -- Classic: Season of Discovery
+		[201] = 'normal', -- Classic: Hardcore
 		-- raids
 		[7] = 'lfr',
 		[17] = 'lfr',

ElvUI/Core/Modules/Tooltip/Tooltip.lua

@@ -896,9 +896,10 @@ function TT:SetToyByItemID(tt, id)
 end
 
 function TT:SetCurrencyToken(tt, index)
-	if tt:IsForbidden() then return end
+	if tt:IsForbidden() or not TT:IsModKeyDown() then return end
 
-	local id = TT:IsModKeyDown() and tonumber(strmatch(C_CurrencyInfo_GetCurrencyListLink(index),'currency:(%d+)'))
+	local link = index and C_CurrencyInfo_GetCurrencyListLink(index)
+	local id = link and tonumber(strmatch(link, 'currency:(%d+)'))
 	if not id then return end
 
 	tt:AddLine(' ')

ElvUI/Core/Modules/UnitFrames/UnitFrames.lua

@@ -552,7 +552,7 @@ do -- IDs maintained in Difficulty Datatext and Nameplate StyleFilters
 		keys = {
 			none = {0},
 			timewalking = {24, 33, 151},
-			dungeonNormal = {1, 38, 173, 201, 205}, -- 205 is follower
+			dungeonNormal = {1, 38, 173, 198, 201, 205}, -- 205 is follower
 			dungeonHeroic = {2, 39, 174},
 			dungeonMythic = {23, 40},
 			dungeonMythicKeystone = {8},

ElvUI/ElvUI_Classic.toc

@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cfd9b9b9bClassic|r
 ## Notes: User Interface Replacement
 ## Author: Elv, Simpy
-## Version: 13.58
+## Version: 13.59
 ## SavedVariables: ElvDB, ElvPrivateDB
 ## SavedVariablesPerCharacter: ElvCharacterDB
 ## OptionalDeps: SharedMedia, Tukui, Masque

ElvUI/ElvUI_Mainline.toc

@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r
 ## Notes: User Interface Replacement
 ## Author: Elv, Simpy
-## Version: 13.58
+## Version: 13.59
 ## SavedVariables: ElvDB, ElvPrivateDB
 ## SavedVariablesPerCharacter: ElvCharacterDB
 ## OptionalDeps: SharedMedia, Tukui, Masque