From 659cf2bb3762cfc605d1be8bd2f67975f1f6f375 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 4 Mar 2017 18:54:11 +0100
Subject: [PATCH] [beta] beta backports (#4763)

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

* Wallet s/delete/forget/ (beta 4741)
---
 js/src/views/Dapps/UrlButton/urlButton.js | 2 +-
 js/src/views/Wallet/wallet.js             | 2 +-
 js/src/views/Web/web.js                   | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/js/src/views/Dapps/UrlButton/urlButton.js b/js/src/views/Dapps/UrlButton/urlButton.js
index 0a01be03b..3fee9259e 100644
--- a/js/src/views/Dapps/UrlButton/urlButton.js
+++ b/js/src/views/Dapps/UrlButton/urlButton.js
@@ -61,7 +61,7 @@ class UrlButton extends Component {
         hint={
           <FormattedMessage
             id='dapps.button.url.input'
-            defaultMessage='https://mkr.market' />
+            defaultMessage='https://oasisdex.com' />
         }
         onBlur={ this.hideInput }
         onFocus={ this.showInput }
diff --git a/js/src/views/Wallet/wallet.js b/js/src/views/Wallet/wallet.js
index 7a895d6dc..a66b15c3e 100644
--- a/js/src/views/Wallet/wallet.js
+++ b/js/src/views/Wallet/wallet.js
@@ -228,7 +228,7 @@ class Wallet extends Component {
       <Button
         key='delete'
         icon={ <ActionDelete /> }
-        label='delete'
+        label='forget'
         onClick={ this.showDeleteDialog } />
     );
 
diff --git a/js/src/views/Web/web.js b/js/src/views/Web/web.js
index a7b63ce30..d69a6628e 100644
--- a/js/src/views/Web/web.js
+++ b/js/src/views/Web/web.js
@@ -62,7 +62,7 @@ export default class Web extends Component {
   }
 
   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)) {
       url = `https://${url}`;
     }
@@ -150,4 +150,3 @@ export default class Web extends Component {
     });
   };
 }
-