Merge branch 'master' into retry-tx-refractor

app/images/deposit-eth.svg

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="78px" viewBox="0 0 80 78" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 49 (51002) - http://www.bohemiancoding.com/sketch -->
+    <title>deposit-eth</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <circle id="path-1" cx="34" cy="34" r="34"></circle>
+        <circle id="path-2" cx="17" cy="17" r="17"></circle>
+    </defs>
+    <g id="Buy-ETH" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="deposit-Ether" transform="translate(-79.000000, -146.000000)">
+            <g id="Group-12" transform="translate(8.000000, 10.000000)">
+                <g id="Group-7" transform="translate(71.000000, 122.000000)">
+                    <g id="deposit-eth" transform="translate(0.000000, 14.000000)">
+                        <g id="Oval">
+                            <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
+                            <circle stroke="#38393A" stroke-width="3" cx="34" cy="34" r="32.5"></circle>
+                        </g>
+                        <path d="M34.406509,44.95 L22,37.7 L34.406509,55 L46.8205983,37.7 L34.4039822,44.95 L34.406509,44.95 Z M34.593491,15 L22.186982,35.37 L34.593491,42.6275 L47,35.3775 L34.593491,15 Z" id="Shape" fill="#38393A"></path>
+                        <g id="Group-6" transform="translate(46.000000, 44.000000)">
+                            <g id="Oval-Copy">
+                                <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-2"></use>
+                                <circle stroke="#38393A" stroke-width="3" cx="17" cy="17" r="15.5"></circle>
+                            </g>
+                            <path d="M19.0769231,15.4230769 L25.5,15.4230769 L25.5,19.5769231 L19.0769231,19.5769231 L19.0769231,26 L14.9230769,26 L14.9230769,19.5769231 L8.5,19.5769231 L8.5,15.4230769 L14.9230769,15.4230769 L14.9230769,9 L19.0769231,9 L19.0769231,15.4230769 Z" id="Combined-Shape" fill="#38393A"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

ui/app/components/modals/deposit-ether-modal.js

@@ -128,13 +128,15 @@ DepositEtherModal.prototype.render = function () {
       }),
 
     ]),
-    
+
     h('.page-container__content', {}, [
-    
+
       h('div.deposit-ether-modal__buy-rows', [
 
         this.renderRow({
-          logo: h('img.deposit-ether-modal__buy-row__eth-logo', { src: '../../../images/eth_logo.svg' }),
+          logo: h('img.deposit-ether-modal__logo', {
+            src: '../../../images/deposit-eth.svg',
+          }),
           title: DIRECT_DEPOSIT_ROW_TITLE,
           text: DIRECT_DEPOSIT_ROW_TEXT,
           buttonLabel: t('viewAccount'),
@@ -164,7 +166,7 @@ DepositEtherModal.prototype.render = function () {
           onButtonClick: () => toCoinbase(address),
           hide: isTestNetwork || buyingWithShapeshift,
         }),
-        
+
         this.renderRow({
           logo: h('div.deposit-ether-modal__logo', {
             style: {

ui/app/css/itcss/components/modal.scss

@@ -725,16 +725,6 @@
       height: 60px;
     }
 
-    &__eth-logo {
-      border-radius: 50%;
-      height: 68px;
-      width: 68px;
-      border: 3px solid $tundora;
-      z-index: 25;
-      padding: 4px;
-      background-color: #fff;
-    }
-
     &__right {
       display: flex;
     }