Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/recieve_view_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/disclaimer.js

@@ -1,6 +1,11 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService, uxLanguage, externalLinkService, storageService, $stateParams) {
+angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService, uxLanguage, externalLinkService, storageService, $stateParams, startupService) {
+
+  $scope.$on("$ionicView.afterEnter", function() {
+    startupService.ready();
+  });
+
   $scope.init = function() {
     $scope.lang = uxLanguage.currentLanguage;
     $scope.terms = {};

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/onboarding/welcomeController.js

@@ -1,9 +1,13 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $ionicConfig, $log, profileService) {
+angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $ionicConfig, $log, profileService, startupService) {
 
   $ionicConfig.views.swipeBackEnabled(false);
 
+  $scope.$parent.$on("$ionicView.afterEnter", function() {
+    startupService.ready();
+  });
+
   $scope.goImport = function(code) {
     $state.go('onboarding.import', {
       fromOnboarding: true,

src/js/controllers/tab-home.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('tabHomeController',
-  function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window, bitpayCardService) {
+  function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window, bitpayCardService, startupService) {
     var wallet;
     var listeners = [];
     var notifications = [];
@@ -13,6 +13,10 @@ angular.module('copayApp.controllers').controller('tabHomeController',
     $scope.homeTip = $stateParams.fromOnboarding;
     $scope.isCordova = platformInfo.isCordova;
 
+    $scope.$on("$ionicView.afterEnter", function() {
+      startupService.ready();
+    });
+
     if (!$scope.homeTip) {
       storageService.getHomeTipAccepted(function(error, value) {
         $scope.homeTip = (value == 'false') ? false : true;

src/js/controllers/tab-send.js

@@ -114,6 +114,9 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
 
     if (!wallets || !wallets.length) {
       $scope.hasFunds = false;
+      $timeout(function() {
+        $scope.$apply();
+      });
     }
 
     var index = 0;
@@ -130,6 +133,9 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
         }
         if (index == wallets.length) {
           $scope.hasFunds = $scope.hasFunds || false;
+          $timeout(function() {
+            $scope.$apply();
+          });
         }
       });
     });

src/js/routes.js

@@ -947,22 +947,21 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         });
 
         $ionicPlatform.on('resume', function() {
-          // Nothing tot do
+          // Nothing to do
         });
 
         $ionicPlatform.on('menubutton', function() {
           window.location = '#/preferences';
         });
-
-        setTimeout(function() {
-          navigator.splashscreen.hide();
-        }, 500);
       }
 
 
       $log.info('Init profile...');
       // Try to open local profile
       profileService.loadAndBindProfile(function(err) {
+        $ionicHistory.nextViewOptions({
+          disableAnimate: true
+        });
         if (err) {
           if (err.message && err.message.match('NOPROFILE')) {
             $log.debug('No profile... redirecting');

src/js/services/startupService.js

@@ -0,0 +1,28 @@
+'use strict';
+
+angular.module('copayApp.services').service('startupService', function($log, $timeout) {
+
+  var splashscreenVisible = true;
+  var statusBarVisible = false;
+
+  function _hideSplash(){
+    if(typeof navigator.splashscreen !== "undefined" && splashscreenVisible){
+      $log.debug('startupService is hiding the splashscreen...');
+      $timeout(function(){
+        navigator.splashscreen.hide();
+      }, 20);
+      splashscreenVisible = false;
+    }
+  }
+  function _showStatusBar(){
+    if(typeof StatusBar !== "undefined" && !statusBarVisible){
+      $log.debug('startupService is showing the StatusBar...');
+      StatusBar.show();
+      statusBarVisible = true;
+    }
+  }
+  this.ready = function() {
+    _showStatusBar();
+    _hideSplash();
+  };
+});

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;
 }