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

Wallet buttons max width + Receive in viewing wallet.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

10
src/js/controllers/tab-receive.js
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 = [

11
src/js/controllers/walletDetails.js
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
});
});
};
});