Merge pull request #5937 from bitpay/revert-5886-feat/placeholder

Revert "adding loading placeholders to avoid the screen resize in tab-home view"

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();

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;

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>

www/views/tab-home.html

@@ -39,31 +39,7 @@
         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>
-    </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}}
@@ -133,6 +109,6 @@
     <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>
+
   </ion-content>
 </ion-view>

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>

www/views/tab-settings.html

@@ -54,9 +54,6 @@
        <span class="setting-value">
          {{currentLanguageName|translate}}
        </span>
-        <span ng-if="!currentLanguageName" class="setting-value">
-          ...
-        </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">
@@ -65,7 +62,7 @@
         </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>
@@ -89,9 +86,6 @@
         <span class="setting-value">
           {{feeOpts[currentFeeLevel]|translate}}
         </span>
-        <span ng-if="!feeOpts[currentFeeLevel]" class="setting-value">
-          ...
-        </span>
         <i class="icon bp-arrow-right"></i>
       </a>