From a3d49108d9cae24063fc0ab9f3c12084182a901d Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Fri, 6 Oct 2023 13:54:19 +0200
Subject: [PATCH] better db

---
 .../BTCPayServer.Plugins.Wabisabi.csproj      |  2 +-
 .../Views/Shared/Wabisabi/CoinView.cshtml     | 30 ++++++
 .../Wabisabi/CoinjoinHistoryTable.cshtml      | 99 +++++++------------
 .../Shared/Wabisabi/WabisabiDashboard.cshtml  | 16 ++-
 submodules/walletwasabi                       |  2 +-
 5 files changed, 76 insertions(+), 73 deletions(-)
 create mode 100644 Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/CoinView.cshtml

diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
index 9205bdf..5e1923d 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
@@ -13,7 +13,7 @@
     <PropertyGroup>
         <Product>Wabisabi Coinjoin</Product>
         <Description>Allows you to integrate your btcpayserver store with coinjoins.</Description>
-        <Version>1.0.57</Version>
+        <Version>1.0.58</Version>
     </PropertyGroup>
 
     <!-- Plugin development properties -->
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/CoinView.cshtml b/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/CoinView.cshtml
new file mode 100644
index 0000000..88b6252
--- /dev/null
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/CoinView.cshtml
@@ -0,0 +1,30 @@
+@using NBitcoin
+@using BTCPayServer.Components.TruncateCenter
+@using BTCPayServer.Payments
+@using BTCPayServer
+@model BTCPayServer.Plugins.Wabisabi.BTCPayWallet.CoinjoinData.CoinjoinDataCoin
+@inject BTCPayNetworkProvider BtcPayNetworkProvider
+@{
+    var op = OutPoint.Parse(Model.Outpoint);
+    var text = Model.Outpoint;
+}
+<li class="bg-none list-group-item d-flex border-0 d-flex px-1  ">
+    <div class="truncate-center-id border-0 p-0 d-flex ">
+        <vc:truncate-center text="@text" link="@BitcoinPaymentType.Instance.GetTransactionLink(BtcPayNetworkProvider.BTC, op.Hash.ToString())" classes="truncate-center-id h-100 border-end-0"/>
+        <div class="card truncate-center-id " style="border-left-style: dashed; min-width: 110px;">
+            <span class="text-nowrap">@Model.Amount BTC</span>
+            <span class="text-nowrap">
+                @if (string.IsNullOrEmpty(Model.PayoutId))
+                {
+                    @($"{Model.AnonymitySet.ToString("0.##")} anonset")
+                }
+                else
+                {
+                    @($"Payment ({Model.PayoutId})")
+                }
+            </span>
+        </div>
+    </div>
+
+
+</li>
\ No newline at end of file
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/CoinjoinHistoryTable.cshtml b/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/CoinjoinHistoryTable.cshtml
index f363cdd..c69c604 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/CoinjoinHistoryTable.cshtml
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/CoinjoinHistoryTable.cshtml
@@ -11,37 +11,8 @@
     var mainnet = BtcPayNetworkProvider.NetworkType == ChainName.Mainnet;
 }
 
-@functions
-{
-    void PrintCoin(BTCPayWallet.CoinjoinData.CoinjoinDataCoin coin)
-    {
-        var op = OutPoint.Parse(coin.Outpoint);
-        <tr>
-            <td>
-                <a href="@BitcoinPaymentType.Instance.GetTransactionLink(BtcPayNetworkProvider.BTC, op.Hash.ToString())" target="_blank" class="text-break">
-                    @coin.Outpoint
-                </a>
-
-            </td>
-            <td>
-                @coin.Amount
-            </td>
-            <td>
-                @if (string.IsNullOrEmpty(coin.PayoutId))
-                {
-                    @coin.AnonymitySet.ToString("0.##")
-                }
-                else
-                {
-                    @($"Payment ({coin.PayoutId})")
-                }
-            </td>
-        </tr>
-    }
-}
-
-<div class="table-responsive">
-    <table class="table table-hover  w-100">
+<div class="table-responsive" style="  transform: rotateX(180deg);">
+    <table class="table table-hover  w-100" style="  transform: rotateX(180deg);">
         <thead>
         <tr>
             <th class="w-125px">Round</th>
@@ -59,7 +30,12 @@
             var cjOutWeightedAverage = @CoinjoinAnalyzer.WeightedAverage.Invoke(@cjData.CoinsOut.Where(coin => coin.PayoutId is null).Select(coin => new CoinjoinAnalyzer.AmountWithAnonymity(coin.AnonymitySet, new Money(coin.Amount, MoneyUnit.BTC))));
             <tr>
                 <td>
-                    <a class="text-break" data-bs-toggle="collapse" data-bs-target="#txcoins-@cjData.Round">@cjData.Round</a>
+                    <a class="d-flex cursor-pointer " data-bs-toggle="collapse" data-bs-target="#txcoins-@cjData.Round">
+
+                        <vc:truncate-center text="@cjData.Round" classes="truncate-center-id"/>
+                        <vc:icon symbol="caret-down"/>
+                    </a>
+
                 </td>
                 <td>
                     <span class="text-break">@cjData.Timestamp.ToTimeAgo()</span>
