Put back the list of ledger accounts to 5.

Fix broken lightning payments on Checkout page
add warning for third parties (#562 )
2019-01-29 13:06:43 +09:00 · 2019-01-28 18:50:26 +09:00 · 2019-01-28 17:40:23 +09:00 · 2019-01-28 17:10:51 +09:00 · 2019-01-28 17:07:01 +09:00
5 changed files with 22 additions and 11 deletions
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@ -2,7 +2,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.3.48</Version>
+		<Version>1.0.3.50</Version>
    <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
--- a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
+++ b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
@ -38,12 +38,17 @@
                    </p>
                    <div id="ledger-info" class="form-text text-muted" style="display: none;">
                        <span>A ledger wallet is detected, which account do you want to use? No need to paste manually xpub if your ledger device was detected. Just select derivation scheme from the list bellow and xpub will automatically populate.</span>
-                        <ul>
-                            @for (int i = 0; i < 4; i++)
-                            {
-                                <li><a class="ledger-info-recommended" data-ledgerkeypath="@Model.RootKeyPath.Derive(i, true)" href="#">Account @i (<span>@Model.RootKeyPath.Derive(i, true)</span>)</a></li>
-                            }
-                        </ul>
+                        <div class="dropdown">
+                            <button class="btn btn-primary dropdown-toggle" type="button" id="ledgerAccountsDropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                Select ledger wallet account
+                            </button>
+                            <div class="dropdown-menu" aria-labelledby="ledgerAccountsDropdownMenuButton">
+                                @for (var i = 0; i < 5; i++)
+                                {
+                                    <a class="dropdown-item ledger-info-recommended" data-ledgerkeypath="@Model.RootKeyPath.Derive(i, true)" href="#">Account @i (<span>@Model.RootKeyPath.Derive(i, true)</span>)</a>
+                                }
+                            </div>
+                        </div>
                    </div>
                </div>
                <div class="form-group">
--- a/BTCPayServer/Views/Stores/UpdateChangellySettings.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateChangellySettings.cshtml
@ -11,6 +11,9 @@
 <div class="row">
    <div class="col-md-10">
        <form method="post">
+            <div class="alert alert-warning" role="alert">
+                If you are enabling Changelly support, we advise that you configure the invoice expiration to a minimum of 30 minutes as it may take longer than the default 15 minutes to convert the funds.
+            </div>
            <p>
                You can obtain API keys at
                <a href="https://changelly.com/?ref_id=804298eb5753" target="_blank">
--- a/BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml
@ -11,8 +11,11 @@
 <div class="row">
    <div class="col-md-10">
        <form method="post">
+            <div class="alert alert-warning" role="alert">
+                If you are enabling CoinSwitch support, we advise that you configure the invoice expiration to a minimum of 30 minutes as it may take longer than the default 15 minutes to convert the funds.
+            </div>
            <p>
-                You can obtain a merchant id at 
+                You can obtain a merchant id at
                <a href="https://coinswitch.co/switch/setup/btcpay" target="_blank">
                    https://coinswitch.co/switch/setup/btcpay
                </a>
@ -24,10 +27,10 @@
            </div>
            <div class="form-group">
                <label asp-for="Mode"></label>
-                <select asp-for="Mode" asp-items="Model.Modes" class="form-control" >
+                <select asp-for="Mode" asp-items="Model.Modes" class="form-control">
                </select>
            </div>
-            
+
            <div class="form-group">
                <label asp-for="Enabled"></label>
                <input asp-for="Enabled" type="checkbox" class="form-check"/>
--- a/BTCPayServer/wwwroot/checkout/js/core.js
+++ b/BTCPayServer/wwwroot/checkout/js/core.js
@ -96,7 +96,7 @@ function onDataCallback(jsonData) {

 function fetchStatus() {
    $.ajax({
-        url: window.location.pathname + "/status?invoiceId=" + srvModel.invoiceId,
+        url: window.location.pathname + "/status?invoiceId=" + srvModel.invoiceId + "&paymentMethodId=" + srvModel.paymentMethodId,
        type: "GET",
        cache: false
    }).done(function (data) {
Author	SHA1	Message	Date
nicolas.dorier	a815fad3f1	Put back the list of ledger accounts to 5.	2019-01-29 13:06:43 +09:00
nicolas.dorier	d8b1c7c10a	Fix broken lightning payments on Checkout page	2019-01-28 18:50:26 +09:00
Andrew Camilleri	02e1aea80c	add warning for third parties (#562 ) * add warning for third parties * Update UpdateCoinSwitchSettings.cshtml * Update UpdateChangellySettings.cshtml * Update UpdateChangellySettings.cshtml * Update UpdateCoinSwitchSettings.cshtml	2019-01-28 17:40:23 +09:00
nicolas.dorier	1892f7e0f4	rename field	2019-01-28 17:10:51 +09:00
Andrew Camilleri	b7b50349a7	Convert Ledger account list to dropdown and add more accounts to list (#560 )	2019-01-28 17:07:01 +09:00