From 937ac62c5ddbb039e3b7059ad6973c0db84cf3d1 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Sun, 19 Nov 2023 13:49:10 +0000 Subject: [PATCH] Change getRobot by getSlot (#955) --- frontend/src/basic/BookPage/index.tsx | 2 +- frontend/src/basic/Main.tsx | 4 ++-- frontend/src/basic/MakerPage/index.tsx | 2 +- frontend/src/basic/NavBar/NavBar.tsx | 10 +++++----- frontend/src/basic/OrderPage/index.tsx | 12 +++++++----- frontend/src/basic/RobotPage/Onboarding.tsx | 14 +++++++++----- frontend/src/basic/RobotPage/RobotProfile.tsx | 18 +++++++++--------- frontend/src/basic/RobotPage/TokenInput.tsx | 2 +- frontend/src/basic/RobotPage/index.tsx | 4 ++-- frontend/src/components/Dialogs/Profile.tsx | 12 ++++++------ frontend/src/components/Dialogs/StoreToken.tsx | 4 ++-- .../src/components/MakerForm/MakerForm.tsx | 8 ++++---- .../src/components/OrderDetails/TakeButton.tsx | 4 ++-- frontend/src/components/RobotInfo/index.tsx | 17 +++++++++-------- .../EncryptedSocketChat/index.tsx | 2 +- frontend/src/components/TradeBox/index.tsx | 4 ++-- frontend/src/contexts/FederationContext.ts | 2 +- frontend/src/models/Coordinator.model.ts | 8 ++++---- frontend/src/models/Federation.model.ts | 2 +- frontend/src/models/Garage.model.ts | 8 ++------ 20 files changed, 71 insertions(+), 68 deletions(-) diff --git a/frontend/src/basic/BookPage/index.tsx b/frontend/src/basic/BookPage/index.tsx index bc9c0965..a8397612 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.getRobot().avatarLoaded) { + if (garage.getSlot().robot.avatarLoaded) { setDelay(10000); navigate(`/order/${shortAlias}/${id}`); } else { diff --git a/frontend/src/basic/Main.tsx b/frontend/src/basic/Main.tsx index 283256fd..0ff0290c 100644 --- a/frontend/src/basic/Main.tsx +++ b/frontend/src/basic/Main.tsx @@ -44,7 +44,7 @@ const Main: React.FC = () => { { garage.updateRobot({ avatarLoaded: true }); @@ -55,7 +55,7 @@ const Main: React.FC = () => { openProfile={() => { setOpen({ ...closeAll, profile: true }); }} - rewards={garage.getRobot().earnedRewards} + rewards={garage.getSlot().robot.earnedRewards} windowWidth={windowSize?.width} /> {settings.network === 'testnet' ? ( diff --git a/frontend/src/basic/MakerPage/index.tsx b/frontend/src/basic/MakerPage/index.tsx index 8db7878f..b59fdc7e 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.getRobot().avatarLoaded) { + if (garage.getSlot().robot.avatarLoaded) { navigate(`/order/${id}`); } else { setOpenNoRobot(true); diff --git a/frontend/src/basic/NavBar/NavBar.tsx b/frontend/src/basic/NavBar/NavBar.tsx index d597505a..51c14168 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.getRobot().avatarLoaded ? '0.9em' : '0.13em', + bottom: garage.getSlot().robot.avatarLoaded ? '0.9em' : '0.13em', minWidth: '1em', } : { position: 'relative', bottom: '1em', minWidth: '2em' }; @@ -118,16 +118,16 @@ const NavBar = (): JSX.Element => { { setOpen({ ...closeAll, profile: !open.profile }); }} icon={ - garage.getRobot().nickname != null && garage.getRobot().avatarLoaded ? ( + garage.getSlot().robot.nickname != null && garage.getSlot().robot.avatarLoaded ? ( ) : ( @@ -162,7 +162,7 @@ const NavBar = (): JSX.Element => { sx={tabSx} label={smallBar ? undefined : t('Order')} value='order' - disabled={!garage.getRobot().avatarLoaded || !garage.getSlot().activeOrderId} + disabled={!garage.getSlot().robot.avatarLoaded || !garage.getSlot().activeOrderId} icon={} iconPosition='start' /> diff --git a/frontend/src/basic/OrderPage/index.tsx b/frontend/src/basic/OrderPage/index.tsx index 1284f429..f8bd4b25 100644 --- a/frontend/src/basic/OrderPage/index.tsx +++ b/frontend/src/basic/OrderPage/index.tsx @@ -45,7 +45,7 @@ const OrderPage = (): JSX.Element => { setCurrentOrder(garage.getSlot().order); } else { coordinator - .fetchOrder(Number(params.orderId) ?? null, garage.getRobot()) + .fetchOrder(Number(params.orderId) ?? null, garage.getSlot().robot) .then((order) => { if (order?.bad_request !== undefined) { setBadOrder(order.bad_request); @@ -60,7 +60,7 @@ const OrderPage = (): JSX.Element => { } } else { coordinator - .fetchOrder(Number(params.orderId) ?? null, garage.getRobot()) + .fetchOrder(Number(params.orderId) ?? null, garage.getSlot().robot) .then((order) => { if (order?.bad_request !== undefined) { setBadOrder(order.bad_request); @@ -107,7 +107,9 @@ const OrderPage = (): JSX.Element => { .getCoordinator(order.shortAlias) .getEndpoint(settings.network, origin, settings.selfhostedClient, hostUrl); apiClient - .post(url + basePath, '/api/make/', body, { tokenSHA256: garage.getRobot().tokenSHA256 }) + .post(url + basePath, '/api/make/', body, { + tokenSHA256: garage.getSlot().robot.tokenSHA256, + }) .then((data: any) => { if (data.bad_request !== undefined) { setBadOrder(data.bad_request); @@ -175,7 +177,7 @@ const OrderPage = (): JSX.Element => { }} > {
- {garage.getRobot().avatarLoaded && Boolean(garage.getRobot().nickname) ? ( + {garage.getSlot().robot.avatarLoaded && Boolean(garage.getSlot().robot.nickname) ? ( t('This is your trading avatar') ) : ( <> @@ -162,7 +162,7 @@ const Onboarding = ({ - {garage.getRobot().avatarLoaded && Boolean(garage.getRobot().nickname) ? ( + {garage.getSlot().robot.avatarLoaded && Boolean(garage.getSlot().robot.nickname) ? ( {t('Hi! My name is')} @@ -197,7 +197,7 @@ const Onboarding = ({ width: '1.5em', }} /> - {garage.getRobot().nickname} + {garage.getSlot().robot.nickname}