Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

Menu: view all orders position #2399

Merged
merged 5 commits into from
Feb 8, 2022
Merged

Menu: view all orders position #2399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a308a19
move order link and improve icon style
alongoni Feb 7, 2022
8420929
add external link arrow
alongoni Feb 7, 2022
d254a4d
add external link arrow
alongoni Feb 8, 2022
52133fe
CLA issue test commit
alongoni Feb 8, 2022
ec760c1
Merge branch 'develop' into 2149-menu-order-view-all-orders
alongoni Feb 8, 2022
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
4 changes: 2 additions & 2 deletions src/custom/components/AccountDetails/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ export default function AccountDetails({
<h5>
Recent Activity <span>{`(${activityTotalCount})`}</span>
</h5>
{explorerOrdersLink && <ExternalLink href={explorerOrdersLink}>View all orders</ExternalLink>}
{explorerOrdersLink && <ExternalLink href={explorerOrdersLink}>View all orders ↗</ExternalLink>}
</span>

<div>
Expand All @@ -233,7 +233,7 @@ export default function AccountDetails({
{renderActivities(activities)}
</Fragment>
))}
{explorerOrdersLink && <ExternalLink href={explorerOrdersLink}>View all orders</ExternalLink>}
{explorerOrdersLink && <ExternalLink href={explorerOrdersLink}>View all orders ↗</ExternalLink>}
</div>
</LowerSection>
) : (
Expand Down
27 changes: 13 additions & 14 deletions src/custom/components/Menu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,11 @@ const MenuFlyout = styled(MenuFlyoutUni)`
height: 18px;
object-fit: contain;
margin: 0 8px 0 0;

> path {
fill: ${({ theme }) => theme.text1};
}
}
`
export const StyledSVG = styled(SVG)`
fill: ${({ theme }) => theme.text1};
`

export const Separator = styled(SeparatorBase)`
background-color: ${({ theme }) => theme.disabled};
Expand Down Expand Up @@ -333,19 +332,27 @@ export function Menu({ darkMode, toggleDarkMode, isClaimPage }: MenuProps) {
Code
</span>
</MenuItem>
{showOrdersLink && (
<MenuItem id="link" href={getExplorerAddressLink(chainId || 1, account)}>
<span aria-hidden="true" onClick={close} onKeyDown={close}>
<ExternalLink size={14} />
View all orders
</span>
</MenuItem>
)}

<Separator />

<MenuItem id="link" href={DISCORD_LINK}>
<span aria-hidden="true" onClick={close} onKeyDown={close}>
<SVG src={discordImage} description="Find CowSwap on Discord!" />
<StyledSVG src={discordImage} description="Find CowSwap on Discord!" />
Discord
</span>
</MenuItem>

<MenuItem id="link" href={TWITTER_LINK}>
<span aria-hidden="true" onClick={close} onKeyDown={close}>
<SVG src={twitterImage} description="Follow CowSwap on Twitter!" /> Twitter
<StyledSVG src={twitterImage} description="Follow CowSwap on Twitter!" /> Twitter
</span>
</MenuItem>

Expand All @@ -364,14 +371,6 @@ export function Menu({ darkMode, toggleDarkMode, isClaimPage }: MenuProps) {
</span>{' '}
Cow Runner
</InternalMenuItem>
{showOrdersLink && (
<MenuItem id="link" href={getExplorerAddressLink(chainId || 1, account)}>
<span aria-hidden="true" onClick={close} onKeyDown={close}>
<ExternalLink size={14} />
View all orders
</span>
</MenuItem>
)}
<MenuItemResponsive onClick={() => toggleDarkMode()}>
{darkMode ? (
<>
Expand Down