diff --git a/components/account.js b/components/account.js
index 3a9422454..ae319f0ac 100644
--- a/components/account.js
+++ b/components/account.js
@@ -1,26 +1,21 @@
import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react'
import { useRouter } from 'next/router'
import * as cookie from 'cookie'
-import { useMe } from '@/components/me'
import { USER_ID, SSR } from '@/lib/constants'
import { USER } from '@/fragments/users'
import { useQuery } from '@apollo/client'
import { UserListRow } from '@/components/user-list'
import Link from 'next/link'
import AddIcon from '@/svgs/add-fill.svg'
-import { MultiAuthErrorBanner } from '@/components/banners'
import { cookieOptions, MULTI_AUTH_ANON, MULTI_AUTH_LIST, MULTI_AUTH_POINTER } from '@/lib/auth'
const AccountContext = createContext()
-const CHECK_ERRORS_INTERVAL_MS = 5_000
-
const b64Decode = str => Buffer.from(str, 'base64').toString('utf-8')
export const AccountProvider = ({ children }) => {
const [accounts, setAccounts] = useState([])
- const [meAnon, setMeAnon] = useState(true)
- const [errors, setErrors] = useState([])
+ const [selected, setSelected] = useState(null)
const updateAccountsFromCookie = useCallback(() => {
const { [MULTI_AUTH_LIST]: listCookie } = cookie.parse(document.cookie)
@@ -39,51 +34,29 @@ export const AccountProvider = ({ children }) => {
return switchSuccess
}, [updateAccountsFromCookie])
- const checkErrors = useCallback(() => {
- const {
- [MULTI_AUTH_LIST]: listCookie,
- [MULTI_AUTH_POINTER]: pointerCookie
- } = cookie.parse(document.cookie)
-
- const errors = []
-
- if (!listCookie) errors.push(`${MULTI_AUTH_LIST} cookie not found`)
- if (!pointerCookie) errors.push(`${MULTI_AUTH_POINTER} cookie not found`)
-
- setErrors(errors)
- }, [])
-
useEffect(() => {
if (SSR) return
updateAccountsFromCookie()
const { [MULTI_AUTH_POINTER]: pointerCookie } = cookie.parse(document.cookie)
- setMeAnon(pointerCookie === 'anonymous')
-
- const interval = setInterval(checkErrors, CHECK_ERRORS_INTERVAL_MS)
- return () => clearInterval(interval)
- }, [updateAccountsFromCookie, checkErrors])
+ setSelected(pointerCookie === MULTI_AUTH_ANON ? USER_ID.anon : Number(pointerCookie))
+ }, [updateAccountsFromCookie])
const value = useMemo(
() => ({
accounts,
- meAnon,
- setMeAnon,
- nextAccount,
- multiAuthErrors: errors
+ selected,
+ nextAccount
}),
- [accounts, meAnon, setMeAnon, nextAccount])
+ [accounts, selected, nextAccount])
return