Merge pull request #322 from jamal-jackson/feature/kill_recieve_scan_tips

kill recieve and scan tips

src/js/controllers/modals/receiveTips.js

@@ -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();
-    });
-  }
-});

src/js/controllers/modals/scanTips.js

@@ -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();
-    });
-  }
-});

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) {

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');

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);

www/views/modals/receive-tips.html

@@ -1,15 +0,0 @@
-<ion-modal-view ng-style="{opacity: '0.9'}" ng-controller="receiveTipsController">
-  <ion-nav-bar class="bar-ligt">
-    <ion-nav-buttons side="secondary">
-      <button class="button" ng-click="close()">
-        X
-      </button>
-    </ion-nav-buttons>
-  </ion-nav-bar>
-  <ion-content class="has-header">
-    <div class="text-center">
-      <h2>Receive bitcoin by sharing your address</h2>
-      <h3>Other bitcoin users can scan this code to send you money</h3>
-    </div>
-  </ion-content>
-</ion-modal-view>

www/views/modals/scan-tips.html

@@ -1,15 +0,0 @@
-<ion-modal-view ng-style="{opacity: '0.9'}" ng-controller="scanTipsController">
-  <ion-nav-bar class="bar-ligt">
-    <ion-nav-buttons side="secondary">
-      <button class="button" ng-click="close()">
-        X
-      </button>
-    </ion-nav-buttons>
-  </ion-nav-bar>
-  <ion-content class="has-header">
-    <div class="text-center">
-      <h2>Scan the code to pay with bitcoin</h2>
-      <h3>QR codes could also contain a bitcoin wallet invitation, or an URL</h3>
-    </div>
-  </ion-content>
-</ion-modal-view>