transfer dialog: allow chain switch when approving eth bridge

renegade-fi · Nov 19, 2024 · d95c8ca · d95c8ca
1 parent 5649f4c
commit d95c8ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/components/dialogs/transfer/default-form.tsx b/components/dialogs/transfer/default-form.tsx
@@ -618,6 +618,7 @@ export function DefaultForm({
                     !form.formState.isValid || (isDeposit && isMaxBalances)
                   }
                   size="xl"
+                  type="submit"
                   variant="outline"
                 >
                   {buttonText}
@@ -645,6 +646,7 @@ export function DefaultForm({
                     !form.formState.isValid || (isDeposit && isMaxBalances)
                   }
                   size="xl"
+                  type="submit"
                   variant="outline"
                 >
                   {buttonText}

diff --git a/components/dialogs/transfer/usdc-form.tsx b/components/dialogs/transfer/usdc-form.tsx
@@ -658,6 +658,7 @@ export function USDCForm({
       if (bridgeAllowanceRequired) {
         await switchChainAndInvoke(mainnet.id, async () =>
           handleApproveBridge({
+            chainId: mainnet.id,
             address: USDC_L1_TOKEN.address,
             args: [
               bridgeQuote?.estimate.approvalAddress as `0x${string}`,
@@ -1212,6 +1213,7 @@ export function USDCForm({
                   className="flex-1 border-0 border-t font-extended text-2xl"
                   disabled={isSubmitDisabled}
                   size="xl"
+                  type="submit"
                   variant="outline"
                 >
                   {buttonText}
@@ -1237,6 +1239,7 @@ export function USDCForm({
                   className="flex w-full flex-col items-center justify-center whitespace-normal text-pretty border-l-0 font-extended text-lg"
                   disabled={isSubmitDisabled}
                   size="xl"
+                  type="submit"
                   variant="outline"
                 >
                   {buttonText}

diff --git a/components/dialogs/transfer/weth-form.tsx b/components/dialogs/transfer/weth-form.tsx
@@ -924,6 +924,7 @@ export function WETHForm({
                     !form.formState.isValid || (isDeposit && isMaxBalances)
                   }
                   size="xl"
+                  type="submit"
                   variant="outline"
                 >
                   {buttonText}
@@ -951,6 +952,7 @@ export function WETHForm({
                     !form.formState.isValid || (isDeposit && isMaxBalances)
                   }
                   size="xl"
+                  type="submit"
                   variant="outline"
                 >
                   {buttonText}

diff --git a/providers/wagmi-provider/wagmi-provider.tsx b/providers/wagmi-provider/wagmi-provider.tsx
@@ -125,7 +125,8 @@ function SyncRenegadeWagmiState() {
         })
     }
 
-    checkConnections()
+    // TODO: Disabled because it prevents switching to Mainnet when bridging
+    // checkConnections()
   }, [chainId, connector, isConnected, wagmiConfig, disconnectWagmi])
 
   // When switching accounts in a wallet, we need to ensure the new account