m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Single asset dropdown fix (#6900)

Browse Source 
* Disable open dropdown for single asset

* add test to check single asset in dropdown

* fix lint errors, remove unused import
This commit is contained in:
Kristian Tapia 2019-07-23 16:51:13 -07:00 committed by Dan J Miller
parent fc3b035aac
commit 934433e4be
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/app/css/itcss/components/send.scss
View File

@ -646,6 +646,17 @@
height: 54px; height: 54px;
border: none; border: none;
&__single-asset {
display: flex;
flex-flow: row nowrap;
align-items: center;
padding: 8px 8px;
&:hover {
background-color: rgba($alto, 0.2);
}
}
&__asset { &__asset {
display: flex; display: flex;
flex-flow: row nowrap; flex-flow: row nowrap;

4
ui/app/pages/send/send-content/send-asset-row/send-asset-row.component.js
View File

@ -59,7 +59,7 @@ export default class SendAssetRow extends Component {
<SendRowWrapper label={`${t('asset')}:`}> <SendRowWrapper label={`${t('asset')}:`}>
<div className="send-v2__asset-dropdown"> <div className="send-v2__asset-dropdown">
{ this.renderSelectedToken() } { this.renderSelectedToken() }
{ this.renderAssetDropdown() } { this.props.tokens.length > 0 ? this.renderAssetDropdown() : null }
</div> </div>
</SendRowWrapper> </SendRowWrapper>
) )
@ -101,7 +101,7 @@ export default class SendAssetRow extends Component {
return ( return (
<div <div
className="send-v2__asset-dropdown__asset" className={ this.props.tokens.length > 0 ? 'send-v2__asset-dropdown__asset' : 'send-v2__asset-dropdown__single-asset' }
onClick={() => this.selectToken()} onClick={() => this.selectToken()}
> >
<div className="send-v2__asset-dropdown__asset-icon"> <div className="send-v2__asset-dropdown__asset-icon">

7
ui/app/pages/send/send-content/tests/send-content-component.test.js
View File

@ -50,4 +50,11 @@ describe('SendContent Component', function () {
assert.equal(PageContainerContentChild.childAt(5).exists(), false) assert.equal(PageContainerContentChild.childAt(5).exists(), false)
}) })
}) })
it('should not render the asset dropdown if token length is 0 ', () => {
wrapper.setProps({ tokens: [] })
const PageContainerContentChild = wrapper.find(PageContainerContent).children()
assert(PageContainerContentChild.childAt(2).is(SendAssetRow))
assert(PageContainerContentChild.childAt(2).find('send-v2__asset-dropdown__single-asset'), true)
})
}) })