Fixes Trade Summary Fees, Whitelist crvUSD vaults on Arbitrum

.github/workflows/deploy-arb-dev.yml

@@ -38,6 +38,7 @@ jobs:
           NX_DD_SITE: ${{ secrets.NX_DD_SITE }}
           NX_APP_URL: ${{ secrets.NX_APP_URL }}
           NX_DATA_URL: ${{ secrets.NX_DATA_URL }}
+          NX_INTERCOM_APP_ID: ${{ secrets.NX_INTERCOM_APP_ID }}
           # This segment key is not the same as the prod one
           NX_SEGMENT_KEY: ${{ secrets.NX_DEV_SEGMENT_KEY }}
           NX_ENV: ${{ github.event.inputs.environment || 'arb' }}

.github/workflows/deploy-arb.yml

@@ -41,6 +41,7 @@ jobs:
           NX_SEGMENT_KEY: ${{ secrets.NX_SEGMENT_KEY }}
           NX_ENV: ${{ github.event.inputs.environment || 'arb' }}
           NX_COMMIT_REF: ${{ github.sha }}
+          NX_INTERCOM_APP_ID: ${{ secrets.NX_INTERCOM_APP_ID }}
       - name: Publish Dev
         uses: cloudflare/pages-action@1
         with:

apps/web/src/containers/LandingPageView/components/hero/components/hero-stats.tsx

@@ -10,32 +10,36 @@ import statsImg from '../images/stats_overlay.svg';
 import { FormattedMessage } from 'react-intl';
 import { formatNumber } from '@notional-finance/helpers';
 import { useNotionalContext } from '@notional-finance/notionable-hooks';
