Skip to content

Commit

Permalink
fix: remove mock tx in erc20 and send tx
Browse files Browse the repository at this point in the history
  • Loading branch information
alter-eggo committed Oct 3, 2024
1 parent 4d332dd commit 76a0495
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ NEXT_PRIVATE_ALCHEMY_KEY=xxx
NEXT_PRIVATE_DRPC_KEY=xxx

# Allow skip transaction (optional)
NEXT_PUBLIC_ALLOW_SKIP_TRANSACTION=false
NEXT_PUBLIC_ALLOW_SKIP_TRANSACTION=true
12 changes: 2 additions & 10 deletions lib/modules/web3/contracts/useManagedErc20Transaction.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable react-hooks/rules-of-hooks */
'use client'

import { allowSkipTransaction, getGqlChain } from '@/lib/config/app.config'
import { getGqlChain } from '@/lib/config/app.config'
import { SupportedChainId } from '@/lib/config/config.types'
import { useNetworkConfig } from '@/lib/config/useNetworkConfig'
import { ManagedResult, TransactionLabels } from '@/lib/modules/transactions/transaction-steps/lib'
Expand All @@ -18,7 +18,6 @@ import { useOnTransactionConfirmation } from './useOnTransactionConfirmation'
import { useOnTransactionSubmission } from './useOnTransactionSubmission'
import { getWaitForReceiptTimeout } from './wagmi-helpers'
import { onlyExplicitRefetch } from '@/lib/shared/utils/queries'
import { useMockedTxHash } from '@/lib/modules/web3/contracts/useMockedTxHash'

type Erc20Abi = typeof erc20Abi

Expand Down Expand Up @@ -67,13 +66,11 @@ export function useManagedErc20Transaction({
},
})

const { mockedTxHash, setMockedTxHash } = useMockedTxHash()

const writeQuery = useWriteContract()

const { txHash, isSafeTxLoading } = useTxHash({
chainId,
wagmiTxHash: mockedTxHash ?? writeQuery.data,
wagmiTxHash: writeQuery.data,
})

const transactionStatusQuery = useWaitForTransactionReceipt({
Expand Down Expand Up @@ -117,11 +114,6 @@ export function useManagedErc20Transaction({
}
if (!simulateQuery.data) return

if (allowSkipTransaction) {
const txHash = setMockedTxHash()
if (txHash) return
}

try {
await writeQuery.writeContractAsync(simulateQuery.data.request)
} catch (e: unknown) {
Expand Down
12 changes: 2 additions & 10 deletions lib/modules/web3/contracts/useManagedSendTransaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useEstimateGas, useSendTransaction, useWaitForTransactionReceipt } from
import { TransactionConfig, TransactionExecution, TransactionSimulation } from './contract.types'
import { useOnTransactionConfirmation } from './useOnTransactionConfirmation'
import { useOnTransactionSubmission } from './useOnTransactionSubmission'
import { allowSkipTransaction, getGqlChain } from '@/lib/config/app.config'
import { getGqlChain } from '@/lib/config/app.config'
import { useChainSwitch } from '../useChainSwitch'
import {
captureWagmiExecutionError,
Expand All @@ -19,7 +19,6 @@ import { mainnet } from 'viem/chains'
import { useTxHash } from '../safe.hooks'
import { getWaitForReceiptTimeout } from './wagmi-helpers'
import { onlyExplicitRefetch } from '@/lib/shared/utils/queries'
import { useMockedTxHash } from '@/lib/modules/web3/contracts/useMockedTxHash'

export type ManagedSendTransactionInput = {
labels: TransactionLabels
Expand Down Expand Up @@ -48,8 +47,6 @@ export function useManagedSendTransaction({
},
})

const { mockedTxHash, setMockedTxHash } = useMockedTxHash()

const writeMutation = useSendTransaction({
mutation: {
meta: sentryMetaForWagmiExecution('Error sending transaction', {
Expand All @@ -62,7 +59,7 @@ export function useManagedSendTransaction({

const { txHash, isSafeTxLoading } = useTxHash({
chainId,
wagmiTxHash: mockedTxHash ?? writeMutation.data,
wagmiTxHash: writeMutation.data,
})

const transactionStatusQuery = useWaitForTransactionReceipt({
Expand Down Expand Up @@ -137,11 +134,6 @@ export function useManagedSendTransaction({
if (!estimateGasQuery.data) return
if (!txConfig?.to) return

if (allowSkipTransaction) {
const txHash = setMockedTxHash()
if (txHash) return
}

try {
return writeMutation.sendTransactionAsync({
chainId,
Expand Down

0 comments on commit 76a0495

Please sign in to comment.