refactor: clean up verifyLatestUser

adapter/src/components/AppWrapper.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 import { useCurrentUserLocale } from '../utils/useLocale.js'
-import { useVerifyLatestUser } from '../utils/useVerifyLatestUser.js'
 import { Alerts } from './Alerts.js'
 import { AuthBoundary } from './AuthBoundary.js'
 import { ConnectedHeaderBar } from './ConnectedHeaderBar.js'
@@ -11,25 +10,24 @@ import { styles } from './styles/AppWrapper.style.js'
 
 export const AppWrapper = ({ children }) => {
  const { loading: localeLoading } = useCurrentUserLocale()
- const { loading: latestUserLoading } = useVerifyLatestUser()
 
- if (localeLoading || latestUserLoading) {
+ if (localeLoading) {
  return <LoadingMask />
  }
 
  return (
- <div className="app-shell-adapter">
- <style jsx>{styles}</style>
- <AuthBoundary>
+ <AuthBoundary>
+ <div className="app-shell-adapter">
+  <style jsx>{styles}</style>
  <ConnectedHeaderBar />
  <div className="app-shell-app">
  <ErrorBoundary onRetry={() => window.location.reload()}>
  {children}
  </ErrorBoundary>
  </div>
  <Alerts />
- </AuthBoundary>
- </div>
+ </div>
+ </AuthBoundary>
  )
 }
 

adapter/src/components/AuthBoundary.js

@@ -10,8 +10,6 @@ import i18n from '../locales'
 import { LoadingMask } from './LoadingMask'
 import styles from './styles/ErrorBoundary.style.js'
 
-// TODO: Remove useVerifyLatestUser.js (and in app wrapper)
-
 const LATEST_USER_KEY = 'dhis2.latestUser'
 const IS_PRODUCTION_ENV = process.env.NODE_ENV === 'production'