Merge remote-tracking branch 'refs/remotes/origin/master' into nfswSe…

…arch
OpenBazaar · Sep 22, 2017 · a05d2d3 · a05d2d3
2 parents ea8f485 + 88d8d43
commit a05d2d3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/js/languages/en-US.json b/js/languages/en-US.json
@@ -715,7 +715,8 @@
     "receiveMoney": {
       "title": "Receive Money",
       "needBitcoin": "Need Bitcoin?",
-      "btnCancel": "Cancel"
+      "btnCancel": "Cancel",
+      "btnFundViaShapeshift": "Fund via ShapeShift"
     },
     "sendMoney": {
       "toLabel": "To",

diff --git a/js/templates/modals/wallet/receiveMoney.html b/js/templates/modals/wallet/receiveMoney.html
@@ -12,7 +12,17 @@ <h2 class="h3 txCtr txUnl row"><%= ob.polyT('wallet.receiveMoney.title') %></h2>
     <%= ob.spinner() %>
   </div>
 </div>
-<div class="flexCent">
-  <i class="btcIcon margRSm"></i>
-  <a href="https://openbazaar.org/bitcoin" class="clrT txB txU"><%= ob.polyT('wallet.receiveMoney.needBitcoin') %></a>
+<div class="flexCent buttonsWrap">
+  <div>
+    <div class="flexVCent gutterH">
+      <button class="btn btnThin clrP clrBr clrSh2 flexNoShrink js-fundViaShapeshift">
+        <i class="shapeShiftIcon icon" style="background-image: url('../imgs/shapeShiftIcon.png');"></i>
+        <%= ob.polyT('wallet.receiveMoney.btnFundViaShapeshift') %>
+      </button>
+      <div class="flexVCent">
+        <i class="btcIcon margRSm"></i>
+        <a href="https://openbazaar.org/bitcoin" class="clrT txB txU"><%= ob.polyT('wallet.receiveMoney.needBitcoin') %></a>
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/js/views/modals/wallet/ReceiveMoney.js b/js/views/modals/wallet/ReceiveMoney.js
@@ -1,4 +1,4 @@
-import { clipboard } from 'electron';
+import { clipboard, remote } from 'electron';
 import _ from 'underscore';
 import loadTemplate from '../../../utils/loadTemplate';
 import baseVw from '../../baseVw';
@@ -22,6 +22,7 @@ export default class extends baseVw {
       'click .js-receiveAddress': 'onClickReceiveAddress',
       'click .js-receiveQrCode': 'onClickReceiveQrCode',
       'click .js-cancelReceiveBtn': 'onClickCancelReceive',
+      'click .js-fundViaShapeshift': 'onClickFundViaShapshift',
     };
   }
 
@@ -58,6 +59,12 @@ export default class extends baseVw {
     this.trigger('click-cancel');
   }
 
+  onClickFundViaShapshift() {
+    const shapeshiftURL = `https://shapeshift.io/shifty.html?destination=${this.getState().address}&amp;output=BTC&apiKey=6e9fbc30b836f85d339b84f3b60cade3f946d2d49a14207d5546895ecca60233b47ec67304cdcfa06e019231a9d135a7965ae50de0a1e68d6ec01b8e57f2b812`;
+    const shapeshiftWin = new remote.BrowserWindow({ width: 700, height: 500, frame: true });
+    shapeshiftWin.loadURL(shapeshiftURL);
+  }
+
   copyAddressToClipboard() {
     clipboard.writeText(this.getState().address);
     clearTimeout(this.copyTextFadeoutTimeout);

diff --git a/styles/modules/modals/_wallet.scss b/styles/modules/modals/_wallet.scss
@@ -57,7 +57,7 @@
   .sendReceiveContainer {
     // So there's no jump when toggling between send / receive mode. If the larger
     // size changes, this may need to be updated.
-    height: 346px;
+    height: 363px;
     padding-top: 25px;
 
     .receiveMoney {
@@ -106,6 +106,11 @@
         right: 0;
         top: -25px;
       }
+
+      .buttonsWrap {
+        position: relative;
+        left: calc($padMd / 2);
+      }
     }
 
     .sendMoney {