diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 33eed46f2..019267dfe 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -12,6 +12,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.isAndroid = platformInfo.isAndroid; $scope.isIOS = platformInfo.isIOS; + $scope.amountIsCollapsible = !$scope.isAndroid; + $scope.openExternalLink = function(url, target) { externalLinkService.open(url, target); }; @@ -279,7 +281,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun var scrollWatcherInitialized; $scope.$on("$ionicView.enter", function(event, data) { - if(scrollWatcherInitialized) { + if(scrollWatcherInitialized || !$scope.amountIsCollapsible) { return; } scrollWatcherInitialized = true; diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index dd1a3cf60..78e89e360 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -123,7 +123,11 @@ background-color: inherit !important; } ion-content { - margin-top: 180px; + + &.collapsible { + margin-top: 180px; + } + padding-top: 0; top: 0; .scroll { @@ -150,12 +154,15 @@ text-align: center; color: #fff; height: 180px; - margin-bottom: 10px; padding-top: 40px; display: flex; align-items: center; justify-content: center; + &.collapsible { + margin-bottom: 10px; + } + &__balance { transform: scale3d(1, 1, 1); margin-top: 5px; diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 5827b0df5..a8f2ecb43 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -13,12 +13,16 @@
-
+
-
+
@@ -69,13 +73,14 @@ ...
-
+
-
- +
+ + +
+
+
+ +
+ {{updateStatusError}} + Tap to retry +
+ +
+ This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information. + Recreate +
+ +
+ {{status.totalBalanceStr}} +
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
+
+
Available: {{status.totalBalanceStr}}
+
Confirming: {{status.pendingAmountStr}}
+
+
+ +
+ [Balance Hidden] +
+ Tap and hold to show +
+
+
+
+
+ ... +
+
+
+ +
+ +
+
+ Wallet not backed up