BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #175 from gabrielbazan7/fixes 

fixes
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-23 13:11:38 -03:00 committed by GitHub
parent 39383b30ad aa53dd4926
commit 6a3bd53464
20 changed files with 91 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/views/modals/tx-details.html
View File

@ -75,7 +75,7 @@
</div>
<div class="item">
<div ng-if="btx.action == 'received'">
<div ng-if="btx.action == 'received' || 'moved'">
<span translate>Date</span>
<span class="item-note">
<time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>

6
public/views/preferences.html
View File

@ -19,7 +19,7 @@
<a class="item" ng-show="wallet.isPrivKeyExternal()">
<span translate>Hardware Wallet</span>
<span class="item-note">
{{wallet.externalSource}}
{{externalSource}}
</span>
</div>
<a class="item item-icon-right" ui-sref="tabs.preferences.preferencesColor">
@ -45,12 +45,12 @@
<i class="icon nav-item-arrow-right"></i>
</a>
<div ng-show="wallet.canSign()">
<ion-toggle ng-model="encryptEnabled" toggle-class="toggle-balanced" ng-change="encryptChange()">
<ion-toggle ng-model="encryptEnabled.value" toggle-class="toggle-balanced" ng-change="encryptChange()">
<span class="toggle-label" translate>Request Spending Password</span>
</ion-toggle>
</div>
<div ng-show="wallet.canSign() && touchIdAvailable">
<ion-toggle ng-model="touchIdEnabled" toggle-class="toggle-balanced" ng-change="touchIdChange()">
<ion-toggle ng-model="touchIdEnabled.value" toggle-class="toggle-balanced" ng-change="touchIdChange()">
<span class="toggle-label" translate>Request Fingerprint</span>
</ion-toggle>
</div>

6
public/views/tab-export-file.html
View File

@ -29,7 +29,7 @@
</ion-checkbox>
</div>
<div class="box-notification error" ng-show="!canSign">
<div class="box-notification error ng-hide" ng-show="!canSign">
<span class="size-14">
<i class="ion-alert-circled"></i>
<span translate>
@ -38,7 +38,7 @@
</span>
</div>
<div class="box-notification error" ng-show="formData.noSignEnabled">
<div class="box-notification error ng-hide" ng-show="formData.noSignEnabled">
<span class="size-14">
<i class="ion-alert-circled"></i>
<span translate>
@ -90,4 +90,4 @@
<i class="icon ion-compose"></i>
<p translate>Copy this text as it is to a safe place (notepad or email)</p>
</div>
</div>
</div>

2
src/js/controllers/addressbookAdd.js
View File

@ -37,7 +37,7 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu
};
$scope.goHome = function() {
$ionicHistory.clearHistory();
$ionicHistory.removeBackView();
$state.go('tabs.home');
};

11
src/js/controllers/amount.js
View File

