diff --git a/src/components/status.jsx b/src/components/status.jsx index c09277ac..30cba751 100644 --- a/src/components/status.jsx +++ b/src/components/status.jsx @@ -105,10 +105,11 @@ function Status({ const { instance: currentInstance } = api(); const sameInstance = instance === currentInstance; - const sKey = statusKey(statusID, instance); + let sKey = statusKey(statusID, instance); const snapStates = useSnapshot(states); if (!status) { status = snapStates.statuses[sKey] || snapStates.statuses[statusID]; + sKey = statusKey(status?.id, instance); } if (!status) { return null; @@ -977,6 +978,7 @@ function Status({ (result) => { if (!result) return; a.removeAttribute('target'); + if (!sKey) return; if (!Array.isArray(states.statusQuotes[sKey])) { states.statusQuotes[sKey] = []; } @@ -1954,6 +1956,7 @@ function FilteredStatus({ status, filterInfo, instance, containerProps = {} }) { } const QuoteStatuses = memo(({ id, instance, level = 0 }) => { + if (!id || !instance) return; const snapStates = useSnapshot(states); const sKey = statusKey(id, instance); const quotes = snapStates.statusQuotes[sKey]; diff --git a/src/utils/states.js b/src/utils/states.js index da3771f1..fb76cc41 100644 --- a/src/utils/states.js +++ b/src/utils/states.js @@ -110,6 +110,7 @@ export function hideAllModals() { } export function statusKey(id, instance) { + if (!id) return; return instance ? `${instance}/${id}` : id; }