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

fixes

Browse source
This commit is contained in:
Gabriel Bazán 2016-09-20 15:59:32 -03:00
commit 800765eeec
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
public/views/confirm.html
View file

@ -50,6 +50,5 @@
</div>
</div>
</ion-content>
<accept class="accept-slide"></accept>
</div>
<accept class="accept-slide" ng-if="!hideSlider"></accept>
</ion-view>

2
public/views/modals/txp-details.html
View file

@ -161,5 +161,5 @@
</button>
</div>
</ion-content>
<accept class="accept-slide" ng-disabled="loading || paymentExpired" ng-if="tx.pendingForUs && canSign && !hideSlider"></accept>
<accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !hideSlider && !loading && !paymentExpired"></accept>
</ion-modal-view>

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

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $ionicSlideBoxDelegate, $filter, $timeout, $ionicScrollDelegate, $ionicNavBarDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, gettext, txFormatService, ongoingProcess, $ionicModal, $ionicHistory, popupService) {
angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, $ionicNavBarDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, gettext, txFormatService, ongoingProcess, $ionicModal, $ionicHistory, popupService) {
$ionicNavBarDelegate.title(gettextCatalog.getString('Confirm'));
var cachedTxp = {};
var isChromeApp = platformInfo.isChromeApp;
@ -9,7 +9,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
if ($stateParams.paypro) {
return setFromPayPro($stateParams.paypro, function(err) {
if (err && !isChromeApp) {
showAlert(gettext('Could not fetch payment'));
popupService.showAlert(gettext('Could not fetch payment'));
}
});
}

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

@ -163,7 +163,7 @@ angular.module('copayApp.directives')
}
}
})
.directive('accept', function($log, profileService, walletService, lodash) {
.directive('accept', function() {
return {
restrict: 'E',
templateUrl: 'views/includes/acceptSlide.html',

5
src/sass/views/confirm.scss
View file

@ -1,4 +1,7 @@
#view-confirm {
ion-content{
bottom: 149px;
}
.send-gravatar {
left: 11px;
position: absolute;
@ -6,7 +9,7 @@
}
.accept-slide {
position: fixed;
bottom: 0;
bottom: 49px;
width: 100%;
height: 100px;
background-color: #f5f5f5;