anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2267 from cmgustavo/bug/ux-generate-address

Browse source 
Optimize Receive section for mobile
This commit is contained in:
Matias Alejo Garcia 2015-01-05 12:49:28 -03:00
commit bc706d6373
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/controllers/receive.js
View file

@ -6,8 +6,9 @@ angular.module('copayApp.controllers').controller('ReceiveController',
$scope.newAddr = function() { $scope.newAddr = function() {
var w = $rootScope.wallet; var w = $rootScope.wallet;
$scope.loading = true; $scope.loading = true;
w.generateAddress(null); var lastAddr = w.generateAddress(null);
$scope.setAddressList(); $scope.setAddressList();
$scope.addr = lastAddr;
$timeout(function() { $timeout(function() {
$scope.loading = false; $scope.loading = false;
}, 1); }, 1);
@ -20,10 +21,10 @@ angular.module('copayApp.controllers').controller('ReceiveController',
var w = $rootScope.wallet; var w = $rootScope.wallet;
var lastAddr = _.first(w.getAddressesOrderer()); var lastAddr = _.first(w.getAddressesOrderer());
var balance = w.balanceInfo.balanceByAddr; var balance = w.balanceInfo.balanceByAddr;
$scope.setAddressList();
while (balance && balance[lastAddr] > 0) { while (balance && balance[lastAddr] > 0) {
$scope.loading = true; $scope.loading = true;
$scope.newAddr();
lastAddr = w.generateAddress(null); lastAddr = w.generateAddress(null);
}; };
$scope.loading = false; $scope.loading = false;

16
views/receive.html
View file

@ -26,7 +26,7 @@
</div> </div>
</div> </div>
<div class="row"> <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 ng-repeat="addr in addresses" ng-click="openAddressModal(addr)" class="pointer">
<div class="panel"> <div class="panel">
<div class="row"> <div class="row">
@ -48,20 +48,16 @@
<!-- end of panel mobile --> <!-- end of panel mobile -->
</div> </div>
</div> </div>
</div>
<div class="large-12 columns">
<a class="button secondary tiny text-center right" ng-click="newAddr()" ng-disabled="loading"> <a class="button secondary tiny text-center right" ng-click="newAddr()" ng-disabled="loading">
Generate new address Generate new address
</a> </a>
<a class="button secondary tiny text-center" ng-click="toggleShowAll()" ng-disabled="loading"> <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> </a>
</div> </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>
</div> </div>