From a4b2327ff4c3e456976f17479fea07e11dd50ea5 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Sun, 7 Jan 2024 14:16:26 +0000 Subject: [PATCH] Small fixes and lint fixes --- frontend/src/basic/BookPage/index.tsx | 2 +- frontend/src/basic/MakerPage/index.tsx | 2 +- frontend/src/basic/NavBar/NavBar.tsx | 7 ++---- frontend/src/basic/OrderPage/index.tsx | 7 +++--- frontend/src/basic/RobotPage/Onboarding.tsx | 7 +++--- frontend/src/basic/RobotPage/RobotProfile.tsx | 7 ++---- frontend/src/basic/RobotPage/TokenInput.tsx | 2 +- frontend/src/components/BookTable/index.tsx | 13 +---------- .../src/components/Dialogs/Coordinator.tsx | 6 ++--- frontend/src/components/Dialogs/Profile.tsx | 4 ++-- .../src/components/MakerForm/MakerForm.tsx | 6 ++--- .../MakerForm/SelectCoordinator.tsx | 2 +- .../src/components/OrderDetails/index.tsx | 2 +- .../RobotAvatar/RobohashGenerator.ts | 20 ++++++++++------- frontend/src/components/RobotAvatar/index.tsx | 2 +- .../components/RobotAvatar/robohash.worker.ts | 22 ++++++++++--------- frontend/src/components/RobotInfo/index.tsx | 4 ++-- .../src/components/SettingsForm/index.tsx | 4 ++-- .../EncryptedSocketChat/index.tsx | 9 +++++--- .../EncryptedTurtleChat/index.tsx | 2 +- .../TradeBox/EncryptedChat/index.tsx | 2 +- .../TradeBox/Prompts/Successful.tsx | 5 ++++- frontend/src/components/TradeBox/index.tsx | 2 +- 23 files changed, 67 insertions(+), 72 deletions(-) diff --git a/frontend/src/basic/BookPage/index.tsx b/frontend/src/basic/BookPage/index.tsx index 30b28ba91..0c9b008be 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 (Boolean(garage.getSlot()?.hashId)) { + if (garage.getSlot()?.hashId) { setDelay(10000); navigate(`/order/${shortAlias}/${id}`); } else { diff --git a/frontend/src/basic/MakerPage/index.tsx b/frontend/src/basic/MakerPage/index.tsx index c4f4d5852..8d5dead15 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 (Boolean(garage.getSlot()?.hashId)) { + if (garage.getSlot()?.hashId) { navigate(`/order/${id}`); } else { setOpenNoRobot(true); diff --git a/frontend/src/basic/NavBar/NavBar.tsx b/frontend/src/basic/NavBar/NavBar.tsx index 55c709f37..9e538a766 100644 --- a/frontend/src/basic/NavBar/NavBar.tsx +++ b/frontend/src/basic/NavBar/NavBar.tsx @@ -33,7 +33,7 @@ const NavBar = (): JSX.Element => { const tabSx = smallBar ? { position: 'relative', - bottom: Boolean(garage.getSlot()?.hashId) ? '0.9em' : '0.13em', + bottom: garage.getSlot()?.hashId ? '0.9em' : '0.13em', minWidth: '1em', } : { position: 'relative', bottom: '1em', minWidth: '2em' }; @@ -155,10 +155,7 @@ const NavBar = (): JSX.Element => { sx={tabSx} label={smallBar ? undefined : t('Order')} value='order' - disabled={ - !Boolean(slot?.hashId) || - !Boolean(slot?.getRobot(slot?.activeShortAlias ?? '')?.activeOrderId) - } + disabled={!slot?.hashId || !slot?.getRobot(slot?.activeShortAlias ?? '')?.activeOrderId} icon={} iconPosition='start' /> diff --git a/frontend/src/basic/OrderPage/index.tsx b/frontend/src/basic/OrderPage/index.tsx index a5db3c8ce..64290f8eb 100644 --- a/frontend/src/basic/OrderPage/index.tsx +++ b/frontend/src/basic/OrderPage/index.tsx @@ -59,7 +59,7 @@ const OrderPage = (): JSX.Element => { updateCurrentOrder(); }, [currentOrderId]); - const updateCurrentOrder = () => { + const updateCurrentOrder = (): void => { if (currentOrderId !== null) { const coordinator = federation.getCoordinator(params.shortAlias ?? ''); const slot = garage.getSlot(); @@ -71,7 +71,7 @@ const OrderPage = (): JSX.Element => { .then((order) => { if (order?.bad_request !== undefined) { setBadOrder(order.bad_request); - } else if (Boolean(order?.id)) { + } else if (order?.id) { setCurrentOrder(order); if (order?.is_participant) { garage.updateOrder(order); @@ -122,7 +122,8 @@ const OrderPage = (): JSX.Element => { { - setOpen(closeAll), setAcknowledgedWarning(true); + setOpen(closeAll); + setAcknowledgedWarning(true); }} longAlias={federation.getCoordinator(params.shortAlias ?? '').longAlias} /> diff --git a/frontend/src/basic/RobotPage/Onboarding.tsx b/frontend/src/basic/RobotPage/Onboarding.tsx index f911f2820..38d54aac7 100644 --- a/frontend/src/basic/RobotPage/Onboarding.tsx +++ b/frontend/src/basic/RobotPage/Onboarding.tsx @@ -62,7 +62,6 @@ const Onboarding = ({ }; const slot = garage.getSlot(); - const robot = slot?.getRobot(); return ( @@ -151,7 +150,7 @@ const Onboarding = ({ - {Boolean(slot?.hashId) ? ( + {slot?.hashId ? ( t('This is your trading avatar') ) : ( <> @@ -179,7 +178,7 @@ const Onboarding = ({ /> - {Boolean(slot?.hashId) ? ( + {slot?.hashId ? ( {t('Hi! My name is')} @@ -211,7 +210,7 @@ const Onboarding = ({ ) : null} - +