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

Update confirm to use btn-primary (#6473)

Browse Source 
* Update confirm to use btn-primary

* Remove console

* Fix e2e test
This commit is contained in:
Chi Kei Chan 2019-04-17 13:34:47 -07:00 committed by GitHub
parent 931aaeb700
commit d8b536982e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/beta/metamask-beta-responsive-ui.spec.js
View File

@ -123,7 +123,7 @@ describe('MetaMask', function () {
}) })
it('clicks the "I agree" option on the metametrics opt-in screen', async () => { it('clicks the "I agree" option on the metametrics opt-in screen', async () => {
const optOutButton = await findElement(driver, By.css('.btn-confirm')) const optOutButton = await findElement(driver, By.css('.btn-primary'))
optOutButton.click() optOutButton.click()
await delay(largeDelayMs) await delay(largeDelayMs)
}) })

11
ui/app/components/ui/button/button.component.js
View File

@ -5,7 +5,7 @@ import classnames from 'classnames'
const CLASSNAME_DEFAULT = 'btn-default' const CLASSNAME_DEFAULT = 'btn-default'
const CLASSNAME_PRIMARY = 'btn-primary' const CLASSNAME_PRIMARY = 'btn-primary'
const CLASSNAME_SECONDARY = 'btn-secondary' const CLASSNAME_SECONDARY = 'btn-secondary'
const CLASSNAME_CONFIRM = 'btn-confirm' const CLASSNAME_CONFIRM = 'btn-primary'
const CLASSNAME_RAISED = 'btn-raised' const CLASSNAME_RAISED = 'btn-raised'
const CLASSNAME_LARGE = 'btn--large' const CLASSNAME_LARGE = 'btn--large'
const CLASSNAME_FIRST_TIME = 'btn--first-time' const CLASSNAME_FIRST_TIME = 'btn--first-time'
@ -14,13 +14,14 @@ const typeHash = {
default: CLASSNAME_DEFAULT, default: CLASSNAME_DEFAULT,
primary: CLASSNAME_PRIMARY, primary: CLASSNAME_PRIMARY,
secondary: CLASSNAME_SECONDARY, secondary: CLASSNAME_SECONDARY,
confirm: CLASSNAME_CONFIRM,
raised: CLASSNAME_RAISED,
'first-time': CLASSNAME_FIRST_TIME,
warning: 'btn-warning', warning: 'btn-warning',
danger: 'btn-danger', danger: 'btn-danger',
'danger-primary': 'btn-danger-primary', 'danger-primary': 'btn-danger-primary',
link: 'btn-link', link: 'btn-link',
// TODO: Legacy button type to be deprecated
confirm: CLASSNAME_CONFIRM,
raised: CLASSNAME_RAISED,
'first-time': CLASSNAME_FIRST_TIME,
} }
export default class Button extends Component { export default class Button extends Component {
@ -42,7 +43,7 @@ export default class Button extends Component {
<button <button
className={classnames( className={classnames(
'button', 'button',
typeHash[type], typeHash[type] || CLASSNAME_DEFAULT,
large && CLASSNAME_LARGE, large && CLASSNAME_LARGE,
className className
)} )}