From 7f2dae69603974e3a9399ad5ce56238d33a5b9a3 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Fri, 7 Oct 2016 16:42:05 -0400 Subject: [PATCH 1/4] killed receive tips --- src/js/controllers/tab-receive.js | 16 ---------------- www/views/modals/receive-tips.html | 15 --------------- 2 files changed, 31 deletions(-) delete mode 100644 www/views/modals/receive-tips.html diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 70bd07e4b..f2cd4472a 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -5,21 +5,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.isCordova = platformInfo.isCordova; $scope.isNW = platformInfo.isNW; - $scope.checkTips = function(force) { - storageService.getReceiveTipsAccepted(function(err, accepted) { - if (err) $log.warn(err); - if (accepted && !force) return; - - $timeout(function() { - $ionicModal.fromTemplateUrl('views/modals/receive-tips.html', { - scope: $scope - }).then(function(modal) { - $scope.receiveTipsModal = modal; - $scope.receiveTipsModal.show(); - }); - }, force ? 1 : 1000); - }); - }; $scope.shareAddress = function(addr) { if ($scope.generatingAddress) return; @@ -84,7 +69,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }); }; - if (!$scope.isCordova) $scope.checkTips(); $scope.$on('Wallet/Changed', function(event, wallet) { if (!wallet) { $log.debug('No wallet provided'); diff --git a/www/views/modals/receive-tips.html b/www/views/modals/receive-tips.html deleted file mode 100644 index b148acd35..000000000 --- a/www/views/modals/receive-tips.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - -
-

Receive bitcoin by sharing your address

-

Other bitcoin users can scan this code to send you money

-
- - From 93625092c5ebcf74442630eaaf9f1090dcedeb7c Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Fri, 7 Oct 2016 16:42:51 -0400 Subject: [PATCH 2/4] removed scanner tip --- src/js/controllers/modals/scanner.js | 23 +---------------------- www/views/modals/scan-tips.html | 15 --------------- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 www/views/modals/scan-tips.html diff --git a/src/js/controllers/modals/scanner.js b/src/js/controllers/modals/scanner.js index 6616d505a..4412dad9b 100644 --- a/src/js/controllers/modals/scanner.js +++ b/src/js/controllers/modals/scanner.js @@ -73,28 +73,7 @@ angular.module('copayApp.controllers').controller('scannerController', function( }; $scope.init = function() { - if (platformInfo.isCordova) scannerInit(); - else checkTips(); - }; - - function checkTips() { - //TODO addapt tips to the new QR plugin (mobile) - storageService.getScanTipsAccepted(function(err, accepted) { - if (err) $log.warn(err); - if (accepted) { - scannerInit(); - return; - } - - $timeout(function() { - $ionicModal.fromTemplateUrl('views/modals/scan-tips.html', { - scope: $scope - }).then(function(modal) { - $scope.scanTipsModal = modal; - $scope.scanTipsModal.show(); - }); - }, 1000); - }); + scannerInit(); }; $scope.$on('TipsModalClosed', function(event) { diff --git a/www/views/modals/scan-tips.html b/www/views/modals/scan-tips.html deleted file mode 100644 index 512b60327..000000000 --- a/www/views/modals/scan-tips.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - -
-

Scan the code to pay with bitcoin

-

QR codes could also contain a bitcoin wallet invitation, or an URL

-
- - From d76dd3764518b1652bb9bc5c6eab0ebe608d63e9 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Fri, 7 Oct 2016 17:32:10 -0400 Subject: [PATCH 3/4] removed storage service methods for tip value set/get --- src/js/services/storageService.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index 3e07547ac..fc21e4059 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -361,21 +361,6 @@ angular.module('copayApp.services') }); }; - root.setScanTipsAccepted = function(val, cb) { - storage.set('scanTips', val, cb); - }; - - root.getScanTipsAccepted = function(cb) { - storage.get('scanTips', cb); - }; - - root.setReceiveTipsAccepted = function(val, cb) { - storage.set('receiveTips', val, cb); - }; - - root.getReceiveTipsAccepted = function(cb) { - storage.get('receiveTips', cb); - }; root.setBackupNeededModalFlag = function(walletId, val, cb) { storage.set('showBackupNeededModal-' + walletId, val, cb); From bdead7bd83949bc1bf4738881282e58e580dc0d7 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Fri, 7 Oct 2016 17:35:45 -0400 Subject: [PATCH 4/4] removed modal controllers --- src/js/controllers/modals/receiveTips.js | 10 ---------- src/js/controllers/modals/scanTips.js | 11 ----------- 2 files changed, 21 deletions(-) delete mode 100644 src/js/controllers/modals/receiveTips.js delete mode 100644 src/js/controllers/modals/scanTips.js diff --git a/src/js/controllers/modals/receiveTips.js b/src/js/controllers/modals/receiveTips.js deleted file mode 100644 index 2297be7a4..000000000 --- a/src/js/controllers/modals/receiveTips.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -angular.module('copayApp.controllers').controller('receiveTipsController', function($scope, $log, storageService) { - $scope.close = function() { - $log.debug('Receive tips accepted'); - storageService.setReceiveTipsAccepted(true, function(err) { - $scope.receiveTipsModal.hide(); - }); - } -}); diff --git a/src/js/controllers/modals/scanTips.js b/src/js/controllers/modals/scanTips.js deleted file mode 100644 index a82f70554..000000000 --- a/src/js/controllers/modals/scanTips.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -angular.module('copayApp.controllers').controller('scanTipsController', function($scope, $log, storageService) { - $scope.close = function() { - $log.debug('Scan tips accepted'); - storageService.setScanTipsAccepted(true, function(err) { - $scope.$emit('TipsModalClosed', function() {}); - $scope.scanTipsModal.hide(); - }); - } -});