Merge pull request #451 from lidofinance/develop

Develop to main

consts/matomo-click-events.ts

@@ -14,11 +14,9 @@ export const enum MATOMO_CLICK_EVENTS_TYPES {
   viewEtherscanOnStakePage = 'viewEtherscanOnStakePage',
   lidoOnLidoMultichainOpportunities = 'lidoOnLidoMultichainOpportunities',
   vaultsBannerLearnMore = 'vaultsBannerLearnMore',
-  vaultsBannerExploreAll = 'vaultsBannerExploreAll',
   obolBannerProceed = 'obolBannerProceed',
   obolBannerDVVLink = 'obolBannerDVVLink',
   exploreAllStrategiesAfterStake = 'exploreAllStrategiesAfterStake',
-  exploreAllStrategiesAfterWrap = 'exploreAllStrategiesAfterWrap',
   // FAQ
   faqSafeWorkWithLidoAudits = 'faqSafeWorkWithLidoAudits',
   faqLidoEthAprEthLandingPage = 'faqLidoEthAprEthLandingPage',
@@ -128,11 +126,6 @@ export const MATOMO_CLICK_EVENTS: Record<
     'Click on "Learn more" on Vaults banner',
     'eth_widget_learn_more_vaults_banner',
   ],
-  [MATOMO_CLICK_EVENTS_TYPES.vaultsBannerExploreAll]: [
-    'Ethereum_Staking_Widget',
-    'Push "Explore all strategies"',
-    'eth_widget_explore_all_strategies',
-  ],
   [MATOMO_CLICK_EVENTS_TYPES.obolBannerProceed]: [
     'Ethereum_Staking_Widget',
     'Push "Proceed" Obol SSV',
@@ -148,11 +141,6 @@ export const MATOMO_CLICK_EVENTS: Record<
     'Push "Explore all strategies" after staking',
     'eth_widget_explore_all_strategies_after_staking',
   ],
-  [MATOMO_CLICK_EVENTS_TYPES.exploreAllStrategiesAfterWrap]: [
-    'Ethereum_Staking_Widget',
-    'Push "Explore all strategies" after wrap',
-    'eth_widget_explore_all_strategies_after_wraping',
-  ],
   // FAQ
   [MATOMO_CLICK_EVENTS_TYPES.faqSafeWorkWithLidoAudits]: [
     'Ethereum_Staking_Widget',

consts/matomo-wallets-events.ts

@@ -31,6 +31,8 @@ export const enum MATOMO_WALLETS_EVENTS_TYPES {
   onConnectBitget = 'onConnectBitget',
   onClickBrowser = 'onClickBrowser',
   onConnectBrowser = 'onConnectBrowser',
+  onClickBinance = 'onClickBinance',
+  onConnectBinance = 'onConnectBinance',
 }
 
 export const MATOMO_WALLETS_EVENTS: Record<
@@ -177,6 +179,16 @@ export const MATOMO_WALLETS_EVENTS: Record<
     'Connect Browser wallet',
     'eth_widget_connect_browser',
   ],
+  [MATOMO_WALLETS_EVENTS_TYPES.onClickBinance]: [
+    'Ethereum_Staking_Widget',
+    'Click Binance Web3 wallet',
+    'eth_widget_click_binance_web3',
+  ],
+  [MATOMO_WALLETS_EVENTS_TYPES.onConnectBinance]: [
+    'Ethereum_Staking_Widget',
+    'Connect Binance Web3 wallet',
+    'eth_widget_connect_binance_web3_wallet',
+  ],
 };
 
 const getMetricHandler = (event: Parameters<typeof trackEvent>) => () =>
@@ -202,6 +214,7 @@ export const walletsMetrics: Metrics<WalletIdsEthereum> = {
         browserExtension: getMetricHandler(
           MATOMO_WALLETS_EVENTS.onClickBrowser,
         ),
+        binanceWallet: getMetricHandler(MATOMO_WALLETS_EVENTS.onClickBinance),
       },
     },
     connect: {
@@ -222,6 +235,7 @@ export const walletsMetrics: Metrics<WalletIdsEthereum> = {
         browserExtension: getMetricHandler(
           MATOMO_WALLETS_EVENTS.onConnectBrowser,
         ),
+        binanceWallet: getMetricHandler(MATOMO_WALLETS_EVENTS.onConnectBinance),
       },
     },
   },

