grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[beta] beta backports (#4763)

Browse Source 
* https://mkr-market -> https://oasisdex.com (4701 beta)

* Wallet s/delete/forget/ (beta 4741)
This commit is contained in:
Jaco Greeff 2017-03-04 18:54:11 +01:00 committed by Arkadiy Paronyan
parent d3d6ff8ca9
commit 659cf2bb37
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/views/Dapps/UrlButton/urlButton.js
View File

@ -61,7 +61,7 @@ class UrlButton extends Component {
hint={ hint={
<FormattedMessage <FormattedMessage
id='dapps.button.url.input' id='dapps.button.url.input'
defaultMessage='https://mkr.market' /> defaultMessage='https://oasisdex.com' />
} }
onBlur={ this.hideInput } onBlur={ this.hideInput }
onFocus={ this.showInput } onFocus={ this.showInput }

2
js/src/views/Wallet/wallet.js
View File

@ -228,7 +228,7 @@ class Wallet extends Component {
<Button <Button
key='delete' key='delete'
icon={ <ActionDelete /> } icon={ <ActionDelete /> }
label='delete' label='forget'
onClick={ this.showDeleteDialog } /> onClick={ this.showDeleteDialog } />
); );

3
js/src/views/Web/web.js
View File

@ -62,7 +62,7 @@ export default class Web extends Component {
} }
setUrl = (url) => { setUrl = (url) => {
url = url || store.get(LS_LAST_ADDRESS) || 'https://mkr.market'; url = url || store.get(LS_LAST_ADDRESS) || 'https://oasisdex.com';
if (!hasProtocol.test(url)) { if (!hasProtocol.test(url)) {
url = `https://${url}`; url = `https://${url}`;
} }
@ -150,4 +150,3 @@ export default class Web extends Component {
}); });
}; };
} }