diff --git a/public/views/preferences.html b/public/views/preferences.html index de96fec3d..fb2a3ab46 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -21,9 +21,9 @@ Backup -
  • +
  • - Delete + Advanced

    • Global settings

    diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html new file mode 100644 index 000000000..3e32b0adb --- /dev/null +++ b/public/views/preferencesAdvanced.html @@ -0,0 +1,15 @@ +
    + + +
    +
    + diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index ead92fad3..b36e8ffa8 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -6,7 +6,7 @@
    -

    Permanently delete this wallet. WARNING: this action cannot be reversed.

    +

    Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED

    diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index f398af13c..7cbfe4d80 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -110,9 +110,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (self.tab === tab && !reset) return; - if (! document.getElementById('menu-' + tab) && ++tries<5) { + if (!document.getElementById('menu-' + tab) && ++tries < 5) { return $timeout(function() { - self.setTab(tab,reset, tries); + self.setTab(tab, reset, tries); }, 300); } @@ -564,7 +564,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.debouncedUpdate = lodash.throttle(function() { self.updateAll(); self.updateTxHistory(); - }, 4000, {leading: false, trailing: true}); + }, 4000, { + leading: false, + trailing: true + }); // No need ot listing to Local/Resume since @@ -578,14 +581,19 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Local/Online', function(event) { self.isOffline = false; + self.offLineSince = null; }); + self.offLineSince = null;; $rootScope.$on('Local/Offline', function(event) { $log.debug('### Offline event'); - self.isOffline = true; - $timeout(function() { - $rootScope.$apply(); - }); + if (!self.offLineSince) self.offLineSince = Date.now(); + if (Date.now() - sef.offLineSince > 1000) { + self.isOffline = true; + $timeout(function() { + $rootScope.$apply(); + }); + } }); $rootScope.$on('Local/BackupDone', function(event) { @@ -629,9 +637,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); $rootScope.$on('Local/WalletImported', function(event, walletId) { - storageService.setBackupFlag(walletId, function() {}); - storageService.clearLastAddress(walletId, function(err) { - self.startScan(walletId); + storageService.setBackupFlag(walletId, function() { + storageService.clearLastAddress(walletId, function(err) { + self.startScan(walletId); + }); }); }); diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index 4c05f0147..90e9777ec 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -2,9 +2,6 @@ angular.module('copayApp.controllers').controller('preferencesController', function($scope, $rootScope, $filter, $timeout, $modal, $log, lodash, configService, profileService) { - this.error = null; - this.success = null; - var config = configService.getSync(); this.unitName = config.wallet.settings.unitName; diff --git a/src/js/controllers/preferencesAdvanced.js b/src/js/controllers/preferencesAdvanced.js new file mode 100644 index 000000000..3777899e2 --- /dev/null +++ b/src/js/controllers/preferencesAdvanced.js @@ -0,0 +1,7 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('preferencesAdvancedController', + function($scope) { + this.scan = function() { + }; + }); diff --git a/src/js/controllers/preferencesBwsUrl.js b/src/js/controllers/preferencesBwsUrl.js index fd0d5c8bd..cf4483f70 100644 --- a/src/js/controllers/preferencesBwsUrl.js +++ b/src/js/controllers/preferencesBwsUrl.js @@ -1,12 +1,9 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesBwsUrlController', - function($scope, $rootScope, $filter, $timeout, $modal, balanceService, notification, backupService, profileService, configService, isMobile, isCordova, go, rateService, applicationService, bwcService) { + function($scope, configService, isMobile, isCordova, go, applicationService ) { this.isSafari = isMobile.Safari(); this.isCordova = isCordova; - this.hideAdv = true; - this.hidePriv = true; - this.hideSecret = true; this.error = null; this.success = null; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 2cd874729..c130d11fe 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -23,6 +23,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.isRateAvailable = false; this.showScanner = false; this.isMobile = isMobile.any(); + this.addr = null; var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) { self.setForm(data); diff --git a/src/js/routes.js b/src/js/routes.js index 3096b0d02..188ad0e57 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -53,8 +53,8 @@ angular try { if (window.cordova) console.log(args.join(' ')); - orig.apply(null, args); historicLog.add(level, args.join(' ')); + orig.apply(null, args); } catch (e) { console.log('Error at log decorator:', e); } @@ -279,6 +279,24 @@ angular } } }) + .state('preferencesAdvanced', { + url: '/preferencesAdvanced', + templateUrl: 'views/preferencesAdvanced.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesAdvanced.html' + }, + 'topbar': { + templateUrl: 'views/includes/topbar.html', + controller: function($scope) { + $scope.titleSection = 'Advanced'; + $scope.goBackToState = 'preferences'; + } + } + } + }) .state('preferencesColor', { url: '/preferencesColor', templateUrl: 'views/preferencesColor.html', @@ -348,8 +366,9 @@ angular 'topbar': { templateUrl: 'views/includes/topbar.html', controller: function($scope, gettext) { - $scope.titleSection = gettext('Delete'); + $scope.titleSection = gettext('Delete Wallet'); $scope.goBackToState = 'preferences'; + $scope.goBackToState = 'preferencesAdvanced'; } } } @@ -490,7 +509,8 @@ angular preferences: 0, preferencesColor: 12, backup: 12, - delete: 12, + preferencesAdvanced: 12, + delete: 13, preferencesLanguage: 12, preferencesUnit: 12, preferencesAltCurrency: 12, @@ -510,7 +530,6 @@ angular }); $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) { - if (pageWeight[fromState.name] > pageWeight[toState.name]) { $rootScope.$emit('Animation/SwipeRight'); } else if (pageWeight[fromState.name] < pageWeight[toState.name]) { @@ -533,12 +552,13 @@ angular } } else { $log.debug('Profile loaded ... Starting UX.'); - $state.transitionTo(toState, toParams); + $state.transitionTo(toState.name || toState, toParams); } }); } if (profileService.focusedClient && !profileService.focusedClient.isComplete() && toState.walletShouldBeComplete) { + $state.transitionTo('copayers'); event.preventDefault(); } diff --git a/src/js/services/go.js b/src/js/services/go.js index a86bcbca0..e3b75dc54 100644 --- a/src/js/services/go.js +++ b/src/js/services/go.js @@ -47,7 +47,6 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope, root.walletHome = function() { var fc = profileService.focusedClient; - if (fc && !fc.isComplete()) { root.path('copayers'); } else {