Merge branch 'feature/disable-ens-when-not-supported' into develop
This commit is contained in:
commit
eb32a7bb77
|
@ -100,7 +100,10 @@ const Address: React.FC = () => {
|
||||||
return (
|
return (
|
||||||
<StandardFrame>
|
<StandardFrame>
|
||||||
{error ? (
|
{error ? (
|
||||||
<AddressOrENSNameNotFound addressOrENSName={addressOrName} />
|
<AddressOrENSNameNotFound
|
||||||
|
addressOrENSName={addressOrName}
|
||||||
|
supportsENS={provider?.network.ensAddress !== undefined}
|
||||||
|
/>
|
||||||
) : (
|
) : (
|
||||||
checksummedAddress && (
|
checksummedAddress && (
|
||||||
<>
|
<>
|
||||||
|
|
|
@ -44,7 +44,9 @@ const Header: React.FC = () => {
|
||||||
className="w-full border-t border-b border-l rounded-l focus:outline-none px-2 py-1 text-sm"
|
className="w-full border-t border-b border-l rounded-l focus:outline-none px-2 py-1 text-sm"
|
||||||
type="text"
|
type="text"
|
||||||
size={60}
|
size={60}
|
||||||
placeholder='Type "/" to search by address / txn hash / block number / ENS name'
|
placeholder={`Type "/" to search by address / txn hash / block number${
|
||||||
|
provider?.network.ensAddress ? " / ENS name" : ""
|
||||||
|
}`}
|
||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
ref={searchRef}
|
ref={searchRef}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -39,7 +39,9 @@ const Home: React.FC = () => {
|
||||||
className="w-full border-l border-t border-b rounded-l focus:outline-none px-2 py-1"
|
className="w-full border-l border-t border-b rounded-l focus:outline-none px-2 py-1"
|
||||||
type="text"
|
type="text"
|
||||||
size={50}
|
size={50}
|
||||||
placeholder="Search by address / txn hash / block number / ENS name"
|
placeholder={`Search by address / txn hash / block number${
|
||||||
|
provider?.network.ensAddress ? " / ENS name" : ""
|
||||||
|
}`}
|
||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
ref={searchRef}
|
ref={searchRef}
|
||||||
autoFocus
|
autoFocus
|
||||||
|
|
|
@ -4,16 +4,19 @@ import ContentFrame from "../ContentFrame";
|
||||||
|
|
||||||
type AddressOrENSNameNotFoundProps = {
|
type AddressOrENSNameNotFoundProps = {
|
||||||
addressOrENSName: string;
|
addressOrENSName: string;
|
||||||
|
supportsENS: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
const AddressOrENSNameNotFound: React.FC<AddressOrENSNameNotFoundProps> = ({
|
const AddressOrENSNameNotFound: React.FC<AddressOrENSNameNotFoundProps> = ({
|
||||||
addressOrENSName,
|
addressOrENSName,
|
||||||
|
supportsENS,
|
||||||
}) => (
|
}) => (
|
||||||
<>
|
<>
|
||||||
<StandardSubtitle>Transaction Details</StandardSubtitle>
|
<StandardSubtitle>Transaction Details</StandardSubtitle>
|
||||||
<ContentFrame>
|
<ContentFrame>
|
||||||
<div className="py-4 text-sm">
|
<div className="py-4 text-sm">
|
||||||
"{addressOrENSName}" is not an ETH address or ENS name.
|
"{addressOrENSName}" is not an ETH address
|
||||||
|
{supportsENS && " or ENS name"}.
|
||||||
</div>
|
</div>
|
||||||
</ContentFrame>
|
</ContentFrame>
|
||||||
</>
|
</>
|
||||||
|
|
|
@ -48,19 +48,25 @@ export const useAddressOrENS = (
|
||||||
if (!provider) {
|
if (!provider) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const resolveName = async () => {
|
if (provider.network.ensAddress) {
|
||||||
const resolvedAddress = await provider.resolveName(addressOrName);
|
const resolveName = async () => {
|
||||||
if (resolvedAddress !== null) {
|
const resolvedAddress = await provider.resolveName(addressOrName);
|
||||||
setENS(true);
|
if (resolvedAddress !== null) {
|
||||||
setError(false);
|
setENS(true);
|
||||||
setChecksummedAddress(resolvedAddress);
|
setError(false);
|
||||||
} else {
|
setChecksummedAddress(resolvedAddress);
|
||||||
setENS(false);
|
} else {
|
||||||
setError(true);
|
setENS(false);
|
||||||
setChecksummedAddress(undefined);
|
setError(true);
|
||||||
}
|
setChecksummedAddress(undefined);
|
||||||
};
|
}
|
||||||
resolveName();
|
};
|
||||||
|
resolveName();
|
||||||
|
} else {
|
||||||
|
setENS(false);
|
||||||
|
setError(true);
|
||||||
|
setChecksummedAddress(undefined);
|
||||||
|
}
|
||||||
}, [provider, addressOrName, urlFixer]);
|
}, [provider, addressOrName, urlFixer]);
|
||||||
|
|
||||||
return [checksummedAddress, isENS, error];
|
return [checksummedAddress, isENS, error];
|
||||||
|
|
Loading…
Reference in New Issue