From 0fc3aa9539842f495ac57df02633e5add49743d1 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 26 Jun 2015 14:25:53 -0300
Subject: [PATCH] Refactor customized amount

---
 public/views/modals/customized-amount.html | 12 ++++++------
 src/js/controllers/walletHome.js           | 15 +++++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/public/views/modals/customized-amount.html b/public/views/modals/customized-amount.html
index a83f5b59a..5fbaad998 100644
--- a/public/views/modals/customized-amount.html
+++ b/public/views/modals/customized-amount.html
@@ -12,11 +12,11 @@
 </nav>
 
 <div class="modal-content">
-  <div ng-show="customizedAmount">
+  <div ng-show="customizedAmountBtc">
   <h4 class="title m0" 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=' + customizedAmount}}"></qrcode>
+      <qrcode size="220" data="bitcoin:{{addr + '?amount=' + customizedAmountBtc}}"></qrcode>
     </li>
   </ul>
   <h4 class="title m0" translate>Details</h4>
@@ -30,13 +30,13 @@
     <li class="line-b p10 oh">
     <span class="text-gray" translate>Amount</span>:
     <span class="right">
-      {{customizedAmount}}
-      <span class="label gray radius">{{customizedAlternative}}</span>
+      {{customizedAmountUnit}}
+      <span class="label gray radius">{{customizedAlternativeUnit}}</span>
     </span>
     </li>
   </ul>
   </div>
-  <div ng-show="!customizedAmount" class="row m20t">
+  <div ng-show="!customizedAmountBtc" class="row m20t">
     <div class="large-12 large-centered columns">
       <form name="amountForm" ng-submit="submitForm(amountForm)" novalidate>
         <div class="right" ng-hide="amountForm.amount.$pristine && !amountForm.amount.$modelValue ">
@@ -54,7 +54,7 @@
           </label>
           <div class="input">
             <input type="number" id="amount" name="amount" ng-attr-placeholder="{{'Amount'|translate}}"
-            ng-minlength="0.00000001" ng-maxlength="10000000000" ng-model="_customAmount" valid-amount required autocomplete="off">
+            ng-model="_customAmount" valid-amount required autocomplete="off">
             <input type="number" id="alternative"  name="alternative"  ng-model="_customAlternative" style="display:none">
             <a class="postfix" ng-click="toggleAlternative()">{{unitName}}</a>
           </div>
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 7a8363ab6..d58fa6a98 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -463,12 +463,15 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       $scope.submitForm = function(form) {
         var satToBtc = 1 / 100000000;
         var amount = form.amount.$modelValue;
-        var alternative = form.alternative.$modelValue;
-        if ($scope.unitName == 'bits') {
-          amount = parseInt((amount * $scope.unitToSatoshi).toFixed(0)) * satToBtc;
-        }
-        $scope.customizedAmount = amount;
-        $scope.customizedAlternative = alternative;
+        var amountSat = parseInt((amount * $scope.unitToSatoshi).toFixed(0));
+        $timeout(function() {
+          $scope.customizedAmountUnit = amount + ' ' + $scope.unitName;
+          $scope.customizedAlternativeUnit = $filter('noFractionNumber')(form.alternative.$modelValue, 2) + ' ' + $scope.alternativeIsoCode;
+          if ($scope.unitName == 'bits') {
+            amount = amountSat * satToBtc;
+          }
+          $scope.customizedAmountBtc = amount;
+        }, 1);
       };
 
       $scope.toggleAlternative = function() {