fix calculator ui - resume send view ui

src/css/ionic-migration.css

@@ -12,10 +12,6 @@
 
 /* Conflicting styles that are customized as a compromise. These styles are a merge or compromise of foundation.css and ionic.css. */
 
-.row {
-
-}
-
 .behind {
 	z-index: -1;
 }
@@ -88,30 +84,6 @@
 	font-size: 14px;
 }
 
-.button.button-light:hover {
-	background-color: #fff;
-	border: 1px solid #E9E9EC;
-}
-
-.button.button-light:active {
-	background-color: #ababab;
-	border: 1px solid #E9E9EC;
-}
-
-.button.button-stable:hover {
-	background-color: transparent;
-	border: 1px solid #E9E9EC;
-}
-
-.button.button-stable:active {
-	background-color: #ababab;
-	border: 1px solid #E9E9EC;
-}
-
-.button-amount {
-	text-transform: none;
-}
-
 button, .button {
 	min-width: inherit;
   min-height: inherit;

src/js/controllers/modals/inputAmount.js

@@ -160,8 +160,6 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
         $ionicScrollDelegate.resize();
       }, 100);
     } else {
-      // self.setAmount(amount, $scope.showAlternativeAmount);
-      // $scope.cancel();
       $scope.sending = true;
       $scope.sendingAmount = profileService.formatAmount(amount * unitToSatoshi, true);
       $scope.sendingAlternativeAmount = $filter('formatFiatAmount')(alternativeAmount);

src/js/controllers/tab-send.js

@@ -1,14 +1,12 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabSendController', function($scope, $ionicModal, addressbookService, profileService, configService, lodash) {
+angular.module('copayApp.controllers').controller('tabSendController', function($scope, $ionicModal, $log, addressbookService, profileService, configService, lodash) {
   var completeList;
 
   $scope.init = function() {
     addressbookService.list(function(err, ab) {
-      if (err) {
-        console.log('ERROR:', err);
-        return;
-      }
+      if (err) $log.error(err);
+
       // $scope.contactList = lodash.isEmpty(ab) ? null : ab;
       $scope.contactList = [{
         label: 'Javier',
@@ -29,7 +27,6 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
     config.colorFor = config.colorFor || {};
     config.aliasFor = config.aliasFor || {};
 
-    // Sanitize empty wallets (fixed in BWC 1.8.1, and auto fixed when wallets completes)
     var credentials = lodash.filter(profileService.profile.credentials, 'walletName');
     var ret = lodash.map(credentials, function(c) {
       return {
@@ -50,6 +47,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
       var val = item.label || item.alias || item.name;
       return lodash.includes(val.toLowerCase(), $scope.search.toLowerCase());
     });
+
     if (lodash.isEmpty(result) || lodash.isEmpty($scope.search)) {
       $scope.list = completeList;
       return;

src/js/version.js

@@ -1,2 +0,0 @@
-window.version="2.5.0";
-window.commitHash="a1a05a3";

src/sass/main.scss

@@ -1981,6 +1981,10 @@ to prevent collapsing during animation*/
   color: #fff;
 }
 
+.transform-none {
+  text-transform: none;
+}
+
 /*** modals ***/
 
 .hideModal {
@@ -2189,16 +2193,16 @@ input[type="number"] {
 
 @media all and (max-height: 480px) {
 	.calculator .button-calc .columns { padding: 10px; }
-  .calculator .header-calc { top: 11%; }
+  .calculator .header-calc { top: 30%; }
 }
 
 @media (min-height: 481px) and (max-height: 670px) {
 	.calculator .button-calc .columns { padding: 15px; }
-  .calculator .header-calc { top: 15%; }
+  .calculator .header-calc { top: 30%; }
 }
 
 @media all and (min-height: 671px) {
 	.calculator .button-calc .columns { padding: 20px; }
-  .calculator .header-calc { top: 18%; }
+  .calculator .header-calc { top: 32%; }
 }