Merge branch 'develop' into feature/si-1557-rewards-history-with-addr…

…ess-input-back

config/groups/stake.ts

@@ -1,6 +1,5 @@
 import { BigNumber } from 'ethers';
 import { parseEther } from '@ethersproject/units';
-import { AddressZero } from '@ethersproject/constants';
 
 import { StakeSwapDiscountIntegrationKey } from 'features/stake/swap-discount-banner';
 
@@ -26,11 +25,11 @@ export const STAKE_GASLIMIT_FALLBACK = BigNumber.from(
   ),
 );
 
-export const STAKE_WIDGET_METRIC_SUFFIX = '01';
+export const LIDO_ADDRESS = '0x11D00000000000000000000000000000000011D0';
 
 export const STAKE_FALLBACK_REFERRAL_ADDRESS = preConfig.ipfsMode
   ? IPFS_REFERRAL_ADDRESS
-  : AddressZero;
+  : LIDO_ADDRESS;
 
 export const STAKE_SWAP_INTEGRATION: StakeSwapDiscountIntegrationKey =
   'one-inch';

consts/matomo-click-events.ts

@@ -15,6 +15,9 @@ export const enum MATOMO_CLICK_EVENTS_TYPES {
   lidoOnLidoMultichainOpportunities = 'lidoOnLidoMultichainOpportunities',
   vaultsBannerLearnMore = 'vaultsBannerLearnMore',
   vaultsBannerExploreAll = 'vaultsBannerExploreAll',
+  obolBannerProceed = 'obolBannerProceed',
+  obolBannerDVVLink = 'obolBannerDVVLink',
+  exploreAllStrategiesAfterStake = 'exploreAllStrategiesAfterStake',
   // FAQ
   faqSafeWorkWithLidoAudits = 'faqSafeWorkWithLidoAudits',
   faqLidoEthAprEthLandingPage = 'faqLidoEthAprEthLandingPage',
@@ -129,6 +132,21 @@ export const MATOMO_CLICK_EVENTS: Record<
     'Push "Explore all strategies"',
     'eth_widget_explore_all_strategies',
   ],
