From 8e69c0aa7ef0ea2e13bd613064a65f77fc7cc75b Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 7 Dec 2015 12:52:42 -0300
Subject: [PATCH] Rename variables

---
 public/views/disclaimer.html      |  2 +-
 src/js/controllers/disclaimer.js  |  2 +-
 src/js/controllers/index.js       | 16 ++++++++--------
 src/js/models/profile.js          |  4 ++--
 src/js/services/profileService.js | 14 +++++++-------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html
index 1dd70e071..639b73ad8 100644
--- a/public/views/disclaimer.html
+++ b/public/views/disclaimer.html
@@ -46,7 +46,7 @@
     </div>
   </div>
     <div class="start-button columns">
-      <button ng-disabled="creatingProfile" ng-click="index.agreeDisclaimer()" class="button black expand round size-12 text-spacing" translate>
+      <button ng-disabled="creatingProfile" ng-click="index.acceptDisclaimer()" class="button black expand round size-12 text-spacing" translate>
         I AGREE. GET STARTED
       </button>
     </div>
diff --git a/src/js/controllers/disclaimer.js b/src/js/controllers/disclaimer.js
index d783e55f9..853b496be 100644
--- a/src/js/controllers/disclaimer.js
+++ b/src/js/controllers/disclaimer.js
@@ -30,7 +30,7 @@ angular.module('copayApp.controllers').controller('disclaimerController',
         else $scope.creatingProfile = false;
 
         //compatible
-        profileService.checkDisclaimer(function(val) {
+        profileService.isDisclaimerAccepted(function(val) {
           if (val) go.walletHome();
         });
       });
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 242f7be82..d6d88c512 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -148,24 +148,24 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.usingCustomBWS = config.bwsFor && config.bwsFor[self.walletId] && (config.bwsFor[self.walletId] != defaults.bws.url);
   };
 
-  self.agreeDisclaimer = function() {
+  self.acceptDisclaimer = function() {
     var profile = profileService.profile;
-    if (profile) profile.agreeDisclaimer = true;
+    if (profile) profile.disclaimerAccepted = true;
     self.disclaimerAccepted = true;
-    profileService.storeDisclaimer(function(err) {
+    profileService.setDisclaimerAccepted(function(err) {
       if (err) $log.error(err); 
       go.walletHome();
     });
   };
 
-  self.checkDisclaimer = function() {
+  self.isDisclaimerAccepted = function() {
     if (self.disclaimerAccepted == true) { 
       go.walletHome();
       return;
     }
-    profileService.checkDisclaimer(function(v) {
+    profileService.isDisclaimerAccepted(function(v) {
       if (v) { 
-        self.agreeDisclaimer();
+        self.acceptDisclaimer();
       } else go.path('disclaimer');
     });
   };
@@ -1240,7 +1240,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
   $rootScope.$on('Local/Resume', function(event) {
     $log.debug('### Resume event');
-    self.checkDisclaimer();
+    self.isDisclaimerAccepted();
     self.debouncedUpdate();
   });
 
@@ -1363,7 +1363,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.setUxLanguage();
     self.setFocusedWallet();
     self.updateTxHistory();
-    self.checkDisclaimer();
+    self.isDisclaimerAccepted();
     storageService.getCleanAndScanAddresses(function(err, walletId) {
       if (walletId && profileService.walletClients[walletId]) {
         $log.debug('Clear last address cache and Scan ', walletId);
diff --git a/src/js/models/profile.js b/src/js/models/profile.js
index 46d78bb3b..4b57a0f66 100644
--- a/src/js/models/profile.js
+++ b/src/js/models/profile.js
@@ -15,7 +15,7 @@ Profile.create = function(opts) {
   var x = new Profile();
   x.createdOn = Date.now();
   x.credentials = opts.credentials || [];
-  x.agreeDisclaimer = false;
+  x.disclaimerAccepted = false;
   return x;
 };
 
@@ -24,7 +24,7 @@ Profile.fromObj = function(obj) {
 
   x.createdOn = obj.createdOn;
   x.credentials = obj.credentials;
-  x.agreeDisclaimer = obj.agreeDisclaimer;
+  x.disclaimerAccepted = obj.disclaimerAccepted;
 
   if (x.credentials[0] && typeof x.credentials[0] != 'object')
     throw ("credentials should be an object");
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index ea59c9673..40bb3260f 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -127,7 +127,7 @@ angular.module('copayApp.services')
           if (err) return cb(err);
           root._setFocus(focusedWalletId, function() {
             $rootScope.$emit('Local/ProfileBound');
-            root.checkDisclaimer(function(val) {
+            root.isDisclaimerAccepted(function(val) {
               if (!val) { 
                 return cb(new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer'));
               }
@@ -521,23 +521,23 @@ angular.module('copayApp.services')
       });
     };
 
-    root.storeDisclaimer = function(cb) {
+    root.setDisclaimerAccepted = function(cb) {
       storageService.getProfile(function(err, profile) {
-        profile.agreeDisclaimer = true;
+        profile.disclaimerAccepted = true;
         storageService.storeProfile(profile, function(err) {
           return cb(err);
         });
       });
     };
 
-    root.checkDisclaimer = function(cb) {
+    root.isDisclaimerAccepted = function(cb) {
       storageService.getProfile(function(err, profile) {
-        if (profile && profile.agreeDisclaimer)
+        if (profile && profile.disclaimerAccepted)
           return cb(true);
-        else if (profile && !profile.agreeDisclaimer) {
+        else if (profile && !profile.disclaimerAccepted) {
           storageService.getCopayDisclaimerFlag(function(err, val) {
             if (val) {
-              profile.agreeDisclaimer = true;
+              profile.disclaimerAccepted = true;
               storageService.storeProfile(profile, function(err) {
                 if (err) $log.error(err);
                 return cb(true);