From 497a68705a585809d9eef8cbaef2c6fc51942280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 26 Oct 2016 11:44:21 -0300 Subject: [PATCH 1/3] remove to show backup needed modal automatically when clicking on receive view --- src/js/controllers/backup.js | 1 - src/js/controllers/tab-receive.js | 20 +++++--------------- src/js/services/profileService.js | 21 --------------------- src/js/services/storageService.js | 9 --------- www/views/includes/backupNeededPopup.html | 2 +- www/views/tab-receive.html | 2 +- 6 files changed, 7 insertions(+), 48 deletions(-) diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 324372323..f40af13d8 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -131,7 +131,6 @@ angular.module('copayApp.controllers').controller('backupController', } profileService.setBackupFlag(wallet.credentials.walletId); - profileService.setBackupNeededModalFlag(wallet.credentials.walletId); return cb(); }, 1); }; diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 733297650..674c4aa87 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -4,7 +4,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.isCordova = platformInfo.isCordova; $scope.isNW = platformInfo.isNW; - var showModalTimeout; $scope.shareAddress = function(addr) { if ($scope.generatingAddress) return; @@ -13,19 +12,14 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi } }; - $scope.setAddress = function(forceNew) { - if (!$scope.wallet || $scope.generatingAddress || !$scope.wallet.isComplete()) return; + $scope.setAddress = function(forceNew, wallet) { + if (!wallet || $scope.generatingAddress || !wallet.isComplete()) return; $scope.addr = null; $scope.generatingAddress = true; - walletService.getAddress($scope.wallet, forceNew, function(err, addr) { + walletService.getAddress(wallet, forceNew, function(err, addr) { $scope.generatingAddress = false; if (err) popupService.showAlert(gettextCatalog.getString('Error'), err); $scope.addr = addr; - if ($scope.wallet.showBackupNeededModal) { - showModalTimeout = $timeout(function() { - $scope.openBackupNeededModal(); - }, 2000); - } $timeout(function() { $scope.$apply(); }, 10); @@ -59,7 +53,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.close = function() { $scope.BackupNeededModal.hide(); $scope.BackupNeededModal.remove(); - profileService.setBackupNeededModalFlag($scope.wallet.credentials.walletId); }; $scope.doBackup = function() { @@ -84,16 +77,13 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi return; } $scope.wallet = wallet; + $scope.generatingAddress = false; $log.debug('Wallet changed: ' + wallet.name); $timeout(function() { - $scope.setAddress(); + $scope.setAddress(false, wallet); }, 100); }); - $scope.$on("$ionicView.leave", function(event, data) { - $timeout.cancel(showModalTimeout); - }); - $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.wallets = profileService.getWallets(); }); diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index c40b3b1bb..4c65a3f48 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -38,22 +38,6 @@ angular.module('copayApp.services') }); } - root.setBackupNeededModalFlag = function(walletId) { - storageService.setBackupNeededModalFlag(walletId, true, function(err) { - if (err) $log.error(err); - $log.debug('Backup warning modal flag stored'); - root.wallet[walletId].showBackupNeededModal = false; - }); - }; - - function _showBackupNeededModal(wallet, cb) { - storageService.getBackupNeededModalFlag(wallet.credentials.walletId, function(err, val) { - if (err) $log.error(err); - if (val) return cb(false); - return cb(true); - }); - }; - root.setBackupFlag = function(walletId) { storageService.setBackupFlag(walletId, function(err) { if (err) $log.error(err); @@ -117,11 +101,6 @@ angular.module('copayApp.services') wallet.balanceHidden = val; }); - _showBackupNeededModal(wallet, function(val) { - if (wallet.needsBackup) wallet.showBackupNeededModal = val; - else wallet.showBackupNeededModal = false; - }); - wallet.removeAllListeners(); wallet.on('report', function(n) { diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index 60f01a3c8..4184f8454 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -373,15 +373,6 @@ angular.module('copayApp.services') }); }; - - root.setBackupNeededModalFlag = function(walletId, val, cb) { - storage.set('showBackupNeededModal-' + walletId, val, cb); - }; - - root.getBackupNeededModalFlag = function(walletId, cb) { - storage.get('showBackupNeededModal-' + walletId, cb); - }; - root.setAmazonGiftCards = function(network, gcs, cb) { storage.set('amazonGiftCards-' + network, gcs, cb); }; diff --git a/www/views/includes/backupNeededPopup.html b/www/views/includes/backupNeededPopup.html index 02dd82d42..5f5fc9528 100644 --- a/www/views/includes/backupNeededPopup.html +++ b/www/views/includes/backupNeededPopup.html @@ -7,7 +7,7 @@
Backup Needed
Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup.
- + diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index ecff16e8b..6f77a406c 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -46,7 +46,7 @@
-
+
Wallet not backed up
From b82136adf1c910dee1b26a556aa6afcb659273aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 26 Oct 2016 12:03:55 -0300 Subject: [PATCH 2/3] fixes --- src/js/controllers/tab-receive.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 674c4aa87..11095db14 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -12,11 +12,11 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi } }; - $scope.setAddress = function(forceNew, wallet) { - if (!wallet || $scope.generatingAddress || !wallet.isComplete()) return; + $scope.setAddress = function(forceNew) { + if (!$scope.wallet || $scope.generatingAddress || !$scope.wallet.isComplete()) return; $scope.addr = null; $scope.generatingAddress = true; - walletService.getAddress(wallet, forceNew, function(err, addr) { + walletService.getAddress($scope.wallet, forceNew, function(err, addr) { $scope.generatingAddress = false; if (err) popupService.showAlert(gettextCatalog.getString('Error'), err); $scope.addr = addr; @@ -80,7 +80,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.generatingAddress = false; $log.debug('Wallet changed: ' + wallet.name); $timeout(function() { - $scope.setAddress(false, wallet); + $scope.setAddress(false); }, 100); }); From e01fd615b0f88c88c4a4f8c67ef73dd9e6073e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 26 Oct 2016 12:05:52 -0300 Subject: [PATCH 3/3] add dark background --- src/sass/views/includes/modals/modals.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/sass/views/includes/modals/modals.scss b/src/sass/views/includes/modals/modals.scss index 8553f11e1..742148e01 100644 --- a/src/sass/views/includes/modals/modals.scss +++ b/src/sass/views/includes/modals/modals.scss @@ -69,5 +69,9 @@ } } +.modal-backdrop.active { + background: rgba(0, 0, 0, .8); + } + @import "backup-needed-modal"; @import "screenshot-warning-model";