remove next address button - add copy to clipboard - load list after transition

This commit is contained in:
Javier 2016-11-17 13:30:52 -03:00
commit b564be7275
7 changed files with 19 additions and 30 deletions

View file

@ -111,7 +111,7 @@ angular.module('copayApp.controllers').controller('addressesController', functio
});
};
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.$on("$ionicView.afterEnter", function(event, data) {
config = configService.getSync().wallet.settings;
unitToSatoshi = config.unitToSatoshi;
satToUnit = 1 / unitToSatoshi;

View file

@ -776,10 +776,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
root.getMainAddresses = function(wallet, opts, cb) {
opts = opts || {};
opts.reverse = true;
wallet.getMainAddresses(opts, function(err, addresses) {
if (err) return cb(err);
return cb(null, addresses);
return cb(err, addresses);
});
};

View file

@ -4,11 +4,6 @@
padding: 0 1rem;
margin: 1rem 0;
}
&-heading {
font-size: 17px;
color: $dark-gray;
margin: 1rem 0;
}
&-description {
text-align: center;
font-size: 15px;
@ -20,10 +15,6 @@
cursor: hand;
}
}
&-description-disabled {
color: cadetblue;
text-decoration: none;
}
&-balance {
margin-top: 4px;
color: #5DD263;
@ -32,15 +23,19 @@
margin-top: 4px;
color: #B8B8B8;
}
.addr-title, .addr-value {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.addr-list {
.big-icon-svg {
padding: 0 7px;
border-radius: 50%;
width: 40px;
height: 40px;
box-shadow: none;
background-repeat: no-repeat;
background-clip: padding-box;
background-size: 103%;
}
.item {
color: $dark-gray;
padding-top: 1.3rem;

View file

@ -86,6 +86,8 @@
.bit-address {
font-size: .8rem;
// left:10%;
cursor: pointer;
cursor: hand;
position: absolute;
transition: all .15s ease;
width:100%;

View file

@ -8,7 +8,7 @@
<ion-content>
<div class="addr-list">
<div class="text-center padding size-42">
<i class="icon ion-ios-ionic-outline"></i>
<i class="icon ion-ios-ionic-outline big-icon-svg"></i>
</div>
<div class="addr-explanation">
@ -36,7 +36,7 @@
<p ng-if="showMore" translate>The restore process will stop when 20 addresses are generated in a row which contain no funds. To safely generate more addresses, make a payment to one of the unused addresses which has already been generated. <a ng-click="readMore()" translate>Read less</a></p>
</div>
<div class="item" ng-repeat="u in latestUnused track by $index">
<div class="item" ng-repeat="u in latestUnused track by $index" copy-to-clipboard="u.address">
{{u.address}}
<div class="addr-path">
{{u.path}} {{u.createdOn * 1000 | amDateFormat:'MMMM Do YYYY, hh:mm a'}}
@ -49,7 +49,7 @@
Addresses With Balance
</div>
<div class="item" ng-repeat="w in latestWithBalance track by $index">
<div class="item" ng-repeat="w in latestWithBalance track by $index" copy-to-clipboard="w.address">
{{w.address}}
<div class="addr-balance">{{w.balanceStr}}</div>
</div>

View file

@ -9,7 +9,7 @@
<div class="addr-list list">
<div class="item item-divider"></div>
<div class="item" ng-repeat="a in allAddresses track by $index">
<div class="item" ng-repeat="a in allAddresses track by $index" copy-to-clipboard="a.address">
{{a.address}}
<div class="addr-path" ng-if="!a.balanceStr">
{{a.path}} {{a.createdOn * 1000 | amDateFormat:'MMMM Do YYYY, hh:mm a'}}

View file

@ -64,19 +64,13 @@
<i class="icon ion-ios-upload-outline"></i>
<span translate>Share</span>
</div>
<div ng-class="{'center-block': !isCordova || !addr}">
<div class="item item-icon-left" ng-click="setAddress(true)">
<i class="icon ion-ios-loop"></i>
<span translate>Next Address</span>
</div>
</div>
</div>
<div id="bit-address" class="row border-top" ng-click="showAddresses()">
<div class="center-block bit-address text-center" ng-repeat="wallet in wallets track by $index" ng-class="walletPosition($index)">
<div class="item item-icon-left item-icon-right">
<i class="icon icon-svg receive-tab-bitcoin-icon"><img src="img/icon-bitcoin-symbol.svg"></i>
<span class="bit-address-gen-address" ng-if="generatingAddress">...</span>
<span class="bit-address-gen-address" ng-if="!generatingAddress" copy-to-clipboard="walletAddrs[wallet.id]">{{walletAddrs[wallet.id]}}</span>
<span class="bit-address-gen-address" ng-if="!generatingAddress">{{walletAddrs[wallet.id]}}</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
</div>