From 0df26852ad20d72ead998d94c8718d4697278936 Mon Sep 17 00:00:00 2001
From: Michal Zielenkiewicz <michal@oasisprotocol.org>
Date: Tue, 14 May 2024 15:05:31 +0200
Subject: [PATCH 1/2] Remove usage of defaultProps in HomePage

---
 .../pages/HomePage/Graph/HelpScreen/index.tsx | 10 +++-------
 .../HomePage/Graph/ParaTimeSelector/index.tsx | 20 +++++++++----------
 src/stories/ButtonsShowroom.stories.tsx       |  3 ---
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/app/pages/HomePage/Graph/HelpScreen/index.tsx b/src/app/pages/HomePage/Graph/HelpScreen/index.tsx
index 62106eb97..b192b9c1d 100644
--- a/src/app/pages/HomePage/Graph/HelpScreen/index.tsx
+++ b/src/app/pages/HomePage/Graph/HelpScreen/index.tsx
@@ -34,12 +34,6 @@ const SwiperBox = styled(Box)(() => ({
   height: '40%',
 }))
 
-export const GetStartedBtn = styled(Button)({})
-GetStartedBtn.defaultProps = {
-  variant: 'contained',
-  color: 'primary',
-}
-
 interface Step {
   icon: ReactElement
   label: string
@@ -135,7 +129,9 @@ const HelpScreen: FC<HelpScreenProps> = ({ setParaTimeStep }) => {
         />
       )}
       {activeStep > 1 && (
-        <GetStartedBtn onClick={onGetStartedClick}>{t('home.helpScreen.getStarted')}</GetStartedBtn>
+        <Button variant="contained" color="primary" onClick={onGetStartedClick}>
+          {t('home.helpScreen.getStarted')}
+        </Button>
       )}
     </HelpScreenContainer>
   )
diff --git a/src/app/pages/HomePage/Graph/ParaTimeSelector/index.tsx b/src/app/pages/HomePage/Graph/ParaTimeSelector/index.tsx
index 7edb48278..f5883b775 100644
--- a/src/app/pages/HomePage/Graph/ParaTimeSelector/index.tsx
+++ b/src/app/pages/HomePage/Graph/ParaTimeSelector/index.tsx
@@ -97,10 +97,6 @@ export const ExploreBtn = styled(Button)(({ theme }) => ({
     paddingRight: theme.spacing(6),
   },
 }))
