Unverified Commit bb060fc8 authored by yann300's avatar yann300 Committed by GitHub

Merge pull request #1899 from ethereum/yann300-patch-23

Fix the context view
parents f0860b5c 445439cc
......@@ -283,7 +283,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
registry.put({api: udapp, name: 'udapp'})
udapp.event.register('transactionBroadcasted', (txhash, networkName) => {
var txLink = executionContext.txDetailsLink(networkName, txhash)
if (txLink) registry.get('logCallback').api.logCallback(yo`<a href="${txLink}" target="_blank">${txLink}</a>`)
if (txLink) registry.get('logCallback').api(yo`<a href="${txLink}" target="_blank">${txLink}</a>`)
})
const udappUI = new UniversalDAppUI(udapp, registry)
......
......@@ -41,7 +41,7 @@ class ContextView {
}
render () {
const view = yo`<div class="${css.contextview} ${css.contextviewcontainer} bg-secondary border-top-0">
const view = yo`<div class="${css.contextview} ${css.contextviewcontainer} badge badge-secondary border-top-0">
<div class=${css.container}>
${this._renderTarget()}
</div>
......
......@@ -2,8 +2,8 @@ var csjs = require('csjs-inject')
var css = csjs`
.contextview {
opacity : 0.8;
}
opacity : 1;
}
.container {
padding : 1px 15px;
}
......@@ -14,7 +14,7 @@ var css = csjs`
text-overflow : ellipsis;
overflow : hidden;
white-space : nowrap;
font-size : 11px;
font-size : 18px;
}
.type {
font-style : italic;
......@@ -45,9 +45,9 @@ var css = csjs`
}
.contextviewcontainer{
position : absolute;
top : 39px;
top : 35px;
z-index : 50;
left : 350px;
left : 40%;
border-radius : 1px;
border : 2px solid var(--secondary);
}
......
......@@ -68,7 +68,7 @@ module.exports = class UniversalDApp extends UdappApi {
executionContext.detectNetwork(cb)
},
personalMode: () => {
return this.config.get('settings/personal-mode')
return this._deps.config.get('settings/personal-mode')
}
})
this.txRunner.event.register('transactionBroadcasted', (txhash) => {
......@@ -94,7 +94,7 @@ module.exports = class UniversalDApp extends UdappApi {
newAccount (password, passwordPromptCb, cb) {
if (!executionContext.isVM()) {
if (!this.config.get('settings/personal-mode')) {
if (!this._deps.config.get('settings/personal-mode')) {
return cb('Not running in personal mode')
}
passwordPromptCb((passphrase) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment