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

wallet @browser working again

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-15 12:52:28 -03:00
commit 4dcd18c42f
8 changed files with 54 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/controllers/backup.js
View file

@ -2,5 +2,12 @@
angular.module('copay.backup').controller('BackupController',
function($scope, $rootScope, $location) {
if (!$rootScope.wallet.id) {
$location.path('signin');
}
$scope.title = 'Backup';
});

8
js/controllers/home.js
View file

@ -6,15 +6,17 @@ angular.module('copay.home').controller('HomeController',
$scope.oneAtATime = true;
if (!$rootScope.peerId) {
if (!$rootScope.wallet.id) {
$location.path('signin');
}
$scope.addrs = $rootScope.publicKeyRing.getAddresses();
$scope.addrs = $rootScope.wallet.publicKeyRing.getAddresses();
$scope.selectedAddr = $scope.addrs[0];
$scope.newAddr = function() {
var a = $rootScope.publicKeyRing.generateAddress();
var a = $rootScope.wallet.publicKeyRing.generateAddress();
$scope.addrs.push({ addrStr: a.toString('hex') });
};

9
js/controllers/send.js
View file

@ -4,14 +4,15 @@ angular.module('copay.send').controller('SendController',
function($scope, $rootScope, $location, Network) {
$scope.title = 'Send';
if (!$rootScope.peerId) {
if (!$rootScope.wallet.id) {
$location.path('signin');
}
$scope.sendTest = function() {
var pkr = $rootScope.publicKeyRing;
var txp = $rootScope.txProposals;
var w = $rootScope.wallet;
var pkr = w.publicKeyRing;
var txp = w.txProposals;
var opts = {remainderOut: { address: pkr.generateAddress(true).toString() }};
// From @cmgustavo's wallet
@ -31,7 +32,7 @@ console.log('[send.js.29:txp:] BEFORE',txp); //TODO
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',
unspentTest,
$rootScope.privateKey,
w.privateKey,
opts
);
console.log('[send.js.29:txp:] READY:',txp); //TODO

2
js/controllers/signin.js
View file

@ -23,8 +23,6 @@ angular.module('copay.signin').controller('SigninController',
$scope.open = function(walletId) {
$scope.loading = true;
console.log('[signin.js.28:walletId:]',walletId); //TODO
if (Network.openWallet(walletId)) {
Network.init(function() {
$location.path('peer');

4
js/controllers/transactions.js
View file

@ -6,7 +6,7 @@ angular.module('copay.transactions').controller('TransactionsController',
$scope.oneAtATime = true;
if (!$rootScope.peerId) {
if (!$rootScope.wallet.id) {
$location.path('signin');
}
@ -23,5 +23,5 @@ angular.module('copay.transactions').controller('TransactionsController',
}
];
$scope.txsoutput = $rootScope.txProposals.txps;
$scope.txsoutput = $rootScope.wallet.txProposals.txps;
});