From cdcc06067412a164b8d7fc9eb8375818d38999a4 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Tue, 9 Aug 2016 15:28:03 -0300
Subject: [PATCH] fix customized unit amount - show address

---
 public/views/modals/inputAmount.html     |  6 +++---
 src/js/controllers/modals/inputAmount.js | 18 +++++++++++++-----
 src/js/controllers/walletHome.js         |  5 ++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/public/views/modals/inputAmount.html b/public/views/modals/inputAmount.html
index 48e38ad29..cec4b620e 100644
--- a/public/views/modals/inputAmount.html
+++ b/public/views/modals/inputAmount.html
@@ -75,10 +75,10 @@
         <h4 class="title m10l" translate>QR Code</h4>
         <ul class="no-bullet size-14 m0">
           <li class="line-b p10 oh text-center">
-            <qrcode size="220" data="bitcoin:{{addr + '?amount=' + specificAmount}}"></qrcode>
+            <qrcode size="220" data="bitcoin:{{addr + '?amount=' + customizedAmountBtc}}"></qrcode>
             <div class="m10t text-center" ng-show="isCordova">
               <span class="button outline dark-gray tiny round"
-                ng-click="shareAddress('bitcoin:' + addr + '?amount=' + specificAmount)">
+                ng-click="shareAddress('bitcoin:' + addr + '?amount=' + customizedAmountBtc)">
                 <i class="fi-share"></i>
                 <span translate>Share address</span>
               </span>
@@ -91,7 +91,7 @@
           <li class="line-b p10 oh">
             <span class="text-gray" translate>Address</span>:
             <span class="right">
-              <span class="text-gray enable_text_select">{{address}}</span>
+              <span class="text-gray enable_text_select">{{addr}}</span>
             </span>
           </li>
           <li class="line-b p10 oh">
diff --git a/src/js/controllers/modals/inputAmount.js b/src/js/controllers/modals/inputAmount.js
index 0058f34f8..ceafa36b0 100644
--- a/src/js/controllers/modals/inputAmount.js
+++ b/src/js/controllers/modals/inputAmount.js
@@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
   var unitToSatoshi;
   var satToUnit;
   var unitDecimals;
+  var satToBtc;
   var self = $scope.self;
   var SMALL_FONT_SIZE_LIMIT = 13;
   var LENGTH_EXPRESSION_LIMIT = 19;
@@ -16,6 +17,7 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
     $scope.isCordova = platformInfo.isCordova;
     unitToSatoshi = config.unitToSatoshi;
     satToUnit = 1 / unitToSatoshi;
+    satToBtc = 1 / 100000000;
     unitDecimals = config.unitDecimals;
     $scope.resetAmount();
     $timeout(function() {
@@ -138,20 +140,26 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
   };
 
   $scope.finish = function() {
-    var amount = evaluate(format($scope.amount)).toFixed(unitDecimals);
-    var alternativeAmount = fromFiat(amount).toFixed(unitDecimals);
+    var amount = $scope.showAlternativeAmount ? fromFiat(evaluate(format($scope.amount))).toFixed(unitDecimals) : evaluate(format($scope.amount));
+    var alternativeAmount = $scope.showAlternativeAmount ? evaluate(format($scope.amount)) : toFiat(evaluate(format($scope.amount)));
 
     if (amount % 1 == 0) amount = parseInt(amount);
 
     if ($scope.addr) {
-      $scope.specificAmount = amount;
-      $scope.specificAlternativeAmount = $filter('formatFiatAmount')(toFiat(amount));
+      $scope.specificAmount = profileService.formatAmount(amount * unitToSatoshi, true);
+      $scope.specificAlternativeAmount = $filter('formatFiatAmount')(alternativeAmount);
+
+      if ($scope.unitName == 'bits') {
+        var amountSat = parseInt((amount * unitToSatoshi).toFixed(0));
+        amount = (amountSat * satToBtc).toFixed(8);
+      }
+      $scope.customizedAmountBtc = amount;
 
       $timeout(function() {
         $ionicScrollDelegate.resize();
       }, 100);
     } else {
-      self.setAmount(amount, alternativeAmount, $scope.showAlternativeAmount);
+      self.setAmount(amount, $scope.showAlternativeAmount);
       $scope.cancel();
     }
   };
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 1ef2263d1..cd47f1cb2 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -347,12 +347,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     }, 1);
   };
 
-  this.setAmount = function(amount, alternativeAmount, useAlternativeAmount) {
-    var amountResult = useAlternativeAmount ? alternativeAmount : amount;
+  this.setAmount = function(amount, useAlternativeAmount) {
     $scope.showAlternative = useAlternativeAmount;
 
     self.fromInputAmount = true;
-    self.setForm(null, amountResult, null);
+    self.setForm(null, amount, null);
   };
 
   this.submitForm = function() {