From 206d01f71ed3b280fc8b513eca747bd08dca94bc Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 21 Apr 2015 15:22:58 -0300
Subject: [PATCH 1/4] Fix animation

---
 public/views/send.html       |  4 ++--
 public/views/walletHome.html | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/views/send.html b/public/views/send.html
index 6647a6008..2ff9ce1aa 100644
--- a/public/views/send.html
+++ b/public/views/send.html
@@ -115,8 +115,8 @@
             </div>
           </div>
 
-  <div class="text-gray text-center m10t animated infinite flash" ng-show="send.onGoingProcess" > 
-    <span>{{send.onGoingProcess|translate}}...</span>
+  <div class="text-gray text-center m10t animated infinite flash"> 
+    <span ng-show="send.onGoingProcess">{{send.onGoingProcess|translate}}...</span>
   </div>
 
 
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index c527cb240..e70bd45a4 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -15,14 +15,12 @@
 
 
 
-          <div class="size-36" ng-show="!index.anyOnGoingProcess">
-            <strong>
-              <span>
-                <span ng-class="{'animated pulse':!index.anyOnGoingProcess}">{{index.totalBalanceStr }}</span> 
-              </span>
+          <div class="size-36 animated pulse">
+            <strong ng-show="!index.anyOnGoingProcess">
+                {{index.totalBalanceStr }} 
             </strong>
           </div>
-          <div class="text-white text-center animated infinite flash" ng-show="index.anyOnGoingProcess" > 
+          <div class="text-white text-center animated infinite flash"> 
             <span translate ng-show="index.onGoingProcessName == 'openingWallet'">Opening Wallet...</span>
             <span translate ng-show="index.onGoingProcessName == 'updatingStatus'">Updating Status...</span>
             <span translate ng-show="index.onGoingProcessName == 'updatingBalance'">Updating Balance...</span>
@@ -30,8 +28,10 @@
             <span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
             <span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet on BWS...</span>
           </div>
