Fix renew order refresh (#1179)

RoboSats · Mar 15, 2024 · b8fd2e2 · b8fd2e2
1 parent 4741c66
commit b8fd2e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/frontend/src/basic/OrderPage/index.tsx b/frontend/src/basic/OrderPage/index.tsx
@@ -49,10 +49,15 @@ const OrderPage = (): JSX.Element => {
     setBaseUrl(`${url}${basePath}`);
 
     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 });
     if (!acknowledgedWarning) setOpen({ ...closeAll, warning: true });
-  }, [params]);
+  }, [params, currentOrderId]);
 
   const onClickCoordinator = function (): void {
     if (currentOrder?.shortAlias != null) {

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