diff --git a/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs b/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs index 75265b42..dc9b28cd 100644 --- a/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs +++ b/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs @@ -64,7 +64,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin this.BoxTitle.Text = Resources.Pages.Admin.BitcoinEchoTest_PageTitle; this.LabelExplainBitcoinEchoTest.Text = String.Format (Resources.Pages.Admin.BitcoinEchoTest_Explain, - CurrentOrganization.Name, address.ProtocolLevelAddress, BitcoinUtility.EchoFeeSatoshis / 100.0); + CurrentOrganization.Name, address.HumanAddress, BitcoinUtility.EchoFeeSatoshis / 100.0); this.ImageBitcoinQr.ImageUrl = "https://chart.googleapis.com/chart?cht=qr&chs=400x400&chl=" + diff --git a/Site/Pages/v5/Financial/Donate.aspx.cs b/Site/Pages/v5/Financial/Donate.aspx.cs index 043c1ab7..bda2737b 100644 --- a/Site/Pages/v5/Financial/Donate.aspx.cs +++ b/Site/Pages/v5/Financial/Donate.aspx.cs @@ -83,13 +83,13 @@ namespace Swarmops.Frontend.Pages.v5.Financial this.BoxTitle.Text = Resources.Pages.Financial.Donate_PageTitle; this.LabelExplainBitcoinDonation.Text = String.Format (Resources.Pages.Financial.Donate_Explain, - CurrentOrganization.Name, address.ProtocolLevelAddress); + CurrentOrganization.Name, address.HumanAddress); this.LabelReceivedFunds.Text = String.Format(Resources.Pages.Financial.Donate_FundsReceivedLabel, CurrentOrganization.Currency.DisplayCode); this.ImageBitcoinQr.ImageUrl = - "https://chart.googleapis.com/chart?cht=qr&chs=400x400&chl=bitcoincash:" + - HttpUtility.UrlEncode (address.ProtocolLevelAddress + "?label=" + + "https://chart.googleapis.com/chart?cht=qr&chs=400x400&chl=" + + HttpUtility.UrlEncode (address.HumanAddress + "?label=" + Uri.EscapeDataString (String.Format (Resources.Pages.Financial.Donate_TxLabel, CurrentOrganization.Name))); // URI scheme doesn't like &, = }