From 8cefdc1312297752ec2ff805f8e8ef4b83988f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Edgardo=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 26 Apr 2017 08:53:32 -0300
Subject: [PATCH] Revert "adding loading placeholders to avoid the screen
 resize in tab-home view"

---
 src/js/controllers/tab-home.js  |   3 -
 src/sass/views/tab-home.scss    |  38 --------
 www/views/includes/wallets.html |   2 +-
 www/views/tab-home.html         | 158 ++++++++++++++------------------
 www/views/tab-receive.html      |   2 +-
 www/views/tab-settings.html     |  30 +++---
 6 files changed, 81 insertions(+), 152 deletions(-)

diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 020716608..7a3fd83f8 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -194,7 +194,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         if (err) $log.error(err);
         $scope.txps = txps;
         $scope.txpsN = n;
-        $scope.txpsFinished = true;
         $timeout(function() {
           $ionicScrollDelegate.resize();
           $scope.$apply();
@@ -226,7 +225,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
           }
           if (++j == i) {
             updateTxps();
-            $scope.walletsFinished = true;
           }
         });
       });
@@ -254,7 +252,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         }
         $scope.notifications = notifications;
         $scope.notificationsN = total;
-        $scope.notificationsFinished = true;
         $timeout(function() {
           $ionicScrollDelegate.resize();
           $scope.$apply();
diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss
index a35975664..3886ba7ee 100644
--- a/src/sass/views/tab-home.scss
+++ b/src/sass/views/tab-home.scss
@@ -53,44 +53,6 @@
         }
       }
     }
