Implement highlighting matches in account names in search results

oasisprotocol · May 16, 2024 · c14df63 · c14df63
1 parent 1358c4a
commit c14df63
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 5 deletions.
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 account={account} />
           </StyledListTitleWithAvatar>
           <dd>
-            <AccountLink scope={account} address={address!} />
+            <AccountLink scope={account} address={address!} highlightedPartOfName={highlightedPartOfName} />
             <CopyToClipboard value={address!} />
           </dd>
 

diff --git a/src/app/pages/ConsensusAccountDetailsPage/DeferredConsensusAccountDetails.tsx b/src/app/pages/ConsensusAccountDetailsPage/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/RuntimeAccountDetailsPage/AccountDetailsCard.tsx b/src/app/pages/RuntimeAccountDetailsPage/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 (
@@ -36,6 +38,7 @@ export const AccountDetailsCard: FC<AccountDetailsProps> = ({
         account={account}
         token={token}
         tokenPrices={tokenPrices}
+        highlightedPartOfName={highlightedPartOfName}
       />
     </SubPageCard>
   )

diff --git a/src/app/pages/RuntimeAccountDetailsPage/AccountDetailsView.tsx b/src/app/pages/RuntimeAccountDetailsPage/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/RuntimeAccountDetailsPage/DeferredRuntimeAccountDetails.tsx b/src/app/pages/RuntimeAccountDetailsPage/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/RuntimeAccountDetailsPage/index.tsx b/src/app/pages/RuntimeAccountDetailsPage/index.tsx
@@ -32,7 +32,7 @@ export const RuntimeAccountDetailsPage: 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 RuntimeAccountDetailsPage: 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}
               />
             )