diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 0e40e0239..77e43fd66 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -53,7 +53,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun force: !!force, }, function(err, status) { $scope.updatingStatus = false; - console.log('status', status); if (err) { if (err === 'WALLET_NOT_REGISTERED') { $scope.walletNotRegistered = true; @@ -150,7 +149,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.txHistory = $scope.completeTxHistory.slice(0, (currentTxHistoryPage + 1) * HISTORY_SHOW_LIMIT); $scope.txHistoryShowMore = $scope.completeTxHistory.length > $scope.txHistory.length; } - console.log('$scope.completeTxHistory', $scope.completeTxHistory); }; $scope.getDate = function(txCreated) { @@ -234,7 +232,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.amountScale = 'scale3d(' + 1 + ',' + 1 + ',' + 1+ ')'; $scope.getScrollPosition = function(){ - console.log($ionicScrollDelegate.getScrollPosition().top); var pos = $ionicScrollDelegate.getScrollPosition().top; var amountHeight = 180 - pos; if(amountHeight < 80) { @@ -245,24 +242,22 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun contentMargin = 180; } - var amountScale = amountHeight/180; + var amountScale = (amountHeight/180); if(amountScale < 0.5) { amountScale = 0.5; } if(amountScale > 1.1) { amountScale = 1.1; } + var s = amountScale; $scope.altAmountOpacity = (amountHeight - 100)/80; - console.log('amountHeight', amountHeight); $window.requestAnimationFrame(function() { $scope.amountHeight = amountHeight + 'px'; $scope.contentMargin = contentMargin + 'px'; $scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s+ ')'; - console.log('$scope.amountScale', $scope.amountScale); - console.log('$scope.altAmountOpacity', $scope.altAmountOpacity); $scope.$evalAsync(angular.noop); }); }; diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 59e8a0839..42286d2e2 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -17,7 +17,6 @@ font-size: 12.5px; } &__tx-title { - //padding-top: 10px; flex-grow: 1; color: $dark-gray; overflow: hidden; @@ -116,7 +115,6 @@ margin-top: 180px; padding-top: 0; top: 0; - //top: 40px; .scroll { background: rgb(248, 248, 249); min-height: 300px; @@ -125,7 +123,6 @@ .amount-wrapper { position: relative; overflow: visible; - //margin-top: 40px; .amount-bg { content: ''; @@ -140,7 +137,6 @@ .amount { width: 100%; text-align: center; - //padding: 2rem 1rem 1.5rem 1rem; color: #fff; height: 180px; margin-bottom: 10px; @@ -181,7 +177,6 @@ } .wallet-not-backed-up-warning { - //margin-top: -15px; margin-bottom: 1rem; background: #E15061; text-align: center; diff --git a/www/views/includes/txp.html b/www/views/includes/txp.html index 6576549bf..779869454 100644 --- a/www/views/includes/txp.html +++ b/www/views/includes/txp.html @@ -1,66 +1,39 @@ - -
- - -
- -
- - - {{addressbook[tx.toAddress].name || addressbook[tx.toAddress]}} - - - {{tx.message}} - - - Sending - - - - {{tx.merchant.domain}} - {{tx.merchant.domain}} - -
- - - - - - (possible double spend) - - - – {{tx.amountStr}} - - -
- - -
-
-
+ diff --git a/www/views/tab-home.html b/www/views/tab-home.html index c2815c666..1c972afd6 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -37,10 +37,6 @@ {{txpsN}} - -
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index c0995c0a4..ddce60732 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -83,53 +83,7 @@ spinner="ios-small" on-refresh="onRefresh()"> - Wallet not backed up @@ -200,55 +154,6 @@ - -