Commit a4c54ff9 authored by lynn's avatar lynn Committed by GitHub

fix: show ens in wallet dropdown too if available (#5564)

* done

* handle no ENS case
parent d4cb32c4
...@@ -17,7 +17,8 @@ import { Text } from 'rebass' ...@@ -17,7 +17,8 @@ import { Text } from 'rebass'
import { useCurrencyBalanceString } from 'state/connection/hooks' import { useCurrencyBalanceString } from 'state/connection/hooks'
import { useAppDispatch } from 'state/hooks' import { useAppDispatch } from 'state/hooks'
import { updateSelectedWallet } from 'state/user/reducer' import { updateSelectedWallet } from 'state/user/reducer'
import styled from 'styled-components/macro' import styled, { css } from 'styled-components/macro'
import { ThemedText } from 'theme'
import { shortenAddress } from '../../nft/utils/address' import { shortenAddress } from '../../nft/utils/address'
import { useCloseModal, useToggleModal } from '../../state/application/hooks' import { useCloseModal, useToggleModal } from '../../state/application/hooks'
...@@ -82,6 +83,30 @@ const FlexContainer = styled.div` ...@@ -82,6 +83,30 @@ const FlexContainer = styled.div`
const StatusWrapper = styled.div` const StatusWrapper = styled.div`
display: inline-block; display: inline-block;
margin-top: 4px; margin-top: 4px;
width: 70%;
`
const TruncatedTextStyle = css`
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
`
const AccountNamesWrapper = styled.div`
${TruncatedTextStyle}
margin-right: 8px;
`
const ENSNameContainer = styled(ThemedText.SubHeader)`
${TruncatedTextStyle}
color: ${({ theme }) => theme.textPrimary};
margin-top: 2.5px;
`
const AccountContainer = styled(ThemedText.BodySmall)`
${TruncatedTextStyle}
color: ${({ theme }) => theme.textSecondary};
margin-top: 2.5px;
` `
const BalanceWrapper = styled.div` const BalanceWrapper = styled.div`
...@@ -99,7 +124,7 @@ const AuthenticatedHeaderWrapper = styled.div` ...@@ -99,7 +124,7 @@ const AuthenticatedHeaderWrapper = styled.div`
` `
const AuthenticatedHeader = () => { const AuthenticatedHeader = () => {
const { account, chainId, connector } = useWeb3React() const { account, chainId, connector, ENSName } = useWeb3React()
const [isCopied, setCopied] = useCopyClipboard() const [isCopied, setCopied] = useCopyClipboard()
const copy = useCallback(() => { const copy = useCallback(() => {
setCopied(account || '') setCopied(account || '')
...@@ -153,9 +178,14 @@ const AuthenticatedHeader = () => { ...@@ -153,9 +178,14 @@ const AuthenticatedHeader = () => {
<StatusWrapper> <StatusWrapper>
<FlexContainer> <FlexContainer>
<StatusIcon connectionType={connectionType} size={24} /> <StatusIcon connectionType={connectionType} size={24} />
<Text fontSize={16} fontWeight={600} marginTop="2.5px"> {ENSName ? (
{account && shortenAddress(account, 2, 4)} <AccountNamesWrapper>
</Text> <ENSNameContainer>{ENSName}</ENSNameContainer>
<AccountContainer>{account && shortenAddress(account, 2, 4)}</AccountContainer>
</AccountNamesWrapper>
) : (
<ThemedText.SubHeader marginTop="2.5px">{account && shortenAddress(account, 2, 4)}</ThemedText.SubHeader>
)}
</FlexContainer> </FlexContainer>
</StatusWrapper> </StatusWrapper>
<IconContainer> <IconContainer>
......
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