Wallet buttons max width + Receive in viewing wallet.

This commit is contained in:
Sebastiaan Pasma 2018-07-26 15:04:42 +02:00
commit d87c2e65f7
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
6 changed files with 24 additions and 9 deletions

View file

@ -233,10 +233,14 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
if (!$scope.wallets[0]) return;
// select first wallet if no wallet selected previously
var selectedWallet = checkSelectedWallet($scope.wallet, $scope.wallets);
var selectedWallet = null;
if (data.stateParams.walletId) { // from walletDetails
selectedWallet = checkSelectedWallet(profileService.getWallet(data.stateParams.walletId), $scope.wallets);
} else {
// select first wallet if no wallet selected previously
selectedWallet = checkSelectedWallet($scope.wallet, $scope.wallets);
}
$scope.onWalletSelect(selectedWallet);
$scope.showShareButton = platformInfo.isCordova ? (platformInfo.isIOS ? 'iOS' : 'Android') : null;
listeners = [

View file

@ -483,4 +483,15 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
function rgbToHex(r, g, b) {
return "#" + componentToHex(r) + componentToHex(g) + componentToHex(b);
}
$scope.goToReceive = function() {
$state.go('tabs.home', {
walletId: $scope.wallet.id
}).then(function () {
$ionicHistory.clearHistory();
$state.go('tabs.receive', {
walletId: $scope.wallet.id
});
});
};
});

View file

@ -236,7 +236,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
})
.state('tabs.receive', {
url: '/receive',
url: '/receive/:walletId',
views: {
'tab-receive': {
controller: 'tabReceiveController',

View file

@ -70,8 +70,8 @@
}
}
.buttons {
margin-bottom: 0;
margin-top: 6px;
margin: 6px auto 0px;
max-width: 600px;
>.col {
padding: 5px 10px;
margin-bottom: 0;

View file

@ -192,8 +192,8 @@
}
.buttons {
margin-bottom: 0;
margin-top: 30px;
max-width: 600px;
margin: 30px auto 0;
>.col {
padding: 5px 10px;
margin-bottom: 0;

View file

@ -92,7 +92,7 @@
</div>
<div class="buttons row" ng-style="{opacity: buttonsOpacity}">
<div class="col">
<div class="button button-outline button-white-outline" ui-sref="tabs.receive">
<div class="button button-outline button-white-outline" ng-click="goToReceive()">
<span translate>Receive</span>
</div>
</div>