features/stake/stake-form/stake-form-context/stake-form-context.tsx

@@ -105,9 +105,9 @@ const useStakeFormNetworkData = (): StakeFormNetworkData => {
 
   const revalidate = useCallback(async () => {
     await Promise.allSettled([
-      updateStethBalance,
-      updateEtherBalance,
-      () => mutateStakeLimit(stakingLimitInfo),
+      updateStethBalance(),
+      updateEtherBalance(),
+      mutateStakeLimit(stakingLimitInfo),
     ]);
   }, [
     updateStethBalance,

features/wsteth/unwrap/hooks/use-tx-modal-stages-unwrap.tsx

@@ -4,7 +4,6 @@ import {
 } from 'shared/transaction-modal/hooks/use-transaction-modal-stage';
 import { getGeneralTransactionModalStages } from 'shared/transaction-modal/hooks/get-general-transaction-modal-stages';
 
-import { VaultsBannerStrategies } from 'shared/banners/vaults-banner-strategies';
 import { TxStageSignOperationAmount } from 'shared/transaction-modal/tx-stages-composed/tx-stage-amount-operation';
 import { TxStageOperationSucceedBalanceShown } from 'shared/transaction-modal/tx-stages-composed/tx-stage-operation-succeed-balance-shown';
 
@@ -48,7 +47,6 @@ const getTxModalStagesUnwrap = (
         balance={balance}
         balanceToken={STAGE_OPERATION_ARGS.willReceiveToken}
         operationText={'Unwrapping'}
-        footer={<VaultsBannerStrategies />}
       />,
       {
         isClosableOnLedger: true,

features/wsteth/unwrap/hooks/use-unwrap-form-processing.ts

@@ -1,11 +1,7 @@
 import invariant from 'tiny-invariant';
 
 import { useCallback } from 'react';
-import {
-  useSDK,
-  useSTETHContractRPC,
-  useWSTETHContractRPC,
-} from '@lido-sdk/react';
+import { useSTETHContractRPC, useWSTETHContractRPC } from '@lido-sdk/react';
 import { useWeb3 } from 'reef-knot/web3-react';
 import { useUnwrapTxProcessing } from './use-unwrap-tx-processing';
 import { useTxModalStagesUnwrap } from './use-tx-modal-stages-unwrap';
@@ -26,7 +22,6 @@ export const useUnwrapFormProcessor = ({
 }: UseUnwrapFormProcessorArgs) => {
   const { account } = useWeb3();
   const { staticRpcProvider } = useCurrentStaticRpcProvider();
-  const { providerWeb3 } = useSDK();
   const processWrapTx = useUnwrapTxProcessing();
   const stETHContractRPC = useSTETHContractRPC();
   const wstETHContractRPC = useWSTETHContractRPC();
@@ -37,8 +32,7 @@ export const useUnwrapFormProcessor = ({
       try {
         invariant(amount, 'amount should be presented');
         invariant(account, 'address should be presented');
-        invariant(providerWeb3, 'provider should be presented');
-        const isMultisig = await isContract(account, providerWeb3);
+        const isMultisig = await isContract(account, staticRpcProvider);
         const willReceive = await wstETHContractRPC.getStETHByWstETH(amount);
 
         txModalStages.sign(amount, willReceive);
@@ -71,7 +65,6 @@ export const useUnwrapFormProcessor = ({
     },
     [
       account,
-      providerWeb3,
       wstETHContractRPC,
       txModalStages,
       stETHContractRPC,

features/wsteth/unwrap/unwrap-form/unwrap-form.tsx

@@ -1,7 +1,6 @@
 import { FC, memo } from 'react';
 
 import { InputWrap, WrapBlock } from 'features/wsteth/shared/styles';
-import { VaultsBannerInfo } from 'shared/banners/vaults-banner-info';
 import { FormController } from 'shared/hook-form/form-controller/form-controller';
 
 import { UnwrapStats } from './unwrap-stats';
@@ -19,7 +18,6 @@ export const UnwrapForm: FC = memo(() => {
           </InputWrap>
           <SubmitButtonUnwrap />
         </FormController>
-        <VaultsBannerInfo />
         <UnwrapStats />
       </WrapBlock>
     </UnwrapFormProvider>

features/wsteth/wrap/hooks/use-tx-modal-stages-wrap.tsx

@@ -1,6 +1,3 @@
-import { Button, Link } from '@lidofinance/lido-ui';
-import { trackEvent } from '@lidofinance/analytics-matomo';
-
 import {
   TransactionModalTransitStage,
   useTransactionModalStage,
@@ -9,14 +6,10 @@ import { getGeneralTransactionModalStages } from 'shared/transaction-modal/hooks
 
 import { TxStageSignOperationAmount } from 'shared/transaction-modal/tx-stages-composed/tx-stage-amount-operation';
 import { TxStageOperationSucceedBalanceShown } from 'shared/transaction-modal/tx-stages-composed/tx-stage-operation-succeed-balance-shown';
-import { LINK_EXPLORE_STRATEGIES } from 'shared/banners/vaults-banner-info/const';
 
 import { getTokenDisplayName } from 'utils/getTokenDisplayName';
 import type { BigNumber } from 'ethers';
 import type { TokensWrappable } from 'features/wsteth/shared/types';
-import { VaultsBannerInfo } from 'shared/banners/vaults-banner-info';
-
-import { MATOMO_CLICK_EVENTS } from 'consts/matomo-click-events';
 
 const STAGE_APPROVE_ARGS = {
   willReceiveToken: 'wstETH',
@@ -89,22 +82,6 @@ const getTxModalStagesWrap = (transitStage: TransactionModalTransitStage) => ({
         balance={balance}
         balanceToken={'wstETH'}
         operationText={'Wrapping'}
-        footer={
-          <>
-            <VaultsBannerInfo isTitleCompact showLearnMoreButton={false} />
-            <br />
-            <Link
-              href={LINK_EXPLORE_STRATEGIES}
-              onClick={() =>
-                trackEvent(...MATOMO_CLICK_EVENTS.exploreAllStrategiesAfterWrap)
-              }
-            >
-              <Button fullwidth size="sm">
-                Explore strategies
-              </Button>
-            </Link>
-          </>
-        }
       />,
       {
         isClosableOnLedger: true,

features/wsteth/wrap/wrap-form/wrap-form.tsx

@@ -1,6 +1,5 @@
 import { memo } from 'react';
 
-import { VaultsBannerInfo } from 'shared/banners/vaults-banner-info';
 import { FormController } from 'shared/hook-form/form-controller';
 
 import { WrapFormStats } from './wrap-stats';
@@ -17,7 +16,6 @@ export const WrapForm: React.FC = memo(() => {
           <InputGroupWrap />
           <SubmitButtonWrap />
         </FormController>
-        <VaultsBannerInfo />
         <WrapFormStats />
       </WrapBlock>
     </WrapFormProvider>

package.json

@@ -45,7 +45,6 @@
     "@lidofinance/rpc": "^0.41.0",
     "@lidofinance/satanizer": "^0.41.0",
     "@tanstack/react-query": "^5.48.0",
-    "@wagmi/core": "^2.11.6",
     "bignumber.js": "9.1.0",
     "copy-to-clipboard": "^3.3.1",
     "cors": "^2.8.5",
@@ -70,7 +69,7 @@
     "react-hook-form": "^7.45.2",
     "react-is": "^18.2.0",
     "react-transition-group": "^4.4.2",
-    "reef-knot": "5.2.3",
+    "reef-knot": "5.5.4",
     "remark": "^13.0.0",
     "remark-external-links": "^8.0.0",
     "remark-html": "^13.0.1",