fix: show login modal before locale is loaded (#527)

dhis2 · Mar 5, 2021 · 98a7a56 · 98a7a56
1 parent b29cb07
commit 98a7a56
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/adapter/src/components/AuthBoundary.js b/adapter/src/components/AuthBoundary.js
@@ -17,14 +17,14 @@ export const AuthBoundary = ({ url, children }) => {
  data && (data.userSettings.keyUiLocale || window.navigator.language)
  )
 
- if (loading || !locale) {
- return <LoadingMask />
- }
-
  if (error) {
  return <LoginModal url={url} />
  }
 
+ if (loading || !locale) {
+ return <LoadingMask />
+ }
+
  return children
 }