diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-06-09 07:10:59 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-06-09 07:10:59 +0800 |
| commit | cb95129fa1d1c977444ba410903c6dc0da4de3a6 (patch) | |
| tree | 48eee84bbb3637fc438f8212fe00af3ded3b1dd7 | |
| parent | 29c7739efce215f94759295b89c7b46828badb12 (diff) | |
| parent | 5c71149a8f1503bd59038b3b31ddfff60e7e6482 (diff) | |
| download | tangerine-wallet-browser-cb95129fa1d1c977444ba410903c6dc0da4de3a6.tar tangerine-wallet-browser-cb95129fa1d1c977444ba410903c6dc0da4de3a6.tar.gz tangerine-wallet-browser-cb95129fa1d1c977444ba410903c6dc0da4de3a6.tar.bz2 tangerine-wallet-browser-cb95129fa1d1c977444ba410903c6dc0da4de3a6.tar.lz tangerine-wallet-browser-cb95129fa1d1c977444ba410903c6dc0da4de3a6.tar.xz tangerine-wallet-browser-cb95129fa1d1c977444ba410903c6dc0da4de3a6.tar.zst tangerine-wallet-browser-cb95129fa1d1c977444ba410903c6dc0da4de3a6.zip | |
Merge branch 'master' of github.com:nihar97/metamask-plugin into internfix
| -rw-r--r-- | mascara/test/lib/first-time.js | 2 | ||||
| -rw-r--r-- | test/integration/lib/first-time.js | 2 | ||||
| -rw-r--r-- | ui/app/components/notice.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mascara/test/lib/first-time.js b/mascara/test/lib/first-time.js index 8e33c8a06..76a4545bf 100644 --- a/mascara/test/lib/first-time.js +++ b/mascara/test/lib/first-time.js @@ -10,7 +10,7 @@ QUnit.test('render init screen', function (assert) { app = $('#app-content').contents() const recurseNotices = function () { let button = app.find('button') - if (button.html() === 'Continue') { + if (button.html() === 'Agree') { let termsPage = app.find('.markdown')[0] termsPage.scrollTop = termsPage.scrollHeight return wait().then(() => { diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js index dbb88a3da..f0fa4ee3f 100644 --- a/test/integration/lib/first-time.js +++ b/test/integration/lib/first-time.js @@ -11,7 +11,7 @@ QUnit.test('render init screen', function (assert) { const recurseNotices = function () { let button = app.find('button') - if (button.html() === 'Continue') { + if (button.html() === 'Agree') { let termsPage = app.find('.markdown')[0] termsPage.scrollTop = termsPage.scrollHeight return wait().then(() => { diff --git a/ui/app/components/notice.js b/ui/app/components/notice.js index 3c8523daf..7fe41fa88 100644 --- a/ui/app/components/notice.js +++ b/ui/app/components/notice.js @@ -107,7 +107,7 @@ Notice.prototype.render = function () { style: { marginTop: '18px', }, - }, 'Continue'), + }, 'Agree'), ]) ) } |