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

Merge pull request #85 from Bitcoin-com/dev-jb

Browse source 
Dev jb
This commit is contained in:
Jean-Baptiste Dominguez 2018-04-27 16:01:42 +09:00 • committed by GitHub
commit eeaa02e3bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 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;

2
src/js/services/configService.js
View file

@ -184,7 +184,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
// If display is not configure, take the default value // If display is not configure, take the default value
if (!configCache.wallet.settings.priceDisplay) { if (!configCache.wallet.settings.priceDisplay) {
configCache.wallet.settings.display = defaultConfig.wallet.settings.priceDisplay; configCache.wallet.settings.priceDisplay = defaultConfig.wallet.settings.priceDisplay;
} }
// Convert tarascash wallet to new style cash wallet // Convert tarascash wallet to new style cash wallet

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>