aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-10-12 06:50:02 +0800
committerKevin Serrano <kevgagser@gmail.com>2016-10-12 06:50:02 +0800
commit5e9bc31c58aff4b9d1d0d1bd54416ffb0a1b14d3 (patch)
tree6e98b8dbf03ef61c655625b6349b056dcdc7bbe0
parentf7361d9654b1a55d0c21ba37b11e1575e7a555ca (diff)
downloadtangerine-wallet-browser-5e9bc31c58aff4b9d1d0d1bd54416ffb0a1b14d3.tar.gz
tangerine-wallet-browser-5e9bc31c58aff4b9d1d0d1bd54416ffb0a1b14d3.tar.zst
tangerine-wallet-browser-5e9bc31c58aff4b9d1d0d1bd54416ffb0a1b14d3.zip
Cleanup.
-rw-r--r--app/scripts/metamask-controller.js2
-rw-r--r--test/integration/tests.js32
-rw-r--r--ui/app/account-detail.js3
-rw-r--r--ui/app/first-time/disclaimer.js2
4 files changed, 26 insertions, 13 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 7ce84018e..550531d6e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -341,8 +341,6 @@ module.exports = class MetamaskController {
}
}
-
-
// called from popup
setRpcTarget (rpcTarget) {
this.configManager.setRpcTarget(rpcTarget)
diff --git a/test/integration/tests.js b/test/integration/tests.js
index 2d813762d..747845d75 100644
--- a/test/integration/tests.js
+++ b/test/integration/tests.js
@@ -3,25 +3,37 @@ QUnit.test('agree to terms', function (assert) {
// Select the mock app root
var app = $('iframe').contents().find('#app-content .mock-app-root')
- // var button = $('.agree')
- // button.removeAttr('disabled')
app.find('.markdown').prop('scrollTop', 100000000)
// Agree to terms
+ // wait().then(function() {
+ // app.find('button').click()
+ // wait().then(function() {
+ //
+ // var title = app.find('h1').text()
+ // assert.equal(title, 'MetaMask', 'title screen')
+ //
+ // var buttons = app.find('button')
+ // assert.equal(buttons.length, 2, 'two buttons: create and restore')
+ //
+ // done()
+ // })
+ // })
+
wait().then(function() {
app.find('button').click()
- wait().then(function() {
-
- var title = app.find('h1').text()
- assert.equal(title, 'MetaMask', 'title screen')
+ }).then(function() {
+ return wait()
+ }).then(function() {
+ var title = app.find('h1').text()
+ assert.equal(title, 'MetaMask', 'title screen')
- var buttons = app.find('button')
- assert.equal(buttons.length, 2, 'two buttons: create and restore')
+ var buttons = app.find('button')
+ assert.equal(buttons.length, 2, 'two buttons: create and restore')
- done()
- })
+ done()
})
// Wait for view to transition:
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 01c7e8781..00dd57b6f 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -44,6 +44,9 @@ AccountDetailScreen.prototype.render = function () {
var props = this.props
var selected = props.address || Object.keys(props.accounts)[0]
var identity = props.identities[selected]
+ console.log(props)
+ console.log(selected)
+ console.log(identity)
var account = props.accounts[selected]
const { network } = props
diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js
index 3ec0b37c3..819d4a110 100644
--- a/ui/app/first-time/disclaimer.js
+++ b/ui/app/first-time/disclaimer.js
@@ -92,7 +92,7 @@ DisclaimerScreen.prototype.render = function () {
h('button', {
style: { marginTop: '18px' },
- disabled: disabled,
+ disabled,
onClick: () => this.props.dispatch(actions.agreeToDisclaimer()),
}, disabled ? 'Scroll Down to Enable' : 'I Agree'),
])