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

Fix - 291/292

Browse source 
- White screen & Remove the button "Send max amount" in receive specific amount"
This commit is contained in:
Jean-Baptiste Dominguez 2018-04-27 15:39:54 +09:00
commit 132939447e
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/js/controllers/amount.js
View file

@ -133,6 +133,11 @@ angular.module('copayApp.controllers').controller('amountController', function($
setAvailableUnits(); setAvailableUnits();
updateUnitUI(); updateUnitUI();
$scope.hasMaxAmount = true;
if ($ionicHistory.backView().stateName == 'tabs.receive') {
$scope.hasMaxAmount = false;
}
$scope.showMenu = $ionicHistory.backView() && ($ionicHistory.backView().stateName == 'tabs.send' || $ionicHistory.backView().stateName == 'tabs.bitpayCard'); $scope.showMenu = $ionicHistory.backView() && ($ionicHistory.backView().stateName == 'tabs.send' || $ionicHistory.backView().stateName == 'tabs.bitpayCard');
$scope.recipientType = data.stateParams.recipientType || null; $scope.recipientType = data.stateParams.recipientType || null;
$scope.toAddress = data.stateParams.toAddress; $scope.toAddress = data.stateParams.toAddress;

4
www/views/amount.html
View file

@ -50,7 +50,7 @@
<div class="amount__result-equiv">&lt;&gt; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</div> <div class="amount__result-equiv">&lt;&gt; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</div>
</div> </div>
<div> <div>
<button class="button button-sendmax" ng-click="sendMax()"> <button ng-if="hasMaxAmount" class="button button-sendmax" ng-click="sendMax()">
<span> <span>
<i class="icon ion-ios-speedometer-outline"></i>&emsp; <i class="icon ion-ios-speedometer-outline"></i>&emsp;
<span translate>Send max amount</span> <span translate>Send max amount</span>
@ -77,7 +77,7 @@
<span>&lt;&gt; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</span> <span>&lt;&gt; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</span>
</div> </div>
<div> <div>
<button class="button button-sendmax" ng-click="sendMax()"> <button ng-if="hasMaxAmount" class="button button-sendmax" ng-click="sendMax()">
<span> <span>
<i class="icon ion-ios-speedometer-outline"></i>&emsp; <i class="icon ion-ios-speedometer-outline"></i>&emsp;
<span translate>Send max amount</span> <span translate>Send max amount</span>