Skip to content

Commit

Permalink
update send and request icons and removed some unused icons
Browse files Browse the repository at this point in the history
  • Loading branch information
schnogz committed May 2, 2019
1 parent 79a91ab commit be89098
Show file tree
Hide file tree
Showing 17 changed files with 288 additions and 490 deletions.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
724 changes: 271 additions & 453 deletions packages/blockchain-info-components/src/Fonts/Icomoon/selection.json

Large diffs are not rendered by default.

12 changes: 2 additions & 10 deletions packages/blockchain-info-components/src/Icons/Icomoon.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ export default {
'down-arrow-filled': '\\e911',
'down-arrow-in-circle': '\\e943',
'down-triangle': '\\e95f',
download: '\\e960',
download2: '\\e9c5',
'download-filled': '\\e913',
email: '\\e961',
'envelope-regular': '\\e984',
eth: '\\e97b',
Expand All @@ -61,25 +58,20 @@ export default {
'nav-buy': '\\e988',
'nav-switch': '\\e903',
'open-in-new-tab': '\\e979',
'open-source': '\\e968',
'paper-airplane': '\\e969',
'paper-airplane-filled': '\\e921',
pencil: '\\e96a',
pending: '\\e915',
phone: '\\e96c',
'phone-in-circle': '\\e96b',
'phone-regular': '\\e985',
plus: '\\ea0a',
present: '\\e96d',
'question-in-circle': '\\e96e',
'question-in-circle-filled': '\\e909',
refresh: '\\e90a',
request: '\\e92a',
request: '\\e912',
'right-arrow': '\\e94e',
safe: '\\e94f',
search: '\\e950',
send: '\\e92e',
'shapeshift-switch': '\\e978',
send: '\\e925',
shield: '\\e908',
'short-right-arrow': '\\e97f',
'stack-of-coins': '\\e972',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,9 @@ const Step1 = props => (
<Wrapper>
<Circle>
{props.status === 'active' ? (
<AnimatedIcon
name='paper-airplane-filled'
size='40px'
color='brand-primary'
/>
<AnimatedIcon name='send' size='40px' color='brand-primary' />
) : (
<Icon name='paper-airplane-filled' size='40px' color='brand-primary' />
<Icon name='send' size='40px' color='brand-primary' />
)}
</Circle>
<Text size='13px' weight={500} capitalize>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const ButtonText = styled(Text)`
const Actions = ({ showModal, sendAvailable, requestAvailable }) => (
<Wrapper>
<ActionButton
name='paper-airplane-filled'
name='send'
disabled={!sendAvailable}
onClick={() => showModal('SEND')}
min='100px'
Expand All @@ -54,7 +54,7 @@ const Actions = ({ showModal, sendAvailable, requestAvailable }) => (
<ActionButton
style={spacing('ml-15')}
disabled={!requestAvailable}
name='download2'
name='request'
onClick={() => showModal('REQUEST')}
min='100px'
data-e2e='requestButton'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class RequestBchContainer extends React.PureComponent {
position={this.props.position}
total={this.props.total}
>
<ModalHeader icon='download2' onClose={this.props.closeAll}>
<ModalHeader icon='request' onClose={this.props.closeAll}>
<FormattedMessage
id='modals.requestbch.title'
defaultMessage='Request Bitcoin Cash'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const SendHeader = styled(ModalHeader)`

const SendBch = props => (
<Modal size='medium' position={props.position} total={props.total}>
<SendHeader icon='paper-airplane-filled' onClose={props.closeAll}>
<SendHeader icon='send' onClose={props.closeAll}>
<FormattedMessage
id='modals.sendbch.title'
defaultMessage='Send Bitcoin Cash'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Modal, ModalHeader, ModalBody } from 'blockchain-info-components'

const SendBsv = props => (
<Modal size='large' position={props.position} total={props.total}>
<ModalHeader icon='paper-airplane-filled' onClose={props.closeAll}>
<ModalHeader icon='send' onClose={props.closeAll}>
<FormattedMessage
id='modals.sendbsv.title'
defaultMessage='Send Bitcoin SV'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Modal, ModalHeader, ModalBody } from 'blockchain-info-components'

const RequestBtc = props => (
<Modal size='large' position={props.position} total={props.total}>
<ModalHeader icon='download2' onClose={props.closeAll}>
<ModalHeader icon='request' onClose={props.closeAll}>
<FormattedMessage
id='modals.requestbitcoin.title'
defaultMessage='Request Bitcoin'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const SendHeader = styled(ModalHeader)`

const SendBtc = props => (
<Modal size='medium' position={props.position} total={props.total}>
<SendHeader icon='paper-airplane-filled' onClose={props.closeAll}>
<SendHeader icon='send' onClose={props.closeAll}>
<FormattedMessage
id='modals.sendbitcoin.title'
defaultMessage='Send Bitcoin'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class RequestEthContainer extends React.PureComponent {

return (
<Modal size='large' position={position} total={total}>
<ModalHeader icon='download2' onClose={closeAll}>
<ModalHeader icon='request' onClose={closeAll}>
<FormattedHTMLMessage
id='modals.requesteth.title'
defaultMessage='Request {displayName}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const SendHeader = styled(ModalHeader)`

const SendEth = props => (
<Modal size='medium' position={props.position} total={props.total}>
<SendHeader icon='paper-airplane-filled' onClose={props.closeAll}>
<SendHeader icon='send' onClose={props.closeAll}>
<FormattedHTMLMessage
id='modals.sendeth.cointitle'
defaultMessage='Send {coinDisplayName}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class RequestXlmContainer extends React.PureComponent {
position={this.props.position}
total={this.props.total}
>
<ModalHeader icon='download2' onClose={this.props.closeAll}>
<ModalHeader icon='request' onClose={this.props.closeAll}>
<FormattedMessage
id='modals.requestxlm.title'
defaultMessage='Request Stellar'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const SendHeader = styled(ModalHeader)`

const SendXlm = props => (
<Modal size='medium' position={props.position} total={props.total}>
<SendHeader icon='paper-airplane-filled' onClose={props.closeAll}>
<SendHeader icon='send' onClose={props.closeAll}>
<FormattedMessage
id='modals.sendxlm.title'
defaultMessage='Send Stellar'
Expand Down

0 comments on commit be89098

Please sign in to comment.