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

use icon properly

Browse source
This commit is contained in:
JDonadio 2017-02-20 10:25:52 -05:00
commit 9472f095eb
5 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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,
});
}
}

8
src/js/controllers/confirm.js
View file

@ -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;
@ -503,8 +503,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$log.debug('statusChangeHandler: ', processName, showName, isOn);
if (
(
processName === 'broadcastingTx' ||
((processName === 'signingTx') && $scope.wallet.m > 1) ||
processName === 'broadcastingTx' ||
((processName === 'signingTx') && $scope.wallet.m > 1) ||
(processName == 'sendingTx' && !$scope.wallet.canSign() && !$scope.wallet.isPrivKeyExternal())
) && !isOn) {
$scope.sendStatus = 'success';

2
src/js/routes.js
View file

@ -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
src/sass/views/confirm.scss
View file

@ -7,4 +7,11 @@
.tx-details-content > .scroll {
padding-bottom: .25rem;
}
.gravatar-contact {
display: flex;
margin-left: -3px;
span {
margin: 5px 0 0 8px;
}
}
}