@@ -68,59 +44,50 @@
                     <span class="text-break">@cjData.CoordinatorName</span>
                 </td>
                 <td>
-                    <a href="@BitcoinPaymentType.Instance.GetTransactionLink(network, cjData.Transaction)" target="_blank" class="text-break">
-                        @cjData.Transaction
-                    </a>
+                    <vc:truncate-center text="@cjData.Transaction" link="@BitcoinPaymentType.Instance.GetTransactionLink(network, cjData.Transaction)" classes="truncate-center-id"/>
                 </td>
                 <td>
-                    <span class="">@cjData.CoinsIn.Length (@cjData.CoinsIn.Sum(coin => coin.Amount) BTC) (@cjInWeightedAverage.ToString("0.##") anonset wavg)</span>
+                    <div class="card truncate-center-id">
+                        <span class="text-nowrap">@cjData.CoinsIn.Length coins</span>
+                        <span class="text-nowrap">@cjData.CoinsIn.Sum(coin => coin.Amount) BTC</span>
+                        <span class="text-nowrap">@cjInWeightedAverage.ToString("0.##") anonset wavg</span>
+                    </div>
                 </td>
                 <td>
-                    <span class="">@cjData.CoinsOut.Length (@cjData.CoinsOut.Sum(coin => coin.Amount) BTC) (@cjOutWeightedAverage.ToString("0.##") anonset wavg)</span>
+
+                    <div class="card truncate-center-id">
+                        <span class="text-nowrap">@cjData.CoinsOut.Length coins</span>
+                        <span class="text-nowrap">@cjData.CoinsOut.Sum(coin => coin.Amount) BTC</span>
+                        <span class="text-nowrap">@cjOutWeightedAverage.ToString("0.##") anonset wavg</span>
+                    </div>
                 </td>
 
             </tr>
 
-            <tr id="txcoins-@cjData.Round" class="collapse">
-                <td colspan="6">
-                    <table class="table mb-0">
-
-                        <thead>
-                        <tr>
-                            <th colspan="3">Inputs</th>
-                        </tr>
-                        <tr>
-                            <th class="w-125px">utxo</th>
-                            <th >Amount</th>
-                            <th >Anonset</th>
-                        </tr>
-                        </thead>
+            <tr id="txcoins-@cjData.Round" class="collapse  overflow-y-auto " style="    max-height: 30vh;">
+                <td colspan="6" >
+                    <div class="d-flex justify-content-start">
+                        
+                    <ul class="list-group list-group-flush" style="--btcpay-list-group-bg: transparent;">
+                        <li class="list-group-item list-group-item-heading h5">Inputs</li>
                         @foreach (var c in cjData.CoinsIn)
                         {
-                            PrintCoin(c);
+                            <partial name="Wabisabi/CoinView" model="@c"/>
                         }
+                    </ul>
 
 
-                    </table>
-                    <table class="table mb-0">
+                    <ul class="list-group list-group-flush" style="--btcpay-list-group-bg: transparent;">
 
-                        <thead>
-                        <tr>
-                            <th colspan="3">Outputs</th>
-                        </tr>
-                        <tr>
-                            <th class="w-125px">utxo</th>
-                            <th >Amount</th>
-                            <th >Anonset</th>
-                        </tr>
-                        </thead>
+                        <li class="list-group-item list-group-item-heading h5">Outputs</li>
                         @foreach (var c in cjData.CoinsOut)
                         {
-                            PrintCoin(c);
+                            <partial name="Wabisabi/CoinView" model="@c"/>
                         }
+                    </ul>
 
 
-                    </table>
+                    </div>
                 </td>
             </tr>
         }
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/WabisabiDashboard.cshtml b/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/WabisabiDashboard.cshtml
index 694fa14..34c2437 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/WabisabiDashboard.cshtml
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/WabisabiDashboard.cshtml
@@ -65,12 +65,8 @@
                 }
                 else
                 {
-                    <div class="table-responsive-sm my-0">
-
-
+                    
                         <partial name="Wabisabi/CoinjoinHistoryTable" model="cjHistory"/>
-
-                    </div>
                 }
             </div>
 
@@ -252,6 +248,16 @@
                                             @coin.Amount.ToDecimal(MoneyUnit.BTC) BTC
                                         </td>
                                         <td>
+                                            <ul class="list-group list-group-flush">
+                                                
+                                                @for (var index = 0; index < coin.HdPubKey.Labels.Count; index++)
+                                                {
+                                                    var label = coin.HdPubKey.Labels.ElementAt(index);
+                                                    <li class="list-group-item">
+                                                        <vc:truncate-center text="@label" classes="truncate-center-id"></vc:truncate-center>
+                                                    </li>
+                                                }
+                                            </ul>
                                             @coin.HdPubKey.Labels.ToString()
                                         </td>
                                     </tr>
diff --git a/submodules/walletwasabi b/submodules/walletwasabi
index b045762..e3b22a8 160000
--- a/submodules/walletwasabi
+++ b/submodules/walletwasabi
@@ -1 +1 @@
-Subproject commit b045762714cc19d2ce156f799dd6ed49edffd0d3
+Subproject commit e3b22a8b0e48595bc8153aada5df261fc2a5bc7b