mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #2267 from cmgustavo/bug/ux-generate-address
Optimize Receive section for mobile
This commit is contained in:
commit
bc706d6373
|
@ -6,8 +6,9 @@ angular.module('copayApp.controllers').controller('ReceiveController',
|
|||
$scope.newAddr = function() {
|
||||
var w = $rootScope.wallet;
|
||||
$scope.loading = true;
|
||||
w.generateAddress(null);
|
||||
var lastAddr = w.generateAddress(null);
|
||||
$scope.setAddressList();
|
||||
$scope.addr = lastAddr;
|
||||
$timeout(function() {
|
||||
$scope.loading = false;
|
||||
}, 1);
|
||||
|
@ -20,10 +21,10 @@ angular.module('copayApp.controllers').controller('ReceiveController',
|
|||
var w = $rootScope.wallet;
|
||||
var lastAddr = _.first(w.getAddressesOrderer());
|
||||
var balance = w.balanceInfo.balanceByAddr;
|
||||
$scope.setAddressList();
|
||||
|
||||
while (balance && balance[lastAddr] > 0) {
|
||||
$scope.loading = true;
|
||||
$scope.newAddr();
|
||||
lastAddr = w.generateAddress(null);
|
||||
};
|
||||
$scope.loading = false;
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="large-12 columns" ng-if="addresses.length">
|
||||
<div class="large-12 columns" ng-if="showAll">
|
||||
<div ng-repeat="addr in addresses" ng-click="openAddressModal(addr)" class="pointer">
|
||||
<div class="panel">
|
||||
<div class="row">
|
||||
|
@ -48,20 +48,16 @@
|
|||
<!-- end of panel mobile -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="large-12 columns">
|
||||
<a class="button secondary tiny text-center right" ng-click="newAddr()" ng-disabled="loading">
|
||||
Generate new address
|
||||
Generate new address
|
||||
</a>
|
||||
<a class="button secondary tiny text-center" ng-click="toggleShowAll()" ng-disabled="loading">
|
||||
<span translate ng-if="showAll">Hide them</span>
|
||||
<span ng-show="!showAll" translate>Show all my addresses</span>
|
||||
<span ng-show="showAll" translate>Hide them</span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="large-12 columns" ng-if="!showAll">
|
||||
<div class="m20b">
|
||||
<a class="button secondary tiny text-center" ng-click="toggleShowAll()" ng-disabled="loading">
|
||||
<span translate>Show all my addresses</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in New Issue