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

Merge branch 'wallet/sprint/20' into wallet/task/537

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-09 15:41:17 +09:00 • committed by GitHub
commit 3bb446cdee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/controllers/amount.js
View file

@ -467,7 +467,6 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
} }
sendFlowService.pushState(confirmData); sendFlowService.pushState(confirmData);
if (!confirmData.fromWalletId) { if (!confirmData.fromWalletId) {
$state.transitionTo('tabs.paymentRequest.confirm', confirmData); $state.transitionTo('tabs.paymentRequest.confirm', confirmData);
} else { } else {

1
src/js/controllers/walletDetails.js
View file

@ -484,7 +484,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
}); });
}; };
$scope.goToReceive = function() { $scope.goToReceive = function() {
$state.go('tabs.home', { $state.go('tabs.home', {
walletId: $scope.wallet.id walletId: $scope.wallet.id

2
www/css/main.css
View file

@ -15359,6 +15359,8 @@ log-options #check-bar .checkbox-icon {
#view-review .fee-summary { #view-review .fee-summary {
position: absolute; position: absolute;
bottom: 92px; } bottom: 92px; }
#view-review .fee-summary-spacer {
height: 15px; }
#view-review .shapeshift-banner, #view-review .bitpay-banner, #view-review .egifter-banner { #view-review .shapeshift-banner, #view-review .bitpay-banner, #view-review .egifter-banner {
box-shadow: none; } box-shadow: none; }
#view-review .warning { #view-review .warning {