Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-01-19 04:31:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix renew order refresh (#1179)

Browse Source
This commit is contained in:
KoalaSat 2024-03-15 02:18:06 +01:00 committed by GitHub
parent 4741c660c3
commit b8fd2e21cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/basic/OrderPage/index.tsx
View File

@ -49,10 +49,15 @@ const OrderPage = (): JSX.Element => {
setBaseUrl(`${url}${basePath}`); setBaseUrl(`${url}${basePath}`);
const orderId = Number(params.orderId); const orderId = Number(params.orderId);
if (orderId && currentOrderId.id !== orderId && currentOrderId.shortAlias !== shortAlias) if (
orderId &&
currentOrderId.id !== orderId &&
currentOrderId.shortAlias !== shortAlias &&
shortAlias
)
setCurrentOrderId({ id: orderId, shortAlias }); setCurrentOrderId({ id: orderId, shortAlias });
if (!acknowledgedWarning) setOpen({ ...closeAll, warning: true }); if (!acknowledgedWarning) setOpen({ ...closeAll, warning: true });
}, [params]); }, [params, currentOrderId]);
const onClickCoordinator = function (): void { const onClickCoordinator = function (): void {
if (currentOrder?.shortAlias != null) { if (currentOrder?.shortAlias != null) {

3
frontend/src/components/TradeBox/index.tsx
View File

@ -118,7 +118,7 @@ interface Contract {
const TradeBox = ({ baseUrl, onStartAgain }: TradeBoxProps): JSX.Element => { const TradeBox = ({ baseUrl, onStartAgain }: TradeBoxProps): JSX.Element => {
const { garage, orderUpdatedAt, setBadOrder } = useContext<UseGarageStoreType>(GarageContext); const { garage, orderUpdatedAt, setBadOrder } = useContext<UseGarageStoreType>(GarageContext);
const { settings, hostUrl, origin } = useContext<UseAppStoreType>(AppContext); const { settings, hostUrl, origin } = useContext<UseAppStoreType>(AppContext);
const { federation } = useContext<UseFederationStoreType>(FederationContext); const { federation, setCurrentOrderId } = useContext<UseFederationStoreType>(FederationContext);
const navigate = useNavigate(); const navigate = useNavigate();
// Buttons and Dialogs // Buttons and Dialogs
@ -186,6 +186,7 @@ const TradeBox = ({ baseUrl, onStartAgain }: TradeBoxProps): JSX.Element => {
setBadOrder(data.bad_request); setBadOrder(data.bad_request);
} else if (data.id !== undefined) { } else if (data.id !== undefined) {
navigate(`/order/${String(currentOrder?.shortAlias)}/${String(data.id)}`); navigate(`/order/${String(currentOrder?.shortAlias)}/${String(data.id)}`);
setCurrentOrderId({ id: data.id, shortAlias: currentOrder?.shortAlias });
} }
}) })
.catch(() => { .catch(() => {