handleSendTransaction

ensdomains · Dec 7, 2024 · 356293c · 356293c
1 parent 1535ceb
commit 356293c
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 38 deletions.
diff --git a/src/components/@molecules/TransactionDialogManager/stage/TransactionStageModal.tsx b/src/components/@molecules/TransactionDialogManager/stage/TransactionStageModal.tsx
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
 import styled, { css } from 'styled-components'
 import { match, P } from 'ts-pattern'
 import { BaseError } from 'viem'
-import { useAccount, useClient, useConnectorClient, useSendTransaction } from 'wagmi'
+import { useClient, useConnectorClient, useSendTransaction } from 'wagmi'
 
 import {
   Button,
@@ -43,6 +43,7 @@ import { makeEtherscanLink } from '@app/utils/utils'
 import { DisplayItems } from '../DisplayItems'
 import {
   createTransactionRequestQueryFn,
+  createTransactionRequestUnsafe,
   getTransactionErrorQueryFn,
   getUniqueTransaction,
   transactionSuccessHandler,
@@ -307,6 +308,31 @@ const getPreTransactionError = ({
     })
 }
 
+export const handleSendTransaction = async (
+  request: Awaited<ReturnType<typeof createTransactionRequestUnsafe>>,
+  actionName: string,
+  trackEvent: ReturnType<typeof useEventTracker>['trackEvent'],
+  sendTransaction: ReturnType<typeof useSendTransaction>['sendTransaction'],
+) => {
+  if (!request) {
+    throw Error('No request object')
+  }
+  if (request?.chainId) {
+    await switchChain(wagmiConfig, { chainId: request?.chainId })
+  }
+  sendTransaction(request)
+
+  const eventName = match(actionName)
+    .with('commitName', () => 'commit_wallet_opened' as const)
+    .with('registerName', () => 'register_wallet_opened' as const)
+    .with('approveDnsRegistrar', () => 'dns_approve_registrar_wallet_opened' as const)
+    .with('importDnsName', () => 'dns_import_wallet_opened' as const)
+    .with('claimDnsName', () => 'dns_claim_wallet_opened' as const)
+    .otherwise(() => undefined)
+
+  if (eventName) trackEvent({ eventName })
+}
+
 export const TransactionStageModal = ({
   actionName,
   currentStep,
@@ -325,7 +351,6 @@ export const TransactionStageModal = ({
   const { data: isSafeApp, isLoading: safeAppStatusLoading } = useIsSafeApp()
   const { data: connectorClient } = useConnectorClient<ConfigWithEns>()
   const client = useClient()
-  const { data: account } = useAccount()
   const addRecentTransaction = useAddRecentTransaction()
 
   const stage = transaction.stage || 'confirm'
@@ -506,7 +531,7 @@ export const TransactionStageModal = ({
     if (stage === 'failed') {
       return (
         <Button
-          onClick={() => sendTransaction(request!)}
+          onClick={() => handleSendTransaction(request, actionName, trackEvent, sendTransaction)}
           disabled={!canEnableTransactionRequest || requestLoading || !request}
           colorStyle="redSecondary"
           data-testid="transaction-modal-failed-button"
@@ -550,21 +575,7 @@ export const TransactionStageModal = ({
           !!requestError ||
           isTransactionRequestCachedData
         }
-        onClick={async () => {
-          if (account?.chain?.id !== request?.chainId) {
-            await switchChain(wagmiConfig, { chainId: request?.chainId })
-          }
-          sendTransaction(request!)
-
-          const eventName = match(actionName)
-            .with('commitName', () => 'commit_wallet_opened' as const)
-            .with('registerName', () => 'register_wallet_opened' as const)
-            .with('approveDnsRegistrar', () => 'dns_approve_registrar_wallet_opened' as const)
-            .with('importDnsName', () => 'dns_import_wallet_opened' as const)
-            .with('claimDnsName', () => 'dns_claim_wallet_opened' as const)
-            .otherwise(() => undefined)
-          if (eventName) trackEvent({ eventName })
-        }}
+        onClick={() => handleSendTransaction(request, actionName, trackEvent, sendTransaction)}
         data-testid="transaction-modal-confirm-button"
       >
         {t('transaction.dialog.confirm.openWallet')}

diff --git a/src/components/@molecules/TransactionDialogManager/stage/query.ts b/src/components/@molecules/TransactionDialogManager/stage/query.ts
@@ -161,7 +161,7 @@ export const calculateGasLimit = async ({
   }
 }
 
-type CreateTransactionRequestQueryKey = CreateQueryKey<
+export type CreateTransactionRequestQueryKey = CreateQueryKey<
   UniqueTransaction,
   'createTransactionRequest',
   'standard'
@@ -175,7 +175,7 @@ type CreateTransactionRequestUnsafeParameters = {
   chainId: SupportedChain['id']
 }
 
-const createTransactionRequestUnsafe = async ({
+export const createTransactionRequestUnsafe = async ({
   client,
   connectorClient,
   isSafeApp,

diff --git a/src/hooks/useQueryOptions.ts b/src/hooks/useQueryOptions.ts
@@ -154,6 +154,8 @@ export function useQueryOptions<
   const { address } = useAccount()
   const config = useConfig()
 
+  // console.log('chainId: ', chainId)
+
   if (queryDependencyType === 'independent')
     return {
       queryKey: createQueryKey({ params, scopeKey, functionName, queryDependencyType }),

diff --git a/src/utils/query/wagmi.ts b/src/utils/query/wagmi.ts
@@ -4,14 +4,9 @@ import { holesky, localhost, mainnet, sepolia } from 'wagmi/chains'
 
 import { ccipRequest } from '@ensdomains/ensjs/utils'
 
-import {
-  holeskyWithEns,
-  localhostWithEns,
-  mainnetWithEns,
-  sepoliaWithEns,
-} from '@app/constants/chains'
-
-import { getChainFromSubdomain, getChainFromUrl } from '../utils'
+import { localhostWithEns } from '@app/constants/chains'
+
+import { getChainFromUrl } from '../utils'
 import { rainbowKitConnectors } from './wallets'
 
 const isLocalProvider = !!process.env.NEXT_PUBLIC_PROVIDER
@@ -78,12 +73,11 @@ const localStorageWithInvertMiddleware = (): Storage | undefined => {
   }
 }
 
-const chains = [
-  ...(isLocalProvider ? ([localhostWithEns] as const) : ([] as const)),
-  mainnetWithEns,
-  sepoliaWithEns,
-  holeskyWithEns,
-] as const
+const getChain = () => {
+  if (isLocalProvider) return localhostWithEns
+  const chain = getChainFromUrl()
+  return chain
+}
 
 const transports = {
   ...(isLocalProvider
@@ -105,10 +99,8 @@ const wagmiConfig_ = createConfig({
   ssr: true,
   multiInjectedProviderDiscovery: true,
   storage: createStorage({ storage: localStorageWithInvertMiddleware(), key: prefix }),
-  chains,
-  client: () => {
-    const chain = getChainFromUrl()
-
+  chains: [getChain()],
+  client: ({ chain }) => {
     const chainId = chain.id
 
     return createClient<Transport, typeof chain>({