fix(twap): stay on Signing tab after placing a TWAP order (#7730)

tenderdeve · web-flow · commit 359591d042b2 · 2026-07-07T09:14:08.000Z
Closes #6864
diff --git a/apps/cowswap-frontend/src/modules/ordersTable/hooks/url/useValidatePageUrlParams.ts b/apps/cowswap-frontend/src/modules/ordersTable/hooks/url/useValidatePageUrlParams.ts
@@ -25,7 +25,12 @@ export function useValidatePageUrlParams(
       (pagesCount > 0 && currentPageNumber > pagesCount) ||
       currentPageNumber < 1 ||
       currentPageNumber !== params.pageNumber
-    const shouldResetTabId = currentTabId !== params.tabId
+    // Only normalize the tab when the URL has no valid tab.
+    // `currentTabId` may transiently differ from a valid `params.tabId` because of the
+    // empty-tab fallback in `useCurrentTab` (e.g. a freshly placed order has not reached
+    // the Signing list yet). Rewriting the URL in that case would permanently bounce the
+    // user off the tab they were explicitly navigated to.
+    const shouldResetTabId = !params.tabId
 
     if (shouldResetPageNumber || shouldResetTabId) {
       navigate(
diff --git a/apps/cowswap-frontend/src/modules/twap/hooks/useCreateTwapOrder.tsx b/apps/cowswap-frontend/src/modules/twap/hooks/useCreateTwapOrder.tsx
@@ -5,7 +5,7 @@ import { useCowAnalytics } from '@cowprotocol/analytics'
 import { OrderKind } from '@cowprotocol/cow-sdk'
 import { CurrencyAmount, Token } from '@cowprotocol/currency'
 import { UiOrderType } from '@cowprotocol/types'
-import { useIsSmartContractWallet, useSendBatchTransactions, useWalletInfo } from '@cowprotocol/wallet'
+import { useSendBatchTransactions, useWalletInfo } from '@cowprotocol/wallet'
 import { WidgetHookEvents } from '@cowprotocol/widget-lib'
 
 import { Nullish } from 'types'
@@ -58,7 +58,6 @@ interface TwapOrderEvent extends TwapAnalyticsEvent {
 // eslint-disable-next-line max-lines-per-function, @typescript-eslint/explicit-function-return-type
 export function useCreateTwapOrder() {
   const { chainId, account } = useWalletInfo()
-  const isSmartContractWallet = useIsSmartContractWallet()
   const twapOrder = useTwapOrder()
   const addTwapOrderToList = useSetAtom(addTwapOrderToListAtom)
   const navigateToOrdersTableTab = useNavigateToOrdersTableTab()
@@ -215,8 +214,9 @@ export function useCreateTwapOrder() {
 
         // TODO: Clear filters if the new order is not visible before navigating.
 
-        // Navigate to open orders after successful placement
-        navigateToOrdersTableTab(isSmartContractWallet ? OrderTabId.signing : OrderTabId.open)
+        // A freshly placed TWAP order is always in WaitSigning until the Safe/SC owners
+        // sign it, so navigate to the Signing tab (not Open) regardless of wallet type.
+        navigateToOrdersTableTab(OrderTabId.signing)
       } catch (error) {
         console.error('[useCreateTwapOrder] error', error)
         const errorMessage = getErrorMessage(error)
@@ -244,7 +244,6 @@ export function useCreateTwapOrder() {
       sendTwapConversionAnalytics,
       tradeFlowAnalytics,
       navigateToOrdersTableTab,
-      isSmartContractWallet,
     ],
   )
 }
