From ac9cee8d6ddb61d011232acc67ec87b26a402d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 8 Nov 2016 12:37:05 -0300 Subject: [PATCH] set 24 hours timer --- src/js/controllers/feedback/rateCard.js | 2 -- src/js/controllers/feedback/sendFeedback.js | 4 ++-- src/js/controllers/onboarding/welcomeController.js | 8 +++++++- src/js/controllers/tab-home.js | 7 +++++-- src/js/services/storageService.js | 8 ++++++++ 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/js/controllers/feedback/rateCard.js b/src/js/controllers/feedback/rateCard.js index 7aa47d381..de9bb4645 100644 --- a/src/js/controllers/feedback/rateCard.js +++ b/src/js/controllers/feedback/rateCard.js @@ -42,8 +42,6 @@ angular.module('copayApp.controllers').controller('rateCardController', function }); }; - $scope.cancel = function() {}; - $scope.hideCard = function() { if ($scope.isModal) { $scope.rateModal.hide(); diff --git a/src/js/controllers/feedback/sendFeedback.js b/src/js/controllers/feedback/sendFeedback.js index a45b9e7f9..cb3700947 100644 --- a/src/js/controllers/feedback/sendFeedback.js +++ b/src/js/controllers/feedback/sendFeedback.js @@ -30,8 +30,8 @@ angular.module('copayApp.controllers').controller('sendFeedbackController', func var config = configService.getSync(); var dataSrc = { - "entry.490635314": lodash.values(config.emailFor)[0] || 'no email setted', - "entry.1447064148": skip ? '-' : feedback, + "entry.490635314": lodash.values(config.emailFor)[0] || ' ', + "entry.1447064148": skip ? ' ' : feedback, "entry.2142850951": $stateParams.score }; diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js index 3a1651f75..77b4400bb 100644 --- a/src/js/controllers/onboarding/welcomeController.js +++ b/src/js/controllers/onboarding/welcomeController.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $ionicConfig, $log, profileService, startupService) { +angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $ionicConfig, $log, profileService, startupService, storageService) { $ionicConfig.views.swipeBackEnabled(false); @@ -19,7 +19,13 @@ angular.module('copayApp.controllers').controller('welcomeController', function( $log.debug('Creating profile'); profileService.createProfile(function(err) { if (err) $log.warn(err); + $scope.setProfileCreationTime(); }); }; + $scope.setProfileCreationTime = function() { + var now = moment().unix() * 1000 + 24 * 60 * 60 * 1000; + storageService.setProfileCreationTime(now, function() {}); + }; + }); diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 3ebfeed1b..bf8443081 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -37,8 +37,11 @@ angular.module('copayApp.controllers').controller('tabHomeController', }); } - storageService.getRateCardFlag(function(error, value) { - $scope.hideRateCard.value = (value == 'true') ? true : false; + storageService.getProfileCreationTime(function(error, time) { + var now = moment().unix() * 1000; + storageService.getRateCardFlag(function(error, value) { + $scope.hideRateCard.value = (value == 'true' || (time - now) > 0) ? true : false; + }); }); }); diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index e68f28df0..60545747a 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -138,6 +138,14 @@ angular.module('copayApp.services') storage.remove('profile', cb); }; + root.setProfileCreationTime = function(time, cb) { + storage.set('profileCreationTime', time, cb); + }; + + root.getProfileCreationTime = function(cb) { + storage.get('profileCreationTime', cb); + }; + root.storeFocusedWalletId = function(id, cb) { storage.set('focusedWalletId', id || '', cb); };