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

add execute directive flag

Browse source
This commit is contained in:
Javier 2016-08-24 17:34:08 -03:00
commit afb7386ec2
5 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/confirm.html
View file

@ -45,7 +45,7 @@
<span class="badge badge-assertive" ng-show="content.notAvailable" translate>Not available</span> <span class="badge badge-assertive" ng-show="content.notAvailable" translate>Not available</span>
</div> </div>
<wallets only-complete="true" network="{{network}}" min-balance="{{minBalance}}"></wallets> <wallets ng-if="hasWallet" only-complete="true" network="{{network}}" min-balance="{{minBalance}}"></wallets>
<div class="item item-icon-left item-icon-right" ng-click="showDescriptionPopup()"> <div class="item item-icon-left item-icon-right" ng-click="showDescriptionPopup()">
<span ng-show="!description">Add Description</span> <span ng-show="!description">Add Description</span>

2
public/views/tab-receive.html
View file

@ -34,7 +34,7 @@
<span ng-show="generatingAddress">...</span> <span ng-show="generatingAddress">...</span>
<span ng-show="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span> <span ng-show="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
</div> </div>
<wallets only-complete="true"></wallets> <wallets ng-if="hasWallet" only-complete="true"></wallets>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

3
src/js/controllers/confirm.js
View file

@ -92,8 +92,9 @@ angular.module('copayApp.controllers').controller('confirmController', function(
}; };
$scope.init = function() { $scope.init = function() {
$scope.notAvailable = false;
$scope.wallet = profileService.getWallets()[0]; $scope.wallet = profileService.getWallets()[0];
$scope.notAvailable = false;
$scope.hasWallet = $scope.wallet ? true : false;
if ($stateParams.paypro) { if ($stateParams.paypro) {
return setFromPayPro($stateParams.paypro, function(err) { return setFromPayPro($stateParams.paypro, function(err) {

1
src/js/controllers/tab-receive.js
View file

@ -6,6 +6,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.init = function() { $scope.init = function() {
$scope.defaultWallet = profileService.getWallets()[0]; $scope.defaultWallet = profileService.getWallets()[0];
$scope.hasWallet = $scope.defaultWallet ? true : false;
$scope.isCordova = platformInfo.isCordova; $scope.isCordova = platformInfo.isCordova;
$scope.isNW = platformInfo.isNW; $scope.isNW = platformInfo.isNW;
$scope.setAddress(false); $scope.setAddress(false);

2
src/js/directives/directives.js
View file

@ -157,8 +157,8 @@ angular.module('copayApp.directives')
scope.content = {}; scope.content = {};
scope.content.wallets = []; scope.content.wallets = [];
scope.content.notAvailable = false; scope.content.notAvailable = false;
var minBalance = attrs.minBalance ? parseInt(attrs.minBalance) : 0;
var wallets = profileService.getWallets(opts); var wallets = profileService.getWallets(opts);
var minBalance = attrs.minBalance ? parseInt(attrs.minBalance) : 0;
var filteredWallets = []; var filteredWallets = [];
var index = 0; var index = 0;