Implement highlighting matches in account names

oasisprotocol · Feb 28, 2024 · cf0f431 · cf0f431
1 parent 33ad4aa
commit cf0f431
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 8 deletions.
diff --git a/.changelog/1246.feature.md b/.changelog/1246.feature.md
@@ -0,0 +1 @@
+Initial support for displaying account names
diff --git a/src/app/components/Account/AccountLink.tsx b/src/app/components/Account/AccountLink.tsx
@@ -11,6 +11,8 @@ import { useAccountName } from '../../hooks/useAccountName'
 import { trimLongString } from '../../utils/trimLongString'
 import { MaybeWithTooltip } from '../AdaptiveTrimmer/MaybeWithTooltip'
 import Box from '@mui/material/Box'
+import { HighlightedText } from '../HighlightedText'
+import { AdaptiveHighlightedText } from '../HighlightedText/AdaptiveHighlightedText'
 import { AdaptiveTrimmer } from '../AdaptiveTrimmer/AdaptiveTrimmer'
 
 const WithTypographyAndLink: FC<{
@@ -60,13 +62,18 @@ export const AccountLink: FC<{
    */
   plain?: boolean
 
+  /**
+   * What part of the name should be highlighted (if any)
+   */
+  highlightedPartOfName?: string | undefined
+
   /**
    * Any extra tooltips to display
    *
    * (Besides the content necessary because of potential shortening)
    */
   extraTooltip?: ReactNode
-}> = ({ scope, address, alwaysTrim, plain, extraTooltip }) => {
+}> = ({ scope, address, alwaysTrim, plain, highlightedPartOfName, extraTooltip }) => {
   const { isTablet } = useScreenSize()
   const { name: accountName } = useAccountName(scope, address)
   const to = RouteUtils.getAccountRoute(scope, address)
@@ -112,7 +119,7 @@ export const AccountLink: FC<{
         <MaybeWithTooltip title={tooltipPostfix}>
           {accountName ? (
             <span>
-              {accountName} ({address})
+              <HighlightedText text={accountName} pattern={highlightedPartOfName} /> ({address})
             </span>
           ) : (
             address
@@ -128,7 +135,11 @@ export const AccountLink: FC<{
   return (
     <WithTypographyAndLink to={to} plain={plain} mobile>
       <>
-        <AdaptiveTrimmer text={accountName} strategy="end" extraTooltip={extraTooltip} />
+        <AdaptiveHighlightedText
+          text={accountName}
+          pattern={highlightedPartOfName}
+          extraTooltip={extraTooltip}
+        />
         <AdaptiveTrimmer text={address} strategy="middle" extraTooltip={extraTooltip} />
       </>
     </WithTypographyAndLink>

diff --git a/src/app/components/Account/index.tsx b/src/app/components/Account/index.tsx
@@ -30,9 +30,17 @@ type AccountProps = {
   isLoading: boolean
   tokenPrices: AllTokenPrices
   showLayer?: boolean
+  highlightedPartOfName: string | undefined
 }
 
-export const Account: FC<AccountProps> = ({ account, token, isLoading, tokenPrices, showLayer }) => {
+export const Account: FC<AccountProps> = ({
+  account,
+  token,
+  isLoading,
+  tokenPrices,
+  showLayer,
+  highlightedPartOfName,
+}) => {
   const { t } = useTranslation()
   const { isMobile } = useScreenSize()
   const address = account ? account.address_eth ?? account.address : undefined
@@ -67,7 +75,7 @@ export const Account: FC<AccountProps> = ({ account, token, isLoading, tokenPric
             <AccountAvatar address={account.address} />
           </StyledListTitleWithAvatar>
           <dd>
-            <AccountLink scope={account} address={address!} />
+            <AccountLink scope={account} address={address!} highlightedPartOfName={highlightedPartOfName} />
             <CopyToClipboard value={address!} />
           </dd>
 

diff --git a/src/app/pages/AccountDetailsPage/AccountDetailsCard.tsx b/src/app/pages/AccountDetailsPage/AccountDetailsCard.tsx
@@ -12,6 +12,7 @@ type AccountDetailsProps = {
   account: RuntimeAccount | undefined
   token: EvmToken | undefined
   tokenPrices: AllTokenPrices
+  highlightedPartOfName?: string | undefined
 }
 
 export const AccountDetailsCard: FC<AccountDetailsProps> = ({
@@ -21,6 +22,7 @@ export const AccountDetailsCard: FC<AccountDetailsProps> = ({
   account,
   token,
   tokenPrices,
+  highlightedPartOfName,
 }) => {
   const { t } = useTranslation()
   return (
@@ -35,6 +37,7 @@ export const AccountDetailsCard: FC<AccountDetailsProps> = ({
         account={account}
         token={token}
         tokenPrices={tokenPrices}
+        highlightedPartOfName={highlightedPartOfName}
       />
     </SubPageCard>
   )

diff --git a/src/app/pages/AccountDetailsPage/AccountDetailsView.tsx b/src/app/pages/AccountDetailsPage/AccountDetailsView.tsx
@@ -12,7 +12,8 @@ export const AccountDetailsView: FC<{
   token?: EvmToken
   tokenPrices: AllTokenPrices
   showLayer?: boolean
-}> = ({ isLoading, isError, account, token, tokenPrices, showLayer }) => {
+  highlightedPartOfName?: string | undefined
+}> = ({ isLoading, isError, account, token, tokenPrices, showLayer, highlightedPartOfName }) => {
   const { t } = useTranslation()
   return isError ? (
     <CardEmptyState label={t('account.cantLoadDetails')} />
@@ -23,6 +24,7 @@ export const AccountDetailsView: FC<{
       isLoading={isLoading}
       tokenPrices={tokenPrices}
       showLayer={showLayer}
+      highlightedPartOfName={highlightedPartOfName}
     />
   )
 }
diff --git a/src/app/pages/AccountDetailsPage/DeferredConsensusAccountDetails.tsx b/src/app/pages/AccountDetailsPage/DeferredConsensusAccountDetails.tsx
@@ -9,6 +9,7 @@ export const DeferredConsensusAccountDetails: FC<{
   network: Network
   address: string
   tokenPrices: AllTokenPrices
+  highlightedPartOfName: string | undefined
   showLayer?: boolean
 }> = () =>
   // {

diff --git a/src/app/pages/AccountDetailsPage/DeferredRuntimeAccountDetails.tsx b/src/app/pages/AccountDetailsPage/DeferredRuntimeAccountDetails.tsx
@@ -12,8 +12,9 @@ export const DeferredRuntimeAccountDetails: FC<{
   layer: Runtime
   address: string
   tokenPrices: AllTokenPrices
+  highlightedPartOfName: string | undefined
   showLayer?: boolean
-}> = ({ network, layer, address, tokenPrices, showLayer }) => {
+}> = ({ network, layer, address, tokenPrices, highlightedPartOfName, showLayer }) => {
   const { data, isLoading, isError } = useGetRuntimeAccountsAddress(network, layer, address)
   return (
     <AccountDetailsView
@@ -22,6 +23,7 @@ export const DeferredRuntimeAccountDetails: FC<{
       account={data?.data}
       tokenPrices={tokenPrices}
       showLayer={showLayer}
+      highlightedPartOfName={highlightedPartOfName}
     />
   )
 }
diff --git a/src/app/pages/AccountDetailsPage/index.tsx b/src/app/pages/AccountDetailsPage/index.tsx
@@ -32,7 +32,7 @@ export const AccountDetailsPage: FC = () => {
   const { t } = useTranslation()
 
   const scope = useRequiredScopeParam()
-  const { address } = useLoaderData() as AddressLoaderData
+  const { address, searchTerm } = useLoaderData() as AddressLoaderData
   const { account, isLoading: isAccountLoading, isError } = useAccount(scope, address)
   const isContract = !!account?.evm_contract
   const { token, isLoading: isTokenLoading } = useTokenInfo(scope, address, isContract)
@@ -62,6 +62,7 @@ export const AccountDetailsPage: FC = () => {
         account={account}
         token={token}
         tokenPrices={tokenPrices}
+        highlightedPartOfName={searchTerm}
       />
       <DappBanner scope={scope} ethAddress={account?.address_eth} />
       <RouterTabs

diff --git a/src/app/pages/SearchResultsPage/SearchResultsList.tsx b/src/app/pages/SearchResultsPage/SearchResultsList.tsx
@@ -109,6 +109,7 @@ export const SearchResultsList: FC<{
                 network={item.network}
                 address={item.address}
                 tokenPrices={tokenPrices}
+                highlightedPartOfName={searchTerm}
                 showLayer={true}
               />
             ) : (
@@ -117,6 +118,7 @@ export const SearchResultsList: FC<{
                 layer={item.layer}
                 address={item.address}
                 tokenPrices={tokenPrices}
+                highlightedPartOfName={searchTerm}
                 showLayer={true}
               />
             )