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

show currency warning on amount screen if plain address used

Browse source
This commit is contained in:
Kadir Sekha 2018-01-26 12:02:48 -04:00
commit d31a2115b1
4 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,6 +37,10 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.fromWalletId = data.stateParams.fromWalletId;
}
if (data.stateParams.noPrefix) {
$scope.showWarningMessage = data.stateParams.noPrefix != 0;
}
var config = configService.getSync().wallet.settings;
function setAvailableUnits() {

2
src/js/routes.js
View file

@ -287,7 +287,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*/
.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: {
'tab-send@tabs': {
controller: 'amountController',

12
src/js/services/incomingData.js
View file

@ -10,8 +10,16 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
root.redir = function(data, shapeshiftData) {
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')) {
try {
noPrefixInAddress = 0;
if (data[0] == 'p' || data[0] == 'q') {
data = 'bitcoincash:' + data;
}
@ -86,7 +94,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
var params = {
toAddress: addr,
coin: coin,
displayAddress: originalAddress
displayAddress: originalAddress,
noPrefix: noPrefixInAddress
};
if (shapeshiftData) {
params['fromWalletId'] = shapeshiftData.fromWalletId;
@ -358,6 +367,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
$state.transitionTo('tabs.send.amount', {
toAddress: toAddress,
coin: coin,
noPrefix: 1
});
}, 100);
}