From c0e70eb686598bbd75996b8d7e9f40a1813eaac3 Mon Sep 17 00:00:00 2001 From: JDonadio Date: Thu, 16 Feb 2017 16:41:36 -0500 Subject: [PATCH] scrolling refactor - copy backup phrase --- src/js/controllers/backup.js | 6 ++++++ src/js/directives/copyToClipboard.js | 3 ++- src/js/routes.js | 3 +++ www/views/backup.html | 4 ++-- www/views/preferencesLogs.html | 2 +- www/views/termsOfUse.html | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index ad2a2c816..437d8f66e 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -97,6 +97,12 @@ angular.module('copayApp.controllers').controller('backupController', }); }; + $scope.copyRecoveryPhrase = function() { + if ($scope.wallet.network == 'livenet') return null; + else if (!$scope.wallet.credentials.mnemonic) return null; + else return $scope.wallet.credentials.mnemonic; + }; + var confirm = function(cb) { $scope.backupError = false; diff --git a/src/js/directives/copyToClipboard.js b/src/js/directives/copyToClipboard.js index b6523b6f1..4c8b791d6 100644 --- a/src/js/directives/copyToClipboard.js +++ b/src/js/directives/copyToClipboard.js @@ -18,6 +18,8 @@ angular.module('copayApp.directives') var msg = gettextCatalog.getString('Copied to clipboard'); elem.bind('click', function() { var data = scope.copyToClipboard; + if (!data) return; + if (isCordova) { window.cordova.plugins.clipboard.copy(data); window.plugins.toast.showShortCenter(msg); @@ -36,4 +38,3 @@ angular.module('copayApp.directives') } } }); - diff --git a/src/js/routes.js b/src/js/routes.js index 59202bea4..c86c521b6 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -36,6 +36,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr // CHECKBOX CIRCLE $ionicConfigProvider.form.checkbox('circle'); + // USE NATIVE SCROLLING + $ionicConfigProvider.scrolling.jsScrolling(false); + $logProvider.debugEnabled(true); $provide.decorator('$log', ['$delegate', 'platformInfo', function($delegate, platformInfo) { diff --git a/www/views/backup.html b/www/views/backup.html index 9a5ca4170..cfaee0902 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.
@@ -16,7 +16,7 @@ -->
Please carefully write down this phrase.
-
+
{{word}} 
diff --git a/www/views/preferencesLogs.html b/www/views/preferencesLogs.html index 42518d4c2..165490b9b 100644 --- a/www/views/preferencesLogs.html +++ b/www/views/preferencesLogs.html @@ -4,7 +4,7 @@ - +