diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js index 79ff9d67f..a42bccdef 100644 --- a/app/soapbox/actions/auth.js +++ b/app/soapbox/actions/auth.js @@ -207,9 +207,12 @@ export function rememberAuthAccount(accountUrl) { export function loadCredentials(token, accountUrl) { return (dispatch, getState) => { - return dispatch(rememberAuthAccount(accountUrl)).finally(() => { - return dispatch(verifyCredentials(token, accountUrl)); - }); + return dispatch(rememberAuthAccount(accountUrl)) + .then(account => account) + .then(() => { + dispatch(verifyCredentials(token, accountUrl)); + }) + .catch(error => dispatch(verifyCredentials(token, accountUrl))); }; } diff --git a/app/soapbox/components/loading-screen.tsx b/app/soapbox/components/loading-screen.tsx index 92882f98f..d132933a4 100644 --- a/app/soapbox/components/loading-screen.tsx +++ b/app/soapbox/components/loading-screen.tsx @@ -9,7 +9,8 @@ const LoadingScreen: React.FC = () => {
-
+
+ {/* Bump up spinner vertically to counteract optical illusion. */}
diff --git a/app/styles/application.scss b/app/styles/application.scss index 03f8ff65d..660fb4a68 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -102,6 +102,10 @@ .shadow-inset { box-shadow: inset 0 0 0 1px rgb(255 255 255 / 10%); } + + .d-screen { + height: 100dvh; + } } @import 'forms';