This repository has been archived by the owner on Jun 24, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 55
Orders Sidebar --> Click to copy move. #1269
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c00ce53
Click to copy move.
73f0d4e
Icon wrapper remove.
2d3419b
Merge branch 'orders-panel-1' of gno.github.com:gnosis/cowswap into o…
6d6f333
Merge branch 'orders-panel-1' of gno.github.com:gnosis/cowswap into o…
1eb0417
Mobile header fixes.
d22769f
Re-factor Copy component.
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import React from 'react' | ||
| import styled from 'styled-components/macro' | ||
| import useCopyClipboard from 'hooks/useCopyClipboard' | ||
|
|
||
| import { LinkStyledButton } from 'theme' | ||
| import { CheckCircle, Copy } from 'react-feather' | ||
| import { Trans } from '@lingui/macro' | ||
| import { TransactionStatusText } from 'components/Copy' // mod | ||
|
|
||
| export const CopyIcon = styled(LinkStyledButton)` | ||
| color: ${({ theme }) => theme.text3}; | ||
| flex-shrink: 0; | ||
| display: flex; | ||
| text-decoration: none; | ||
| font-size: 0.825rem; | ||
| :hover, | ||
| :active, | ||
| :focus { | ||
| text-decoration: none; | ||
| color: ${({ theme }) => theme.text2}; | ||
| } | ||
| ` | ||
|
|
||
| /* const TransactionStatusText = styled.span` | ||
| margin-left: 0.25rem; | ||
| font-size: 0.825rem; | ||
| ${({ theme }) => theme.flexRowNoWrap}; | ||
| align-items: center; | ||
| ` */ | ||
|
|
||
| export default function CopyHelper(props: { toCopy: string; children?: React.ReactNode; clickableLink?: boolean }) { | ||
| const { toCopy, children, clickableLink } = props | ||
| const [isCopied, setCopied] = useCopyClipboard() | ||
|
|
||
| return ( | ||
| <> | ||
| {clickableLink && <LinkStyledButton onClick={() => setCopied(toCopy)}>{toCopy}</LinkStyledButton>} | ||
| <CopyIcon onClick={() => setCopied(toCopy)}> | ||
| {isCopied ? ( | ||
| <TransactionStatusText | ||
| isCopied={isCopied} // mod | ||
| > | ||
| <CheckCircle size={'16'} /> | ||
| <TransactionStatusText | ||
| isCopied={isCopied} // mod | ||
| > | ||
| <Trans>Copied</Trans> | ||
| </TransactionStatusText> | ||
| </TransactionStatusText> | ||
| ) : ( | ||
| <TransactionStatusText> | ||
| <Copy size={'16'} /> | ||
| </TransactionStatusText> | ||
| )} | ||
| {isCopied ? '' : children} | ||
| </CopyIcon> | ||
| </> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,15 @@ | ||
| import React from 'react' | ||
| import styled from 'styled-components/macro' | ||
| import useCopyClipboard from 'hooks/useCopyClipboard' | ||
| import { CopyIcon } from './CopyMod' | ||
|
|
||
| import { LinkStyledButton } from 'theme' | ||
| import { CheckCircle, Copy } from 'react-feather' | ||
| import { Trans } from '@lingui/macro' | ||
|
|
||
| export const CopyIcon = styled(LinkStyledButton)` | ||
| color: ${({ theme }) => theme.text3}; | ||
| flex-shrink: 0; | ||
| display: flex; | ||
| text-decoration: none; | ||
| font-size: 0.825rem; | ||
| :hover, | ||
| :active, | ||
| :focus { | ||
| text-decoration: none; | ||
| color: ${({ theme }) => theme.text2}; | ||
| } | ||
| ` | ||
| const TransactionStatusText = styled.span` | ||
| margin-left: 0.25rem; | ||
| font-size: 0.825rem; | ||
| export const TransactionStatusText = styled.span<{ isCopied?: boolean }>` | ||
| color: ${({ theme, isCopied }) => (isCopied ? theme.green1 : theme.text3)}; | ||
| ${({ theme }) => theme.flexRowNoWrap}; | ||
| align-items: center; | ||
| ` | ||
|
|
||
| export default function CopyHelper(props: { toCopy: string; children?: React.ReactNode; clickableLink?: boolean }) { | ||
| const { toCopy, children, clickableLink } = props | ||
| const [isCopied, setCopied] = useCopyClipboard() | ||
| ${CopyIcon} { | ||
| color: ${({ theme, isCopied }) => (isCopied ? theme.green1 : theme.text3)}; | ||
| } | ||
| ` | ||
|
|
||
| return ( | ||
| <> | ||
| {clickableLink && <LinkStyledButton onClick={() => setCopied(toCopy)}>{toCopy}</LinkStyledButton>} | ||
| <CopyIcon onClick={() => setCopied(toCopy)}> | ||
| {isCopied ? ( | ||
| <TransactionStatusText> | ||
| <CheckCircle size={'16'} /> | ||
| <TransactionStatusText> | ||
| <Trans>Copied</Trans> | ||
| </TransactionStatusText> | ||
| </TransactionStatusText> | ||
| ) : ( | ||
| <TransactionStatusText> | ||
| <Copy size={'16'} /> | ||
| </TransactionStatusText> | ||
| )} | ||
| {isCopied ? '' : children} | ||
| </CopyIcon> | ||
| </> | ||
| ) | ||
| } | ||
| export * from './CopyMod' | ||
| export { default } from './CopyMod' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ENSNameoraccountshould exist from the parent ternary. But added the empty string as the fallback here to satisfy theCopytype. Better solutions welcome. General aim is to consolidate code/markup as much as possible.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this case, I think we want to always copy the address, no?
Even when ENS is present.
At least that was the default behaviour.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's what I wondered too. I thought when there's the ENSName you perhaps want to copy the ENS Name instead? Otherwise can see it making sense to copy the address.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm. Ok, I guess copying the ENS name makes sense when that's available.
There's still the link to etherscan below, so that should be enough for covering both cases.