Develop to main

consts/matomo-wallets-events.ts

@@ -1,6 +1,7 @@
 import { MatomoEventType, trackEvent } from '@lidofinance/analytics-matomo';
-import { Metrics } from 'reef-knot/connect-wallet-modal';
+import { MetricsProp } from '@reef-knot/types';
 import { WalletIdsEthereum } from 'reef-knot/wallets';
+import { MATOMO_CLICK_EVENTS } from './matomo-click-events';
 
 export const enum MATOMO_WALLETS_EVENTS_TYPES {
   onClickAmbire = 'onClickAmbire',
@@ -206,7 +207,7 @@ export const MATOMO_WALLETS_EVENTS: Record<
 const getMetricHandler = (event: Parameters<typeof trackEvent>) => () =>
   trackEvent(...event);
 
-export const walletsMetrics: Metrics<WalletIdsEthereum> = {
+export const walletsMetrics: MetricsProp<WalletIdsEthereum> = {
   events: {
     click: {
       handlers: {
@@ -230,6 +231,8 @@ export const walletsMetrics: Metrics<WalletIdsEthereum> = {
           MATOMO_WALLETS_EVENTS.onClickBrowser,
         ),
         binanceWallet: getMetricHandler(MATOMO_WALLETS_EVENTS.onClickBinance),
+        walletsLess: getMetricHandler(MATOMO_CLICK_EVENTS.clickShowLessWallets),
+        walletsMore: getMetricHandler(MATOMO_CLICK_EVENTS.clickShowMoreWallets),
       },
     },
     connect: {

modules/web3/web3-provider/web3-provider.tsx

@@ -1,19 +1,20 @@
 import { FC, PropsWithChildren, useEffect, useMemo } from 'react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { WagmiProvider, createConfig, useConnections } from 'wagmi';
+import { WagmiProvider, useConnections } from 'wagmi';
 import * as wagmiChains from 'wagmi/chains';
+import { ReefKnotProvider, getDefaultConfig } from 'reef-knot/core-react';
 import {
-  AutoConnect,
-  ReefKnot,
-  getWalletsDataList,
-} from 'reef-knot/core-react';
-import { WalletsListEthereum } from 'reef-knot/wallets';
+  ReefKnotWalletsModal,
+  getDefaultWalletsModalConfig,
+} from 'reef-knot/connect-wallet-modal';
+import { WalletIdsEthereum, WalletsListEthereum } from 'reef-knot/wallets';
+import { useThemeToggle } from '@lidofinance/lido-ui';
 
 import { config } from 'config';
 import { useUserConfig } from 'config/user-config';
 import { useGetRpcUrlByChainId } from 'config/rpc';
 import { CHAINS } from 'consts/chains';
-import { ConnectWalletModal } from './connect-wallet-modal';
+import { walletsMetrics } from 'consts/matomo-wallets-events';
 
 import { useWeb3Transport } from './use-web3-transport';
 import { LidoSDKProvider } from './lido-sdk';
@@ -22,6 +23,11 @@ import { SupportL1Chains } from './dapp-chain';
 
 type ChainsList = [wagmiChains.Chain, ...wagmiChains.Chain[]];
 
+const WALLETS_PINNED: WalletIdsEthereum[] = [
+  'binanceWallet',
+  'browserExtension',
+];
+
 export const wagmiChainMap = Object.values(wagmiChains).reduce(
   (acc, chain) => {
     acc[chain.id] = chain;
@@ -45,6 +51,7 @@ export const Web3Provider: FC<PropsWithChildren> = ({ children }) => {
     walletconnectProjectId,
     isWalletConnectionAllowed,
   } = useUserConfig();
+  const { themeName } = useThemeToggle();
 
   const { supportedChains, defaultChain } = useMemo(() => {
     // must preserve order of supportedChainIds
@@ -72,34 +79,42 @@ export const Web3Provider: FC<PropsWithChildren> = ({ children }) => {
       ),
     [supportedChainIds, getRpcUrlByChainId],
   );
-
-  const { walletsDataList } = useMemo(() => {
-    return getWalletsDataList({
-      walletsList: WalletsListEthereum,
-      rpc: backendRPC,
-      walletconnectProjectId,
-      defaultChain,
-    });
-  }, [backendRPC, defaultChain, walletconnectProjectId]);
-
   const { transportMap, onActiveConnection } = useWeb3Transport(
     supportedChains,
     backendRPC,
   );
 
-  const wagmiConfig = useMemo(() => {
-    return createConfig({
+  const { wagmiConfig, reefKnotConfig, walletsModalConfig } = useMemo(() => {
+    return getDefaultConfig({
+      // Reef-Knot config args
+      rpc: backendRPC,
+      defaultChain: defaultChain,
+      walletconnectProjectId,
+      walletsList: WalletsListEthereum,
+
+      // Wagmi config args
+      transports: transportMap,
       chains: supportedChains,
+      autoConnect: isWalletConnectionAllowed,
       ssr: true,
-      connectors: [],
+      pollingInterval: config.PROVIDER_POLLING_INTERVAL,
       batch: {
         multicall: false,
       },
-      multiInjectedProviderDiscovery: false,
-      pollingInterval: config.PROVIDER_POLLING_INTERVAL,
-      transports: transportMap,
+
+      // Wallets config args
+      ...getDefaultWalletsModalConfig(),
+      metrics: walletsMetrics,
+      walletsPinned: WALLETS_PINNED,
     });
-  }, [supportedChains, transportMap]);
+  }, [
+    backendRPC,
+    supportedChains,
+    defaultChain,
+    walletconnectProjectId,
+    isWalletConnectionAllowed,
+    transportMap,
+  ]);
 
   const [activeConnection] = useConnections({ config: wagmiConfig });
 
@@ -111,19 +126,17 @@ export const Web3Provider: FC<PropsWithChildren> = ({ children }) => {
     // default wagmi autoConnect, MUST be false in our case, because we use custom autoConnect from Reef Knot
     <WagmiProvider config={wagmiConfig} reconnectOnMount={false}>
       <QueryClientProvider client={queryClient}>
-        <ReefKnot
-          rpc={backendRPC}
-          chains={supportedChains}
-          walletDataList={walletsDataList}
-        >
-          {isWalletConnectionAllowed && <AutoConnect autoConnect />}
+        <ReefKnotProvider config={reefKnotConfig}>
+          <ReefKnotWalletsModal
+            config={walletsModalConfig}
+            darkThemeEnabled={themeName === 'dark'}
+          />
           <LidoSDKProvider>
             <SupportL1Chains>
               <SDKLegacyProvider>{children}</SDKLegacyProvider>
             </SupportL1Chains>
           </LidoSDKProvider>
-          <ConnectWalletModal />
-        </ReefKnot>
+        </ReefKnotProvider>
       </QueryClientProvider>
     </WagmiProvider>
   );

package.json

@@ -45,6 +45,7 @@
     "@lidofinance/next-pages": "^0.45.1",
     "@lidofinance/rpc": "^0.45.1",
     "@lidofinance/satanizer": "^0.45.1",
+    "@reef-knot/types": "^3.0.0",
     "@tanstack/react-query": "^5.51.21",
     "bignumber.js": "9.1.0",
     "copy-to-clipboard": "^3.3.1",
@@ -69,7 +70,7 @@
     "react-hook-form": "^7.45.2",
     "react-is": "^18.2.0",
     "react-transition-group": "^4.4.2",
-    "reef-knot": "5.7.5",
+    "reef-knot": "6.0.3",
     "styled-components": "^5.3.5",
     "swr": "^1.3.0",
     "tiny-async-pool": "^1.2.0",

utils/getErrorMessage.ts

@@ -84,23 +84,12 @@ export const extractCodeFromError = (
       normalizedMessage.includes('rejected the request') ||
       normalizedMessage.includes('reject this request') ||
       normalizedMessage.includes('rejected methods') ||
-      normalizedMessage.includes('transaction declined')
+      normalizedMessage.includes('transaction declined') ||
+      normalizedMessage.includes('signed declined')
     )
       return 'ACTION_REJECTED';
   }
 
-  // Ledger live errors
-  if (
-    'data' in error &&
-    typeof error.data === 'object' &&
-    Array.isArray(error.data) &&
-    typeof error.data['0'] === 'object' &&
-    typeof error.data['0'].message === 'string' &&
-    error.data['0'].message.toLowerCase().includes('rejected')
-  ) {
-    return 'ACTION_REJECTED';
-  }
-
   if ('name' in error && typeof error.name == 'string') {
     const error_name = error.name.toLowerCase();
     if (error_name === 'EthAppPleaseEnableContractData'.toLowerCase())