Revert "Merge master to aggron"

.prettierrc

@@ -2,6 +2,6 @@
   "trailingComma": "all",
   "semi": false,
   "singleQuote": true,
-  "printWidth": 130,
+  "printWidth": 120,
   "arrowParens": "avoid"
 }

src/__tests__/components/__snapshots__/Table.spec.tsx.snap

@@ -76,7 +76,7 @@ exports[`Table Component shallow renders 2`] = `
 exports[`Table Component shallow renders 3`] = `
 .c0 {
   width: 10px;
-  margin: auto 0;
+  line-height: 20px;
   text-align: center;
   margin: auto 0;
 }

src/__tests__/pages/__snapshots__/Home.spec.tsx.snap

@@ -342,7 +342,7 @@ exports[`Active Page shallow renders 1`] = `
                 Miner
               </span>
               <div
-                className="sc-fznzOf eVxyCl"
+                className="sc-fznzOf bKNQLi"
                 fontSize="14px"
                 width="10%"
               >
@@ -444,7 +444,7 @@ exports[`Active Page shallow renders 1`] = `
                 Miner
               </span>
               <div
-                className="sc-fznzOf eVxyCl"
+                className="sc-fznzOf bKNQLi"
                 fontSize="14px"
                 width="10%"
               >
@@ -546,7 +546,7 @@ exports[`Active Page shallow renders 1`] = `
                 Miner
               </span>
               <div
-                className="sc-fznzOf eVxyCl"
+                className="sc-fznzOf bKNQLi"
                 fontSize="14px"
                 width="10%"
               >

src/__tests__/pages/__snapshots__/StatisticCharts.spec.tsx.snap

@@ -5,7 +5,7 @@ exports[`Active Page shallow renders with empty data 1`] = `
   className="sc-fzqNJr dLfJWR"
 >
   <div
-    className="sc-fzoiQi cJWpwo container"
+    className="sc-fzoiQi ioDjAy container"
   >
     <div
       className="sc-fzqARJ dBcmJI"

src/components/Card/HashCard/index.tsx

@@ -11,17 +11,6 @@ import SmallLoading from '../../Loading/SmallLoading'
 import { useDispatch } from '../../../contexts/providers'
 import { HashCardPanel, LoadingPanel } from './styled'
 import SimpleButton from '../../SimpleButton'
