fix: add back correct fellback setter (#7116)

* fix: check chainId in findCancelTx

* feat: comment

CODEOWNERS

@@ -0,0 +1 @@
+@uniswap/web-admins

cypress/e2e/wallet-connection/connect.test.ts

@@ -22,7 +22,7 @@ describe('disconnect wallet', () => {
     cy.contains('Connect Wallet')
 
     // Verify swap input is cleared
-    cy.get('#swap-currency-input .token-amount-input').should('have.value', '1')
+    cy.get('#swap-currency-input .token-amount-input').should('have.value', '')
   })
 })
 

src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.tsx

@@ -77,6 +77,7 @@ function Loader() {
 }
 
 const Success = styled(AnimatedEntranceConfirmationIcon)`
+  position: relative;
   margin-bottom: 10px;
 `
 

src/components/AccountDrawer/MiniPortfolio/Activity/hooks.ts

@@ -19,7 +19,8 @@ function findCancelTx(localActivity: Activity, remoteMap: ActivityMap, account:
     if (
       remoteTx.nonce === localActivity.nonce &&
       remoteTx.from.toLowerCase() === account.toLowerCase() &&
-      remoteTx.hash.toLowerCase() !== localActivity.hash.toLowerCase()
+      remoteTx.hash.toLowerCase() !== localActivity.hash.toLowerCase() &&
+      remoteTx.chainId === localActivity.chainId
     ) {
       return remoteTx.hash
     }
@@ -37,6 +38,11 @@ function combineActivities(localMap: ActivityMap = {}, remoteMap: ActivityMap =
     const remoteActivity = (remoteMap?.[hash] ?? {}) as Activity
 
     if (localActivity.cancelled) {
+      // Hides misleading activities caused by cross-chain nonce collisions previously being incorrectly labelled as cancelled txs in redux
+      if (localActivity.chainId !== remoteActivity.chainId) {
+        acc.push(remoteActivity)
+        return acc
+      }
       // Remote data only contains data of the cancel tx, rather than the original tx, so we prefer local data here
       acc.push(localActivity)
     } else {
@@ -67,6 +73,7 @@ export function useAllActivities(account: string) {
       if (!localActivity) return
 
       const cancelHash = findCancelTx(localActivity, remoteMap, account)
+
       if (cancelHash) updateCancelledTx(localActivity.hash, localActivity.chainId, cancelHash)
     })
   }, [account, localMap, remoteMap, updateCancelledTx])

src/components/Web3Provider/index.tsx

@@ -10,7 +10,7 @@ import { TraceJsonRpcVariant, useTraceJsonRpcFlag } from 'featureFlags/flags/tra
 import useEagerlyConnect from 'hooks/useEagerlyConnect'
 import useOrderedConnections from 'hooks/useOrderedConnections'
 import usePrevious from 'hooks/usePrevious'
-import { ReactNode, useEffect } from 'react'
+import { ReactNode, useEffect, useMemo, useState } from 'react'
 import { useLocation } from 'react-router-dom'
 import { useConnectedWallets } from 'state/wallets/hooks'
 import { getCurrentPageFromLocation } from 'utils/urlRoutes'
@@ -20,8 +20,16 @@ export default function Web3Provider({ children }: { children: ReactNode }) {
   const connections = useOrderedConnections()
   const connectors: [Connector, Web3ReactHooks][] = connections.map(({ hooks, connector }) => [connector, hooks])
 
+  // Force a re-render when our connection state changes.
+  const [index, setIndex] = useState(0)
+  useEffect(() => setIndex((index) => index + 1), [connections])
+  const key = useMemo(
+    () => connections.map((connection) => connection.getName()).join('-') + index,
+    [connections, index]
+  )
+
   return (
-    <Web3ReactProvider connectors={connectors}>
+    <Web3ReactProvider connectors={connectors} key={key}>
       <Updater />
       {children}
     </Web3ReactProvider>

src/components/swap/PendingModalContent/index.tsx

@@ -265,13 +265,10 @@ export function PendingModalContent({
   const { chainId } = useWeb3React()
 
   const swapStatus = useSwapTransactionStatus(swapResult)
+  const order = useOrder(swapResult?.type === TradeFillType.UniswapX ? swapResult.response.orderHash : '')
 
-  const classicSwapConfirmed = swapStatus === TransactionStatus.Confirmed
+  const swapConfirmed = swapStatus === TransactionStatus.Confirmed || order?.status === UniswapXOrderStatus.FILLED
   const wrapConfirmed = useIsTransactionConfirmed(wrapTxHash)
-  // TODO(UniswapX): Support UniswapX status here too
-  const uniswapXSwapConfirmed = Boolean(swapResult)
-
-  const swapConfirmed = swapResult?.type === TradeFillType.Classic ? classicSwapConfirmed : uniswapXSwapConfirmed
 
   const swapPending = swapResult !== undefined && !swapConfirmed
   const wrapPending = wrapTxHash != undefined && !wrapConfirmed
@@ -288,8 +285,6 @@ export function PendingModalContent({
     chainId,
   })
 
-  const order = useOrder(swapResult?.type === TradeFillType.UniswapX ? swapResult.response.orderHash : '')
-
   const currentStepContainerRef = useRef<HTMLDivElement>(null)
   useUnmountingAnimation(currentStepContainerRef, () => AnimationType.EXITING)
 

src/hooks/useOrderedConnections.ts

@@ -1,6 +1,7 @@
 import { getConnection } from 'connection'
 import { ConnectionType } from 'connection/types'
 import { useMemo } from 'react'
+import { useAppSelector } from 'state/hooks'
 
 const SELECTABLE_WALLETS = [
   ConnectionType.UNISWAP_WALLET_V2,
@@ -10,17 +11,23 @@ const SELECTABLE_WALLETS = [
 ]
 
 export default function useOrderedConnections() {
+  const selectedWallet = useAppSelector((state) => state.user.selectedWallet)
+
   return useMemo(() => {
     const orderedConnectionTypes: ConnectionType[] = []
 
     // Always attempt to use to Gnosis Safe first, as we can't know if we're in a SafeContext.
     orderedConnectionTypes.push(ConnectionType.GNOSIS_SAFE)
 
-    orderedConnectionTypes.push(...SELECTABLE_WALLETS)
+    // Add the `selectedWallet` to the top so it's prioritized, then add the other selectable wallets.
+    if (selectedWallet) {
+      orderedConnectionTypes.push(selectedWallet)
+    }
+    orderedConnectionTypes.push(...SELECTABLE_WALLETS.filter((wallet) => wallet !== selectedWallet))
 
     // Add network connection last as it should be the fallback.
     orderedConnectionTypes.push(ConnectionType.NETWORK)
 
     return orderedConnectionTypes.map((connectionType) => getConnection(connectionType))
-  }, [])
+  }, [selectedWallet])
 }

src/state/routing/slice.ts

@@ -128,8 +128,9 @@ export const routingApi = createApi({
         )
       },
       async queryFn(args, _api, _extraOptions, fetch) {
-        const fellBack = false
+        let fellBack = false
         if (shouldUseAPIRouter(args)) {
+          fellBack = true
           try {
             const {
               tokenInAddress,