Deploy version 1.0.0

5 files changed, 28 insertions, 16 deletions

diff --git a/app/images/deposit-dexon.svg b/app/images/deposit-dexon.svg
new file mode 100644
index 00000000..987f50c1
--- /dev/null
+++ b/app/images/deposit-dexon.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="120" height="120" viewBox="0 0 120 120">
+    <g fill="none" fill-rule="evenodd">
+        <g>
+            <circle cx="60" cy="60" r="58.5" fill="none" stroke="#FFF" stroke-width="3"/>
+            <path fill="#FFF" d="M60 25.5l-4.539 7.796-4.342-7.458-.79 1.358-3.947 6.778-3.947-6.778-.198-.34-1.974 3.39L22.5 60.75l17.763 30.504 1.974 3.39.198-.34 3.947-6.778 3.948 6.779.789 1.356 4.342-7.457L60 96l4.539-7.795 3.949 6.779.394.678 4.737-8.135 3.948 6.779.196.34v-.002.001l1.975-3.39L97.5 60.751 79.738 30.246l-1.975-3.39-.196.34-3.948 6.778-3.947-6.778-.79-1.358-.394.68-3.95 6.778L60 25.5zm-3.948 8.814L60 27.534l3.948 6.78L60 41.092l-3.949-6.778zm9.276.338l3.949-6.779 3.947 6.78-3.947 6.778-3.949-6.779zm-18.551 0l3.947-6.779 3.948 6.78-3.948 6.778-3.947-6.779zm28.815 49.485l13.62-23.386-13.62-23.388 3.948-6.779 17.565 30.167L79.54 90.917l-3.948-6.78zM22.895 60.751L40.46 30.584l3.948 6.779L30.79 60.75l13.618 23.386-3.948 6.78-17.565-30.166zM60.79 42.447l3.947-6.779 3.947 6.779-3.947 6.779-3.947-6.779zm-9.474 0l3.947-6.779 3.948 6.779-3.948 6.779-3.947-6.779zM71.25 76.681l9.277-15.93-9.277-15.93 3.948-6.78L88.42 60.75 75.198 83.46l-3.948-6.778zM31.58 60.75l13.224-22.71 3.946 6.78-9.276 15.93 9.276 15.93-3.946 6.778L31.58 60.751zm24.474-10.17L60 43.804l3.948 6.779L60 57.36l-3.946-6.778zM66.71 68.886l4.737-8.134-4.737-8.136 3.948-6.778 8.683 14.914-8.683 14.912-3.948-6.778zM40.657 60.75l8.684-14.914 3.948 6.778-4.737 8.136 4.737 8.134-3.948 6.778-8.684-14.912zm21.317 0l3.948-6.778 3.946 6.778-3.946 6.779-3.948-6.779zm-11.843 0l3.947-6.778 3.949 6.778-3.949 6.779-3.947-6.779zm5.923 10.167L60 64.14l3.948 6.778L60 77.697l-3.946-6.779zm4.736 8.136l3.947-6.78 3.947 6.78-3.947 6.779-3.947-6.779zm-9.474 0l3.947-6.78 3.948 6.78-3.948 6.779-3.947-6.779zm14.012 7.795l3.949-6.778 3.947 6.778-3.947 6.779-3.949-6.779zm-18.551 0l3.947-6.778 3.948 6.778-3.948 6.779-3.947-6.779zm9.275.34l3.95-6.779 3.946 6.779L60 93.967l-3.948-6.778z"/>
+        </g>
+        <path fill="none" d="M84 120h36V84H84z"/>
+        <path fill="#FFF" d="M102 89.4c-6.948 0-12.6 5.653-12.6 12.6s5.652 12.6 12.6 12.6c6.948 0 12.6-5.653 12.6-12.6s-5.652-12.6-12.6-12.6"/>
+        <path fill="#222" d="M111.113 101.1h-8.214v-8.214a.898.898 0 1 0-1.799 0v8.214h-8.212a.9.9 0 0 0 0 1.799h8.212v8.214a.9.9 0 0 0 1.799 0v-8.214h8.214a.9.9 0 1 0 0-1.799"/>
+    </g>
+</svg>
diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css
index 2b50dee1..9e493976 100644
--- a/mascara/src/app/first-time/index.css
+++ b/mascara/src/app/first-time/index.css
@@ -124,7 +124,7 @@
   .buy-ether {
     display: flex;
     flex-flow: column nowrap;
-    width: calc(100vw - 80px);
+    width: calc(100vw - 48px);
   }
 
   .create-password__title,
diff --git a/notices/notices.js b/notices/notices.js
index 6392b638..89e56744 100644
--- a/notices/notices.js
+++ b/notices/notices.js
@@ -25,11 +25,11 @@ module.exports = [
     firstVersion: '<=3.12.0',
     body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_3.md'), 'utf8'),
   },
-  {
-    id: 4,
-    read: false,
-    date: 'Wed Jun 13 2018',
-    title: 'Phishing Warning',
-    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_4.md'), 'utf8'),
-  },
+  // {
+  //   id: 4,
+  //   read: false,
+  //   date: 'Wed Jun 13 2018',
+  //   title: 'Phishing Warning',
+  //   body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_4.md'), 'utf8'),
+  // },
 ]
diff --git a/ui/app/components/modals/deposit-ether-modal.js b/ui/app/components/modals/deposit-ether-modal.js
index bfa334d5..ba5cbedb 100644
--- a/ui/app/components/modals/deposit-ether-modal.js
+++ b/ui/app/components/modals/deposit-ether-modal.js
@@ -146,7 +146,7 @@ DepositEtherModal.prototype.render = function () {
 
         this.renderRow({
           logo: h('img.deposit-ether-modal__logo', {
-            src: './images/deposit-eth.svg',
+            src: './images/deposit-dexon.svg',
           }),
           title: DIRECT_DEPOSIT_ROW_TITLE,
           text: DIRECT_DEPOSIT_ROW_TEXT,
diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss
index 8dec5235..209901cd 100644
--- a/ui/app/css/itcss/components/modal.scss
+++ b/ui/app/css/itcss/components/modal.scss
@@ -641,7 +641,8 @@
     align-items: center;
 
     @media screen and (max-width: 575px) {
-      height: 0;
+      height: 100%;
+      padding: 0 10px;
     }
 
     .shapeshift-form-wrapper {
@@ -667,7 +668,7 @@
   }
 
   &__logo {
-    height: 60px;
+    height: 120px;
     background-repeat: no-repeat;
     background-size: contain;
     background-position: center;
@@ -728,7 +729,6 @@
 
       @media screen and (max-width: 575px) {
         width: 100%;
-        max-height: 6rem;
         padding-bottom: 20px;
       }
     }
@@ -747,11 +747,12 @@
 
     &__description {
       color: $white;
-      padding-bottom: 20px;
-      align-self: flex-start;
+      flex: 1;
 
-      @media screen and (min-width: 575px) {
-        width: 15rem;
+      @media screen and (max-width: 575px) {
+        align-self: flex-start;
+        text-align: center;
+        padding-bottom: 20px;
       }
 
       &__title {