-ExploreBtn.defaultProps = {
-  color: 'secondary',
-  variant: 'contained',
-}
 
 export const ZoomOutBtn = styled(Button)(({ theme }) => ({
   color: theme.palette.layout.graphZoomOutText,
@@ -118,11 +114,7 @@ export const ZoomOutBtn = styled(Button)(({ theme }) => ({
     backgroundColor: 'transparent',
   },
 }))
-ZoomOutBtn.defaultProps = {
-  color: 'primary',
-  variant: 'text',
-  startIcon: <ChevronLeftIcon />,
-}
+
 const ZoomOutBtnFade = styled(Fade)(() => ({
   transitionDelay: '500ms !important',
 }))
@@ -267,13 +259,21 @@ const ParaTimeSelectorCmp: FC<ParaTimeSelectorProps> = ({
           </QuickPinchZoomOuter>
           {!isMobile && (
             <ZoomOutBtnFade in={graphZoomedIn}>
-              <ZoomOutBtn onClick={onZoomOutClick} disabled={disabled}>
+              <ZoomOutBtn
+                color="primary"
+                variant="text"
+                startIcon={<ChevronLeftIcon />}
+                onClick={onZoomOutClick}
+                disabled={disabled}
+              >
                 {t('home.zoomOutBtnText')}
               </ZoomOutBtn>
             </ZoomOutBtnFade>
           )}
           {isMobile && ParaTimeSelectorUtils.showExploreBtn(step) && (
             <ExploreBtn
+              color="secondary"
+              variant="contained"
               onClick={onExploreClick}
               aria-label={exploreBtnTextTranslated}
               sx={{ position: 'absolute', top: '50%', left: '50%', transform: 'translate(-50%, -50%)' }}
diff --git a/src/stories/ButtonsShowroom.stories.tsx b/src/stories/ButtonsShowroom.stories.tsx
index 72e86cad8..b2b124432 100644
--- a/src/stories/ButtonsShowroom.stories.tsx
+++ b/src/stories/ButtonsShowroom.stories.tsx
@@ -3,7 +3,6 @@ import { SearchButton } from '../app/components/Search'
 import { SuggestionButton } from '../app/components/Search/SearchSuggestionsButtons'
 import { Select } from '../app/components/Select'
 import { ExploreBtn, ZoomOutBtn } from '../app/pages/HomePage/Graph/ParaTimeSelector'
-import { GetStartedBtn } from '../app/pages/HomePage/Graph/HelpScreen'
 import { ViewResultButton } from '../app/pages/SearchResultsPage/ResultsGroupByType'
 import { LoadMoreButton } from '../app/components/LoadMoreButton'
 import { withRouter } from 'storybook-addon-react-router-v6'
@@ -28,8 +27,6 @@ const Template: StoryFn = () => {
       <Select options={[{ label: 'Select', value: 'Select' }]} />
       <br />
       <br />
-
-      <GetStartedBtn>GetStartedBtn</GetStartedBtn>
       <ExploreBtn>ExploreBtn</ExploreBtn>
       <ZoomOutBtn>ZoomOutBtn</ZoomOutBtn>
       <br />

From 67c65494bc08b27fc6459495ee986cae630727f0 Mon Sep 17 00:00:00 2001
From: Michal Zielenkiewicz <michal@oasisprotocol.org>
Date: Tue, 14 May 2024 17:04:17 +0200
Subject: [PATCH 2/2] Remove usage of defaultProps in Search

---
 .changelog/1414.internal.md                       |  1 +
 .../Search/SearchSuggestionsButtons.tsx           | 12 ++++++------
 src/app/components/Search/index.tsx               | 12 ++++++------
 .../SearchResultsPage/ResultsGroupByType.tsx      | 15 ++-------------
 src/stories/ButtonsShowroom.stories.tsx           |  2 --
 5 files changed, 15 insertions(+), 27 deletions(-)
 create mode 100644 .changelog/1414.internal.md

diff --git a/.changelog/1414.internal.md b/.changelog/1414.internal.md
new file mode 100644
index 000000000..877daeab0
--- /dev/null
+++ b/.changelog/1414.internal.md
@@ -0,0 +1 @@
+Remove usage of deprecated React API
diff --git a/src/app/components/Search/SearchSuggestionsButtons.tsx b/src/app/components/Search/SearchSuggestionsButtons.tsx
index 16684a0e2..c465c4ded 100644
--- a/src/app/components/Search/SearchSuggestionsButtons.tsx
+++ b/src/app/components/Search/SearchSuggestionsButtons.tsx
@@ -1,7 +1,7 @@
 import { FC } from 'react'
 import Typography from '@mui/material/Typography'
 import { styled } from '@mui/material/styles'
-import Button from '@mui/material/Button'
+import Button, { ButtonProps } from '@mui/material/Button'
 import { Trans, useTranslation } from 'react-i18next'
 import { COLORS } from '../../../styles/theme/colors'
 import WidgetsIcon from '@mui/icons-material/Widgets'
@@ -12,7 +12,7 @@ import { searchSuggestionTerms } from './search-utils'
 import { OptionalBreak } from '../OptionalBreak'
 import { SearchScope } from '../../../types/searchScope'
 
-const PlainTextButton = styled(Button)({
+const StyledPlainTextButton = styled(Button)({
   fontSize: 'inherit',
   textTransform: 'none',
   paddingLeft: 0,
@@ -20,10 +20,10 @@ const PlainTextButton = styled(Button)({
   minWidth: 0,
   height: '1em',
 })
-PlainTextButton.defaultProps = {
-  variant: 'text',
-  color: 'inherit',
-}
+
+const PlainTextButton = (props: ButtonProps) => (
+  <StyledPlainTextButton variant="text" color="inherit" {...props} />
+)
 
 export const SuggestionButton = styled(PlainTextButton)({
   gap: '0.2ch', // Space after icon
diff --git a/src/app/components/Search/index.tsx b/src/app/components/Search/index.tsx
index 897fc9969..7887208f6 100644
--- a/src/app/components/Search/index.tsx
+++ b/src/app/components/Search/index.tsx
@@ -3,7 +3,7 @@ import { useNavigate, useSearchParams } from 'react-router-dom'
 import TextField, { textFieldClasses } from '@mui/material/TextField'
 import InputAdornment, { inputAdornmentClasses } from '@mui/material/InputAdornment'
 import { styled } from '@mui/material/styles'
-import Button from '@mui/material/Button'
+import Button, { ButtonProps } from '@mui/material/Button'
 import Box from '@mui/material/Box'
 import SearchIcon from '@mui/icons-material/Search'
 import { useTranslation } from 'react-i18next'
@@ -70,7 +70,7 @@ const SearchForm = styled('form', {
 
 interface SearchButtonProps extends StyledBaseProps {}
 
-export const SearchButton = styled(Button, {
+export const StyledSearchButton = styled(Button, {
   shouldForwardProp: (prop: PropertyKey) =>
     !(['searchVariant'] as (keyof SearchButtonProps)[]).includes(prop as keyof SearchButtonProps),
 })<SearchButtonProps>(({ theme, searchVariant }) => ({
@@ -90,10 +90,10 @@ export const SearchButton = styled(Button, {
       }
     : {}),
 }))
-SearchButton.defaultProps = {
-  variant: 'contained',
-  color: 'primary',
-}
+
+export const SearchButton = (props: ButtonProps & SearchButtonProps) => (
+  <StyledSearchButton variant="contained" color="primary" {...props} />
+)
 
 export interface SearchProps {
   scope?: SearchScope
diff --git a/src/app/pages/SearchResultsPage/ResultsGroupByType.tsx b/src/app/pages/SearchResultsPage/ResultsGroupByType.tsx
index c4804d58b..686b785b5 100644
--- a/src/app/pages/SearchResultsPage/ResultsGroupByType.tsx
+++ b/src/app/pages/SearchResultsPage/ResultsGroupByType.tsx
@@ -3,7 +3,6 @@ import { Link as RouterLink } from 'react-router-dom'
 import Button from '@mui/material/Button'
 import Box from '@mui/material/Box'
 import Divider from '@mui/material/Divider'
-import { styled } from '@mui/material/styles'
 import Typography from '@mui/material/Typography'
 
 interface Props<T> {
@@ -14,16 +13,6 @@ interface Props<T> {
   linkLabel: string
 }
 
-export const ViewResultButton = (() => {
-  const ViewResultButton = styled(Button)({})
-  ViewResultButton.defaultProps = {
-    variant: 'contained',
-    color: 'primary',
-  }
-  // Type cast is needed because styled type breaks `<ViewResultButton component={RouterLink}`
-  return ViewResultButton as typeof Button
-})()
-
 /**
  * Component for displaying search results of the same type, from the same network.
  *
@@ -51,9 +40,9 @@ export function ResultsGroupByType<T>({ title, results, resultComponent, link, l
         <div key={i}>
           {resultComponent(item)}
           <Box sx={{ display: 'flex', justifyContent: 'center', mt: 5 }}>
-            <ViewResultButton component={RouterLink} to={link(item)}>
+            <Button variant="contained" color="primary" component={RouterLink} to={link(item)}>
               {linkLabel}
-            </ViewResultButton>
+            </Button>
           </Box>
           {i < results.length - 1 && <Divider variant="card" />}
         </div>
diff --git a/src/stories/ButtonsShowroom.stories.tsx b/src/stories/ButtonsShowroom.stories.tsx
index b2b124432..5b2f6461f 100644
--- a/src/stories/ButtonsShowroom.stories.tsx
+++ b/src/stories/ButtonsShowroom.stories.tsx
@@ -3,7 +3,6 @@ import { SearchButton } from '../app/components/Search'
 import { SuggestionButton } from '../app/components/Search/SearchSuggestionsButtons'
 import { Select } from '../app/components/Select'
 import { ExploreBtn, ZoomOutBtn } from '../app/pages/HomePage/Graph/ParaTimeSelector'
-import { ViewResultButton } from '../app/pages/SearchResultsPage/ResultsGroupByType'
 import { LoadMoreButton } from '../app/components/LoadMoreButton'
 import { withRouter } from 'storybook-addon-react-router-v6'
 import WidgetsIcon from '@mui/icons-material/Widgets'
@@ -17,7 +16,6 @@ const Template: StoryFn = () => {
   return (
     <div>
       <SearchButton searchVariant="button">SearchButton</SearchButton>
-      <ViewResultButton>ViewResultButton</ViewResultButton>
       <SuggestionButton>
         <WidgetsIcon sx={{ fontSize: '18px' }} /> SuggestionButton
       </SuggestionButton>