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

Merge pull request #171 from gabrielbazan7/fix/confirm2

Browse source 
fix confirm popup
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-23 10:38:00 -03:00 • committed by GitHub
commit a34d483cd3
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/confirm.html
View file

@ -51,7 +51,7 @@
<i ng-show="!description" class="icon ion-ios-plus-empty size-21"></i> <i ng-show="!description" class="icon ion-ios-plus-empty size-21"></i>
</div> </div>
</div> </div>
<button class="button button-block button-positive" ng-click="approve()" ng-if="!isCordova" ng-disabled="!fee" translate>Click to pay</button> <button class="button button-block button-positive" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
</ion-content> </ion-content>
<accept class="accept-slide" ng-if="isCordova && fee"></accept> <accept class="accept-slide" ng-if="isCordova"></accept>
</ion-view> </ion-view>

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

@ -272,8 +272,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
var touchIdEnabled = config.touchIdFor && !config.touchIdFor[wallet.id]; var touchIdEnabled = config.touchIdFor && !config.touchIdFor[wallet.id];
var isCordova = $scope.isCordova; var isCordova = $scope.isCordova;
var bigAmount = parseFloat(txFormatService.formatToUSD(txp.amount)) > 20; var bigAmount = parseFloat(txFormatService.formatToUSD(txp.amount)) > 20;
var message = gettextCatalog.getString('Sending {{fee}} from your {{name}} wallet', { var message = gettextCatalog.getString('Sending {{amountStr}} from your {{name}} wallet', {
fee: $scope.fee, amountStr: $scope.amountStr,
name: wallet.name name: wallet.name
}); });
var okText = gettextCatalog.getString('Confirm'); var okText = gettextCatalog.getString('Confirm');
@ -307,7 +307,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$state.go('tabs.send'); $state.go('tabs.send');
}; };
$scope.$on("$ionicView.enter", function(event, data){ $scope.$on("$ionicView.enter", function(event, data) {
initConfirm(); initConfirm();
}); });
}); });