fix: lo dont close

KyberNetwork · Nov 22, 2023 · 974033f · 974033f
1 parent 8c50561
commit 974033f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/components/swapv2/LimitOrder/ListOrder/useRequestCancelOrder.tsx b/src/components/swapv2/LimitOrder/ListOrder/useRequestCancelOrder.tsx
@@ -254,8 +254,10 @@ export const useProcessCancelOrder = ({
       if (signal.aborted) return
       setCancelStatus(gasLessCancel ? CancelStatus.COUNTDOWN : CancelStatus.WAITING)
       const expired = data?.orders?.[0]?.operatorSignatureExpiredAt
-      if (expired) setExpiredTime(expired)
-      else onDismiss()
+      if (expired) {
+        setExpiredTime(expired)
+        if (expired * 1000 < Date.now()) setCancelStatus(CancelStatus.CANCEL_DONE)
+      } else onDismiss()
     } catch (error) {
       if (signal.aborted) return
       setExpiredTime(0)

diff --git a/src/components/swapv2/LimitOrder/Modals/CancelButtons.tsx b/src/components/swapv2/LimitOrder/Modals/CancelButtons.tsx
@@ -181,7 +181,7 @@ const CancelButtons = ({
         isEdit={isEdit}
         gasAmountDisplay={gasAmountDisplay}
         buttonGasless={
-          <ButtonPrimary {...propsGasless} onClick={onDismiss}>
+          <ButtonPrimary {...propsGasless} color={undefined} onClick={onDismiss}>
             <Check size={18} />
             &nbsp;
             <Trans>Close</Trans>