Feat/umbrella final

package.json

@@ -31,7 +31,7 @@
     "test:coverage": "jest --coverage"
   },
   "dependencies": {
-    "@aave/contract-helpers": "1.33.0",
+    "@aave/contract-helpers": "1.33.1-07752485b0e3b6582efa1c636fad5c267b2c6d04.0",
     "@aave/math-utils": "1.33.0",
     "@bgd-labs/aave-address-book": "^4.17.1",
     "@emotion/cache": "11.10.3",

src/locales/en/messages.po

@@ -2089,10 +2089,6 @@ msgstr "Addresses"
 msgid "The requested amount is greater than the max loan size in stable rate mode"
 msgstr "The requested amount is greater than the max loan size in stable rate mode"
 
-#: src/modules/umbrella/UnstakeModalContent.tsx
-msgid "Redeem as {0}"
-msgstr "Redeem as {0}"
-
 #: pages/index.page.tsx
 #: src/components/transactions/Supply/SupplyModal.tsx
 #: src/modules/dashboard/lists/SuppliedPositionsList/SuppliedPositionsListItem.tsx

src/modules/umbrella/AvailableToStakeItem.tsx

@@ -3,7 +3,6 @@ import { Box, Stack, Typography } from '@mui/material';
 import { FormattedNumber } from 'src/components/primitives/FormattedNumber';
 import { TokenIcon } from 'src/components/primitives/TokenIcon';
 import { MergedStakeData } from 'src/hooks/stake/useUmbrellaSummary';
-import { useRootStore } from 'src/store/root';
 
 import { AmountAvailableItem } from './helpers/AmountAvailableItem';
 import { MultiIconWithTooltip } from './helpers/MultiIcon';
@@ -21,15 +20,7 @@ export const AvailableToStakeItem = ({
     underlyingTokenBalance,
   } = stakeData.formattedBalances;
 
-  const currentNetworkConfig = useRootStore((store) => store.currentNetworkConfig);
-
   const icons = [];
-  if (stakeData.stataTokenData.isUnderlyingWrappedBaseToken) {
-    icons.push({
-      src: currentNetworkConfig.baseAssetSymbol,
-      aToken: false,
-    });
-  }
   if (underlyingTokenBalance) {
     icons.push({
       src: stakeData.stataTokenData.assetSymbol,
@@ -50,15 +41,11 @@ export const AvailableToStakeItem = ({
     });
   }
 
-  let totalAvailableToStake =
+  const totalAvailableToStake =
     Number(underlyingTokenBalance) +
     Number(underlyingWaTokenBalance) +
     Number(aTokenBalanceAvailableToStake);
 
-  if (stakeData.stataTokenData.isUnderlyingWrappedBaseToken) {
-    totalAvailableToStake += Number(stakeData.formattedBalances.nativeTokenBalance);
-  }
-
   return (
     <Stack
       direction={isMobile ? 'row' : 'column'}
@@ -92,21 +79,13 @@ export const AvailableToStakeTooltipContent = ({ stakeData }: { stakeData: Merge
   } = stakeData.formattedBalances;
 
   const { assetSymbol } = stakeData.stataTokenData;
-  const currentNetworkConfig = useRootStore((store) => store.currentNetworkConfig);
 
   return (
     <Stack direction="column" alignItems="center" justifyContent="center" minWidth={160}>
       <Typography variant="caption" color="text.secondary" mb={3}>
         <Trans>Your balance of assets that are available to stake</Trans>
       </Typography>
       <Box sx={{ width: '100%' }}>
-        {stakeData.stataTokenData.isUnderlyingWrappedBaseToken && (
-          <AmountAvailableItem
-            symbol={currentNetworkConfig.baseAssetSymbol}
-            name={currentNetworkConfig.baseAssetSymbol}
-            value={stakeData.formattedBalances.nativeTokenBalance}
-          />
-        )}
         {underlyingWaTokenBalance && (
           <AmountAvailableItem
             symbol={assetSymbol}

src/modules/umbrella/UmbrellaModalContent.tsx

@@ -1,4 +1,3 @@
-import { API_ETH_MOCK_ADDRESS } from '@aave/contract-helpers';
 import { USD_DECIMALS, valueToBigNumber } from '@aave/math-utils';
 import { Trans } from '@lingui/macro';
 import { Box, Checkbox, Skeleton, Stack, Typography } from '@mui/material';
@@ -26,7 +25,6 @@ import { MergedStakeData } from 'src/hooks/stake/useUmbrellaSummary';
 import { useIsWrongNetwork } from 'src/hooks/useIsWrongNetwork';
 import { useModalContext } from 'src/hooks/useModal';
 import { useRootStore } from 'src/store/root';
-import { NetworkConfig } from 'src/ui-config/networksConfig';
 import { calculateHFAfterWithdraw } from 'src/utils/hfUtils';
 import { STAKE } from 'src/utils/mixPanelEvents';
 import { roundToTokenDecimals } from 'src/utils/utils';
@@ -54,10 +52,7 @@ export interface StakeInputAsset {
   balance: string;
 }
 
-const getInputTokens = (
-  stakeData: MergedStakeData,
-  networkConfig: NetworkConfig
-): StakeInputAsset[] => {
+const getInputTokens = (stakeData: MergedStakeData): StakeInputAsset[] => {
   const assets = stakeData.underlyingIsStataToken
     ? [
         // stata token
@@ -84,14 +79,6 @@ const getInputTokens = (
           balance: stakeData.formattedBalances.underlyingTokenBalance,
         },
       ];
-  if (stakeData.stataTokenData.isUnderlyingWrappedBaseToken) {
-    assets.push({
-      address: API_ETH_MOCK_ADDRESS,
-      symbol: networkConfig.baseAssetSymbol,
-      iconSymbol: networkConfig.baseAssetSymbol,
-      balance: stakeData.formattedBalances.nativeTokenBalance,
-    });
-  }
   assets.sort((a, b) => +b.balance - +a.balance);
   return assets;
 };
@@ -103,11 +90,11 @@ export const UmbrellaModalContent = ({ stakeData, user, userReserve, poolReserve
   // states
   const [_amount, setAmount] = useState('');
 
-  const [currentChainId, currentNetworkConfig] = useRootStore(
+  const [currentChainId] = useRootStore(
     useShallow((store) => [store.currentChainId, store.currentNetworkConfig])
   );
 
-  const assets = getInputTokens(stakeData, currentNetworkConfig);
+  const assets = getInputTokens(stakeData);
 
   const [inputToken, setInputToken] = useState<StakeInputAsset>(assets[0]);
 

src/modules/umbrella/UnstakeModalContent.tsx

@@ -96,10 +96,6 @@ export const UnStakeModalContent = ({ stakeData }: { stakeData: MergedStakeData
     setRedeemType(value ? RedeemType.ATOKEN : RedeemType.NORMAL);
   };
 
-  const setRedeemNativeTokens = (value: boolean) => {
-    setRedeemType(value ? RedeemType.NATIVE : RedeemType.NORMAL);
-  };
-
   const symbolFormatted = stakeData.underlyingIsStataToken
     ? stakeData.stataTokenData.assetSymbol
     : stakeData.underlyingTokenSymbol;
@@ -169,17 +165,6 @@ export const UnStakeModalContent = ({ stakeData }: { stakeData: MergedStakeData
           }
         />
       )}
-      {stakeData.stataTokenData.isUnderlyingWrappedBaseToken && (
-        <DetailsUnwrapSwitch
-          unwrapped={redeemType === RedeemType.NATIVE}
-          setUnWrapped={setRedeemNativeTokens}
-          label={
-            <Typography>
-              <Trans>{`Redeem as ${currentNetworkConfig.baseAssetSymbol}`}</Trans>
-            </Typography>
-          }
-        />
-      )}
 
       {stakeData.underlyingIsStataToken ? (
         <TxModalDetails gasLimit={gasLimit} chainId={currentChainId}>

src/services/UmbrellaStakeDataService.ts

@@ -12,9 +12,9 @@ interface StakeUmbrellaConfig {
 export const stakeUmbrellaConfig: StakeUmbrellaConfig = {
   // [ChainId.mainnet]: {}, // TODO: Mainnet addresses
   [ChainId.base_sepolia]: {
-    stakeDataProvider: '0x4d6f6e98d262ba7eebcd811ffae904cb46a5d344',
-    batchHelper: '0xAaA87d031d991B6faAb8076AAea518072Fc8E6F2',
-    stakeRewardsController: '0x8dd1E13fe050C6319eD74d540ACF2a9603C08Fe8',
+    stakeDataProvider: '0xD80c9F7C6d5359558E2F3F32Faa4a48D8224F4c6',
+    batchHelper: '0xcDfb3f2d924b02A78a51F43BC34610dC62ADCEC3',
+    stakeRewardsController: '0x412f8957f9A42FFe47B634AB73f89Ff4E0a29026',
   },
 };
 

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@aave/[email protected]":
-  version "1.33.0"
-  resolved "https://registry.yarnpkg.com/@aave/contract-helpers/-/contract-helpers-1.33.0.tgz#d58f44c83737dfe3ab04b3776f1133064e08ebc6"
-  integrity sha512-hwOG+B6LYv8/oZIW3OYPZqr2OwEVYLWXO230h3LfUpG9P4+MhknZeyuJHRA7uGNpj2dpP/KYuLrYYfx4G9D0aQ==
+"@aave/[email protected].1-07752485b0e3b6582efa1c636fad5c267b2c6d04.0":
+  version "1.33.1-07752485b0e3b6582efa1c636fad5c267b2c6d04.0"
+  resolved "https://registry.yarnpkg.com/@aave/contract-helpers/-/contract-helpers-1.33.1-07752485b0e3b6582efa1c636fad5c267b2c6d04.0.tgz#494631939065178079b13f063b253bf5af1e9850"
+  integrity sha512-RQVEZfyQSUdRgI+dbiNDYg3ph5WesCNcVepNKaR/QTruwOBwKhzRkXPgq2fe0DEpKCwpBUUtw6Kj3V6gJgWhjQ==
   dependencies:
     isomorphic-unfetch "^3.1.0"