Commit e03c5d12 authored by Max Alekseenko's avatar Max Alekseenko

post-review changes and style fix

parent 99a839fc
...@@ -10,7 +10,7 @@ type Props = { ...@@ -10,7 +10,7 @@ type Props = {
internalWallet: boolean | undefined; internalWallet: boolean | undefined;
} }
const MarketplaceAppTopBar = ({ internalWallet }: Props) => { const MarketplaceAppAlert = ({ internalWallet }: Props) => {
const { address } = useMarketplaceWallet(); const { address } = useMarketplaceWallet();
const isWalletConnected = Boolean(address); const isWalletConnected = Boolean(address);
...@@ -34,7 +34,6 @@ const MarketplaceAppTopBar = ({ internalWallet }: Props) => { ...@@ -34,7 +34,6 @@ const MarketplaceAppTopBar = ({ internalWallet }: Props) => {
return ( return (
<Alert <Alert
status={ message.status } status={ message.status }
width={{ base: '100%', md: 'auto' }}
borderRadius="base" borderRadius="base"
px={ 3 } px={ 3 }
py={{ base: 3, md: 1.5 }} py={{ base: 3, md: 1.5 }}
...@@ -53,4 +52,4 @@ const MarketplaceAppTopBar = ({ internalWallet }: Props) => { ...@@ -53,4 +52,4 @@ const MarketplaceAppTopBar = ({ internalWallet }: Props) => {
); );
}; };
export default MarketplaceAppTopBar; export default MarketplaceAppAlert;
...@@ -11,6 +11,13 @@ const WebsiteLink = ({ url }: Props) => { ...@@ -11,6 +11,13 @@ const WebsiteLink = ({ url }: Props) => {
if (!url) { if (!url) {
return null; return null;
} }
function getHostname(url: string) {
try {
return new URL(url).hostname;
} catch (err) {}
}
return ( return (
<Link <Link
href={ url } href={ url }
...@@ -21,7 +28,7 @@ const WebsiteLink = ({ url }: Props) => { ...@@ -21,7 +28,7 @@ const WebsiteLink = ({ url }: Props) => {
mt={ 3 } mt={ 3 }
> >
<IconSvg name="link" boxSize={ 5 } color="text_secondary"/> <IconSvg name="link" boxSize={ 5 } color="text_secondary"/>
<span>{ (new URL(url)).hostname }</span> <span>{ getHostname(url) }</span>
</Link> </Link>
); );
}; };
......
...@@ -28,6 +28,12 @@ const MarketplaceAppTopBar = ({ data, isLoading }: Props) => { ...@@ -28,6 +28,12 @@ const MarketplaceAppTopBar = ({ data, isLoading }: Props) => {
return route({ pathname: '/apps' }); return route({ pathname: '/apps' });
}, [ appProps.referrer ]); }, [ appProps.referrer ]);
function getHostname(url: string | undefined) {
try {
return new URL(url || '').hostname;
} catch (err) {}
}
return ( return (
<Flex alignItems="center" flexWrap="wrap" mb={{ base: 6, md: 2 }} rowGap={ 3 } columnGap={ 2 }> <Flex alignItems="center" flexWrap="wrap" mb={{ base: 6, md: 2 }} rowGap={ 3 } columnGap={ 2 }>
<Tooltip label="Back to dApps list" order={ 1 }> <Tooltip label="Back to dApps list" order={ 1 }>
...@@ -35,7 +41,7 @@ const MarketplaceAppTopBar = ({ data, isLoading }: Props) => { ...@@ -35,7 +41,7 @@ const MarketplaceAppTopBar = ({ data, isLoading }: Props) => {
<IconSvg name="arrows/east" boxSize={ 6 } transform="rotate(180deg)" margin="auto" color="gray.400"/> <IconSvg name="arrows/east" boxSize={ 6 } transform="rotate(180deg)" margin="auto" color="gray.400"/>
</LinkInternal> </LinkInternal>
</Tooltip> </Tooltip>
<Skeleton order={{ base: 4, md: 2 }} isLoaded={ !isLoading }> <Skeleton width={{ base: '100%', md: 'auto' }} order={{ base: 4, md: 2 }} isLoaded={ !isLoading }>
<MarketplaceAppAlert internalWallet={ data?.internalWallet }/> <MarketplaceAppAlert internalWallet={ data?.internalWallet }/>
</Skeleton> </Skeleton>
<Skeleton order={{ base: 2, md: 3 }} isLoaded={ !isLoading }> <Skeleton order={{ base: 2, md: 3 }} isLoaded={ !isLoading }>
...@@ -53,7 +59,7 @@ const MarketplaceAppTopBar = ({ data, isLoading }: Props) => { ...@@ -53,7 +59,7 @@ const MarketplaceAppTopBar = ({ data, isLoading }: Props) => {
isLoading={ isLoading } isLoading={ isLoading }
> >
<chakra.span isTruncated> <chakra.span isTruncated>
{ data?.url ? (new URL(data.url)).hostname : '' } { getHostname(data?.url) }
</chakra.span> </chakra.span>
</LinkExternal> </LinkExternal>
</Flex> </Flex>
......
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