From 2408190869573bf4f8e5dd34fe65df9652695ff4 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Sat, 2 Dec 2023 19:50:07 +0000 Subject: [PATCH] Fix statusToDelay, linting and others --- frontend/src/basic/BookPage/index.tsx | 2 +- frontend/src/basic/Main.tsx | 2 +- frontend/src/basic/MainDialogs/index.tsx | 3 - frontend/src/basic/MakerPage/index.tsx | 2 +- frontend/src/basic/NavBar/NavBar.tsx | 5 +- frontend/src/basic/OrderPage/index.tsx | 44 ++++--- frontend/src/basic/RobotPage/Onboarding.tsx | 6 +- frontend/src/basic/RobotPage/RobotProfile.tsx | 8 +- frontend/src/basic/RobotPage/TokenInput.tsx | 2 +- frontend/src/basic/SettingsPage/index.tsx | 7 +- .../src/components/Dialogs/Coordinator.tsx | 8 +- frontend/src/components/Dialogs/Notice.tsx | 26 ----- frontend/src/components/Dialogs/Profile.tsx | 4 +- frontend/src/components/Dialogs/index.ts | 1 - .../src/components/MakerForm/MakerForm.tsx | 4 +- .../components/OrderDetails/TakeButton.tsx | 2 +- frontend/src/components/RobotInfo/index.tsx | 19 ++-- .../EncryptedSocketChat/index.tsx | 3 +- .../EncryptedTurtleChat/index.tsx | 16 +-- .../src/components/TradeBox/Prompts/Chat.tsx | 12 +- frontend/src/components/TradeBox/index.tsx | 8 +- frontend/src/contexts/AppContext.ts | 1 - frontend/src/contexts/FederationContext.ts | 81 +++++++------ frontend/src/models/Coordinator.model.ts | 14 +-- frontend/src/models/Federation.model.ts | 1 - frontend/src/models/Garage.model.ts | 20 ++-- frontend/src/models/Slot.model.ts | 8 +- frontend/src/pro/Widgets/Federation.tsx | 2 - frontend/static/locales/ca.json | 107 +++++++++--------- frontend/static/locales/cs.json | 107 +++++++++--------- frontend/static/locales/de.json | 107 +++++++++--------- frontend/static/locales/en.json | 107 +++++++++--------- frontend/static/locales/es.json | 107 +++++++++--------- frontend/static/locales/eu.json | 107 +++++++++--------- frontend/static/locales/fr.json | 107 +++++++++--------- frontend/static/locales/it.json | 107 +++++++++--------- frontend/static/locales/ja.json | 107 +++++++++--------- frontend/static/locales/pl.json | 107 +++++++++--------- frontend/static/locales/pt.json | 107 +++++++++--------- frontend/static/locales/ru.json | 107 +++++++++--------- frontend/static/locales/sv.json | 107 +++++++++--------- frontend/static/locales/sw.json | 107 +++++++++--------- frontend/static/locales/th.json | 107 +++++++++--------- frontend/static/locales/zh-SI.json | 107 +++++++++--------- frontend/static/locales/zh-TR.json | 107 +++++++++--------- 45 files changed, 1044 insertions(+), 1086 deletions(-) delete mode 100644 frontend/src/components/Dialogs/Notice.tsx diff --git a/frontend/src/basic/BookPage/index.tsx b/frontend/src/basic/BookPage/index.tsx index bc4dd9b9..85aa695d 100644 --- a/frontend/src/basic/BookPage/index.tsx +++ b/frontend/src/basic/BookPage/index.tsx @@ -31,7 +31,7 @@ const BookPage = (): JSX.Element => { const chartWidthEm = width - maxBookTableWidth; const onOrderClicked = function (id: number, shortAlias: string): void { - if (garage.getSlot()?.avatarLoaded) { + if (garage.getSlot()?.avatarLoaded === true) { setDelay(10000); navigate(`/order/${shortAlias}/${id}`); } else { diff --git a/frontend/src/basic/Main.tsx b/frontend/src/basic/Main.tsx index 7176a041..1ec99a23 100644 --- a/frontend/src/basic/Main.tsx +++ b/frontend/src/basic/Main.tsx @@ -40,7 +40,7 @@ const Main: React.FC = () => { setAvatarBaseUrl(federation.getCoordinator(sortedCoordinators[0]).getBaseUrl()); }, [settings.network, settings.selfhostedClient, federation, sortedCoordinators]); - const onLoad = () => { + const onLoad = (): void => { garage.updateSlot({ avatarLoaded: true }); }; diff --git a/frontend/src/basic/MainDialogs/index.tsx b/frontend/src/basic/MainDialogs/index.tsx index 141f0189..211b5686 100644 --- a/frontend/src/basic/MainDialogs/index.tsx +++ b/frontend/src/basic/MainDialogs/index.tsx @@ -11,7 +11,6 @@ import { } from '../../components/Dialogs'; import { AppContext, type UseAppStoreType, closeAll } from '../../contexts/AppContext'; import { FederationContext, type UseFederationStoreType } from '../../contexts/FederationContext'; -import { UseGarageStoreType, GarageContext } from '../../contexts/GarageContext'; export interface OpenDialogs { more: boolean; @@ -23,14 +22,12 @@ export interface OpenDialogs { client: boolean; update: boolean; profile: boolean; - notice: boolean; } const MainDialogs = (): JSX.Element => { const { open, setOpen, settings, clientVersion, hostUrl } = useContext(AppContext); const { federation } = useContext(FederationContext); - const { garage } = useContext(GarageContext); return ( <> diff --git a/frontend/src/basic/MakerPage/index.tsx b/frontend/src/basic/MakerPage/index.tsx index e77b40e9..8fee6249 100644 --- a/frontend/src/basic/MakerPage/index.tsx +++ b/frontend/src/basic/MakerPage/index.tsx @@ -51,7 +51,7 @@ const MakerPage = (): JSX.Element => { ]); const onOrderClicked = function (id: number): void { - if (garage.getSlot()?.avatarLoaded) { + if (garage.getSlot()?.avatarLoaded === true) { navigate(`/order/${id}`); } else { setOpenNoRobot(true); diff --git a/frontend/src/basic/NavBar/NavBar.tsx b/frontend/src/basic/NavBar/NavBar.tsx index 4fbefe1d..5f7148ac 100644 --- a/frontend/src/basic/NavBar/NavBar.tsx +++ b/frontend/src/basic/NavBar/NavBar.tsx @@ -42,7 +42,7 @@ const NavBar = (): JSX.Element => { const tabSx = smallBar ? { position: 'relative', - bottom: garage.getSlot()?.avatarLoaded ? '0.9em' : '0.13em', + bottom: garage.getSlot()?.avatarLoaded === true ? '0.9em' : '0.13em', minWidth: '1em', } : { position: 'relative', bottom: '1em', minWidth: '2em' }; @@ -166,7 +166,8 @@ const NavBar = (): JSX.Element => { label={smallBar ? undefined : t('Order')} value='order' disabled={ - !slot?.avatarLoaded || !slot?.getRobot(slot?.activeShortAlias ?? '')?.activeOrderId + slot?.avatarLoaded === false || + !(slot?.getRobot(slot?.activeShortAlias ?? '')?.activeOrderId != null) } icon={} iconPosition='start' diff --git a/frontend/src/basic/OrderPage/index.tsx b/frontend/src/basic/OrderPage/index.tsx index 322186a3..64f425b0 100644 --- a/frontend/src/basic/OrderPage/index.tsx +++ b/frontend/src/basic/OrderPage/index.tsx @@ -40,7 +40,7 @@ const OrderPage = (): JSX.Element => { setBaseUrl(`${url}${basePath}`); const orderId = Number(params.orderId); - if (orderId && currentOrderId !== orderId) setCurrentOrderId(orderId); + if (Boolean(orderId) && currentOrderId !== orderId) setCurrentOrderId(orderId); }, [params]); useEffect(() => { @@ -49,17 +49,17 @@ const OrderPage = (): JSX.Element => { const coordinator = federation.getCoordinator(params.shortAlias ?? ''); const slot = garage.getSlot(); const robot = slot?.getRobot(); - if (robot && slot?.token) { - federation.fetchRobot(garage, slot.token); + if (robot != null && slot?.token != null) { + void federation.fetchRobot(garage, slot.token); coordinator .fetchOrder(currentOrderId, robot) .then((order) => { if (order?.bad_request !== undefined) { setBadOrder(order.bad_request); - } else if (order !== null && order?.id !== null) { + } else if (order?.id != null) { setCurrentOrder(order); if (order.is_participant) { - garage.updateOrder(order as Order); + garage.updateOrder(order); } } }) @@ -82,25 +82,23 @@ const OrderPage = (): JSX.Element => { navigate('/robot'); }; - const orderDetailsSpace = currentOrder ? ( - { - navigate('/robot'); - }} - /> - ) : ( - <> - ); + const orderDetailsSpace = + currentOrder != null ? ( + { + navigate('/robot'); + }} + /> + ) : ( + <> + ); - const tradeBoxSpace = currentOrder ? ( - - ) : ( - <> - ); + const tradeBoxSpace = + currentOrder != null ? : <>; return ( diff --git a/frontend/src/basic/RobotPage/Onboarding.tsx b/frontend/src/basic/RobotPage/Onboarding.tsx index 4abc0edb..2b666f53 100644 --- a/frontend/src/basic/RobotPage/Onboarding.tsx +++ b/frontend/src/basic/RobotPage/Onboarding.tsx @@ -151,7 +151,7 @@ const Onboarding = ({ - {slot?.avatarLoaded && Boolean(robot?.nickname) ? ( + {slot?.avatarLoaded === true && Boolean(robot?.nickname) ? ( t('This is your trading avatar') ) : ( <> @@ -180,7 +180,7 @@ const Onboarding = ({ /> - {slot?.avatarLoaded && Boolean(robot?.nickname) ? ( + {slot?.avatarLoaded === true && Boolean(robot?.nickname) ? ( {t('Hi! My name is')} @@ -212,7 +212,7 @@ const Onboarding = ({ ) : null} - +