diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 3665f1042..b1661758e 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -57,7 +57,8 @@ angular.module('copayApp.controllers').controller('confirmController', function( } var filteredWallets = []; - var index = 0, enoughFunds = false; + var index = 0; + var enoughFunds = false; lodash.each(wallets, function(w) { walletService.getStatus(w, {}, function(err, status) { @@ -311,6 +312,9 @@ angular.module('copayApp.controllers').controller('confirmController', function( popupService.showConfirm(null, message, okText, cancelText, function(ok) { if (!ok) { $scope.sendStatus = ''; + $timeout(function() { + $scope.$apply(); + }); return; } publishAndSign(wallet, txp, onSendStatusChange); @@ -331,14 +335,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( }; function statusChangeHandler(processName, showName, isOn) { - console.log('in statusChangeHandler', processName, showName, isOn); - console.log('$scope.wallet', $scope.wallet); - if( - (processName === 'broadcastingTx' || - ((processName === 'signingTx') && $scope.wallet.m > 1)) && !isOn) { + $log.debug('statusChangeHandler: ', processName, showName, isOn); + if ((processName === 'broadcastingTx' || ((processName === 'signingTx') && $scope.wallet.m > 1)) && !isOn) { $scope.sendStatus = 'success'; $scope.$digest(); - } else if(showName) { + } else if (showName) { $scope.sendStatus = showName; } } diff --git a/src/js/controllers/modals/txStatus.js b/src/js/controllers/modals/txStatus.js index 6ac660181..e9e3aa537 100644 --- a/src/js/controllers/modals/txStatus.js +++ b/src/js/controllers/modals/txStatus.js @@ -1,49 +1,11 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $stateParams, $ionicHistory, $log, addressbookService) { +angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout) { if ($scope.cb) $timeout($scope.cb, 100); - var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName; - $scope.fromSendTab = previousView.match(/tabs.send/) ? true : false; - $scope.fromBitPayCard = previousView.match(/tabs.bitpayCard/) ? true : false; - $scope.fromPayPro = $stateParams.paypro ? true : false; - $scope.cancel = function() { $scope.txStatusModal.hide(); - if ($scope.fromSendTab) { - $ionicHistory.removeBackView(); - $state.go('tabs.send'); - $timeout(function() { - $state.transitionTo('tabs.home'); - }, 100); - } else if ($scope.fromBitPayCard) { - $ionicHistory.removeBackView(); - $timeout(function() { - $state.transitionTo('tabs.bitpayCard'); - }, 100); - } }; - $scope.save = function(addressbookEntry) { - $scope.txStatusModal.hide(); - $ionicHistory.nextViewOptions({ - disableAnimate: true, - disableBack: true - }); - $ionicHistory.removeBackView(); - $state.go('tabs.send.addressbook', { - fromSendTab: $scope.fromSendTab, - addressbookEntry: addressbookEntry - }); - } - - addressbookService.list(function(err, ab) { - if (err) $log.error(err); - if (ab[$scope.tx.toAddress]) { - $scope.entryExist = true; - $log.debug('Entry already exist'); - } - }) - }); diff --git a/src/sass/shame.scss b/src/sass/shame.scss index 6216e4cb4..4ef73e65a 100644 --- a/src/sass/shame.scss +++ b/src/sass/shame.scss @@ -385,6 +385,10 @@ input[type=number] { text-transform: lowercase; } +.text-center { + text-align: center; +} + .text-light { font-weight: 200; } diff --git a/src/sass/views/includes/tx-status.scss b/src/sass/views/includes/tx-status.scss index c1a62c779..0e0f52a94 100644 --- a/src/sass/views/includes/tx-status.scss +++ b/src/sass/views/includes/tx-status.scss @@ -1,29 +1,4 @@ #tx-status { - .address { - display: flex; - padding: 5px 15px; - background-color: #f5f5f5; - margin-top: 10px; - i { - color: grey; - padding-right: 10px; - border-right: 1px solid; - border-color: grey; - font-size: 20px; - } - contact { - margin-left: 15px; - margin-bottom: 3px; - margin-top: 5px; - } - } - .collect-address { - bottom: 0; - background: #fff; - color: #6c6c6c; - position: absolute; - width: 100%; - } .popup-txsent { font-size: 5rem; color: #4A90E2; diff --git a/www/views/modals/tx-status.html b/www/views/modals/tx-status.html index 1c930de0d..83c363d83 100644 --- a/www/views/modals/tx-status.html +++ b/www/views/modals/tx-status.html @@ -1,41 +1,15 @@
-
-
-

Would you like to add this address to your address book?

+ +
+ {{tx.amountStr}}
-
-
- - - - -
+
+ Sent
-
-
- -
-
- -
+
+ OKAY