diff --git a/src/logic/wallets/getWeb3.ts b/src/logic/wallets/getWeb3.ts index df591735..466250c5 100644 --- a/src/logic/wallets/getWeb3.ts +++ b/src/logic/wallets/getWeb3.ts @@ -3,7 +3,16 @@ import Web3 from 'web3' import { sameAddress } from './ethAddresses' import { EMPTY_DATA } from './ethTransactions' -import { getNetwork } from 'src/config/index' +import { getNetwork } from '../../config' + +declare global { + interface Window { + web3: { + currentProvider: any + } + testAccountIndex: string + } +} export const ETHEREUM_NETWORK = { MAINNET: 'MAINNET', @@ -64,7 +73,7 @@ export const getInfuraUrl = () => { export const web3ReadOnly = process.env.NODE_ENV !== 'test' ? new Web3(new Web3.providers.HttpProvider(getInfuraUrl())) - : new Web3((window as any).web3?.currentProvider || 'ws://localhost:8545') + : new Web3(window.web3?.currentProvider || 'ws://localhost:8545') let web3 = web3ReadOnly export const getWeb3 = () => web3 @@ -76,8 +85,8 @@ export const resetWeb3 = () => { export const getAccountFrom = async (web3Provider) => { const accounts = await web3Provider.eth.getAccounts() - if (process.env.NODE_ENV === 'test' && (window as any).testAccountIndex) { - return accounts[(window as any).testAccountIndex] + if (process.env.NODE_ENV === 'test' && window.testAccountIndex) { + return accounts[window.testAccountIndex] } return accounts && accounts.length > 0 ? accounts[0] : null diff --git a/src/test/builder/safe.redux.builder.ts b/src/test/builder/safe.redux.builder.ts index 9e5a915a..a66ce23f 100644 --- a/src/test/builder/safe.redux.builder.ts +++ b/src/test/builder/safe.redux.builder.ts @@ -72,7 +72,7 @@ export const aMinedSafe = async ( threshold = 1, name = 'Safe Name', ) => { - const provider = await getProviderInfo((window as any).web3?.currentProvider || 'ws://localhost:8545') + const provider = await getProviderInfo(window.web3?.currentProvider || 'ws://localhost:8545') const walletRecord = makeProvider(provider) store.dispatch(addProvider(walletRecord)) diff --git a/src/test/safe.dom.load.tsx b/src/test/safe.dom.load.tsx index 8d9a3290..f2b862b3 100644 --- a/src/test/safe.dom.load.tsx +++ b/src/test/safe.dom.load.tsx @@ -29,7 +29,7 @@ afterAll(() => { }) const renderLoadSafe = async (localStore) => { - const provider = await getProviderInfo((window as any).web3.currentProvider || 'ws://localhost:8545') + const provider = await getProviderInfo(window.web3.currentProvider || 'ws://localhost:8545') const walletRecord = makeProvider(provider) localStore.dispatch(addProvider(walletRecord))