feat: scaffold APY range select

aave · Dec 17, 2024 · d4515eb · d4515eb
1 parent 4d82ed8
commit d4515eb
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 13 deletions.
diff --git a/src/components/HistoricalAPYRow.tsx b/src/components/HistoricalAPYRow.tsx
@@ -0,0 +1,100 @@
+import { SxProps, Theme, ToggleButton, ToggleButtonGroup, Typography } from '@mui/material';
+
+const supportedHistoricalTimeRangeOptions = ['Now', '30D', '60D', '90D'] as const;
+
+export enum ESupportedAPYTimeRanges {
+  Now = 'Now',
+  ThirtyDays = '30D',
+  SixtyDays = '60D',
+  NinetyDays = '90D',
+}
+
+export const reserveHistoricalRateTimeRangeOptions = [
+  ESupportedAPYTimeRanges.Now,
+  ESupportedAPYTimeRanges.ThirtyDays,
+  ESupportedAPYTimeRanges.SixtyDays,
+  ESupportedAPYTimeRanges.NinetyDays,
+];
+
+export type ReserveHistoricalRateTimeRange = typeof reserveHistoricalRateTimeRangeOptions[number];
+
+export interface TimeRangeSelectorProps {
+  disabled?: boolean;
+  selectedTimeRange: ESupportedAPYTimeRanges;
+  onTimeRangeChanged: (value: ESupportedAPYTimeRanges) => void;
+  sx?: {
+    buttonGroup: SxProps<Theme>;
+    button: SxProps<Theme>;
+  };
+}
+
+export const HistoricalAPYRow = ({
+  disabled = false,
+  selectedTimeRange,
+  onTimeRangeChanged,
+  ...props
+}: TimeRangeSelectorProps) => {
+  const handleChange = (
+    _event: React.MouseEvent<HTMLElement>,
+    newInterval: ESupportedAPYTimeRanges
+  ) => {
+    if (newInterval !== null) {
+      onTimeRangeChanged(newInterval);
+    }
+  };
+
+  return (
+    <div
+      style={{
+        display: 'flex',
+        justifyContent: 'center',
+        alignItems: 'center',
+        gap: '10px',
+      }}
+    >
+      <Typography variant="secondary14">APY</Typography>
+      <ToggleButtonGroup
+        disabled={disabled}
+        value={selectedTimeRange}
+        exclusive
+        onChange={handleChange}
+        aria-label="Date range"
+        sx={{
+          height: '24px',
+          '&.MuiToggleButtonGroup-grouped': {
+            borderRadius: 'unset',
+          },
+          ...props.sx?.buttonGroup,
+        }}
+      >
+        {supportedHistoricalTimeRangeOptions.map((interval) => {
+          return (
+            <ToggleButton
+              key={interval}
+              value={interval}
+              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+              // @ts-ignore
+              sx={(theme): SxProps<Theme> | undefined => ({
+                '&.MuiToggleButtonGroup-grouped:not(.Mui-selected), &.MuiToggleButtonGroup-grouped&.Mui-disabled':
+                  {
+                    border: '0.5px solid transparent',
+                    backgroundColor: 'background.surface',
+                    color: 'action.disabled',
+                  },
+                '&.MuiToggleButtonGroup-grouped&.Mui-selected': {
+                  borderRadius: '4px',
+                  border: `0.5px solid ${theme.palette.divider}`,
+                  boxShadow: '0px 2px 1px rgba(0, 0, 0, 0.05), 0px 0px 1px rgba(0, 0, 0, 0.25)',
+                  backgroundColor: 'background.paper',
+                },
+                ...props.sx?.button,
+              })}
+            >
+              <Typography variant="buttonM">{interval}</Typography>
+            </ToggleButton>
+          );
+        })}
+      </ToggleButtonGroup>
+    </div>
+  );
+};
diff --git a/src/components/TitleWithSearchBar.tsx b/src/components/TitleWithSearchBar.tsx
@@ -28,13 +28,10 @@ export const TitleWithSearchBar = <T extends React.ElementType>({
   title,
 }: TitleWithSearchBarProps<T>) => {
   const [showSearchBar, setShowSearchBar] = useState(false);
-
   const { breakpoints } = useTheme();
   const sm = useMediaQuery(breakpoints.down('sm'));
-
   const showSearchIcon = sm && !showSearchBar;
-  const showMarketTitle = !sm || !showSearchBar;
-
+  const showMarketTitle = (!sm || !showSearchBar) && !!title;
   const handleCancelClick = () => {
     setShowSearchBar(false);
     onSearchTermChange('');
@@ -46,7 +43,7 @@ export const TitleWithSearchBar = <T extends React.ElementType>({
         width: '100%',
         display: 'flex',
         alignItems: 'center',
-        justifyContent: 'space-between',
+        justifyContent: showMarketTitle && title ? 'space-between' : 'center',
       }}
     >
       {showMarketTitle && (

diff --git a/src/modules/markets/MarketAssetsListContainer.tsx b/src/modules/markets/MarketAssetsListContainer.tsx
@@ -16,6 +16,11 @@ import { getGhoReserve, GHO_MINTING_MARKETS, GHO_SYMBOL } from 'src/utils/ghoUti
 
 import { GENERAL } from '../../utils/mixPanelEvents';
 import { GhoBanner } from './Gho/GhoBanner';
+import {
+  ESupportedAPYTimeRanges,
+  HistoricalAPYRow,
+  ReserveHistoricalRateTimeRange,
+} from 'src/components/HistoricalAPYRow';
 
 function shouldDisplayGhoBanner(marketTitle: string, searchTerm: string): boolean {
   // GHO banner is only displayed on markets where new GHO is mintable (i.e. Ethereum)
@@ -75,6 +80,9 @@ export const MarketAssetsListContainer = () => {
   //   marketFrozen && ['Fantom', 'Ethereum AMM'].includes(currentMarketData.marketTitle);
   const unfrozenReserves = filteredData.filter((r) => !r.isFrozen && !r.isPaused);
   const [showFrozenMarketsToggle, setShowFrozenMarketsToggle] = useState(false);
+  const [selectedTimeRange, setSelectedTimeRange] = useState<ReserveHistoricalRateTimeRange>(
+    ESupportedAPYTimeRanges.Now
+  );
 
   const handleChange = () => {
     setShowFrozenMarketsToggle((prevState) => !prevState);
@@ -85,15 +93,38 @@ export const MarketAssetsListContainer = () => {
   return (
     <ListWrapper
       titleComponent={
-        <TitleWithSearchBar
-          onSearchTermChange={setSearchTerm}
-          title={
-            <>
+        <div
+          style={{
+            display: 'flex',
+            alignItems: 'center',
+            width: '100%',
+          }}
+        >
+          {/* Left: Title */}
+          <div style={{ flex: 1, display: 'flex', justifyContent: 'flex-start' }}>
+            <Typography variant="h2" component="div">
               {currentMarketData.marketTitle} <Trans>assets</Trans>
-            </>
-          }
-          searchPlaceholder={sm ? 'Search asset' : 'Search asset name, symbol, or address'}
-        />
+            </Typography>
+          </div>
+
+          {/* Center: Search Bar */}
+          <div style={{ flex: 1, display: 'flex', justifyContent: 'center' }}>
+            <TitleWithSearchBar
+              onSearchTermChange={setSearchTerm}
+              title={null}
+              searchPlaceholder={sm ? 'Search asset' : 'Search asset name, symbol, or address'}
+            />
+          </div>
+
+          {/* Right: Historical APY */}
+          <div style={{ flex: 1, display: 'flex', justifyContent: 'flex-end' }}>
+            <HistoricalAPYRow
+              disabled={false}
+              selectedTimeRange={selectedTimeRange}
+              onTimeRangeChanged={setSelectedTimeRange}
+            />
+          </div>
+        </div>
       }
     >
       {displayGhoBanner && (