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

Merge branch 'ref/design' of github.com:matiu/copay into ref/design

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-23 12:41:49 -03:00
commit bc4f7e841e
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
15 changed files with 235 additions and 429 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/js/controllers/bitpayCard.js
View file

@ -5,8 +5,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
var self = this;
var client;
var network = 'livenet';
self.sandbox = network == 'testnet' ? true : false;
self.sandbox = bitpayCardService.getEnvironment() == 'testnet' ? true : false;
if (platformInfo.isCordova && StatusBar.isVisible) {
StatusBar.backgroundColorByHexString("#293C92");
@ -71,7 +70,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
this.update = function() {
var dateRange = setDateRange($scope.dateRange);
self.loadingSession = true;
bitpayCardService.setCredentials(network);
bitpayCardService.isAuthenticated(function(err, bpSession) {
self.loadingSession = false;
if (err) {
@ -110,14 +108,16 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
$scope.dateRange = 'last30Days';
self.update();
self.allWallets = profileService.getWallets(network);
client = profileService.focusedClient;
if (!client) return;
var network = bitpayCardService.getEnvironment();
self.allWallets = profileService.getWallets({
network: network,
n: 1,
onlyComplete: true
});
if (lodash.isEmpty(self.allWallets)) return;
if (client.credentials.network != network) return;
client = self.allWallets[0];
if (client.credentials.n > 1)
self.isMultisigWallet = true;

4
src/js/controllers/modals/bitpayCardConfirmation.js
View file

@ -1,10 +1,10 @@
'use strict';
angular.module('copayApp.controllers').controller('bitpayCardConfirmationController', function($scope, $timeout, go, bitpayCardService) {
angular.module('copayApp.controllers').controller('bitpayCardConfirmationController', function($scope, $timeout, $state, bitpayCardService) {
$scope.ok = function() {
bitpayCardService.logout(function() {
go.path('bitpayCard');
$state.go('bitpayCard.main');
});
$scope.cancel();
};

13
src/js/controllers/tab-home.js
View file

@ -4,7 +4,9 @@ angular.module('copayApp.controllers').controller('tabHomeController',
function($rootScope, $timeout, $scope, $state, lodash, profileService, walletService, configService, txFormatService, $ionicModal, $log, platformInfo) {
var self = this;
self.glideraEnabled = configService.getSync().glidera.enabled;
self.setWallets = function() {
$scope.wallets = profileService.getWallets();
};
var setPendingTxps = function(txps) {
@ -144,14 +146,13 @@ angular.module('copayApp.controllers').controller('tabHomeController',
});
});
var config = configService.getSync().wallet;
var GLIDERA_LOCK_TIME = 6 * 60 * 60;
var glideraActive = true; // TODO TODO TODO
// isGlidera flag is a security measure so glidera status is not
// only determined by the tx.message
$scope.openTxpModal = function(tx) {
var config = configService.getSync().wallet;
var scope = $rootScope.$new(true);
scope.tx = tx;
scope.wallet = tx.wallet;
@ -167,12 +168,12 @@ angular.module('copayApp.controllers').controller('tabHomeController',
});
};
$scope.init = function() {
configService.whenAvailable(function() {
var config = configService.getSync();
var isWindowsPhoneApp = platformInfo.isWP && isCordova;
var glideraEnabled = config.glidera.enabled;
var coinbaseEnabled = config.coinbase.enabled;
var isWindowsPhoneApp = platformInfo.isWP && isCordova;
$scope.buyAndSellEnabled = !isWindowsPhoneApp && (glideraEnabled || coinbaseEnabled);
}
});
});

2
src/js/controllers/tab-send.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('tabSendController', function($scope, $ionicModal, $log, $timeout, addressbookService, profileService, configService, lodash, $state, walletService) {
angular.module('copayApp.controllers').controller('tabSendController', function($scope, $ionicModal, $log, $timeout, addressbookService, profileService, lodash, $state, walletService) {
var originalList;