Merge remote-tracking branch 'bitpay-wallet/ref/design' into feature/settings-polish

src/js/controllers/copayers.js

@@ -3,15 +3,11 @@
 angular.module('copayApp.controllers').controller('copayersController',
   function($scope, $log, $timeout, $stateParams, $state, $rootScope, $ionicHistory, lodash, profileService, walletService, popupService, platformInfo, gettextCatalog, ongoingProcess) {
 
+    $scope.isCordova = platformInfo.isCordova;
     $scope.$on("$ionicView.beforeEnter", function(event, data) {
-      init();
-    });
-
-    var init = function() {
-      $scope.isCordova = platformInfo.isCordova;
-      $scope.wallet = profileService.getWallet($stateParams.walletId);
+      $scope.wallet = profileService.getWallet(data.stateParams.walletId);
       updateWallet();
-    };
+    });
 
     $rootScope.$on('bwsEvent', function() {
       updateWallet();
@@ -40,7 +36,9 @@ angular.module('copayApp.controllers').controller('copayersController',
     };
 
     $scope.showDeletePopup = function() {
-      popupService.showConfirm(gettextCatalog.getString('Confirm'), gettextCatalog.getString('Are you sure you want to delete this wallet?'), null, null, function(res) {
+      var title = gettextCatalog.getString('Confirm');
+      var msg = gettextCatalog.getString('Are you sure you want to cancel and delete this wallet?');
+      popupService.showConfirm(title, msg, null, null, function(res) {
         if (res) deleteWallet();
       });
     };

src/js/controllers/onboarding/tour.js

@@ -34,6 +34,9 @@ angular.module('copayApp.controllers').controller('tourController',
         var rate = rateService.toFiat(btcAmount * 1e8, localCurrency);
         $scope.localCurrencySymbol = '$';
         $scope.localCurrencyPerBtc = $filter('formatFiatAmount')(parseFloat(rate.toFixed(2), 10));
+        $timeout(function() {
+          $scope.$apply();
+        })
       });
     });
 
@@ -50,7 +53,7 @@ angular.module('copayApp.controllers').controller('tourController',
               ongoingProcess.set('creatingWallet', false);
               popupService.showAlert(
                 gettextCatalog.getString('Cannot Create Wallet'), err,
-                 function() {
+                function() {
                   retryCount = 0;
                   return $scope.createDefaultWallet();
                 }, gettextCatalog.getString('Retry'));

src/js/controllers/tab-send.js

@@ -106,7 +106,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
 
 
   var updateHasFunds = function() {
-    $scope.hasFunds = true;
+    $scope.hasFunds = null;
 
     var wallets = profileService.getWallets({
       onlyComplete: true,
@@ -127,16 +127,16 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
           $log.error(err);
           return;
         }
-        if (status.availableBalanceSat && status.availableBalanceSat > 0) {
+
+        if (status.availableBalanceSat) {
           $scope.hasFunds = true;
         }
-        else $scope.hasFunds = false;
         if (index == wallets.length) {
           $scope.hasFunds = $scope.hasFunds || false;
+          $timeout(function() {
+            $scope.$apply();
+          });
         }
-        $timeout(function() {
-          $scope.$apply();
-        })
       });
     });
   };

src/sass/buttons.scss

@@ -35,7 +35,8 @@ $button-secondary-active-border:   transparent;
     @include button-outline($button-primary-bg);
   }
   &.button-primary,
-  &.button-secondary {
+  &.button-secondary,
+  &.button-assertive {
     &.button-standard {
       @extend %button-standard;
       & + .button-standard {

src/sass/views/copayers.scss

@@ -1,7 +1,13 @@
 .copayers-secret {
-  overflow-wrap: break-word;
-  word-wrap: break-word;
   text-align: center;
-  font-size: 14px;
+  font-size: 12px;
   margin: 10px;
+  white-space: -moz-pre-wrap !important;
+  white-space: -pre-wrap;
+  white-space: -o-pre-wrap;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  white-space: -webkit-pre-wrap;
+  word-break: break-all;
+  white-space: normal;
 }