diff --git a/public/views/confirm.html b/public/views/confirm.html
index 3f011988d..f8998594b 100644
--- a/public/views/confirm.html
+++ b/public/views/confirm.html
@@ -50,6 +50,5 @@
-
-
+
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 790d09156..e3d9da154 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -161,5 +161,5 @@
-
+
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 1812f1e17..1e65bf1b5 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -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'));
}
});
}
diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js
index 06d620691..7a790c5d6 100644
--- a/src/js/directives/directives.js
+++ b/src/js/directives/directives.js
@@ -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',
diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss
index e4c1b97aa..556301f5d 100644
--- a/src/sass/views/confirm.scss
+++ b/src/sass/views/confirm.scss
@@ -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;