@ -10,7 +10,11 @@ angular.module('copayApp.controllers').controller('amountController', function($
var SMALL_FONT_SIZE_LIMIT = 13;
var LENGTH_EXPRESSION_LIMIT = 19;
$scope.$on("$ionicView.enter", function(event, data){
$scope.toAddress = $stateParams.toAddress;
$scope.toName = $stateParams.toName;
$scope.toEmail = $stateParams.toEmail;
$scope.$on("$ionicView.beforeEnter", function(event, data) {
if (!$stateParams.toAddress) {
$log.error('Bad params at amount')
@ -46,11 +50,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
angular.element($window).off('keydown');
});
$scope.toAddress = $stateParams.toAddress;
$scope.toName = $stateParams.toName;
$scope.toEmail = $stateParams.toEmail;
var config = configService.getSync().wallet.settings;
$scope.unitName = config.unitName;
$scope.alternativeIsoCode = config.alternativeIsoCode;

2
src/js/controllers/backup.js
View File

@ -97,7 +97,7 @@ angular.module('copayApp.controllers').controller('backupController',
if ($stateParams.fromOnboarding) {
$state.go('onboarding.disclaimer');
} else {
$ionicHistory.clearHistory();
$ionicHistory.removeBackView();
$state.go('tabs.home');
}
};

20
src/js/controllers/confirm.js
View File

@ -4,6 +4,16 @@ angular.module('copayApp.controllers').controller('confirmController', function(
var cachedTxp = {};
var isChromeApp = platformInfo.isChromeApp;
$scope.toAddress = $stateParams.toAddress;
$scope.toName = $stateParams.toName;
$scope.toEmail = $stateParams.toEmail;
$scope.description = $stateParams.description;
$scope.paypro = $stateParams.paypro;
$scope.$on("$ionicView.enter", function(event, data) {
initConfirm();
});
var initConfirm = function() {
if ($stateParams.paypro) {
return setFromPayPro($stateParams.paypro, function(err) {
@ -26,12 +36,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
var amount = $scope.toAmount = parseInt($stateParams.toAmount);
$scope.amountStr = txFormatService.formatAmountStr($scope.toAmount);
$scope.toAddress = $stateParams.toAddress;
$scope.toName = $stateParams.toName;
$scope.toEmail = $stateParams.toEmail;
$scope.description = $stateParams.description;
$scope.paypro = $stateParams.paypro;
var networkName = (new bitcore.Address($scope.toAddress)).network.name;
$scope.network = networkName;
@ -309,8 +313,4 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.cancel = function() {
$state.go('tabs.send');
};
$scope.$on("$ionicView.enter", function(event, data) {
initConfirm();
});
});

3
src/js/controllers/create.js
View File

@ -175,12 +175,11 @@ angular.module('copayApp.controllers').controller('createController',
if ($scope.seedSource.id == 'set') {
profileService.setBackupFlag(client.credentials.walletId);
}
$ionicHistory.removeBackView();
if (!client.isComplete()) {
$ionicHistory.nextViewOptions({
disableAnimate: true
});
$ionicHistory.removeBackView();
$state.go('tabs.home');
$timeout(function() {
$state.transitionTo('tabs.copayers', {

4
src/js/controllers/export.js
View File

@ -71,7 +71,7 @@ angular.module('copayApp.controllers').controller('exportController',
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export'));
return;
}
$ionicHistory.clearHistory();
$ionicHistory.removeBackView();
$state.go('tabs.home');
});
});
@ -158,7 +158,7 @@ angular.module('copayApp.controllers').controller('exportController',
});
};
$scope.$on("$ionicView.enter", function(event, data){
$scope.$on("$ionicView.beforeEnter", function(event, data) {
init();
});

1
src/js/controllers/import.js
View File

@ -345,6 +345,7 @@ angular.module('copayApp.controllers').controller('importController',
if (err) $log.error(err);
});
}
$ionicHistory.removeBackView();
$state.go('tabs.home', {
fromOnboarding: $stateParams.fromOnboarding
});

2
src/js/controllers/join.js
View File

@ -145,7 +145,7 @@ angular.module('copayApp.controllers').controller('joinController',
walletService.updateRemotePreferences(client, {}, function() {
$log.debug('Remote preferences saved for:' + client.credentials.walletId)
});
$ionicHistory.removeBackView();
$state.go('tabs.home');
});
}, 100);

2
src/js/controllers/modals/txStatus.js
View File

@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('txStatusController', function
if ($scope.cb) $timeout($scope.cb, 100);
$scope.cancel = function() {
$ionicHistory.clearHistory();
$ionicHistory.removeBackView();
$state.go('tabs.home');
$scope.txStatusModal.hide();
};

4
src/js/controllers/paperWallet.js
View File

@ -96,7 +96,7 @@ angular.module('copayApp.controllers').controller('paperWalletController',
popupService.showAlert(gettextCatalog.getString('Error sweeping wallet:'), err || err.toString());
} else {
$scope.openStatusModal('broadcasted', function() {
$ionicHistory.clearHistory();
$ionicHistory.removeBackView();
$state.go('tabs.home');
});
}
@ -120,7 +120,7 @@ angular.module('copayApp.controllers').controller('paperWalletController',
});
};
$scope.$on("$ionicView.enter", function(event, data){
$scope.$on("$ionicView.enter", function(event, data) {
var wallet = profileService.getWallet($stateParams.walletId);
$scope.wallet = wallet;
$scope.isCordova = platformInfo.isCordova;

2
src/js/controllers/paymentUri.js
View File

@ -47,7 +47,7 @@ angular.module('copayApp.controllers').controller('paymentUriController',
this.selectWallet = function(wid) {
var self = this;
profileService.setAndStoreFocus(wid, function() {});
$ionicHistory.clearHistory();
$ionicHistory.removeBackView();
$state.go('tabs.home');
$timeout(function() {
$rootScope.$emit('paymentUri', self.bitcoinURI);

21
src/js/controllers/preferences.js
View File

@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
$scope.encryptChange = function() {
if (!wallet) return;
var val = $scope.encryptEnabled;
var val = $scope.encryptEnabled.value;
if (val && !walletService.isEncrypted(wallet)) {
$log.debug('Encrypting private key for', wallet.name);
@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
$log.warn(err);
// ToDo show error?
$scope.encryptEnabled = false;
$scope.encryptEnabled.value = false;
return;
}
profileService.updateCredentials(JSON.parse(wallet.export()), function() {
@ -31,7 +31,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
$log.warn(err);
// ToDo show error?
$scope.encryptEnabled = true;
$scope.encryptEnabled.value = true;
return;
}
profileService.updateCredentials(JSON.parse(wallet.export()), function() {
@ -43,10 +43,10 @@ angular.module('copayApp.controllers').controller('preferencesController',
};
$scope.touchIdChange = function() {
var newStatus = $scope.touchIdEnabled;
var newStatus = $scope.touchIdEnabled.value;
walletService.setTouchId(wallet, !!newStatus, function(err) {
if (err) {
$scope.touchIdEnabled = !newStatus;
$scope.touchIdEnabled.value = !newStatus;
$timeout(function() {
$scope.$apply();
}, 1);
@ -56,7 +56,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
});
};
$scope.$on("$ionicView.beforeEnter", function(event, data){
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.externalSource = null;
if (!wallet)
@ -64,12 +64,17 @@ angular.module('copayApp.controllers').controller('preferencesController',
var config = configService.getSync();
$scope.encryptEnabled = walletService.isEncrypted(wallet);
$scope.encryptEnabled = {
value: walletService.isEncrypted(wallet)
};
if (wallet.isPrivKeyExternal)
$scope.externalSource = wallet.getPrivKeyExternalSourceName() == 'ledger' ? 'Ledger' : 'Trezor';
$scope.touchIdAvailable = fingerprintService.isAvailable();
$scope.touchIdEnabled = config.touchIdFor ? config.touchIdFor[walletId] : null;
$scope.touchIdEnabled = {
value: config.touchIdFor ? config.touchIdFor[walletId] : null
};
$scope.deleted = false;
if (wallet.credentials && !wallet.credentials.mnemonicEncrypted && !wallet.credentials.mnemonic) {

4
src/js/controllers/preferencesHistory.js
View File

@ -125,13 +125,13 @@ angular.module('copayApp.controllers').controller('preferencesHistory',
$scope.$emit('Local/ClearHistory');
$timeout(function() {
$ionicHistory.clearHistory();
$ionicHistory.removeBackView();
$state.go('tabs.home');
}, 100);
});
};
$scope.$on("$ionicView.enter", function(event, data){
$scope.$on("$ionicView.enter", function(event, data) {
$scope.csvHistory();
});
});

10
src/js/controllers/preferencesInformation.js
View File

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('preferencesInformation',
function($scope, $log, $timeout, $ionicHistory, platformInfo, gettextCatalog, lodash, profileService, configService, $stateParams, walletService, $state) {
function($scope, $log, $timeout, $ionicHistory, $ionicScrollDelegate, platformInfo, gettextCatalog, lodash, profileService, configService, $stateParams, walletService, $state) {
var base = 'xpub';
var wallet = profileService.getWallet($stateParams.walletId);
var walletId = wallet.id;
@ -65,7 +65,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
opts.colorFor[walletId] = color;
configService.set(opts, function(err) {
$ionicHistory.clearHistory();
$ionicHistory.removeBackView();
$state.go('tabs.home');
if (err) $log.warn(err);
});
@ -77,11 +77,11 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
$scope.scan = function() {
walletService.startScan(wallet);
$ionicHistory.clearHistory();
$ionicHistory.removeBackView();
$state.go('tabs.home');
};
$scope.$on("$ionicView.enter", function(event, data){
$scope.$on("$ionicView.enter", function(event, data) {
var c = wallet.credentials;
var basePath = c.getBaseAddressDerivationPath();
@ -116,7 +116,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
$timeout(function() {
$scope.$apply();
});
$ionicScrollDelegate.resize();
});
});

53
src/js/controllers/preferencesLogs.js
View File

@ -3,32 +3,33 @@
angular.module('copayApp.controllers').controller('preferencesLogs',
function($scope, historicLog, gettextCatalog) {
$scope.prepare = function() {
var log = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n';
log += '\n\n';
log += $scope.logs.map(function(v) {
return v.msg;
}).join('\n');
return log;
};
$scope.sendLogs = function() {
var body = $scope.prepare();
window.plugins.socialsharing.shareViaEmail(
body,
'Copay Logs',
null, // TO: must be null or an array
null, // CC: must be null or an array
null, // BCC: must be null or an array
null, // FILES: can be null, a string, or an array
function() {},
function() {}
);
};
$scope.$on("$ionicView.enter", function(event, data){
$scope.$on("$ionicView.enter", function(event, data) {
$scope.logs = historicLog.get();
$scope.prepare = function() {
var log = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n';
log += '\n\n';
log += $scope.logs.map(function(v) {
return v.msg;
}).join('\n');
return log;
};
$scope.sendLogs = function() {
var body = $scope.prepare();
window.plugins.socialsharing.shareViaEmail(
body,
'Copay Logs',
null, // TO: must be null or an array
null, // CC: must be null or an array
null, // BCC: must be null or an array
null, // FILES: can be null, a string, or an array
function() {},
function() {}
);
};
});
});

14
src/js/controllers/tab-settings.js
View File

@ -28,10 +28,16 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.$digest();
});
}
$scope.spendUnconfirmed = {value : config.wallet.spendUnconfirmed};
$scope.glideraEnabled = {value: config.glidera.enabled};
$scope.spendUnconfirmed = {
value: config.wallet.spendUnconfirmed
};
$scope.glideraEnabled = {
value: config.glidera.enabled
};
$scope.coinbaseEnabled = config.coinbase.enabled;
$scope.pushNotifications = {value: config.pushNotifications.enabled};
$scope.pushNotifications = {
value: config.pushNotifications.enabled
};
$scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) {
return w.id != self.walletId;
});
@ -94,7 +100,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
});
};
$scope.$on("$ionicView.enter", function(event, data){
$scope.$on("$ionicView.enter", function(event, data) {
updateConfig();
});

2
src/js/services/applicationService.js
View File

@ -19,7 +19,7 @@ angular.module('copayApp.services')
if (isChromeApp) {
chrome.runtime.reload();
} else if (isNW) {
$ionicHistory.clearHistory();
$ionicHistory.removeBackView();
$state.go('tabs.home');
$timeout(function() {
var win = require('nw.gui').Window.get();