From 1e8bd97d7079cec0a25ca4aa6ec857c48bc0d011 Mon Sep 17 00:00:00 2001 From: JDonadio Date: Thu, 26 Jan 2017 17:42:39 -0300 Subject: [PATCH 1/2] select text --- src/js/controllers/backup.js | 20 ++++++++++---------- src/sass/shame.scss | 11 +++++++++++ www/views/backup.html | 2 +- www/views/includes/terms.html | 2 +- www/views/preferencesLogs.html | 4 ++-- www/views/termsOfUse.html | 2 +- 6 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 63e6d996f..ad2a2c816 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -2,15 +2,15 @@ angular.module('copayApp.controllers').controller('backupController', function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, lodash, profileService, bwcService, walletService, ongoingProcess, popupService, gettextCatalog, $ionicModal) { - var wallet = profileService.getWallet($stateParams.walletId); - $scope.viewTitle = wallet.name || wallet.credentials.walletName; - $scope.n = wallet.n; + $scope.wallet = profileService.getWallet($stateParams.walletId); + $scope.viewTitle = $scope.wallet.name || $scope.wallet.credentials.walletName; + $scope.n = $scope.wallet.n; var keys; - $scope.credentialsEncrypted = wallet.isPrivKeyEncrypted(); + $scope.credentialsEncrypted = $scope.wallet.isPrivKeyEncrypted(); var isDeletedSeed = function() { - if (!wallet.credentials.mnemonic && !wallet.credentials.mnemonicEncrypted) + if (!$scope.wallet.credentials.mnemonic && !$scope.wallet.credentials.mnemonicEncrypted) return true; return false; @@ -35,7 +35,7 @@ angular.module('copayApp.controllers').controller('backupController', $scope.mnemonicWords = words.split(/[\u3000\s]+/); $scope.shuffledMnemonicWords = shuffledWords($scope.mnemonicWords); - $scope.mnemonicHasPassphrase = wallet.mnemonicHasPassphrase(); + $scope.mnemonicHasPassphrase = $scope.wallet.mnemonicHasPassphrase(); $scope.useIdeograms = words.indexOf("\u3000") >= 0; $scope.data.passphrase = null; $scope.customWords = []; @@ -115,9 +115,9 @@ angular.module('copayApp.controllers').controller('backupController', try { walletClient.seedFromMnemonic(customSentence, { - network: wallet.credentials.network, + network: $scope.wallet.credentials.network, passphrase: passphrase, - account: wallet.credentials.account + account: $scope.wallet.credentials.account }); } catch (err) { walletClient.credentials.xPrivKey = lodash.repeat('x', 64); @@ -130,7 +130,7 @@ angular.module('copayApp.controllers').controller('backupController', } } - profileService.setBackupFlag(wallet.credentials.walletId); + profileService.setBackupFlag($scope.wallet.credentials.walletId); return cb(); }, 1); }; @@ -195,7 +195,7 @@ angular.module('copayApp.controllers').controller('backupController', return; } - walletService.getKeys(wallet, function(err, k) { + walletService.getKeys($scope.wallet, function(err, k) { if (err || !k) { $log.error('Could not get keys: ', err); $ionicHistory.goBack(); diff --git a/src/sass/shame.scss b/src/sass/shame.scss index 397f0795f..66b818caa 100644 --- a/src/sass/shame.scss +++ b/src/sass/shame.scss @@ -2,6 +2,17 @@ * Our goal is to delete this file. Search the regex: /class=".*CLASS.*?"/ */ + .enable_text_select { + -webkit-user-select: auto; + -moz-user-select: auto; + -ms-user-select: auto; + user-select: auto; + } + + .red { + color: red; + } + .box-notification { padding: 0.5rem; border: 1px solid; diff --git a/www/views/backup.html b/www/views/backup.html index 37efcb6cf..9a5ca4170 100644 --- a/www/views/backup.html +++ b/www/views/backup.html @@ -6,7 +6,7 @@ - +
Wallet recovery phrase not available.
You can still export it from Advanced > Export.
diff --git a/www/views/includes/terms.html b/www/views/includes/terms.html index 6ce3f0325..fb0ad6328 100644 --- a/www/views/includes/terms.html +++ b/www/views/includes/terms.html @@ -1,4 +1,4 @@ -
+

This is a binding Agreement between BitPay, Inc. (“BitPay” or “We”) and the person, persons, or entity (“You” or “Your”) using the service, Software, or application (“Software”).

diff --git a/www/views/preferencesLogs.html b/www/views/preferencesLogs.html index 7f503d08c..42518d4c2 100644 --- a/www/views/preferencesLogs.html +++ b/www/views/preferencesLogs.html @@ -4,7 +4,7 @@ - +
-
+
  • diff --git a/www/views/termsOfUse.html b/www/views/termsOfUse.html index 409b21bd1..bb2fd3811 100644 --- a/www/views/termsOfUse.html +++ b/www/views/termsOfUse.html @@ -5,7 +5,7 @@ - +
    From 713551d3a42e144aba3a216bb34d9fa055d324ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Donad=C3=ADo?= Date: Thu, 26 Jan 2017 18:05:35 -0300 Subject: [PATCH 2/2] remote unused class --- src/sass/shame.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/sass/shame.scss b/src/sass/shame.scss index 66b818caa..514d04029 100644 --- a/src/sass/shame.scss +++ b/src/sass/shame.scss @@ -9,10 +9,6 @@ user-select: auto; } - .red { - color: red; - } - .box-notification { padding: 0.5rem; border: 1px solid;