diff --git a/js/client-topbar.js b/js/client-topbar.js index f2eb0d86b04..570a747cfd2 100644 --- a/js/client-topbar.js +++ b/js/client-topbar.js @@ -546,7 +546,7 @@ buf += '
'; if (app.user.get('named')) { - buf += '

'; + buf += '

'; } else { buf += '

'; } @@ -978,8 +978,8 @@ buf += '

Register your account:

'; } buf += '

'; - buf += '

'; - buf += '

'; + buf += '

'; + buf += '

'; buf += '

'; buf += '

'; buf += '

'; @@ -1062,6 +1062,10 @@ buf += '

If this is someone else\'s account:

'; buf += '

'; + buf += '

or

'; + buf += '

Register with your Metamask

'; + buf += '

'; + buf += ''; this.$el.html(buf); diff --git a/js/client.js b/js/client.js index 5ac475ad670..6c8b5f3831f 100644 --- a/js/client.js +++ b/js/client.js @@ -340,6 +340,11 @@ function toId() { */ this.challstr = challstr; var self = this; + + // BUILDSHIP + console.log("RECEIVED CHALLSTR: " + challstr); + window.challstr = challstr; + $.post(this.getActionPHP(), { act: 'upkeep', challstr: this.challstr diff --git a/js/storage.js b/js/storage.js index 274ac73a6d9..e9ab005d62f 100644 --- a/js/storage.js +++ b/js/storage.js @@ -553,6 +553,13 @@ Storage.initTestClient = function () { if (sid) { data.sid = sid; post(uri, data, callback, type); + } else if (true) { + // if metamask connected, use it + app.addPopup(ProxyPopup, {uri: uri, callback: callback}); + debugger; + + console.log('metamask connected'); + } else { var src = '
'; src += '';