-    .loading-block-title {
-      height: 20px;
-      width: 150px;
-      background:-webkit-radial-gradient(#fff, #f7f7f7);
-      background-size: 20px 100px;
-      -webkit-animation: m .6s linear infinite;
-    }
-    .loading-block-body {
-      width: 100%;
-      height: 160px;
-      background: -webkit-radial-gradient(#fff, #f7f7f7);
-      background-size: 25px 100%;
-      -webkit-animation: m .6s linear infinite;
-    }
-    @keyframes m {
-      0% {
-      background-position: 20px 0;
-      }
-      100% {
-      }
-    }
-  }
-  .card-loading-placeholder {
-    width: 100%;
-    margin-bottom: 0;
-  }
-  .loading-placeholder {
-    height: 100%;
-    .row {
-      height: 50%;
-    }
-  }
-  .animate-show-hide.ng-hide {
-    opacity: 0;
-  }
-  .animate-show-hide.ng-hide-add,
-  .animate-show-hide.ng-hide-remove {
-    transition: all linear 0.2s;
   }
   .wallet-details__item.item {
     padding-top: 0;
diff --git a/www/views/includes/wallets.html b/www/views/includes/wallets.html
index bca92b8f0..4fa2cc894 100644
--- a/www/views/includes/wallets.html
+++ b/www/views/includes/wallets.html
@@ -8,7 +8,7 @@
           </i>
           <span class="wallet-name">{{wallet.name || wallet.id}}</span>
           <span class="item-note m10l" ng-if="!wallet.balanceHidden">
-            {{wallet.status.availableBalanceStr || '...'}}
+            {{wallet.status.availableBalanceStr}}
           </span>
           <span class="item-note m10l" ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
         </div>
diff --git a/www/views/tab-home.html b/www/views/tab-home.html
index 8022dc529..6d2ec9247 100644
--- a/www/views/tab-home.html
+++ b/www/views/tab-home.html
@@ -39,100 +39,76 @@
         On this screen you can see all your wallets, accounts, and assets.
       </div>
     </div>
-    <div class="loading-placeholder" ng-show="!txpsFinished || !notificationsFinished || !walletsFinished">
-      <div class="row">
-        <div class="list card card-loading-placeholder">
-          <a class="item item-icon-right item-heading">
-            <div class="loading-block-title"></div>
-            <i class="icon bp-arrow-right"></i>
-          </a>
-          <a class="item">
-            <div class="loading-block-body"></div>
-          </a>
-        </div>
-      </div>
-      <div class="row">
-        <div class="list card card-loading-placeholder">
-          <a class="item item-icon-right item-heading">
-            <div class="loading-block-title"></div>
-            <i class="icon bp-arrow-right"></i>
-          </a>
-          <a class="item">
-            <div class="loading-block-body"></div>
-          </a>
-        </div>
+
+    <div class="list card" ng-hide="!txps[0]">
+      <a class="item item-icon-right item-heading" ui-sref="tabs.proposals">
+        {{'Payment Proposals'|translate}}
+        <i class="icon bp-arrow-right"></i>
+        <span class="badge badge-assertive m5t m10r" ng-show="txpsN>3"> {{txpsN}}</span>
+      </a>
+
+      <div ng-repeat="tx in txps" ng-click="openTxpModal(tx)">
+        <a class="wallet-details__item item item-sub" ng-include="'views/includes/txp.html'"></a>
       </div>
     </div>
-    <div class="animate-show-hide" ng-show="txpsFinished && notificationsFinished && walletsFinished">
-      <div class="list card" ng-hide="!txps[0]">
-        <a class="item item-icon-right item-heading" ui-sref="tabs.proposals">
-          {{'Payment Proposals'|translate}}
-          <i class="icon bp-arrow-right"></i>
-          <span class="badge badge-assertive m5t m10r" ng-show="txpsN>3"> {{txpsN}}</span>
-        </a>
 
-        <div ng-repeat="tx in txps" ng-click="openTxpModal(tx)">
-          <a class="wallet-details__item item item-sub" ng-include="'views/includes/txp.html'"></a>
-        </div>
-      </div>
-
-      <div class="list card" ng-if="notifications[0] && recentTransactionsEnabled">
-        <a class="item item-icon-right item-heading" ui-sref="tabs.activity">
-          <span translate>Recent Transactions</span>
-          <i class="icon bp-arrow-right"></i>
-          <span class="badge badge-assertive m5t m10r" ng-show="notificationsN>3"> {{notificationsN}}</span>
-        </a>
-        <a class="item item-sub activity" ng-repeat="notification in notifications" ng-click="openNotificationModal(notification)">
-          <span ng-include="'views/includes/walletActivity.html'"></span>
-        </a>
-      </div>
-
-      <div class="list card">
-        <div class="item item-icon-right item-heading">
-          <span translate>Wallets</span>
-          <a ui-sref="tabs.add" ng-if="wallets[0]"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
-        </div>
-        <div>
-          <a ng-if="!wallets[0]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
-           <i class="icon big-icon-svg">
-             <img src="img/icon-wallet.svg" class="bg wallet icon-create-wallet"/>
-           </i>
-            <span translate>Create bitcoin wallet</span>
-            <i class="icon bp-arrow-right"></i>
-          </a>
-          <a ng-repeat="wallet in wallets track by $index"
-             class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet"
-             ng-click="openWallet(wallet)">
-            <i class="icon big-icon-svg">
-              <img src="img/icon-wallet.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
-            </i>
-            <span>
-              {{wallet.name || wallet.id}}
-            </span>
-            <p>
-            <span ng-if="!wallet.isComplete()" class="assertive" translate>
-              Incomplete
-            </span>
-            <span ng-if="wallet.isComplete()">
-              <span ng-if="!wallet.balanceHidden"> {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance   + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn  * 1000 | amTimeAgo) : '') : ''  ) }} </span>
-
-              <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
-              <span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">
-                {{wallet.m}}-of-{{wallet.n}}
-              </span>
-              <i ng-if="!wallet.balanceHidden && (wallet.status.totalBalanceSat != wallet.status.spendableAmount)" class="tab-home__wallet__status-icon ion-ios-timer-outline"></i>
-              <span class="assertive" ng-if="wallet.error">{{wallet.error}}</span>
-            </span>
-            &nbsp;
-            </p>
-            <i class="icon bp-arrow-right"></i>
-          </a>
-        </div>
-      </div>
-      <div class="ng-hide" ng-show="wallets[0] && bitpayCardItems.length>0" ng-include="'views/includes/bitpayCardsCard.html'"></div>
-      <div class="ng-hide" ng-show="wallets[0] && buyAndSellItems.length>0" ng-include="'views/includes/buyAndSellCard.html'"></div>
-      <div class="ng-hide" ng-show="homeIntegrations.length>0" ng-include="'views/includes/homeIntegrations.html'"></div>
-      <div class="ng-hide" ng-show="nextStepsItems.length>0" ng-include="'views/includes/nextSteps.html'"></div>
+    <div class="list card" ng-if="notifications[0] && recentTransactionsEnabled">
+      <a class="item item-icon-right item-heading" ui-sref="tabs.activity">
+        <span translate>Recent Transactions</span>
+        <i class="icon bp-arrow-right"></i>
+        <span class="badge badge-assertive m5t m10r" ng-show="notificationsN>3"> {{notificationsN}}</span>
+      </a>
+      <a class="item item-sub activity" ng-repeat="notification in notifications" ng-click="openNotificationModal(notification)">
+        <span ng-include="'views/includes/walletActivity.html'"></span>
+      </a>
     </div>
