From e7e9de6adbf7955cd8e7757a16a25316756af422 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 9 Aug 2016 20:22:45 -0300
Subject: [PATCH] Fix input-amount for WP. Lock-amount by default

---
 public/views/walletHome.html     | 54 +++++++++++++++++++++++++++++---
 src/js/controllers/walletHome.js |  3 +-
 src/sass/forms.scss              | 22 -------------
 3 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 27be41161..1ba4ba392 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -420,12 +420,58 @@
                   </label>
                   <div class="input">
                     <div ng-if="index.isCordova">
-                      <input type="amount" readonly="true" ng-show="!showAlternative" id="amount" ng-disabled="home.lockAmount" name="amount" ng-attr-placeholder="{{'Amount in'|translate}} {{home.unitName}}" ng-model="_amount" valid-amount required autocomplete="off" ng-focus="openInputAmountModal()" ignore-mouse-wheel>
-                      <input type="amount" readonly="true" ng-show="showAlternative" id="alternative" ng-disabled="!home.isRateAvailable || home.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount in'|translate}} {{ home.alternativeName }}" ng-model="_alternative" required autocomplete="off" ng-focus="openInputAmountModal()" ignore-mouse-wheel>
+                      <input
+                        type="number"
+                        readonly="true"
+                        ng-show="!showAlternative"
+                        id="amount"
+                        ng-disabled="home.lockAmount"
+                        name="amount"
+                        ng-attr-placeholder="{{'Amount in'|translate}} {{home.unitName}}"
+                        ng-model="_amount"
+                        valid-amount
+                        required
+                        autocomplete="off"
+                        ng-click="openInputAmountModal()"
+                        ignore-mouse-wheel>
+                      <input
+                        type="number"
+                        readonly="true"
+                        ng-show="showAlternative"
+                        id="alternative"
+                        ng-disabled="!home.isRateAvailable || home.lockAmount"
+                        name="alternative"
+                        ng-attr-placeholder="{{'Amount in'|translate}} {{ home.alternativeName }}"
+                        ng-model="_alternative"
+                        required
+                        autocomplete="off"
+                        ng-click="openInputAmountModal()"
+                        ignore-mouse-wheel>
                     </div>
                     <div ng-if="!index.isCordova">
-                      <input type="number" ng-show="!showAlternative" id="amount" ng-disabled="home.lockAmount" name="amount" ng-attr-placeholder="{{'Amount in'|translate}} {{home.unitName}}" ng-model="_amount" valid-amount required autocomplete="off" ignore-mouse-wheel>
-                      <input type="number" ng-show="showAlternative" id="alternative" ng-disabled="!home.isRateAvailable || home.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount in'|translate}} {{ home.alternativeName }}" ng-model="_alternative" required autocomplete="off" ignore-mouse-wheel>
+                      <input
+                        type="number"
+                        ng-show="!showAlternative"
+                        id="amount"
+                        ng-disabled="home.lockAmount"
+                        name="amount"
+                        ng-attr-placeholder="{{'Amount in'|translate}} {{home.unitName}}"
+                        ng-model="_amount"
+                        valid-amount
+                        required
+                        autocomplete="off"
+                        ignore-mouse-wheel>
+                      <input
+                        type="number"
+                        ng-show="showAlternative"
+                        id="alternative"
+                        ng-disabled="!home.isRateAvailable || home.lockAmount"
+                        name="alternative"
+                        ng-attr-placeholder="{{'Amount in'|translate}} {{ home.alternativeName }}"
+                        ng-model="_alternative"
+                        required
+                        autocomplete="off"
+                        ignore-mouse-wheel>
                     </div>
                     <a class="postfix button" ng-show="!showAlternative" ng-style="{'background-color':index.backgroundColor}" ng-click="showAlternative = !showAlternative">{{home.unitName}}</a>
                     <a class="postfix button black" ng-show="showAlternative" ng-click="showAlternative = !showAlternative">{{home.alternativeIsoCode}}</a>
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 93174daeb..2a315605b 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -610,8 +610,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       form.amount.$setViewValue("" + amount);
       form.amount.$isValid = true;
       form.amount.$render();
-      if (!this.fromInputAmount)
-        this.lockAmount = true;
+      this.lockAmount = true;
       this.fromInputAmount = false;
     }
 
diff --git a/src/sass/forms.scss b/src/sass/forms.scss
index e58f64586..e5bbebbbe 100644
--- a/src/sass/forms.scss
+++ b/src/sass/forms.scss
@@ -44,28 +44,6 @@ textarea:focus {
   background: transparent;
 }
 
-input[type="amount"] {
-  &[readonly] {
-    width: 100%;
-    opacity: 1;
-    color: #B7C2CD;
-    margin-bottom: 1.5rem;
-    height: 35px;
-    background: transparent;
-    border: none;
-    padding-left: 0.1rem;
-    font-size: 13px;
-    border-bottom: 1px solid #E9EDF0;
-    cursor: text;
-  },
-  &[disabled] {
-    background-color: #E4E8EC;
-    color: #2C3E50;
-    padding-left: 0.5rem;
-    opacity: 1;
-  }
-}
-
 input[type="text"] {
   &[disabled], &[readonly] {
     background-color: #E4E8EC;