From c558b644032fe2c020f16df15bf85b18981c3bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 16 May 2017 14:36:20 -0300
Subject: [PATCH] delete unused view and wording fixes

---
 src/js/controllers/confirm.js      |  6 ++---
 src/sass/views/confirm.scss        |  2 +-
 www/views/confirm.html             |  2 +-
 www/views/includes/confirm-tx.html | 39 ------------------------------
 4 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 www/views/includes/confirm-tx.html

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 6c9934a8b..881da799b 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -164,7 +164,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   };
 
   function resetValues() {
-    $scope.displayAmount = $scope.displayUnit = $scope.fee = $scope.feeFiat = $scope.feePercent = $scope.alternativeAmountStr = $scope.insufficientFunds = $scope.noMatchingWallet = null;
+    $scope.displayAmount = $scope.displayUnit = $scope.fee = $scope.feeFiat = $scope.feeRateStr = $scope.alternativeAmountStr = $scope.insufficientFunds = $scope.noMatchingWallet = null;
     $scope.showAddress = false;
   };
 
@@ -263,7 +263,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     txFormatService.formatAlternativeStr(data.amount, function(v) {
       $scope.alternativeAmountStr = v;
     });
-    $scope.feePercent = (data.fee * 100 / (data.amount + data.fee)).toFixed(2);
+    $scope.feeRateStr = (data.fee / (data.amount + data.fee) * 100).toFixed(2) + '%';
     $timeout(function() {
       $scope.$apply();
     });
@@ -389,7 +389,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       $scope.feeFiat = v;
     });
     $scope.txp = txp;
-    $scope.feePercent = (txp.fee * 100 / (txp.amount + txp.fee)).toFixed(2);
+    $scope.feeRateStr = (txp.fee / (txp.amount + txp.fee) * 100).toFixed(2) + '%';
     $timeout(function() {
       $scope.$apply();
     });
diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss
index 6d6425a6f..8adc61672 100644
--- a/src/sass/views/confirm.scss
+++ b/src/sass/views/confirm.scss
@@ -3,7 +3,7 @@
   @extend .deflash-blue;
   .item-note {
     float: none;
-    .fee-percent {
+    .fee-rate {
       display: inline-block;
     }
   }
diff --git a/www/views/confirm.html b/www/views/confirm.html
index 8b6ad0df7..b9c65a312 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -81,7 +81,7 @@
           <span class="label">{{'Fee' | translate}}: {{feeLevel | translate}}</span>
           <span class="m10l">{{fee || '...'}}</span>
           <span class="item-note m10l">
-            <span>{{feeFiat || '...'}}&nbsp;<span class="fee-percent" ng-if="feePercent" translate>- {{feePercent}} % of the transaction</span></span>
+            <span>{{feeFiat || '...'}}&nbsp;<span class="fee-rate" ng-if="feeRateStr" translate>- {{feeRateStr}} of the transaction</span></span>
           </span>
           <i class="icon bp-arrow-right"></i>
         </div>
diff --git a/www/views/includes/confirm-tx.html b/www/views/includes/confirm-tx.html
deleted file mode 100644
index 1743e399c..000000000
--- a/www/views/includes/confirm-tx.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="m20t">
-  <label class="size-14 text-center">
-    <span translate>Send bitcoin</span>
-  </label>
-</div>
-<div class="text-center">
-  <div class="size-36">{{tx.amountStr}}</div>
-  <div class="size-12 label gray radius" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
-  <i class="db fi-arrow-down size-24 m10v"></i>
-  <div class="payment-proposal-to" copy-to-clipboard="tx.toAddress">
-    <i class="fi-bitcoin left m10l"></i>
-    <contact ng-if="!tx.hasMultiplesOutputs" class="dib enable_text_select ellipsis m5t m5b m15l size-14" address="{{tx.toAddress}}"></contact>
-    <span ng-if="tx.hasMultiplesOutputs" translate>
-      Multiple recipients
-    </span>
-  </div>
-  <div class="m10t size-12" ng-init="processFee(tx.amount, tx.fee)">
-    <div ng-show="!showPercentage" ng-click="showPercentage = true">
-      <span translate>Fee</span> <span class="tl">({{feeLevel|translate}})</span>:
-      <span class="text-bold">{{tx.feeStr}}</span>
-      <span class="label gray radius">{{feeAlternativeStr}}</span>
-    </div>
-    <div ng-show="showPercentage" ng-click="showPercentage = false" translate>
-      {{feeRateStr}} of the transaction
-    </div>
-  </div>
-  <div class="row m20t dib">
-    <div class="half-row left">
-      <button ng-click="cancel()" class="round outline dark-gray expand">
-        <span class="size-12" translate>Cancel</span>
-      </button>
-    </div>
-    <div class="half-row left">
-      <button ng-click="accept()" class="round expand" ng-class="{'wallet-background-color-default': !color}" ng-style="{'background-color': color}" autofocus>
-        <span class="size-12" translate>Confirm</span>
-      </button>
-    </div>
-  </div>
-</div>