diff --git a/css/src/main.css b/css/src/main.css index 22d4ff963..cfcdf7c46 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -616,11 +616,6 @@ ul.tx-copayers { .ma { margin: 0 auto;} .tu {text-transform: uppercase;} -.small { - font-size: 60%; - line-height: inherit; -} - .line-dashed-setuph-v { border-left: 1px dashed #415970; } @@ -850,6 +845,7 @@ input[type=number]::-webkit-outer-spin-button { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + padding-top: 3px; } ul.pagination li.current a { diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js index 9fc338ad0..877efd6f0 100644 --- a/js/controllers/copayers.js +++ b/js/controllers/copayers.js @@ -33,25 +33,24 @@ angular.module('copayApp.controllers').controller('CopayersController', }; $scope.deleteWallet = function() { - $scope.loading = true; - identityService.deleteWallet(w, function(err) { - if (err) { - $scope.loading = null; - $scope.error = err.message || err; - copay.logger.warn(err); - $timeout(function() { - $scope.$digest(); - }); - } else { - $scope.loading = false; - if ($rootScope.wallet) { - go.walletHome(); + $rootScope.starting = true; + $timeout(function() { + identityService.deleteWallet(w, function(err) { + $rootScope.starting = false; + if (err) { + $scope.error = err.message || err; + copay.logger.warn(err); + $timeout(function () { $scope.$digest(); }); + } else { + if ($rootScope.wallet) { + go.walletHome(); + } + $timeout(function() { + notification.success('Success', 'The wallet "' + (w.name || w.id) + '" was deleted'); + }); } - $timeout(function() { - notification.success('Success', 'The wallet "' + (w.name || w.id) + '" was deleted'); - }); - } - }); + }); + }, 100); }; $scope.copySecret = function(secret) { diff --git a/js/controllers/more.js b/js/controllers/more.js index dd633372f..0ab271512 100644 --- a/js/controllers/more.js +++ b/js/controllers/more.js @@ -119,22 +119,23 @@ angular.module('copayApp.controllers').controller('MoreController', $scope.deleteWallet = function() { $scope.loading = true; - identityService.deleteWallet(w, function(err) { - if (err) { - $scope.loading = null; - $scope.error = err.message || err; - copay.logger.warn(err); - $timeout(function () { $scope.$digest(); }); - } else { + $timeout(function() { + identityService.deleteWallet(w, function(err) { $scope.loading = false; - if ($rootScope.wallet) { - go.walletHome(); + if (err) { + $scope.error = err.message || err; + copay.logger.warn(err); + $timeout(function () { $scope.$digest(); }); + } else { + if ($rootScope.wallet) { + go.walletHome(); + } + $timeout(function() { + notification.success('Success', 'The wallet "' + (w.name || w.id) + '" was deleted'); + }); } - $timeout(function() { - notification.success('Success', 'The wallet "' + (w.name || w.id) + '" was deleted'); - }); - } - }); + }); + }, 100); }; $scope.copyText = function(text) { diff --git a/js/controllers/receive.js b/js/controllers/receive.js index 0a9e9c7ed..cdaa0b868 100644 --- a/js/controllers/receive.js +++ b/js/controllers/receive.js @@ -60,7 +60,7 @@ angular.module('copayApp.controllers').controller('ReceiveController', $modal.open({ templateUrl: 'views/modals/qr-address.html', - windowClass: 'tiny', + windowClass: 'small', controller: ModalInstanceCtrl, resolve: { address: function() { diff --git a/views/copayers.html b/views/copayers.html index bd9efe3b3..a38b5a25e 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -1,80 +1,86 @@
-
-
-

Share this secret with your copayers

-
+
+
- -
-
- -
-
-
-
- -
- - Please note the wallet creator must be online until all copayers have joined. - -
- -
-
- -
-
- {{secret}} -
-
-
- - Share secret - -
-
-

{{$root.wallet.getName()}}

- - [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ] - - in TESTNET -
-
+ +
+
+
+

Share this secret with your copayers

-
-
-

Waiting for copayers

-
-
-
-

+ +

+
+ +
+
+
+
+ +
+ + Please note the wallet creator must be online until all copayers have joined. + +
+ +
+
+ +
+
+ {{secret}} +
+
+
+ + Share secret + +
+
+

{{$root.wallet.getName()}}

+ + [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ] + + in TESTNET +
+
+
+
+
+
+

Waiting for copayers

+
+
+
+

Waiting... -

+

+
+
- -
- -
-
- -
-

Are you sure you want to cancel and delete this wallet

-
-
- -
-
- + +
+
+ +
+

Are you sure you want to cancel and delete this wallet

+
+
+ +
+
+ +
diff --git a/views/includes/copayers.html b/views/includes/copayers.html index 3180d4b46..e69dbda3c 100644 --- a/views/includes/copayers.html +++ b/views/includes/copayers.html @@ -6,12 +6,12 @@
- + {{'Me'|translate}} - - + + {{copayer.nick}} - +
- \ No newline at end of file + diff --git a/views/modals/address-book.html b/views/modals/address-book.html index 3d23d0d1f..602fc10f9 100644 --- a/views/modals/address-book.html +++ b/views/modals/address-book.html @@ -27,8 +27,8 @@ ng-repeat="(addr, info) in addressBook" ng-class="{'addressbook-disabled': info.hidden}"> - {{info.label}} -
{{::addr}}
+ {{info.label}}
+ {{::addr}} {{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}} diff --git a/views/modals/qr-address.html b/views/modals/qr-address.html index 2df6dc4fd..24af02226 100644 --- a/views/modals/qr-address.html +++ b/views/modals/qr-address.html @@ -4,14 +4,18 @@