anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

more fixes on the send/receive on Android & iOS / removed some unused code

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-07-30 15:17:15 +02:00
commit 734153ec5b
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
3 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/js/controllers/walletDetails.js
View file

@ -12,13 +12,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.isAndroid = platformInfo.isAndroid; $scope.isAndroid = platformInfo.isAndroid;
$scope.isIOS = platformInfo.isIOS; $scope.isIOS = platformInfo.isIOS;
$scope.currencySymbols = {
'EUR': '€',
'GBP': '£',
'USD': '$',
'YEN' : ''
};
var channel = "firebase"; var channel = "firebase";
if (platformInfo.isNW) { if (platformInfo.isNW) {
channel = "ga"; channel = "ga";
@ -354,7 +347,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
top = TOP_BALANCE_BUTTON; top = TOP_BALANCE_BUTTON;
} }
var amountTop = ((amountScale - 0.80) / 0.80) * top; //0.85 var amountTop = ((amountScale - 0.80) / 0.80) * top;
if (amountTop < -2) { if (amountTop < -2) {
amountTop = -2; amountTop = -2;
} }
@ -365,8 +358,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
var t = amountTop; var t = amountTop;
$scope.altAmountOpacity = (amountHeight - 100) / 80; $scope.altAmountOpacity = (amountHeight - 100) / 80;
$scope.buttonsOpacity = (amountHeight - 140) / 70;
$scope.buttonsOpacity = (amountHeight - 150)/80;
$window.requestAnimationFrame(function() { $window.requestAnimationFrame(function() {
$scope.amountHeight = amountHeight + 'px'; $scope.amountHeight = amountHeight + 'px';
$scope.contentMargin = contentMargin + 'px'; $scope.contentMargin = contentMargin + 'px';

4
src/sass/views/walletDetails.scss
View file

@ -194,7 +194,9 @@
.send-receive-buttons { .send-receive-buttons {
max-width: 600px; max-width: 600px;
margin: 25px auto 0; position: absolute;
bottom: 20px;
>.col { >.col {
padding: 5px 10px; padding: 5px 10px;
margin-bottom: 0; margin-bottom: 0;

8
www/views/walletDetails.html
View file

@ -91,7 +91,7 @@
</button> </button>
</div> </div>
<div class="send-receive-buttons row" ng-if="status.availableBalanceSat || status.availableBalanceSat === 0" ng-style="{opacity: buttonsOpacity}"> <div class="send-receive-buttons row" ng-if="(status.availableBalanceSat || status.availableBalanceSat === 0) && (buttonsOpacity > 0 || isAndroid)" ng-style="{opacity: buttonsOpacity}">
<div class="col"> <div class="col">
<div class="button button-outline button-white-outline" ng-click="goToReceive()"> <div class="button button-outline button-white-outline" ng-click="goToReceive()">
<span translate>Receive</span> <span translate>Receive</span>
@ -214,17 +214,17 @@
</button> </button>
</div> </div>
<div class="send-receive-buttons row" ng-style="{opacity: buttonsOpacity}"> <div class="send-receive-buttons row" ng-if="(status.availableBalanceSat || status.availableBalanceSat === 0) && (buttonsOpacity > 0 || isAndroid)" ng-style="{opacity: buttonsOpacity}">
<div class="col"> <div class="col">
<div class="button button-outline button-white-outline" ng-click="goToReceive()"> <div class="button button-outline button-white-outline" ng-click="goToReceive()">
<span translate>Receive</span> <span translate>Receive</span>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div class="button button-outline button-white-outline" ng-if="!status.availableBalanceSat" ui-sref="tabs.buyandsell"> <div class="button button-outline button-white-outline" ng-if="!status.availableBalanceSat" ng-click="goToBuy()">
<span translate>Buy Bitcoin</span> <span translate>Buy Bitcoin</span>
</div> </div>
<div class="button button-outline button-white-outline" ng-if="status.availableBalanceSat>0" ui-sref="tabs.send"> <div class="button button-outline button-white-outline" ng-if="status.availableBalanceSat>0" ng-click="goToSend()">
<span translate>Send</span> <span translate>Send</span>
</div> </div>
</div> </div>