Merge branch 'dev' into staging

Author: maciejka

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis-dex",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "private": true,
   "dependencies": {
     "autoprefixer": "7.1.2",

src/components/ClickWarp.jsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import CSSModules from "react-css-modules";
+
+import styles from "./WaitingForAccess.scss";
+import OasisButton from "./OasisButton";
+
+function dismiss() {
+  localStorage.setItem('announcement', 'true');
+  location.reload();
+}
+
+const ClickWarp = () => {
+  return (
+    <div className={styles.NoEthereumSection}>
+      <h2>IMPORTANT</h2>
+      <div>We will be moving to a new contract on 18-12-2018.</div>
+      <div>
+        <a href="https://en.reddit.com/r/MakerDAO/comments/9z7h2x/an_announcement_from_the_oasis_team/">Read more here.</a>
+      </div>
+      <OasisButton
+        // className={tableStyles.inputBtn}
+        type="button"
+        color="success"
+        size="xs"
+        onClick={dismiss}
+      >
+        Dismiss
+      </OasisButton>
+
+    </div>
+  );
+};
+
+ClickWarp.displayName = "Announcement";
+
+export default CSSModules(ClickWarp, styles, { allowMultiple: true });

src/components/ClickWarp.scss

@@ -0,0 +1,41 @@
+@import "../styles/modules/breakpoints";
+@import "../styles/modules/constants";
+
+.NoEthereumSection {
+  max-width: 980px;
+  margin: 0 auto;
+  @media (max-width: $xxs) {
+    max-width: 100%;
+  }
+
+  text-align: center;
+  font-family: 'Montserrat', sans-serif;
+  font-weight: 500;
+  color: $blue-darkish;
+  font-size: 24px;
+
+  h2 {
+    max-width: 100%;
+    font-weight: 700;
+    opacity: 0.8;
+    color: #222228;
+  }
+
+  .ImgHeaderLogo {
+    width: 264px;
+    padding-bottom: 30px;
+  }
+
+  .ImgEthereumLogo {
+    width: 61px;
+    padding-top: 30px;
+    margin-bottom: 40px;
+  }
+
+  .HorizontalLine {
+    color: $lightgray;
+    border: 0;
+    border-top: solid 1px $lightgray;
+  }
+
+}

src/containers/OasisApp.jsx

@@ -21,6 +21,7 @@ import CSSModules from "react-css-modules";
 import version from "../version";
 import network from "../store/selectors/network";
 import OasisYourNodeIsSyncingWrapper from "./OasisYourNodeIsSyncing";
+import ClickWarp from "../components/ClickWarp";
 
 const propTypes = PropTypes && {};
 
@@ -73,6 +74,10 @@ export class OasisAppWrapper extends PureComponent {
       isAppLoading, globalFormLock,
     } = this.props;
 
+    if(!localStorage.getItem('announcement')) {
+      return <ClickWarp/>;
+    }
+
     if (noProviderConnected)
       return <NoConnection />;