Commit 6de407de authored by Igor Stuev's avatar Igor Stuev Committed by GitHub

Search: open dapp info for external dapps fix (#2567)

parent 4839af83
...@@ -24,7 +24,6 @@ import * as UserOpEntity from 'ui/shared/entities/userOp/UserOpEntity'; ...@@ -24,7 +24,6 @@ import * as UserOpEntity from 'ui/shared/entities/userOp/UserOpEntity';
import { ADDRESS_REGEXP } from 'ui/shared/forms/validators/address'; import { ADDRESS_REGEXP } from 'ui/shared/forms/validators/address';
import HashStringShortenDynamic from 'ui/shared/HashStringShortenDynamic'; import HashStringShortenDynamic from 'ui/shared/HashStringShortenDynamic';
import IconSvg from 'ui/shared/IconSvg'; import IconSvg from 'ui/shared/IconSvg';
import LinkExternal from 'ui/shared/links/LinkExternal';
import LinkInternal from 'ui/shared/links/LinkInternal'; import LinkInternal from 'ui/shared/links/LinkInternal';
import ListItemMobile from 'ui/shared/ListItemMobile/ListItemMobile'; import ListItemMobile from 'ui/shared/ListItemMobile/ListItemMobile';
import type { SearchResultAppItem } from 'ui/shared/search/utils'; import type { SearchResultAppItem } from 'ui/shared/search/utils';
...@@ -145,34 +144,18 @@ const SearchResultListItem = ({ data, searchTerm, isLoading, addressFormat }: Pr ...@@ -145,34 +144,18 @@ const SearchResultListItem = ({ data, searchTerm, isLoading, addressFormat }: Pr
src={ colorMode === 'dark' && data.app.logoDarkMode ? data.app.logoDarkMode : data.app.logo } src={ colorMode === 'dark' && data.app.logoDarkMode ? data.app.logoDarkMode : data.app.logo }
alt={ `${ data.app.title } app icon` } alt={ `${ data.app.title } app icon` }
/> />
{ data.app.external ? ( <LinkInternal
<LinkExternal href={ data.app.external ?
href={ route({ pathname: '/apps', query: { selectedAppId: data.app.id } }) :
route({ route({ pathname: '/apps/[id]', query: { id: data.app.id } })
pathname: '/apps', }
query: { fontWeight={ 700 }
selectedAppId: data.app.id, wordBreak="break-all"
}, isLoading={ isLoading }
}) onClick={ handleLinkClick }
} >
fontWeight={ 700 } { title }
wordBreak="break-all" </LinkInternal>
isLoading={ isLoading }
onClick={ handleLinkClick }
>
{ title }
</LinkExternal>
) : (
<LinkInternal
href={ route({ pathname: '/apps/[id]', query: { id: data.app.id } }) }
fontWeight={ 700 }
wordBreak="break-all"
isLoading={ isLoading }
onClick={ handleLinkClick }
>
{ title }
</LinkInternal>
) }
</Flex> </Flex>
); );
} }
......
...@@ -24,7 +24,6 @@ import * as UserOpEntity from 'ui/shared/entities/userOp/UserOpEntity'; ...@@ -24,7 +24,6 @@ import * as UserOpEntity from 'ui/shared/entities/userOp/UserOpEntity';
import { ADDRESS_REGEXP } from 'ui/shared/forms/validators/address'; import { ADDRESS_REGEXP } from 'ui/shared/forms/validators/address';
import HashStringShortenDynamic from 'ui/shared/HashStringShortenDynamic'; import HashStringShortenDynamic from 'ui/shared/HashStringShortenDynamic';
import IconSvg from 'ui/shared/IconSvg'; import IconSvg from 'ui/shared/IconSvg';
import LinkExternal from 'ui/shared/links/LinkExternal';
import LinkInternal from 'ui/shared/links/LinkInternal'; import LinkInternal from 'ui/shared/links/LinkInternal';
import type { SearchResultAppItem } from 'ui/shared/search/utils'; import type { SearchResultAppItem } from 'ui/shared/search/utils';
import { getItemCategory, searchItemTitles } from 'ui/shared/search/utils'; import { getItemCategory, searchItemTitles } from 'ui/shared/search/utils';
...@@ -209,34 +208,18 @@ const SearchResultTableItem = ({ data, searchTerm, isLoading, addressFormat }: P ...@@ -209,34 +208,18 @@ const SearchResultTableItem = ({ data, searchTerm, isLoading, addressFormat }: P
src={ colorMode === 'dark' && data.app.logoDarkMode ? data.app.logoDarkMode : data.app.logo } src={ colorMode === 'dark' && data.app.logoDarkMode ? data.app.logoDarkMode : data.app.logo }
alt={ `${ data.app.title } app icon` } alt={ `${ data.app.title } app icon` }
/> />
{ data.app.external ? ( <LinkInternal
<LinkExternal href={ data.app.external ?
href={ route({ pathname: '/apps', query: { selectedAppId: data.app.id } }) :
route({ route({ pathname: '/apps/[id]', query: { id: data.app.id } })
pathname: '/apps', }
query: { fontWeight={ 700 }
selectedAppId: data.app.id, wordBreak="break-all"
}, isLoading={ isLoading }
}) onClick={ handleLinkClick }
} >
fontWeight={ 700 } { title }
wordBreak="break-all" </LinkInternal>
isLoading={ isLoading }
onClick={ handleLinkClick }
>
{ title }
</LinkExternal>
) : (
<LinkInternal
href={ route({ pathname: '/apps/[id]', query: { id: data.app.id } }) }
fontWeight={ 700 }
wordBreak="break-all"
isLoading={ isLoading }
onClick={ handleLinkClick }
>
{ title }
</LinkInternal>
) }
</Flex> </Flex>
</Td> </Td>
<Td fontSize="sm" verticalAlign="middle" colSpan={ 2 }> <Td fontSize="sm" verticalAlign="middle" colSpan={ 2 }>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment