diff --git a/src/js/controllers/activity.js b/src/js/controllers/activity.js index 3d3495755..70f9bfb76 100644 --- a/src/js/controllers/activity.js +++ b/src/js/controllers/activity.js @@ -1,11 +1,12 @@ 'use strict'; angular.module('copayApp.controllers').controller('activityController', - function($timeout, $scope, $log, $ionicModal, lodash, txpModalService, profileService, walletService, ongoingProcess, popupService, gettextCatalog, $state) { + function($timeout, $scope, $log, $ionicModal, lodash, txpModalService, profileService, walletService, ongoingProcess, popupService, gettextCatalog, $state, $ionicNavBarDelegate) { $scope.openTxpModal = txpModalService.open; $scope.fetchingNotifications = true; $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); profileService.getNotifications(50, function(err, n) { if (err) { $log.error(err); diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js index 1bec0d141..a5eefbde3 100644 --- a/src/js/controllers/advancedSettings.js +++ b/src/js/controllers/advancedSettings.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $log, configService, platformInfo, externalLinkService, gettextCatalog) { +angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $log, configService, platformInfo, externalLinkService, gettextCatalog, $ionicNavBarDelegate) { var updateConfig = function() { var config = configService.getSync(); @@ -54,4 +54,8 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', updateConfig(); }); + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); + }); diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 5bab3e87f..9ea1b4700 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('createController', - function($scope, $rootScope, $timeout, $log, lodash, $state, $ionicScrollDelegate, $ionicHistory, profileService, configService, gettextCatalog, ledger, trezor, intelTEE, derivationPathHelper, ongoingProcess, walletService, storageService, popupService, appConfigService, pushNotificationsService, firebaseEventsService) { + function($scope, $rootScope, $timeout, $log, lodash, $state, $ionicScrollDelegate, $ionicHistory, profileService, configService, gettextCatalog, ledger, trezor, intelTEE, derivationPathHelper, ongoingProcess, walletService, storageService, popupService, appConfigService, pushNotificationsService, firebaseEventsService, $ionicNavBarDelegate) { /* For compressed keys, m*73 + n*34 <= 496 */ var COPAYER_PAIR_LIMITS = { @@ -41,6 +41,10 @@ angular.module('copayApp.controllers').controller('createController', resetPasswordFields(); }); + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); + $scope.coinChanged = function() { $scope.formData.bwsurl = $scope.formData.coin == 'btc' ? defaults.bws.url : defaults.bwscash.url; } diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js index d42132c8d..27373b9d8 100644 --- a/src/js/controllers/export.js +++ b/src/js/controllers/export.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('exportController', - function($scope, $timeout, $log, $ionicHistory, $ionicScrollDelegate, backupService, walletService, storageService, profileService, platformInfo, gettextCatalog, $state, $stateParams, popupService, appConfigService) { + function($scope, $timeout, $log, $ionicHistory, $ionicScrollDelegate, backupService, walletService, storageService, profileService, platformInfo, gettextCatalog, $state, $stateParams, popupService, appConfigService, $ionicNavBarDelegate) { var wallet = profileService.getWallet($stateParams.walletId); $scope.wallet = wallet; @@ -232,4 +232,7 @@ angular.module('copayApp.controllers').controller('exportController', $scope.result = null; }); + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); }); diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 081bf7e89..59db5c753 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('importController', - function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog, appConfigService, hwWallet) { + function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog, appConfigService, hwWallet, $ionicNavBarDelegate) { var reader = new FileReader(); var defaults = configService.getDefaults(); @@ -422,6 +422,10 @@ angular.module('copayApp.controllers').controller('importController', }, 10); }; + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); + $scope.$on("$ionicView.afterEnter", function(event, data) { $scope.showAdv = false; $scope.init(); diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 171f570b6..9119cb7ed 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('joinController', - function($scope, $rootScope, $timeout, $state, $ionicHistory, $ionicScrollDelegate, profileService, configService, storageService, applicationService, gettextCatalog, lodash, ledger, trezor, intelTEE, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService, appConfigService) { + function($scope, $rootScope, $timeout, $state, $ionicHistory, $ionicScrollDelegate, profileService, configService, storageService, applicationService, gettextCatalog, lodash, ledger, trezor, intelTEE, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService, appConfigService, $ionicNavBarDelegate) { var defaults = configService.getDefaults(); @@ -33,6 +33,10 @@ angular.module('copayApp.controllers').controller('joinController', } }); + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); + $scope.showAdvChange = function() { $scope.showAdv = !$scope.showAdv; $scope.encrypt = null; diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index 7b8d8ebe3..b71b23b36 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesController', - function($scope, $rootScope, $timeout, $log, $ionicHistory, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog) { + function($scope, $rootScope, $timeout, $log, $ionicHistory, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog, $ionicNavBarDelegate) { var wallet; var walletId; @@ -112,4 +112,8 @@ angular.module('copayApp.controllers').controller('preferencesController', $scope.deleted = true; } }); + + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); }); diff --git a/src/js/controllers/preferencesAbout.js b/src/js/controllers/preferencesAbout.js index 0deba04bc..a7c756cce 100644 --- a/src/js/controllers/preferencesAbout.js +++ b/src/js/controllers/preferencesAbout.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesAbout', - function($scope, $window, appConfigService, gettextCatalog, externalLinkService) { + function($scope, $window, appConfigService, gettextCatalog, externalLinkService, $ionicNavBarDelegate) { $scope.title = gettextCatalog.getString('About') + ' ' + appConfigService.nameCase; $scope.version = $window.version; @@ -27,4 +27,8 @@ angular.module('copayApp.controllers').controller('preferencesAbout', externalLinkService.open(url, optIn, title, message, okText, cancelText); }; + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); + }); diff --git a/src/js/controllers/preferencesAdvancedController.js b/src/js/controllers/preferencesAdvancedController.js index c49c6e9e5..ddc30bdf0 100644 --- a/src/js/controllers/preferencesAdvancedController.js +++ b/src/js/controllers/preferencesAdvancedController.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('preferencesAdvancedController', function($scope, $timeout, $state, $stateParams, profileService) { +angular.module('copayApp.controllers').controller('preferencesAdvancedController', function($scope, $timeout, $state, $stateParams, profileService, $ionicNavBarDelegate) { var wallet = profileService.getWallet($stateParams.walletId); $scope.network = wallet.network; $scope.wallet = wallet; @@ -11,6 +11,10 @@ angular.module('copayApp.controllers').controller('preferencesAdvancedController }); }; + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); + $timeout(function() { $scope.$apply(); }, 1); diff --git a/src/js/controllers/preferencesAlias.js b/src/js/controllers/preferencesAlias.js index 8cb9f2670..a798fb229 100644 --- a/src/js/controllers/preferencesAlias.js +++ b/src/js/controllers/preferencesAlias.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesAliasController', - function($scope, $timeout, $stateParams, $ionicHistory, configService, profileService, walletService) { + function($scope, $timeout, $stateParams, $ionicHistory, configService, profileService, walletService, $ionicNavBarDelegate) { var wallet = profileService.getWallet($stateParams.walletId); var walletId = wallet.credentials.walletId; var config = configService.getSync(); @@ -24,4 +24,8 @@ angular.module('copayApp.controllers').controller('preferencesAliasController', $ionicHistory.goBack(); }); }; + + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); }); diff --git a/src/js/controllers/preferencesAltCurrency.js b/src/js/controllers/preferencesAltCurrency.js index 201d60cec..fcb2c0b4c 100644 --- a/src/js/controllers/preferencesAltCurrency.js +++ b/src/js/controllers/preferencesAltCurrency.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesAltCurrencyController', - function($scope, $log, $timeout, $ionicHistory, configService, rateService, lodash, profileService, walletService, storageService) { + function($scope, $log, $timeout, $ionicHistory, configService, rateService, lodash, profileService, walletService, storageService, $ionicNavBarDelegate) { var next = 10; var completeAlternativeList = []; @@ -48,7 +48,7 @@ angular.module('copayApp.controllers').controller('preferencesAltCurrencyControl completeAlternativeList.push(c); } }); - + $scope.altCurrencyList = completeAlternativeList.slice(0, 10); $scope.lastUsedPopularList = lodash.unique(lodash.union($scope.lastUsedAltCurrencyList, popularCurrencyList), 'isoCode'); @@ -114,4 +114,8 @@ angular.module('copayApp.controllers').controller('preferencesAltCurrencyControl init(); }); }); + + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); }); diff --git a/src/js/controllers/preferencesBwsUrl.js b/src/js/controllers/preferencesBwsUrl.js index f7940d95e..0c6be93ba 100644 --- a/src/js/controllers/preferencesBwsUrl.js +++ b/src/js/controllers/preferencesBwsUrl.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesBwsUrlController', - function($scope, $log, $stateParams, configService, applicationService, profileService, storageService, appConfigService) { + function($scope, $log, $stateParams, configService, applicationService, profileService, storageService, appConfigService, $ionicNavBarDelegate) { $scope.success = null; var wallet = profileService.getWallet($stateParams.walletId); @@ -53,4 +53,8 @@ angular.module('copayApp.controllers').controller('preferencesBwsUrlController', }); }); }; + + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); }); diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js index 4867f6554..bff1b6fbe 100644 --- a/src/js/controllers/preferencesColor.js +++ b/src/js/controllers/preferencesColor.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('preferencesColorController', function($scope, $timeout, $log, $stateParams, $ionicHistory, configService, profileService) { +angular.module('copayApp.controllers').controller('preferencesColorController', function($scope, $timeout, $log, $stateParams, $ionicHistory, configService, profileService, $ionicNavBarDelegate) { var wallet = profileService.getWallet($stateParams.walletId); $scope.wallet = wallet; var walletId = wallet.credentials.walletId; @@ -76,4 +76,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController', ("0" + parseInt(rgb[3],10).toString(16)).slice(-2) : ''; }; + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); }); diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index 8283f93c5..c9dc6a3d5 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesDeleteWalletController', - function($scope, $ionicHistory, gettextCatalog, lodash, profileService, $state, ongoingProcess, popupService, pushNotificationsService) { + function($scope, $ionicHistory, gettextCatalog, lodash, profileService, $state, ongoingProcess, popupService, pushNotificationsService, $ionicNavBarDelegate) { $scope.$on("$ionicView.beforeEnter", function(event, data) { if (!data.stateParams || !data.stateParams.walletId) { @@ -20,6 +20,10 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro $scope.walletName = $scope.wallet.name; }); + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); + $scope.showDeletePopup = function() { var title = gettextCatalog.getString('Warning!'); var message = gettextCatalog.getString('Are you sure you want to delete this wallet?'); diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js index ee7f84789..4ad2ef01c 100644 --- a/src/js/controllers/preferencesFee.js +++ b/src/js/controllers/preferencesFee.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('preferencesFeeController', function($scope, $q, $timeout, $ionicHistory, lodash, gettextCatalog, configService, feeService, ongoingProcess, popupService) { +angular.module('copayApp.controllers').controller('preferencesFeeController', function($scope, $q, $timeout, $ionicHistory, lodash, gettextCatalog, configService, feeService, ongoingProcess, popupService, $ionicNavBarDelegate) { $scope.save = function(newFee) { @@ -31,6 +31,10 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu $scope.init(); }); + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); + $scope.init = function() { $scope.network = $scope.network || 'livenet'; $scope.feeOpts = feeService.feeOpts; diff --git a/src/js/controllers/preferencesHistory.js b/src/js/controllers/preferencesHistory.js index 68c6f8daa..2adcda789 100644 --- a/src/js/controllers/preferencesHistory.js +++ b/src/js/controllers/preferencesHistory.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesHistory', - function($scope, $log, $stateParams, $timeout, $state, $ionicHistory, storageService, platformInfo, profileService, lodash, appConfigService, walletService) { + function($scope, $log, $stateParams, $timeout, $state, $ionicHistory, storageService, platformInfo, profileService, lodash, appConfigService, walletService, $ionicNavBarDelegate) { $scope.wallet = profileService.getWallet($stateParams.walletId); $scope.csvReady = false; $scope.isCordova = platformInfo.isCordova; @@ -147,6 +147,7 @@ angular.module('copayApp.controllers').controller('preferencesHistory', }; $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); $scope.csvHistory(); }); }); diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js index 9362d883f..303c41a76 100644 --- a/src/js/controllers/preferencesInformation.js +++ b/src/js/controllers/preferencesInformation.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesInformation', - function($scope, $log, $ionicHistory, platformInfo, lodash, profileService, configService, $stateParams, $state, walletService) { + function($scope, $log, $ionicHistory, platformInfo, lodash, profileService, configService, $stateParams, $state, walletService, $ionicNavBarDelegate) { var wallet = profileService.getWallet($stateParams.walletId); $scope.wallet = wallet; @@ -31,6 +31,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', }; $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); var c = wallet.credentials; var basePath = c.getBaseAddressDerivationPath(); diff --git a/src/js/controllers/preferencesLanguage.js b/src/js/controllers/preferencesLanguage.js index c8d14d30d..0f8442587 100644 --- a/src/js/controllers/preferencesLanguage.js +++ b/src/js/controllers/preferencesLanguage.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesLanguageController', - function($scope, $log, $ionicHistory, configService, profileService, uxLanguage, walletService, externalLinkService, gettextCatalog) { + function($scope, $log, $ionicHistory, configService, profileService, uxLanguage, walletService, externalLinkService, gettextCatalog, $ionicNavBarDelegate) { $scope.availableLanguages = uxLanguage.getLanguages(); @@ -36,4 +36,8 @@ angular.module('copayApp.controllers').controller('preferencesLanguageController $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.currentLanguage = uxLanguage.getCurrentLanguage(); }); + + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); }); diff --git a/src/js/controllers/preferencesLogs.js b/src/js/controllers/preferencesLogs.js index 5ee106bf0..01a0c4a46 100644 --- a/src/js/controllers/preferencesLogs.js +++ b/src/js/controllers/preferencesLogs.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesLogs', - function($scope, historicLog, lodash, configService, gettextCatalog) { + function($scope, historicLog, lodash, configService, gettextCatalog, $ionicNavBarDelegate) { var config = configService.getSync(); var logLevels = historicLog.getLevels(); @@ -68,6 +68,7 @@ angular.module('copayApp.controllers').controller('preferencesLogs', }); $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); filterLogs(selectedLevel.weight); }); }); diff --git a/src/js/controllers/preferencesNotifications.js b/src/js/controllers/preferencesNotifications.js index 9b4547ea7..7351a9f23 100644 --- a/src/js/controllers/preferencesNotifications.js +++ b/src/js/controllers/preferencesNotifications.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('preferencesNotificationsController', function($scope, $log, $timeout, appConfigService, lodash, configService, platformInfo, pushNotificationsService, emailService) { +angular.module('copayApp.controllers').controller('preferencesNotificationsController', function($scope, $log, $timeout, appConfigService, lodash, configService, platformInfo, pushNotificationsService, emailService, $ionicNavBarDelegate) { var updateConfig = function() { var config = configService.getSync(); $scope.appName = appConfigService.nameCase; @@ -103,6 +103,7 @@ angular.module('copayApp.controllers').controller('preferencesNotificationsContr }; $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); updateConfig(); }); }); diff --git a/src/js/controllers/pricechart.js b/src/js/controllers/pricechart.js index 47aa6bfbf..eabad09c3 100644 --- a/src/js/controllers/pricechart.js +++ b/src/js/controllers/pricechart.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('pricechartController', function($scope, $q, $http, $timeout, $ionicModal, $log, $state, $ionicHistory, lodash, pricechartService, externalLinkService, popupService) { +angular.module('copayApp.controllers').controller('pricechartController', function($scope, $q, $http, $timeout, $ionicModal, $log, $state, $ionicHistory, lodash, pricechartService, externalLinkService, popupService, $ionicNavBarDelegate) { $scope.openExternalLink = function(url) { externalLinkService.open(url); @@ -86,4 +86,8 @@ angular.module('copayApp.controllers').controller('pricechartController', functi new Chartist.Line('#btc-chart', data.chartData, options); }); }); + + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); }); diff --git a/src/js/controllers/shapeshift.js b/src/js/controllers/shapeshift.js index 21eed0878..a58fc20b6 100644 --- a/src/js/controllers/shapeshift.js +++ b/src/js/controllers/shapeshift.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('shapeshiftController', function($scope, $interval, profileService, walletService, popupService, lodash) { +angular.module('copayApp.controllers').controller('shapeshiftController', function($scope, $interval, profileService, walletService, popupService, lodash, $ionicNavBarDelegate) { var walletsBtc = []; var walletsBch = []; @@ -53,6 +53,10 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi $scope.showToWallets = false; }); + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); + $scope.showFromWalletSelector = function() { $scope.showFromWallets = true; } diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index ebfd01a90..1904566b9 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('tabHomeController', - function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, $window, gettextCatalog, lodash, popupService, ongoingProcess, externalLinkService, latestReleaseService, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, appConfigService, startupService, addressbookService, feedbackService, bwcError, nextStepsService, buyAndSellService, homeIntegrationsService, bitpayCardService, pushNotificationsService, timeService, bitcoincomService, pricechartService, firebaseEventsService, servicesService, shapeshiftService) { + function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, $window, gettextCatalog, lodash, popupService, ongoingProcess, externalLinkService, latestReleaseService, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, appConfigService, startupService, addressbookService, feedbackService, bwcError, nextStepsService, buyAndSellService, homeIntegrationsService, bitpayCardService, pushNotificationsService, timeService, bitcoincomService, pricechartService, firebaseEventsService, servicesService, shapeshiftService, $ionicNavBarDelegate) { var wallet; var listeners = []; var notifications = []; @@ -82,6 +82,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', }); $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); updateAllWallets(); addressbookService.list(function(err, ab) { diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index a2985cad7..89ea612e3 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabReceiveController', function($rootScope, $scope, $timeout, $log, $ionicModal, $state, $ionicHistory, $ionicPopover, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService, bwcError, bitcoinCashJsService) { +angular.module('copayApp.controllers').controller('tabReceiveController', function($rootScope, $scope, $timeout, $log, $ionicModal, $state, $ionicHistory, $ionicPopover, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService, bwcError, bitcoinCashJsService, $ionicNavBarDelegate) { var listeners = []; $scope.bchAddressType = { type: 'cashaddr' }; @@ -123,6 +123,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi ]; }); + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); + $scope.$on("$ionicView.leave", function(event, data) { $ionicHistory.clearCache(); lodash.each(listeners, function(x) { diff --git a/src/js/controllers/tab-scan.js b/src/js/controllers/tab-scan.js index 88542c2dc..1744f3d69 100644 --- a/src/js/controllers/tab-scan.js +++ b/src/js/controllers/tab-scan.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabScanController', function($scope, $log, $timeout, scannerService, incomingData, $state, $ionicHistory, $rootScope) { +angular.module('copayApp.controllers').controller('tabScanController', function($scope, $log, $timeout, scannerService, incomingData, $state, $ionicHistory, $rootScope, $ionicNavBarDelegate) { var scannerStates = { unauthorized: 'unauthorized', @@ -55,6 +55,10 @@ angular.module('copayApp.controllers').controller('tabScanController', function( _refreshScanView(); }); + $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); + }); + $scope.$on("$ionicView.afterEnter", function() { // try initializing and refreshing status any time the view is entered if(!scannerService.isInitialized()){ diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index 6e761e59e..3e4428096 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabSendController', function($scope, $rootScope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService, platformInfo, bwcError, gettextCatalog, scannerService, configService, bitcoinCashJsService) { +angular.module('copayApp.controllers').controller('tabSendController', function($scope, $rootScope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService, platformInfo, bwcError, gettextCatalog, scannerService, configService, bitcoinCashJsService, $ionicNavBarDelegate) { var originalList; var CONTACTS_SHOW_LIMIT; @@ -235,6 +235,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function( }); $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); if (!$scope.hasWallets) { $scope.checkingBalance = false; return; diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js index bb570b645..7c380d27f 100644 --- a/src/js/controllers/tab-settings.js +++ b/src/js/controllers/tab-settings.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabSettingsController', function($rootScope, $timeout, $scope, appConfigService, $ionicModal, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayAccountService, bitpayCardService, storageService, glideraService, gettextCatalog, buyAndSellService) { +angular.module('copayApp.controllers').controller('tabSettingsController', function($rootScope, $timeout, $scope, appConfigService, $ionicModal, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayAccountService, bitpayCardService, storageService, glideraService, gettextCatalog, buyAndSellService, $ionicNavBarDelegate) { var updateConfig = function() { $scope.currentLanguageName = uxLanguage.getCurrentLanguageName(); @@ -68,9 +68,8 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct }); }); - - $scope.$on("$ionicView.enter", function(event, data) { + $ionicNavBarDelegate.showBar(true); updateConfig(); });