Compare commits

...
2 changed files with 3 additions and 19 deletions
@@ -71,7 +71,7 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
}); });
function verifyConnectedToPubKey() { function verifyConnectedToPubKey() {
cy.getByTestId(banner).should( cy.getByTestId(banner, { timeout: 10000 }).should(
'contain.text', 'contain.text',
`Viewing as Vega user: ${vegaPubkeyTruncated}` `Viewing as Vega user: ${vegaPubkeyTruncated}`
); );
+2 -18
View File
@@ -1,7 +1,7 @@
import * as Sentry from '@sentry/react'; import * as Sentry from '@sentry/react';
import { toBigNum } from '@vegaprotocol/utils'; import { toBigNum } from '@vegaprotocol/utils';
import { Splash } from '@vegaprotocol/ui-toolkit'; import { Splash } from '@vegaprotocol/ui-toolkit';
import { useVegaWallet, useEagerConnect } from '@vegaprotocol/wallet'; import { useVegaWallet } from '@vegaprotocol/wallet';
import { FLAGS, useEnvironment } from '@vegaprotocol/environment'; import { FLAGS, useEnvironment } from '@vegaprotocol/environment';
import { useWeb3React } from '@web3-react/core'; import { useWeb3React } from '@web3-react/core';
import React from 'react'; import React from 'react';
@@ -15,19 +15,6 @@ import {
} from './contexts/app-state/app-state-context'; } from './contexts/app-state/app-state-context';
import { useContracts } from './contexts/contracts/contracts-context'; import { useContracts } from './contexts/contracts/contracts-context';
import { useRefreshAssociatedBalances } from './hooks/use-refresh-associated-balances'; import { useRefreshAssociatedBalances } from './hooks/use-refresh-associated-balances';
import { Connectors } from './lib/vega-connectors';
import { useSearchParams } from 'react-router-dom';
const useVegaWalletEagerConnect = () => {
const vegaConnecting = useEagerConnect(Connectors);
const { pubKey, connect } = useVegaWallet();
const [searchParams] = useSearchParams();
const [query] = React.useState(searchParams.get('address'));
if (query && !pubKey) {
connect(Connectors['view']);
}
return vegaConnecting;
};
export const AppLoader = ({ children }: { children: React.ReactElement }) => { export const AppLoader = ({ children }: { children: React.ReactElement }) => {
const { t } = useTranslation(); const { t } = useTranslation();
@@ -38,9 +25,6 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
const { token, staking, vesting } = useContracts(); const { token, staking, vesting } = useContracts();
const setAssociatedBalances = useRefreshAssociatedBalances(); const setAssociatedBalances = useRefreshAssociatedBalances();
const [balancesLoaded, setBalancesLoaded] = React.useState(false); const [balancesLoaded, setBalancesLoaded] = React.useState(false);
const vegaConnecting = useVegaWalletEagerConnect();
const loaded = balancesLoaded && !vegaConnecting;
React.useEffect(() => { React.useEffect(() => {
const run = async () => { const run = async () => {
@@ -164,7 +148,7 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
); );
} }
if (!loaded) { if (!balancesLoaded) {
return ( return (
<Splash> <Splash>
<SplashLoader /> <SplashLoader />