diff --git a/app/client/web/src/access/Access.tsx b/app/client/web/src/access/Access.tsx index aedc1bbc..eebcc501 100644 --- a/app/client/web/src/access/Access.tsx +++ b/app/client/web/src/access/Access.tsx @@ -27,10 +27,11 @@ export function Access() { await actions.adminLogin() } otpClose() - } catch (err: any) { - console.log(err.message) - if (err.message === '405' || err.message === '403' || err.message === '429') { - if (err.message === '429') { + } catch (err) { + const { message } = err as { message: string } + console.log(message) + if (message === '405' || message === '403' || message === '429') { + if (message === '429') { setDisabled(true) } else { setDisabled(false) diff --git a/app/client/web/src/contacts/Contacts.tsx b/app/client/web/src/contacts/Contacts.tsx index 5de04036..7afdfcc4 100644 --- a/app/client/web/src/contacts/Contacts.tsx +++ b/app/client/web/src/contacts/Contacts.tsx @@ -1,6 +1,6 @@ -import { Text } from '@mantine/core' +import React from 'react' import { useContacts } from './useContacts.hook' -import { UnstyledButton, ActionIcon, TextInput, Button } from '@mantine/core' +import { ActionIcon, TextInput, Button } from '@mantine/core' import { IconSearch, IconUserPlus, IconSortAscending, IconSortDescending, IconMessage2, IconPhone } from '@tabler/icons-react' import classes from './Contacts.module.css' import { Card } from '../card/Card' diff --git a/app/client/web/src/contacts/useContacts.hook.ts b/app/client/web/src/contacts/useContacts.hook.ts index 508f458f..7f0d76f8 100644 --- a/app/client/web/src/contacts/useContacts.hook.ts +++ b/app/client/web/src/contacts/useContacts.hook.ts @@ -2,7 +2,7 @@ import { useState, useContext, useEffect } from 'react' import { AppContext } from '../context/AppContext' import { DisplayContext } from '../context/DisplayContext' import { ContextType } from '../context/ContextType' -import { Card, Channel } from 'databag-client-sdk' +import { Card } from 'databag-client-sdk' export function useContacts() { const app = useContext(AppContext) as ContextType diff --git a/app/client/web/src/context/useAppContext.hook.ts b/app/client/web/src/context/useAppContext.hook.ts index 233e02c2..1942a996 100644 --- a/app/client/web/src/context/useAppContext.hook.ts +++ b/app/client/web/src/context/useAppContext.hook.ts @@ -1,5 +1,5 @@ import { useState, useEffect, useRef } from 'react' -import { DatabagSDK, Params, Session } from 'databag-client-sdk' +import { DatabagSDK, Session } from 'databag-client-sdk' import { SessionStore } from '../SessionStore' import { WebCrypto } from '../WebCrypto' diff --git a/app/client/web/src/profile/Profile.tsx b/app/client/web/src/profile/Profile.tsx index df7ab146..74235d3f 100644 --- a/app/client/web/src/profile/Profile.tsx +++ b/app/client/web/src/profile/Profile.tsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from 'react' +import React, { useState } from 'react' import { useProfile } from './useProfile.hook' import classes from './Profile.module.css' import { modals } from '@mantine/modals' @@ -18,7 +18,7 @@ import { IconCancel, IconDeviceFloppy, } from '@tabler/icons-react' -import { Text, Image, ActionIcon, Button } from '@mantine/core' +import { Text, Image, ActionIcon } from '@mantine/core' export type ProfileParams = { guid: string diff --git a/app/client/web/src/registry/Registry.tsx b/app/client/web/src/registry/Registry.tsx index 884bd667..5ea8a93a 100644 --- a/app/client/web/src/registry/Registry.tsx +++ b/app/client/web/src/registry/Registry.tsx @@ -1,7 +1,8 @@ +import React from 'react' import { useRegistry } from './useRegistry.hook' import { TextInput } from '@mantine/core' import classes from './Registry.module.css' -import { IconX, IconArrowLeft, IconServer, IconUser } from '@tabler/icons-react' +import { IconX, IconServer, IconUser } from '@tabler/icons-react' import { Card } from '../card/Card' import { ProfileParams } from '../profile/Profile' diff --git a/app/client/web/src/settings/Settings.tsx b/app/client/web/src/settings/Settings.tsx index b8fe6eb5..bc8d023a 100644 --- a/app/client/web/src/settings/Settings.tsx +++ b/app/client/web/src/settings/Settings.tsx @@ -169,10 +169,11 @@ export function Settings({ showLogout }: { showLogout: boolean }) { try { await actions.confirmMFA() mfaClose() - } catch (err: any) { - if (err.message === '401') { + } catch (err) { + const { message } = err as { message: string } + if (message === '401') { setAuthMessage(state.strings.mfaError) - } else if (err.message === '429') { + } else if (message === '429') { setAuthMessage(state.strings.mfaDisabled) } else { setAuthMessage(`${state.strings.error}: ${state.strings.tryAgain}`)