show currency warning on amount screen if plain address used
This commit is contained in:
parent
85cf86d108
commit
d31a2115b1
4 changed files with 18 additions and 2 deletions
|
|
@ -37,6 +37,10 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
$scope.fromWalletId = data.stateParams.fromWalletId;
|
$scope.fromWalletId = data.stateParams.fromWalletId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (data.stateParams.noPrefix) {
|
||||||
|
$scope.showWarningMessage = data.stateParams.noPrefix != 0;
|
||||||
|
}
|
||||||
|
|
||||||
var config = configService.getSync().wallet.settings;
|
var config = configService.getSync().wallet.settings;
|
||||||
|
|
||||||
function setAvailableUnits() {
|
function setAvailableUnits() {
|
||||||
|
|
|
||||||
|
|
@ -287,7 +287,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.state('tabs.send.amount', {
|
.state('tabs.send.amount', {
|
||||||
url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor/:coin/:fixedUnit/:fromWalletId/:minShapeshiftAmount/:maxShapeshiftAmount/:shapeshiftOrderId/:displayAddress',
|
url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor/:coin/:fixedUnit/:fromWalletId/:minShapeshiftAmount/:maxShapeshiftAmount/:shapeshiftOrderId/:displayAddress/:noPrefix',
|
||||||
views: {
|
views: {
|
||||||
'tab-send@tabs': {
|
'tab-send@tabs': {
|
||||||
controller: 'amountController',
|
controller: 'amountController',
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,16 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
|
||||||
|
|
||||||
root.redir = function(data, shapeshiftData) {
|
root.redir = function(data, shapeshiftData) {
|
||||||
var originalAddress = null;
|
var originalAddress = null;
|
||||||
|
var noPrefixInAddress = 0;
|
||||||
|
|
||||||
|
if (data.toLowerCase().indexOf('bitcoin') < 0) {
|
||||||
|
noPrefixInAddress = 1;
|
||||||
|
}
|
||||||
|
|
||||||
if (typeof(data) == 'string' && (data.toLowerCase().indexOf('bitcoincash:') >= 0 || data[0] == 'q' || data[0] == 'p' || data[0] == 'C' || data[0] == 'H')) {
|
if (typeof(data) == 'string' && (data.toLowerCase().indexOf('bitcoincash:') >= 0 || data[0] == 'q' || data[0] == 'p' || data[0] == 'C' || data[0] == 'H')) {
|
||||||
try {
|
try {
|
||||||
|
noPrefixInAddress = 0;
|
||||||
|
|
||||||
if (data[0] == 'p' || data[0] == 'q') {
|
if (data[0] == 'p' || data[0] == 'q') {
|
||||||
data = 'bitcoincash:' + data;
|
data = 'bitcoincash:' + data;
|
||||||
}
|
}
|
||||||
|
|
@ -86,7 +94,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
|
||||||
var params = {
|
var params = {
|
||||||
toAddress: addr,
|
toAddress: addr,
|
||||||
coin: coin,
|
coin: coin,
|
||||||
displayAddress: originalAddress
|
displayAddress: originalAddress,
|
||||||
|
noPrefix: noPrefixInAddress
|
||||||
};
|
};
|
||||||
if (shapeshiftData) {
|
if (shapeshiftData) {
|
||||||
params['fromWalletId'] = shapeshiftData.fromWalletId;
|
params['fromWalletId'] = shapeshiftData.fromWalletId;
|
||||||
|
|
@ -358,6 +367,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
|
||||||
$state.transitionTo('tabs.send.amount', {
|
$state.transitionTo('tabs.send.amount', {
|
||||||
toAddress: toAddress,
|
toAddress: toAddress,
|
||||||
coin: coin,
|
coin: coin,
|
||||||
|
noPrefix: 1
|
||||||
});
|
});
|
||||||
}, 100);
|
}, 100);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="!isAndroid && !isIos" ng-class="{'amount-pane-recipient': !customAmount && !nextStep,'amount-pane-no-recipient': customAmount || nextStep}">
|
<div ng-show="!isAndroid && !isIos" ng-class="{'amount-pane-recipient': !customAmount && !nextStep,'amount-pane-no-recipient': customAmount || nextStep}">
|
||||||
|
<span class="recipient-label" ng-if="showWarningMessage" translate>Note: Address doesn't contain currency information, please make sure you are sending the correct currency.</span>
|
||||||
<div class="amount-bar oh">
|
<div class="amount-bar oh">
|
||||||
<div class="title">
|
<div class="title">
|
||||||
<span translate>Amount</span>
|
<span translate>Amount</span>
|
||||||
|
|
@ -60,6 +61,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="item" ng-show="isAndroid || isIos">
|
<div class="item" ng-show="isAndroid || isIos">
|
||||||
|
<span class="recipient-label" ng-if="showWarningMessage" translate>Note: Address doesn't contain currency information, please make sure you are sending the correct currency.</span><br/><br/>
|
||||||
<span class="label" translate>Amount</span><br/>
|
<span class="label" translate>Amount</span><br/>
|
||||||
<div ng-if="shapeshiftOrderId">
|
<div ng-if="shapeshiftOrderId">
|
||||||
Minimum amount: {{minShapeshiftAmount}} <br/>
|
Minimum amount: {{minShapeshiftAmount}} <br/>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue