From f49e8725e8543f852f612b069b561d23bbe4c833 Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Thu, 2 Aug 2018 16:05:12 +0200
Subject: [PATCH] Translations additions + some (s)css + review transaction
 changes

---
 i18n/po/template.pot                    | 19 ++++++++++++++++++-
 src/js/controllers/review.controller.js |  4 +++-
 src/sass/views/review.scss              |  4 ++++
 src/sass/views/shapeshift.scss          |  6 ++++--
 www/views/review.html                   | 16 +++-------------
 www/views/shapeshift.html               |  5 ++---
 6 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index 2e7cedcbe..ecf44efe9 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -2651,6 +2651,7 @@ msgid "You can receive bitcoin from any wallet or service."
 msgstr ""
 
 #: www/views/tab-send.html:72
+#: www/views/shapeshift.html:23
 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin."
 msgstr ""
 
@@ -3116,6 +3117,18 @@ msgstr ""
 msgid "Start ShapeShift"
 msgstr ""
 
+#: www/views/shapeshift.html:30
+msgid "Exchange your BTC to BCH in minutes."
+msgstr ""
+
+#: www/views/shapeshift.html:30
+msgid "To start the process you need to add funds to your wallet."
+msgstr ""
+
+#: www/views/shapeshift.html:30
+msgid "he process is fast and you will receive the exchanged amount in your wallet."
+msgstr ""
+
 #: www/views/shapeshift.html:34
 msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction."
 msgstr ""
@@ -3720,10 +3733,14 @@ msgstr ""
 msgid "Review Transaction"
 msgstr ""
 
-#: www/views/review.html:14
+#: src/js/controllers/review.controller.js:36
 msgid "You are sending"
 msgstr ""
 
+#: src/js/controllers/review.controller.js:66
+msgid "You are shifting"
+msgstr ""
+
 #: www/views/review.html:22
 msgid "From:"
 msgstr ""
diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index edf7787d5..473ac4452 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -4,7 +4,7 @@ angular
   .module('copayApp.controllers')
   .controller('reviewController', reviewController);
 
-function reviewController(addressbookService, configService, profileService, $log, $scope, txFormatService) {
+function reviewController(addressbookService, configService, gettextCatalog, profileService, $log, $scope, txFormatService) {
   var vm = this;
 
   vm.destination = {
@@ -33,6 +33,7 @@ function reviewController(addressbookService, configService, profileService, $lo
   vm.secondaryAmount = '';
   vm.secondaryCurrency = '';
   vm.thirdParty = false;
+  vm.sendingTitle = gettextCatalog.getString('You are sending');
 
   var config = null;
   var coin = '';
@@ -62,6 +63,7 @@ function reviewController(addressbookService, configService, profileService, $lo
       vm.thirdParty = JSON.parse(data.stateParams.thirdParty); // Parse stringified JSON-object
       if (vm.thirdParty) {
         if (vm.thirdParty.id === 'shapeshift') {
+          vm.sendingTitle = gettextCatalog.getString('You are shifting');
           if (!vm.thirdParty.data) {
             vm.thirdParty.data = {};
           }
diff --git a/src/sass/views/review.scss b/src/sass/views/review.scss
index 67733fe22..22470a7b2 100644
--- a/src/sass/views/review.scss
+++ b/src/sass/views/review.scss
@@ -10,4 +10,8 @@
     position: absolute;
     bottom: 92px;
   }
+
+  .shapeshift-banner {
+    box-shadow: none;
+  }
 }
\ No newline at end of file
diff --git a/src/sass/views/shapeshift.scss b/src/sass/views/shapeshift.scss
index 158babb16..ee4cd0b0f 100644
--- a/src/sass/views/shapeshift.scss
+++ b/src/sass/views/shapeshift.scss
@@ -1,7 +1,8 @@
 #shapeshift {
   .swap-image {
-    width: 70%;
+    width: auto;
     max-width: 400px;
+    max-height: 25vh;
   }
   .empty-case {
     @include empty-case();
@@ -17,5 +18,6 @@
   }
 }
 .header.shapeshift {
-  background: #243F5D;
+  background: url(../img/shapeshiftbg.jpg) center center no-repeat #28394d;
+  opacity: 0.99;
 }
\ No newline at end of file
diff --git a/www/views/review.html b/www/views/review.html
index b9c190ab5..e398e68a1 100644
--- a/www/views/review.html
+++ b/www/views/review.html
@@ -12,7 +12,7 @@
     <div ng-if="vm.thirdParty && vm.thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
     <div class="header" ng-class="vm.thirdParty.id">
       <div class="content">
-        <p translate>You are sending</p>
+        <p>{{vm.sendingTitle}}</p>
         <p class="large">{{vm.primaryAmount}} {{vm.primaryCurrency}}</amount></p>
         <p ng-show="vm.secondaryAmount">{{vm.secondaryAmount}} {{vm.secondaryCurrency}}</p>
       </div>
@@ -84,13 +84,13 @@
 
   <click-to-accept
     ng-click="approve(tx, wallet, statusChangeHandler)"
-    ng-if="(!isCordova || isWindowsPhoneApp) && wallet"
+    ng-if="(!isCordova || isWindowsPhoneApp)"
     click-send-status="sendStatus"
     is-disabled="!wallet">
     {{buttonText}}
   </click-to-accept>
   <slide-to-accept
-    ng-if="isCordova && !isWindowsPhoneApp && wallet"
+    ng-if="isCordova && !isWindowsPhoneApp"
     slide-on-confirm="approve(tx, wallet, statusChangeHandler)"
     slide-send-status="sendStatus"
     is-disabled="!wallet">
@@ -104,14 +104,4 @@
     <span ng-show="wallet.m > 1 && (wallet.canSign() || wallet.isPrivKeyExternal())" translate>Proposal Created</span>
     <span ng-show="!wallet.canSign() && !wallet.isPrivKeyExternal()" translate>Transaction Created</span>
   </slide-to-accept-success>
-
-  <wallet-selector
-    wallet-selector-title="walletSelectorTitle"
-    wallet-selector-wallets="wallets"
-    wallet-selector-selected-wallet="wallet"
-    wallet-selector-show="walletSelector"
-    wallet-selector-on-select="onWalletSelect"
-    wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
-  </wallet-selector>
-
 </ion-view>
diff --git a/www/views/shapeshift.html b/www/views/shapeshift.html
index 764ef8851..61ad0952e 100644
--- a/www/views/shapeshift.html
+++ b/www/views/shapeshift.html
@@ -13,12 +13,11 @@
         <img class="swap-image" src="img/shapeshift_swap.png"/>
       </div>
       <div class="subtitle">
+        <p translate>Exchange your BTC to BCH in minutes.</p>
         <div ng-show="!walletsWithFunds.length">
-          <p translate>Before exchanging your BTC to BCH, you will need to add funds to your wallet.</p>
-          <p translate>You can receive Bitcoin from any wallet or service.</p>
+          <p translate>To start the process you need to add funds to your wallet.</p>
         </div>
         <div ng-show="walletsWithFunds.length">
-          <p translate>Using Shapeshift will allow you to exchange your BTC for BCH.</p>
           <p translate>The process is fast and you will receive the exchanged amount in your wallet.</p>
         </div>
         <div ng-show="!hasWallets" translate>To get started, you'll need to create a bitcoin wallet and get some bitcoin.</div>