refactor(trading,governance,wallet): wallet rewrite (#5815)

Co-authored-by: bwallacee <ben@vega.xyz>

apps/governance-e2e/src/integration/view/pubkey-view.cy.ts

@@ -34,12 +34,6 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
     cy.connectPublicKey(vegaWalletPubKey);
   });
 
-  it('Able to connect public key using url', function () {
-    cy.getByTestId('exit-view').click();
-    cy.visit(`/?address=${vegaWalletPubKey}`);
-    verifyConnectedToPubKey();
-  });
-
   it.skip('Able to connect public key via wallet and view assets in wallet', function () {
     verifyConnectedToPubKey();
     cy.getByTestId('currency-title', { timeout: 10000 })

apps/governance/src/app-loader.tsx

@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/react';
 import { toBigNum } from '@vegaprotocol/utils';
 import { Splash } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet, useEagerConnect } from '@vegaprotocol/wallet';
+import { useVegaWallet, useEagerConnect } from '@vegaprotocol/wallet-react';
 import { useFeatureFlags, useEnvironment } from '@vegaprotocol/environment';
 import { useWeb3React } from '@web3-react/core';
 import React, { Suspense } from 'react';
@@ -15,20 +15,6 @@ import {
 } from './contexts/app-state/app-state-context';
 import { useContracts } from './contexts/contracts/contracts-context';
 import { useRefreshAssociatedBalances } from './hooks/use-refresh-associated-balances';
-import { useConnectors } from './lib/vega-connectors';
-import { useSearchParams } from 'react-router-dom';
-
-const useVegaWalletEagerConnect = () => {
-  const connectors = useConnectors();
-  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 }) => {
   const featureFlags = useFeatureFlags((state) => state.flags);
@@ -40,7 +26,7 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
   const { token, staking, vesting } = useContracts();
   const setAssociatedBalances = useRefreshAssociatedBalances();
   const [balancesLoaded, setBalancesLoaded] = React.useState(false);
-  const vegaConnecting = useVegaWalletEagerConnect();
+  const vegaConnecting = useEagerConnect();
 
   const loaded = balancesLoaded && !vegaConnecting;
 

apps/governance/src/app.tsx

@@ -1,7 +1,6 @@
 import './i18n';
 
 import React, { useEffect } from 'react';
-import * as Sentry from '@sentry/react';
 import { BrowserRouter as Router, useLocation } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
@@ -26,7 +25,7 @@ import {
 } from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
-import { VegaWalletProvider, useChainId } from '@vegaprotocol/wallet';
+import { WalletProvider } from '@vegaprotocol/wallet-react';
 import {
   useVegaTransactionManager,
   useVegaTransactionUpdater,
@@ -36,26 +35,21 @@ import { useEthereumConfig } from '@vegaprotocol/web3';
 import {
   useEnvironment,
   NetworkLoader,
-  useInitializeEnv,
   NodeGuard,
   NodeSwitcherDialog,
   useNodeSwitcherStore,
-  DocsLinks,
   NodeFailure,
   AppLoader as Loader,
+  useInitializeEnv,
 } from '@vegaprotocol/environment';
-import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
 import { ToastsManager } from './toasts-manager';
-import {
+import { TelemetryDialog } from './components/telemetry-dialog/telemetry-dialog';
-  TelemetryDialog,
-  TELEMETRY_ON,
-} from './components/telemetry-dialog/telemetry-dialog';
-import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import { useTranslation } from 'react-i18next';
-import { isPartyNotFoundError } from './lib/party';
+import { useSentryInit } from './hooks/use-sentry-init';
+import { useVegaWalletConfig } from './hooks/use-vega-wallet-config';
 
 const cache: InMemoryCacheConfig = {
   typePolicies: {
@@ -104,32 +98,12 @@ const Web3Container = ({
   /** Ethereum provider url */
   providerUrl: string;
 }) => {
-  const InitializeHandlers = () => {
-    useVegaTransactionManager();
-    useVegaTransactionUpdater();
-    useEthTransactionManager();
-    useEthTransactionUpdater();
-    useEthWithdrawApprovalsManager();
-    return null;
-  };
-
   const [connectors, initializeConnectors] = useWeb3ConnectStore((store) => [
     store.connectors,
     store.initialize,
   ]);
-  const {
+  const { ETHEREUM_PROVIDER_URL, ETH_LOCAL_PROVIDER_URL, ETH_WALLET_MNEMONIC } =
-    ETHEREUM_PROVIDER_URL,
+    useEnvironment();
-    ETH_LOCAL_PROVIDER_URL,
-    ETH_WALLET_MNEMONIC,
-    VEGA_ENV,
-    VEGA_URL,
-    VEGA_EXPLORER_URL,
-    CHROME_EXTENSION_URL,
-    MOZILLA_EXTENSION_URL,
-    VEGA_WALLET_URL,
-  } = useEnvironment();
-
-  const vegaChainId = useChainId(VEGA_URL);
 
   useEffect(() => {
     if (chainId) {
@@ -150,50 +124,31 @@ const Web3Container = ({
     ETH_LOCAL_PROVIDER_URL,
     ETH_WALLET_MNEMONIC,
   ]);
-  const sideBar = React.useMemo(() => {
-    return [<EthWallet />, <VegaWallet />];
-  }, []);
 
-  if (connectors.length === 0) {
+  const vegaWalletConfig = useVegaWalletConfig();
+
+  if (!vegaWalletConfig || connectors.length === 0) {
     // Prevent loading when the connectors are not initialized
     return <SplashLoader />;
   }
 
-  if (
-    !VEGA_URL ||
-    !VEGA_WALLET_URL ||
-    !VEGA_EXPLORER_URL ||
-    !DocsLinks ||
-    !CHROME_EXTENSION_URL ||
-    !MOZILLA_EXTENSION_URL ||
-    !vegaChainId
-  ) {
-    return null;
-  }
-
   return (
     <Web3Provider connectors={connectors}>
       <Web3Connector connectors={connectors} chainId={Number(chainId)}>
-        <VegaWalletProvider
+        <WalletProvider config={vegaWalletConfig}>
-          config={{
-            network: VEGA_ENV,
-            vegaUrl: VEGA_URL,
-            chainId: vegaChainId,
-            vegaWalletServiceUrl: VEGA_WALLET_URL,
-            links: {
-              explorer: VEGA_EXPLORER_URL,
-              concepts: DocsLinks?.VEGA_WALLET_CONCEPTS_URL,
-              chromeExtensionUrl: CHROME_EXTENSION_URL,
-              mozillaExtensionUrl: MOZILLA_EXTENSION_URL,
-            },
-          }}
-        >
           <ContractsProvider>
             <AppLoader>
               <BalanceManager>
                 <>
                   <AppLayout>
-                    <TemplateSidebar sidebar={sideBar}>
+                    <TemplateSidebar
+                      sidebar={
+                        <>
+                          <EthWallet />
+                          <VegaWallet />
+                        </>
+                      }
+                    >
                       <AppRouter />
                     </TemplateSidebar>
                     <footer className="p-4 break-all border-t border-neutral-700">
@@ -211,7 +166,7 @@ const Web3Container = ({
               </BalanceManager>
             </AppLoader>
           </ContractsProvider>
-        </VegaWalletProvider>
+        </WalletProvider>
       </Web3Connector>
     </Web3Provider>
   );
@@ -231,20 +186,9 @@ const ScrollToTop = () => {
   return null;
 };
 
-const removeQueryParams = (url: string) => {
-  return url.split('?')[0];
-};
-
 const AppContainer = () => {
   const { config, loading, error } = useEthereumConfig();
-  const {
+  const { VEGA_URL, ETHEREUM_PROVIDER_URL } = useEnvironment();
-    VEGA_ENV,
-    VEGA_URL,
-    GIT_COMMIT_HASH,
-    GIT_BRANCH,
-    ETHEREUM_PROVIDER_URL,
-  } = useEnvironment();
-  const [telemetryOn] = useLocalStorage(TELEMETRY_ON);
   const { t } = useTranslation();
   const [nodeSwitcherOpen, setNodeSwitcher] = useNodeSwitcherStore((store) => [
     store.dialogOpen,
@@ -254,70 +198,7 @@ const AppContainer = () => {
   // Hacky skip all the loading & web3 init for geo restricted users
   const isRestricted = document?.location?.pathname?.includes('/restricted');
 
-  useEffect(() => {
+  useSentryInit();
-    if (ENV.dsn && telemetryOn === 'true') {
-      Sentry.init({
-        dsn: ENV.dsn,
-        tracesSampleRate: 0.1,
-        enabled: true,
-        environment: VEGA_ENV,
-        release: GIT_COMMIT_HASH,
-        beforeSend(event, hint) {
-          const error = hint?.originalException;
-          const errorIsString = typeof error === 'string';
-          const errorIsObject = error instanceof Error;
-          const requestUrl = event.request?.url;
-          const transaction = event.transaction;
-
-          if (
-            (errorIsString && isPartyNotFoundError({ message: error })) ||
-            (errorIsObject && isPartyNotFoundError(error))
-          ) {
-            // This error is caused by a pubkey making an API request before
-            // it has interacted with the chain. This isn't needed in Sentry.
-            return null;
-          }
-
-          const updatedRequest =
-            requestUrl && requestUrl.includes('/claim?')
-              ? { ...event.request, url: removeQueryParams(requestUrl) }
-              : event.request;
-
-          const updatedTransaction =
-            transaction && transaction.includes('/claim?')
-              ? removeQueryParams(transaction)
-              : transaction;
-
-          const updatedBreadcrumbs = event.breadcrumbs?.map((breadcrumb) => {
-            if (
-              breadcrumb.type === 'navigation' &&
-              breadcrumb.data?.to?.includes('/claim?')
-            ) {
-              return {
-                ...breadcrumb,
-                data: {
-                  ...breadcrumb.data,
-                  to: removeQueryParams(breadcrumb.data.to),
-                },
-              };
-            }
-            return breadcrumb;
-          });
-
-          return {
-            ...event,
-            request: updatedRequest,
-            transaction: updatedTransaction,
-            breadcrumbs: updatedBreadcrumbs ?? event.breadcrumbs,
-          };
-        },
-      });
-      Sentry.setTag('branch', GIT_BRANCH);
-      Sentry.setTag('commit', GIT_COMMIT_HASH);
-    } else {
-      Sentry.close();
-    }
-  }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV, telemetryOn]);
 
   if (isRestricted) {
     return (
@@ -359,6 +240,15 @@ const AppContainer = () => {
   );
 };
 
+const InitializeHandlers = () => {
+  useVegaTransactionManager();
+  useVegaTransactionUpdater();
+  useEthTransactionManager();
+  useEthTransactionUpdater();
+  useEthWithdrawApprovalsManager();
+  return null;
+};
+
 function App() {
   useInitializeEnv();
 

apps/governance/src/components/balance-manager/balance-manager.tsx

@@ -7,7 +7,7 @@ import { useGetAssociationBreakdown } from '../../hooks/use-get-association-brea
 import { useGetUserBalances } from '../../hooks/use-get-user-balances';
 import { useBalances } from '../../lib/balances/balances-store';
 import type { ReactElement } from 'react';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useListenForStakingEvents as useListenForAssociationEvents } from '../../hooks/use-listen-for-staking-events';
 import { useTranches } from '../../lib/tranches/tranches-store';
 import { useUserTrancheBalances } from '../../routes/redemption/hooks';

apps/governance/src/components/connect-to-vega/connect-to-vega.tsx

@@ -1,18 +1,13 @@
 import { Button } from '@vegaprotocol/ui-toolkit';
-import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useDialogStore } from '@vegaprotocol/wallet-react';
 
 export const ConnectToVega = () => {
   const { t } = useTranslation();
-  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
+  const openVegaWalletDialog = useDialogStore((store) => store.open);
-    openVegaWalletDialog: store.openVegaWalletDialog,
-  }));
   return (
     <Button
-      onClick={() => {
+      onClick={openVegaWalletDialog}
-        openVegaWalletDialog();
-      }}
       data-testid="connect-to-vega-wallet-btn"
       variant="primary"
     >

apps/governance/src/components/manage-dialog/manage-dialog.tsx

@@ -6,8 +6,8 @@ import {
   Intent,
   Icon,
 } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '../use-vega-wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
-import { useT } from '../use-t';
+import { useTranslation } from 'react-i18next';
 
 export interface VegaManageDialogProps {
   dialogOpen: boolean;
@@ -18,7 +18,7 @@ export const VegaManageDialog = ({
   dialogOpen,
   setDialogOpen,
 }: VegaManageDialogProps) => {
-  const t = useT();
+  const { t } = useTranslation();
   const { pubKey, pubKeys, selectPubKey, disconnect } = useVegaWallet();
   return (
     <Dialog

apps/governance/src/components/page-templates/app-layout.tsx

@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import type { ReactNode } from 'react';
 import { AnnouncementBanner } from '@vegaprotocol/announcements';
 import { Nav } from '../nav';

apps/governance/src/components/page-templates/template-sidebar.tsx

@@ -1,8 +1,8 @@
-import React from 'react';
+import { Children, type ReactNode } from 'react';
 
 export interface TemplateSidebarProps {
-  children: React.ReactNode;
+  children: ReactNode;
-  sidebar: React.ReactNode[];
+  sidebar: ReactNode;
 }
 
 export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
@@ -12,9 +12,9 @@ export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
         {children}
       </main>
       <aside className="col-start-2 row-start-1 row-span-2 hidden lg:block p-4 bg-banner bg-contain border-l border-neutral-700">
-        {sidebar.map((Component, i) => (
+        {Children.map(sidebar, (child, i) => (
           <section className="mb-4 last:mb-0" key={i}>
-            {Component}
+            {child}
           </section>
         ))}
       </aside>

apps/governance/src/components/vega-wallet-container/vega-wallet-container.tsx

@@ -1,5 +1,5 @@
 import { Button } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useVegaWallet, useDialogStore } from '@vegaprotocol/wallet-react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -10,9 +10,7 @@ interface VegaWalletContainerProps {
 export const VegaWalletContainer = ({ children }: VegaWalletContainerProps) => {
   const { t } = useTranslation();
   const { pubKey } = useVegaWallet();
-  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
+  const openVegaWalletDialog = useDialogStore((store) => store.open);
-    openVegaWalletDialog: store.openVegaWalletDialog,
-  }));
 
   if (!pubKey) {
     return (

apps/governance/src/components/vega-wallet-dialogs/risk-message.tsx

@@ -9,7 +9,7 @@ import Routes from '../../routes/routes';
 export const RiskMessage = () => {
   return (
     <>
-      <div className="bg-vega-light-100 dark:bg-vega-dark-100 p-6 mb-6">
+      <div className="bg-vega-light-100 dark:bg-vega-dark-100 p-6">
         <ul className="list-[square] ml-4">
           <li>
             {t(
@@ -23,7 +23,7 @@ export const RiskMessage = () => {
           </li>
         </ul>
       </div>
-      <p className="mb-8">
+      <p>
         {t(
           'By using the Vega Governance App, you acknowledge that you have read and understood the'
         )}{' '}

apps/governance/src/components/vega-wallet-dialogs/vega-wallet-dialogs.tsx

@@ -1,25 +1,39 @@
 import {
-  VegaConnectDialog,
+  ConnectDialogWithRiskAck,
-  VegaManageDialog,
+  useDialogStore,
-  ViewAsDialog,
+} from '@vegaprotocol/wallet-react';
-} from '@vegaprotocol/wallet';
 import {
   AppStateActionType,
   useAppState,
 } from '../../contexts/app-state/app-state-context';
-import { useConnectors } from '../../lib/vega-connectors';
 import { RiskMessage } from './risk-message';
+import { VegaManageDialog } from '../manage-dialog';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
 
 export const VegaWalletDialogs = () => {
+  const { VEGA_ENV } = useEnvironment();
   const { appState, appDispatch } = useAppState();
-  const connectors = useConnectors();
+  const [riskAccepted, setRiskAccepted] = useLocalStorage(
+    'vega_wallet_risk_accepted'
+  );
+  const vegaWalletDialogOpen = useDialogStore((store) => store.isOpen);
+  const setVegaWalletDialog = useDialogStore((store) => store.set);
   return (
     <>
-      <VegaConnectDialog
+      <ConnectDialogWithRiskAck
-        connectors={connectors}
+        open={vegaWalletDialogOpen}
-        riskMessage={<RiskMessage />}
+        onChange={setVegaWalletDialog}
+        riskAccepted={
+          VEGA_ENV === Networks.TESTNET ? riskAccepted === 'true' : true
+        }
+        riskAckContent={<RiskMessage />}
+        onRiskAccepted={() => setRiskAccepted('true')}
+        onRiskRejected={() => {
+          setRiskAccepted('false');
+          setVegaWalletDialog(false);
+        }}
       />
-
       <VegaManageDialog
         dialogOpen={appState.vegaWalletManageOverlay}
         setDialogOpen={(open) =>
@@ -29,8 +43,6 @@ export const VegaWalletDialogs = () => {
           })
         }
       />
-
-      <ViewAsDialog connector={connectors.view} />
     </>
   );
 };

apps/governance/src/components/vega-wallet/hooks.ts

@@ -10,7 +10,7 @@ import vegaBlack from '../../images/vega_black.png';
 import vegaVesting from '../../images/vega_vesting.png';
 import { BigNumber } from '../../lib/bignumber';
 import { type WalletCardAssetProps } from '../wallet-card';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useContracts } from '../../contexts/contracts/contracts-context';
 import * as Schema from '@vegaprotocol/types';
 import {

apps/governance/src/components/vega-wallet/vega-wallet-prompt.tsx

@@ -1,11 +1,11 @@
 import { ButtonLink, Link } from '@vegaprotocol/ui-toolkit';
 import { useTranslation } from 'react-i18next';
 import { ExternalLinks } from '@vegaprotocol/environment';
-import { useViewAsDialog } from '@vegaprotocol/wallet';
+import { useConnect } from '@vegaprotocol/wallet-react';
 
 export const VegaWalletPrompt = () => {
   const { t } = useTranslation();
-  const setViewAsDialog = useViewAsDialog((state) => state.setOpen);
+  const { connect } = useConnect();
   return (
     <>
       <h3 className="mt-4 mb-2">{t('getWallet')}</h3>
@@ -16,7 +16,7 @@ export const VegaWalletPrompt = () => {
         <ButtonLink
           className="text-neutral-500"
           data-testid="view-as-user"
-          onClick={() => setViewAsDialog(true)}
+          onClick={() => connect('viewParty')}
         >
           {t('viewAsParty')}
         </ButtonLink>

apps/governance/src/components/vega-wallet/vega-wallet.tsx

@@ -25,7 +25,7 @@ import {
 } from '../wallet-card';
 import { VegaWalletPrompt } from './vega-wallet-prompt';
 import { usePollForDelegations } from './hooks';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useVegaWallet, useDialogStore } from '@vegaprotocol/wallet-react';
 import { Button, ButtonLink } from '@vegaprotocol/ui-toolkit';
 import { toBigNum } from '@vegaprotocol/utils';
 import { usePendingBalancesStore } from '../../hooks/use-pending-balances-manager';
@@ -34,15 +34,16 @@ import omit from 'lodash/omit';
 
 export const VegaWallet = () => {
   const { t } = useTranslation();
-  const { pubKey, pubKeys } = useVegaWallet();
+  const { status, pubKey, pubKeys } = useVegaWallet();
   const pubKeyObj = useMemo(() => {
     return pubKeys?.find((pk) => pk.publicKey === pubKey);
   }, [pubKey, pubKeys]);
 
-  const child = !pubKeys ? (
+  const child =
-    <VegaWalletNotConnected />
+    status === 'connected' ? (
-  ) : (
       <VegaWalletConnected vegaKeys={pubKeys.map((pk) => pk.publicKey)} />
+    ) : (
+      <VegaWalletNotConnected />
     );
 
   return (
@@ -75,9 +76,7 @@ export const VegaWallet = () => {
 
 const VegaWalletNotConnected = () => {
   const { t } = useTranslation();
-  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
+  const openVegaWalletDialog = useDialogStore((store) => store.open);
-    openVegaWalletDialog: store.openVegaWalletDialog,
-  }));
   return (
     <>
       <Button

apps/governance/src/hooks/use-listen-for-staking-events.ts

@@ -7,7 +7,7 @@ import { useWeb3React } from '@web3-react/core';
 
 export const useListenForStakingEvents = (
   contract: Contract | undefined,
-  vegaPublicKey: string | null,
+  vegaPublicKey: string | undefined,
   numberOfConfirmations: number
 ) => {
   const { account } = useWeb3React();

apps/governance/src/hooks/use-refresh-balances.ts

@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/react';
 import { toBigNum } from '@vegaprotocol/utils';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import React from 'react';
 

apps/governance/src/hooks/use-sentry-init.ts

@@ -0,0 +1,81 @@
+import { useEffect } from 'react';
+import * as Sentry from '@sentry/react';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { TELEMETRY_ON } from '../components/telemetry-dialog/telemetry-dialog';
+import { useEnvironment } from '@vegaprotocol/environment';
+import { ENV } from '../config';
+import { isPartyNotFoundError } from '../lib/party';
+
+export const useSentryInit = () => {
+  const { VEGA_ENV, GIT_COMMIT_HASH, GIT_BRANCH } = useEnvironment();
+  const [telemetryOn] = useLocalStorage(TELEMETRY_ON);
+
+  useEffect(() => {
+    if (ENV.dsn && telemetryOn === 'true') {
+      Sentry.init({
+        dsn: ENV.dsn,
+        tracesSampleRate: 0.1,
+        enabled: true,
+        environment: VEGA_ENV,
+        release: GIT_COMMIT_HASH,
+        beforeSend(event, hint) {
+          const error = hint?.originalException;
+          const errorIsString = typeof error === 'string';
+          const errorIsObject = error instanceof Error;
+          const requestUrl = event.request?.url;
+          const transaction = event.transaction;
+
+          if (
+            (errorIsString && isPartyNotFoundError({ message: error })) ||
+            (errorIsObject && isPartyNotFoundError(error))
+          ) {
+            // This error is caused by a pubkey making an API request before
+            // it has interacted with the chain. This isn't needed in Sentry.
+            return null;
+          }
+
+          const updatedRequest =
+            requestUrl && requestUrl.includes('/claim?')
+              ? { ...event.request, url: removeQueryParams(requestUrl) }
+              : event.request;
+
+          const updatedTransaction =
+            transaction && transaction.includes('/claim?')
+              ? removeQueryParams(transaction)
+              : transaction;
+
+          const updatedBreadcrumbs = event.breadcrumbs?.map((breadcrumb) => {
+            if (
+              breadcrumb.type === 'navigation' &&
+              breadcrumb.data?.to?.includes('/claim?')
+            ) {
+              return {
+                ...breadcrumb,
+                data: {
+                  ...breadcrumb.data,
+                  to: removeQueryParams(breadcrumb.data.to),
+                },
+              };
+            }
+            return breadcrumb;
+          });
+
+          return {
+            ...event,
+            request: updatedRequest,
+            transaction: updatedTransaction,
+            breadcrumbs: updatedBreadcrumbs ?? event.breadcrumbs,
+          };
+        },
+      });
+      Sentry.setTag('branch', GIT_BRANCH);
+      Sentry.setTag('commit', GIT_COMMIT_HASH);
+    } else {
+      Sentry.close();
+    }
+  }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV, telemetryOn]);
+};
+
+const removeQueryParams = (url: string) => {
+  return url.split('?')[0];
+};

apps/governance/src/hooks/use-vega-wallet-config.ts

@@ -0,0 +1,41 @@
+import { useMemo } from 'react';
+import {
+  InjectedConnector,
+  JsonRpcConnector,
+  SnapConnector,
+  ViewPartyConnector,
+  createConfig,
+  fairground,
+  stagnet,
+  mainnet,
+} from '@vegaprotocol/wallet';
+import { useEnvironment } from '@vegaprotocol/environment';
+
+export const useVegaWalletConfig = () => {
+  const { VEGA_ENV, VEGA_URL, VEGA_WALLET_URL } = useEnvironment();
+  return useMemo(() => {
+    if (!VEGA_ENV || !VEGA_URL || !VEGA_WALLET_URL) return;
+
+    const injected = new InjectedConnector();
+
+    const jsonRpc = new JsonRpcConnector({
+      url: VEGA_WALLET_URL,
+    });
+
+    const snap = new SnapConnector({
+      node: new URL(VEGA_URL).origin,
+      snapId: 'npm:@vegaprotocol/snap',
+      version: '1.0.1',
+    });
+
+    const viewParty = new ViewPartyConnector();
+
+    const config = createConfig({
+      chains: [mainnet, fairground, stagnet],
+      defaultChainId: fairground.id,
+      connectors: [injected, snap, jsonRpc, viewParty],
+    });
+
+    return config;
+  }, [VEGA_ENV, VEGA_URL, VEGA_WALLET_URL]);
+};

apps/governance/src/i18n/index.ts

@@ -31,7 +31,7 @@ i18n
     load: 'languageOnly',
     debug: isInDev,
     // have a common namespace used around the full app
-    ns: ['governance'],
+    ns: ['governance', 'wallet', 'wallet-react'],
     defaultNS: 'governance',
     keySeparator: false, // we use content as keys
     nsSeparator: false,

apps/governance/src/lib/vega-connectors.ts

@@ -1,30 +0,0 @@
-import { useFeatureFlags } from '@vegaprotocol/environment';
-import { useMemo } from 'react';
-import {
-  JsonRpcConnector,
-  ViewConnector,
-  InjectedConnector,
-  SnapConnector,
-  DEFAULT_SNAP_ID,
-} from '@vegaprotocol/wallet';
-
-const urlParams = new URLSearchParams(window.location.search);
-
-export const jsonRpc = new JsonRpcConnector();
-export const injected = new InjectedConnector();
-export const view = new ViewConnector(urlParams.get('address'));
-
-export const snap = new SnapConnector(DEFAULT_SNAP_ID);
-
-export const useConnectors = () => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
-  return useMemo(
-    () => ({
-      injected,
-      jsonRpc,
-      view,
-      snap: featureFlags.METAMASK_SNAPS ? snap : undefined,
-    }),
-    [featureFlags.METAMASK_SNAPS]
-  );
-};

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.spec.tsx

@@ -5,7 +5,6 @@ import {
   ProposalState,
   VoteValue,
 } from '@vegaprotocol/types';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import {
   generateNoVotes,
@@ -16,9 +15,7 @@ import { ProposalHeader, NewTransferSummary } from './proposal-header';
 import {
   lastWeek,
   nextWeek,
-  mockWalletContext,
   createUserVoteQueryMock,
-  networkParamsQueryMock,
 } from '../../test-helpers/mocks';
 import { BrowserRouter } from 'react-router-dom';
 import { VoteState } from '../vote-details/use-user-vote';
@@ -45,14 +42,12 @@ const renderComponent = (
   render(
     <AppStateProvider>
       <BrowserRouter>
-        <MockedProvider mocks={[networkParamsQueryMock, ...mocks]}>
+        <MockedProvider mocks={mocks}>
-          <VegaWalletContext.Provider value={mockWalletContext}>
           <ProposalHeader
             proposal={proposal}
             isListItem={isListItem}
             voteState={voteState}
           />
-          </VegaWalletContext.Provider>
         </MockedProvider>
       </BrowserRouter>
     </AppStateProvider>
@@ -160,7 +155,7 @@ describe('Proposal header', () => {
       screen.queryByTestId('proposal-description')
     ).not.toBeInTheDocument();
     expect(screen.getByTestId('proposal-details')).toHaveTextContent(
-      'Update to market: MarketId'
+      /Update to market: MarketId/
     );
   });
 

apps/governance/src/routes/proposals/components/proposal/proposal.spec.tsx

@@ -1,12 +1,12 @@
 import { MemoryRouter } from 'react-router-dom';
 import { MockedProvider } from '@apollo/client/testing';
-import { VegaWalletProvider } from '@vegaprotocol/wallet';
-import { type VegaWalletConfig } from '@vegaprotocol/wallet';
 import { render, screen } from '@testing-library/react';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
 import { ProposalState } from '@vegaprotocol/types';
 import { type Proposal as IProposal } from '../../types';
+import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
+import { MockedWalletProvider } from '@vegaprotocol/wallet-react/testing';
 
 jest.mock('@vegaprotocol/network-parameters', () => ({
   ...jest.requireActual('@vegaprotocol/network-parameters'),
@@ -24,45 +24,44 @@ jest.mock('@vegaprotocol/network-parameters', () => ({
     error: null,
   })),
 }));
+
 jest.mock('../proposal-detail-header/proposal-header', () => ({
   ProposalHeader: () => <div data-testid="proposal-header"></div>,
 }));
+
 jest.mock('../proposal-change-table', () => ({
   ProposalChangeTable: () => <div data-testid="proposal-change-table"></div>,
 }));
+
 jest.mock('../proposal-json', () => ({
   ProposalJson: () => <div data-testid="proposal-json"></div>,
 }));
+
 jest.mock('../list-asset', () => ({
   ListAsset: () => <div data-testid="proposal-list-asset"></div>,
 }));
 
-jest.mock('./proposal-change-details', () => ({
+jest.mock('../list-asset', () => ({
-  ProposalChangeDetails: () => (
+  ListAsset: () => <div data-testid="proposal-list-asset"></div>,
-    <div data-testid="proposal-change-details"></div>
-  ),
 }));
 
-const vegaWalletConfig: VegaWalletConfig = {
+jest.mock('../vote-details', () => ({
-  network: 'TESTNET',
+  UserVote: () => <div data-testid="user-vote"></div>,
-  vegaUrl: 'https://vega.xyz',
+}));
-  vegaWalletServiceUrl: 'https://wallet.vega.xyz',
+
-  links: {
+jest.mock('./proposal-change-details', () => ({
-    explorer: 'explorer',
+  ProposalChangeDetails: () => <div data-testid="proposal-change-details" />,
-    concepts: 'concepts',
+}));
-    chromeExtensionUrl: 'chrome',
-    mozillaExtensionUrl: 'mozilla',
-  },
-  chainId: 'VEGA_CHAIN_ID',
-};
 
 const renderComponent = (proposal: IProposal) => {
-  render(
+  return render(
     <MemoryRouter>
       <MockedProvider>
-        <VegaWalletProvider config={vegaWalletConfig}>
+        <MockedWalletProvider>
+          <AppStateProvider>
             <Proposal restData={null} proposal={proposal} />
-        </VegaWalletProvider>
+          </AppStateProvider>
+        </MockedWalletProvider>
       </MockedProvider>
     </MemoryRouter>
   );

apps/governance/src/routes/proposals/components/proposal/proposal.tsx

@@ -23,7 +23,7 @@ export interface ProposalProps {
 
 export const Proposal = ({ proposal, restData }: ProposalProps) => {
   const { t } = useTranslation();
-  const { submit, Dialog, finalizedVote, transaction } = useVoteSubmit();
+  const { submit, finalizedVote, transaction } = useVoteSubmit();
   const { voteState, voteDatetime } = useUserVote(proposal?.id, finalizedVote);
 
   return (
@@ -88,7 +88,6 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
           <UserVote
             proposal={proposal}
             submit={submit}
-            dialog={Dialog}
             transaction={transaction}
             voteState={voteState}
             voteDatetime={voteDatetime}

apps/governance/src/routes/proposals/components/proposals-list-item/proposals-list-item-details.spec.tsx

@@ -1,15 +1,14 @@
 import { BrowserRouter as Router } from 'react-router-dom';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { render, screen } from '@testing-library/react';
+import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { ProposalsListItemDetails } from './proposals-list-item-details';
-import { mockWalletContext } from '../../test-helpers/mocks';
 
 const renderComponent = (id: string) =>
   render(
     <Router>
-      <VegaWalletContext.Provider value={mockWalletContext}>
+      <AppStateProvider>
         <ProposalsListItemDetails id={id} />
-      </VegaWalletContext.Provider>
+      </AppStateProvider>
     </Router>
   );
 

apps/governance/src/routes/proposals/components/propose/proposal-form-submit.spec.tsx

@@ -1,25 +1,32 @@
-import { render, screen } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
+import {
+  MockedWalletProvider,
+  mockConfig,
+} from '@vegaprotocol/wallet-react/testing';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { ProposalFormSubmit } from './proposal-form-submit';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 
-const renderComponent = (
+const renderComponent = (isSubmitting: boolean) => {
-  context: VegaWalletContextShape,
-  isSubmitting: boolean
-) => {
   render(
+    <MockedWalletProvider>
       <AppStateProvider>
-      <VegaWalletContext.Provider value={context}>
         <ProposalFormSubmit isSubmitting={isSubmitting} />
-      </VegaWalletContext.Provider>
       </AppStateProvider>
+    </MockedWalletProvider>
   );
 };
 
 describe('Proposal Form Submit', () => {
+  const pubKey = { publicKey: '123456__123456', name: 'test' };
+
+  afterEach(() => {
+    act(() => {
+      mockConfig.reset();
+    });
+  });
+
   it('should display connection message and button if wallet not connected', () => {
-    renderComponent({ pubKey: null } as VegaWalletContextShape, false);
+    renderComponent(false);
 
     expect(
       screen.getByText('Connect your wallet to submit a proposal')
@@ -30,28 +37,22 @@ describe('Proposal Form Submit', () => {
   });
 
   it('should display submit button if wallet is connected', () => {
-    const pubKey = { publicKey: '123456__123456', name: 'test' };
+    mockConfig.store.setState({
-    renderComponent(
-      {
       pubKey: pubKey.publicKey,
-        pubKeys: [pubKey],
+      keys: [pubKey],
-      } as VegaWalletContextShape,
+    });
-      false
+    renderComponent(false);
-    );
     expect(screen.getByTestId('proposal-submit')).toHaveTextContent(
       'Submit proposal'
     );
   });
 
   it('should display submitting button text if wallet is connected and submitting', () => {
-    const pubKey = { publicKey: '123456__123456', name: 'test' };
+    mockConfig.store.setState({
-    renderComponent(
-      {
       pubKey: pubKey.publicKey,
-        pubKeys: [pubKey],
+      keys: [pubKey],
-      } as VegaWalletContextShape,
+    });
-      true
+    renderComponent(true);
-    );
     expect(screen.getByTestId('proposal-submit')).toHaveTextContent(
       'Submitting proposal'
     );

apps/governance/src/routes/proposals/components/propose/proposal-form-submit.tsx

@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import { Button } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { VegaWalletContainer } from '../../../../components/vega-wallet-container';
 
 interface ProposalFormSubmitProps {

apps/governance/src/routes/proposals/components/propose/proposal-form-transaction-dialog.tsx

@@ -1,19 +1,24 @@
 import {
+  VegaTransactionDialog,
   getProposalDialogIcon,
   getProposalDialogIntent,
   useGetProposalDialogTitle,
 } from '@vegaprotocol/proposals';
-import type { ProposalEventFieldsFragment } from '@vegaprotocol/proposals';
+import type {
-import type { DialogProps } from '@vegaprotocol/proposals';
+  ProposalEventFieldsFragment,
+  VegaTxState,
+} from '@vegaprotocol/proposals';
 
 interface ProposalFormTransactionDialogProps {
   finalizedProposal: ProposalEventFieldsFragment | null;
-  TransactionDialog: (props: DialogProps) => JSX.Element;
+  transaction: VegaTxState;
+  onChange: (open: boolean) => void;
 }
 
 export const ProposalFormTransactionDialog = ({
   finalizedProposal,
-  TransactionDialog,
+  transaction,
+  onChange,
 }: ProposalFormTransactionDialogProps) => {
   const title = useGetProposalDialogTitle(finalizedProposal?.state);
   // Render a custom complete UI if the proposal was rejected otherwise
@@ -24,13 +29,16 @@ export const ProposalFormTransactionDialog = ({
 
   return (
     <div data-testid="proposal-transaction-dialog">
-      <TransactionDialog
+      <VegaTransactionDialog
         title={title}
         intent={getProposalDialogIntent(finalizedProposal?.state)}
         icon={getProposalDialogIcon(finalizedProposal?.state)}
         content={{
           Complete: completeContent,
         }}
+        transaction={transaction}
+        isOpen={transaction.dialogOpen}
+        onChange={onChange}
       />
     </div>
   );

apps/governance/src/routes/proposals/components/vote-breakdown/vote-breakdown.spec.tsx

@@ -1,10 +1,8 @@
 import { render, screen } from '@testing-library/react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { MockedProvider } from '@apollo/client/testing';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import {
   lastWeek,
-  mockWalletContext,
   networkParamsQueryMock,
   nextWeek,
 } from '../../test-helpers/mocks';
@@ -48,9 +46,7 @@ const renderComponent = (
   render(
     <Router>
       <MockedProvider mocks={mocks}>
-        <VegaWalletContext.Provider value={mockWalletContext}>
         <VoteBreakdown proposal={proposal} />
-        </VegaWalletContext.Provider>
       </MockedProvider>
     </Router>
   );
@@ -60,6 +56,7 @@ describe('VoteBreakdown', () => {
     jest.useFakeTimers();
     jest.setSystemTime(0);
   });
+
   afterAll(() => {
     jest.useRealTimers();
   });

apps/governance/src/routes/proposals/components/vote-details/use-user-vote.tsx

@@ -1,5 +1,5 @@
 import { captureMessage } from '@sentry/minimal';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { VoteValue } from '@vegaprotocol/types';
 import { useEffect, useState } from 'react';
 import { useUserVoteQuery } from './__generated__/Vote';

apps/governance/src/routes/proposals/components/vote-details/user-vote.tsx

@@ -1,20 +1,19 @@
 import { useTranslation } from 'react-i18next';
 import { Icon, ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { ProposalState } from '@vegaprotocol/types';
 import { ConnectToVega } from '../../../../components/connect-to-vega';
 import { VoteButtonsContainer } from './vote-buttons';
 import { SubHeading } from '../../../../components/heading';
 import { type VoteValue } from '@vegaprotocol/types';
-import { type DialogProps, type VegaTxState } from '@vegaprotocol/proposals';
+import { type VegaTxState } from '@vegaprotocol/proposals';
 import { type VoteState } from './use-user-vote';
 import { type Proposal, type BatchProposal } from '../../types';
 
 interface UserVoteProps {
   proposal: Proposal | BatchProposal;
-  transaction: VegaTxState | null;
+  transaction: VegaTxState;
   submit: (voteValue: VoteValue, proposalId: string | null) => Promise<void>;
-  dialog: (props: DialogProps) => JSX.Element;
   voteState: VoteState | null;
   voteDatetime: Date | null;
 }
@@ -23,7 +22,6 @@ export const UserVote = ({
   proposal,
   submit,
   transaction,
-  dialog,
   voteState,
   voteDatetime,
 }: UserVoteProps) => {
@@ -56,7 +54,6 @@ export const UserVote = ({
             className="flex"
             submit={submit}
             transaction={transaction}
-            dialog={dialog}
           />
         )
       ) : (

apps/governance/src/routes/proposals/components/vote-details/vega-transaction-dialog.spec.tsx

@@ -2,33 +2,20 @@ import { render, screen } from '@testing-library/react';
 import { VoteTransactionDialog } from './vote-transaction-dialog';
 import { VoteState } from './use-user-vote';
 import { VegaTxStatus } from '@vegaprotocol/proposals';
+import { ConnectorErrors, unknownError } from '@vegaprotocol/wallet';
 
 describe('VoteTransactionDialog', () => {
-  const mockTransactionDialog = jest.fn(({ title, content }) => (
-    <div>
-      <div>{title}</div>
-      <div>{content?.Complete}</div>
-    </div>
-  ));
-
-  it('renders without crashing', () => {
-    render(
-      <VoteTransactionDialog
-        voteState={VoteState.Yes}
-        transaction={null}
-        TransactionDialog={mockTransactionDialog}
-      />
-    );
-
-    expect(screen.getByTestId('vote-transaction-dialog')).toBeInTheDocument();
-  });
-
   it('renders with txRequested title when voteState is Requested', () => {
     render(
       <VoteTransactionDialog
         voteState={VoteState.Requested}
-        transaction={null}
+        transaction={{
-        TransactionDialog={mockTransactionDialog}
+          error: null,
+          txHash: null,
+          signature: null,
+          status: VegaTxStatus.Requested,
+          dialogOpen: true,
+        }}
       />
     );
 
@@ -39,8 +26,13 @@ describe('VoteTransactionDialog', () => {
     render(
       <VoteTransactionDialog
         voteState={VoteState.Pending}
-        transaction={null}
+        transaction={{
-        TransactionDialog={mockTransactionDialog}
+          error: null,
+          txHash: null,
+          signature: null,
+          status: VegaTxStatus.Pending,
+          dialogOpen: true,
+        }}
       />
     );
 
@@ -51,8 +43,13 @@ describe('VoteTransactionDialog', () => {
     render(
       <VoteTransactionDialog
         voteState={VoteState.Yes} // or any other state other than Requested or Pending
-        transaction={null}
+        transaction={{
-        TransactionDialog={mockTransactionDialog}
+          error: null,
+          txHash: null,
+          signature: null,
+          status: VegaTxStatus.Complete,
+          dialogOpen: true,
+        }}
       />
     );
 
@@ -65,17 +62,18 @@ describe('VoteTransactionDialog', () => {
       <VoteTransactionDialog
         voteState={VoteState.Failed}
         transaction={{
-          error: { message: 'Custom error test message', name: 'blah' },
+          error: unknownError(),
           txHash: null,
           signature: null,
           status: VegaTxStatus.Error,
-          dialogOpen: false,
+          dialogOpen: true,
         }}
-        TransactionDialog={mockTransactionDialog}
       />
     );
 
-    expect(screen.getByText('Custom error test message')).toBeInTheDocument();
+    expect(
+      screen.getByText(ConnectorErrors.unknown.message)
+    ).toBeInTheDocument();
   });
 
   it('renders default error message when voteState is failed and no error message exists on the tx', () => {
@@ -86,10 +84,9 @@ describe('VoteTransactionDialog', () => {
           error: null,
           txHash: null,
           signature: null,
-          status: VegaTxStatus.Error,
+          status: VegaTxStatus.Complete,
-          dialogOpen: false,
+          dialogOpen: true,
         }}
-        TransactionDialog={mockTransactionDialog}
       />
     );
 
@@ -100,8 +97,13 @@ describe('VoteTransactionDialog', () => {
     render(
       <VoteTransactionDialog
         voteState={VoteState.Yes}
-        transaction={null}
+        transaction={{
-        TransactionDialog={mockTransactionDialog}
+          error: null,
+          txHash: null,
+          signature: null,
+          status: VegaTxStatus.Default,
+          dialogOpen: true,
+        }}
       />
     );
 

apps/governance/src/routes/proposals/components/vote-details/vote-buttons.spec.tsx

@@ -1,120 +1,77 @@
-import { fireEvent, render, screen } from '@testing-library/react';
+import { act, fireEvent, render, screen } from '@testing-library/react';
 import BigNumber from 'bignumber.js';
-import { VoteButtons } from './vote-buttons';
+import { VoteButtons, type VoteButtonsProps } from './vote-buttons';
 import { VoteState } from './use-user-vote';
 import { ProposalState } from '@vegaprotocol/types';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import { mockWalletContext } from '../../test-helpers/mocks';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { MockedProvider } from '@apollo/react-testing';
+import { VegaTxStatus } from '@vegaprotocol/proposals';
+import {
+  MockedWalletProvider,
+  mockConfig,
+} from '@vegaprotocol/wallet-react/testing';
 
 describe('Vote buttons', () => {
-  it('should render successfully', () => {
+  const key = { publicKey: '0x123', name: 'key 1' };
-    const { baseElement } = render(
+  const transaction = {
+    status: VegaTxStatus.Default,
+    error: null,
+    txHash: null,
+    signature: null,
+    dialogOpen: false,
+  };
+  const props = {
+    voteState: VoteState.NotCast,
+    voteDatetime: null,
+    proposalState: ProposalState.STATE_OPEN,
+    proposalId: null,
+    minVoterBalance: null,
+    spamProtectionMinTokens: null,
+    currentStakeAvailable: new BigNumber(1),
+    submit: () => Promise.resolve(),
+    transaction,
+  };
+
+  const renderComponent = (testProps?: Partial<VoteButtonsProps>) => {
+    return render(
       <AppStateProvider>
         <MockedProvider>
-          <VegaWalletContext.Provider value={mockWalletContext}>
+          <MockedWalletProvider>
-            <VoteButtons
+            <VoteButtons {...props} {...testProps} />
-              voteState={VoteState.NotCast}
+          </MockedWalletProvider>
-              voteDatetime={null}
-              proposalState={ProposalState.STATE_OPEN}
-              proposalId={null}
-              minVoterBalance={null}
-              spamProtectionMinTokens={null}
-              currentStakeAvailable={new BigNumber(1)}
-              dialog={() => <div>Blah</div>}
-              submit={() => Promise.resolve()}
-              transaction={null}
-            />
-          </VegaWalletContext.Provider>
         </MockedProvider>
       </AppStateProvider>
     );
+  };
+
+  beforeEach(() => {
+    mockConfig.store.setState({ pubKey: key.publicKey, keys: [key] });
+  });
+
+  afterEach(() => {
+    act(() => {
+      mockConfig.reset();
+    });
+  });
+
+  it('should render successfully', () => {
+    const { baseElement } = renderComponent();
     expect(baseElement).toBeTruthy();
   });
 
   it('should explain that voting is closed if the proposal is not open', () => {
-    render(
+    renderComponent({ proposalState: ProposalState.STATE_PASSED });
-      <AppStateProvider>
-        <MockedProvider>
-          <VegaWalletContext.Provider value={mockWalletContext}>
-            <VoteButtons
-              voteState={VoteState.NotCast}
-              voteDatetime={null}
-              proposalState={ProposalState.STATE_PASSED}
-              proposalId={null}
-              minVoterBalance={null}
-              spamProtectionMinTokens={null}
-              currentStakeAvailable={new BigNumber(1)}
-              dialog={() => <div>Blah</div>}
-              submit={() => Promise.resolve()}
-              transaction={null}
-            />
-          </VegaWalletContext.Provider>
-        </MockedProvider>
-      </AppStateProvider>
-    );
     expect(screen.getByText('Voting has ended.')).toBeTruthy();
   });
 
   it('should provide a connect wallet prompt if no pubkey', () => {
-    const mockWalletNoPubKeyContext = {
+    mockConfig.reset();
-      pubKey: null,
+    renderComponent();
-      pubKeys: [],
-      isReadOnly: false,
-      sendTx: jest.fn().mockReturnValue(Promise.resolve(null)),
-      connect: jest.fn(),
-      disconnect: jest.fn(),
-      selectPubKey: jest.fn(),
-      connector: null,
-    } as unknown as VegaWalletContextShape;
-
-    render(
-      <AppStateProvider>
-        <MockedProvider>
-          <VegaWalletContext.Provider value={mockWalletNoPubKeyContext}>
-            <VoteButtons
-              voteState={VoteState.NotCast}
-              voteDatetime={null}
-              proposalState={ProposalState.STATE_OPEN}
-              proposalId={null}
-              minVoterBalance={null}
-              spamProtectionMinTokens={null}
-              currentStakeAvailable={new BigNumber(1)}
-              dialog={() => <div>Blah</div>}
-              submit={() => Promise.resolve()}
-              transaction={null}
-            />
-          </VegaWalletContext.Provider>
-        </MockedProvider>
-      </AppStateProvider>
-    );
-
     expect(screen.getByTestId('connect-wallet')).toBeTruthy();
   });
 
   it('should tell the user they need tokens if their current stake is 0', () => {
-    render(
+    renderComponent({ currentStakeAvailable: new BigNumber(0) });
-      <AppStateProvider>
-        <MockedProvider>
-          <VegaWalletContext.Provider value={mockWalletContext}>
-            <VoteButtons
-              voteState={VoteState.NotCast}
-              voteDatetime={null}
-              proposalState={ProposalState.STATE_OPEN}
-              proposalId={null}
-              minVoterBalance={null}
-              spamProtectionMinTokens={null}
-              currentStakeAvailable={new BigNumber(0)}
-              dialog={() => <div>Blah</div>}
-              submit={() => Promise.resolve()}
-              transaction={null}
-            />
-          </VegaWalletContext.Provider>
-        </MockedProvider>
-      </AppStateProvider>
-    );
     expect(
       screen.getByText(
         'You need some VEGA tokens to participate in governance.'
@@ -123,26 +80,10 @@ describe('Vote buttons', () => {
   });
 
   it('should tell the user of the minimum requirements if they have some, but not enough tokens', () => {
-    render(
+    renderComponent({
-      <AppStateProvider>
+      minVoterBalance: '2000000000000000000',
-        <MockedProvider>
+      spamProtectionMinTokens: '1000000000000000000',
-          <VegaWalletContext.Provider value={mockWalletContext}>
+    });
-            <VoteButtons
-              voteState={VoteState.NotCast}
-              voteDatetime={null}
-              proposalState={ProposalState.STATE_OPEN}
-              proposalId={null}
-              minVoterBalance="2000000000000000000"
-              spamProtectionMinTokens="1000000000000000000"
-              currentStakeAvailable={new BigNumber(1)}
-              dialog={() => <div>Blah</div>}
-              submit={() => Promise.resolve()}
-              transaction={null}
-            />
-          </VegaWalletContext.Provider>
-        </MockedProvider>
-      </AppStateProvider>
-    );
     expect(
       screen.getByText(
         'You must have at least 2 VEGA associated to vote on this proposal'
@@ -151,51 +92,23 @@ describe('Vote buttons', () => {
   });
 
   it('should show you voted if vote state is correct, and if the proposal is still open, it will display a change vote button', () => {
-    render(
+    renderComponent({
-      <AppStateProvider>
+      voteState: VoteState.Yes,
-        <MockedProvider>
+      minVoterBalance: '2000000000000000000',
-          <VegaWalletContext.Provider value={mockWalletContext}>
+      spamProtectionMinTokens: '1000000000000000000',
-            <VoteButtons
+      currentStakeAvailable: new BigNumber(10),
-              voteState={VoteState.Yes}
+    });
-              voteDatetime={null}
-              proposalState={ProposalState.STATE_OPEN}
-              proposalId={null}
-              minVoterBalance="2000000000000000000"
-              spamProtectionMinTokens="1000000000000000000"
-              currentStakeAvailable={new BigNumber(10)}
-              dialog={() => <div>Blah</div>}
-              submit={() => Promise.resolve()}
-              transaction={null}
-            />
-          </VegaWalletContext.Provider>
-        </MockedProvider>
-      </AppStateProvider>
-    );
     expect(screen.getByTestId('you-voted')).toBeInTheDocument();
     expect(screen.getByTestId('change-vote-button')).toBeInTheDocument();
   });
 
   it('should allow you to change your vote', () => {
-    render(
+    renderComponent({
-      <AppStateProvider>
+      voteState: VoteState.No,
-        <MockedProvider>
+      minVoterBalance: '2000000000000000000',
-          <VegaWalletContext.Provider value={mockWalletContext}>
+      spamProtectionMinTokens: '1000000000000000000',
-            <VoteButtons
+      currentStakeAvailable: new BigNumber(10),
-              voteState={VoteState.No}
+    });
-              voteDatetime={null}
-              proposalState={ProposalState.STATE_OPEN}
-              proposalId={null}
-              minVoterBalance="2000000000000000000"
-              spamProtectionMinTokens="1000000000000000000"
-              currentStakeAvailable={new BigNumber(10)}
-              dialog={() => <div>Blah</div>}
-              submit={() => Promise.resolve()}
-              transaction={null}
-            />
-          </VegaWalletContext.Provider>
-        </MockedProvider>
-      </AppStateProvider>
-    );
     fireEvent.click(screen.getByTestId('change-vote-button'));
     expect(screen.getByTestId('vote-buttons')).toBeInTheDocument();
   });

apps/governance/src/routes/proposals/components/vote-details/vote-buttons.tsx

@@ -1,7 +1,7 @@
 import { format } from 'date-fns';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useVegaWallet, useDialogStore } from '@vegaprotocol/wallet-react';
 import {
   AsyncRenderer,
   Button,
@@ -17,7 +17,7 @@ import { VoteState } from './use-user-vote';
 import { ProposalMinRequirements, ProposalUserAction } from '../shared';
 import { VoteTransactionDialog } from './vote-transaction-dialog';
 import { useVoteButtonsQuery } from './__generated__/Stake';
-import type { DialogProps, VegaTxState } from '@vegaprotocol/proposals';
+import type { VegaTxState } from '@vegaprotocol/proposals';
 import { filterAcceptableGraphqlErrors } from '../../../../lib/party';
 import {
   NetworkParams,
@@ -32,8 +32,7 @@ interface VoteButtonsContainerProps {
   proposalId: string | null;
   proposalState: ProposalState;
   submit: (voteValue: VoteValue, proposalId: string | null) => Promise<void>;
-  transaction: VegaTxState | null;
+  transaction: VegaTxState;
-  dialog: (props: DialogProps) => JSX.Element;
   className?: string;
 }
 
@@ -136,17 +135,16 @@ export const VoteButtonsContainer = (props: VoteButtonsContainerProps) => {
   );
 };
 
-interface VoteButtonsProps {
+export interface VoteButtonsProps {
   voteState: VoteState | null;
   voteDatetime: Date | null;
-  proposalId: string | null;
   proposalState: ProposalState;
-  submit: (voteValue: VoteValue, proposalId: string | null) => Promise<void>;
+  proposalId: string | null;
-  transaction: VegaTxState | null;
-  dialog: (props: DialogProps) => JSX.Element;
   currentStakeAvailable: BigNumber;
   minVoterBalance: string | null;
   spamProtectionMinTokens: string | null;
+  submit: (voteValue: VoteValue, proposalId: string | null) => Promise<void>;
+  transaction: VegaTxState;
 }
 
 export const VoteButtons = ({
@@ -159,13 +157,10 @@ export const VoteButtons = ({
   spamProtectionMinTokens,
   submit,
   transaction,
-  dialog: Dialog,
 }: VoteButtonsProps) => {
   const { t } = useTranslation();
   const { pubKey } = useVegaWallet();
-  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
+  const openVegaWalletDialog = useDialogStore((store) => store.open);
-    openVegaWalletDialog: store.openVegaWalletDialog,
-  }));
   const [changeVote, setChangeVote] = React.useState(false);
   const proposalVotable = useMemo(
     () =>
@@ -184,11 +179,7 @@ export const VoteButtons = ({
     if (!pubKey) {
       return (
         <div data-testid="connect-wallet">
-          <ButtonLink
+          <ButtonLink onClick={openVegaWalletDialog}>
-            onClick={() => {
-              openVegaWalletDialog();
-            }}
-          >
             {t('connectVegaWallet')}
           </ButtonLink>{' '}
           {t('toVote')}
@@ -301,11 +292,7 @@ export const VoteButtons = ({
           </p>
         )
       )}
-      <VoteTransactionDialog
+      <VoteTransactionDialog voteState={voteState} transaction={transaction} />
-        voteState={voteState}
-        transaction={transaction}
-        TransactionDialog={Dialog}
-      />
     </>
   );
 };

apps/governance/src/routes/proposals/components/vote-details/vote-transaction-dialog.tsx

@@ -1,11 +1,13 @@
 import { t } from '@vegaprotocol/i18n';
 import { VoteState } from './use-user-vote';
-import type { DialogProps, VegaTxState } from '@vegaprotocol/proposals';
+import {
+  VegaTransactionDialog,
+  type VegaTxState,
+} from '@vegaprotocol/proposals';
 
 interface VoteTransactionDialogProps {
   voteState: VoteState;
-  transaction: VegaTxState | null;
+  transaction: VegaTxState;
-  TransactionDialog: (props: DialogProps) => JSX.Element;
 }
 
 const dialogTitle = (voteState: VoteState): string | undefined => {
@@ -22,22 +24,23 @@ const dialogTitle = (voteState: VoteState): string | undefined => {
 export const VoteTransactionDialog = ({
   voteState,
   transaction,
-  TransactionDialog,
 }: VoteTransactionDialogProps) => {
   // Render a custom message if the voting fails otherwise
   // pass undefined so that the default vega transaction dialog UI gets used
   const customMessage =
     voteState === VoteState.Failed ? (
-      <p>{transaction?.error?.message || t('voteError')}</p>
+      <p>{transaction.error?.message || t('voteError')}</p>
     ) : undefined;
 
   return (
     <div data-testid="vote-transaction-dialog">
-      <TransactionDialog
+      <VegaTransactionDialog
         title={dialogTitle(voteState)}
+        transaction={transaction}
         content={{
           Complete: customMessage,
         }}
+        isOpen={transaction.dialogOpen}
       />
     </div>
   );

apps/governance/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx

@@ -1,13 +1,12 @@
 import { render, screen } from '@testing-library/react';
 import { ProposeFreeform } from './propose-freeform';
 import { MockedProvider } from '@apollo/client/testing';
-import { mockWalletContext } from '../../test-helpers/mocks';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { MemoryRouter as Router } from 'react-router-dom';
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import { MockedWalletProvider } from '@vegaprotocol/wallet-react/testing';
 
 jest.mock('@vegaprotocol/environment', () => ({
   ...jest.requireActual('@vegaprotocol/environment'),
@@ -72,18 +71,19 @@ const updateMarketNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {
   },
 };
 
-const renderComponent = () =>
+const renderComponent = () => {
-  render(
+  return render(
     <Router>
       <MockedProvider mocks={[updateMarketNetworkParamsQueryMock]}>
+        <MockedWalletProvider>
           <AppStateProvider>
-          <VegaWalletContext.Provider value={mockWalletContext}>
             <ProposeFreeform />
-          </VegaWalletContext.Provider>
           </AppStateProvider>
+        </MockedWalletProvider>
       </MockedProvider>
     </Router>
   );
+};
 
 // Note: form submission is tested in propose-raw.spec.tsx. Reusable form
 // components are tested in their own directory.

apps/governance/src/routes/proposals/propose/freeform/propose-freeform.tsx

@@ -51,7 +51,8 @@ export const ProposeFreeform = () => {
     watch,
     trigger,
   } = useForm<FreeformProposalFormFields>();
-  const { finalizedProposal, submit, Dialog } = useProposalSubmit();
+  const { finalizedProposal, transaction, submit, setTransaction } =
+    useProposalSubmit();
 
   const assembleProposal = (fields: FreeformProposalFormFields) => {
     const isVoteDeadlineAtMinimum =
@@ -169,7 +170,8 @@ export const ProposeFreeform = () => {
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}
-                TransactionDialog={Dialog}
+                transaction={transaction}
+                onChange={(open) => setTransaction({ dialogOpen: open })}
               />
             </form>
           </div>

apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx

@@ -1,13 +1,12 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import { ProposeNetworkParameter } from './propose-network-parameter';
 import { MockedProvider } from '@apollo/client/testing';
-import { mockWalletContext } from '../../test-helpers/mocks';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { MemoryRouter as Router } from 'react-router-dom';
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
+import { MockedWalletProvider } from '@vegaprotocol/wallet-react/testing';
 
 jest.mock('@vegaprotocol/environment', () => ({
   ...jest.requireActual('@vegaprotocol/environment'),
@@ -72,26 +71,27 @@ const updateMarketNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {
   },
 };
 
-const renderComponent = () =>
+const renderComponent = () => {
-  render(
+  return render(
     <Router>
       <MockedProvider mocks={[updateMarketNetworkParamsQueryMock]}>
+        <MockedWalletProvider>
           <AppStateProvider>
-          <VegaWalletContext.Provider value={mockWalletContext}>
             <ProposeNetworkParameter />
-          </VegaWalletContext.Provider>
           </AppStateProvider>
+        </MockedWalletProvider>
       </MockedProvider>
     </Router>
   );
+};
 
 // Note: form submission is tested in propose-raw.spec.tsx. Reusable form
 // components are tested in their own directory.
 
 describe('Propose Network Parameter', () => {
-  it('should render successfully', async () => {
+  it('should render successfully', () => {
     const { baseElement } = renderComponent();
-    await expect(baseElement).toBeTruthy();
+    expect(baseElement).toBeTruthy();
   });
 
   it('should render the correct title', async () => {

apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.tsx

@@ -91,7 +91,8 @@ export const ProposeNetworkParameter = () => {
     watch,
     trigger,
   } = useForm<NetworkParameterProposalFormFields>();
-  const { finalizedProposal, submit, Dialog } = useProposalSubmit();
+  const { finalizedProposal, transaction, submit, setTransaction } =
+    useProposalSubmit();
 
   const selectedParamEntry = params
     ? Object.entries(params).find(([key]) => key === selectedNetworkParam)
@@ -312,7 +313,8 @@ export const ProposeNetworkParameter = () => {
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}
-                TransactionDialog={Dialog}
+                transaction={transaction}
+                onChange={(open) => setTransaction({ dialogOpen: open })}
               />
             </form>
           </div>

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx

@@ -1,13 +1,12 @@
 import { MockedProvider } from '@apollo/client/testing';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
-import { mockWalletContext } from '../../test-helpers/mocks';
 import { ProposeNewAsset } from './propose-new-asset';
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import { MockedWalletProvider } from '@vegaprotocol/wallet-react/testing';
 
 jest.mock('@vegaprotocol/environment', () => ({
   ...jest.requireActual('@vegaprotocol/environment'),
@@ -72,26 +71,27 @@ const newAssetNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {
   },
 };
 
-const renderComponent = () =>
+const renderComponent = () => {
-  render(
+  return render(
     <Router>
       <MockedProvider mocks={[newAssetNetworkParamsQueryMock]}>
+        <MockedWalletProvider>
           <AppStateProvider>
-          <VegaWalletContext.Provider value={mockWalletContext}>
             <ProposeNewAsset />
-          </VegaWalletContext.Provider>
           </AppStateProvider>
+        </MockedWalletProvider>
       </MockedProvider>
     </Router>
   );
+};
 
 // Note: form submission is tested in propose-raw.spec.tsx. Reusable form
 // components are tested in their own directory.
 
 describe('Propose New Asset', () => {
-  it('should render successfully', async () => {
+  it('should render successfully', () => {
     const { baseElement } = renderComponent();
-    await expect(baseElement).toBeTruthy();
+    expect(baseElement).toBeTruthy();
   });
 
   it('should render the title', async () => {

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx

@@ -64,7 +64,8 @@ export const ProposeNewAsset = () => {
     watch,
     trigger,
   } = useForm<NewAssetProposalFormFields>();
-  const { finalizedProposal, submit, Dialog } = useProposalSubmit();
+  const { finalizedProposal, transaction, submit, setTransaction } =
+    useProposalSubmit();
 
   const assembleProposal = (fields: NewAssetProposalFormFields) => {
     const isVoteDeadlineAtMinimum = doesValueEquateToParam(
@@ -232,7 +233,8 @@ export const ProposeNewAsset = () => {
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}
-                TransactionDialog={Dialog}
+                transaction={transaction}
+                onChange={(open) => setTransaction({ dialogOpen: open })}
               />
             </form>
           </div>

apps/governance/src/routes/proposals/propose/new-market/propose-new-market.spec.tsx

@@ -1,13 +1,12 @@
 import { render, screen } from '@testing-library/react';
 import { ProposeNewMarket } from './propose-new-market';
 import { MockedProvider } from '@apollo/client/testing';
-import { mockWalletContext } from '../../test-helpers/mocks';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { BrowserRouter as Router } from 'react-router-dom';
 import type { MockedResponse } from '@apollo/client/testing';
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import { MockedWalletProvider } from '@vegaprotocol/wallet-react/testing';
 
 jest.mock('@vegaprotocol/environment', () => ({
   ...jest.requireActual('@vegaprotocol/environment'),
@@ -72,26 +71,27 @@ const newMarketNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {
   },
 };
 
-const renderComponent = () =>
+const renderComponent = () => {
-  render(
+  return render(
     <Router>
       <MockedProvider mocks={[newMarketNetworkParamsQueryMock]}>
+        <MockedWalletProvider>
           <AppStateProvider>
-          <VegaWalletContext.Provider value={mockWalletContext}>
             <ProposeNewMarket />
-          </VegaWalletContext.Provider>
           </AppStateProvider>
+        </MockedWalletProvider>
       </MockedProvider>
     </Router>
   );
+};
 
 // Note: form submission is tested in propose-raw.spec.tsx. Reusable form
 // components are tested in their own directory.
 
 describe('Propose New Market', () => {
-  it('should render successfully', async () => {
+  it('should render successfully', () => {
     const { baseElement } = renderComponent();
-    await expect(baseElement).toBeTruthy();
+    expect(baseElement).toBeTruthy();
   });
 
   it('should render the form components', async () => {

apps/governance/src/routes/proposals/propose/new-market/propose-new-market.tsx

@@ -62,7 +62,8 @@ export const ProposeNewMarket = () => {
     watch,
     trigger,
   } = useForm<NewMarketProposalFormFields>();
-  const { finalizedProposal, submit, Dialog } = useProposalSubmit();
+  const { finalizedProposal, transaction, submit, setTransaction } =
+    useProposalSubmit();
 
   const assembleProposal = (fields: NewMarketProposalFormFields) => {
     const isVoteDeadlineAtMinimum = doesValueEquateToParam(
@@ -214,7 +215,8 @@ export const ProposeNewMarket = () => {
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}
-                TransactionDialog={Dialog}
+                transaction={transaction}
+                onChange={(open) => setTransaction({ dialogOpen: open })}
               />
             </form>
           </div>

apps/governance/src/routes/proposals/propose/raw/proposal-raw.spec.tsx

@@ -3,8 +3,6 @@ import type { MockedResponse } from '@apollo/client/testing';
 import { addHours, getTime } from 'date-fns';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { MockedProvider } from '@apollo/client/testing';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import * as Schema from '@vegaprotocol/types';
 import { ProposeRaw } from './propose-raw';
 import { ProposalEventDocument } from '@vegaprotocol/proposals';
@@ -12,6 +10,11 @@ import type { ProposalEventSubscription } from '@vegaprotocol/proposals';
 
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import {
+  MockedWalletProvider,
+  mockConfig,
+} from '@vegaprotocol/wallet-react/testing';
+import { userRejectedError } from '@vegaprotocol/wallet';
 
 const paramsDelay = 20;
 
@@ -103,23 +106,15 @@ describe('Raw proposal form', () => {
     },
     delay: 300,
   };
-  const setup = (mockSendTx = jest.fn()) => {
+  const setup = () => {
     return render(
       <AppStateProvider>
         <MockedProvider
           mocks={[rawProposalNetworkParamsQueryMock, mockProposalEvent]}
         >
-          <VegaWalletContext.Provider
+          <MockedWalletProvider>
-            value={
-              {
-                pubKey,
-                sendTx: mockSendTx,
-                links: { explorer: 'explorer' },
-              } as unknown as VegaWalletContextShape
-            }
-          >
             <ProposeRaw />
-          </VegaWalletContext.Provider>
+          </MockedWalletProvider>
         </MockedProvider>
       </AppStateProvider>
     );
@@ -127,15 +122,22 @@ describe('Raw proposal form', () => {
 
   beforeAll(() => {
     jest.useFakeTimers();
+    mockConfig.store.setState({ status: 'connected', pubKey: '0x123' });
   });
 
   afterAll(() => {
     jest.useRealTimers();
+    mockConfig.reset();
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
   });
 
   it('handles validation', async () => {
-    const mockSendTx = jest.fn().mockReturnValue(Promise.resolve());
+    const mockSendTx = jest.spyOn(mockConfig, 'sendTransaction');
-    setup(mockSendTx);
+
+    setup();
 
     expect(await screen.findByTestId('proposal-submit')).toBeTruthy();
     await act(async () => {
@@ -162,7 +164,9 @@ describe('Raw proposal form', () => {
   });
 
   it('sends the transaction', async () => {
-    const mockSendTx = jest.fn().mockReturnValue(
+    const mockSendTx = jest
+      .spyOn(mockConfig, 'sendTransaction')
+      .mockReturnValue(
         new Promise((resolve) => {
           setTimeout(
             () =>
@@ -170,12 +174,15 @@ describe('Raw proposal form', () => {
                 transactionHash: 'tx-hash',
                 signature:
                   'cfe592d169f87d0671dd447751036d0dddc165b9c4b65e5a5060e2bbadd1aa726d4cbe9d3c3b327bcb0bff4f83999592619a2493f9bbd251fae99ce7ce766909',
+                sentAt: new Date().toISOString(),
+                receivedAt: new Date().toISOString(),
               }),
             100
           );
         })
       );
-    setup(mockSendTx);
+
+    setup();
 
     await act(async () => {
       jest.advanceTimersByTime(paramsDelay);
@@ -206,8 +213,12 @@ describe('Raw proposal form', () => {
       fireEvent.click(screen.getByTestId('proposal-submit'));
     });
 
-    expect(mockSendTx).toHaveBeenCalledWith(pubKey, {
+    expect(mockSendTx).toHaveBeenCalledWith({
+      publicKey: pubKey,
+      sendingMode: 'TYPE_SYNC',
+      transaction: {
         proposalSubmission: JSON.parse(inputJSON),
+      },
     });
 
     expect(screen.getByTestId('dialog-title')).toHaveTextContent(
@@ -232,12 +243,12 @@ describe('Raw proposal form', () => {
   });
 
   it('can be rejected by the user', async () => {
-    const mockSendTx = jest.fn().mockReturnValue(
+    jest.spyOn(mockConfig, 'sendTransaction').mockReturnValue(
-      new Promise((resolve) => {
+      new Promise((_, reject) => {
-        setTimeout(() => resolve(null), 100);
+        setTimeout(() => reject(userRejectedError()), 100);
       })
     );
-    setup(mockSendTx);
+    setup();
 
     await act(async () => {
       jest.advanceTimersByTime(paramsDelay);

apps/governance/src/routes/proposals/propose/raw/propose-raw.tsx

@@ -52,7 +52,8 @@ export const ProposeRaw = () => {
     handleSubmit,
     formState: { isSubmitting, errors },
   } = useForm<RawProposalFormFields>();
-  const { finalizedProposal, submit, Dialog } = useProposalSubmit();
+  const { finalizedProposal, transaction, submit, setTransaction } =
+    useProposalSubmit();
 
   const hasError = Boolean(errors.rawProposalData?.message);
 
@@ -152,7 +153,8 @@ export const ProposeRaw = () => {
               <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}
-                TransactionDialog={Dialog}
+                transaction={transaction}
+                onChange={(open) => setTransaction({ dialogOpen: open })}
               />
             </form>
           </div>

apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.spec.tsx

@@ -1,13 +1,12 @@
 import { MockedProvider } from '@apollo/client/testing';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
-import { mockWalletContext } from '../../test-helpers/mocks';
 import { ProposeUpdateAsset } from './propose-update-asset';
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import { MockedWalletProvider } from '@vegaprotocol/wallet-react/testing';
 
 jest.mock('@vegaprotocol/environment', () => ({
   ...jest.requireActual('@vegaprotocol/environment'),
@@ -72,26 +71,27 @@ const updateAssetNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {
   },
 };
 
-const renderComponent = () =>
+const renderComponent = () => {
-  render(
+  return render(
     <Router>
       <MockedProvider mocks={[updateAssetNetworkParamsQueryMock]}>
+        <MockedWalletProvider>
           <AppStateProvider>
-          <VegaWalletContext.Provider value={mockWalletContext}>
             <ProposeUpdateAsset />
-          </VegaWalletContext.Provider>
           </AppStateProvider>
+        </MockedWalletProvider>
       </MockedProvider>
     </Router>
   );
+};
 
 // Note: form submission is tested in propose-raw.spec.tsx. Reusable form
 // components are tested in their own directory.
 
 describe('Propose Update Asset', () => {
-  it('should render successfully', async () => {
+  it('should render successfully', () => {
     const { baseElement } = renderComponent();
-    await expect(baseElement).toBeTruthy();
+    expect(baseElement).toBeTruthy();
   });
 
   it('should render the title', async () => {

apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.tsx

@@ -62,7 +62,8 @@ export const ProposeUpdateAsset = () => {
     watch,
     trigger,
   } = useForm<UpdateAssetProposalFormFields>();
-  const { finalizedProposal, submit, Dialog } = useProposalSubmit();
+  const { finalizedProposal, transaction, submit, setTransaction } =
+    useProposalSubmit();
 
   const assembleProposal = (fields: UpdateAssetProposalFormFields) => {
     const isVoteDeadlineAtMinimum = doesValueEquateToParam(
@@ -218,7 +219,8 @@ export const ProposeUpdateAsset = () => {
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}
-                TransactionDialog={Dialog}
+                transaction={transaction}
+                onChange={(open) => setTransaction({ dialogOpen: open })}
               />
             </form>
           </div>

apps/governance/src/routes/proposals/propose/update-market/propose-update-market.spec.tsx

@@ -2,15 +2,14 @@ import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
-import { mockWalletContext } from '../../test-helpers/mocks';
 import { ProposeUpdateMarket } from './propose-update-market';
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 import type { ProposalMarketsQueryQuery } from './__generated__/UpdateMarket';
 import { ProposalMarketsQueryDocument } from './__generated__/UpdateMarket';
 import { ProposalState } from '@vegaprotocol/types';
+import { MockedWalletProvider } from '@vegaprotocol/wallet-react/testing';
 
 const updateMarketNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {
   request: {
@@ -217,29 +216,30 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
   },
 };
 
-const renderComponent = () =>
+const renderComponent = () => {
-  render(
+  return render(
     <MockedProvider
       mocks={[updateMarketNetworkParamsQueryMock, marketQueryMock]}
       addTypename={false}
     >
       <Router>
+        <MockedWalletProvider>
           <AppStateProvider>
-          <VegaWalletContext.Provider value={mockWalletContext}>
             <ProposeUpdateMarket />
-          </VegaWalletContext.Provider>
           </AppStateProvider>
+        </MockedWalletProvider>
       </Router>
     </MockedProvider>
   );
+};
 
 // Note: form submission is tested in propose-raw.spec.tsx. Reusable form
 // components are tested in their own directory.
 
 describe('Propose Update Market', () => {
-  it('should render successfully', async () => {
+  it('should render successfully', () => {
     const { baseElement } = renderComponent();
-    await expect(baseElement).toBeTruthy();
+    expect(baseElement).toBeTruthy();
   });
 
   it('should render the title', async () => {

apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx

@@ -109,7 +109,8 @@ export const ProposeUpdateMarket = () => {
     watch,
     trigger,
   } = useForm<UpdateMarketProposalFormFields>();
-  const { finalizedProposal, submit, Dialog } = useProposalSubmit();
+  const { finalizedProposal, transaction, submit, setTransaction } =
+    useProposalSubmit();
 
   const assembleProposal = (fields: UpdateMarketProposalFormFields) => {
     const isVoteDeadlineAtMinimum = doesValueEquateToParam(
@@ -323,7 +324,8 @@ export const ProposeUpdateMarket = () => {
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}
-                TransactionDialog={Dialog}
+                transaction={transaction}
+                onChange={(open) => setTransaction({ dialogOpen: open })}
               />
             </form>
           </div>

apps/governance/src/routes/proposals/test-helpers/mocks.ts

@@ -1,28 +1,17 @@
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import type { PubKey, VegaWalletContextShape } from '@vegaprotocol/wallet';
 import type { VoteValue } from '@vegaprotocol/types';
 import type { UserVoteQuery } from '../components/vote-details/__generated__/Vote';
 import { UserVoteDocument } from '../components/vote-details/__generated__/Vote';
 import faker from 'faker';
+import { type Key } from '@vegaprotocol/wallet';
 
-export const mockPubkey: PubKey = {
+export const mockPubkey: Key = {
   publicKey: '0x123',
   name: 'test key 1',
 };
 
-export const mockWalletContext = {
-  pubKey: mockPubkey.publicKey,
-  pubKeys: [mockPubkey],
-  isReadOnly: false,
-  sendTx: jest.fn().mockReturnValue(Promise.resolve(null)),
-  connect: jest.fn(),
-  disconnect: jest.fn(),
-  selectPubKey: jest.fn(),
-  connector: null,
-} as unknown as VegaWalletContextShape;
-
 const mockEthereumConfig = {
   network_id: '3',
   chain_id: '3',

apps/governance/src/routes/rewards/connect-to-see-rewards.tsx

@@ -1,13 +1,11 @@
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
-import { useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useDialogStore } from '@vegaprotocol/wallet-react';
 import { Button } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../components/heading';
 
 export const ConnectToSeeRewards = () => {
-  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
+  const openVegaWalletDialog = useDialogStore((store) => store.open);
-    openVegaWalletDialog: store.openVegaWalletDialog,
-  }));
   const { t } = useTranslation();
 
   const classes = classNames(

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx

@@ -4,7 +4,7 @@ import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import type { EpochFieldsFragment } from '../home/__generated__/Rewards';
 import { useRewardsQuery } from '../home/__generated__/Rewards';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { EpochIndividualRewardsTable } from './epoch-individual-rewards-table';
 import { generateEpochIndividualRewardsList } from './generate-epoch-individual-rewards-list';
 import { calculateEpochOffset } from '../../../lib/epoch-pagination';

apps/governance/src/routes/rewards/home/rewards-page.tsx

@@ -10,7 +10,7 @@ import {
   Toggle,
   ExternalLink,
 } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import {
   useNetworkParams,
   NetworkParams,

apps/governance/src/routes/staking/associate/components/staking-wallets-container/staking-wallets-container.spec.tsx

@@ -33,8 +33,8 @@ let mockVegaWalletHookValue: {
   pubKey: null,
 };
 
-jest.mock('@vegaprotocol/wallet', () => ({
+jest.mock('@vegaprotocol/wallet-react', () => ({
-  ...jest.requireActual('@vegaprotocol/wallet'),
+  ...jest.requireActual('@vegaprotocol/wallet-react'),
   useVegaWallet: jest.fn(() => mockVegaWalletHookValue),
 }));
 

apps/governance/src/routes/staking/associate/components/staking-wallets-container/staking-wallets-container.tsx

@@ -2,7 +2,7 @@ import { useWeb3React } from '@web3-react/core';
 import { useTranslation } from 'react-i18next';
 
 import { EthConnectPrompt } from '../../../../../components/eth-connect-prompt';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { ConnectToVega } from '../../../../../components/connect-to-vega';
 
 export const StakingWalletsContainer = ({

apps/governance/src/routes/staking/disassociate/index.spec.tsx

@@ -33,8 +33,8 @@ let mockVegaWalletHookValue: {
   pubKey: null,
 };
 
-jest.mock('@vegaprotocol/wallet', () => ({
+jest.mock('@vegaprotocol/wallet-react', () => ({
-  ...jest.requireActual('@vegaprotocol/wallet'),
+  ...jest.requireActual('@vegaprotocol/wallet-react'),
   useVegaWallet: jest.fn(() => mockVegaWalletHookValue),
 }));
 

apps/governance/src/routes/staking/disassociate/index.tsx

@@ -1,4 +1,4 @@
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useWeb3React } from '@web3-react/core';
 import { EthConnectPrompt } from '../../../components/eth-connect-prompt';
 import { DisassociatePage } from './components/disassociate-page';

apps/governance/src/routes/staking/home/epoch-data.tsx

@@ -5,7 +5,7 @@ import { useStakingQuery } from '../__generated__/Staking';
 import { usePreviousEpochQuery } from '../__generated__/PreviousEpoch';
 import { ValidatorTables } from './validator-tables';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { getMultisigStatusInfo } from '../../../lib/get-multisig-status-info';
 import { MultisigIncorrectNotice } from '../../../components/multisig-incorrect-notice';
 

apps/governance/src/routes/staking/node/node.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import {
   addDecimal,
   removePaginationWrapper,

apps/governance/src/routes/staking/node/nodes-container.tsx

@@ -1,5 +1,5 @@
 import { Callout, Intent, Splash } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useTranslation } from 'react-i18next';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { SplashLoader } from '../../../components/splash-loader';

apps/governance/src/routes/staking/node/pending-stake.tsx

@@ -1,78 +0,0 @@
-import React from 'react';
-import * as Sentry from '@sentry/react';
-import { Button, Callout, Intent, Loader } from '@vegaprotocol/ui-toolkit';
-import { useTranslation } from 'react-i18next';
-import { useAppState } from '../../../contexts/app-state/app-state-context';
-import type { BigNumber } from '../../../lib/bignumber';
-import type { UndelegateSubmissionBody } from '@vegaprotocol/wallet';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { removeDecimal } from '@vegaprotocol/utils';
-
-interface PendingStakeProps {
-  pendingAmount: BigNumber;
-  nodeId: string;
-  pubKey: string;
-}
-
-enum FormState {
-  Default,
-  Pending,
-  Success,
-  Failure,
-}
-
-export const PendingStake = ({
-  pendingAmount,
-  nodeId,
-  pubKey,
-}: PendingStakeProps) => {
-  const { t } = useTranslation();
-  const { sendTx } = useVegaWallet();
-  const { appState } = useAppState();
-  const [formState, setFormState] = React.useState(FormState.Default);
-
-  const removeStakeNow = async () => {
-    setFormState(FormState.Pending);
-    try {
-      const command: UndelegateSubmissionBody = {
-        undelegateSubmission: {
-          nodeId,
-          amount: removeDecimal(pendingAmount.toString(), appState.decimals),
-          method: 'METHOD_NOW',
-        },
-      };
-      await sendTx(pubKey, command);
-    } catch (err) {
-      setFormState(FormState.Failure);
-      Sentry.captureException(err);
-    }
-  };
-
-  if (formState === FormState.Failure) {
-    return (
-      <Callout
-        intent={Intent.Danger}
-        title={t('failedToRemovePendingStake', { pendingAmount })}
-      >
-        <p>{t('pleaseTryAgain')}</p>
-      </Callout>
-    );
-  } else if (formState === FormState.Pending) {
-    return (
-      <Callout
-        icon={<Loader size="small" />}
-        title={t('removingPendingStake', { pendingAmount })}
-      />
-    );
-  }
-
-  return (
-    <div className="py-4">
-      <h2>{t('pendingNomination')}</h2>
-      <p>{t('pendingNominationNextEpoch', { pendingAmount })}</p>
-      <Button onClick={() => removeStakeNow()}>
-        {t('cancelPendingEpochNomination')}
-      </Button>
-    </div>
-  );
-};

apps/governance/src/routes/staking/node/staking-form.tsx

@@ -27,11 +27,11 @@ import {
   NetworkParams,
 } from '@vegaprotocol/network-parameters';
 import { useBalances } from '../../../lib/balances/balances-store';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { SubHeading } from '../../../components/heading';
-import type {
+import {
-  DelegateSubmissionBody,
+  type DelegateSubmissionBody,
-  UndelegateSubmissionBody,
+  type UndelegateSubmissionBody,
 } from '@vegaprotocol/wallet';
 import Routes from '../../routes';
 

apps/governance/src/routes/withdrawals/index.tsx

@@ -9,7 +9,7 @@ import {
   useWithdrawalDialog,
   WithdrawalsTable,
 } from '@vegaprotocol/withdraws';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import type { RouteChildProps } from '../index';

apps/governance/src/toasts-manager.tsx

@@ -6,7 +6,7 @@ import {
   VegaIconNames,
   useToasts,
 } from '@vegaprotocol/ui-toolkit';
-import { useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useDialogStore } from '@vegaprotocol/wallet-react';
 import {
   useEthereumTransactionToasts,
   useEthereumWithdrawApprovalsToasts,
@@ -19,9 +19,7 @@ import { useTranslation } from 'react-i18next';
 const WalletDisconnectAdditionalContent = () => {
   const { t } = useTranslation();
   const { hideToast } = useWalletDisconnectToastActions();
-  const openVegaWalletDialog = useVegaWalletDialogStore(
+  const openVegaWalletDialog = useDialogStore((store) => store.open);
-    (store) => store.openVegaWalletDialog
-  );
   return (
     <p className="mt-2">
       <TradingButton

apps/trading/client-pages/competitions/competitions-create-team.tsx

@@ -5,7 +5,7 @@ import {
   VegaIcon,
   VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useVegaWallet, useDialogStore } from '@vegaprotocol/wallet-react';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { useT } from '../../lib/use-t';
 import { useReferralSetTransaction } from '../../lib/hooks/use-referral-set-transaction';
@@ -26,9 +26,7 @@ export const CompetitionsCreateTeam = () => {
   usePageTitle(t('Create a team'));
 
   const { isReadOnly, pubKey } = useVegaWallet();
-  const openWalletDialog = useVegaWalletDialogStore(
+  const openWalletDialog = useDialogStore((store) => store.open);
-    (store) => store.openVegaWalletDialog
-  );
 
   return (
     <ErrorBoundary feature="create-team">

apps/trading/client-pages/competitions/competitions-team.tsx

@@ -31,7 +31,7 @@ import { TeamStats } from '../../components/competitions/team-stats';
 import { usePageTitle } from '../../lib/hooks/use-page-title';
 import { ErrorBoundary } from '../../components/error-boundary';
 import { LayoutWithGradient } from '../../components/layouts-inner';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { JoinTeam } from './join-team';
 import { UpdateTeamButton } from './update-team-button';
 import {

apps/trading/client-pages/competitions/competitions-update-team.tsx

@@ -2,7 +2,7 @@ import { ErrorBoundary } from '../../components/error-boundary';
 import { usePageTitle } from '../../lib/hooks/use-page-title';
 import { Box } from '../../components/competitions/box';
 import { useT } from '../../lib/use-t';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useVegaWallet, useDialogStore } from '@vegaprotocol/wallet-react';
 import {
   Intent,
   Loader,
@@ -24,9 +24,7 @@ export const CompetitionsUpdateTeam = () => {
   const t = useT();
   usePageTitle([t('Competitions'), t('Update a team')]);
   const { pubKey, isReadOnly } = useVegaWallet();
-  const openWalletDialog = useVegaWalletDialogStore(
+  const openWalletDialog = useDialogStore((store) => store.open);
-    (store) => store.openVegaWalletDialog
-  );
   const { teamId } = useParams<{ teamId: string }>();
   if (!teamId) {
     return <Navigate to={Links.COMPETITIONS()} />;

apps/trading/client-pages/competitions/join-team.spec.tsx

@@ -29,7 +29,7 @@ describe('JoinButton', () => {
   });
 
   it('disables button if not connected', async () => {
-    render(<JoinButton {...props} pubKey={null} />);
+    render(<JoinButton {...props} pubKey={undefined} />);
     const button = screen.getByRole('button');
     expect(button).toBeDisabled();
     await userEvent.hover(button);

apps/trading/client-pages/competitions/join-team.tsx

@@ -6,7 +6,10 @@ import {
   VegaIcon,
   VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
-import { useSimpleTransaction, useVegaWallet } from '@vegaprotocol/wallet';
+import {
+  useSimpleTransaction,
+  useVegaWallet,
+} from '@vegaprotocol/wallet-react';
 import { useT } from '../../lib/use-t';
 import { type Team } from '../../lib/hooks/use-team';
 import { useState } from 'react';
@@ -59,7 +62,7 @@ export const JoinButton = ({
   partyTeam,
   onJoin,
 }: {
-  pubKey: string | null;
+  pubKey: string | undefined;
   isReadOnly: boolean;
   team: Team;
   partyTeam?: Team;

apps/trading/client-pages/competitions/team-form.tsx

@@ -14,11 +14,11 @@ import { URL_REGEX, isValidVegaPublicKey } from '@vegaprotocol/utils';
 import { type useReferralSetTransaction } from '../../lib/hooks/use-referral-set-transaction';
 import { useT } from '../../lib/use-t';
 import { useForm, Controller } from 'react-hook-form';
-import type {
+import {
-  CreateReferralSet,
+  type CreateReferralSet,
-  UpdateReferralSet,
+  type UpdateReferralSet,
-  Status,
 } from '@vegaprotocol/wallet';
+import { type Status } from '@vegaprotocol/wallet-react';
 import classNames from 'classnames';
 import { useLayoutEffect, useState } from 'react';
 

apps/trading/client-pages/competitions/update-team-button.tsx

@@ -1,6 +1,6 @@
 import { type Team } from '../../lib/hooks/use-team';
 import { type ComponentProps } from 'react';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { Intent, TradingAnchorButton } from '@vegaprotocol/ui-toolkit';
 import { Links } from '../../lib/links';
 import { useT } from '../../lib/use-t';

apps/trading/client-pages/deposit/deposit-get-started.tsx

@@ -1,12 +1,12 @@
+import classNames from 'classnames';
 import { Intent, TradingAnchorButton } from '@vegaprotocol/ui-toolkit';
 import { GetStartedCheckList } from '../../components/welcome-dialog';
+import { useOnboardingStore } from '../../stores/onboarding';
 import {
   useGetOnboardingStep,
-  useOnboardingStore,
   OnboardingStep,
-} from '../../components/welcome-dialog/use-get-onboarding-step';
+} from '../../lib/hooks/use-get-onboarding-step';
 import { Links } from '../../lib/links';
-import classNames from 'classnames';
 import { useT } from '../../lib/use-t';
 
 export const DepositGetStarted = () => {

apps/trading/client-pages/liquidity/liquidity.tsx

@@ -1,7 +1,7 @@
 import { matchFilter, lpAggregatedDataProvider } from '@vegaprotocol/liquidity';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { Tab, Tabs } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
 import { LiquidityContainer } from '../../components/liquidity-container';

apps/trading/client-pages/markets/closed.spec.tsx

@@ -1,5 +1,4 @@
 import { act, render, screen, waitFor, within } from '@testing-library/react';
-// import userEvent from '@testing-library/user-event';
 import { MemoryRouter } from 'react-router-dom';
 import { Closed } from './closed';
 import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
@@ -18,8 +17,6 @@ import {
   MarketsDocument,
   getAsset,
 } from '@vegaprotocol/markets';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import {
   createMarketFragment,
@@ -37,7 +34,6 @@ describe('Closed', () => {
     3
   ).toISOString();
   const settlementDateTag = `settlement-expiry-date:${settlementDateMetaDate}`;
-  const pubKey = 'pubKey';
   const marketId = 'market-0';
   const settlementDataProperty = 'spec-binding';
   const settlementDataId = 'settlement-data-oracle-id';
@@ -175,11 +171,7 @@ describe('Closed', () => {
       render(
         <MemoryRouter>
           <MockedProvider mocks={mocks}>
-            <VegaWalletContext.Provider
-              value={{ pubKey } as VegaWalletContextShape}
-            >
             <Closed />
-            </VegaWalletContext.Provider>
           </MockedProvider>
         </MemoryRouter>
       );

apps/trading/client-pages/markets/mobile-buttons.tsx

@@ -14,7 +14,7 @@ import { useT } from '../../lib/use-t';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { useEffect } from 'react';
 import classNames from 'classnames';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useVegaWallet, useDialogStore } from '@vegaprotocol/wallet-react';
 
 const ViewInitializer = () => {
   const currentRouteId = useGetCurrentRouteId();
@@ -34,9 +34,7 @@ export const MarketsMobileSidebar = () => {
   const t = useT();
   const currentRouteId = useGetCurrentRouteId();
   const { pubKeys, isReadOnly } = useVegaWallet();
-  const openVegaWalletDialog = useVegaWalletDialogStore(
+  const openVegaWalletDialog = useDialogStore((store) => store.open);
-    (store) => store.openVegaWalletDialog
-  );
 
   return (
     <Routes>

apps/trading/client-pages/markets/open-markets.spec.tsx

@@ -15,8 +15,6 @@ import {
   MarketsDocument,
   MarketsCandlesDocument,
 } from '@vegaprotocol/markets';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import {
   marketsQuery,
   marketsDataQuery,
@@ -27,7 +25,6 @@ import userEvent from '@testing-library/user-event';
 describe('Open', () => {
   let originalNow: typeof Date.now;
   const mockNowTimestamp = 1672531200000;
-  const pubKey = 'pubKey';
 
   const marketsQueryData = marketsQuery();
   const marketsMock: MockedResponse<MarketsQuery> = {
@@ -79,12 +76,8 @@ describe('Open', () => {
         <MemoryRouter>
           <MockedProvider
             mocks={[marketsMock, marketsCandlesMock, marketsDataMock]}
-          >
-            <VegaWalletContext.Provider
-              value={{ pubKey } as VegaWalletContextShape}
           >
             <OpenMarkets />
-            </VegaWalletContext.Provider>
           </MockedProvider>
         </MemoryRouter>
       );

apps/trading/client-pages/referrals/apply-code-form.tsx

@@ -14,8 +14,8 @@ import { RainbowButton } from '../../components/rainbow-button';
 import {
   useSimpleTransaction,
   useVegaWallet,
-  useVegaWalletDialogStore,
+  useDialogStore,
-} from '@vegaprotocol/wallet';
+} from '@vegaprotocol/wallet-react';
 import { useIsInReferralSet, useReferral } from './hooks/use-referral';
 import { Routes } from '../../lib/links';
 import { Statistics, useStats } from './referral-statistics';
@@ -83,9 +83,7 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
   const t = useT();
   const program = useReferralProgram();
   const navigate = useNavigate();
-  const openWalletDialog = useVegaWalletDialogStore(
+  const openWalletDialog = useDialogStore((store) => store.open);
-    (store) => store.openVegaWalletDialog
-  );
 
   const { isReadOnly, pubKey } = useVegaWallet();
   const { isEligible, requiredFunds } = useFundsAvailable();

apps/trading/client-pages/referrals/create-code-form.tsx

@@ -1,4 +1,4 @@
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useVegaWallet, useDialogStore } from '@vegaprotocol/wallet-react';
 import { RainbowButton } from '../../components/rainbow-button';
 import { useState } from 'react';
 import {
@@ -28,9 +28,7 @@ export const CreateCodeContainer = () => {
   const t = useT();
   const { pubKey, isReadOnly } = useVegaWallet();
   const isInReferralSet = useIsInReferralSet(pubKey);
-  const openWalletDialog = useVegaWalletDialogStore(
+  const openWalletDialog = useDialogStore((store) => store.open);
-    (store) => store.openVegaWalletDialog
-  );
 
   // Navigate to the index page when already in the referral set.
   if (isInReferralSet) {

apps/trading/client-pages/referrals/hooks/use-funds-available.ts

@@ -1,4 +1,4 @@
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useFundsAvailableQuery } from './__generated__/FundsAvailable';
 import compact from 'lodash/compact';
 import BigNumber from 'bignumber.js';

apps/trading/client-pages/referrals/hooks/use-referral-toasts.tsx

@@ -6,7 +6,7 @@ import {
   Button,
 } from '@vegaprotocol/ui-toolkit';
 import { useReferral } from './use-referral';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useEffect } from 'react';
 import { useT } from '../../../lib/use-t';
 import { matchPath, useLocation, useNavigate } from 'react-router-dom';

apps/trading/client-pages/referrals/hooks/use-referral.ts

@@ -15,7 +15,7 @@ export const DEFAULT_AGGREGATION_DAYS = 30;
 export type Role = 'referrer' | 'referee';
 type UseReferralArgs = (
   | { code: string | undefined }
-  | { pubKey: string | null; role: Role }
+  | { pubKey: string | undefined; role: Role }
 ) & {
   aggregationEpochs?: number;
 };
@@ -188,7 +188,7 @@ const retrieveReferralSetData = (data: ReferralSetsQuery | undefined) =>
     ? data.referralSets.edges[0]?.node
     : undefined;
 
-export const useIsInReferralSet = (pubKey: string | null) => {
+export const useIsInReferralSet = (pubKey: string | undefined) => {
   const [asRefereeVariables, asRefereeSkip] = prepareVariables({
     pubKey,
     role: 'referee',

apps/trading/client-pages/referrals/referral-statistics.spec.tsx

@@ -1,9 +1,5 @@
 import { MockedProvider, type MockedResponse } from '@apollo/react-testing';
 import { render, screen, waitFor } from '@testing-library/react';
-import {
-  VegaWalletContext,
-  type VegaWalletContextShape,
-} from '@vegaprotocol/wallet';
 import { ReferralStatistics } from './referral-statistics';
 import {
   ReferralProgramDocument,
@@ -25,9 +21,22 @@ import {
   type RefereesQuery,
 } from './hooks/__generated__/Referees';
 import { MemoryRouter } from 'react-router-dom';
+import {
+  mockConfig,
+  MockedWalletProvider,
+} from '@vegaprotocol/wallet-react/testing';
 
-const MOCK_PUBKEY =
+const mockKeys = [
-  '1234567890123456789012345678901234567890123456789012345678901234';
+  {
+    name: 'Key 1',
+    publicKey: '1'.repeat(64),
+  },
+  {
+    name: 'Key 2',
+    publicKey: '2'.repeat(64),
+  },
+];
+const MOCK_PUBKEY = mockKeys[0].publicKey;
 
 const MOCK_STAKE_AVAILABLE: StakeAvailableQuery = {
   networkParameter: {
@@ -301,23 +310,29 @@ const refereesMock30: MockedResponse<RefereesQuery, RefereesQueryVariables> = {
 
 describe('ReferralStatistics', () => {
   const renderComponent = (mocks: MockedResponse[]) => {
-    const walletContext = {
-      pubKey: MOCK_PUBKEY,
-      isReadOnly: false,
-      sendTx: jest.fn(),
-    } as unknown as VegaWalletContextShape;
-
     return render(
       <MemoryRouter>
-        <VegaWalletContext.Provider value={walletContext}>
         <MockedProvider mocks={mocks} showWarnings={false}>
+          <MockedWalletProvider>
             <ReferralStatistics />
+          </MockedWalletProvider>
         </MockedProvider>
-        </VegaWalletContext.Provider>
       </MemoryRouter>
     );
   };
 
+  beforeAll(() => {
+    mockConfig.store.setState({
+      status: 'connected',
+      keys: mockKeys,
+      pubKey: mockKeys[0].publicKey,
+    });
+  });
+
+  afterAll(() => {
+    mockConfig.reset();
+  });
+
   it('displays apply code when no data has been found for given pubkey', () => {
     renderComponent([]);
     expect(

apps/trading/client-pages/referrals/referral-statistics.tsx

@@ -11,7 +11,7 @@ import {
   truncateMiddle,
   TextChildrenTooltip as Tooltip,
 } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import {
   addDecimalsFormatNumber,
   formatNumber,

apps/trading/client-pages/referrals/referrals.tsx

@@ -9,7 +9,7 @@ import { TiersContainer } from './tiers';
 import { TabLink } from './buttons';
 import { Outlet, useMatch } from 'react-router-dom';
 import { Routes } from '../../lib/links';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useReferral } from './hooks/use-referral';
 import { REFERRAL_DOCS_LINK } from './constants';
 import classNames from 'classnames';

apps/trading/components/accounts-container/accounts-container.tsx

@@ -1,7 +1,7 @@
 import { useCallback } from 'react';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
 import { AccountManager } from '@vegaprotocol/accounts';
 import { create } from 'zustand';

apps/trading/components/bootstrapper/bootstrapper.tsx

@@ -2,42 +2,24 @@ import type { InMemoryCacheConfig } from '@apollo/client';
 import {
   AppFailure,
   AppLoader,
-  DocsLinks,
   NetworkLoader,
   NodeFailure,
   NodeGuard,
   useEnvironment,
 } from '@vegaprotocol/environment';
-import { VegaWalletProvider } from '@vegaprotocol/wallet';
+import { type ReactNode } from 'react';
-import type { ReactNode } from 'react';
 import { Web3Provider } from './web3-provider';
 import { useT } from '../../lib/use-t';
 import { DataLoader } from './data-loader';
-import { useChainId } from '@vegaprotocol/wallet';
+import { WalletProvider } from '@vegaprotocol/wallet-react';
+import { useVegaWalletConfig } from '../../lib/hooks/use-vega-wallet-config';
 
 export const Bootstrapper = ({ children }: { children: ReactNode }) => {
   const t = useT();
-  const {
+  const { error, VEGA_URL } = useEnvironment();
-    error,
+  const config = useVegaWalletConfig();
-    VEGA_URL,
-    VEGA_ENV,
-    VEGA_WALLET_URL,
-    VEGA_EXPLORER_URL,
-    MOZILLA_EXTENSION_URL,
-    CHROME_EXTENSION_URL,
-  } = useEnvironment();
 
-  const chainId = useChainId(VEGA_URL);
+  if (!config) {
-
-  if (
-    !VEGA_URL ||
-    !VEGA_WALLET_URL ||
-    !VEGA_EXPLORER_URL ||
-    !CHROME_EXTENSION_URL ||
-    !MOZILLA_EXTENSION_URL ||
-    !DocsLinks ||
-    !chainId
-  ) {
     return <AppLoader />;
   }
 
@@ -72,22 +54,7 @@ export const Bootstrapper = ({ children }: { children: ReactNode }) => {
               <AppFailure title={t('Could not configure web3 provider')} />
             }
           >
-            <VegaWalletProvider
+            <WalletProvider config={config}>{children}</WalletProvider>
-              config={{
-                network: VEGA_ENV,
-                vegaUrl: VEGA_URL,
-                chainId,
-                vegaWalletServiceUrl: VEGA_WALLET_URL,
-                links: {
-                  explorer: VEGA_EXPLORER_URL,
-                  concepts: DocsLinks.VEGA_WALLET_CONCEPTS_URL,
-                  chromeExtensionUrl: CHROME_EXTENSION_URL,
-                  mozillaExtensionUrl: MOZILLA_EXTENSION_URL,
-                },
-              }}
-            >
-              {children}
-            </VegaWalletProvider>
           </Web3Provider>
         </DataLoader>
       </NodeGuard>

apps/trading/components/deposits-container/deposits-container.tsx

@@ -2,7 +2,7 @@ import { Splash } from '@vegaprotocol/ui-toolkit';
 import { DepositsTable } from '@vegaprotocol/deposits';
 import { depositsProvider } from '@vegaprotocol/deposits';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useT } from '../../lib/use-t';
 
 export const DepositsContainer = () => {

apps/trading/components/fees-container/fees-container.tsx

@@ -1,6 +1,6 @@
 import maxBy from 'lodash/maxBy';
 import minBy from 'lodash/minBy';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import {
   useNetworkParams,
   NetworkParams,

apps/trading/components/fills-container/fills-container.tsx

@@ -1,4 +1,4 @@
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { FillsManager } from '@vegaprotocol/fills';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';

apps/trading/components/funding-payments-container/funding-payments-container.tsx

@@ -1,4 +1,4 @@
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { FundingPaymentsManager } from '@vegaprotocol/funding-payments';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';

apps/trading/components/ledger-container/ledger-container.tsx

@@ -1,6 +1,6 @@
 import { LedgerExportForm } from '@vegaprotocol/ledger';
 import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useEnvironment } from '@vegaprotocol/environment';
 import type { PartyAssetFieldsFragment } from '@vegaprotocol/assets';
 import { usePartyAssetsQuery } from '@vegaprotocol/assets';

apps/trading/components/navbar/navbar.spec.tsx

@@ -1,47 +1,38 @@
-import { render, screen, within } from '@testing-library/react';
+import { act, render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { MemoryRouter } from 'react-router-dom';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { Navbar } from './navbar';
 import { useGlobalStore } from '../../stores';
 import { ENV, useFeatureFlags } from '@vegaprotocol/environment';
+import {
+  mockConfig,
+  MockedWalletProvider,
+} from '@vegaprotocol/wallet-react/testing';
 
 jest.mock('@vegaprotocol/proposals', () => ({
   ProtocolUpgradeCountdown: () => null,
 }));
 
 describe('Navbar', () => {
-  const pubKey = '000';
+  const mockKeys = [
-  const pubKeys = [
     {
-      publicKey: pubKey,
+      name: 'Key 1',
-      name: 'Pub key 0',
+      publicKey: '1'.repeat(64),
     },
     {
-      publicKey: '111',
+      name: 'Key 2',
-      name: 'Pub key 1',
+      publicKey: '2'.repeat(64),
     },
   ];
   const marketId = 'abc';
   const navbarContent = 'navbar-menu-content';
 
-  const renderComponent = (
+  const renderComponent = (initialEntries?: string[]) => {
-    initialEntries?: string[],
-    walletContext?: Partial<VegaWalletContextShape>
-  ) => {
-    const context = {
-      pubKey,
-      pubKeys,
-      selectPubKey: jest.fn(),
-      disconnect: jest.fn(),
-      ...walletContext,
-    } as VegaWalletContextShape;
     return render(
       <MemoryRouter initialEntries={initialEntries}>
-        <VegaWalletContext.Provider value={context}>
+        <MockedWalletProvider>
           <Navbar />
-        </VegaWalletContext.Provider>
+        </MockedWalletProvider>
       </MemoryRouter>
     );
   };
@@ -57,6 +48,12 @@ describe('Navbar', () => {
     jest.clearAllMocks();
   });
 
+  afterEach(() => {
+    act(() => {
+      mockConfig.reset();
+    });
+  });
+
   it('should be properly rendered', () => {
     renderComponent();
 
@@ -125,26 +122,38 @@ describe('Navbar', () => {
   });
 
   it('can open wallet menu on small screens and change pubkey', async () => {
-    const mockSelectPubKey = jest.fn();
+    mockConfig.store.setState({
-    renderComponent(undefined, { selectPubKey: mockSelectPubKey });
+      status: 'connected',
+      keys: mockKeys,
+      pubKey: mockKeys[0].publicKey,
+    });
+    const mockSelectPubKey = jest.spyOn(mockConfig.store, 'setState');
+    renderComponent(undefined);
     await userEvent.click(screen.getByRole('button', { name: 'Wallet' }));
 
     const menuEl = screen.getByTestId(navbarContent);
     expect(menuEl).toBeInTheDocument();
     const menu = within(menuEl);
 
-    expect(menu.getAllByTestId(/key-\d+-mobile/)).toHaveLength(pubKeys.length);
+    expect(menu.getAllByTestId(/key-\d+-mobile/)).toHaveLength(mockKeys.length);
 
-    const activeKey = within(menu.getByTestId('key-000-mobile'));
+    const activeKey = within(menu.getByTestId(/key-1+-mobile/));
-    expect(activeKey.getByText(pubKeys[0].name)).toBeInTheDocument();
+    expect(activeKey.getByText(mockKeys[0].name)).toBeInTheDocument();
     expect(activeKey.getByTestId('icon-tick')).toBeInTheDocument();
 
-    const inactiveKey = within(menu.getByTestId('key-111-mobile'));
+    const inactiveKey = within(menu.getByTestId(/key-2+-mobile/));
-    await userEvent.click(inactiveKey.getByText(pubKeys[1].name));
+    await userEvent.click(inactiveKey.getByText(mockKeys[1].name));
-    expect(mockSelectPubKey).toHaveBeenCalledWith(pubKeys[1].publicKey);
+    expect(mockSelectPubKey).toHaveBeenCalledWith({
+      pubKey: mockKeys[1].publicKey,
+    });
   });
 
   it('can transfer and close menu', async () => {
+    mockConfig.store.setState({
+      status: 'connected',
+      keys: mockKeys,
+      pubKey: mockKeys[0].publicKey,
+    });
     renderComponent();
     await userEvent.click(screen.getByRole('button', { name: 'Wallet' }));
 
@@ -158,8 +167,13 @@ describe('Navbar', () => {
   });
 
   it('can disconnect and close menu', async () => {
-    const mockDisconnect = jest.fn();
+    mockConfig.store.setState({
-    renderComponent(undefined, { disconnect: mockDisconnect });
+      status: 'connected',
+      keys: mockKeys,
+      pubKey: mockKeys[0].publicKey,
+    });
+    const mockDisconnect = jest.spyOn(mockConfig, 'disconnect');
+    renderComponent(undefined);
     await userEvent.click(screen.getByRole('button', { name: 'Wallet' }));
 
     const menuEl = screen.getByTestId(navbarContent);

apps/trading/components/navbar/navbar.tsx

@@ -25,7 +25,7 @@ import { NavLink } from 'react-router-dom';
 import { Links } from '../../lib/links';
 import classNames from 'classnames';
 import { VegaWalletMenu } from '../vega-wallet';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useDialogStore, useWallet } from '@vegaprotocol/wallet-react';
 import { WalletIcon } from '../icons/wallet';
 import { ProtocolUpgradeCountdown } from '@vegaprotocol/proposals';
 import { useT, useI18n } from '../../lib/use-t';
@@ -40,13 +40,9 @@ export const Navbar = ({ theme = 'system' }: { theme?: Theme }) => {
   // menu state for small screens
   const [menu, setMenu] = useState<MenuState>(null);
 
-  const { pubKey } = useVegaWallet();
+  const status = useWallet((store) => store.status);
 
-  const openVegaWalletDialog = useVegaWalletDialogStore(
+  const openVegaWalletDialog = useDialogStore((store) => store.open);
-    (store) => store.openVegaWalletDialog
-  );
-
-  const isConnected = pubKey !== null;
 
   const navTextClasses = 'text-vega-clight-200 dark:text-vega-cdark-200';
   const rootClasses = classNames(
@@ -88,7 +84,7 @@ export const Navbar = ({ theme = 'system' }: { theme?: Theme }) => {
         </div>
         <NavbarMobileButton
           onClick={() => {
-            if (isConnected) {
+            if (status === 'connected') {
               setMenu((x) => (x === 'wallet' ? null : 'wallet'));
             } else {
               openVegaWalletDialog();

apps/trading/components/orders-container/orders-container.tsx

@@ -1,7 +1,7 @@
 import { useDataGridEvents } from '@vegaprotocol/datagrid';
 import { Filter, OrderListManager } from '@vegaprotocol/orders';
 import { Splash } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useNavigateWithMeta } from '../../lib/hooks/use-market-click-handler';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';

apps/trading/components/positions-container/positions-container.tsx

@@ -1,7 +1,7 @@
 import { useDataGridEvents } from '@vegaprotocol/datagrid';
 import { PositionsManager } from '@vegaprotocol/positions';
 import { Splash } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
 import type { StateCreator } from 'zustand';

apps/trading/components/rewards-container/rewards-container.spec.tsx

@@ -172,7 +172,9 @@ describe('Vesting', () => {
   });
 
   it('doesnt use multiplier if not connected', () => {
-    render(<Vesting baseRate={'0.25'} pubKey={null} multiplier={undefined} />);
+    render(
+      <Vesting baseRate={'0.25'} pubKey={undefined} multiplier={undefined} />
+    );
 
     expect(screen.getByTestId('vesting-rate')).toHaveTextContent('25%');
 
@@ -199,7 +201,11 @@ describe('Multipliers', () => {
 
   it('shows not connected state', () => {
     render(
-      <Multipliers pubKey={null} streakMultiplier="3" hoarderMultiplier="2" />
+      <Multipliers
+        pubKey={undefined}
+        streakMultiplier="3"
+        hoarderMultiplier="2"
+      />
     );
 
     expect(

apps/trading/components/rewards-container/rewards-container.tsx

@@ -7,7 +7,7 @@ import {
   useNetworkParams,
 } from '@vegaprotocol/network-parameters';
 import { AccountType } from '@vegaprotocol/types';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import BigNumber from 'bignumber.js';
 import {
   Card,
@@ -309,7 +309,7 @@ type VestingBalances = NonNullable<
 >['vestingBalancesSummary'];
 
 export type RewardPotProps = {
-  pubKey: string | null;
+  pubKey: string | undefined;
   accounts: Account[] | null;
   assetId: string; // VEGA
   vestingBalancesSummary: VestingBalances | undefined;
@@ -469,7 +469,7 @@ export const Vesting = ({
   baseRate,
   multiplier,
 }: {
-  pubKey: string | null;
+  pubKey: string | undefined;
   baseRate: string;
   multiplier?: string;
 }) => {
@@ -506,7 +506,7 @@ export const Multipliers = ({
   streakMultiplier,
   hoarderMultiplier,
 }: {
-  pubKey: string | null;
+  pubKey: string | undefined;
   streakMultiplier?: string;
   hoarderMultiplier?: string;
 }) => {

apps/trading/components/rewards-container/rewards-history.tsx

@@ -25,7 +25,7 @@ export const RewardsHistoryContainer = ({
   pubKey,
   assets,
 }: {
-  pubKey: string | null;
+  pubKey: string | undefined;
   epoch: number;
   assets: Record<string, AssetFieldsFragment>;
 }) => {
@@ -129,7 +129,7 @@ export const RewardHistoryTable = ({
   epochRewardSummaries: RewardsHistoryQuery['epochRewardSummaries'];
   partyRewards: PartyRewardsConnection;
   assets: Record<string, AssetFieldsFragment> | null;
-  pubKey: string | null;
+  pubKey: string | undefined;
   epoch: number;
   epochVariables: {
     from: number;
@@ -145,7 +145,7 @@ export const RewardHistoryTable = ({
     epochRewardSummaries,
     partyRewards,
     assets,
-    partyId: isParty ? pubKey : null,
+    partyId: isParty ? pubKey : undefined,
   });
 
   const columnDefs = useMemo<ColDef<RewardRow>[]>(() => {

apps/trading/components/rewards-container/use-reward-row-data.ts

@@ -97,7 +97,7 @@ export const useRewardsRowData = ({
   partyRewards: PartyRewardsConnection;
   epochRewardSummaries: RewardsHistoryQuery['epochRewardSummaries'];
   assets: Record<string, Asset> | null;
-  partyId: string | null;
+  partyId: string | undefined;
 }) => {
   if (partyId) {
     const rewards = removePaginationWrapper(partyRewards?.edges).map((r) => ({

apps/trading/components/risk-ack-content/index.ts

@@ -0,0 +1 @@
+export { RiskAckContent } from './risk-ack-content';