-import { AppDispatch } from '../../../contexts/reducer'
-
-const copyAction = (dispatch: AppDispatch) => {
-  copyElementValue(document.getElementById('hash__value'))
-  dispatch({
-    type: AppActions.ShowToastMessage,
-    payload: {
-      message: i18n.t('common.copied'),
-    },
-  })
-}
 
 export default ({
   title,
@@ -73,7 +62,18 @@ export default ({
               <span className="monospace">{isMobile() ? mobileHash() : adaptPCEllipsis(hash, 13, 25)}</span>
             </div>
           )}
-          <SimpleButton className="hash__copy_icon" onClick={() => copyAction(dispatch)}>
+          <SimpleButton
+            className="hash__copy_icon"
+            onClick={() => {
+              copyElementValue(document.getElementById('hash__value'))
+              dispatch({
+                type: AppActions.ShowToastMessage,
+                payload: {
+                  message: i18n.t('common.copied'),
+                },
+              })
+            }}
+          >
             {!loading && <img src={CopyIcon} alt="copy" />}
           </SimpleButton>
         </div>

src/components/Content/index.tsx

@@ -10,7 +10,7 @@ const ContentPanel = styled.div`
   margin-top: 64px;
   background: #ededed;
 `
-export default ({ children, style }: { children?: ReactNode; style?: any }) => {
+export default ({ children, style }: { children: ReactNode; style?: any }) => {
   const {
     components: { mobileMenuVisible },
   } = useAppState()

src/components/Header/BlockchainComp/index.tsx

@@ -84,7 +84,12 @@ const BlockchainMenu = () => {
 
   return (
     <MobileSubMenuPanel showSubMenu={false}>
-      <SimpleButton className="mobile__menus__main__item" onClick={() => setShowSubMenu(!showSubMenu)}>
+      <SimpleButton
+        className="mobile__menus__main__item"
+        onClick={() => {
+          setShowSubMenu(!showSubMenu)
+        }}
+      >
         <div className="mobile__menus__main__item__content__highlight">
           {isMainnet() ? i18n.t('navbar.mainnet') : CONFIG.TESTNET_NAME.toUpperCase()}
         </div>

src/components/Header/LanguageComp/index.tsx

@@ -96,7 +96,12 @@ const LanguageMenu = () => {
 
   return (
     <MobileSubMenuPanel showSubMenu={false}>
-      <SimpleButton className="mobile__menus__main__item" onClick={() => setShowSubMenu(!showSubMenu)}>
+      <SimpleButton
+        className="mobile__menus__main__item"
+        onClick={() => {
+          setShowSubMenu(!showSubMenu)
+        }}
+      >
         <div className="mobile__menus__main__item__content">
           {currentLanguage() === 'en' ? i18n.t('navbar.language_en') : i18n.t('navbar.language_zh')}
         </div>
@@ -108,10 +113,20 @@ const LanguageMenu = () => {
       </SimpleButton>
       {showSubMenu && (
         <>
-          <SimpleButton className="mobile__menus__sub__item" onClick={() => hideMobileMenu(dispatch)}>
+          <SimpleButton
+            className="mobile__menus__sub__item"
+            onClick={() => {
+              hideMobileMenu(dispatch)
+            }}
+          >
             {currentLanguage() === 'en' ? i18n.t('navbar.language_en') : i18n.t('navbar.language_zh')}
           </SimpleButton>
-          <SimpleButton className="mobile__menus__sub__item" onClick={() => languageAction(dispatch)}>
+          <SimpleButton
+            className="mobile__menus__sub__item"
+            onClick={() => {
+              languageAction(dispatch)
+            }}
+          >
             {currentLanguage() === 'en' ? i18n.t('navbar.language_zh') : i18n.t('navbar.language_en')}
           </SimpleButton>
         </>

src/components/Header/SearchComp/index.tsx

@@ -6,16 +6,6 @@ import { isScreen750to1440 } from '../../../utils/screen'
 import { HeaderSearchBarPanel } from './styled'
 import { useDispatch, useAppState } from '../../../contexts/providers'
 import { ComponentActions } from '../../../contexts/actions'
-import { AppDispatch } from '../../../contexts/reducer'
-
-const headerSearchAction = (dispatch: AppDispatch) => {
-  dispatch({
-    type: ComponentActions.UpdateHeaderSearchEditable,
-    payload: {
-      searchBarEditable: true,
-    },
-  })
-}
 
 export const SearchComp = () => {
   const dispatch = useDispatch()
@@ -25,7 +15,19 @@ export const SearchComp = () => {
 
   if (isScreen750to1440() && !searchBarEditable) {
     return (
-      <HeaderSearchBarPanel onClick={() => headerSearchAction(dispatch)}>
+      <HeaderSearchBarPanel
+        role="button"
+        tabIndex={-1}
+        onKeyDown={() => {}}
+        onClick={() => {
+          dispatch({
+            type: ComponentActions.UpdateHeaderSearchEditable,
+            payload: {
+              searchBarEditable: true,
+            },
+          })
+        }}
+      >
         <img alt="header search bar" src={SearchLogo} />
       </HeaderSearchBarPanel>
     )

src/components/Header/SearchComp/styled.tsx

@@ -1,5 +1,4 @@
 import styled from 'styled-components'
-import SimpleButton from '../../SimpleButton'
 
 export const HeaderSearchPanel = styled.div`
   display: flex;
@@ -23,7 +22,7 @@ export const HeaderSearchPanel = styled.div`
   }
 `
 
-export const HeaderSearchBarPanel = styled(SimpleButton)`
+export const HeaderSearchBarPanel = styled.div`
   display: flex;
   align-items: center;
   margin-right: 30px;

src/components/Header/index.tsx

@@ -9,7 +9,6 @@ import { SearchComp } from './SearchComp'
 import LanguageComp from './LanguageComp'
 import BlockchainComp from './BlockchainComp'
 import { useLocation } from 'react-router'
-import { AppDispatch } from '../../contexts/reducer'
 
 const LogoComp = () => {
   return (
@@ -19,22 +18,22 @@ const LogoComp = () => {
   )
 }
 
-const headerMenuAction = (dispatch: AppDispatch, mobileMenuVisible: boolean) => {
-  dispatch({
-    type: ComponentActions.UpdateHeaderMobileMenuVisible,
-    payload: {
-      mobileMenuVisible: !mobileMenuVisible,
-    },
-  })
-}
-
 const MobileMenuComp = () => {
   const dispatch = useDispatch()
   const {
     components: { mobileMenuVisible },
   } = useAppState()
   return (
-    <HeaderMobileMenuPanel onClick={() => headerMenuAction(dispatch, mobileMenuVisible)}>
+    <HeaderMobileMenuPanel
+      onClick={() => {
+        dispatch({
+          type: ComponentActions.UpdateHeaderMobileMenuVisible,
+          payload: {
+            mobileMenuVisible: !mobileMenuVisible,
+          },
+        })
+      }}
+    >
       <div className={mobileMenuVisible ? 'close' : ''}>
         <div className="menu__icon__first" />
         <div className="menu__icon__second" />
@@ -55,7 +54,7 @@ export default () => {
     dispatch({
       type: ComponentActions.UpdateHeaderSearchBarVisible,
       payload: {
-        headerSearchBarVisible: pathname !== '/' && pathname !== '/search/fail',
+        headerSearchBarVisible: pathname !== '/' && pathname !== '/search/fail' && pathname !== '/maintain',
       },
     })
   }, [dispatch, pathname])

src/components/Search/Filter/index.tsx

@@ -48,34 +48,40 @@ const Filter = ({
   const [showClear, setShowClear] = useState(false)
   const inputElement = useRef<HTMLInputElement>(null)
 
-  const filterAction = (isClear?: boolean) => {
-    if (isClear) {
-      setShowClear(false)
-      clearFilterInput(inputElement)
-    }
-  }
-
-  const resetFilterAction = () => {
-    setShowReset(false)
-    setShowClear(false)
-    clearFilterInput(inputElement)
-    if (filterType === FilterType.DAO) {
-      getNervosDaoTransactions(dispatch, 1, PageParams.PageSize)
-    } else if (typeHash) {
-      getSimpleUDTTransactions(typeHash, 1, PageParams.PageSize, dispatch)
-    }
-  }
-
   const FilterIcon = ({ isClear }: { isClear?: boolean }) => {
     return (
-      <FilterImage isClear={isClear} onClick={() => filterAction(isClear)}>
+      <FilterImage
+        isClear={isClear}
+        onClick={() => {
+          if (isClear) {
+            setShowClear(false)
+            clearFilterInput(inputElement)
+          }
+        }}
+      >
         <img src={isClear ? ClearLogo : SearchFilter} alt="search logo" />
       </FilterImage>
     )
   }
 
   const ResetFilter = () => {
-    return <ResetButtonPanel onClick={() => resetFilterAction()}>{i18n.t('nervos_dao.dao_search_reset')}</ResetButtonPanel>
+    const dispatch = useDispatch()
+    return (
+      <ResetButtonPanel
+        onClick={() => {
+          setShowReset(false)
+          setShowClear(false)
+          clearFilterInput(inputElement)
+          if (filterType === FilterType.DAO) {
+            getNervosDaoTransactions(dispatch, 1, PageParams.PageSize)
+          } else if (typeHash) {
+            getSimpleUDTTransactions(typeHash, 1, PageParams.PageSize, dispatch)
+          }
+        }}
+      >
+        {i18n.t('nervos_dao.dao_search_reset')}
+      </ResetButtonPanel>
+    )
   }
 
   const handleSearchResult = () => {