-          <div class="size-14" ng-show="!index.anyOnGoingProcess && index.alternativeBalanceAvailable">
-            <span ng-class="{'animated fadeIn':!index.hideBalance}">{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}</span>
+          <div class="size-14" 
+            ng-class="{'animated fadeIn':!index.hideBalance}" 
+            ng-show="!index.anyOnGoingProcess && index.alternativeBalanceAvailable">
+            {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
           </div>
         </div>
         <div class="pr columns line-b">

From bfc1c61753cd8501f7a77ec58337d3f46c2e5374 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 21 Apr 2015 16:32:25 -0300
Subject: [PATCH 2/4] Fix animation for wp

---
 public/views/send.html       |  4 +--
 public/views/walletHome.html | 55 +++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/public/views/send.html b/public/views/send.html
index 2ff9ce1aa..c69adbb86 100644
--- a/public/views/send.html
+++ b/public/views/send.html
@@ -115,8 +115,8 @@
             </div>
           </div>
 
-  <div class="text-gray text-center m10t animated infinite flash"> 
-    <span ng-show="send.onGoingProcess">{{send.onGoingProcess|translate}}...</span>
+  <div ng-if="send.onGoingProcess" class="text-gray text-center m10t"> 
+    <span class="animated infinite flash">{{send.onGoingProcess|translate}}...</span>
   </div>
 
 
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index e70bd45a4..4583807b5 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -2,38 +2,41 @@
   <div class="row" ng-show="!index.noFocusedWallet">
     <div class="amount" ng-style="{'background-color':index.backgroundColor}">
 
-          <div ng-show="index.updateError && !index.notAuthorized && !index.anyOnGoingProcess" ng-click='index.openWallet()'> 
-              Could not update Wallet
-              <br> [Tap to retry]
-          </div>
-
-
-          <div ng-show="index.walletScanStatus == 'error' && !index.anyOnGoingProcess" ng-click='index.retryScan()'> 
-              Scan status finished with error
-              <br> [Tap to retry]
-          </div>
-
-
-
+      <div ng-if="!index.anyOnGoingProcess && !index.notAuthorized">
+        <div ng-show="index.updateError" ng-click='index.openWallet()'> 
+          <span translate>Could not update Wallet</span>
+          <br>[<span translate>Tap to retry</span>]
+        </div>
+        
+        <div ng-show="index.walletScanStatus == 'error'" ng-click='index.retryScan()'> 
+          <span translate>Scan status finished with error</span>
+          <br>[<span translate>Tap to retry</span>]
+        </div>
+        
+        <div ng-show="!index.updateError && index.walletScanStatus != 'error'">
           <div class="size-36 animated pulse">
-            <strong ng-show="!index.anyOnGoingProcess">
-                {{index.totalBalanceStr }} 
-            </strong>
-          </div>
-          <div class="text-white text-center animated infinite flash"> 
-            <span translate ng-show="index.onGoingProcessName == 'openingWallet'">Opening Wallet...</span>
-            <span translate ng-show="index.onGoingProcessName == 'updatingStatus'">Updating Status...</span>
-            <span translate ng-show="index.onGoingProcessName == 'updatingBalance'">Updating Balance...</span>
-            <span translate ng-show="index.onGoingProcessName == 'updatingPendingTxps'">Updating Pending Transactions...</span>
-            <span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
-            <span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet on BWS...</span>
+            <strong>{{index.totalBalanceStr}}</strong>
           </div>
           <div class="size-14" 
-            ng-class="{'animated fadeIn':!index.hideBalance}" 
-            ng-show="!index.anyOnGoingProcess && index.alternativeBalanceAvailable">
+            ng-class="{'animated fadeIn':!index.hideBalance && index.alternativeBalanceAvailable}" 
+            ng-show="index.alternativeBalanceAvailable">
             {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
           </div>
         </div>
+      </div>
+
+      <div ng-if="index.anyOnGoingProcess" class="text-white text-center">
+        <div class="animated infinite flash">
+          <span translate ng-show="index.onGoingProcessName == 'openingWallet'">Opening Wallet...</span>
+          <span translate ng-show="index.onGoingProcessName == 'updatingStatus'">Updating Status...</span>
+          <span translate ng-show="index.onGoingProcessName == 'updatingBalance'">Updating Balance...</span>
+          <span translate ng-show="index.onGoingProcessName == 'updatingPendingTxps'">Updating Pending Transactions...</span>
+          <span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
+          <span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet on BWS...</span>
+        </div>
+      </div>
+          
+    </div>
         <div class="pr columns line-b">
           <div class="avatar-wallet left" 
             ng-style="{'background-color':index.backgroundColor}">{{index.walletName | limitTo: 1}}</div>      

From 68173e632e204a551cc5cbe2dbb1d3de5741821c Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 21 Apr 2015 17:00:32 -0300
Subject: [PATCH 3/4] Important fix for chrome app. Fix updating alternative
 amount

---
 Gruntfile.js                 | 2 --
 public/views/walletHome.html | 9 +++++----
 src/js/routes.js             | 2 --
 test/karma.conf.js           | 2 --
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index c062a6aef..1e77a305b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -78,8 +78,6 @@ module.exports = function(grunt) {
       },
       angular: {
         src: [
-          'bower_components/fastclick/lib/fastclick.js',
-          'bower_components/modernizr/modernizr.js',
           'bower_components/qrcode-generator/js/qrcode.js',
           'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js',
           'bower_components/moment/min/moment-with-locales.js',
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 4583807b5..24603c618 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -17,10 +17,11 @@
           <div class="size-36 animated pulse">
             <strong>{{index.totalBalanceStr}}</strong>
           </div>
-          <div class="size-14" 
-            ng-class="{'animated fadeIn':!index.hideBalance && index.alternativeBalanceAvailable}" 
-            ng-show="index.alternativeBalanceAvailable">
-            {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
+          <div class="size-14"  
+            ng-if="index.totalBalanceAlternative">
+            <span ng-class="{'animated fadeIn':!index.hideBalance}">
+              {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
+            </span>
           </div>
         </div>
       </div>
diff --git a/src/js/routes.js b/src/js/routes.js
index ef538d08a..317adff43 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -7,8 +7,6 @@ if (window && window.navigator) {
   var isaosp = (rxaosp && rxaosp[1] < 537);
   if (!window.cordova && isaosp)
     unsupported = true;
-  if (!Modernizr.localstorage)
-    unsupported = true;
   if (unsupported) {
     window.location = '#/unsupported';
   }
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 3b2cb70bd..881d6b189 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -15,8 +15,6 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'bower_components/fastclick/lib/fastclick.js',
-      'bower_components/modernizr/modernizr.js',
       'bower_components/qrcode-generator/js/qrcode.js',
       'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js',
       'bower_components/moment/min/moment-with-locales.js',

From 02c6cd6ed99ea31fcdfbdf872badfe49a2a263b0 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 21 Apr 2015 17:35:11 -0300
Subject: [PATCH 4/4] Fix unsent transaction for 1-1 wallets

---
 public/views/walletHome.html | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 24603c618..f5344162c 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -99,15 +99,9 @@
   </div>
 
   <div ng-if="!index.requiresMultipleSignatures && index.txps[0]">
-    <div class="row">
-      <div class="large-12 columns">
-        <div class="panel oh">
-          <h2 class="line-b" translate>Unsent transactions</h2>
-          <div class="last-transactions pr" ng-repeat="tx in index.txps"
-            ng-include="'views/includes/transaction.html'">
-          </div>
-        </div>
-      </div>
+    <h4 class="title m0" translate>Unsent transactions</h4>
+    <div class="last-transactions pr" ng-repeat="tx in index.txps"
+      ng-include="'views/includes/transaction.html'">
     </div>
   </div>