Skip to content

fix(web): Implement enhanced account dropdown ux #7932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(web): Implement enhanced account dropdown ux #7932

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78c83a4
implement enhanced account drawer experience
jvmi7 Jul 27, 2025
840f4a5
implement enhanced account drawer experience
jvmi7 Jul 27, 2025
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
73 changes: 26 additions & 47 deletions apps/web/src/components/AccountDrawer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import DefaultMenu from 'components/AccountDrawer/DefaultMenu'
import { useAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
import { Scrim } from 'components/AccountDrawer/Scrim'
import { Web3StatusRef } from 'components/Web3Status'
import { useAccount } from 'hooks/useAccount'
import useDisableScrolling from 'hooks/useDisableScrolling'
Expand All @@ -8,23 +9,18 @@ import { useOnClickOutside } from 'hooks/useOnClickOutside'
import usePrevious from 'hooks/usePrevious'
import { useAtom } from 'jotai'
import { useEffect, useRef } from 'react'
import { ChevronsRight } from 'react-feather'
import { transitions } from 'theme/styles'
import {
AnimatePresence,
Flex,
FlexProps,
TouchableArea,
WebBottomSheet,
styled,
useMedia,
useScrollbarStyles,
useShadowPropsMedium,
useSporeColors,
} from 'ui/src'
import { INTERFACE_NAV_HEIGHT, zIndexes } from 'ui/src/theme'
import Trace from 'uniswap/src/features/telemetry/Trace'
import { InterfaceEventName } from 'uniswap/src/features/telemetry/constants'
import { INTERFACE_NAV_HEIGHT, breakpoints, zIndexes } from 'ui/src/theme'
import { TestID } from 'uniswap/src/test/fixtures/testIDs'

const DRAWER_SPECS = {
Expand Down Expand Up @@ -57,7 +53,7 @@ const Container = styled(Flex, {
'$platform-web': { position: 'fixed' },
top: DRAWER_SPECS.MARGIN,
right: '0',
zIndex: zIndexes.dropdown,
zIndex: zIndexes.modal,
variants: {
open: {
true: { right: DRAWER_SPECS.MARGIN },
Expand Down Expand Up @@ -95,6 +91,7 @@ const SideDrawerContainer = styled(Flex, {
transition: `margin-right ${transitions.duration.medium}`,
width: DRAWER_SPECS.WIDTH_XL,
maxWidth: DRAWER_SPECS.WIDTH_XL,
zIndex: zIndexes.modal,
$xl: {
mr: `-${DRAWER_SPECS.WIDTH}`,
width: DRAWER_SPECS.WIDTH,
Expand All @@ -110,23 +107,6 @@ const SideDrawerContainer = styled(Flex, {
},
})

const CloseDrawer = styled(Flex, {
animation: 'fast',
opacity: 0.6,
height: '100%',
p: '$spacing24',
pl: '$spacing12',
pr: `calc(18px + ${DRAWER_SPECS.OFFSET})`,
borderTopLeftRadius: '$rounded20',
borderBottomLeftRadius: '$rounded20',
borderTopRightRadius: '$none',
borderBottomRightRadius: '$none',
'$group-hover': {
x: '$spacing8',
backgroundColor: 'rgba(153,161,189,0.08)',
},
})

type AccountDrawerProps = {
isOpen: boolean
onClose: () => void
Expand Down Expand Up @@ -164,42 +144,41 @@ function AccountDropdown({ isOpen, onClose, children }: AccountDrawerProps) {
}

function AccountSideDrawer({ isOpen, onClose, children }: AccountDrawerProps) {
const colors = useSporeColors()
const scrollbarStyles = useScrollbarStyles()
const accountDrawer = useAccountDrawer()
const shadowProps = useShadowPropsMedium()
const wasAccountDrawerOpen = usePrevious(accountDrawer.isOpen)
const scrollRef = useRef<HTMLDivElement>(null)
const drawerRef = useRef<HTMLDivElement>(null)

useEffect(() => {
if (wasAccountDrawerOpen && !accountDrawer.isOpen) {
scrollRef.current?.scrollTo({ top: 0, behavior: 'smooth' })
}
}, [accountDrawer, wasAccountDrawerOpen])

useOnClickOutside({
node: drawerRef,
handler: onClose,
})

return (
<Flex row height={`calc(100% - 2 * ${DRAWER_SPECS.MARGIN})`}>
{isOpen && (
<Trace logPress eventOnTrigger={InterfaceEventName.MiniPortfolioToggled} properties={{ type: 'close' }}>
<TouchableArea group zIndex={zIndexes.background} width={60}>
<CloseDrawer onPress={onClose} data-testid="close-account-drawer">
<ChevronsRight color={colors.neutral2.val} size={24} />
</CloseDrawer>
</TouchableArea>
</Trace>
)}
<SideDrawerContainer open={isOpen} {...shadowProps}>
{/* id used for child InfiniteScrolls to reference when it has reached the bottom of the component */}
<AccountDrawerScrollWrapper
ref={scrollRef}
style={scrollbarStyles}
id="wallet-dropdown-scroll-wrapper"
height="100%"
>
{children}
</AccountDrawerScrollWrapper>
</SideDrawerContainer>
</Flex>
<>
<Scrim $open={isOpen} $maxWidth={breakpoints.xxxl} $zIndex={zIndexes.modalBackdrop} onClick={onClose} />
<Flex row height={`calc(100% - 2 * ${DRAWER_SPECS.MARGIN})`}>
<SideDrawerContainer ref={drawerRef} open={isOpen} {...shadowProps}>
{/* id used for child InfiniteScrolls to reference when it has reached the bottom of the component */}
<AccountDrawerScrollWrapper
ref={scrollRef}
style={scrollbarStyles}
id="wallet-dropdown-scroll-wrapper"
height="100%"
>
{children}
</AccountDrawerScrollWrapper>
</SideDrawerContainer>
</Flex>
</>
)
}

Expand Down