moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Developers, SW: check 'waiting' before 'active'

This commit is contained in:
Alex Gleason 2022-11-03 19:00:15 -05:00
parent 66cd92970b
commit d385c0d80c
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/soapbox/features/developers/service-worker-info.tsx
View File

@ -50,10 +50,10 @@ const ServiceWorkerInfo: React.FC<IServiceWorkerInfo> = () => {
const url = registration?.active?.scriptURL; const url = registration?.active?.scriptURL;
const getState = () => { const getState = () => {
if (registration?.active) { if (registration?.waiting) {
return 'active';
} else if (registration?.waiting) {
return 'pending'; return 'pending';
} else if (registration?.active) {
return 'active';
} else { } else {
return 'inactive'; return 'inactive';
} }
@ -74,13 +74,6 @@ const ServiceWorkerInfo: React.FC<IServiceWorkerInfo> = () => {
defaultMessage='Unavailable' defaultMessage='Unavailable'
/> />
); );
} else if (registration?.active) {
return (
<FormattedMessage
id='sw.state.active'
defaultMessage='Active'
/>
);
} else if (registration?.waiting) { } else if (registration?.waiting) {
return ( return (
<FormattedMessage <FormattedMessage
@ -88,6 +81,13 @@ const ServiceWorkerInfo: React.FC<IServiceWorkerInfo> = () => {
defaultMessage='Waiting' defaultMessage='Waiting'
/> />
); );
} else if (registration?.active) {
return (
<FormattedMessage
id='sw.state.active'
defaultMessage='Active'
/>
);
} else { } else {
return ( return (
<FormattedMessage <FormattedMessage