Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix: add stopPropagation to the external link #220

Merged
merged 4 commits into from
Feb 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@safe-global/safe-react-components",
"version": "2.0.2",
"version": "2.0.3",
"description": "Safe UI components",
"main": "dist/index.min.js",
"typings": "dist/index.d.ts",
Expand Down
10 changes: 7 additions & 3 deletions src/components/EthHashInfo/EthHashInfo.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import * as React from 'react';

import EthHashInfo from './';
import EthHashInfo, { type EthHashInfoProps } from './';

export const Main = ({ size }): React.ReactElement => {
export const Main = ({
size,
}: {
size?: EthHashInfoProps['avatarSize'];
}): React.ReactElement => {
return (
<EthHashInfo
avatarSize={size || null}
avatarSize={size}
showPrefix
prefix="eth"
address="0x40A2aCCbd92BCA938b02010E17A5b8929b49130D"
Expand Down
14 changes: 8 additions & 6 deletions src/components/EthHashInfo/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ const EthHashInfo = ({
const theme = useTheme();
const isMobile = useMediaQuery(theme.breakpoints.down('sm'));

const onError = React.useCallback(() => {
setFallbackToIdenticon(true);
}, []);

return (
<Container>
{showAvatar && (
Expand All @@ -58,7 +62,7 @@ const EthHashInfo = ({
<img
src={customAvatar}
alt={address}
onError={() => setFallbackToIdenticon(true)}
onError={onError}
width={avatarSize}
height={avatarSize}
/>
Expand All @@ -82,11 +86,9 @@ const EthHashInfo = ({
<AddressContainer>
<Box fontWeight="inherit" fontSize="inherit">
{showPrefix && shouldPrefix && prefix && <b>{prefix}:</b>}
{isMobile ? (
<span>{shortenAddress(address)}</span>
) : (
<span>{shortAddress ? shortenAddress(address) : address}</span>
)}
<span>
{shortAddress || isMobile ? shortenAddress(address) : address}
</span>
</Box>

{showCopyButton && (
Expand Down
3 changes: 3 additions & 0 deletions src/components/ExplorerButton/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export type ExplorerButtonProps = {
href: string;
};

const stopPropagation = (e: React.SyntheticEvent) => e.stopPropagation();

const ExplorerButton = ({
title,
href,
Expand All @@ -22,6 +24,7 @@ const ExplorerButton = ({
href={href}
target="_blank"
rel="noopener noreferrer"
onClick={stopPropagation}
size="small">
<Icon component={LinkIcon} />
</IconButton>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ exports[`Storyshots Components/ExplorerButton Main 1`] = `
data-mui-internal-clone-element={true}
href="https://goerli.etherscan.io/address/0x51A099ac1BF46D471110AA8974024Bfe518Fd6C4"
onBlur={[Function]}
onClick={[Function]}
onContextMenu={[Function]}
onDragLeave={[Function]}
onFocus={[Function]}
Expand Down