Merge remote-tracking branch 'source/master' into dev-shapeshift

This commit is contained in:
lepipele
2018-03-17 23:50:11 -05:00
38 changed files with 434 additions and 491 deletions

View File

@@ -77,7 +77,7 @@ namespace BTCPayServer.Controllers
var onchainMethod = data.GetPaymentMethodDetails() as Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod;
if(onchainMethod != null)
{
cryptoPayment.Address = onchainMethod.DepositAddress.ToString();
cryptoPayment.Address = onchainMethod.DepositAddress;
}
cryptoPayment.Rate = FormatCurrency(data);
cryptoPayment.PaymentUrl = cryptoInfo.PaymentUrls.BIP21;