diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js index fcebd4ddd..a186879e3 100644 --- a/src/js/controllers/tabsController.js +++ b/src/js/controllers/tabsController.js @@ -41,8 +41,4 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro }; - $scope.$on("$ionicView.beforeEnter", function(event, data) { - $rootScope.hideTabs = ''; - }); - }); diff --git a/src/js/directives/showTabs.js b/src/js/directives/showTabs.js new file mode 100644 index 000000000..5c56ec0db --- /dev/null +++ b/src/js/directives/showTabs.js @@ -0,0 +1,15 @@ +'use strict'; +angular.module('copayApp.directives') + .directive('showTabs', function($rootScope, $timeout) { + return { + restrict: 'A', + link: function($scope, $el) { + $scope.$on("$ionicView.beforeEnter", function(event, data) { + $timeout(function() { + $rootScope.hideTabs = ''; + $rootScope.$apply(); + }); + }); + } + }; + }); diff --git a/www/views/activity.html b/www/views/activity.html index 3d9f94d84..360246855 100644 --- a/www/views/activity.html +++ b/www/views/activity.html @@ -1,4 +1,4 @@ - + {{'Recent Transactions'|translate}} diff --git a/www/views/add.html b/www/views/add.html index 6721477bd..23651096d 100644 --- a/www/views/add.html +++ b/www/views/add.html @@ -1,4 +1,4 @@ - + {{'Add wallet' | translate}} diff --git a/www/views/advancedSettings.html b/www/views/advancedSettings.html index 2d39653a0..68f1f58a5 100644 --- a/www/views/advancedSettings.html +++ b/www/views/advancedSettings.html @@ -1,4 +1,4 @@ - + {{'Advanced Settings' | translate}} diff --git a/www/views/amazon.html b/www/views/amazon.html index ba3d7a34a..85d4e0636 100644 --- a/www/views/amazon.html +++ b/www/views/amazon.html @@ -1,4 +1,4 @@ - + diff --git a/www/views/amazonCards.html b/www/views/amazonCards.html index 03a989e06..eeb6560b1 100644 --- a/www/views/amazonCards.html +++ b/www/views/amazonCards.html @@ -1,4 +1,4 @@ - + @@ -16,7 +16,7 @@

{{item.amount | currency : '$ ' : 2}} {{item.currency}} -

+

Error Expired diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index b787ca4a9..c81eb6e54 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -1,4 +1,4 @@ - + diff --git a/www/views/buyandsell.html b/www/views/buyandsell.html index 629e28568..f18866aa5 100644 --- a/www/views/buyandsell.html +++ b/www/views/buyandsell.html @@ -1,4 +1,4 @@ - + diff --git a/www/views/export.html b/www/views/export.html index f789c416f..7a7e460c6 100644 --- a/www/views/export.html +++ b/www/views/export.html @@ -1,4 +1,4 @@ - + {{'Export wallet' | translate}} diff --git a/www/views/glidera.html b/www/views/glidera.html index 129b9c5a3..7425120a8 100644 --- a/www/views/glidera.html +++ b/www/views/glidera.html @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Refresh - +

-
+
Hardware not connected.
Check installation and retry. diff --git a/www/views/preferencesFee.html b/www/views/preferencesFee.html index 4471432be..c55cd3f01 100644 --- a/www/views/preferencesFee.html +++ b/www/views/preferencesFee.html @@ -1,4 +1,4 @@ - + {{'Bitcoin Network Fee Policy'|translate}} diff --git a/www/views/preferencesGlidera.html b/www/views/preferencesGlidera.html index 99de7e7ac..d74bfdeea 100644 --- a/www/views/preferencesGlidera.html +++ b/www/views/preferencesGlidera.html @@ -1,4 +1,4 @@ - + diff --git a/www/views/preferencesHistory.html b/www/views/preferencesHistory.html index 2924335ed..ab1876317 100644 --- a/www/views/preferencesHistory.html +++ b/www/views/preferencesHistory.html @@ -1,4 +1,4 @@ - + {{'Transaction History' | translate}} diff --git a/www/views/preferencesInformation.html b/www/views/preferencesInformation.html index 927aa4d38..728edb40b 100644 --- a/www/views/preferencesInformation.html +++ b/www/views/preferencesInformation.html @@ -1,4 +1,4 @@ - + {{'Wallet Information' | translate}} diff --git a/www/views/preferencesLanguage.html b/www/views/preferencesLanguage.html index 0605e17be..f9cadd017 100644 --- a/www/views/preferencesLanguage.html +++ b/www/views/preferencesLanguage.html @@ -1,4 +1,4 @@ - + {{'Language'|translate}} diff --git a/www/views/preferencesLogs.html b/www/views/preferencesLogs.html index 486a8d34d..91e3e3261 100644 --- a/www/views/preferencesLogs.html +++ b/www/views/preferencesLogs.html @@ -1,4 +1,4 @@ - + {{'Session Log' | translate}} diff --git a/www/views/preferencesNotifications.html b/www/views/preferencesNotifications.html index 6e1744c05..baf9e7a05 100644 --- a/www/views/preferencesNotifications.html +++ b/www/views/preferencesNotifications.html @@ -1,4 +1,4 @@ - + {{'Notifications' | translate}} diff --git a/www/views/preferencesUnit.html b/www/views/preferencesUnit.html index f5486f5c1..77edf05d7 100644 --- a/www/views/preferencesUnit.html +++ b/www/views/preferencesUnit.html @@ -1,4 +1,4 @@ - + {{'Unit'|translate}} diff --git a/www/views/proposals.html b/www/views/proposals.html index 14b8348c9..573b36a0c 100644 --- a/www/views/proposals.html +++ b/www/views/proposals.html @@ -1,5 +1,4 @@ - - + {{'Pending Proposals'|translate}} diff --git a/www/views/tab-create-personal.html b/www/views/tab-create-personal.html index 4fe02fd23..9b695aefc 100644 --- a/www/views/tab-create-personal.html +++ b/www/views/tab-create-personal.html @@ -1,4 +1,4 @@ - + {{'Create Personal Wallet' | translate}} diff --git a/www/views/tab-create-shared.html b/www/views/tab-create-shared.html index b054e018c..700ac9c2b 100644 --- a/www/views/tab-create-shared.html +++ b/www/views/tab-create-shared.html @@ -1,4 +1,4 @@ - + {{'Create Shared Wallet' | translate}} diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 300bb78ea..7b7a0d6ca 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -1,4 +1,4 @@ - + diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index ebf2a2a15..7f42ab857 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -1,11 +1,11 @@ - + {{'Receive' | translate}} @@ -27,7 +27,7 @@
-
+
-
+
@@ -81,7 +81,7 @@
- + + {{'Scan' | translate}} diff --git a/www/views/tab-send.html b/www/views/tab-send.html index e217bacc2..6b36814b0 100644 --- a/www/views/tab-send.html +++ b/www/views/tab-send.html @@ -1,4 +1,4 @@ - + {{'Send' | translate}} diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 7650aa62f..2ccd0afdb 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -1,4 +1,4 @@ - + {{'Settings' | translate}} diff --git a/www/views/termsOfUse.html b/www/views/termsOfUse.html index 409b21bd1..5bcc3cef0 100644 --- a/www/views/termsOfUse.html +++ b/www/views/termsOfUse.html @@ -1,4 +1,4 @@ - + {{'Terms Of Use' | translate}}