fix: use ConfirmSwapModal in expert mode (#6673)

Fixes the swap flow for users who are still in expert mode  and need permit2 approvals for a token

### test plan

added e2e test for full permit2 flow with expert mode enabled. 

failing test without the change:
<img width="1394" alt="Screenshot 2023-05-31 at 2 24 12 PM" src="https://github.com/Uniswap/interface/assets/66155195/6a39e039-31b5-4bce-91d2-5e3ebc777378">


passing test with change in the CI of this PR

cypress/e2e/permit2.test.ts

@@ -81,6 +81,34 @@ describe('Permit2', () => {
     })
   })
 
+  it('swaps after completing full permit2 approval process in expert mode', () => {
+    // Sets up a swap between INPUT_TOKEN and OUTPUT_TOKEN.
+    cy.visit(`/swap/?inputCurrency=${INPUT_TOKEN.address}&outputCurrency=${OUTPUT_TOKEN.address}&ape=true`, {
+      ethereum: 'hardhat',
+    })
+    cy.get('#swap-currency-input .token-amount-input').type(TEST_BALANCE_INCREMENT.toString())
+
+    cy.hardhat().then(({ provider }) => {
+      cy.spy(provider, 'send').as('permitApprovalSpy')
+    })
+    initiateSwap()
+    cy.contains('Enable spending limits for DAI on Uniswap').should('exist')
+    cy.contains('Approved').should('exist')
+
+    cy.contains('Allow DAI to be used for swapping').should('exist')
+    cy.contains('Confirm Swap').should('exist')
+
+    cy.then(() => {
+      const approvalTime = Date.now()
+
+      cy.contains('Swapped').should('exist')
+
+      expectTokenAllowanceForPermit2ToBeMax()
+      expectPermit2AllowanceForUniversalRouterToBeMax(approvalTime)
+      cy.get('@permitApprovalSpy').should('have.been.calledWith', 'eth_signTypedData_v4')
+    })
+  })
+
   it('swaps after handling user rejection of both approval and signature', () => {
     const USER_REJECTION = { code: 4001 }
     cy.hardhat().then((hardhat) => {

src/pages/Swap/index.tsx

@@ -699,9 +699,6 @@ export function Swap({
             >
               <ButtonError
                 onClick={() => {
-                  if (isExpertMode) {
-                    handleSwap()
-                  } else {
                   setSwapState({
                     tradeToConfirm: trade,
                     attemptingTxn: false,
@@ -709,7 +706,6 @@ export function Swap({
                     showConfirm: true,
                     txHash: undefined,
                   })
-                  }
                 }}
                 id="swap-button"
                 data-testid="swap-button"