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

Merge branch 'master' of github.com:nihar97/metamask-plugin into internfix

Browse Source
This commit is contained in:
Kevin Serrano 2017-06-08 16:10:59 -07:00
commit cb95129fa1
No known key found for this signature in database
GPG Key ID: BF999DEFC7371BA1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mascara/test/lib/first-time.js
View File

@ -10,7 +10,7 @@ QUnit.test('render init screen', function (assert) {
app = $('#app-content').contents() app = $('#app-content').contents()
const recurseNotices = function () { const recurseNotices = function () {
let button = app.find('button') let button = app.find('button')
if (button.html() === 'Continue') { if (button.html() === 'Agree') {
let termsPage = app.find('.markdown')[0] let termsPage = app.find('.markdown')[0]
termsPage.scrollTop = termsPage.scrollHeight termsPage.scrollTop = termsPage.scrollHeight
return wait().then(() => { return wait().then(() => {

2
test/integration/lib/first-time.js
View File

@ -11,7 +11,7 @@ QUnit.test('render init screen', function (assert) {
const recurseNotices = function () { const recurseNotices = function () {
let button = app.find('button') let button = app.find('button')
if (button.html() === 'Continue') { if (button.html() === 'Agree') {
let termsPage = app.find('.markdown')[0] let termsPage = app.find('.markdown')[0]
termsPage.scrollTop = termsPage.scrollHeight termsPage.scrollTop = termsPage.scrollHeight
return wait().then(() => { return wait().then(() => {

2
ui/app/components/notice.js
View File

@ -107,7 +107,7 @@ Notice.prototype.render = function () {
style: { style: {
marginTop: '18px', marginTop: '18px',
}, },
}, 'Continue'), }, 'Agree'),
]) ])
) )
} }