mirror of https://github.com/BTCPrivate/copay.git
use icon properly
This commit is contained in:
parent
515b806fa3
commit
9472f095eb
|
@ -100,6 +100,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
|||
toAddress: $scope.toAddress,
|
||||
toName: $scope.toName,
|
||||
toEmail: $scope.toEmail,
|
||||
toColor: $scope.toColor,
|
||||
useSendMax: true,
|
||||
});
|
||||
};
|
||||
|
@ -237,7 +238,8 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
|||
toAmount: (amount * unitToSatoshi).toFixed(0),
|
||||
toAddress: $scope.toAddress,
|
||||
toName: $scope.toName,
|
||||
toEmail: $scope.toEmail
|
||||
toEmail: $scope.toEmail,
|
||||
toColor: $scope.toColor,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,11 +14,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
|||
toAmount = data.stateParams.toAmount;
|
||||
cachedSendMax = {};
|
||||
$scope.useSendMax = data.stateParams.useSendMax == 'true' ? true : false;
|
||||
var isWallet = data.stateParams.isWallet || 'false';
|
||||
$scope.isWallet = (isWallet.toString().trim().toLowerCase() == 'true' ? true : false);
|
||||
$scope.isWallet = data.stateParams.isWallet == 'true' ? true : false;
|
||||
$scope.toAddress = data.stateParams.toAddress;
|
||||
$scope.toName = data.stateParams.toName;
|
||||
$scope.toEmail = data.stateParams.toEmail;
|
||||
$scope.toColor = data.stateParams.toColor;
|
||||
$scope.description = data.stateParams.description;
|
||||
$scope.paypro = data.stateParams.paypro;
|
||||
$scope.insufficientFunds = false;
|
||||
|
|
|
@ -283,7 +283,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
|||
}
|
||||
})
|
||||
.state('tabs.send.confirm', {
|
||||
url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:description/:useSendMax',
|
||||
url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:toColor/:description/:useSendMax',
|
||||
views: {
|
||||
'tab-send@tabs': {
|
||||
controller: 'confirmController',
|
||||
|
|
|
@ -7,4 +7,11 @@
|
|||
.tx-details-content > .scroll {
|
||||
padding-bottom: .25rem;
|
||||
}
|
||||
.gravatar-contact {
|
||||
display: flex;
|
||||
margin-left: -3px;
|
||||
span {
|
||||
margin: 5px 0 0 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,8 +29,12 @@
|
|||
|
||||
<div class="item">
|
||||
<span class="label" translate>To</span>
|
||||
<span class="payment-proposal-to">
|
||||
<img src="img/icon-bitcoin-small.svg">
|
||||
<span class="payment-proposal-to" ng-if="!isWallet">
|
||||
<img ng-if="cardId" src="img/icon-card.svg" width="34">
|
||||
<i ng-if="isGiftCard" class="icon big-icon-svg">
|
||||
<div class="bg icon-amazon"></div>
|
||||
</i>
|
||||
<img ng-if="isGlidera" src="img/glidera-logo.png" width="90"/>
|
||||
|
||||
<div copy-to-clipboard="toAddress" ng-if="!paypro" class="ellipsis">
|
||||
<contact ng-if="!toName" address="{{toAddress}}"></contact>
|
||||
|
@ -46,6 +50,19 @@
|
|||
<!-- <contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{toAddress}}"></contact>
|
||||
<span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span> -->
|
||||
</span>
|
||||
<div class="wallet" ng-if="isWallet">
|
||||
<i class="icon big-icon-svg">
|
||||
<img src="img/icon-wallet.svg" ng-style="{'background-color': toColor}" class="bg"/>
|
||||
</i>
|
||||
<div copy-to-clipboard="toAddress" class="ellipsis">
|
||||
<contact ng-if="!toName" address="{{toAddress}}"></contact>
|
||||
<span class="size-14" ng-if="toName">{{toName}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-if="toEmail && !isChromeApp" class="gravatar-contact">
|
||||
<gravatar class="send-gravatar" name="{{toName}}" height="30" width="30" email="{{toEmail}}"></gravatar>
|
||||
<span class="size-14" ng-if="toName">{{toName}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<a class="item item-icon-right" ng-hide="!useSendMax && (insufficientFunds || noMatchingWallet)" ng-click="showWalletSelector()">
|
||||
<span class="label" translate>From</span>
|
||||
|
|
Loading…
Reference in New Issue