diff options
author | kytwb <kytwb@pm.me> | 2021-12-13 03:44:46 +0100 |
---|---|---|
committer | kytwb <kytwb@pm.me> | 2021-12-13 03:44:46 +0100 |
commit | 4b6e9220c42f6d59511a811a0f87bb6d1dee0d0b (patch) | |
tree | bd6aa76c3033278fda77bfb5ef4f3442e10504ae | |
parent | 5.6.4-nightly.32 [skip ci] (diff) | |
download | ferdium-app-4b6e9220c42f6d59511a811a0f87bb6d1dee0d0b.tar.gz ferdium-app-4b6e9220c42f6d59511a811a0f87bb6d1dee0d0b.tar.zst ferdium-app-4b6e9220c42f6d59511a811a0f87bb6d1dee0d0b.zip |
Gracefully handle edge case showing both hibernating and loading state
-rw-r--r-- | src/components/services/content/ServiceView.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 6fc1f1400..3ea36ae97 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -109,6 +109,7 @@ class ServiceView extends Component { | |||
109 | {service.isEnabled && | 109 | {service.isEnabled && |
110 | service.isLoading && | 110 | service.isLoading && |
111 | service.isFirstLoad && | 111 | service.isFirstLoad && |
112 | !service.isHibernating && | ||
112 | !service.isServiceAccessRestricted && ( | 113 | !service.isServiceAccessRestricted && ( |
113 | <WebviewLoader loaded={false} name={service.name} /> | 114 | <WebviewLoader loaded={false} name={service.name} /> |
114 | )} | 115 | )} |
@@ -145,12 +146,12 @@ class ServiceView extends Component { | |||
145 | /> | 146 | /> |
146 | </> | 147 | </> |
147 | ) : ( | 148 | ) : ( |
148 | <div> | 149 | <div style={{display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', textAlign: 'center' }}> |
149 | <span role="img" aria-label="Sleeping Emoji"> | 150 | <span role="img" aria-label="Sleeping Emoji" style={{fontSize: 42}}> |
150 | 😴 | 151 | 😴 |
151 | </span>{' '} | 152 | </span><br/><br/> |
152 | This service is currently hibernating. If this page doesn't | 153 | This service is currently hibernating.<br/> |
153 | close soon, please try reloading Ferdi. | 154 | Try switching services or reloading Ferdi. |
154 | </div> | 155 | </div> |
155 | )} | 156 | )} |
156 | </> | 157 | </> |