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

Merge sprint/21.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-20 17:23:01 +12:00
commit ba98fbe187
5 changed files with 24 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/js/controllers/shapeshift.js
View file

@ -4,6 +4,8 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
var walletsBtc = [];
var walletsBch = [];
$scope.showMyAddress = showMyAddress;
function generateAddress(wallet, cb) {
if (!wallet) return;
walletService.getAddress(wallet, false, function(err, addr) {
@ -41,14 +43,6 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
$ionicNavBarDelegate.showBar(true);
});
$scope.showFromWalletSelector = function() {
$scope.showFromWallets = true;
};
$scope.showToWalletSelector = function() {
$scope.showToWallets = true;
};
// This could probably be enhanced refactoring the routes abstract states
$scope.createWallet = function() {
$state.go('tabs.home').then(function() {
@ -81,4 +75,11 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
});
});
}
function showMyAddress() {
$state.go('tabs.home').then(function() {
$state.go('tabs.receive');
});
}
});