Merge remote-tracking branch 'origin' into feat/add-alert-plasma-txhistory

Author: AGMASO

package.json

@@ -35,7 +35,7 @@
     "@aave/math-utils": "1.36.1",
     "@aave/react": "0.6.1",
     "@amplitude/analytics-browser": "^2.13.0",
-    "@bgd-labs/aave-address-book": "^4.31.0",
+    "@bgd-labs/aave-address-book": "^4.34.1",
     "@cowprotocol/app-data": "^3.1.0",
     "@cowprotocol/cow-sdk": "6.3.3",
     "@emotion/cache": "11.10.3",

public/icons/tokens/kbtc.svg

@@ -126,14 +126,16 @@ const MARKET_ORDER_BY_TITLE: { [title: string]: number } = {
   OP: 9,
   Gnosis: 10,
   Aptos: 11,
-  'BNB Chain': 12,
-  Polygon: 13,
-  Scroll: 14,
-  ZKsync: 15,
-  Celo: 16,
-  Metis: 17,
-  Soneium: 18,
-  EtherFi: 19,
+  Ink: 12,
+
+  'BNB Chain': 13,
+  Polygon: 14,
+  Scroll: 15,
+  ZKsync: 16,
+  Celo: 17,
+  Metis: 18,
+  Soneium: 19,
+  EtherFi: 20,
 };
 
 const getMarketOrder = (marketId: CustomMarket): number => {
@@ -185,6 +187,7 @@ export const MarketSwitcher = () => {
   };
 
   const marketBlurbs: { [key: string]: JSX.Element } = {
+    proto_ink_v3: <Trans>The Ink instance is governed by the Ink Foundation</Trans>,
     proto_mainnet_v3: (
       <Trans>Main Ethereum market with the largest selection of assets and yield options</Trans>
     ),

public/icons/tokens/syrupusdt.svg

@@ -127,6 +127,11 @@ const IncentivesSymbolMap: {
     symbol: 'aCELO',
     aToken: true,
   },
+  aCelcUSD: {
+    tokenIconSymbol: 'cUSD',
+    symbol: 'acUSD',
+    aToken: true,
+  },
   aGnoEURe: {
     tokenIconSymbol: 'EURe',
     symbol: 'aEURe',

public/icons/tokens/usdg.svg

@@ -7,6 +7,7 @@ import {
   MeritIncentivesBreakdown,
 } from 'src/hooks/useMeritIncentives';
 import { useModalContext } from 'src/hooks/useModal';
+import { useRootStore } from 'src/store/root';
 
 import { FormattedNumber } from '../primitives/FormattedNumber';
 import { Link, ROUTES } from '../primitives/Link';
@@ -112,6 +113,7 @@ export const MeritIncentivesTooltipContent = ({
 }) => {
   const theme = useTheme();
   const { openClaimRewards } = useModalContext();
+  const account = useRootStore((store) => store.account);
   const typographyVariant = 'secondary12';
 
   const handleClaimClick = () => {
@@ -161,11 +163,7 @@ export const MeritIncentivesTooltipContent = ({
           does not guarantee the program and accepts no liability.
         </Trans>{' '}
         <Link
-          href={
-            meritIncentives.customForumLink
-              ? meritIncentives.customForumLink
-              : 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898'
-          }
+          href={'https://apps.aavechan.com/merit'}
           sx={{ textDecoration: 'underline' }}
           variant="caption"
           color="text.secondary"
@@ -231,22 +229,30 @@ export const MeritIncentivesTooltipContent = ({
         {campaignConfig.type === CampaignType.SELF_VERIFICATION && selfConfig ? (
           <>
             <Trans>Merit Program and Self rewards can be claimed </Trans>
-            <Typography
-              component="span"
-              onClick={handleClaimClick}
-              sx={{
-                textDecoration: 'underline',
-                cursor: 'pointer',
-                fontSize: '13px !important',
-                fontWeight: 'bold',
-                mx: 0.5,
-              }}
-              variant="caption"
-              color="primary"
-            >
-              <Trans>here</Trans>
-            </Typography>
-            <Trans> or from the </Trans>
+            {account ? (
+              <>
+                <Typography
+                  component="span"
+                  onClick={handleClaimClick}
+                  sx={{
+                    textDecoration: 'underline',
+                    cursor: 'pointer',
+                    fontSize: '13px !important',
+                    fontWeight: 'bold',
+                    mx: 0.5,
+                  }}
+                  variant="caption"
+                  color="primary"
+                >
+                  <Trans>here</Trans>
+                </Typography>
+                <Trans> or from the </Trans>
+              </>
+            ) : (
+              <span style={{ marginLeft: '4px' }}>
+                <Trans>from the </Trans>
+              </span>
+            )}
             <Link
               href={`${ROUTES.dashboard}`}
               sx={{
@@ -265,22 +271,30 @@ export const MeritIncentivesTooltipContent = ({
         ) : (
           <>
             <Trans>Merit Program rewards can be claimed </Trans>
-            <Typography
-              component="span"
-              onClick={handleClaimClick}
-              sx={{
-                textDecoration: 'underline',
-                cursor: 'pointer',
-                fontSize: '13px !important',
-                fontWeight: 'bold',
-                mx: 0.5,
-              }}
-              variant="caption"
-              color="primary"
-            >
-              <Trans>here</Trans>
-            </Typography>
-            <Trans> or from the </Trans>
+            {account ? (
+              <>
+                <Typography
+                  component="span"
+                  onClick={handleClaimClick}
+                  sx={{
+                    textDecoration: 'underline',
+                    cursor: 'pointer',
+                    fontSize: '13px !important',
+                    fontWeight: 'bold',
+                    mx: 0.5,
+                  }}
+                  variant="caption"
+                  color="primary"
+                >
+                  <Trans>here</Trans>
+                </Typography>
+                <Trans> or from the </Trans>
+              </>
+            ) : (
+              <span style={{ marginLeft: '4px' }}>
+                <Trans>from the </Trans>
+              </span>
+            )}
             <Link
               href={`${ROUTES.dashboard}`}
               sx={{