+  [MATOMO_CLICK_EVENTS_TYPES.obolBannerProceed]: [
+    'Ethereum_Staking_Widget',
+    'Push "Proceed" Obol SSV',
+    'eth_widget_proceed_obol_ssv',
+  ],
+  [MATOMO_CLICK_EVENTS_TYPES.obolBannerDVVLink]: [
+    'Ethereum_Staking_Widget',
+    'Push "the DVV Vault" link on Obol SSV banner',
+    'eth_widget_the_dvv_vault_link_obol_ssv',
+  ],
+  [MATOMO_CLICK_EVENTS_TYPES.exploreAllStrategiesAfterStake]: [
+    'Ethereum_Staking_Widget',
+    'Push "Explore all strategies" after staking',
+    'eth_widget_explore_all_strategies_after_staking',
+  ],
   // FAQ
   [MATOMO_CLICK_EVENTS_TYPES.faqSafeWorkWithLidoAudits]: [
     'Ethereum_Staking_Widget',

features/stake/stake-form/hooks/use-tx-modal-stages-stake.tsx

@@ -4,10 +4,17 @@ import {
 } from 'shared/transaction-modal/hooks/use-transaction-modal-stage';
 import { getGeneralTransactionModalStages } from 'shared/transaction-modal/hooks/get-general-transaction-modal-stages';
 
+import { Button, Link } from '@lidofinance/lido-ui';
+import { VaultsBannerInfo } from 'shared/banners/vaults-banner-info';
 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 type { BigNumber } from 'ethers';
+import { trackEvent } from '@lidofinance/analytics-matomo';
+import { MATOMO_CLICK_EVENTS } from 'consts/matomo-click-events';
+
+const LINK_EXPLORE_STRATEGIES =
+  'https://lido.fi/?pk_vid=6c467e14095d5ea11723712888b1fe5f#defi-strategies';
 
 const STAGE_OPERATION_ARGS = {
   token: 'ETH',
@@ -45,6 +52,24 @@ const getTxModalStagesStake = (transitStage: TransactionModalTransitStage) => ({
         balance={balance}
         balanceToken={'stETH'}
         operationText={'Staking'}
+        footer={
+          <>
+            <VaultsBannerInfo isTitleCompact showLearnMoreButton={false} />
+            <br />
+            <Link
+              href={LINK_EXPLORE_STRATEGIES}
+              onClick={() =>
+                trackEvent(
+                  ...MATOMO_CLICK_EVENTS.exploreAllStrategiesAfterStake,
+                )
+              }
+            >
+              <Button fullwidth size="sm">
+                Explore strategies
+              </Button>
+            </Link>
+          </>
+        }
       />,
       {
         isClosableOnLedger: true,

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

@@ -8,7 +8,7 @@ import { StakeSubmitButton } from './controls/stake-submit-button';
 import { StakeFormInfo } from './stake-form-info';
 import { SwapDiscountBanner } from '../swap-discount-banner';
 import { StakeBlock, FormControllerStyled } from './styles';
-import { VaultsBannerInfo } from 'shared/banners/vaults-banner-info';
+import { DVVBanner } from 'shared/banners/dvv-banner';
 
 export const StakeForm: FC = memo(() => {
   return (
@@ -19,7 +19,7 @@ export const StakeForm: FC = memo(() => {
           <StakeAmountInput />
           <StakeSubmitButton />
           <SwapDiscountBanner>
-            <VaultsBannerInfo />
+            <DVVBanner />
           </SwapDiscountBanner>
         </FormControllerStyled>
         <StakeFormInfo />

features/stake/stake-form/use-stake.ts

@@ -14,11 +14,7 @@ import { useCurrentStaticRpcProvider } from 'shared/hooks/use-current-static-rpc
 import { isContract } from 'utils/isContract';
 import { runWithTransactionLogger } from 'utils';
 
-import {
-  MockLimitReachedError,
-  getAddress,
-  applyCalldataSuffix,
-} from './utils';
+import { MockLimitReachedError, getAddress } from './utils';
 import { useTxModalStagesStake } from './hooks/use-tx-modal-stages-stake';
 
 import { sendTx } from 'utils/send-tx';
@@ -41,9 +37,6 @@ export const useStake = ({ onConfirm, onRetry }: StakeOptions) => {
   const { providerWeb3 } = useSDK();
   const { txModalStages } = useTxModalStagesStake();
 
-  // temporary disable until Ledger is fixed
-  const shouldApplyCalldataSuffix = false;
-
   return useCallback(
     async ({ amount, referral }: StakeArguments): Promise<boolean> => {
       try {
@@ -77,14 +70,13 @@ export const useStake = ({ onConfirm, onRetry }: StakeOptions) => {
             },
           );
 
-          if (shouldApplyCalldataSuffix) applyCalldataSuffix(tx);
-
           return sendTx({
             tx,
             isMultisig,
             staticProvider: staticRpcProvider,
             walletProvider: providerWeb3,
             shouldApplyGasLimitRatio: true,
+            shouldRoundUpGasLimit: true,
           });
         };
 
@@ -128,7 +120,6 @@ export const useStake = ({ onConfirm, onRetry }: StakeOptions) => {
       staticRpcProvider,
       stethContract,
       onConfirm,
-      shouldApplyCalldataSuffix,
       onRetry,
     ],
   );

features/stake/stake-form/utils.ts

@@ -1,10 +1,6 @@
-import type { PopulatedTransaction } from 'ethers';
 import { isAddress } from 'ethers/lib/utils';
 import type { BaseProvider } from '@ethersproject/providers';
 
-import { config } from 'config';
-import invariant from 'tiny-invariant';
-
 export const getAddress = async (
   input: string,
   providerRpc: BaseProvider,
@@ -20,15 +16,6 @@ export const getAddress = async (
   throw new ReferralAddressError();
 };
 
-// adds metrics indicator for widget tx
-export const applyCalldataSuffix = (tx: PopulatedTransaction) => {
-  if (!config.ipfsMode) {
-    invariant(tx.data, 'transaction must have calldata');
-    tx.data = tx.data + config.STAKE_WIDGET_METRIC_SUFFIX;
-  }
-  return tx;
-};
-
 export class ReferralAddressError extends Error {
   reason: string;
   constructor() {

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

@@ -4,6 +4,7 @@ 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';
 
@@ -47,6 +48,7 @@ const getTxModalStagesUnwrap = (
         balance={balance}
         balanceToken={STAGE_OPERATION_ARGS.willReceiveToken}
         operationText={'Unwrapping'}
+        footer={<VaultsBannerStrategies />}
       />,
       {
         isClosableOnLedger: true,