fix(governance): withdrawals bug (#3443)
Co-authored-by: Dexter <dexter.edwards93@gmail.com>
This commit is contained in:
parent
da59e83b19
commit
b0f1aeedae
@ -10,6 +10,7 @@ NX_ETHEREUM_CHAIN_ID=1440
|
|||||||
NX_ETH_URL_CONNECT=1
|
NX_ETH_URL_CONNECT=1
|
||||||
NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
|
NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
|
||||||
NX_LOCAL_PROVIDER_URL=http://localhost:8545/
|
NX_LOCAL_PROVIDER_URL=http://localhost:8545/
|
||||||
|
NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
|
||||||
NX_VEGA_WALLET_URL=http://localhost:1789
|
NX_VEGA_WALLET_URL=http://localhost:1789
|
||||||
NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
|
NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
|
||||||
NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
|
NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
|
||||||
|
@ -20,3 +20,4 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
|
|||||||
|
|
||||||
#Test configuration variables
|
#Test configuration variables
|
||||||
CYPRESS_FAIRGROUND=false
|
CYPRESS_FAIRGROUND=false
|
||||||
|
|
||||||
|
@ -17,6 +17,12 @@ import { AppStateProvider } from './contexts/app-state/app-state-provider';
|
|||||||
import { ContractsProvider } from './contexts/contracts/contracts-provider';
|
import { ContractsProvider } from './contexts/contracts/contracts-provider';
|
||||||
import { AppRouter } from './routes';
|
import { AppRouter } from './routes';
|
||||||
import type { EthereumConfig } from '@vegaprotocol/web3';
|
import type { EthereumConfig } from '@vegaprotocol/web3';
|
||||||
|
import {
|
||||||
|
createConnectors,
|
||||||
|
useEthTransactionManager,
|
||||||
|
useEthWithdrawApprovalsManager,
|
||||||
|
useWeb3ConnectStore,
|
||||||
|
} from '@vegaprotocol/web3';
|
||||||
import { Web3Provider } from '@vegaprotocol/web3';
|
import { Web3Provider } from '@vegaprotocol/web3';
|
||||||
import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
|
import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
|
||||||
import { VegaWalletProvider } from '@vegaprotocol/wallet';
|
import { VegaWalletProvider } from '@vegaprotocol/wallet';
|
||||||
@ -27,10 +33,10 @@ import {
|
|||||||
NetworkLoader,
|
NetworkLoader,
|
||||||
useInitializeEnv,
|
useInitializeEnv,
|
||||||
} from '@vegaprotocol/environment';
|
} from '@vegaprotocol/environment';
|
||||||
import { createConnectors } from './lib/web3-connectors';
|
import { ENV } from './config';
|
||||||
import { ENV } from './config/env';
|
|
||||||
import type { InMemoryCacheConfig } from '@apollo/client';
|
import type { InMemoryCacheConfig } from '@apollo/client';
|
||||||
import { WithdrawalDialog } from '@vegaprotocol/withdraws';
|
import { WithdrawalDialog } from '@vegaprotocol/withdraws';
|
||||||
|
import { SplashLoader } from './components/splash-loader';
|
||||||
|
|
||||||
const cache: InMemoryCacheConfig = {
|
const cache: InMemoryCacheConfig = {
|
||||||
typePolicies: {
|
typePolicies: {
|
||||||
@ -70,20 +76,52 @@ const cache: InMemoryCacheConfig = {
|
|||||||
|
|
||||||
const Web3Container = ({
|
const Web3Container = ({
|
||||||
chainId,
|
chainId,
|
||||||
providerUrl,
|
|
||||||
}: {
|
}: {
|
||||||
chainId: number;
|
chainId: number;
|
||||||
providerUrl: string;
|
providerUrl: string;
|
||||||
}) => {
|
}) => {
|
||||||
|
const InitializeHandlers = () => {
|
||||||
|
useEthTransactionManager();
|
||||||
|
useEthWithdrawApprovalsManager();
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
const [connectors, initializeConnectors] = useWeb3ConnectStore((store) => [
|
||||||
|
store.connectors,
|
||||||
|
store.initialize,
|
||||||
|
]);
|
||||||
|
const { ETHEREUM_PROVIDER_URL, ETH_LOCAL_PROVIDER_URL, ETH_WALLET_MNEMONIC } =
|
||||||
|
useEnvironment();
|
||||||
|
useEffect(() => {
|
||||||
|
if (chainId) {
|
||||||
|
return initializeConnectors(
|
||||||
|
createConnectors(
|
||||||
|
ETHEREUM_PROVIDER_URL,
|
||||||
|
Number(chainId),
|
||||||
|
ETH_LOCAL_PROVIDER_URL,
|
||||||
|
ETH_WALLET_MNEMONIC
|
||||||
|
),
|
||||||
|
Number(chainId)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}, [
|
||||||
|
chainId,
|
||||||
|
ETHEREUM_PROVIDER_URL,
|
||||||
|
initializeConnectors,
|
||||||
|
ETH_LOCAL_PROVIDER_URL,
|
||||||
|
ETH_WALLET_MNEMONIC,
|
||||||
|
]);
|
||||||
const sideBar = React.useMemo(() => {
|
const sideBar = React.useMemo(() => {
|
||||||
return [<EthWallet />, <VegaWallet />];
|
return [<EthWallet />, <VegaWallet />];
|
||||||
}, []);
|
}, []);
|
||||||
const Connectors = React.useMemo(() => {
|
|
||||||
return createConnectors(providerUrl, Number(chainId));
|
if (connectors.length === 0) {
|
||||||
}, [chainId, providerUrl]);
|
// Prevent loading when the connectors are not initialized
|
||||||
|
return <SplashLoader />;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Web3Provider connectors={Connectors}>
|
<Web3Provider connectors={connectors}>
|
||||||
<Web3Connector connectors={Connectors} chainId={Number(chainId)}>
|
<Web3Connector connectors={connectors} chainId={Number(chainId)}>
|
||||||
<VegaWalletProvider>
|
<VegaWalletProvider>
|
||||||
<ContractsProvider>
|
<ContractsProvider>
|
||||||
<AppLoader>
|
<AppLoader>
|
||||||
@ -97,6 +135,7 @@ const Web3Container = ({
|
|||||||
<NetworkInfo />
|
<NetworkInfo />
|
||||||
</footer>
|
</footer>
|
||||||
</AppLayout>
|
</AppLayout>
|
||||||
|
<InitializeHandlers />
|
||||||
<VegaWalletDialogs />
|
<VegaWalletDialogs />
|
||||||
<TransactionModal />
|
<TransactionModal />
|
||||||
<WithdrawalDialog />
|
<WithdrawalDialog />
|
||||||
|
Loading…
Reference in New Issue
Block a user