diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index b945be92c..73ebfd150 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -467,7 +467,6 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory, } sendFlowService.pushState(confirmData); - if (!confirmData.fromWalletId) { $state.transitionTo('tabs.paymentRequest.confirm', confirmData); } else { diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index b159f7bc4..e6a8e2351 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -484,7 +484,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }); }; - $scope.goToReceive = function() { $state.go('tabs.home', { walletId: $scope.wallet.id @@ -495,7 +494,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }); }); }; - + $scope.goToBuy = function() { $state.go('tabs.home', { walletId: $scope.wallet.id diff --git a/www/css/main.css b/www/css/main.css index 8602ba35d..0dfaaf5fb 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -15359,6 +15359,8 @@ log-options #check-bar .checkbox-icon { #view-review .fee-summary { position: absolute; bottom: 92px; } + #view-review .fee-summary-spacer { + height: 15px; } #view-review .shapeshift-banner, #view-review .bitpay-banner, #view-review .egifter-banner { box-shadow: none; } #view-review .warning {