From d393cee7326dc499655c16ceaa34ea70cb6939d5 Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Tue, 14 Jul 2020 09:18:40 +0200
Subject: [PATCH 1/2] streamline decode of uploaded psbt file + fix action
 button alginment

---
 .../WalletViewModels/WalletPSBTViewModel.cs   | 17 ++++-----------
 BTCPayServer/Views/Wallets/WalletPSBT.cshtml  | 21 ++++++++++---------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/BTCPayServer/Models/WalletViewModels/WalletPSBTViewModel.cs b/BTCPayServer/Models/WalletViewModels/WalletPSBTViewModel.cs
index 111b1e0a2..04f70c7bf 100644
--- a/BTCPayServer/Models/WalletViewModels/WalletPSBTViewModel.cs
+++ b/BTCPayServer/Models/WalletViewModels/WalletPSBTViewModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using NBitcoin;
@@ -36,19 +37,9 @@ namespace BTCPayServer.Models.WalletViewModels
             {
                 if (UploadedPSBTFile.Length > 500 * 1024)
                     return null;
-                byte[] bytes = new byte[UploadedPSBTFile.Length];
-                using (var stream = UploadedPSBTFile.OpenReadStream())
-                {
-                    await stream.ReadAsync(bytes, 0, (int)UploadedPSBTFile.Length);
-                }
-                try
-                {
-                    return NBitcoin.PSBT.Load(bytes, network);
-                }
-                catch
-                {
-                    return null;
-                }
+
+                using var stream = new StreamReader(UploadedPSBTFile.OpenReadStream());
+                PSBT = await stream.ReadToEndAsync();
             }
             if (!string.IsNullOrEmpty(PSBT))
             {
diff --git a/BTCPayServer/Views/Wallets/WalletPSBT.cshtml b/BTCPayServer/Views/Wallets/WalletPSBT.cshtml
index 2c13a9b17..6898bbba6 100644
--- a/BTCPayServer/Views/Wallets/WalletPSBT.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletPSBT.cshtml
@@ -33,16 +33,17 @@
                     <input type="hidden" asp-for="NBXSeedAvailable" />
                     <input type="hidden" asp-for="PSBT" />
                     <input type="hidden" asp-for="FileName" />
-
-                    <partial name="WalletSigningMenu" model="@((Model.CryptoCode, Model.NBXSeedAvailable))" />
-                    <div class="dropdown d-inline-block">
-                        <button class="btn btn-secondary dropdown-toggle" type="button" id="OtherActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            Other actions...
-                        </button>
-                        <div class="dropdown-menu" aria-labelledby="OtherActions">
-                            <button name="command" type="submit" class="dropdown-item" value="broadcast">Review</button>
-                            <button name="command" type="submit" class="dropdown-item" value="update">Update</button>
-                            <button name="command" type="submit" class="dropdown-item" value="combine">Combine</button>
+                    <div  class="d-flex">
+                        <partial name="WalletSigningMenu" model="@((Model.CryptoCode, Model.NBXSeedAvailable))"/>
+                        <div class="ml-2 dropdown">
+                            <button class="btn btn-secondary dropdown-toggle" type="button" id="OtherActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                Other actions...
+                            </button>
+                            <div class="dropdown-menu" aria-labelledby="OtherActions">
+                                <button name="command" type="submit" class="dropdown-item" value="broadcast">Review</button>
+                                <button name="command" type="submit" class="dropdown-item" value="update">Update</button>
+                                <button name="command" type="submit" class="dropdown-item" value="combine">Combine</button>
+                            </div>
                         </div>
                     </div>
                 </form>

From 016bf1d671e0cf1a6933da1c1c602d708ef1d829 Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Tue, 14 Jul 2020 09:23:28 +0200
Subject: [PATCH 2/2] add download psbt action

---
 .../WalletViewModels/WalletPSBTViewModel.cs     | 17 +++++++++++++++--
 BTCPayServer/Views/Wallets/WalletPSBT.cshtml    |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/BTCPayServer/Models/WalletViewModels/WalletPSBTViewModel.cs b/BTCPayServer/Models/WalletViewModels/WalletPSBTViewModel.cs
index 04f70c7bf..2d21a1534 100644
--- a/BTCPayServer/Models/WalletViewModels/WalletPSBTViewModel.cs
+++ b/BTCPayServer/Models/WalletViewModels/WalletPSBTViewModel.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
@@ -38,8 +39,20 @@ namespace BTCPayServer.Models.WalletViewModels
                 if (UploadedPSBTFile.Length > 500 * 1024)
                     return null;
 
-                using var stream = new StreamReader(UploadedPSBTFile.OpenReadStream());
-                PSBT = await stream.ReadToEndAsync();
+                try
+                {
+                    byte[] bytes = new byte[UploadedPSBTFile.Length];
+                    await using (var stream = UploadedPSBTFile.OpenReadStream())
+                    {
+                        await stream.ReadAsync(bytes, 0, (int)UploadedPSBTFile.Length);
+                    }
+                    return NBitcoin.PSBT.Load(bytes, network);
+                }
+                catch (Exception)
+                {
+                    using var stream = new StreamReader(UploadedPSBTFile.OpenReadStream());
+                    PSBT = await stream.ReadToEndAsync();
+                }
             }
             if (!string.IsNullOrEmpty(PSBT))
             {
diff --git a/BTCPayServer/Views/Wallets/WalletPSBT.cshtml b/BTCPayServer/Views/Wallets/WalletPSBT.cshtml
index 6898bbba6..2711986c3 100644
--- a/BTCPayServer/Views/Wallets/WalletPSBT.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletPSBT.cshtml
@@ -43,6 +43,7 @@
                                 <button name="command" type="submit" class="dropdown-item" value="broadcast">Review</button>
                                 <button name="command" type="submit" class="dropdown-item" value="update">Update</button>
                                 <button name="command" type="submit" class="dropdown-item" value="combine">Combine</button>
+                                <button name="command" type="submit" class="dropdown-item" value="save-psbt">Download</button>
                             </div>
                         </div>
                     </div>