+import { SupportedNetworks } from '@notional-finance/util';
 
 const oneMillion = 1_000_000;
 
 export const HeroStats = () => {
   const theme = useTheme();
   const {
-    globalState: { heroStats },
+    globalState: { heroStats, activeAccounts },
   } = useNotionalContext();
+  const isReady = SupportedNetworks.every(
+    (n) => activeAccounts && activeAccounts[n]
+  );
 
   return (
     <StatsContainer>
       <ImgContainer>
         <StatsContent>
-          {heroStats?.totalAccounts ? (
+          {isReady && heroStats ? (
             <div>
               <LargeInputText>
                 {`$${formatNumber(
                   heroStats.totalValueLocked / oneMillion,
-                  0
+                  2
                 )}M`}
                 <BodySecondary>
                   <FormattedMessage defaultMessage={'Total Value Locked'} />
                 </BodySecondary>
               </LargeInputText>
               <LargeInputText sx={{ marginTop: theme.spacing(6) }}>
-                {`$${formatNumber(heroStats.totalOpenDebt / oneMillion, 0)}M`}
+                {`$${formatNumber(heroStats.totalOpenDebt / oneMillion, 1)}M`}
                 <BodySecondary>
                   <FormattedMessage defaultMessage={'Total Open Debt'} />
                 </BodySecondary>

package.json

@@ -67,6 +67,7 @@
     "react-scroll": "^1.8.9",
     "react-slick": "^0.29.0",
     "react-swipeable": "^7.0.0",
+    "react-use-intercom": "^5.4.0",
     "react-youtube": "^9.0.2",
     "recharts": "^2.3.2",
     "regenerator-runtime": "0.13.7",

packages/core-entities/src/client/analytics-registry-client.ts

@@ -331,7 +331,10 @@ export class AnalyticsRegistryClient extends ClientRegistry<unknown> {
         Registry.getTokenRegistry()
           .getAllTokens(n)
           .filter(
-            (t) => t.tokenType === 'PrimeDebt' || t.tokenType === 'PrimeCash'
+            (t) =>
+              t.tokenType === 'PrimeDebt' ||
+              t.tokenType === 'PrimeCash' ||
+              t.tokenType === 'VaultShare'
           )
           .reduce(
             (acc, token) =>

packages/core-entities/src/client/exchange-registry-client.ts

@@ -36,11 +36,9 @@ export class ExchangeRegistryClient extends ClientRegistry<PoolDefinition> {
     network: Network,
     address: string
   ) {
-    const pool = this.getLatestFromSubject(
-      network,
-      // Converts to a checksummed address
-      ethers.utils.getAddress(address)
-    );
+    const pool =
+      this.getLatestFromSubject(network, ethers.utils.getAddress(address)) ||
+      this.getLatestFromSubject(network, address.toLowerCase());
     if (!pool) throw Error(`Pool ${address} on ${network} not found`);
     return this._buildPool<T>(network, pool);
   }

packages/core-entities/src/config/whitelisted-vaults.ts

@@ -65,10 +65,10 @@ export const whitelistedVaults = (network: Network) => {
         '0xdb08f663e5d765949054785f2ed1b2aa1e9c22cf',
         // "[USDT]:USDC_e_xUSDT"
         '0x431dbfe3050ea39abbff3e0d86109fb5bafa28fd',
-        // // "[USDC]:crvUSD_xUSDC"
-        // '0x5c36a0deab3531d29d848e684e8bdf5f81cdb643',
-        // // "[USDT]:crvUSD_xUSDT"
-        // '0xae04e4887cbf5f25c05ac1384bcd0b7e885a1f4a',
+        // "[USDC]:crvUSD_xUSDC"
+        '0x5c36a0deab3531d29d848e684e8bdf5f81cdb643',
+        // "[USDT]:crvUSD_xUSDT"
+        '0xae04e4887cbf5f25c05ac1384bcd0b7e885a1f4a',
         // "[rETH]:xrETH_WETH"
         '0x3df035433cface65b6d68b77cc916085d020c8b8',
         // "[USDC]:xUSDC_DAI_USDT_USDC_e"

packages/core-entities/src/exchanges/default-pools.ts

@@ -54,7 +54,7 @@ const defaultPools: Record<Network, PoolDefinition[]> = {
     },
     {
       address: '0x383E6b4437b59fff47B619CBA855CA29342A8559',
-      PoolClass: 'Curve2TokenPoolV1_SelfLPToken',
+      PoolClass: 'Curve2TokenPoolV1_SelfLPTokenNoAdmin',
       registerTokens: [
         {
           id: '0x383E6b4437b59fff47B619CBA855CA29342A8559',
@@ -80,7 +80,7 @@ const defaultPools: Record<Network, PoolDefinition[]> = {
     },
     {
       address: '0x4DEcE678ceceb27446b35C672dC7d61F30bAD69E',
-      PoolClass: 'Curve2TokenPoolV1_SelfLPToken',
+      PoolClass: 'Curve2TokenPoolV1_SelfLPTokenNoAdmin',
       registerTokens: [
         {
           id: '0x4DEcE678ceceb27446b35C672dC7d61F30bAD69E',
@@ -106,7 +106,7 @@ const defaultPools: Record<Network, PoolDefinition[]> = {
     },
     {
       address: '0x390f3595bCa2Df7d23783dFd126427CCeb997BF4',
-      PoolClass: 'Curve2TokenPoolV1_SelfLPToken',
+      PoolClass: 'Curve2TokenPoolV1_SelfLPTokenNoAdmin',
       registerTokens: [
         {
           id: '0x390f3595bCa2Df7d23783dFd126427CCeb997BF4',
@@ -286,7 +286,7 @@ const defaultPools: Record<Network, PoolDefinition[]> = {
     },
     {
       address: '0x7f90122BF0700F9E7e1F688fe926940E8839F353',
-      PoolClass: 'Curve2TokenPoolV1_SelfLPToken',
+      PoolClass: 'Curve2TokenPoolV1_SelfLPTokenNoAdmin',
       registerTokens: [
         // USDT / USDC v1 pool
         {
@@ -340,30 +340,53 @@ const defaultPools: Record<Network, PoolDefinition[]> = {
       ],
     },
     {
-      // NOTE: the pool address here is different from the lp token address
-      address: '0x6eB2dc694eB516B16Dc9FBc678C60052BbdD7d80',
-      PoolClass: 'Curve2TokenPoolV1_HasOracle',
+      address: '0x73af1150f265419ef8a5db41908b700c32d49135',
+      PoolClass: 'Curve2TokenPoolV1_SelfLPTokenNoAdmin',
       registerTokens: [
-        // ETH / wstETH Pool
         {
-          id: '0xDbcD16e622c95AcB2650b38eC799f76BFC557a0b',
-          address: '0xDbcD16e622c95AcB2650b38eC799f76BFC557a0b',
+          id: '0x73af1150f265419ef8a5db41908b700c32d49135',
+          address: '0x73af1150f265419ef8a5db41908b700c32d49135',
           network: Network.arbitrum,
-          symbol: 'wstETHCRV',
-          name: 'Curve.fi ETH/wstETH',
+          symbol: 'crvUSDC',
+          name: 'crvUSD/USDT',
           decimals: 18,
           tokenInterface: 'ERC20',
           tokenType: 'Underlying',
         },
-        // Register ALT_ETH
         {
-          id: ALT_ETH,
-          address: ALT_ETH,
+          id: '0x498bf2b1e120fed3ad3d42ea2165e9b73f99c1e5',
+          address: '0x498bf2b1e120fed3ad3d42ea2165e9b73f99c1e5',
           network: Network.arbitrum,
-          symbol: 'ETH [Alt]',
-          name: 'Ether [Alternate]',
+          symbol: 'crvUSD',
+          name: 'Curve.Fi USD Stablecoin',
           decimals: 18,
-          tokenInterface: 'ERC20', // TODO: change this to Ether interface
+          tokenInterface: 'ERC20',
+          tokenType: 'Underlying',
+        },
+      ],
+    },
+    {
+      address: '0xec090cf6dd891d2d014bea6edada6e05e025d93d',
+      PoolClass: 'Curve2TokenPoolV1_SelfLPTokenNoAdmin',
+      registerTokens: [
+        {
+          id: '0xec090cf6dd891d2d014bea6edada6e05e025d93d',
+          address: '0xec090cf6dd891d2d014bea6edada6e05e025d93d',
+          network: Network.arbitrum,
+          symbol: 'crvUSDC',
+          name: 'crvUSD/USDC',
+          decimals: 18,
+          tokenInterface: 'ERC20',
+          tokenType: 'Underlying',
+        },
+        {
+          id: '0x498bf2b1e120fed3ad3d42ea2165e9b73f99c1e5',
+          address: '0x498bf2b1e120fed3ad3d42ea2165e9b73f99c1e5',
+          network: Network.arbitrum,
+          symbol: 'crvUSD',
+          name: 'Curve.Fi USD Stablecoin',
+          decimals: 18,
+          tokenInterface: 'ERC20',
           tokenType: 'Underlying',
         },
       ],

packages/features/liquidity/src/liquidity-leveraged/hooks/use-liquidity-details.tsx

@@ -137,25 +137,6 @@ export const useLiquidityDetails = () => {
         greenOnArrowUp: true,
       },
     },
-    {
-      label: 'Net Worth',
-      current: currentHoldings?.presentValue.toDisplayStringWithSymbol() || '-',
-      updated: {
-        value: newNetWorth?.toDisplayStringWithSymbol() || '-',
-        arrowUp:
-          getChangeType(
-            currentHoldings?.presentValue.toFloat(),
-            newNetWorth?.toFloat()
-          ) === 'increase',
-        checkmark:
-          getChangeType(
-            currentHoldings?.presentValue.toFloat(),
-            newNetWorth?.toFloat()
-          ) === 'cleared',
-        greenOnCheckmark: false,
-        greenOnArrowUp: true,
-      },
-    },
     {
       label: 'Leverage Ratio',
       current: currentHoldings?.leverageRatio

packages/features/liquidity/src/liquidity-leveraged/side-drawers/create-increase-position.tsx

@@ -56,7 +56,7 @@ export const CreateOrIncreasePosition = () => {
       {currentPosition ? (
         <ManageTerms
           borrowType={
-            currentPosition.debt.tokenType === 'PrimeDebt'
+            currentPosition.debt.balance.tokenType === 'PrimeDebt'
               ? 'Variable'
               : 'Fixed'
           }

packages/features/portfolio/src/side-drawers/convert-asset.tsx

@@ -1,31 +1,31 @@
-import { Box, useTheme } from '@mui/material';
+import { Box } from '@mui/material';
 import { TokenBalance } from '@notional-finance/core-entities';
-import { SideBarSubHeader, useCurrencyInputRef } from '@notional-finance/mui';
+import { useCurrencyInputRef } from '@notional-finance/mui';
 import { useTradeContext } from '@notional-finance/notionable-hooks';
 import { AssetInput } from '@notional-finance/trade';
 import { PORTFOLIO_ACTIONS } from '@notional-finance/util';
-import { defineMessage } from 'react-intl';
 import { PortfolioSideDrawer } from './components/portfolio-side-drawer';
 import { SelectConvertAsset } from './components/select-convert-asset';
 import { messages } from './messages';
 import { useState } from 'react';
 
 export const ConvertAsset = () => {
-  const theme = useTheme();
   const context = useTradeContext('ConvertAsset');
   const { currencyInputRef } = useCurrencyInputRef();
   const {
     state: { collateral },
     updateState,
   } = context;
-  const [hasUserTouched, setHasUserTouched] = useState<boolean>(false)
+  const [hasUserTouched, setHasUserTouched] = useState<boolean>(false);
 
   const onBalanceChange = (
     inputAmount: TokenBalance | undefined,
     _: TokenBalance | undefined,
     maxBalance: TokenBalance | undefined
   ) => {
-    if (inputAmount) setHasUserTouched(true)
+    // Fixes a race condition where the screen flashes
+    if (inputAmount === undefined && hasUserTouched === false) return;
+    if (inputAmount) setHasUserTouched(true);
     updateState({
       debtBalance: inputAmount,
       maxWithdraw: maxBalance && inputAmount?.neg().eq(maxBalance),
@@ -35,19 +35,10 @@ export const ConvertAsset = () => {
   return (
     <Box>
       <Box sx={{ display: collateral === undefined ? 'block' : 'none' }}>
-        <SelectConvertAsset context={context} hasUserTouched={hasUserTouched}/>
+        <SelectConvertAsset context={context} hasUserTouched={hasUserTouched} />
       </Box>
       {collateral && (
         <PortfolioSideDrawer context={context}>
-          <SideBarSubHeader
-            callback={() => updateState({ collateral: undefined })}
-            sx={{
-              position: 'absolute',
-              top: 0,
-              background: theme.palette.background.paper,
-            }}
-            titleText={defineMessage({ defaultMessage: 'Back' })}
-          ></SideBarSubHeader>
           <AssetInput
             ref={currencyInputRef}
             debtOrCollateral="Debt"

packages/features/portfolio/src/side-drawers/roll-debt.tsx

@@ -1,17 +1,15 @@
-import { Box, useTheme } from '@mui/material';
+import { Box } from '@mui/material';
 import { TokenBalance } from '@notional-finance/core-entities';
-import { SideBarSubHeader, useCurrencyInputRef } from '@notional-finance/mui';
+import { useCurrencyInputRef } from '@notional-finance/mui';
 import { useTradeContext } from '@notional-finance/notionable-hooks';
 import { AssetInput } from '@notional-finance/trade';
 import { PORTFOLIO_ACTIONS } from '@notional-finance/util';
-import { defineMessage } from 'react-intl';
 import { PortfolioSideDrawer } from './components/portfolio-side-drawer';
 import { SelectConvertAsset } from './components/select-convert-asset';
 import { messages } from './messages';
 import { useState } from 'react';
 
 export const RollDebt = () => {
-  const theme = useTheme();
   const context = useTradeContext('RollDebt');
   const { currencyInputRef } = useCurrencyInputRef();
   const {
@@ -25,6 +23,8 @@ export const RollDebt = () => {
     _: TokenBalance | undefined,
     maxBalance: TokenBalance | undefined
   ) => {
+    // Fixes a race condition where the screen flashes
+    if (inputAmount === undefined && hasUserTouched === false) return;
     if (inputAmount) setHasUserTouched(true);
     updateState({
       collateralBalance: inputAmount,
@@ -42,15 +42,6 @@ export const RollDebt = () => {
           context={context}
           enablePrimeBorrow={debt?.tokenType === 'PrimeDebt'}
         >
-          <SideBarSubHeader
-            callback={() => updateState({ debt: undefined })}
-            sx={{
-              position: 'absolute',
-              top: 0,
-              background: theme.palette.background.paper,
-            }}
-            titleText={defineMessage({ defaultMessage: 'Back' })}
-          />
           <AssetInput
             ref={currencyInputRef}
             debtOrCollateral="Collateral"

packages/features/portfolio/src/side-drawers/withdraw.tsx

@@ -28,6 +28,7 @@ export const Withdraw = () => {
     setCurrencyInput,
     onMaxValue,
     maxWithdrawUnderlying,
+    belowMaxWarning,
   } = useMaxWithdraw(context);
   const {
     state: { selectedNetwork },
@@ -59,6 +60,7 @@ export const Withdraw = () => {
         context={context}
         inputRef={currencyInputRef}
         maxWithdraw={maxWithdrawUnderlying}
+        warningMsg={belowMaxWarning}
         onMaxValue={onMaxValue}
         newRoute={(newToken) =>
           `/portfolio/${selectedNetwork}/${category}/${sideDrawerKey}/${newToken}`

packages/features/vault/src/components/vault-side-drawer.tsx

@@ -2,7 +2,6 @@ import { ToggleSwitchProps } from '@notional-finance/mui';
 import { TransactionSidebar } from '@notional-finance/trade';
 import { useHistory } from 'react-router';
 import { messages } from '../messages';
-import { VaultDetailsTable } from './vault-details-table';
 import {
   VaultContext,
   useVaultProperties,
@@ -43,14 +42,12 @@ export const VaultSideDrawer = ({
       showDrawer={false}
       heading={messages[tradeType].heading}
       advancedToggle={advancedToggle}
-      onCancelRouteCallback={() => history.push(`/vaults/${selectedNetwork}/${vaultAddress}`)}
+      onCancelRouteCallback={() =>
+        history.push(`/vaults/${selectedNetwork}/${vaultAddress}`)
+      }
       hideTextOnMobile={false}
       riskComponent={
-        tradeType === 'CreateVaultPosition' ? (
-          <CreateVaultLiquidationRisk key={'vault-risk-table'} state={state} />
-        ) : (
-          <VaultDetailsTable key={'vault-risk-table'} />
-        )
+        <CreateVaultLiquidationRisk key={'vault-risk-table'} state={state} />
       }
       helptext={{
         ...messages[tradeType].helptext,