+
+    <div class="list card">
+      <div class="item item-icon-right item-heading">
+        <span translate>Wallets</span>
+        <a ui-sref="tabs.add" ng-if="wallets[0]"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
+      </div>
+      <div>
+        <a ng-if="!wallets[0]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
+         <i class="icon big-icon-svg">
+           <img src="img/icon-wallet.svg" class="bg wallet icon-create-wallet"/>
+         </i>
+          <span translate>Create bitcoin wallet</span>
+          <i class="icon bp-arrow-right"></i>
+        </a>
+        <a ng-repeat="wallet in wallets track by $index"
+           class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet"
+           ng-click="openWallet(wallet)">
+          <i class="icon big-icon-svg">
+            <img src="img/icon-wallet.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
+          </i>
+          <span>
+            {{wallet.name || wallet.id}}
+          </span>
+          <p>
+          <span ng-if="!wallet.isComplete()" class="assertive" translate>
+            Incomplete
+          </span>
+          <span ng-if="wallet.isComplete()">
+            <span ng-if="!wallet.balanceHidden"> {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance   + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn  * 1000 | amTimeAgo) : '') : ''  ) }} </span>
+
+            <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
+            <span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">
+              {{wallet.m}}-of-{{wallet.n}}
+            </span>
+            <i ng-if="!wallet.balanceHidden && (wallet.status.totalBalanceSat != wallet.status.spendableAmount)" class="tab-home__wallet__status-icon ion-ios-timer-outline"></i>
+            <span class="assertive" ng-if="wallet.error">{{wallet.error}}</span>
+          </span>
+          &nbsp;
+          </p>
+          <i class="icon bp-arrow-right"></i>
+        </a>
+      </div>
+    </div>
+    <div class="ng-hide" ng-show="wallets[0] && bitpayCardItems.length>0" ng-include="'views/includes/bitpayCardsCard.html'"></div>
+    <div class="ng-hide" ng-show="wallets[0] && buyAndSellItems.length>0" ng-include="'views/includes/buyAndSellCard.html'"></div>
+    <div class="ng-hide" ng-show="homeIntegrations.length>0" ng-include="'views/includes/homeIntegrations.html'"></div>
+    <div class="ng-hide" ng-show="nextStepsItems.length>0" ng-include="'views/includes/nextSteps.html'"></div>
+
   </ion-content>
 </ion-view>
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html
index 56c390bf8..644af8e0f 100644
--- a/www/views/tab-receive.html
+++ b/www/views/tab-receive.html
@@ -90,7 +90,7 @@
                 </i>
                 <span class="wallet-name">{{wallet.name || wallet.id}}</span>
                 <span class="item-note m10l">
-                  {{wallet.status.availableBalanceStr || '...'}}
+                  {{wallet.status.availableBalanceStr}}
                 </span>
               </div>
             </div>
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html
index 76c76ec7b..cfc054614 100644
--- a/www/views/tab-settings.html
+++ b/www/views/tab-settings.html
@@ -47,25 +47,22 @@
         <i class="icon bp-arrow-right"></i>
       </a>
       <a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.language">
-        <i class="icon big-icon-svg">
-          <img src="img/icon-language.svg" class="bg"/>
-        </i>
-        <span class="setting-title">{{'Language' | translate}}</span>
-        <span class="setting-value">
-          {{currentLanguageName | translate}}
-        </span>
-        <span ng-if="!currentLanguageName" class="setting-value">
-          ...
-        </span>
-        <i class="icon bp-arrow-right"></i>
-      </a>
+       <i class="icon big-icon-svg">
+         <img src="img/icon-language.svg" class="bg"/>
+       </i>
+       <span class="setting-title">{{'Language' | translate}}</span>
+       <span class="setting-value">
+         {{currentLanguageName|translate}}
+       </span>
+       <i class="icon bp-arrow-right"></i>
+     </a>
       <a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.unit">
         <i class="icon big-icon-svg">
           <img src="img/icon-unit.svg" class="bg"/>
         </i>
         <span class="setting-title">{{'Bitcoin Unit' | translate}}</span>
         <span class="setting-value">
-          {{unitName || '...'}}
+          {{unitName}}
         </span>
         <i class="icon bp-arrow-right"></i>
       </a>
@@ -76,7 +73,7 @@
         </i>
         <span class="setting-title">{{'Alternative Currency' | translate}}</span>
         <span class="setting-value">
-          {{selectedAlternative.name || '...'}}
+          {{selectedAlternative.name}}
         </span>
         <i class="icon bp-arrow-right"></i>
       </a>
@@ -87,10 +84,7 @@
         </i>
         <span class="setting-title">{{'Bitcoin Network Fee Policy' | translate}}</span>
         <span class="setting-value">
-          {{feeOpts[currentFeeLevel] | translate}}
-        </span>
-        <span ng-if="!feeOpts[currentFeeLevel]" class="setting-value">
-          ...
+          {{feeOpts[currentFeeLevel]|translate}}
         </span>
         <i class="icon bp-arrow-right"></i>
       </a>