Fix confirm view for bitcoin cash legacy address
This commit is contained in:
parent
e486568708
commit
5e0b5c876b
3 changed files with 35 additions and 4 deletions
|
|
@ -68,6 +68,28 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
function getNetwork(address) {
|
||||||
|
var network;
|
||||||
|
try {
|
||||||
|
network = (new bitcore.Address(address)).network.name;
|
||||||
|
} catch(e) {
|
||||||
|
network = (new bitcoreCash.Address(address)).network.name;
|
||||||
|
}
|
||||||
|
return network;
|
||||||
|
};
|
||||||
|
|
||||||
|
function getValidAddress(coin, address) {
|
||||||
|
var B = coin == 'bch' ? bitcoreCash : bitcore;
|
||||||
|
try {
|
||||||
|
return B.Address(address).toString();
|
||||||
|
} catch(e) {
|
||||||
|
$scope.legacyBitcoinAddress = address;
|
||||||
|
$log.warn('Convert to new bitcoin cash address format');
|
||||||
|
var a = bitcore.Address(address).toObject();
|
||||||
|
return bitcoreCash.Address.fromObject(a).toString();
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||||
|
|
||||||
function setWalletSelector(coin, network, minAmount, cb) {
|
function setWalletSelector(coin, network, minAmount, cb) {
|
||||||
|
|
@ -123,13 +145,14 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
// Setup $scope
|
// Setup $scope
|
||||||
|
|
||||||
|
|
||||||
var B = data.stateParams.coin == 'bch' ? bitcoreCash : bitcore;
|
var network = getNetwork(data.stateParams.toAddress);
|
||||||
|
var toAddress = getValidAddress(data.stateParams.coin, data.stateParams.toAddress);
|
||||||
|
|
||||||
// Grab stateParams
|
// Grab stateParams
|
||||||
tx = {
|
tx = {
|
||||||
toAmount: parseInt(data.stateParams.toAmount),
|
toAmount: parseInt(data.stateParams.toAmount),
|
||||||
sendMax: data.stateParams.useSendMax == 'true' ? true : false,
|
sendMax: data.stateParams.useSendMax == 'true' ? true : false,
|
||||||
toAddress: data.stateParams.toAddress,
|
toAddress: toAddress,
|
||||||
description: data.stateParams.description,
|
description: data.stateParams.description,
|
||||||
paypro: data.stateParams.paypro,
|
paypro: data.stateParams.paypro,
|
||||||
|
|
||||||
|
|
@ -141,7 +164,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
toName: data.stateParams.toName,
|
toName: data.stateParams.toName,
|
||||||
toEmail: data.stateParams.toEmail,
|
toEmail: data.stateParams.toEmail,
|
||||||
toColor: data.stateParams.toColor,
|
toColor: data.stateParams.toColor,
|
||||||
network: (new B.Address(data.stateParams.toAddress)).network.name,
|
network: network,
|
||||||
coin: data.stateParams.coin,
|
coin: data.stateParams.coin,
|
||||||
txp: {},
|
txp: {},
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -30,4 +30,9 @@
|
||||||
.toggle {
|
.toggle {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
.legacy-bitcoin-address {
|
||||||
|
font-size: 12px;
|
||||||
|
color: #aaa;
|
||||||
|
margin-left: 40px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -60,6 +60,9 @@
|
||||||
<span ng-if="tx.toName && !showAddress">{{tx.toName}}</span>
|
<span ng-if="tx.toName && !showAddress">{{tx.toName}}</span>
|
||||||
<span ng-if="tx.toName && showAddress">{{tx.toAddress}}</span>
|
<span ng-if="tx.toName && showAddress">{{tx.toAddress}}</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="legacy-bitcoin-address" ng-if="legacyBitcoinAddress" copy-to-clipboard="legacyBitcoinAddress" translate>
|
||||||
|
Legacy Bitcoin address: {{legacyBitcoinAddress}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<a class="item item-icon-right" ng-hide="!wallet" ng-click="showWalletSelector()">
|
<a class="item item-icon-right" ng-hide="!wallet" ng-click="showWalletSelector()">
|
||||||
<span class="label" translate>From</span>
|
<span class="label" translate>From</span>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue